Merge pull request #141 from jrit/cheerio-node-12

jrit · jrit · commit a53a947e1d4c · 2015-07-14T12:26:08.000-05:00
special purpose encode/decode for EJS
diff --git a/History.md b/History.md
@@ -1,3 +1,8 @@
+1.3.3 / 2015-07-14
+==================
+
+* Prevent mangling of EJS tags
+
 1.3.0 / 2015-07-02
 ==================
 
diff --git a/lib/juice.js b/lib/juice.js
@@ -28,7 +28,7 @@ var juice = function (html,options) {
     return doc.xml();
   }
   else {
-    return doc.html();
+    return utils.decodeEntities(doc.html());
   }
 };
 
@@ -307,7 +307,7 @@ function juiceResources(html, options, callback) {
       return callback(null, $.xml());
     }
     else {
-      return callback(null, $.html());
+      return callback(null, utils.decodeEntities($.html()));
     }
   };
 
@@ -354,7 +354,7 @@ function inlineContent(html, css, options) {
       return $.xml();
     }
     else {
-      return $.html();
+      return utils.decodeEntities($.html());
     }
 }
 
diff --git a/lib/utils.js b/lib/utils.js
@@ -140,6 +140,7 @@ exports.getMediaQueryText = function ( css )
 
 exports.cheerio = function (html, options) {
   options = exports.extend({decodeEntities: false}, options || {});
+  html = exports.encodeEntities(html);
   return cheerio.load(html,options);
 };
 
@@ -152,6 +153,26 @@ exports.normalizeLineEndings = function (text){
   return text.replace(/\r\n/g, '\n').replace(/\n/g, '\r\n');
 };
 
+exports.encodeEJS = function (html){
+  return html.replace(/<%((.|\s)*?)%>/g, function(match, subMatch){
+    return "<!--EJS <%"+subMatch+"%> -->";
+  });
+};
+
+exports.decodeEJS = function (html){
+  return html.replace(/<!--EJS <%((.|\s)*?)%> -->/g, function (match, subMatch){
+    return "<%"+subMatch+"%>";
+  });
+};
+
+exports.encodeEntities = function(html){
+  return exports.encodeEJS(html);
+};
+
+exports.decodeEntities = function(html){
+  return exports.decodeEJS(html);
+};
+
 /**
  * Converts to array
  *
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "juice",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "Inlines css into html source",
   "bin": "./bin/juice",
   "main": "./lib/juice",
diff --git a/test/cases/ejs.css b/test/cases/ejs.css
@@ -0,0 +1,3 @@
+body {
+  color: red;
+}
diff --git a/test/cases/ejs.html b/test/cases/ejs.html
@@ -0,0 +1,3 @@
+<body>
+<%= config.sitePrefix %>verify?grant=<%= grant._id %>&secret=<%= grant.secret %>
+</body>
diff --git a/test/cases/ejs.out b/test/cases/ejs.out
@@ -0,0 +1,3 @@
+<body style="color: red;">
+<%= config.sitePrefix %>verify?grant=<%= grant._id %>&secret=<%= grant.secret %>
+</body>

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ var juice = function (html,options) {`
`28`	`28`	`return doc.xml();`
`29`	`29`	`}`
`30`	`30`	`else {`
`31`		`- return doc.html();`
	`31`	`+ return utils.decodeEntities(doc.html());`
`32`	`32`	`}`
`33`	`33`	`};`
`34`	`34`
`@@ -307,7 +307,7 @@ function juiceResources(html, options, callback) {`
`307`	`307`	`return callback(null, $.xml());`
`308`	`308`	`}`
`309`	`309`	`else {`
`310`		`- return callback(null, $.html());`
	`310`	`+ return callback(null, utils.decodeEntities($.html()));`
`311`	`311`	`}`
`312`	`312`	`};`
`313`	`313`
`@@ -354,7 +354,7 @@ function inlineContent(html, css, options) {`
`354`	`354`	`return $.xml();`
`355`	`355`	`}`
`356`	`356`	`else {`
`357`		`- return $.html();`
	`357`	`+ return utils.decodeEntities($.html());`
`358`	`358`	`}`
`359`	`359`	`}`
`360`	`360`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "juice",`
`3`		`- "version": "1.3.2",`
	`3`	`+ "version": "1.3.3",`
`4`	`4`	`"description": "Inlines css into html source",`
`5`	`5`	`"bin": "./bin/juice",`
`6`	`6`	`"main": "./lib/juice",`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<body>`
	`2`	`+<%= config.sitePrefix %>verify?grant=<%= grant._id %>&secret=<%= grant.secret %>`
	`3`	`+</body>`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<body style="color: red;">`
	`2`	`+<%= config.sitePrefix %>verify?grant=<%= grant._id %>&secret=<%= grant.secret %>`
	`3`	`+</body>`