added closeOpenedElement callback and integration test

tmont · Jun 5, 2012 · 00ad88c · 00ad88c
1 parent 41e7c0e
commit 00ad88c
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 32 deletions.
diff --git a/src/context.js b/src/context.js
@@ -72,7 +72,8 @@ exports.create = function(raw, options) {
 	});
 
 	context.callbacks = {};
-	[ 'openElement', 'closeElement', 'attribute', 'comment', 'cdata', 'text', 'docType', 'xmlProlog', ].forEach(function(value) {
+	var types = [ 'openElement', 'closeElement', 'attribute', 'comment', 'cdata', 'text', 'docType', 'xmlProlog', 'closeOpenedElement' ];
+	types.forEach(function(value) {
 		context.callbacks[value] = options[value] || function() {
 		};
 	});

diff --git a/src/parser.js b/src/parser.js
@@ -41,14 +41,16 @@ function readAttributes(context, isXml) {
 	if (context.current === '/') {
 		//self closing tag "/>"
 		context.readUntilNonWhitespace();
-		context.callbacks.closeElement('');
+		context.read();
+		context.callbacks.closeOpenedElement('/>');
 	} else if (isXml) {
 		//xml closing "?>"
 		context.read(2);
-		context.callbacks.closeElement('');
+		context.callbacks.closeOpenedElement('?>');
 	} else {
 		//normal closing ">"
 		context.read();
+		context.callbacks.closeOpenedElement('>');
 	}
 }
 

diff --git a/tests/files/good-expected.html b/tests/files/good-expected.html
@@ -1,4 +1,5 @@
 <!doctype html>
+
 <html>
 	<head>
 		<title>tommy montgomery </title>
@@ -18,6 +19,6 @@ <h1><a href="/"><span>t</span>ommy <span>mont</span>gomery</a></h1>
 			</div>
 		</div>
 
-		<script src="/media/js/d3.min.js" type="text/javascript"></script>
+		<script src="/media/js/d3.min.js"></script>
 	</body>
 </html>
diff --git a/tests/files/good.html b/tests/files/good.html
@@ -18,6 +18,6 @@ <h1><a href="/"><span>t</span>ommy <span>mont</span>gomery</a></h1>
 			</div>
 		</div>
 
-		<script src="/media/js/d3.min.js" type="text/javascript"></script>
+		<script src="/media/js/d3.min.js"></script>
 	</body>
 </html>
diff --git a/tests/integration-tests.js b/tests/integration-tests.js
@@ -1,25 +1,38 @@
 var should = require('should');
 var helpers = require('./helpers');
 
-//describe('Integration', function() {
-//	it('real life HTML document', function() {
-//		var content = '';
-//
-//		helpers.htmlParser.parseFile(__dirname + '/files/good.html', null, {
-//			docType: function(value) {
-//				content += '<!doctype ' + value + '>\n';
-//			},
-//
-//			openElement: function(name) {
-//				switch (name) {
-//					case 'link':
-//					case 'meta':
-//
-//
-//				}
-//			}
-//		}, function(err) {
-//			should.not.exist(err);
-//		});
-//	});
-//});
+describe('Integration', function() {
+	it('real life HTML document', function(done) {
+		var content = '';
+		helpers.parser.parseFile(__dirname + '/files/good.html', 'utf8', {
+			docType: function(value) {
+				content += '<!doctype ' + value + '>\n';
+			},
+
+			openElement: function(name) {
+				content += '<' + name;
+			},
+
+			closeOpenedElement: function(token) {
+				content += token;
+			},
+
+			closeElement: function(name) {
+				content += '</' + name + '>';
+			},
+
+			attribute: function(name, value) {
+				content += ' ' + name + '="' + value.replace(/"/g, '&quot;') + '"';
+			},
+
+			text: function(value) {
+				content += value;
+			}
+		}, function(err) {
+			should.not.exist(err);
+			var expected = require('fs').readFileSync(__dirname + '/files/good-expected.html', 'utf8');
+			content.should.equal(expected);
+			done();
+		});
+	});
+});
diff --git a/tests/open-and-close-tag-tests.js b/tests/open-and-close-tag-tests.js
@@ -135,15 +135,15 @@ describe('opening and closing tags', function() {
 		textCount.should.equal(1);
 	});
 
-	it('self closing tag should emit closeElement', function() {
+	it('self closing tag should emit closeOpenedElement', function() {
 		var closeCount = 0, openCount = 0;
 		helpers.parseString('<foo />', {
 			openElement: function(name) {
 				name.should.equal('foo');
 				openCount++;
 			},
-			closeElement: function(name) {
-				name.should.equal('');
+			closeOpenedElement: function(name) {
+				name.should.equal('/>');
 				closeCount++;
 			}
 		});

diff --git a/tests/xml-prolog-tests.js b/tests/xml-prolog-tests.js
@@ -61,7 +61,7 @@ describe('XML Prologs', function() {
 				openCount++;
 			},
 			closeElement: function(name) {
-				name.should.equal(closeCount === 0 ? '' : 'foo');
+				name.should.equal('foo');
 				closeCount++;
 			},
 			attribute: function(name, value) {
@@ -75,6 +75,6 @@ describe('XML Prologs', function() {
 
 		prologCount.should.equal(1);
 		openCount.should.equal(1);
-		closeCount.should.equal(2);
+		closeCount.should.equal(1);
 	});
 });
-Original file line number
+Diff line change
@@ Expand Up @@
     			</div>
     		</div>
-    		<script src="/media/js/d3.min.js" type="text/javascript"></script>
+    		<script src="/media/js/d3.min.js"></script>
     	</body>
     </html>