adding callback argument to .query() - closes #64

README.md

@@ -208,6 +208,8 @@ URI.js is published under the [MIT license](http://www.opensource.org/licenses/m
 ## Changelog ##
 
 * adding [`.setQuery()`](http://medialize.github.com/URI.js/docs.html#search-set) - ([Issue #64](https://github.com/medialize/URI.js/issues/64))
+* adding callback argument to [`.query()`](http://medialize.github.com/URI.js/docs.html#accessors-search)
+
 
 ### 1.8.3 (January 9th 2013) ###
 

docs.html

@@ -473,6 +473,18 @@ <h3 id="accessors-search">search(), query()</h3>
 uri.search({ foo: "bar", hello : ["world", "mars"] });
 // uri == "http://example.org/bar/world.html?foo=bar&amp;hello=world&amp;hello=mars"
 
+// overwrite data through callback
+uri.search(function(data) {
+    return { hello : "world" };
+});
+// uri == "http://example.org/bar/world.html?hello=world"
+
+// augment data through callback
+uri.search(function(data) {
+    data.foo = "bar";
+});
+// uri == "http://example.org/bar/world.html?hello=world&amp;foo=bar"
+
 // CAUTION: beware of arrays, the following are not quite the same
 // If you're dealing with PHP, you probably want the latter…
 uri.search("?foo=bar&amp;bar=baz");

src/URI.js

@@ -1234,6 +1234,12 @@ var q = p.query;
 p.query = function(v, build) {
     if (v === true) {
         return URI.parseQuery(this._parts.query);
+    } else if (typeof v === "function") {
+        var data = URI.parseQuery(this._parts.query);
+        var result = v.call(this, data);
+        this._parts.query = URI.buildQuery(result || data, this._parts.duplicateQueryParameters);
+        this.build(!build);
+        return this;
     } else if (v !== undefined && typeof v !== "string") {
         this._parts.query = URI.buildQuery(v, this._parts.duplicateQueryParameters);
         this.build(!build);

test/test.js

@@ -553,7 +553,21 @@ test("mutating object", function() {
     u.query(q);
     equal(u.query(), 'something=new&something=and&something=funky', "removing array");
 });
-test("addQuery", function() {
+test("query callback", function() {
+    var u = URI('?foo=bar');
+    u.query(function(data) {
+        data.foo = "bam";
+    });
+    equal(u.query(), 'foo=bam', "augment argument");
+
+    u.query(function(data) {
+        return {
+            bla: 'blubb'
+        }
+    });
+    equal(u.query(), 'bla=blubb', "overwrite returned value");
+});
+test("setQuery", function() {
     var u = URI('?foo=bar');
     u.setQuery('foo', 'bam');
     equal(u.query(), 'foo=bam', "set name, value");