[fixed] Use %20 instead of + in URL pathnames

Fixes #2407
remix-run · Oct 30, 2015 · fbc109c · mjackson · Oct 30, 2015 · fbc109c
1 parent e2a979e
commit fbc109c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/modules/PatternUtils.js b/modules/PatternUtils.js
@@ -72,6 +72,8 @@ export function compilePattern(pattern) {
  * - *              Consumes (non-greedy) all characters up to the next
  *                  character in the pattern, or to the end of the URL if
  *                  there is none
+ * - **             Consumes (greedy) all characters up to the next character
+ *                  in the pattern, or to the end of the URL if there is none
  *
  * The return value is an object with the following properties:
  *
@@ -94,7 +96,7 @@ export function matchPattern(pattern, pathname) {
   let remainingPathname, paramValues
   if (match != null) {
     paramValues = Array.prototype.slice.call(match, 1).map(function (v) {
-      return v != null ? decodeURIComponent(v.replace(/\+/g, '%20')) : v
+      return v != null ? decodeURIComponent(v) : v
     })
 
     if (captureRemaining) {
@@ -154,7 +156,7 @@ export function formatPattern(pattern, params) {
       )
 
       if (paramValue != null)
-        pathname += encodeURI(paramValue).replace(/%20/g, '+')
+        pathname += encodeURI(paramValue)
     } else if (token === '(') {
       parenCount += 1
     } else if (token === ')') {
@@ -170,7 +172,7 @@ export function formatPattern(pattern, params) {
       )
 
       if (paramValue != null)
-        pathname += encodeURIComponent(paramValue).replace(/%20/g, '+')
+        pathname += encodeURIComponent(paramValue)
     } else {
       pathname += token
     }

diff --git a/modules/__tests__/formatPattern-test.js b/modules/__tests__/formatPattern-test.js
@@ -57,7 +57,7 @@ describe('formatPattern', function () {
 
     describe('and some params have special URL encoding', function () {
       it('returns the correct path', function () {
-        expect(formatPattern(pattern, { id: 'one, two' })).toEqual('/comments/one%2C+two/edit')
+        expect(formatPattern(pattern, { id: 'one, two' })).toEqual('/comments/one%2C%20two/edit')
       })
     })
 

diff --git a/modules/__tests__/PatternUtils-test.js → modules/__tests__/matchPattern-test.js b/modules/__tests__/PatternUtils-test.js → modules/__tests__/matchPattern-test.js
@@ -20,6 +20,11 @@ describe('matchPattern', function () {
     assertMatch('/:id.:ext', '/path.jpg', '', [ 'id', 'ext' ], [ 'path', 'jpg' ])
   })
 
+  it('works with named params that contain spaces', function () {
+    assertMatch('/:id', '/path+more', '', [ 'id' ], [ 'path+more' ])
+    assertMatch('/:id', '/path%20more', '', [ 'id' ], [ 'path more' ])
+  })
+
   it('works with splat params', function () {
     assertMatch('/files/*.*', '/files/path.jpg', '', [ 'splat', 'splat' ], [ 'path', 'jpg' ])
   })