Add path regex support.

Author: STRML

lib/matchRoutes.js

@@ -36,6 +36,10 @@ function matchRoutes(routes, path) {
         if (match) {
           page = current;
         }
+        // Regex matches are not named, so they go in the `_` array, much like splats.
+        if (Array.isArray(match)) {
+          match = {_: match};
+        }
       }
     }
     if (!notFound && current.path === null) {

tests/browser.js

@@ -1,3 +1,4 @@
+'use strict';
 var assert          = require('assert');
 var ReactAsync      = require('react-async');
 var React           = require('react');

tests/matchRoutes.js

@@ -1,3 +1,4 @@
+'use strict';
 var assert          = require('assert');
 var matchRoutes     = require('../lib/matchRoutes');
 
@@ -11,6 +12,7 @@ describe('matchRoutes', function() {
     {path: '(/)', handler: handler({name: 'root'})},
     {path: '/cat/:id', handler: handler({name: 'cat'})},
     {path: '/mod/*', handler: handler({name: 'mod'})},
+    {path: /\/regex\/([a-zA-Z]*)$/, handler: handler({name: 'regex'})},
     {path: null, handler: handler({name: 'notfound'})}
   ];
 
@@ -54,6 +56,26 @@ describe('matchRoutes', function() {
     assert.strictEqual(match.unmatchedPath, 'wow/here');
   });
 
+  it('matches /regex/text', function() {
+    var match = matchRoutes(routes, '/regex/text');
+    assert(match.route);
+    assert.strictEqual(match.route.handler.name, 'regex');
+    assert.deepEqual(match.match, {_: ['text']});
+    assert.strictEqual(match.path, '/regex/text');
+    assert.strictEqual(match.matchedPath, '/regex/');
+    assert.strictEqual(match.unmatchedPath, 'text');
+  });
+
+  it('does not match /regex/1text', function() {
+    var match = matchRoutes(routes, '/regex/1text');
+    assert(match.route);
+    assert.strictEqual(match.route.handler.name, 'notfound');
+    assert.deepEqual(match.match, null);
+    assert.strictEqual(match.path, '/regex/1text');
+    assert.strictEqual(match.matchedPath, '/regex/1text');
+    assert.strictEqual(match.unmatchedPath, null);
+  });
+
   it('handles not found', function() {
     var match = matchRoutes(routes, '/hm');
     assert(match.route);

tests/server.js

@@ -1,3 +1,4 @@
+'use strict';
 var assert = require('assert');
 var React  = require('react');
 var Router = require('../index');
@@ -16,6 +17,10 @@ describe('react-router-component (on server)', function() {
           path: '/x/:slug',
           handler: function(props) { return React.DOM.div(null, props.slug); }
         }),
+        Router.Location({
+          path: /\/y(.*)/,
+          handler: function(props) { return React.DOM.div(null, props._[0]);}
+        }),
         Router.NotFound({
           handler: function(props) { return React.DOM.div(null, 'not_found'); }
         })
@@ -35,6 +40,12 @@ describe('react-router-component (on server)', function() {
     assert(markup.match(/hello/));
   });
 
+  it('renders with regex', function() {
+    var markup = React.renderComponentToString(App({path: '/y/ohhai'}));
+    assert(markup.match(/class="App"/));
+    assert(markup.match(/ohhai/));
+  })
+
   it('renders to empty on notfound', function() {
     var markup = React.renderComponentToString(App({path: '/notfound'}));
     assert(markup.match(/class="App"/));