Add support for parse custom separators (resolves #3).

ruiquelhas · Sep 19, 2014 · 339b541 · 339b541
1 parent 5fd33d6
commit 339b541
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 23 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -9,6 +9,16 @@ exports = module.exports = {};
 
 var internals = {};
 
+internals.customize = function (del, sep) {
+  del = del && !string(del).isAlphaNumeric() &&
+    del !== sep ? del : '.';
+
+  sep = sep && !string(sep).isAlphaNumeric() &&
+    sep !== del ? sep : '&';
+
+  return { del: del, sep: sep };
+};
+
 internals.isArray = function (obj) {
   for (var key in obj) {
     if (string(key).isNumeric()) {
@@ -59,32 +69,26 @@ internals.parse = function (obj) {
   }(0));
 };
 
-exports.parse = function (nvp, del) {
-  del = del && !string(del).isAlphaNumeric() ? del : '.';
+exports.parse = function (nvp, del, sep) {
+  var custom = internals.customize(del, sep);
+  var transformable = qs.parse(nvp, custom.sep);
 
-  var transformable = qs.parse(nvp);
-
-  var parser = new Parser(del);
+  var parser = new Parser(custom.del);
   parser.object(transformable);
 
   return internals.parse(transformable);
 };
 
 exports.stringify = function (input, del, sep) {
   var output = {};
-
-  del = del && !string(del).isAlphaNumeric() &&
-    del !== sep ? del : '.';
-
-  sep = sep && !string(sep).isAlphaNumeric() &&
-    sep !== del ? sep : '&';
+  var custom = internals.customize(del, sep);
 
   function _stringify(obj, current) {
     var value, dotNotationKey;
 
     for (var key in obj) {
       value = obj[key];
-      dotNotationKey = (current ? [current, key].join(del) : key);
+      dotNotationKey = (current ? [current, key].join(custom.del) : key);
 
       if (_.isObject(value)) {
         _stringify(value, dotNotationKey);
@@ -96,5 +100,5 @@ exports.stringify = function (input, del, sep) {
     return output;
   }
 
-  return qs.stringify(_stringify(input), sep);
+  return qs.stringify(_stringify(input), custom.sep);
 };
diff --git a/test/index.js b/test/index.js
@@ -27,16 +27,6 @@ lab.experiment('NVP encoded querystring utility belt', function () {
 
       done();
     });
-
-    lab.test('returns matching object using a custom delimiter', function (done) {
-      var input = qs.stringify(nvp_stub).replace(/\./g, '-');
-      var output = nvpqs.parse(input, '-');
-
-      Lab.expect(output).to.be.a('object');
-      Lab.expect(output).to.deep.equal(object_stub);
-
-      done();
-    });
   });
 
   lab.experiment('stringifies a JavaScript object to a proper querystring and', function () {
@@ -55,7 +45,9 @@ lab.experiment('NVP encoded querystring utility belt', function () {
 
       done();
     });
+  });
 
+  lab.experiment('allows custom notitation delimiter and separator characters', function() {
     lab.test('returns a matching querystring using a custom delimiter character', function (done) {
       var output = nvpqs.stringify(object_stub, '-');