Merge pull request #113 from erikbern/master

Fix sanitize for text

Author: c4milo

lib/sanitize.js

@@ -27,13 +27,17 @@ function escapeRegExp(string) {
     return string.replace(/([.*+?^=!:${}()|\[\]\/\\])/g, "\\$1");
 }
 
-exports.sanitize = function sanitize(value) {
+exports.sanitize = function sanitize(value, reverse) {
     if (typeof value !== 'string') {
         return value;
     }
 
     Object.keys(chars).forEach(function(key) {
-        value = value.replace(new RegExp(escapeRegExp(key), 'g'), chars[key]);
+        if (reverse) {
+            value = value.replace(new RegExp(escapeRegExp(chars[key]), 'g'), key);
+        } else {
+            value = value.replace(new RegExp(escapeRegExp(key), 'g'), chars[key]);
+        }
     });
 
     return value;

lib/xml2json.js

@@ -61,7 +61,7 @@ function endElement(name) {
         }
 
         if (options.sanitize) {
-            currentObject['$t'] = sanitizer.sanitize(currentObject['$t']);
+            currentObject['$t'] = sanitizer.sanitize(currentObject['$t'], true);
         }
 
         currentObject['$t'] = coerce(currentObject['$t'],name);

test/fixtures/xmlsanitize2.json

@@ -0,0 +1 @@
+{"e":"Smith & Son"}

test/fixtures/xmlsanitize2.xml

@@ -0,0 +1 @@
+<e>Smith &amp; Son</e>

test/test.js

@@ -88,14 +88,25 @@ describe('xml2json', function () {
     it('does xmlsanitize', function (done) {
 
         var xml = internals.readFixture('xmlsanitize.xml');
-        var result = parser.toJson(xml, {});
+        var result = parser.toJson(xml, {sanitize: true});
         var json = internals.readFixture('xmlsanitize.json');
 
         expect(result).to.deep.equal(json);
 
         done();
     });
 
+    it('does xmlsanitize of text', function (done) {
+
+        var xml = internals.readFixture('xmlsanitize2.xml');
+        var result = parser.toJson(xml, {sanitize: true});
+        var json = internals.readFixture('xmlsanitize2.json');
+
+        expect(result).to.deep.equal(json);
+
+        done();
+    });
+
     it('throws error on bad options', function (done) {
 
         var throws = function() {