html-parser - npm Package Compare versions

Comparing version 0.5.0 to 0.6.0

package.json

 {
 	"name": "html-parser",
-	"version": "0.5.0",
+	"version": "0.6.0",
 	"description": "HTML/XML parser with less explosions",
@@ -5,0 +5,0 @@ "keywords": [ "html", "xml", "parser", "explosion" ],

src/parser.js

@@ -67,3 +67,3 @@ var parseContext = require('./context');
 
-	if (name !== 'script' && name !== 'xmp') {
+	if (!/^(script|xmp)$/i.test(name)) {
 		return;
@@ -73,7 +73,7 @@ }
 	//just read until the closing tags for elements that allow cdata
-	var regex = new RegExp('^([\\s\\S]*?)(?:$|</' + name + '>)', 'i');
+	var regex = new RegExp('^([\\s\\S]*?)(?:$|</(' + name + ')\\s*>)', 'i');
 	var match = regex.exec(context.substring);
 	context.read(match[0].length);
 	context.callbacks.cdata(match[1]);
-	context.callbacks.closeElement(name);
+	context.callbacks.closeElement(match[2]);
 }
@@ -80,0 +80,0 @@

tests/open-and-close-tag-tests.js

@@ -155,2 +155,53 @@ var should = require('should');
 	});
+
+	it('closing script tags allow whitespace', function() {
+		var closeCount = 0, openCount = 0;
+		helpers.parseString('<script></script \n >', {
+			openElement: function(name) {
+				name.should.equal('script');
+				openCount++;
+			},
+			closeElement: function(name) {
+				name.should.equal('script');
+				closeCount++;
+			}
+		});
+
+		closeCount.should.equal(1);
+		openCount.should.equal(1);
+	});
+
+	it('closing xmp tags allow whitespace', function() {
+		var closeCount = 0, openCount = 0;
+		helpers.parseString('<xmp></xmp \n >', {
+			openElement: function(name) {
+				name.should.equal('xmp');
+				openCount++;
+			},
+			closeElement: function(name) {
+				name.should.equal('xmp');
+				closeCount++;
+			}
+		});
+
+		closeCount.should.equal(1);
+		openCount.should.equal(1);
+	});
+
+	it('closing script tag is not case sensitive', function() {
+		var closeCount = 0, openCount = 0;
+		helpers.parseString('<script></SCRIPT>', {
+			openElement: function(name) {
+				name.should.equal('script');
+				openCount++;
+			},
+			closeElement: function(name) {
+				name.should.equal('SCRIPT');
+				closeCount++;
+			}
+		});
+
+		closeCount.should.equal(1);
+		openCount.should.equal(1);
+	});
 });

tests/sanitization-tests.js

@@ -88,2 +88,26 @@ var should = require('should');
 	});
+
+	it('should remove element with attributes', function() {
+		var html = '<foo><bar baz="bat"></bar></foo>';
+		var sanitized = helpers.parser.sanitize(html, {
+			elements: [ 'bar' ]
+		});
+		sanitized.should.equal('<foo></foo>');
+	});
+
+	it('should remove script tag with whitespace', function() {
+		var html = '<p>foo<script ></script ></p>';
+		var sanitized = helpers.parser.sanitize(html, {
+			elements: [ 'script' ]
+		});
+		sanitized.should.equal('<p>foo</p>');
+	});
+
+	it('should remove script tag with attributes', function() {
+		var html = '<p>foo<script type="text/javascript">alert("foo");</script></p>';
+		var sanitized = helpers.parser.sanitize(html, {
+			elements: [ 'script' ]
+		});
+		sanitized.should.equal('<p>foo</p>');
+	});
 });

No alert changes

Improved metrics

Total package byte prevSize

70316

increased by2.63%

Lines of code

1287

increased by5.41%

No dependency changes