Fixed issue with trailing slashes

Author: dancannon

modules/components/Routes.js

@@ -32,7 +32,7 @@ function findMatches(path, routes, defaultRoute, notFoundRoute) {
 
     if (matches != null) {
       var rootParams = getRootMatch(matches).params;
-      
+
       params = route.props.paramNames.reduce(function (params, paramName) {
         params[paramName] = rootParams[paramName];
         return params;

modules/utils/Path.js

@@ -16,6 +16,7 @@ function encodeURLPath(path) {
 
 var paramCompileMatcher = /:([a-zA-Z_$][a-zA-Z0-9_$]*)|[*.()\[\]\\+|{}^$]/g;
 var paramInjectMatcher = /:([a-zA-Z_$?][a-zA-Z0-9_$?]*)|[*]/g;
+var paramInjectTrailingSlashMatcher = /\/\/\?|\/\?/g;
 var queryMatcher = /\?(.+)/;
 
 var _compiledPatterns = {};
@@ -83,11 +84,10 @@ var Path = {
 
     var splatIndex = 0;
 
-    return pattern.replace(paramInjectMatcher, function (match, paramName) {
-    console.log(pattern, match, paramName);
+    var url = pattern.replace(paramInjectMatcher, function (match, paramName) {
       paramName = paramName || 'splat';
 
-      // If param is optional dont check for existance
+      // If param is optional don't check for existence
       if (paramName.slice(-1) !== '?') {
         invariant(
           params[paramName] != null,
@@ -114,6 +114,11 @@ var Path = {
 
       return encodeURLPath(segment);
     });
+    url = url.replace(paramInjectTrailingSlashMatcher, '/');
+
+    console.log(url);
+
+    return url;
   },
 
   /**

modules/utils/__tests__/Path-test.js

@@ -61,6 +61,20 @@ describe('Path.extractParams', function () {
         });
       });
     });
+    describe('and the pattern and forward slash are optional', function () {
+      var pattern = 'comments/:id?/edit'
+
+      describe('and the path matches with supplied param', function () {
+        it('returns an object with the params', function () {
+          expect(Path.extractParams(pattern, 'comments/123/edit')).toEqual({ id: '123' });
+        });
+      });
+      describe('and the path matches without supplied param', function () {
+        it('returns an object with param set to null', function () {
+          expect(Path.extractParams(pattern, 'comments/edit')).toEqual({id: null});
+        });
+      });
+    });
     describe('and the path does not match', function () {
       it('returns null', function () {
         expect(Path.extractParams(pattern, 'users/123')).toBe(null);
@@ -192,6 +206,18 @@ describe('Path.injectParams', function () {
       });
     });
 
+    describe('and a param and forward slash are optional', function () {
+      var pattern = 'comments/:id?/?edit';
+
+      it('returns the correct path when param is supplied', function () {
+        expect(Path.injectParams(pattern, {id:'123'})).toEqual('comments/123/edit');
+      });
+
+      it('returns the correct path when param is not supplied', function () {
+        expect(Path.injectParams(pattern, {})).toEqual('comments/edit');
+      });
+    });
+
     describe('and all params are present', function () {
       it('returns the correct path', function () {
         expect(Path.injectParams(pattern, { id: 'abc' })).toEqual('comments/abc/edit');