Merge pull request #57 from STRML/master

Upgrade url-pattern and support optional patterns.

Author: andreypopp

lib/matchRoutes.js

@@ -28,7 +28,7 @@ function matchRoutes(routes, path) {
     }
 
     if (current.path) {
-      current.pattern = current.pattern || pattern(current.path);
+      current.pattern = current.pattern || pattern.newPattern(current.path);
       if (!page) {
         match = current.pattern.match(path);
         if (match) {

package.json

@@ -4,7 +4,7 @@
   "description": "Declarative router component for React",
   "main": "index.js",
   "dependencies": {
-    "url-pattern": "~0.4.0",
+    "url-pattern": "~0.6.0",
     "envify": "^1.2.1",
     "urllite": "~0.4.0"
   },

tests/matchRoutes.js

@@ -8,12 +8,22 @@ describe('matchRoutes', function() {
   }
 
   var routes = [
-    {path: '/', handler: handler({name: 'root'})},
+    {path: '(/)', handler: handler({name: 'root'})},
     {path: '/cat/:id', handler: handler({name: 'cat'})},
     {path: '/mod/*', handler: handler({name: 'mod'})},
     {path: null, handler: handler({name: 'notfound'})}
   ];
 
+  it('matches ""', function() {
+    var match = matchRoutes(routes, '');
+    assert(match.route);
+    assert.strictEqual(match.route.handler.name, 'root');
+    assert.deepEqual(match.match, {});
+    assert.strictEqual(match.path, '');
+    assert.strictEqual(match.matchedPath, '');
+    assert.strictEqual(match.unmatchedPath, null);
+  });
+
   it('matches /', function() {
     var match = matchRoutes(routes, '/');
     assert(match.route);