Changeset 6481

Timestamp:

03/27/07 20:55:56 (2 years ago)

Author:

madrobby

Message:

Make Hash.toQueryString serialize undefined values. Ensure consistency with String.prototype.toQueryParams. Closes #7806. [Mislav Marohnic]

Files:

• spinoffs/prototype/trunk/CHANGELOG (modified) (1 diff)
• spinoffs/prototype/trunk/src/hash.js (modified) (1 diff)
• spinoffs/prototype/trunk/src/string.js (modified) (1 diff)
• spinoffs/prototype/trunk/test/lib/unittest.js (modified) (4 diffs)
• spinoffs/prototype/trunk/test/unit/hash.html (modified) (5 diffs)
• spinoffs/prototype/trunk/test/unit/string.html (modified) (1 diff)
• spinoffs/prototype/trunk/test/unit/unit_tests.html (added)

spinoffs/prototype/trunk/CHANGELOG

@@ -1 +1 @@
-*SVN*
-
+* Make Hash.toQueryString serialize undefined values. Ensure consistency with String.prototype.toQueryParams.  Closes #7806.  [Mislav Marohnić]
+  Examples:
+    $H({a:'b',c:undefined}).toQueryString()      -> 'a=b&c'
+    $H({a:'b',c:null}).toQueryString()           -> 'a=b&c='
+    $H('a=b&c'.toQueryParams()).toQueryString()  -> 'a=b&c'
+    $H('a=b&c='.toQueryParams()).toQueryString() -> 'a=b&c='
+    
-* Fix issues with Selector an+b logic, :not support, attribute selector double quotes, plus performance improvements.  Closes #7873, #7901.  [Andrew Dupont]
-

spinoffs/prototype/trunk/src/hash.js

@@ -36 +36 @@
-
-Hash.toQueryString.addPair = function(key, value, prefix) {
-  if (value == null) return;
-  key = encodeURIComponent(key);
-
+
+
-}
-

spinoffs/prototype/trunk/src/string.js

@@ -96 +96 @@
-    return match[1].split(separator || '&').inject({}, function(hash, pair) {
-      if ((pair = pair.split('='))[0]) {
-name = decodeURIComponent(pair[0]
-[1] ? decodeURIComponent(pair[1]) : undefined
-
-if (hash[name] !== undefined) {
-  if (hash[name].constructor != Array)
-  hash[name] = [hash[name
-if (value) hash[name
+key = decodeURIComponent(pair.shift()
+.length > 1 ? pair.join('=') : pair[0]
+
+
+if (key in hash) {
+if (hash[key].constructor != Array) hash[key] = [hash[key
+hash[key
-        }
-name
+key
-      }
-      return hash;

spinoffs/prototype/trunk/test/lib/unittest.js

@@ -304 +304 @@
-    catch(e) { this.error(e); }
-  },
+  assertNotEqual: function(expected, actual) {
+    var message = arguments[2] || "assertNotEqual";
+    try { (expected != actual) ? this.pass() : 
+      this.fail(message + ': got "' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
+  },
-  assertEnumEqual: function(expected, actual) {
-    var message = arguments[2] || "assertEnumEqual";
@@ -314 +320 @@
-    catch(e) { this.error(e); }
-  },
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    catch(e) { this.error(e); }
-  },
@@ -373 +413 @@
-    var message = arguments[2] || 'assertMatch';
-    var regex = new RegExp(expected);
-(regex.exec(actual)
+regex.exec(actual
-      this.fail(message + ' : regex: "' +  Test.Unit.inspect(expected) + ' did not match: ' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertNoMatch: function(expected, actual) {
+    var message = arguments[2] || 'assertMatch';
+    var regex = new RegExp(expected);
+    try { !regex.exec(actual) ? this.pass() :
+      this.fail(message + ' : regex: "' +  Test.Unit.inspect(expected) + ' matched: ' + Test.Unit.inspect(actual) + '"'); }
-    catch(e) { this.error(e); }
-  },
@@ -380 +427 @@
-    var message = arguments[1] || 'assertHidden';
-    this.assertEqual("none", element.style.display, message);
-  },
-  assertNotNull: function(object) {
-    var message = arguments[1] || 'assertNotNull';
-    this.assert(object != null, message);
-  },
-  assertInstanceOf: function(expected, actual) {

spinoffs/prototype/trunk/test/unit/hash.html

@@ -39 +39 @@
-
-    functions: {
-alpha: 'foo'
-beta:  function(n) { return n+1;
+quad: function(n) { return n*n }
+plus: function(n) { return n+n
-    },
-    
@@ -66 +66 @@
-    
-    testConstruct: function(){ with(this) {
-
-
-
+;
+;
+;
-
-
-
-Equal(h.inspect(), h2.inspect())
+;
+;
+HashEqual(h, h2);
-    }},
-    
@@ -78 +78 @@
-      assertEnumEqual([],               $H({}).keys());
-      assertEnumEqual(['a'],            $H(Fixtures.one).keys());
-
-alpha beta'), $H(Fixtures.functions).keys
+.sort()
+plus quad'),  $H(Fixtures.functions).keys().sort
-    }},
-    
@@ -85 +85 @@
-      assertEnumEqual([],             $H({}).values());
-      assertEnumEqual(['A#'],         $H(Fixtures.one).values());
-
-
-
+
+
+
+
+
-    }},  
-      
-    testMerge: function(){ with(this) {
-
-
-
-
+
+
+
+
+
-    }},
-
@@ -100 +103 @@
-      var hash = $H(Fixtures.many);
-      var values = hash.remove('b', 'c');
-EnumEqual($w('a d'), hash.keys()
+HashEqual({a:'A', d:'D#'}, hash
-      assertEnumEqual($w('B C'), values);
-    }},
-    
-    testToQueryString: function(){ with(this) {
-
-
-
-
-
-
+
+
+
+
+
+
+
-      assertEqual("color=r&color=g&color=b", $H(Fixtures.multiple).toQueryString());
-g
-",                 
-     
+&color=g&color
+color=&color",
+
-      assertEqual("stuff%5B%5D=%24&stuff%5B%5D=a&stuff%5B%5D=%3B", $H(Fixtures.multiple_special).toQueryString());
-
-assertEnumEqual($w("_each=E map=M keys=K values=V collect=C inject=I").sort(),
-  Hash.toQueryString(Fixtures.dangerous).split('&').sort()
-$w('_each=E map=M keys=K values=V collect=C inject=I').sort(),
- 
+
+
+var danger = $w("_each=E collect=C inject=I keys=K map=M values=V"
+danger, Hash.toQueryString(Fixtures.dangerous).split('&').sort());
+assertEnumEqual(danger,
-    }},
-    

spinoffs/prototype/trunk/test/unit/string.html

@@ -290 +290 @@
-    
-    testToQueryParams: function() {with(this) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }},
-