implemented doctype parsing

tmont · Jun 5, 2012 · 15476bd · 15476bd
1 parent eb596b3
commit 15476bd
Show file tree

Hide file tree

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

diff --git a/src/parser.js b/src/parser.js
@@ -51,7 +51,7 @@ function parseCData(context) {
 
 	var match = /^([\s\S]*?)(?:$|]]>)/.exec(context.substring);
 	var value = match[1];
-	context.read(value.length + match[0].length);
+	context.read(match[0].length);
 	context.callbacks.cdata(value);
 }
 
@@ -61,10 +61,20 @@ function parseComment(context) {
 
 	var match = /^([\s\S]*?)(?:$|-->)/.exec(context.substring);
 	var value = match[1];
-	context.read(value.length + match[0].length);
+	context.read(match[0].length);
 	context.callbacks.comment(value);
 }
 
+function parseDocType(context) {
+	//read "!doctype"
+	context.read(8);
+
+	var match = /^\s*([\s\S]*?)(?:$|>)/.exec(context.substring);
+	var value = match[1];
+	context.read(match[0].length);
+	context.callbacks.docType(value);
+}
+
 function appendText(value, context) {
 	context.text += value;
 }
@@ -97,6 +107,9 @@ function parseNext(context) {
 			} else if (/^!--/.test(context.substring)) {
 				callbackText(context);
 				parseComment(context);
+			} else if (/^!doctype/i.test(context.substring)) {
+				callbackText(context);
+				parseDocType(context);
 			} else {
 				//malformed html
 				context.read();

diff --git a/tests/doctype-tests.js b/tests/doctype-tests.js
@@ -0,0 +1,65 @@
+var should = require('should');
+var helpers = require('./helpers');
+
+describe('DocTypes', function() {
+	it('at beginning of document', function() {
+		var docTypeCount = 0;
+		helpers.parseString('<!doctype html>', {
+			docType: function(value) {
+				value.should.equal('html');
+				docTypeCount++;
+			}
+		});
+
+		docTypeCount.should.equal(1);
+	});
+
+	it('in middle of document', function() {
+		var docTypeCount = 0, openCount = 0, closeCount = 0;
+		helpers.parseString('<foo><!doctype html></foo>', {
+			openElement: function(name) {
+				name.should.equal('foo');
+				openCount++;
+			},
+			closeElement: function(name) {
+				name.should.equal('foo');
+				closeCount++;
+			},
+			docType: function(value) {
+				openCount.should.equal(1);
+				closeCount.should.equal(0);
+				value.should.equal('html');
+				docTypeCount++;
+			}
+		});
+
+		docTypeCount.should.equal(1);
+		openCount.should.equal(1);
+		closeCount.should.equal(1);
+	});
+
+	it('with line breaks', function() {
+		var docTypeCount = 0;
+		helpers.parseString('<!doctype foo\nbar>', {
+			docType: function(value) {
+				value.should.equal('foo\nbar');
+				docTypeCount++;
+			}
+		});
+
+		docTypeCount.should.equal(1);
+	});
+
+	it('are case insensitive', function() {
+		var docTypeCount = 0;
+		helpers.parseString('<!DoCtyPE html>', {
+			docType: function(value) {
+				value.should.equal('html');
+				docTypeCount++;
+			}
+		});
+
+		docTypeCount.should.equal(1);
+	});
+
+});
diff --git a/tests/files/good.html b/tests/files/good.html
@@ -0,0 +1,41 @@
+<!doctype html>
+<html>
+
+	<head>
+		<title>tommy montgomery </title>
+		<meta http-equiv="content-type" content="text/html;charset=utf-8"/>
+		<link rel="stylesheet" href="/media/css/global.css"/>
+		<link rel="shortcut icon" type="image/png" href="/favicon.ico"/>
+	</head>
+
+	<body>
+		<div id="wrapper">
+			<div id="header">
+				<h1><a href="/"><span>t</span>ommy <span>mont</span>gomery</a></h1>
+			</div>
+
+			<div id="main-content">
+				<div id="menu"></div>
+
+			</div>
+		</div>
+
+		<script src="/media/js/d3.min.js" type="text/javascript"></script>
+		<script src="/media/js/mainmenu.js" type="text/javascript"></script>
+
+
+		<script type="text/javascript">
+			var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+			document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+		</script>
+		<script type="text/javascript">
+			try {
+				var pageTracker = _gat._getTracker("UA-6733824-1");
+				pageTracker._trackPageview();
+			}
+			catch (err) {
+			}
+		</script>
+	</body>
+
+</html>
diff --git a/tests/integration-tests.js b/tests/integration-tests.js
@@ -0,0 +1,8 @@
+require('should');
+var helpers = require('./helpers');
+
+describe('Integration', function() {
+	it('real life HTML document', function() {
+
+	});
+});