Merge branch 'master' of git://github.com/jazzychad/querystring.node.js

Conflicts:
	querystring-parse.js
	querystring-stringify.js
	util.js

Author: isaacs

querystring-parse.js

@@ -42,6 +42,7 @@ exports.parse = querystring_parse;
  * @for querystring
  * @static
  */
+<<<<<<< HEAD
 function querystring_parse (qs, sep, eq, unesc) {
   return qs.split(sep || "&")
     .map(pieceParser(eq || "=", unesc || unescape))
@@ -50,6 +51,22 @@ function querystring_parse (qs, sep, eq, unesc) {
 
 function unescape (s) {
     return decodeURIComponent(s.replace(/\+/g, ' '));
+=======
+var parse = function (qs, sep, eq) {
+  // wouldn't Array(qs.split()).map(pieceParser(eq)).reduce(mergeParams) be prettier?
+  return util.reduce(
+		     util.map(
+			      qs.split(sep || "&"),
+			      pieceParser(eq || "=")
+			      ),
+{},
+		     mergeParams
+		     );
+};
+
+var unescape = function (s) {
+  return decodeURIComponent(s.replace(/\+/g, ' '));
+>>>>>>> dfaf3130e7ad0c25f7464dc46bb862c9f0bfb9ee
 };
 
 
@@ -62,24 +79,40 @@ function unescape (s) {
 // return parse(foo[bar], [{bla:"baz"}])
 // return parse(foo, {bar:[{bla:"baz"}]})
 // return {foo:{bar:[{bla:"baz"}]}}
+<<<<<<< HEAD
 function pieceParser (eq, unesc) {
   return function parsePiece (key, val) {
 
+=======
+var pieceParser = function (eq) {
+  return function parsePiece (key, val) {
+>>>>>>> dfaf3130e7ad0c25f7464dc46bb862c9f0bfb9ee
     if (arguments.length !== 2) {
       // key=val, called from the map/reduce
       key = key.split(eq);
       return parsePiece(
+<<<<<<< HEAD
         unesc(key.shift()),
         unesc(key.join(eq))
       );
+=======
+			unescape(key.shift()),
+			unescape(key.join(eq))
+			);
+>>>>>>> dfaf3130e7ad0c25f7464dc46bb862c9f0bfb9ee
     }
     key = key.replace(/^\s+|\s+$/g, '');
     if (util.isString(val)) {
       val = val.replace(/^\s+|\s+$/g, '');
       // convert numerals to numbers
       if (!isNaN(val)) {
+<<<<<<< HEAD
         var numVal = +val;
         if (val === numVal.toString(10)) val = numVal;
+=======
+	var numVal = +val;
+	if (val === numVal.toString(10)) val = numVal;
+>>>>>>> dfaf3130e7ad0c25f7464dc46bb862c9f0bfb9ee
       }
     }
     var sliced = /(.*)\[([^\]]*)\]$/.exec(key);
@@ -89,8 +122,12 @@ function pieceParser (eq, unesc) {
       return ret;
     }
     // ["foo[][bar][][baz]", "foo[][bar][]", "baz"]
+<<<<<<< HEAD
     var tail = sliced[2],
       head = sliced[1];
+=======
+    var tail = sliced[2], head = sliced[1];
+>>>>>>> dfaf3130e7ad0c25f7464dc46bb862c9f0bfb9ee
 
     // array: key[]=val
     if (!tail) return parsePiece(head, [val]);
@@ -104,6 +141,7 @@ function pieceParser (eq, unesc) {
 
 // the reducer function that merges each query piece together into one set of params
 function mergeParams (params, addition) {
+<<<<<<< HEAD
 	var ret;
 
 	if (!params){
@@ -120,14 +158,39 @@ function mergeParams (params, addition) {
 		ret = mergeObjects(params, addition);
 	}
 	return ret;
+=======
+  var ret;
+            
+  if (!params){
+    // if it's uncontested, then just return the addition.
+    ret = addition;
+  } else if (util.isArray(params)) {
+    // if the existing value is an array, then concat it.
+    ret = params.concat(addition);
+  } else if (!util.isObject(params) || !util.isObject(addition)) {
+    // if the existing value is not an array, and either are not objects, arrayify it.      
+    ret = [params].concat(addition);
+  } else {
+    // else merge them as objects, which is a little more complex
+    ret = mergeObjects(params, addition);
+  }
+  return ret;
+>>>>>>> dfaf3130e7ad0c25f7464dc46bb862c9f0bfb9ee
 };
 
 
 // Merge two *objects* together. If this is called, we've already ruled
 // out the simple cases, and need to do the for-in business.
 function mergeObjects (params, addition) {
+<<<<<<< HEAD
   for (var i in addition) if (i && addition.hasOwnProperty(i)) {
     params[i] = mergeParams(params[i], addition[i]);
+=======
+  for (var i in addition) {
+    if (i && addition.hasOwnProperty(i)) {
+      params[i] = mergeParams(params[i], addition[i]);
+    }
+>>>>>>> dfaf3130e7ad0c25f7464dc46bb862c9f0bfb9ee
   }
   return params;
 };

querystring-stringify.js

@@ -42,7 +42,6 @@ function querystring_stringify (obj, sep, eq, name, escape) {
   if (util.isNumber(obj) || util.isString(obj)) {
     return escape(name) + eq + escape(obj);
   }  
-  
   if (util.isArray(obj)) {
     var s = [];
     name = name+'[]';

test.js

@@ -28,6 +28,14 @@ sys.puts("qs:  " + qs.stringify(foo));
 
 sys.puts('------------------');
 
+/* test 2 */
+foo = qs.parse("foo=bar&foo=");
+
+sys.puts("obj: " + JSON.stringify(foo));
+sys.puts("qs:  " + qs.stringify(foo));
+
+sys.puts('------------------');
+
 /* test 3 */
 foo = qs.parse("foo[1]=1&foo[2]=2&foo[3]=4");
 

util.js

@@ -18,36 +18,34 @@ exports.isArray = isArray;
 exports.isObject = isObject;
 
 
-var toString = Object.prototype.toString;
-
 function is (type, obj) {
-    return toString.call(obj) === '[object '+type+']';
+  return Object.prototype.toString.call(obj) === '[object '+type+']';
 }
 
 function isArray (obj) {
-    return is("Array", obj);
+  return is("Array", obj);
 }
 
 function isObject (obj) {
-    return is("Object", obj);
+  return is("Object", obj);
 }
 
 function isString (obj) {
-    return is("String", obj);
+  return is("String", obj);
 }
 
 function isNumber (obj) {
-    return is("Number", obj);
+  return is("Number", obj);
 }
 
 function isBoolean (obj) {
-    return is("Boolean", obj);
+  return is("Boolean", obj);
 }
 
 function isNull (obj) {
-    return typeof obj === "object" && !obj;
+  return typeof obj === "object" && !obj;
 }
 
 function isUndefined (obj) {
-    return typeof obj === "undefined";
+  return typeof obj === "undefined";
 }