(new) 'extension' option

cloudhead · Jan 22, 2011 · 0490137 · 0490137
1 parent abe12d0
commit 0490137
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/lib/journey.js b/lib/journey.js
@@ -73,6 +73,10 @@ journey.Router = function Router(routes, options) {
     this.routes = [];
     this.options = options || {};
 
+    if (this.options.extension) {
+        this.options.extension = this.options.extension.replace('.', '\\.');
+    }
+
     // Call map() in the context of `this.map`, so `this`
     // can be used instead of the passed argument.
     routes.call(map, map);
@@ -95,7 +99,8 @@ journey.map = function (context) {
                 pattern     = this.paths.length ? '' : /.*/,
                 ignoreCase  = false,
                 method      = journey.Router.methods,
-                constraints = {};
+                constraints = {},
+                extension   = context.options.extension ? '(?:' + context.options.extension + ')?' : '';
 
             args.forEach(function (arg) {
                 if (journey.Router.methods.indexOf(arg) !== -1 || Array.isArray(arg)) {
@@ -122,7 +127,8 @@ journey.map = function (context) {
                                       .join('/')
                                       .match(/^\^?(.*?)\$?$/)[1]          // Strip ^ and $
                                       .replace(/^(\/|\\\/)(?!$)/, '')     // Strip root / if pattern != '/'
-                                      .replace(/(\/|\\\/)+/g, '/') + '$'; // Squeeze slashes
+                                      .replace(/(\/|\\\/)+/g, '/') +      // Squeeze slashes
+                                      extension + '$';
 
             pattern = new(RegExp)(pattern, ignoreCase ? 'i' : '');