Alphanumeric attributes

rajkissu · rajkissu · commit b4207c731e87 · 2015-09-23T15:46:39.000+08:00
* adds support for alphanumeric attributes
* updates parser test case
* fixes loader test case
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-node_modules
+node_modules
+*.sw*
diff --git a/lib/attributesParser.js b/lib/attributesParser.js
@@ -27,9 +27,9 @@ var parser = new Parser({
 	inside: {
 		"\\s+": true, // eat up whitespace
 		">": "outside", // end of attributes
-		"(([a-zA-Z\\-]+)\\s*=\\s*\")([^\"]*)\"": processMatch,
-		"(([a-zA-Z\\-]+)\\s*=\\s*\')([^\']*)\'": processMatch,
-		"(([a-zA-Z\\-]+)\\s*=\\s*)([^\\s>]+)": processMatch
+		"(([0-9a-zA-Z\\-]+)\\s*=\\s*\")([^\"]*)\"": processMatch,
+		"(([0-9a-zA-Z\\-]+)\\s*=\\s*\')([^\']*)\'": processMatch,
+		"(([0-9a-zA-Z\\-]+)\\s*=\\s*)([^\\s>]+)": processMatch
 	}
 });
 
@@ -40,4 +40,4 @@ module.exports = function parse(html, isRelevantTagAttr) {
 		results: [],
 		isRelevantTagAttr: isRelevantTagAttr
 	}).results;
-};
+};
diff --git a/test/loaderTest.js b/test/loaderTest.js
@@ -38,7 +38,7 @@ describe("loader", function() {
 		loader.call({
 			minimize: true
 		}, '<!-- comment --><h3>#{number} {customer}</h3>\n<p>   {title}   </p>\n\t <!-- comment --> <img src="image.png" />').should.be.eql(
-			'module.exports = "<h3>#{number} {customer}</h3><p>{title}</p><img src=" + require("./image.png") + ">";'
+			'module.exports = "<h3>#{number} {customer}</h3><p>{title}</p><img src=\\"" + require("./image.png") + "\\">";'
 		);
 	});
 	it("should not translate root-relative urls (without root query)", function() {
diff --git a/test/parserTest.js b/test/parserTest.js
@@ -7,6 +7,7 @@ function test(name, html, result) {
 		attrParse(html, function(tag, attr) {
 			if(tag === "img" && attr === "src") return true;
 			if(tag === "link" && attr === "href") return true;
+			if(tag === "div" && attr === "data-videomp4") return true;
 			return false;
 		}).map(function(match) { return match.value }).should.be.eql(result);
 	});
@@ -28,6 +29,7 @@ describe("parser", function() {
 	test("tags", '<img src="image.png"><script src="script.js"></script><link type="stylesheet" href="style.css">', ["image.png", "style.css"]);
 	test("cdata", '<![CDATA[<img src="image.png">]]><img src="image2.png">', ["image2.png"]);
 	test("doctype", '<!doctype html><img src="image.png">', ["image.png"]);
+  test("alphanumeric", '<div data-videomp4="video.mp4"></div>', ["video.mp4"]);
 });
 
 describe("locations", function() {
@@ -38,4 +40,4 @@ describe("locations", function() {
 			value: "image.png"
 		}]);
 	});
-});
+});

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-node_modules`
	`1`	`+node_modules`
	`2`	`+.sw`