minor style adjustments and adds an options parameters

Author: c4milo

lib/index.js

@@ -4,78 +4,88 @@ var parser = new expat.Parser('UTF-8');
 
 // This object will hold the final result.
 var obj = {};
-var currentParent = obj;
+var currentObject = obj;
 var ancestors = [];
 
+var options = {}; //configuration options
 function startElement(name, attrs) {
-  if (! (name in currentParent)) {
-    currentParent[name] = attrs;
-  } else if (!(currentParent[name] instanceof Array)) {
-    // Put the existing object in an array.
-    var newArray = [currentParent[name]];
-    // Add the new object to the array.
-    newArray.push(attrs);
-    // Point to the new array.
-    currentParent[name] = newArray;
-  } else {
-    // An array already exists, push the attributes on to it.
-    currentParent[name].push(attrs);
-  }
+    if (! (name in currentObject)) {
+        currentObject[name] = attrs;
+    } else if (! (currentObject[name] instanceof Array)) {
+        // Put the existing object in an array.
+        var newArray = [currentObject[name]];
+        // Add the new object to the array.
+        newArray.push(attrs);
+        // Point to the new array.
+        currentObject[name] = newArray;
+    } else {
+        // An array already exists, push the attributes on to it.
+        currentObject[name].push(attrs);
+    }
 
-  // Store the current (old) parent.
-  ancestors.push(currentParent);
+    // Store the current (old) parent.
+    ancestors.push(currentObject);
 
-  // We are now working with this object, so it becomes the current parent.
-  if (currentParent[name] instanceof Array) {
-    // If it is an array, get the last element of the array.
-    currentParent = currentParent[name][currentParent[name].length - 1];
-  } else {
-    // Otherwise, use the object itself.
-    currentParent = currentParent[name];
-  }
+    // We are now working with this object, so it becomes the current parent.
+    if (currentObject[name] instanceof Array) {
+        // If it is an array, get the last element of the array.
+        currentObject = currentObject[name][currentObject[name].length - 1];
+    } else {
+        // Otherwise, use the object itself.
+        currentObject = currentObject[name];
+    }
 }
 
-function charData(data) {
+function text(data) {
     data = data.trim();
     if (!data.length) {
         return;
     }
-    currentParent['$t'] = data;
+    currentObject['$t'] = data;
 }
 
 function endElement(name) {
     // This should check to make sure that the name we're ending 
     // matches the name we started on.
-
     var ancestor = ancestors.pop();
-    if ((Object.keys(currentParent).length == 1) && ('$t' in currentParent)) {
-        if (ancestor[name] instanceof Array) {
-            //console.log("list-replacing $t in " + name);
-            ancestor[name].push(ancestor[name].pop()['$t']);
+    if (!options.reversible) {
+        if ((Object.keys(currentObject).length == 1) && ('$t' in currentObject)) {
+            if (ancestor[name] instanceof Array) {
+                //console.log("list-replacing $t in " + name);
+                ancestor[name].push(ancestor[name].pop()['$t']);
+            } else {
+                //console.log("replacing $t in " + name);
+                ancestor[name] = currentObject['$t'];
+            }
         } else {
-            //console.log("replacing $t in " + name);
-            ancestor[name] = currentParent['$t'];
+            //console.log("final " + name + ":");
+            //console.log(currentObject);
         }
-    } else {
-        //console.log("final " + name + ":");
-        //console.log(currentParent);
     }
 
-    currentParent = ancestor;
+    currentObject = ancestor;
 }
 
 parser.on('startElement', startElement);
-parser.on('text', charData);
+parser.on('text', text);
 parser.on('endElement', endElement);
 
-module.exports.toJson = function(xml, _object) {
-    _object = _object || false;
-    if(parser.parse(xml)) {
-        if(_object) {
+module.exports.toJson = function(xml, _options) {
+    options = null;
+    options = {
+        object: false,
+        reversible: false
+    }
+
+    for (var opt in _options) {
+        options[opt] = _options[opt];
+    }
+
+    if (parser.parse(xml)) {
+        if (options.object) {
             return obj;
         }
         return JSON.stringify(obj);
     }
 };
 
-