Merge pull request #64 from idy/issue-61

fix #61

Author: c4milo

lib/json2xml.js

@@ -1,5 +1,4 @@
 module.exports = function toXml(json, xml) {
-    var xml = xml || '';
     if (json instanceof Buffer) {
         json = json.toString();
     }
@@ -14,7 +13,13 @@ module.exports = function toXml(json, xml) {
     } else {
         obj = json;
     }
+    var toXml = new ToXml();
+    toXml.parse(obj);
+    return toXml.xml;
+}
 
+ToXml.prototype.parse = function(obj) {
+    var self = this;
     var keys = Object.keys(obj);
     var len = keys.length;
 
@@ -28,10 +33,9 @@ module.exports = function toXml(json, xml) {
             it.forEach(function(subVal) {
                 if (typeof(subVal) != 'object') {
                     if (key == '$t') {
-                        xml += subVal;
+                        self.addTextContent(subVal);
                     } else {
-                        xml = xml.replace(/>$/, '');
-                        xml += ' ' + key + '="' + subVal + '">';
+                        self.addAttr(key, subVal);
                     }
                 }
             })
@@ -49,18 +53,43 @@ module.exports = function toXml(json, xml) {
                 var elem = elems[j];
 
                 if (typeof(elem) == 'object') {
-                    xml += '<' + key + '>';
-                    xml = toXml(elem, xml);
-                    xml += '</' + key + '>';
+                    self.openTag(key);
+                    self.parse(elem);
+                    self.closeTag(key);
                 }
             }
         } else if (typeof(obj[key]) == 'object') {
-            xml += '<' + key + '>';
-            xml = toXml(obj[key], xml);
-            xml += '</' + key + '>';
+            self.openTag(key);
+            self.parse(obj[key]);
+            self.closeTag(key);
         }
     }
 
-    return xml;
 };
 
+ToXml.prototype.openTag = function(key) {
+    this.completeTag();
+    this.xml += '<' + key;
+    this.tagIncomplete = true;
+}
+ToXml.prototype.addAttr = function(key, val) {
+    this.xml += ' ' + key + '="' + val + '"';
+}
+ToXml.prototype.addTextContent = function(text) {
+    this.completeTag();
+    this.xml += text;
+}
+ToXml.prototype.closeTag = function(key) {
+    this.completeTag();
+    this.xml += '</' + key + '>';
+}
+ToXml.prototype.completeTag = function() {
+    if (this.tagIncomplete) {
+        this.xml += '>';
+        this.tagIncomplete = false;
+    }
+}
+function ToXml() {
+    this.xml = '';
+    this.tagIncomplete = false;
+}