Added + support to pathtoRegexp()

fisch42 · Jun 6, 2012 · f874eea · f874eea
1 parent 6975e18
commit f874eea
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/page.js b/lib/page.js
@@ -278,10 +278,11 @@
 
   function pathtoRegexp(path, keys, sensitive, strict) {
     if (path instanceof RegExp) return path;
-    if (path instanceof Array)  path = '(' + path.join('|') + ')';
+    if (path instanceof Array) path = '(' + path.join('|') + ')';
     path = path
       .concat(strict ? '' : '/?')
       .replace(/\/\(/g, '(?:/')
+      .replace(/\+/g, '__plus__')
       .replace(/(\/)?(\.)?:(\w+)(?:(\(.*?\)))?(\?)?/g, function(_, slash, format, key, capture, optional){
         keys.push({ name: key, optional: !! optional });
         slash = slash || '';
@@ -293,6 +294,7 @@
           + (optional || '');
       })
       .replace(/([\/.])/g, '\\$1')
+      .replace(/__plus__/g, '(.+)')
       .replace(/\*/g, '(.*)');
     return new RegExp('^' + path + '$', sensitive ? '' : 'i');
   };