Merge branch 'master' of github.com:visionmedia/express

lib/application.js

@@ -12,14 +12,14 @@ var connect = require('connect')
   , Router = require('./router')
   , methods = Router.methods.concat('del', 'all')
   , middleware = require('./middleware')
+  , debug = require('debug')('express:application')
   , View = require('./view')
   , url = require('url')
   , utils = connect.utils
   , path = require('path')
   , http = require('http')
   , join = path.join
-  , fs = require('fs')
-  , qs = require('qs');
+  , fs = require('fs');
 
 /**
  * Application prototype.
@@ -72,6 +72,7 @@ app.defaultConfiguration = function(){
 
   // default settings
   this.set('env', process.env.NODE_ENV || 'development');
+  debug('booting in %s mode', this.get('env'));
 
   // implicit middleware
   this.use(connect.query());
@@ -175,6 +176,7 @@ app.use = function(route, fn){
     };
   }
 
+  debug('use %s %s', route, fn.name || 'unnamed');
   connect.proto.use.call(this, route, fn);
 
   // mounted an app

lib/router/index.js

@@ -11,6 +11,7 @@
 var Route = require('./route')
   , Collection = require('./collection')
   , utils = require('../utils')
+  , debug = require('debug')('express:routes')
   , parse = require('url').parse;
 
 /**
@@ -200,6 +201,8 @@ Router.prototype._dispatch = function(req, res, next){
   var params = this.params
     , self = this;
 
+  debug('dispatching %s %s', req.method, req.url);
+
   // route dispatch
   (function pass(i, err){
     var paramCallbacks
@@ -223,6 +226,7 @@ Router.prototype._dispatch = function(req, res, next){
 
     // no route
     if (!route) return next(err);
+    debug('matched %s %s', route.method, route.path);
 
     // we have a route
     // start at param 0
@@ -404,6 +408,7 @@ Router.prototype.route = function(method, path, callbacks){
   if (!path) throw new Error('Router#' + method + '() requires a path');
 
   // create the route
+  debug('defined %s %s', method, path);
   var route = new Route(method, path, callbacks, {
       sensitive: this.caseSensitive
     , strict: this.strict

lib/router/route.js

@@ -1,4 +1,3 @@
-
 /*!
  * Express - router - Route
  * Copyright(c) 2010 TJ Holowaychuk <[email protected]>
@@ -59,7 +58,7 @@ Route.prototype.match = function(path){
  * key names. For example "/user/:id" will
  * then contain ["id"].
  *
- * @param  {String|RegExp} path
+ * @param  {String|RegExp|Array} path
  * @param  {Array} keys
  * @param  {Boolean} sensitive
  * @param  {Boolean} strict
@@ -69,6 +68,8 @@ Route.prototype.match = function(path){
 
 function normalize(path, keys, sensitive, strict) {
   if (path instanceof RegExp) return path;
+  if (path instanceof Array) 
+  	path = '(' + path.join('|') + ')';
   path = path
     .concat(strict ? '' : '/?')
     .replace(/\/\(/g, '(?:/')

package.json

@@ -12,9 +12,9 @@
   "dependencies": {
     "connect": "git://github.com/senchalabs/connect.git",
     "commander": "0.5.1",
-    "mime": ">= 1.2.4",
-    "qs": ">= 0.4.0",
-    "mkdirp": "0.2.2"
+    "mime": "1.2.4",
+    "mkdirp": "0.3.0",
+    "debug": "*"
   },
   "devDependencies": {
     "ejs": "*",

test/app.router.js

@@ -1,4 +1,3 @@
-
 var express = require('../')
   , request = require('./support/http')
   , assert = require('assert');
@@ -110,6 +109,24 @@ describe('app.router', function(){
       .expect('editing user 10', done);
     })
   })
+
+  describe('when given an array', function(){
+  	it('should match all paths in the array', function(done){
+			var app = express();
+
+			app.get(['/one', '/two'], function(req, res){
+				res.end('works');
+			});
+
+			request(app)
+			.get('/one')
+			.expect('works', function() {
+				request(app)
+				.get('/two')
+				.expect('works', done);
+			});
+		})
+	})
 
   describe('case sensitivity', function(){
     it('should be disabled by default', function(done){