Merge branch 'pull'

lib/express/core.js

@@ -104,10 +104,16 @@ Router = Class({
    * @api private
    */
 
-  route: function(){
-    var route = this.matchingRoute()
-    if (route)
-      return route.fn.apply(this.request, this.request.captures.slice(1))
+  route: function() { 
+    var route = this.matchingRoute(), body
+    if (route) {
+      body = route.fn.apply(this.request, this.request.captures.slice(1));
+      if (this.request.passed) {
+        this.request.passed = false
+        return this.route()
+      }
+      return body;
+    }
     else if (this.request.accepts('html') && set('helpful 404'))
       this.request.halt(404, require('express/pages/not-found').render(this.request))
     else
@@ -121,10 +127,18 @@ Router = Class({
    * @api private
    */
 
-  matchingRoute: function(){
-    return Express.routes.find(function(route){
-      return this.match(route)
-    }, this)
+  matchingRoute: function() {
+    // Stop at the first match. If request.pass() was called
+    // continue from where we left off   
+    var i = -1
+    this.matchingRoute = function() {
+      var routes = Express.routes, route
+      while (route = routes[++i]) 
+        if (this.match(route))
+          break
+      return route
+    }
+    return this.matchingRoute()  
   },
 
   /**

lib/express/request.js

@@ -178,6 +178,17 @@ exports.Request = Class({
     });
   },
 
+  /**
+   * Pass control to the next matching route.
+   *
+   * @api public
+   */
+
+  pass: function () {
+    this.passed = true
+    return this
+  },
+
   /**
    * Set Content-Type header to the mime type
    * for the given _path_, which calls mime.type().

spec/spec.request.js

@@ -198,6 +198,20 @@ describe 'Express'
         })
         get('/public/app.js').body.should.eql 'public, app, js'
       end
+    end
+
+    describe '#pass()'
+      it 'should pass control to the next matching route'
+        get('/user', function () { 
+          this.pass()
+        })
+        get('/user', function () { 
+          this.pass()
+          return 'nodejs'
+        })
+        get('/user', function () { return 'success'})
+        get('/user').body.should.eql 'success'
+      end
     end    
   end
 end