initial changes for xml parser replacement

Author: marcelduran

lib/helper.js

@@ -4,10 +4,12 @@
  * Released under the MIT License
  */
 
-var jsonml = require('jsonml'),
+var xml2js = require('xml2js'),
     url    = require('url'),
     os     = require('os');
 
+var parser = new xml2js.Parser({explicitArray: false});
+
 var reNumber = /^[\.\+\-]?[\d\.]+$/,
     reInvalidDec = /(?:\.\d*){2,}/,
     reDec = /\./,
@@ -27,48 +29,33 @@ function parseNumber(s) {
   return reDec.test(s) ? parseFloat(s, 10) : parseInt(s, 10);
 }
 
-function xmlToObj(xml) {
-  var obj = {},
-
-      rec = function xmlToObjRecursion(a, o) {
-        var val, newObj, i,
-            len = a.length;
-
-        if (len === 2 && !o[a[0]]) {
-          if (typeof a[1] !== 'object') {
-            o[a[0]] = parseNumber(a[1]);
-          } else {
-            o[a[0]] = {};
-            rec(a[1], o[a[0]]);
-          }
-        } else if (len >= 2) {
-          if (o[a[0]]) {
-            if (!(o[a[0]] instanceof Array)) {
-              val = o[a[0]];
-              o[a[0]] = [val];
-            }
-            if (len === 2) {
-              return rec([o[a[0]].length, a[1]], o[a[0]]);
-            } else {
-              newObj = {};
-              o[a[0]].push(newObj);
-            }
-          } else {
-            o[a[0]] = {};
-          }
-          for (i = 1, len = a.length; i < len; i += 1) {
-            rec(a[i], newObj || o[a[0]]);
-          }
-        } else if (len === undefined && typeof a === 'object') {
-          Object.keys(a).forEach(function(key) {
-            o[key] = a[key];
-          });
+function normalizeObj(root) {
+  if (typeof root === 'object') {
+    Object.keys(root).forEach(function(key) {
+      var value = root[key];
+      if (typeof value === 'string') {
+        if (value.length === 0 || value === '\n') {
+          delete root[key];
+        } else {
+          root[key] = parseNumber(value);
         }
-      };
+      } else {
+        normalizeObj(value);
+      }
+    });
+  }
+}
 
-  rec(jsonml.parse(xml), obj);
+function xmlToObj(xml, callback) {
 
-  return obj;
+  parser.parseString(xml, function (err, obj) {
+    if (err) {
+      callback(err);
+    }
+
+    normalizeObj(obj);
+    callback(undefined, obj);
+  });
 }
 
 function svToObj(delimiter, headers, sv) {

lib/webpagetest.js

@@ -156,7 +156,12 @@ function api(pathname, callback, query, options) {
             } else if (info.type === 'application/json') {
               data = JSON.parse(data);
             } else if (info.type === 'text/xml') {
-              data = helper.xmlToObj(data);
+              helper.xmlToObj(data, function(err, obj) {
+                if (typeof callback === 'function') {
+                  callback.apply(this, [err, obj].concat(options.args));
+                }
+                return;
+              });
             } else if (info.type === 'text/html') {
               data = {result: (reHTMLOutput.exec(data) || [])[1]};
             }

package.json

@@ -33,9 +33,9 @@
     "node": ">=0.8.1"
   },
   "dependencies": {
-    "jsonml": "~0.0.4",
     "commander": "~1.3.2",
-    "mocha": "~1.12.0"
+    "mocha": "~1.12.0",
+    "xml2js": "~0.2.8"
   },
   "devDependencies": {
     "nock": "~0.19.0"