Merge pull request #3 from aaronhaines/master

Handle simple query string parameters

Author: mstade

src/rhumb.js

@@ -112,20 +112,35 @@ function create (){
   }
 
   router.match = function(path){
-      var parts = path.split("/").filter(falsy)
-        , match  = findIn(parts, tree)
-
-      if(match){
-        return match.fn.apply(match.fn, [match.params])
+    
+    var split = path.split("?").filter(falsy)
+      , parts = split[0].split("/").filter(falsy)
+      , params = parseQueryString(split[1])
+      , match = findIn(parts, tree)
+
+    if(match){
+      for (var prop in match.params) {
+        params[prop] = match.params[prop]
       }
-  }    
+      return match.fn.apply(match.fn, [params])
+    }
+  }   
   return router
 }
 
 function falsy(d){
   return !!d
 }
 
+function parseQueryString(s) {
+  if(!s) return {}
+  return s.split("&").filter(falsy).reduce(function(qs, kv) {
+    var pair = kv.split('=').filter(falsy)
+    qs[pair[0]] = pair[1]
+    return qs
+  }, {})
+}
+
 
 function parse(ptn){
   var variable  = /^{(\w+)}$/

test/test.rhumb.js

@@ -28,7 +28,53 @@ describe("routing", function(){
       expect(router.match("/sing/bird-song")).to.eql({
         sound : "bird-song"
       })
-    })  
+    })
+    it("should pass query string params to callback", function(){
+      var router = rhumb.create()
+
+      router.add("/sing", function(params){
+        return params
+      })
+      expect(router.match("/sing?foo=bar&baz=bam")).to.eql({
+        foo : "bar"
+      , baz : "bam"
+      })
+    }) 
+    it("should pass query string params and path params to callback", function(){
+      var router = rhumb.create()
+
+      router.add("/sing/{sound}", function(params){
+        return params
+      })
+      expect(router.match("/sing/bird-song?foo=bar&baz=bam")).to.eql({
+        sound : "bird-song"
+      , foo : "bar"
+      , baz : "bam"
+      })
+    })
+    it("should add query string params without values as undefined", function(){
+      var router = rhumb.create()
+
+      router.add("/sing/{sound}", function(params){
+        return params
+      })
+      expect(router.match("/sing/bird-song?foo=&bar&baz=bop")).to.eql({
+        sound : "bird-song"
+      , foo : undefined
+      , bar : undefined
+      , baz : "bop"
+      })
+    })
+    it("should handle incomplete query strings", function(){
+      var router = rhumb.create()
+
+      router.add("/sing", function(params){
+        return params
+      })
+      expect(router.match("/sing?foo=&")).to.eql({
+        foo : undefined
+      })
+    })
   })
   describe("matching with variable paths", function(){
     it("should match /{foo} with path /bar", function(){