Merge pull request #337 from broeks/master

modify url matcher to accomodate snake case GET request parameters

Author: nateabele

src/urlMatcherFactory.js

@@ -62,7 +62,7 @@ function UrlMatcher(pattern) {
       params = this.params = [];
 
   function addParameter(id) {
-    if (!/^\w+$/.test(id)) throw new Error("Invalid parameter name '" + id + "' in pattern '" + pattern + "'");
+    if (!/^\w+(-+\w+)*$/.test(id)) throw new Error("Invalid parameter name '" + id + "' in pattern '" + pattern + "'");
     if (names[id]) throw new Error("Duplicate parameter name '" + id + "' in pattern '" + pattern + "'");
     names[id] = true;
     params.push(id);

test/urlMatcherFactorySpec.js

@@ -20,6 +20,26 @@ describe("UrlMatcher", function () {
     expect(params).toContain('to');
   });
 
+  it("handles proper snake case parameter names", function(){
+    var matcher = new UrlMatcher('/users/?from&to&snake-case&snake-case-triple');
+    var params = matcher.parameters();
+    expect(params.length).toBe(4);
+    expect(params).toContain('from');
+    expect(params).toContain('to');
+    expect(params).toContain('snake-case');
+    expect(params).toContain('snake-case-triple');
+  });
+
+    it("handles invalid snake case parameter names", function(){
+        expect(function() { new UrlMatcher('/users/?from&to&-snake'); }).toThrow(
+            "Invalid parameter name '-snake' in pattern '/users/?from&to&-snake'"
+        );
+
+        expect(function() { new UrlMatcher('/users/?from&to&snake-'); }).toThrow(
+            "Invalid parameter name 'snake-' in pattern '/users/?from&to&snake-'"
+        );
+    });
+
   it(".exec() captures parameter values", function () {
     expect(
       new UrlMatcher('/users/:id/details/{type}/{repeat:[0-9]+}?from&to')