Add raw tag to handle things that aren't proper xml

heldermattos · Jun 17, 2016 · dbbc3c8 · dbbc3c8
1 parent 5f4cb49
commit dbbc3c8
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 2 deletions.
diff --git a/lib/inky.js b/lib/inky.js
@@ -44,7 +44,9 @@ Inky.prototype.releaseTheKraken = function(xmlString, cheerioOpts) {
   // <center> is an exception: the selector is center:not([data-parsed])
   // Otherwise the parser gets caught in an infinite loop where it continually tries to process the same <center> tags
   //
-  var $ = cheerio.load(xmlString, Inky.mergeCheerioOpts(cheerioOpts));
+  var set = Inky.extractRaws(xmlString);
+  var raws = set[0], string = set[1];
+  var $ = cheerio.load(string, Inky.mergeCheerioOpts(cheerioOpts));
   var tags = this.componentTags.map(function(tag) {
     if (tag == 'center') {
       return tag + ':not([data-parsed])';
@@ -59,7 +61,8 @@ Inky.prototype.releaseTheKraken = function(xmlString, cheerioOpts) {
     elem.replaceWith(newHtml);
   }
 
-  return $.html();
+  string =  $.html();
+  return Inky.reInjectRaws(string, raws);
 }
 
 Inky.mergeCheerioOpts = function(opts) {
@@ -70,6 +73,28 @@ Inky.mergeCheerioOpts = function(opts) {
   return opts;
 };
 
+Inky.extractRaws = function(string) {
+  var raws = [];
+  var i = 0;
+  var raw;
+  var str = string
+  var regex = /\< *raw *\>(.*?)\<\/ *raw *\>/i;
+  while(raw = str.match(regex)) {
+    raws[i] = raw[1];
+    str = str.replace(regex, '###RAW' + i + '###');
+    i = i+1;
+  }
+  return [raws, str];
+};
+
+Inky.reInjectRaws = function(string, raws) {
+  var str = string;
+  for (var i in raws) {
+    str = str.replace('###RAW' + i + '###', raws[i])
+  }
+  return str;
+};
+
 Inky.prototype.componentFactory = require('./componentFactory');
 
 Inky.prototype.makeColumn = require('./makeColumn');
diff --git a/test/inky.js b/test/inky.js
@@ -86,6 +86,20 @@ describe('Inky', () => {
     compare(input, expected, { decodeEntities: false });
   });
 
+  it(`doesn't muck with stuff inside raw`, () => {
+    var input = '<raw><%= test %></raw>';
+    var expected = '<%= test %>';
+
+    compare(input, expected);
+  });
+
+  it(`can handle multiple raw tags`, () => {
+    var input = '<h1><raw><%= test %></raw></h1><h2>< raw >!!!</ raw ></h2>';
+    var expected = '<h1><%= test %></h1><h2>!!!</h2>';
+
+    compare(input, expected);
+  });
+
 });
 
 describe('Inky wrappers', () => {