Only keep looping matching route middlewares if they yield next

lib/router.js

@@ -5,6 +5,7 @@
 var debug = require('debug')('koa-router')
   , methods = require('methods')
   , parse = require('url').parse
+  , compose = require('koa-compose')
   , Resource = require('./resource')
   , Route = require('./route');
 
@@ -62,13 +63,24 @@ router.middleware = function() {
       return yield next;
     }
 
+    var matchingMiddlewares = [];
+
     // Dispatch route middlewares
     for (var i=0, len=matches.length; i<len; i++) {
       var route = matches[i].route;
-      this.params = matches[i].params;
       debug('dispatch "%s" %s', route.path, route.regexp);
-      yield route.middleware.call(this, next);
+      var wrapper = function(ctx, myRoute, params) {
+        return function *(next) {
+          ctx.params = params;
+          yield myRoute.middleware.call(ctx, next);
+        }
+      }(this, route, matches[i].params);
+
+      matchingMiddlewares.push(wrapper);
     }
+
+    var fn = compose(matchingMiddlewares);
+    yield fn(next);
   };
 };
 

test/lib/resource.js

@@ -69,14 +69,14 @@ describe('Resource', function() {
         should.exist(this.params);
         this.params.should.have.property('forum', '54');
         this.params.should.have.property('thread', '12');
-        this.status = 200;
+        this.status = 204;
       }
     });
     forums.add(threads);
     threads.base.should.equal('/forums/:forum/threads');
     request(http.createServer(app.callback()))
       .get('/forums/54/threads/12')
-      .expect(200)
+      .expect(204)
       .end(function(err, res) {
         if (err) return done(err);
         done();
@@ -89,12 +89,12 @@ describe('Resource', function() {
     app.use(router.middleware());
     app.resource({
       index: function *() {
-        this.status = 200;
+        this.status = 204;
       }
     });
     request(http.createServer(app.callback()))
       .get('/')
-      .expect(200)
+      .expect(204)
       .end(function(err, res) {
         if (err) return done(err);
         done();

test/lib/router.js

@@ -69,6 +69,7 @@ describe('Router', function() {
       this.params.should.have.property('lastname', 'smith');
       this.status = 204;
       counter++;
+      yield next;
     });
     app.get('/:surname', function *(next) {
       this.should.have.property('params');
@@ -87,6 +88,35 @@ describe('Router', function() {
     });
   });
 
+  it('matches only first route if it doesn\'t yield', function(done) {
+    var app = koa();
+    var counter = 0;
+    app.use(Router(app));
+    app.get('/:lastname', function *(next) {
+      this.should.have.property('params');
+      this.params.should.have.property('lastname', 'smith');
+      this.status = 204;
+      counter++;
+    });
+    app.get('/:surname', function *(next) {
+      this.should.have.property('params');
+      this.params.should.have.property('surname', 'smith');
+      this.status = 204;
+      counter++;
+
+      yield next;
+    });
+    var server = http.createServer(app.callback());
+      request(server)
+      .get('/smith')
+      .expect(204)
+      .end(function(err, res) {
+        if (err) return done(err);
+        counter.should.equal(1);
+        done();
+    });
+  });
+
   it('no matches after throw', function(done) {
     var app = koa();
     var counter = 0;