Release 2.3.7

this is now abstract and will be going into express-params
along with some other cases

.gitignore

@@ -10,3 +10,4 @@ lib-cov
 *.swo
 benchmarks/graphs
 testing.js
+node_modules/

.gitmodules

@@ -1,30 +0,0 @@
-[submodule "support/expresso"]
-	path = support/expresso
-	url = git://github.com/visionmedia/expresso.git
-[submodule "support/haml"]
-	path = support/haml
-	url = git://github.com/visionmedia/haml.js.git
-[submodule "support/ejs"]
-	path = support/ejs
-	url = git://github.com/visionmedia/ejs.git
-[submodule "support/connect-form"]
-	path = support/connect-form
-	url = git://github.com/visionmedia/connect-form.git
-[submodule "support/connect"]
-	path = support/connect
-	url = git://github.com/senchalabs/connect.git
-[submodule "support/should"]
-	path = support/should
-	url = git://github.com/visionmedia/should.js.git
-[submodule "support/formidable"]
-	path = support/formidable
-	url = git://github.com/felixge/node-formidable.git
-[submodule "support/jade"]
-	path = support/jade
-	url = git://github.com/visionmedia/jade.git
-[submodule "support/qs"]
-	path = support/qs
-	url = git://github.com/visionmedia/node-querystring.git
-[submodule "support/mime"]
-	path = support/mime
-	url = https://github.com/bentomas/node-mime.git

History.md

@@ -1,4 +1,74 @@
 
+2.3.7 / 2011-05-23 
+==================
+
+  * Added route `Collection`, ex: `app.get('/user/:id').remove();`
+  * Added support for `app.param(fn)` to define param logic
+  * Removed `app.param()` support for callback with return value
+  * Removed module.parent check from express(1) generated app. Closes #670
+  * Refactored router. Closes #639
+
+2.3.6 / 2011-05-20 
+==================
+
+  * Changed; using devDependencies instead of git submodules
+  * Fixed redis session example
+  * Fixed markdown example
+  * Fixed view caching, should not be enabled in development
+
+2.3.5 / 2011-05-20 
+==================
+
+  * Added export `.view` as alias for `.View`
+
+2.3.4 / 2011-05-08 
+==================
+
+  * Added `./examples/say`
+  * Fixed `res.sendfile()` bug preventing the transfer of files with spaces
+
+2.3.3 / 2011-05-03 
+==================
+
+  * Added "case sensitive routes" option.
+  * Changed; split methods supported per rfc [slaskis]
+  * Fixed route-specific middleware when using the same callback function several times
+
+2.3.2 / 2011-04-27 
+==================
+
+  * Fixed view hints
+
+2.3.1 / 2011-04-26 
+==================
+
+  * Added `app.match()` as `app.match.all()`
+  * Added `app.lookup()` as `app.lookup.all()`
+  * Added `app.remove()` for `app.remove.all()`
+  * Added `app.remove.VERB()`
+  * Fixed template caching collision issue. Closes #644
+  * Moved router over from connect and started refactor
+
+2.3.0 / 2011-04-25 
+==================
+
+  * Added options support to `res.clearCookie()`
+  * Added `res.helpers()` as alias of `res.locals()`
+  * Added; json defaults to UTF-8 with `res.send()`. Closes #632. [Daniel   * Dependency `connect >= 1.4.0`
+  * Changed; auto set Content-Type in res.attachement [Aaron Heckmann]
+  * Renamed "cache views" to "view cache". Closes #628
+  * Fixed caching of views when using several apps. Closes #637
+  * Fixed gotcha invoking `app.param()` callbacks once per route middleware. 
+Closes #638
+  * Fixed partial lookup precedence. Closes #631
+Shaw]
+
+2.2.2 / 2011-04-12 
+==================
+
+  * Added second callback support for `res.download()` connection errors
+  * Fixed `filename` option passing to template engine
+
 2.2.1 / 2011-04-04 
 ==================
 

Makefile

@@ -1,17 +1,13 @@
 
 DOCS = $(shell find docs/*.md)
 HTMLDOCS =$(DOCS:.md=.html)
+TESTS = $(shell find test/*.test.js)
 
 test:
-	@NODE_ENV=test ./support/expresso/bin/expresso \
+	@NODE_ENV=test ./node_modules/.bin/expresso \
 		-I lib \
-		-I support \
-		-I support/connect/lib \
-		-I support/haml/lib \
-		-I support/jade/lib \
-		-I support/ejs/lib \
 		$(TESTFLAGS) \
-		test/*.test.js
+		$(TESTS)
 
 test-cov:
 	@TESTFLAGS=--cov $(MAKE) test

Readme.md

@@ -16,6 +16,10 @@
 
     $ npm install express
 
+or to access the `express(1)` executable install globally:
+
+    $ npm install -g express
+
 ## Features
 
   * Robust routing
@@ -54,6 +58,7 @@ The following are the major contributors of Express (in no specific order).
 
 ## More Information
 
+  * [express-expose](http://github.com/visionmedia/express-expose) expose objects, functions, modules and more to client-side js with ease
   * [express-configure](http://github.com/visionmedia/express-configuration) async configuration support
   * [express-messages](http://github.com/visionmedia/express-messages) flash notification rendering helper
   * [express-namespace](http://github.com/visionmedia/express-namespace) namespaced route support
@@ -71,6 +76,26 @@ Express 1.x is compatible with node 0.2.x and connect < 1.0.
 
 Express 2.x is compatible with node 0.4.x and connect 1.x
 
+## Viewing Examples
+
+First install the dev dependencies to install all the example / test suite deps:
+
+    $ npm install
+
+then run whichever tests you want:
+
+    $ node examples/jade/app.js
+
+## Running Tests
+
+To run the test suite first invoke the following command within the repo, installing the development dependencies:
+
+    $ npm install
+
+then run the tests:
+
+    $ make test
+
 ## License 
 
 (The MIT License)

bin/express

@@ -11,7 +11,7 @@ var fs = require('fs')
  * Framework version.
  */
 
-var version = '2.2.0';
+var version = '2.3.7';
 
 /**
  * Add session support.
@@ -217,12 +217,8 @@ var app = [
   , '  });'
   , '});'
   , ''
-  , '// Only listen on $ node app.js'
-  , ''
-  , 'if (!module.parent) {'
-  , '  app.listen(3000);'
-  , '  console.log("Express server listening on port %d", app.address().port);'
-  , '}'
+  , 'app.listen(3000);'
+  , 'console.log("Express server listening on port %d", app.address().port);'
   , ''
 ].join('\n');
 

docs/contrib.md

@@ -1,10 +1,9 @@
 
 ### Development Dependencies
 
-Express development dependencies are stored within the _./support_ directory. To
-update them execute:
+First install the dev dependencies by executing the following command in the repo's directory:
 
-    $ git submodule update --init
+    $ npm install
 
 ### Running Tests
 

docs/guide.html

@@ -340,6 +340,8 @@ app.configure('production', function(){
 <li><em>views</em> Root views directory defaulting to <strong>CWD/views</strong></li>
 <li><em>view engine</em> Default view engine name for views rendered without extensions</li>
 <li><em>view options</em> An object specifying global view options</li>
+<li><em>view cache</em> Enable view caching (enabled in production)</li>
+<li><em>case sensitive routes</em> Enable case-sensitive routing</li>
 </ul>
 
 
@@ -431,7 +433,7 @@ app.post('/', function(req, res){
 app.listen(3000);
 </code></pre>
 
-<p>Typically we may use a &ldquo;dumb&rdquo; placeholder such as &ldquo;/user/:id&rdquo; which has no restrictions, however say for example we are limiting a user id to digits, we may use <em>&lsquo;/user/:id(\d+)&rsquo;</em> which will <em>not</em> match unless the placeholder value contains only digits.</p>
+<p>Typically we may use a &ldquo;dumb&rdquo; placeholder such as &ldquo;/user/:id&rdquo; which has no restrictions, however say for example we are limiting a user id to digits, we may use <em>&lsquo;/user/:id([0-9]+)&rsquo;</em> which will <em>not</em> match unless the placeholder value contains only digits.</p>
 
 <h3 id="passing-route control">Passing Route Control</h3>
 
@@ -519,6 +521,34 @@ app.use(connect.bodyParser());
 app.use(express.bodyParser());
 </code></pre>
 
+<p>Middleware ordering is important, when Connect receives a request the <em>first</em> middleware we pass to <em>createServer()</em> or <em>use()</em> is executed with three parameters, <em>request</em>, <em>response</em>, and a callback function usually named <em>next</em>. When <em>next()</em> is invoked the second middleware will then have it&rsquo;s turn and so on. This is important to note because many middleware depend on each other, for example <em>methodOverride()</em> checks <em>req.body.</em>method<em> for the HTTP method override, however </em>bodyParser()<em> parses the request body and populates </em>req.body<em>. Another example of this is cookie parsing and session support, we must first </em>use()<em> </em>cookieParser()<em> followed by </em>session()_.</p>
+
+<p>Many Express applications may contain the line <em>app.use(app.router)</em>, while this may appear strange, it&rsquo;s simply the middleware function that contains all defined routes, and performs route lookup based on the current request url and HTTP method. Express allows you to position this middleware, though by default it will be added to the bottom. By positioning the router, we can alter middleware precedence, for example we may want to add error reporting as the <em>last</em> middleware so that any exception passed to <em>next()</em> will be handled by it, or perhaps we want static file serving to have low precedence, allowing our routes to intercept requests to a static file to count downloads etc. This may look a little like below</p>
+
+<pre><code>app.use(express.logger(...));
+app.use(express.bodyParser(...));
+app.use(express.cookieParser(...));
+app.use(express.session(...));
+app.use(app.router);
+app.use(express.static(...));
+app.use(express.errorHandler(...));
+</code></pre>
+
+<p>First we add <em>logger()</em> so that it may wrap node&rsquo;s <em>req.end()</em> method, providing us with response-time data. Next the request&rsquo;s body will be parsed (if any), followed by cookie parsing and session support, meaning <em>req.session</em> will be defined by the time we hit our routes in <em>app.router</em>. If a request such as <em>GET /javascripts/jquery.js</em> is handled by our routes, and we do not call <em>next()</em> then the <em>static()</em> middleware will never see this request, however if were to define a route as shown below, we can record stats, refuse downloads, consume download credits etc.</p>
+
+<pre><code>var downloads = {};
+
+app.use(app.router);
+app.use(express.static(__dirname + '/public'));
+
+app.get('/*', function(req, res, next){
+  var file = req.params[0];
+  downloads[file] = downloads[file] || 0;
+  downloads[file]++;
+  next();
+});
+</code></pre>
+
 <h3 id="route-middleware">Route Middleware</h3>
 
 <p>Routes may utilize route-specific middleware by passing one or more additional callbacks (or arrays) to the method. This feature is extremely useful for restricting access, loading data used by the route etc.</p>
@@ -595,6 +625,8 @@ app.get('/', all, function(){});
 
 <p>For this example in full, view the <a href="http://github.com/visionmedia/express/blob/master/examples/route-middleware/app.js">route middleware example</a> in the repository.</p>
 
+<p>There are times when we may want to &ldquo;skip&rdquo; passed remaining route middleware, but continue matching subsequent routes. To do this we invoke <code>next()</code> with the string &ldquo;route&rdquo; <code>next('route')</code>. If no remaining routes match the request url then Express will respond with 404 Not Found.</p>
+
 <h3 id="http-methods">HTTP Methods</h3>
 
 <p>We have seen <em>app.get()</em> a few times, however Express also exposes other familiar HTTP verbs in the same manor, such as <em>app.post()</em>, <em>app.del()</em>, etc.</p>
@@ -1155,7 +1187,7 @@ an error occurs, or when the transfer is complete. By default failures call <cod
 });
 </code></pre>
 
-<h3 id="res.download()">res.download(file[, filename[, callback]])</h3>
+<h3 id="res.download()">res.download(file[, filename[, callback[, callback2]]])</h3>
 
 <p>Transfer the given <em>file</em> as an attachment with optional alternative <em>filename</em>.</p>
 
@@ -1169,13 +1201,22 @@ res.download('path/to/image.png', 'foo.png');
 res.sendfile(file);
 </code></pre>
 
-<p>An optional callback may be supplied as either the second or third argument, which is passed to <em>res.sendfile()</em>:</p>
+<p>An optional callback may be supplied as either the second or third argument, which is passed to <em>res.sendfile()</em>. Within this callback you may still respond, as the header has not been sent.</p>
 
 <pre><code>res.download(path, 'expenses.doc', function(err){
   // handle
 });
 </code></pre>
 
+<p>An optional second callback, <em>callback2</em> may be given to allow you to act on connection related errors, however you should not attempt to respond.</p>
+
+<pre><code>res.download(path, function(err){
+  // error or finished
+}, function(err){
+  // connection related error
+});
+</code></pre>
+
 <h3 id="res.send()">res.send(body|status[, headers|status[, status]])</h3>
 
 <p>The <em>res.send()</em> method is a high level response utility allowing you to pass
@@ -1233,7 +1274,7 @@ app.get('/', function(req, res){
 });
 </code></pre>
 
-<h3 id="res.clearcookie()">res.clearCookie(name)</h3>
+<h3 id="res.clearcookie()">res.clearCookie(name[, options])</h3>
 
 <p>Clear cookie <em>name</em> by setting &ldquo;expires&rdquo; far in the past.</p>
 
@@ -1525,9 +1566,7 @@ as well as the <em>name()</em> function exposed.</p>
 
 <pre><code>- `settings`  the app's settings object
 - `filename`  the view's filename
-- `request`   the request object
-- `response`  the response object
-- `app`       the application itself
+- `layout(path)`  specify the layout from within a view
 </code></pre>
 
 <p>This method is aliased as <em>app.locals()</em>.</p>

docs/guide.md

@@ -1,4 +1,3 @@
-
 ### Installation
 
     $ npm install express
@@ -82,6 +81,8 @@ Express supports the following settings out of the box:
   * _views_ Root views directory defaulting to **CWD/views**
   * _view engine_ Default view engine name for views rendered without extensions
   * _view options_ An object specifying global view options
+  * _view cache_ Enable view caching (enabled in production)
+  * _case sensitive routes_ Enable case-sensitive routing
 
 ### Routing
 
@@ -165,7 +166,7 @@ For example we can __POST__ some json, and echo the json back using the _bodyPar
 
     app.listen(3000);
 
-Typically we may use a "dumb" placeholder such as "/user/:id" which has no restrictions, however say for example we are limiting a user id to digits, we may use _'/user/:id(\\\\d+)'_ which will _not_ match unless the placeholder value contains only digits.
+Typically we may use a "dumb" placeholder such as "/user/:id" which has no restrictions, however say for example we are limiting a user id to digits, we may use _'/user/:id([0-9]+)'_ which will _not_ match unless the placeholder value contains only digits.
 
 ### Passing Route Control
 
@@ -234,7 +235,7 @@ passed to _express.createServer()_ as you would with a regular Connect server. F
 
 Alternatively we can _use()_ them which is useful when adding middleware within _configure()_ blocks, in a progressive manor.
 
-    app.use(express.logger({ format: ':method :uri' }));
+    app.use(express.logger({ format: ':method :url' }));
 
 Typically with connect middleware you would _require('connect')_ like so:
 
@@ -247,6 +248,33 @@ This is somewhat annoying, so express re-exports these middleware properties, ho
     app.use(express.logger());
     app.use(express.bodyParser());
 
+Middleware ordering is important, when Connect receives a request the _first_ middleware we pass to _createServer()_ or _use()_ is executed with three parameters, _request_, _response_, and a callback function usually named _next_. When _next()_ is invoked the second middleware will then have it's turn and so on. This is important to note because many middleware depend on each other, for example _methodOverride()_ checks _req.body._method_ for the HTTP method override, however _bodyParser()_ parses the request body and populates _req.body_. Another example of this is cookie parsing and session support, we must first _use()_ _cookieParser()_ followed by _session()_.
+
+Many Express applications may contain the line _app.use(app.router)_, while this may appear strange, it's simply the middleware function that contains all defined routes, and performs route lookup based on the current request url and HTTP method. Express allows you to position this middleware, though by default it will be added to the bottom. By positioning the router, we can alter middleware precedence, for example we may want to add error reporting as the _last_ middleware so that any exception passed to _next()_ will be handled by it, or perhaps we want static file serving to have low precedence, allowing our routes to intercept requests to a static file to count downloads etc. This may look a little like below
+
+    app.use(express.logger(...));
+    app.use(express.bodyParser(...));
+    app.use(express.cookieParser(...));
+    app.use(express.session(...));
+    app.use(app.router);
+    app.use(express.static(...));
+    app.use(express.errorHandler(...));
+
+First we add _logger()_ so that it may wrap node's _req.end()_ method, providing us with response-time data. Next the request's body will be parsed (if any), followed by cookie parsing and session support, meaning _req.session_ will be defined by the time we hit our routes in _app.router_. If a request such as _GET /javascripts/jquery.js_ is handled by our routes, and we do not call _next()_ then the _static()_ middleware will never see this request, however if were to define a route as shown below, we can record stats, refuse downloads, consume download credits etc.
+
+    var downloads = {};
+
+    app.use(app.router);
+    app.use(express.static(__dirname + '/public'));
+
+    app.get('/*', function(req, res, next){
+      var file = req.params[0];
+      downloads[file] = downloads[file] || 0;
+      downloads[file]++;
+      next();
+    });
+
+
 ### Route Middleware
 
 Routes may utilize route-specific middleware by passing one or more additional callbacks (or arrays) to the method. This feature is extremely useful for restricting access, loading data used by the route etc.
@@ -318,6 +346,8 @@ Commonly used "stacks" of middleware can be passed as an array (_applied recursi
 
 For this example in full, view the [route middleware example](http://github.com/visionmedia/express/blob/master/examples/route-middleware/app.js) in the repository.
 
+There are times when we may want to "skip" passed remaining route middleware, but continue matching subsequent routes. To do this we invoke `next()` with the string "route" `next('route')`. If no remaining routes match the request url then Express will respond with 404 Not Found.
+
 ### HTTP Methods
 
 We have seen _app.get()_ a few times, however Express also exposes other familiar HTTP verbs in the same manor, such as _app.post()_, _app.del()_, etc.
@@ -816,7 +846,7 @@ Options may also be passed to the internal _fs.createReadStream()_ call, for exa
       // handle
     });
 
-### res.download(file[, filename[, callback]])
+### res.download(file[, filename[, callback[, callback2]]])
 
 Transfer the given _file_ as an attachment with optional alternative _filename_.
 
@@ -828,12 +858,20 @@ This is equivalent to:
     res.attachment(file);
     res.sendfile(file);
 
-An optional callback may be supplied as either the second or third argument, which is passed to _res.sendfile()_:
+An optional callback may be supplied as either the second or third argument, which is passed to _res.sendfile()_. Within this callback you may still respond, as the header has not been sent.
 
     res.download(path, 'expenses.doc', function(err){
       // handle
     });
 
+An optional second callback, _callback2_ may be given to allow you to act on connection related errors, however you should not attempt to respond.
+
+    res.download(path, function(err){
+      // error or finished
+    }, function(err){
+      // connection related error
+    });
+
 ### res.send(body|status[, headers|status[, status]])
 
 The _res.send()_ method is a high level response utility allowing you to pass
@@ -886,7 +924,7 @@ To parse incoming _Cookie_ headers, use the _cookieParser_ middleware, which pro
       // use req.cookies.rememberme
     });
 
-### res.clearCookie(name)
+### res.clearCookie(name[, options])
 
 Clear cookie _name_ by setting "expires" far in the past.
 

examples/auth/app.js

@@ -1,7 +1,4 @@
 
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
 /**
  * Module dependencies.
  */

examples/blog/app.js

@@ -1,7 +1,4 @@
 
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
 /**
  * Module dependencies.
  */

examples/cookies/app.js

@@ -1,7 +1,4 @@
 
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
 /**
  * Module dependencies.
  */

examples/downloads/app.js

@@ -1,7 +1,4 @@
 
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
 /**
  * Module dependencies.
  */
@@ -24,13 +21,20 @@ app.get('/files/:file(*)', function(req, res, next){
     , path = __dirname + '/files/' + file;
   // either res.download(path) and let
   // express handle failures, or provide
-  // a callback
+  // a callback as shown below
   res.download(path, function(err){
+    // if an error occurs in this callback
+    // the file most likely does not exist,
+    // and it's safe to respond or next(err)
     if (err) return next(err);
-    // the response has invoked .end()
-    // so you cannnot respond here (of course)
-    // but the callback is handy for statistics etc.
+
+    // the file has been transferred, do not respond
+    // from here, though you may use this callback
+    // for stats etc.
     console.log('transferred %s', path);
+  }, function(err){
+    // this second optional callback is used when
+    // an error occurs during transmission
   });
 });
 

examples/ejs/app.js

@@ -1,7 +1,4 @@
 
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
 /**
  * Module dependencies.
  */

examples/error/app.js

@@ -1,7 +1,4 @@
 
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
 /**
  * Module dependencies.
  */
@@ -25,4 +22,5 @@ app.get('/next', function(req, res, next){
 // text/html, and application/json responses to aid in development
 app.use('/', express.errorHandler({ dump: true, stack: true }));
 
-app.listen(3000);
+app.listen(3000);
+console.log('app listening on port 3000');

examples/flash/app.js

@@ -1,7 +1,4 @@
 
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
 /**
  * Module dependencies.
  */

examples/format/app.js

@@ -1,7 +1,4 @@
 
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
 /**
  * Module dependencies.
  */

examples/github/app.js

@@ -1,7 +1,4 @@
 
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
 /**
  * Module dependencies.
  */

examples/jade/app.js

@@ -1,7 +1,4 @@
 
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
 /**
  * Module dependencies.
  */

examples/layout-control/app.js

@@ -1,7 +1,4 @@
 
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
 /**
  * Module dependencies.
  */
@@ -15,7 +12,7 @@ app.set('views', __dirname + '/views');
 // set default layout, usually "layout"
 app.set('view options', { layout: 'layouts/default' });
 
-// Set our default template engine to "jade"
+// Set our default template engine to "ejs"
 // which prevents the need for extensions
 // (although you can still mix and match)
 app.set('view engine', 'ejs');

examples/markdown/app.js

@@ -1,15 +1,10 @@
 
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
-// $ npm install markdown
-
 /**
  * Module dependencies.
  */
 
 var express = require('../../lib/express')
-  , md = require('markdown').markdown;
+  , md = require('node-markdown').Markdown;
 
 var app = express.createServer();
 
@@ -19,7 +14,7 @@ var app = express.createServer();
 
 app.register('.md', {
   compile: function(str, options){
-    var html = md.toHTML(str);
+    var html = md(str);
     return function(locals){
       return html.replace(/\{([^}]+)\}/g, function(_, name){
         return locals[name];

examples/mounting/app.js

@@ -1,7 +1,4 @@
 
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
 /**
  * Module dependencies.
  */

examples/multipart/app.js

@@ -1,7 +1,4 @@
 
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
 /**
  * Module dependencies.
  */

examples/mvc/app.js

@@ -1,7 +1,4 @@
 
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
 /**
  * Module dependencies.
  */

examples/mvc/mvc.js

@@ -14,7 +14,7 @@ exports.boot = function(app){
 // App settings and middleware
 
 function bootApplication(app) {
-  app.use(express.logger({ format: ':method :url :status' }));
+  app.use(express.logger(':method :url :status'));
   app.use(express.bodyParser());
   app.use(express.methodOverride());
   app.use(express.cookieParser());
@@ -45,6 +45,7 @@ function bootApplication(app) {
     },
 
     hasMessages: function(req){
+      if (!req.session) return false;
       return Object.keys(req.session.flash || {}).length;
     },
 

examples/params/app.js

@@ -1,7 +1,4 @@
 
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
 /**
  * Module dependencies.
  */

examples/partials/app.js

@@ -1,7 +1,4 @@
 
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
 /**
  * Module dependencies.
  */

examples/resource/app.js

@@ -1,7 +1,4 @@
 
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
 /**
  * Module dependencies.
  */

examples/route-middleware/app.js

@@ -1,7 +1,4 @@
 
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
 /**
  * Module dependencies.
  */

examples/route-separation/app.js

@@ -1,7 +1,4 @@
 
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
 /**
  * Module dependencies.
  */

examples/say/app.js

@@ -0,0 +1,44 @@
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('../../')
+  , path = require('path')
+  , exec = require('child_process').exec
+  , fs = require('fs');
+
+/**
+ * Error handler.
+ */
+
+function errorHandler(voice) {
+  return function(err, req, res, next) {
+    var parts = err.stack.split('\n')[1].split(/[()]/)[1].split(':')
+      , filename = parts.shift()
+      , basename = path.basename(filename)
+      , lineno = parts.shift()
+      , col = parts.shift()
+      , lines = fs.readFileSync(filename, 'utf8').split('\n')
+      , line = lines[lineno - 1].replace(/\./, ' ');
+
+    exec('say -v "' + voice + '" '
+      + err.message
+      + ' on line ' + lineno
+      + ' of ' + basename + '.'
+      + ' The contents of this line is '
+      + ' "' + line + '".');
+
+    res.send(500);
+  }
+}
+
+var app = express.createServer();
+
+app.get('/', function(request, response){
+  if (request.is(foo)) response.end('bar');
+});
+
+app.use(errorHandler('Vicki'));
+
+app.listen(3000);

examples/session/app.js

@@ -1,7 +1,4 @@
 
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
 /**
  * Module dependencies.
  */

examples/session/redis.js

@@ -1,7 +1,4 @@
 
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
 /**
  * Module dependencies.
  */
@@ -15,7 +12,7 @@ var app = express.createServer(
   express.logger(),
 
   // Required by session() middleware
-  express.cookieDecoder(),
+  express.cookieParser(),
 
   // Populates:
   //   - req.session

examples/stylus/app.js

@@ -1,7 +1,4 @@
 
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
 /**
  * Module dependencies.
  */

examples/vhost/app.js

@@ -1,7 +1,4 @@
 
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
 /**
  * Module dependencies.
  */

lib/express.js

@@ -11,7 +11,8 @@
 
 var connect = require('connect')
   , HTTPSServer = require('./https')
-  , HTTPServer = require('./http');
+  , HTTPServer = require('./http')
+  , Route = require('./router/route')
 
 /**
  * Re-export connect auto-loaders.
@@ -27,7 +28,7 @@ var exports = module.exports = connect.middleware;
  * Framework version.
  */
 
-exports.version = '2.2.1';
+exports.version = '2.3.7';
 
 /**
  * Shortcut for `new Server(...)`.
@@ -51,12 +52,14 @@ exports.createServer = function(options){
 
 exports.HTTPServer = HTTPServer;
 exports.HTTPSServer = HTTPSServer;
+exports.Route = Route;
 
 /**
  * View extensions.
  */
 
-require('./view');
+exports.View =
+exports.view = require('./view');
 
 /**
  * Response extensions.

lib/http.js

@@ -11,12 +11,26 @@
 
 var qs = require('qs')
   , connect = require('connect')
-  , router = connect.router
-  , methods = router.methods.concat(['del', 'all'])
+  , router = require('./router')
+  , Router = require('./router')
   , view = require('./view')
+  , toArray = require('./utils').toArray
+  , methods = router.methods.concat('del', 'all')
   , url = require('url')
   , utils = connect.utils;
 
+/**
+ * Expose `HTTPServer`.
+ */
+
+exports = module.exports = HTTPServer;
+
+/**
+ * Server proto.
+ */
+
+var app = HTTPServer.prototype;
+
 /**
  * Initialize a new `HTTPServer` with optional `middleware`.
  *
@@ -24,7 +38,7 @@ var qs = require('qs')
  * @api public
  */
 
-var Server = exports = module.exports = function HTTPServer(middleware){
+function HTTPServer(middleware){
   connect.HTTPServer.call(this, []);
   this.init(middleware);
 };
@@ -33,7 +47,7 @@ var Server = exports = module.exports = function HTTPServer(middleware){
  * Inherit from `connect.HTTPServer`.
  */
 
-Server.prototype.__proto__ = connect.HTTPServer.prototype;
+app.__proto__ = connect.HTTPServer.prototype;
 
 /**
  * Initialize the server.
@@ -42,21 +56,17 @@ Server.prototype.__proto__ = connect.HTTPServer.prototype;
  * @api private
  */
 
-Server.prototype.init = function(middleware){
+app.init = function(middleware){
   var self = this;
-  this.match = {};
-  this.lookup = {};
+  this.cache = {};
   this.settings = {};
   this.redirects = {};
   this.isCallbacks = {};
-  this.viewHelpers = {};
+  this._locals = {};
   this.dynamicViewHelpers = {};
   this.errorHandlers = [];
 
-  // default "home" to /
   this.set('home', '/');
-
-  // set "env" to NODE_ENV, defaulting to "development"
   this.set('env', process.env.NODE_ENV || 'development');
 
   // expose objects to each other
@@ -78,11 +88,11 @@ Server.prototype.init = function(middleware){
   // apply middleware
   if (middleware) middleware.forEach(self.use.bind(self));
 
-  // use router, expose as app.get(), etc
-  var fn = router(function(app){ self.routes = app; });
+  // router
+  this.routes = new Router(this);
   this.__defineGetter__('router', function(){
     this.__usedRouter = true;
-    return fn;
+    return self.routes.middleware;
   });
 
   // default locals
@@ -98,34 +108,76 @@ Server.prototype.init = function(middleware){
 
   // default production configuration
   this.configure('production', function(){
-    this.enable('cache views');
+    this.enable('view cache');
   });
 
   // register error handlers on "listening"
   // so that they disregard definition position.
   this.on('listening', this.registerErrorHandlers.bind(this));
 
-  // route lookup methods
+  // route manipulation methods
   methods.forEach(function(method){
-    self.match[method] = function(url){
-      return self.router.match(url, 'all' == method
-        ? null
-        : method);
+    self.lookup[method] = function(path){
+      return self.routes.lookup(method, path);
     };
 
-    self.lookup[method] = function(path){
-      return self.router.lookup(path, 'all' == method
-        ? null
-        : method);
+    self.match[method] = function(path){
+      return self.routes.match(method, path);
+    };
+
+    self.remove[method] = function(path){
+      return self.routes.lookup(method, path).remove();
     };
   });
+
+  // del -> delete
+  self.lookup.del = self.lookup.delete;
+  self.match.del = self.match.delete;
+  self.remove.del = self.remove.delete;
+};
+
+/**
+ * Remove routes matching the given `path`.
+ *
+ * @param {Route} path
+ * @return {Boolean}
+ * @api public
+ */
+
+app.remove = function(path){
+  return this.routes.lookup('all', path).remove();
+};
+
+/**
+ * Lookup routes defined with a path
+ * equivalent to `path`.
+ *
+ * @param {Stirng} path
+ * @return {Array}
+ * @api public
+ */
+
+app.lookup = function(path){
+  return this.routes.lookup('all', path);
+};
+
+/**
+ * Lookup routes matching the given `url`.
+ *
+ * @param {Stirng} url
+ * @return {Array}
+ * @api public
+ */
+
+app.match = function(url){
+  return this.routes.match('all', url);
 };
 
 /**
  * When using the vhost() middleware register error handlers.
  */
 
-Server.prototype.onvhost = function(){
+app.onvhost = function(){
   this.registerErrorHandlers();
 };
 
@@ -136,7 +188,7 @@ Server.prototype.onvhost = function(){
  * @api public
  */
 
-Server.prototype.registerErrorHandlers = function(){
+app.registerErrorHandlers = function(){
   this.errorHandlers.forEach(function(fn){
     this.use(function(err, req, res, next){
       fn.apply(this, arguments);
@@ -155,7 +207,7 @@ Server.prototype.registerErrorHandlers = function(){
  * @api public
  */
 
-Server.prototype.use = function(route, middleware){
+app.use = function(route, middleware){
   var app, home, handle;
 
   if ('string' != typeof route) {
@@ -213,7 +265,7 @@ Server.prototype.use = function(route, middleware){
  * @api public
  */
 
-Server.prototype.mounted = function(fn){
+app.mounted = function(fn){
   this.__mounted = fn;
   return this;
 };
@@ -225,7 +277,7 @@ Server.prototype.mounted = function(fn){
  * @api public
  */
 
-Server.prototype.register = function(){
+app.register = function(){
   view.register.apply(this, arguments);
   return this;
 };
@@ -239,9 +291,9 @@ Server.prototype.register = function(){
  * @api public
  */
 
-Server.prototype.helpers =
-Server.prototype.locals = function(obj){
-  utils.merge(this.viewHelpers, obj);
+app.helpers =
+app.locals = function(obj){
+  utils.merge(this._locals, obj);
   return this;
 };
 
@@ -254,7 +306,7 @@ Server.prototype.locals = function(obj){
  * @api public
  */
 
-Server.prototype.dynamicHelpers = function(obj){
+app.dynamicHelpers = function(obj){
   utils.merge(this.dynamicViewHelpers, obj);
   return this;
 };
@@ -263,54 +315,44 @@ Server.prototype.dynamicHelpers = function(obj){
  * Map the given param placeholder `name`(s) to the given callback `fn`.
  *
  * Param mapping is used to provide pre-conditions to routes
- * which us normalized placeholders. For example ":user_id" may
- * attempt to load the user from the database, where as ":num" may
- * pass the value through `parseInt(num, 10)`.
+ * which us normalized placeholders. This callback has the same
+ * signature as regular middleware, for example below when ":userId"
+ * is used this function will be invoked in an attempt to load the user.
  *
- * When the callback function accepts only a single argument, the
- * value of placeholder is passed:
+ *      app.param('userId', function(req, res, next, id){
+ *        User.find(id, function(err, user){
+ *          if (err) {
+ *            next(err);
+ *          } else if (user) {
+ *            req.user = user;
+ *            next();
+ *          } else {
+ *            next(new Error('failed to load user'));
+ *          }
+ *        });
+ *      });
  *
- *    app.param('page', function(n){ return parseInt(n, 10); });
- *
- * After which "/users/:page" would automatically provide us with
- * an integer for `req.params.page`. If desired we could use the callback
- * signature shown below, and immediately `next(new Error('invalid page'))`
- * when `parseInt` fails.
- *
- * Alternatively the callback may accept the request, response, next, and
- * the value, acting like middlware:
- *
- *     app.param('userId', function(req, res, next, id){
- *       User.find(id, function(err, user){
- *         if (err) {
- *           next(err);
- *         } else if (user) {
- *           req.user = user;
- *           next();
- *         } else {
- *           next(new Error('failed to load user'));
- *         }
- *       });
- *     });
- *
- * Now every time ":userId" is present, the associated user object
- * will be loaded and assigned before the route handler is invoked.
- *
- * @param {String|Array} name
+ * @param {String|Array|Function} name
  * @param {Function} fn
  * @return {Server} for chaining
  * @api public
  */
 
-Server.prototype.param = function(name, fn){
+app.param = function(name, fn){
+  // array
   if (Array.isArray(name)) {
     name.forEach(function(name){
       this.param(name, fn);
     }, this);
+  // param logic
+  } else if ('function' == typeof name) {
+    this.routes.param(name);
+  // single
   } else {
     if (':' == name[0]) name = name.substr(1);
     this.routes.param(name, fn);
   }
+
   return this;
 };
 
@@ -323,7 +365,7 @@ Server.prototype.param = function(name, fn){
  * @api public
  */
 
-Server.prototype.error = function(fn){
+app.error = function(fn){
   this.errorHandlers.push(fn);
   return this;
 };
@@ -337,7 +379,7 @@ Server.prototype.error = function(fn){
  * @api public
  */
 
-Server.prototype.is = function(type, fn){
+app.is = function(type, fn){
   if (!fn) return this.isCallbacks[type];
   this.isCallbacks[type] = fn;
   return this;
@@ -353,7 +395,7 @@ Server.prototype.is = function(type, fn){
  * @api public
  */
 
-Server.prototype.set = function(setting, val){
+app.set = function(setting, val){
   if (val === undefined) {
     if (this.settings.hasOwnProperty(setting)) {
       return this.settings[setting];
@@ -374,7 +416,7 @@ Server.prototype.set = function(setting, val){
  * @api public
  */
 
-Server.prototype.enabled = function(setting){
+app.enabled = function(setting){
   return !!this.set(setting);
 };
 
@@ -386,7 +428,7 @@ Server.prototype.enabled = function(setting){
  * @api public
  */
 
-Server.prototype.disabled = function(setting){
+app.disabled = function(setting){
   return !this.set(setting);
 };
 
@@ -398,7 +440,7 @@ Server.prototype.disabled = function(setting){
  * @api public
  */
 
-Server.prototype.enable = function(setting){
+app.enable = function(setting){
   return this.set(setting, true);
 };
 
@@ -410,7 +452,7 @@ Server.prototype.enable = function(setting){
  * @api public
  */
 
-Server.prototype.disable = function(setting){
+app.disable = function(setting){
   return this.set(setting, false);
 };
 
@@ -423,7 +465,7 @@ Server.prototype.disable = function(setting){
  * @api public
  */
 
-Server.prototype.redirect = function(key, url){
+app.redirect = function(key, url){
   this.redirects[key] = url;
   return this;
 };
@@ -437,58 +479,46 @@ Server.prototype.redirect = function(key, url){
  * @api public
  */
 
-Server.prototype.configure = function(env, fn){
-  if ('function' == typeof env) {
-    fn = env, env = 'all';
-  }
-  if ('all' == env || env == this.settings.env) {
-    fn.call(this);
-  }
+app.configure = function(env, fn){
+  if ('function' == typeof env) fn = env, env = 'all';
+  if ('all' == env || env == this.settings.env) fn.call(this);
   return this;
 };
 
-// Generate routing methods
+/**
+ * Delegate `.VERB(...)` calls to `.route(VERB, ...)`.
+ */
 
-function generateMethod(method){
-  Server.prototype[method] = function(path, fn){
-    var self = this;
+methods.forEach(function(method){
+  app[method] = function(path){
+    if (1 == arguments.length) return this.routes.lookup(method, path);
+    var args = [method].concat(toArray(arguments));
+    if (!this.__usedRouter) this.use(this.router);
+    return this.routes._route.apply(this.routes, args);
+  }
+});
 
-    // Lookup
-    if (1 == arguments.length) {
-      return this.router.lookup(path, 'all' == method
-        ? null
-        : method);
-    }
+/**
+ * Special-cased "all" method, applying the given route `path`,
+ * middleware, and callback to _every_ HTTP method.
+ *
+ * @param {String} path
+ * @param {Function} ...
+ * @return {Server} for chaining
+ * @api public
+ */
 
-    // Ensure router is mounted
-    if (!this.__usedRouter) {
-      this.use(this.router);
-    }
+app.all = function(path){
+  var args = arguments;
+  if (1 == args.length) return this.routes.lookup('all', path);
+  methods.forEach(function(method){
+    if ('all' == method) return;
+    app[method].apply(this, args);
+  }, this);
+  return this;
+};
 
-    // Route specific middleware support
-    if (arguments.length > 2) {
-      var args = Array.prototype.slice.call(arguments, 1);
-      fn = args.pop();
-      (function stack(middleware){
-        middleware.forEach(function(fn){
-          if (Array.isArray(fn)) {
-            stack(fn);
-          } else {
-            self[method](path, fn);
-          }
-        });
-      })(args);
-    }
+// del -> delete alias
 
-    // Generate the route
-    this.routes[method](path, fn);
-    return this;
-  };
-  return arguments.callee;
-}
+app.del = app.delete;
 
-methods.forEach(generateMethod);
-
-// Alias delete as "del"
-
-Server.prototype.del = Server.prototype.delete;

lib/https.js

@@ -13,6 +13,18 @@ var connect = require('connect')
   , HTTPServer = require('./http')
   , https = require('https');
 
+/**
+ * Expose `HTTPSServer`.
+ */
+
+exports = module.exports = HTTPSServer;
+
+/**
+ * Server proto.
+ */
+
+var app = HTTPSServer.prototype;
+
 /**
  * Initialize a new `HTTPSServer` with the 
  * given `options`, and optional `middleware`.
@@ -22,7 +34,7 @@ var connect = require('connect')
  * @api public
  */
 
-var Server = exports = module.exports = function HTTPSServer(options, middleware){
+function HTTPSServer(options, middleware){
   connect.HTTPSServer.call(this, options, []);
   this.init(middleware);
 };
@@ -31,10 +43,10 @@ var Server = exports = module.exports = function HTTPSServer(options, middleware
  * Inherit from `connect.HTTPSServer`.
  */
 
-Server.prototype.__proto__ = connect.HTTPSServer.prototype;
+app.__proto__ = connect.HTTPSServer.prototype;
 
 // mixin HTTPServer methods
 
 Object.keys(HTTPServer.prototype).forEach(function(method){
-  Server.prototype[method] = HTTPServer.prototype[method];
+  app[method] = HTTPServer.prototype[method];
 });

lib/request.js

@@ -197,7 +197,7 @@ req.flash = function(type, msg){
       , args = arguments
       , formatters = this.app.flashFormatters || {};
     formatters.__proto__ = flashFormatters;
-    msg = utils.miniMarkdown(utils.htmlEscape(msg));
+    msg = utils.miniMarkdown(utils.escape(msg));
     msg = msg.replace(/%([a-zA-Z])/g, function(_, format){
       var formatter = formatters[format];
       if (formatter) return formatter(args[i++]);
@@ -269,7 +269,7 @@ req.is = function(type){
     if ('*' == type[0] && type[1] == contentType[1]) return true;
     if ('*' == type[1] && type[0] == contentType[0]) return true;
   }
-  return ~contentType.indexOf(type);
+  return !! ~contentType.indexOf(type);
 };
 
 // Callback for isXMLHttpRequest / xhr

lib/response.js

@@ -17,8 +17,9 @@ var fs = require('fs')
   , parseRange = require('./utils').parseRange
   , res = http.ServerResponse.prototype
   , send = connect.static.send
-  , join = require('path').join
-  , mime = require('mime');
+  , mime = require('mime')
+  , basename = path.basename
+  , join = path.join;
 
 /**
  * Send a response with the given `body` and optional `headers` and `status` code.
@@ -75,10 +76,12 @@ res.send = function(body, headers, status){
         }
       } else {
         if (!this.header('Content-Type')) {
+          this.charset = this.charset || 'utf-8';
           this.contentType('.json');
         }
         body = JSON.stringify(body);
         if (this.req.query.callback && this.app.set('jsonp callback')) {
+          this.charset = this.charset || 'utf-8';
           this.header('Content-Type', 'text/javascript');
           body = this.req.query.callback.replace(/[^\w$.]/g, '') + '(' + body + ');';
         }
@@ -130,6 +133,7 @@ res.send = function(body, headers, status){
  */
 
 res.sendfile = function(path, options, fn){
+  var next = this.req.next;
   options = options || {};
 
   // support function as second arg
@@ -138,9 +142,9 @@ res.sendfile = function(path, options, fn){
     options = {};
   }
 
-  options.path = path;
+  options.path = encodeURIComponent(path);
   options.callback = fn;
-  send(this.req, this, this.req.next, options);
+  send(this.req, this, next, options);
 };
 
 /**
@@ -175,40 +179,50 @@ res.contentType = function(type){
  */
 
 res.attachment = function(filename){
+  if (filename) this.contentType(filename);
   this.header('Content-Disposition', filename
-    ? 'attachment; filename="' + path.basename(filename) + '"'
+    ? 'attachment; filename="' + basename(filename) + '"'
     : 'attachment');
   return this;
 };
 
 /**
  * Transfer the file at the given `path`, with optional 
- * `filename` as an attachment and optional callback `fn(err)`.
+ * `filename` as an attachment and optional callback `fn(err)`,
+ * and optional `fn2(err)` which is invoked when an error has
+ * occurred after headers have been sent.
  *
  * @param {String} path
  * @param {String|Function} filename or fn
  * @param {Function} fn
- * @return {Type}
+ * @param {Function} fn2
  * @api public
  */
 
-res.download = function(path, filename, fn){
+res.download = function(path, filename, fn, fn2){
   var self = this;
 
   // support callback as second arg
   if ('function' == typeof filename) {
+    fn2 = fn;
     fn = filename;
     filename = null;
   }
 
   // transfer the file
   this.attachment(filename || path).sendfile(path, function(err){
-    if (err) self.removeHeader('Content-Disposition');
-    if (fn) return fn(err);
+    var sentHeader = self._header;
     if (err) {
-      self.req.next('ENOENT' == err.code
-        ? null
-        : err);
+      if (!sentHeader) self.removeHeader('Content-Disposition');
+      if (sentHeader) {
+        fn2 && fn2(err);
+      } else if (fn) {
+        fn(err);
+      } else {
+        self.req.next(err);
+      }
+    } else if (fn) {
+      fn();
     }
   });
 };
@@ -235,11 +249,15 @@ res.header = function(name, val){
  * Clear cookie `name`.
  *
  * @param {String} name
+ * @param {Object} options
  * @api public
  */
 
-res.clearCookie = function(name){
-  this.cookie(name, '', { expires: new Date(1) });
+res.clearCookie = function(name, options){
+  var opts = { expires: new Date(1) };
+  this.cookie(name, '', options
+    ? utils.merge(options, opts)
+    : opts);
 };
 
 /**
@@ -394,7 +412,8 @@ res.local = function(name, val){
  * @api public
  */
 
-res.locals = function(obj){
+res.locals =
+res.helpers = function(obj){
   if (obj) {
     for (var key in obj) {
       this.local(key, obj[key]);

lib/router/collection.js

@@ -0,0 +1,53 @@
+
+/*!
+ * Express - router - Collection
+ * Copyright(c) 2010 TJ Holowaychuk <tj@vision-media.ca>
+ * MIT Licensed
+ */
+
+/**
+ * Expose `Collection`.
+ */
+
+module.exports = Collection;
+
+/**
+ * Initialize a new route `Collection`
+ * with the given `router`.
+ * 
+ * @param {Router} router
+ * @api private
+ */
+
+function Collection(router) {
+  Array.apply(this, arguments);
+  this.router = router;
+}
+
+/**
+ * Inherit from `Array.prototype`.
+ */
+
+Collection.prototype.__proto__ = Array.prototype;
+
+/**
+ * Remove the routes in this collection.
+ *
+ * @return {Collection} of routes removed
+ * @api public
+ */
+
+Collection.prototype.remove = function(){
+  var router = this.router
+    , len = this.length
+    , ret = new Collection(this.router);
+
+  for (var i = 0; i < len; ++i) {
+    if (router.remove(this[i])) {
+      ret.push(this[i]);
+    }
+  }
+
+  return ret;
+};
+

lib/router/index.js

@@ -0,0 +1,383 @@
+
+/*!
+ * Express - Router
+ * Copyright(c) 2010 TJ Holowaychuk <tj@vision-media.ca>
+ * MIT Licensed
+ */
+
+/**
+ * Module dependencies.
+ */
+
+var Route = require('./route')
+  , Collection = require('./collection')
+  , utils = require('../utils')
+  , parse = require('url').parse
+  , toArray = utils.toArray;
+
+/**
+ * Expose `Router` constructor.
+ */
+
+exports = module.exports = Router;
+
+/**
+ * Expose HTTP methods.
+ */
+
+var methods = exports.methods = require('./methods');
+
+/**
+ * Initialize a new `Router` with the given `app`.
+ * 
+ * @param {express.HTTPServer} app
+ * @api private
+ */
+
+function Router(app) {
+  var self = this;
+  this.app = app;
+  this.routes = {};
+  this.params = {};
+  this._params = [];
+
+  this.middleware = function(req, res, next){
+    self._dispatch(req, res, next);
+  };
+}
+
+/**
+ * Register a param callback `fn` for the given `name`.
+ *
+ * @param {String|Function} name
+ * @param {Function} fn
+ * @return {Router} for chaining
+ * @api public
+ */
+
+Router.prototype.param = function(name, fn){
+  // param logic
+  if ('function' == typeof name) {
+    this._params.push(name);
+    return;
+  }
+
+  // apply param functions
+  var params = this._params
+    , len = params.length
+    , ret;
+
+  for (var i = 0; i < len; ++i) {
+    if (ret = params[i](name, fn)) {
+      fn = ret;
+    }
+  }
+
+  // ensure we end up with a
+  // middleware function
+  if ('function' != typeof fn) {
+    throw new Error('invalid param() call for ' + name + ', got ' + fn);
+  }
+
+  this.params[name] = fn;
+  return this;
+};
+
+/**
+ * Remove the given `route`, returns
+ * a bool indicating if the route was present
+ * or not.
+ *
+ * @param {Route} route
+ * @return {Boolean}
+ * @api public
+ */
+
+Router.prototype.remove = function(route){
+  var routes = this.routes[route.method]
+    , len = routes.length;
+
+  for (var i = 0; i < len; ++i) {
+    if (route == routes[i]) {
+      routes.splice(i, 1);
+      return true;
+    }
+  }
+};
+
+/**
+ * Return routes with route paths matching `path`.
+ *
+ * @param {String} method
+ * @param {String} path
+ * @return {Collection}
+ * @api public
+ */
+
+Router.prototype.lookup = function(method, path){
+  return this.find(function(route){
+    return path == route.path
+      && (route.method == method
+      || method == 'all');
+  });
+};
+
+/**
+ * Return routes with regexps that match the given `url`.
+ *
+ * @param {String} method
+ * @param {String} url
+ * @return {Collection}
+ * @api public
+ */
+
+Router.prototype.match = function(method, url){
+  return this.find(function(route){
+    return route.match(url)
+      && (route.method == method
+      || method == 'all');
+  });
+};
+
+/**
+ * Find routes based on the return value of `fn`
+ * which is invoked once per route.
+ *
+ * @param {Function} fn
+ * @return {Collection}
+ * @api public
+ */
+
+Router.prototype.find = function(fn){
+  var len = methods.length
+    , ret = new Collection(this)
+    , method
+    , routes
+    , route;
+
+  for (var i = 0; i < len; ++i) {
+    method = methods[i];
+    routes = this.routes[method];
+    if (!routes) continue;
+    for (var j = 0, jlen = routes.length; j < jlen; ++j) {
+      route = routes[j];
+      if (fn(route)) ret.push(route);
+    }
+  }
+
+  return ret;
+};
+
+/**
+ * Route dispatcher aka the route "middleware".
+ *
+ * @param {IncomingMessage} req
+ * @param {ServerResponse} res
+ * @param {Function} next
+ * @api private
+ */
+
+Router.prototype._dispatch = function(req, res, next){
+  var params = this.params
+    , self = this;
+
+  // route dispatch
+  (function pass(i){
+    var route
+      , keys
+      , ret;
+
+    // match next route
+    function nextRoute() {
+      pass(req._route_index + 1);
+    }
+
+    // match route
+    route = self._match(req, i);
+
+    // implied OPTIONS
+    if ('OPTIONS' == req.method) return self._options(req, res);
+
+    // no route
+    if (!route) return next();
+
+    // we have a route
+    // start at param 0
+    req.params = route.params;
+    keys = route.keys;
+    i = 0;
+
+    (function param(err) {
+      var key = keys[i++]
+        , val = req.params[key]
+        , fn = params[key]
+        , ret;
+
+      try {
+        if ('route' == err) {
+          nextRoute();
+        } else if (err) {
+          next(err);
+        } else if (fn) {
+          fn(req, res, param, val);
+        } else if (key) {
+          param();
+        } else {
+          i = 0;
+          middleware();
+        }
+      } catch (err) {
+        next(err);
+      }
+    })();
+
+    // invoke route middleware
+    function middleware(err) {
+      var fn = route.middleware[i++];
+      if ('route' == err) {
+        nextRoute();
+      } else if (err) {
+        next(err);
+      } else if (fn) {
+        fn(req, res, middleware);
+      } else {
+        done();
+      }
+    };
+
+    // invoke middleware callback
+    function done() {
+      route.callback.call(self, req, res, function(err){
+        if (err) return next(err);
+        pass(req._route_index + 1);
+      });
+    }
+  })(0);
+};
+
+/**
+ * Respond to __OPTIONS__ method.
+ *
+ * @param {IncomingMessage} req
+ * @param {ServerResponse} res
+ * @api private
+ */
+
+Router.prototype._options = function(req, res){
+  var path = parse(req.url).pathname
+    , body = this._optionsFor(path).join(',');
+  res.send(body, { Allow: body });
+};
+
+/**
+ * Return an array of HTTP verbs or "options" for `path`.
+ *
+ * @param {String} path
+ * @return {Array}
+ * @api private
+ */
+
+Router.prototype._optionsFor = function(path){
+  var self = this;
+  return methods.filter(function(method){
+    var routes = self.routes[method];
+    if (!routes) return;
+    for (var i = 0, len = routes.length; i < len; ++i) {
+      if (routes[i].match(path)) return true;
+    }
+  }).map(function(method){
+    return method.toUpperCase();
+  });
+};
+
+/**
+ * Attempt to match a route for `req`
+ * starting from offset `i`.
+ *
+ * @param {IncomingMessage} req
+ * @param {Number} i
+ * @return {Route}
+ * @api private
+ */
+
+Router.prototype._match = function(req, i){
+  var method = req.method.toLowerCase()
+    , url = parse(req.url)
+    , path = url.pathname
+    , routes = this.routes
+    , captures
+    , route
+    , keys;
+
+  // pass HEAD to GET routes
+  if ('head' == method) method = 'get';
+
+  // routes for this method
+  if (routes = routes[method]) {
+
+    // matching routes
+    for (var len = routes.length; i < len; ++i) {
+      route = routes[i];
+      if (captures = route.match(path)) {
+        keys = route.keys;
+        route.params = [];
+
+        // params from capture groups
+        for (var j = 1, jlen = captures.length; j < jlen; ++j) {
+          var key = keys[j-1]
+            , val = 'string' == typeof captures[j]
+              ? decodeURIComponent(captures[j])
+              : captures[j];
+          if (key) {
+            route.params[key] = val;
+          } else {
+            route.params.push(val);
+          }
+        }
+
+        // all done
+        req._route_index = i;
+        return route;
+      }
+    }
+  }
+};
+
+/**
+ * Route `method`, `path`, and optional middleware
+ * to the callback `fn`.
+ *
+ * @param {String} method
+ * @param {String} path
+ * @param {Function} ...
+ * @param {Function} fn
+ * @return {Router} for chaining
+ * @api private
+ */
+
+Router.prototype._route = function(method, path, fn){
+  var app = this.app
+    , middleware = [];
+
+  // slice middleware
+  if (arguments.length > 3) {
+    middleware = toArray(arguments, 2);
+    fn = middleware.pop();
+    middleware = utils.flatten(middleware);
+  }
+
+  // ensure path and callback are given
+  if (!path) throw new Error(method + 'route requires a path');
+  if (!fn) throw new Error(method + ' route ' + path + ' requires a callback');
+
+  // create the route
+  var route = new Route(method, path, fn, {
+      sensitive: app.enabled('case sensitive routes')
+    , middleware: middleware
+  });
+
+  // add it
+  (this.routes[method] = this.routes[method] || [])
+    .push(route);
+  return this;
+};

lib/router/methods.js

@@ -0,0 +1,70 @@
+
+/*!
+ * Express - router - methods
+ * Copyright(c) 2010 TJ Holowaychuk <tj@vision-media.ca>
+ * MIT Licensed
+ */
+
+/**
+ * Hypertext Transfer Protocol -- HTTP/1.1 
+ * http://www.ietf.org/rfc/rfc2616.txt
+ */
+
+var RFC2616 = ['OPTIONS', 'GET', 'POST', 'PUT', 'DELETE', 'TRACE', 'CONNECT'];
+
+/**
+ * HTTP Extensions for Distributed Authoring -- WEBDAV
+ * http://www.ietf.org/rfc/rfc2518.txt
+ */
+
+var RFC2518 = ['PROPFIND', 'PROPPATCH', 'MKCOL', 'COPY', 'MOVE', 'LOCK', 'UNLOCK'];
+
+/**
+ * Versioning Extensions to WebDAV 
+ * http://www.ietf.org/rfc/rfc3253.txt
+ */
+
+var RFC3253 = ['VERSION-CONTROL', 'REPORT', 'CHECKOUT', 'CHECKIN', 'UNCHECKOUT', 'MKWORKSPACE', 'UPDATE', 'LABEL', 'MERGE', 'BASELINE-CONTROL', 'MKACTIVITY'];
+
+/**
+ * Ordered Collections Protocol (WebDAV) 
+ * http://www.ietf.org/rfc/rfc3648.txt
+ */
+
+var RFC3648 = ['ORDERPATCH'];
+
+/**
+ * Web Distributed Authoring and Versioning (WebDAV) Access Control Protocol 
+ * http://www.ietf.org/rfc/rfc3744.txt
+ */
+
+var RFC3744 = ['ACL'];
+
+/**
+ * Web Distributed Authoring and Versioning (WebDAV) SEARCH
+ * http://www.ietf.org/rfc/rfc5323.txt
+ */
+
+var RFC5323 = ['SEARCH'];
+
+/**
+ * PATCH Method for HTTP 
+ * http://www.ietf.org/rfc/rfc5789.txt
+ */
+
+var RFC5789 = ['PATCH'];
+
+/**
+ * Expose the methods.
+ */
+
+module.exports = [].concat(
+    RFC2616
+  , RFC2518
+  , RFC3253
+  , RFC3648
+  , RFC3744
+  , RFC5323
+  , RFC5789).map(function(method){
+    return method.toLowerCase();
+  });

lib/router/route.js

@@ -0,0 +1,85 @@
+
+/*!
+ * Express - router - Route
+ * Copyright(c) 2010 TJ Holowaychuk <tj@vision-media.ca>
+ * MIT Licensed
+ */
+
+/**
+ * Expose `Route`.
+ */
+
+module.exports = Route;
+
+/**
+ * Initialize `Route` with the given HTTP `method`, `path`,
+ * and callback `fn` and `options`.
+ *
+ * Options:
+ *
+ *   - `sensitive`   enable case-sensitive routes
+ *   - `middleware`   array of middleware
+ *
+ * @param {String} method
+ * @param {String} path
+ * @param {Function} fn
+ * @param {Object} options.
+ * @api private
+ */
+
+function Route(method, path, fn, options) {
+  options = options || {};
+  this.callback = fn;
+  this.path = path;
+  this.method = method;
+  this.regexp = normalize(path, this.keys = [], options.sensitive);
+  this.middleware = options.middleware;
+}
+
+/**
+ * Check if this route matches `path` and return captures made.
+ *
+ * @param {String} path
+ * @return {Array}
+ * @api private
+ */
+
+Route.prototype.match = function(path){
+  return this.regexp.exec(path);
+};
+
+/**
+ * Normalize the given path string,
+ * returning a regular expression.
+ *
+ * An empty array should be passed,
+ * which will contain the placeholder
+ * key names. For example "/user/:id" will
+ * then contain ["id"].
+ *
+ * @param  {String|RegExp} path
+ * @param  {Array} keys
+ * @param  {Boolean} sensitive
+ * @return {RegExp}
+ * @api private
+ */
+
+function normalize(path, keys, sensitive) {
+  if (path instanceof RegExp) return path; 
+  path = path
+    .concat('/?')
+    .replace(/\/\(/g, '(?:/')
+    .replace(/(\/)?(\.)?:(\w+)(?:(\(.*?\)))?(\?)?/g, function(_, slash, format, key, capture, optional){
+      keys.push(key);
+      slash = slash || '';
+      return ''
+        + (optional ? '' : slash)
+        + '(?:'
+        + (optional ? slash : '')
+        + (format || '') + (capture || '([^/]+?)') + ')'
+        + (optional || '');
+    })
+    .replace(/([\/.])/g, '\\$1')
+    .replace(/\*/g, '(.+)');
+  return new RegExp('^' + path + '$', sensitive ? '' : 'i');
+}

lib/utils.js

@@ -5,64 +5,6 @@
  * MIT Licensed
  */
 
-/**
- * Module dependencies.
- */
-
-var path = require('path')
-  , basename = path.basename
-  , dirname = path.dirname
-  , extname = path.extname;
-
-/**
- * Memory cache.
- */
-
-var cache = {
-    basename: {}
-  , dirname: {}
-  , extname: {}
-};
-
-/**
- * Cached basename.
- *
- * @param {String} path
- * @return {String}
- * @api private
- */
-
-exports.basename = function(path){
-  return cache.basename[path]
-    || (cache.basename[path] = basename(path));
-};
-
-/**
- * Cached dirname.
- *
- * @param {String} path
- * @return {String}
- * @api private
- */
-
-exports.dirname = function(path){
-  return cache.dirname[path]
-    || (cache.dirname[path] = dirname(path));
-};
-
-/**
- * Cached extname.
- *
- * @param {String} path
- * @return {String}
- * @api private
- */
-
-exports.extname = function(path){
-  return cache.extname[path]
-    || (cache.extname[path] = extname(path));
-};
-
 /**
  * Merge object `b` with `a` giving precedence to
  * values in object `a`.
@@ -88,6 +30,27 @@ exports.union = function(a, b){
   return a;
 };
 
+/**
+ * Flatten the given `arr`.
+ *
+ * @param {Array} arr
+ * @return {Array}
+ * @api private
+ */
+
+exports.flatten = function(arr, ret){
+  var ret = ret || []
+    , len = arr.length;
+  for (var i = 0; i < len; ++i) {
+    if (Array.isArray(arr[i])) {
+      exports.flatten(arr[i], ret);
+    } else {
+      ret.push(arr[i]);
+    }
+  }
+  return ret;
+};
+
 /**
  * Parse mini markdown implementation.
  * The following conversions are supported,
@@ -117,7 +80,7 @@ exports.miniMarkdown = function(str){
  * @api private
  */
 
-exports.htmlEscape = function(html) {
+exports.escape = function(html) {
   return String(html)
     .replace(/&/g, '&amp;')
     .replace(/"/g, '&quot;')
@@ -157,3 +120,20 @@ exports.parseRange = function(size, str){
   });
   return valid ? arr : undefined;
 };
+
+/**
+ * Fast alternative to `Array.prototype.slice.call()`.
+ *
+ * @param {Arguments} args
+ * @param {Number} n
+ * @return {Array}
+ * @api public
+ */
+
+exports.toArray = function(args, i){
+  var arr = []
+    , len = args.length
+    , i = i || 0;
+  for (; i < len; ++i) arr.push(args[i]);
+  return arr;
+};

lib/view.js

@@ -21,14 +21,6 @@ var path = require('path')
   , http = require('http')
   , res = http.ServerResponse.prototype;
 
-/**
- * Memory cache.
- *
- * @type Object
- */
-
-var cache = {};
-
 /**
  * Expose constructors.
  */
@@ -41,6 +33,91 @@ exports = module.exports = View;
 
 exports.register = View.register;
 
+/**
+ * Lookup and compile `view` with cache support by supplying
+ * both the `cache` object and `cid` string,
+ * followed by `options` passed to `exports.lookup()`.
+ *
+ * @param {String} view
+ * @param {Object} cache
+ * @param {Object} cid
+ * @param {Object} options
+ * @return {View}
+ * @api private
+ */
+
+exports.compile = function(view, cache, cid, options){
+  if (cache && cid && cache[cid]) return cache[cid];
+
+  // lookup
+  view = exports.lookup(view, options);
+
+  // hints
+  if (!view.exists) {
+    if (options.hint) hintAtViewPaths(view.original, options);
+    var err = new Error('failed to locate view "' + view.original.view + '"');
+    err.view = view.original;
+    throw err;
+  }    
+
+  // compile
+  view.fn = view.templateEngine.compile(view.contents, options);
+  cache[cid] = view;
+  
+  return view;
+};
+
+/**
+ * Lookup `view`, returning an instanceof `View`.
+ *
+ * Options:
+ *
+ *   - `root` root directory path
+ *   - `defaultEngine` default template engine
+ *   - `parentView` parent `View` object
+ *   - `cache` cache object
+ *   - `cacheid` optional cache id
+ *
+ * Lookup:
+ *
+ *   - partial `_<name>` 
+ *   - any `<name>/index` 
+ *   - non-layout `../<name>/index` 
+ *   - any `<root>/<name>` 
+ *   - partial `<root>/_<name>` 
+ *
+ * @param {String} view
+ * @param {Object} options
+ * @return {View}
+ * @api private
+ */
+
+exports.lookup = function(view, options){
+  var orig = view = new View(view, options);
+
+  // Try _ prefix ex: ./views/_<name>.jade
+  if (partial) {
+    view = new View(orig.prefixPath, options);
+    if (!view.exists) view = orig;
+  }
+
+  // Try index ex: ./views/user/index.jade
+  if (!view.exists) view = new View(orig.indexPath, options);
+
+  // Try ../<name>/index ex: ../user/index.jade
+  // when calling partial('user') within the same dir
+  if (!view.exists && !options.isLayout) view = new View(orig.upIndexPath, options);
+
+  // Try root ex: <root>/user.jade
+  if (!view.exists) view = new View(orig.rootPath, options);
+
+  // Try root _ prefix ex: <root>/_user.jade
+  if (!view.exists && partial) view = new View(view.prefixPath, options);
+
+  view.original = orig;
+  return view;
+};
+
 /**
  * Partial render helper.
  *
@@ -179,6 +256,7 @@ function renderPartial(res, view, options, parentLocals, parent){
 res.partial = function(view, options, fn){
   var app = this.app
     , options = options || {}
+    , viewEngine = app.set('view engine')
     , parent = {};
 
   // accept callback as second argument
@@ -191,9 +269,7 @@ res.partial = function(view, options, fn){
   parent.dirname = app.set('views') || process.cwd() + '/views';
 
   // utilize "view engine" option
-  if (app.set('view engine')) {
-    parent.extension = '.' + app.set('view engine');
-  }
+  if (viewEngine) parent.extension = '.' + viewEngine;
 
   // render the partial
   try {
@@ -261,12 +337,16 @@ res._render = function(view, opts, fn, parent, sub){
   var options = {}
     , self = this
     , app = this.app
-    , helpers = app.viewHelpers
+    , helpers = app._locals
     , dynamicHelpers = app.dynamicViewHelpers
     , viewOptions = app.set('view options')
-    , cacheViews = app.set('cache views')
     , root = app.set('views') || process.cwd() + '/views';
 
+  // cache id
+  var cid = app.enabled('view cache')
+    ? view + (parent ? ':' + parent.path : '')
+    : false;
+
   // merge "view options"
   if (viewOptions) merge(options, viewOptions);
 
@@ -282,6 +362,9 @@ res._render = function(view, opts, fn, parent, sub){
   // status support
   if (options.status) this.statusCode = options.status;
 
+  // capture attempts
+  options.attempts = [];
+
   var partial = options.renderPartial
     , layout = options.layout;
 
@@ -330,45 +413,11 @@ res._render = function(view, opts, fn, parent, sub){
     return renderPartial(self, path, opts, options, view);
   };
 
-  // Provide filename to engine
+  // View lookup
+  options.hint = app.enabled('hints');
+  view = exports.compile(view, app.cache, cid, options);
   options.filename = view.path;
 
-  // cached view
-  if (cache[view]) {
-    view = cache[view];
-  // resolve view
-  } else {
-    var orig = view = new View(view, options);
-
-    // Try _ prefix ex: ./views/_<name>.jade
-    if (!view.exists) view = new View(orig.prefixPath, options);
-  
-    // Try index ex: ./views/user/index.jade
-    if (!view.exists) view = new View(orig.indexPath, options);
-
-    // Try ../<name>/index ex: ../user/index.jade
-    // when calling partial('user') within the same dir
-    if (!view.exists && !options.isLayout) view = new View(orig.upIndexPath, options);
-
-    // Try root ex: <root>/user.jade
-    if (!view.exists) view = new View(orig.rootPath, options);
-
-    // Try root _ prefix ex: <root>/_user.jade
-    if (!view.exists && partial) view = new View(view.prefixPath, options);
-
-    // Does not exist
-    if (!view.exists) {
-      if (app.enabled('hints')) hintAtViewPaths(orig, options);
-      var err = new Error('failed to locate view "' + orig.view + '"');
-      err.view = orig;
-      throw err;
-    }    
-
-    var engine = view.templateEngine;
-    view.fn = engine.compile(view.contents, options)
-    if (cacheViews) cache[orig.view] = view;
-  }
-
   // layout helper
   options.layout = function(path){
     layout = path;
@@ -406,10 +455,8 @@ res._render = function(view, opts, fn, parent, sub){
 function hintAtViewPaths(view, options) {
   console.error();
   console.error('failed to locate view "' + view.view + '", tried:');
-  console.error('  - ' + new View(view.path, options).path);
-  console.error('  - ' + new View(view.prefixPath, options).path);
-  console.error('  - ' + new View(view.indexPath, options).path);
-  if (!options.isLayout) console.error('  - ' + new View(view.upIndexPath, options).path);
-  if (options.isLayout) console.error('  - ' + new View(view.rootPath, options).path);
+  options.attempts.forEach(function(path){
+    console.error('  - %s', path);
+  });
   console.error();
 }

lib/view/view.js

@@ -9,13 +9,19 @@
  * Module dependencies.
  */
 
-var utils = require('../utils')
-  , extname = utils.extname
-  , dirname = utils.dirname
-  , basename = utils.basename
+var path = require('path')
+  , extname = path.extname
+  , dirname = path.dirname
+  , basename = path.basename
   , fs = require('fs')
   , stat = fs.statSync;
 
+/**
+ * Expose `View`.
+ */
+
+exports = module.exports = View;
+
 /**
  * Require cache.
  */
@@ -30,7 +36,7 @@ var cache = {};
  * @api private
  */
 
-var View = exports = module.exports = function View(view, options) {
+function View(view, options) {
   options = options || {};
   this.view = view;
   this.root = options.root;
@@ -43,6 +49,10 @@ var View = exports = module.exports = function View(view, options) {
   this.name = this.basename.replace(this.extension, '');
   this.path = this.resolvePath();
   this.dirname = dirname(this.path);
+  if (options.attempts) {
+    if (!~options.attempts.indexOf(this.path))
+      options.attempts.push(this.path);
+  }
 };
 
 /**

package.json

@@ -1,7 +1,7 @@
 {
   "name": "express",
   "description": "Sinatra inspired web development framework",
-  "version": "2.2.1",
+  "version": "2.3.7",
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "contributors": [ 
     { "name": "TJ Holowaychuk", "email": "tj@vision-media.ca" }, 
@@ -10,10 +10,22 @@
     { "name": "Guillermo Rauch", "email": "rauchg@gmail.com" }
   ],
   "dependencies": {
-    "connect": ">= 1.2.0 < 2.0.0",
+    "connect": ">= 1.4.1 < 2.0.0",
     "mime": ">= 0.0.1",
     "qs": ">= 0.0.6"
   },
+  "devDependencies": {
+    "connect-form": "0.2.1",
+    "ejs": "0.4.2",
+    "expresso": "0.7.2",
+    "hamljs": "0.5.1",
+    "jade": "0.11.0",
+    "stylus": "0.13.0",
+    "should": "0.2.1",
+    "express-messages": "0.0.2",
+    "node-markdown": ">= 0.0.1",
+    "connect-redis": ">= 0.0.1"
+  },
   "keywords": ["framework", "sinatra", "web", "rest", "restful"],
   "repository": "git://github.com/visionmedia/express",
   "main": "index",

test/express.test.js

@@ -6,7 +6,8 @@
 var express = require('express')
   , connect = require('connect')
   , assert = require('assert')
-  , should = require('should');
+  , should = require('should')
+  , Route = express.Route;
 
 module.exports = {
   'test inheritance': function(){
@@ -17,6 +18,7 @@ module.exports = {
   'test constructor exports': function(){
     express.should.have.property('HTTPServer');
     express.should.have.property('HTTPSServer');
+    express.should.have.property('Route');
   },
   
   'test connect middleware autoloaders': function(){
@@ -435,173 +437,29 @@ module.exports = {
     );
   },
   
-  'test route middleware': function(){
-    var app = express.createServer();
-
-    function allow(role) {
-      return function(req, res, next) {
-        // this is totally not real, dont use this :)
-        // for tests only
-        if (req.headers['x-role'] == role) {
-          next();
-        } else {
-          res.send(401);
-        }
-      }
-    }
-    
-    function restrictAge(age) {
-      return function(req, res, next){
-        if (req.headers['x-age'] >= age) {
-          next();
-        } else {
-          res.send(403);
-        }
-      }
+  'test routes with same callback': function(){
+    function handle(req, res) {
+      res.send('got ' + req.string);
     }
 
-    app.get('/xxx', allow('member'), restrictAge(18), function(req, res){
-      res.send(200);
-    });
-
-    app.get('/booze', [allow('member')], restrictAge(18), function(req, res){
-      res.send(200);
-    });
-
-    app.get('/tobi', [allow('member')], [[restrictAge(18)]], function(req, res){
-      res.send(200);
-    });
-
-    ['xxx', 'booze', 'tobi'].forEach(function(thing){
-      assert.response(app,
-        { url: '/' + thing },
-        { body: 'Unauthorized', status: 401 });
-      assert.response(app,
-        { url: '/' + thing, headers: { 'X-Role': 'member' }},
-        { body: 'Forbidden', status: 403 });
-      assert.response(app,
-        { url: '/' + thing, headers: { 'X-Role': 'member', 'X-Age': 18 }},
-        { body: 'OK', status: 200 });
-    });
-  },
-  
-  'test named capture groups': function(){
     var app = express.createServer();
 
-    app.get('/user/:id([0-9]{2,10})', function(req, res){
-      res.send('user ' + req.params.id);
-    });
+    app.get('/', function(req, res, next){
+      req.string = '/';
+      next();
+    }, handle);
+
+    app.get('/another', function(req, res, next){
+      req.string = '/another';
+      next();
+    }, handle);
 
     assert.response(app,
-      { url: '/user/12' },
-      { body: 'user 12' });
-    
+      { url: '/' },
+      { body: 'got /' });
+
     assert.response(app,
-      { url: '/user/ab' },
-      { body: 'Cannot GET /user/ab' });
-  },
-  
-  'test .param()': function(){
-    var app = express.createServer();
-
-    var users = [
-        { name: 'tj' }
-      , { name: 'tobi' }
-      , { name: 'loki' }
-      , { name: 'jane' }
-      , { name: 'bandit' }
-    ];
-
-    function integer(n){ return parseInt(n, 10); };
-    app.param(['to', 'from'], integer);
-
-    app.param('user', function(req, res, next, id){
-      if (req.user = users[id]) {
-        next();
-      } else {
-        next(new Error('failed to find user'));
-      }
-    });
-
-    app.get('/user/:user', function(req, res, next){
-      res.send('user ' + req.user.name);
-    });
-
-    app.get('/users/:from-:to', function(req, res, next){
-      var names = users.slice(req.params.from, req.params.to).map(function(user){
-        return user.name;
-      });
-      res.send('users ' + names.join(', '));
-    });
-    
-    assert.response(app,
-      { url: '/user/0' },
-      { body: 'user tj' });
-    
-    assert.response(app,
-      { url: '/user/1' },
-      { body: 'user tobi' });
-    
-    assert.response(app,
-      { url: '/users/0-3' },
-      { body: 'users tj, tobi, loki' });
-  },
-  
-  'test OPTIONS': function(){
-    var app = express.createServer();
-    
-    app.get('/', function(){});
-    app.get('/user/:id', function(){});
-    app.put('/user/:id', function(){});
-    
-    assert.response(app,
-      { url: '/', method: 'OPTIONS' },
-      { headers: { Allow: 'GET' }});
-    
-    assert.response(app,
-      { url: '/user/12', method: 'OPTIONS' },
-      { headers: { Allow: 'GET,PUT' }});
-  },
-  
-  'test app.lookup': function(){
-    var app = express.createServer();
-    app.get('/user', function(){});
-    app.get('/user/:id', function(){});
-    app.get('/user/:id/:op?', function(){});
-    app.put('/user/:id', function(){});
-    app.get('/user/:id/edit', function(){});
-
-    app.get('/user').should.have.length(1);
-    app.get('/user/:id').should.have.length(1);
-    app.get('/user/:id/:op?').should.have.length(1);
-    app.put('/user/:id').should.have.length(1);
-    app.get('/user/:id/edit').should.have.length(1);
-    app.get('/').should.have.be.empty;
-    app.all('/user/:id').should.have.length(2);
-    
-    app.lookup.get('/user').should.have.length(1);
-    app.lookup.get('/user/:id').should.have.length(1);
-    app.lookup.get('/user/:id/:op?').should.have.length(1);
-    app.lookup.put('/user/:id').should.have.length(1);
-    app.lookup.get('/user/:id/edit').should.have.length(1);
-    app.lookup.get('/').should.have.be.empty;
-    app.lookup.all('/user/:id').should.have.length(2);
-  },
-  
-  'test app.match': function(){
-    var app = express.createServer();
-    app.get('/user', function(){});
-    app.get('/user/:id', function(){});
-    app.get('/user/:id/:op?', function(){});
-    app.put('/user/:id', function(){});
-    app.get('/user/:id/edit', function(){});
-
-    app.match.get('/user').should.have.length(1);
-    app.match.get('/user/12').should.have.length(2);
-    app.match.get('/user/12/:op?').should.have.length(1);
-    app.match.put('/user/100').should.have.length(1);
-    app.match.get('/user/5/edit').should.have.length(2);
-    app.match.get('/').should.have.be.empty;
-    app.match.all('/user/123').should.have.length(3);
+      { url: '/another' },
+      { body: 'got /another' });
   }
 };

test/fixtures/_foobar.jade

@@ -0,0 +1 @@
+p two

test/fixtures/foobar.jade

@@ -0,0 +1 @@
+p one

test/fixtures/some random text file.txt

@@ -0,0 +1 @@
+hello

test/response.test.js

@@ -15,7 +15,7 @@ module.exports = {
     app.get('/html', function(req, res){
       res.send('<p>test</p>', { 'Content-Language': 'en' });
     });
-    
+
     app.get('/json', function(req, res){
       res.header('X-Foo', 'bar');
       res.send({ foo: 'bar' }, { 'X-Foo': 'baz' }, 201);
@@ -38,6 +38,10 @@ module.exports = {
       res.send(404);
     });
     
+    app.get('/status/text', function(req, res){
+      res.send('Oh noes!', 404);
+    });
+    
     app.get('/error', function(req, res){
       res.send('Oh shit!', { 'Content-Type': 'text/plain' }, 500);
     });
@@ -61,7 +65,7 @@ module.exports = {
     assert.response(app,
       { url: '/bool' },
       { body: 'true'
-      , headers: { 'Content-Type': 'application/json' }});
+      , headers: { 'Content-Type': 'application/json; charset=utf-8' }});
 
     assert.response(app,
       { url: '/html' },
@@ -76,7 +80,7 @@ module.exports = {
       { body: '{"foo":"bar"}'
       , status: 201
       , headers: {
-          'Content-Type': 'application/json'
+          'Content-Type': 'application/json; charset=utf-8'
         , 'X-Foo': 'baz'
       }});
   
@@ -85,7 +89,7 @@ module.exports = {
       { body: 'test({"foo":"bar"});'
       , status: 201
       , headers: {
-          'Content-Type': 'text/javascript'
+          'Content-Type': 'text/javascript; charset=utf-8'
         , 'X-Foo': 'baz'
       }});
   
@@ -93,7 +97,7 @@ module.exports = {
       { url: '/jsonp?callback=baz' },
       { body: 'baz({"foo":"bar"});'
       , status: 201, headers: {
-          'Content-Type': 'text/javascript'
+          'Content-Type': 'text/javascript; charset=utf-8'
         , 'X-Foo': 'baz'
       }});
   
@@ -102,7 +106,7 @@ module.exports = {
       { body: 'invalid({"foo":"bar"});'
       , status: 201
       , headers: {
-          'Content-Type': 'text/javascript'
+          'Content-Type': 'text/javascript; charset=utf-8'
         , 'X-Foo': 'baz'
       }});
   
@@ -111,7 +115,7 @@ module.exports = {
       { body: '{"foo":"bar"}'
       , status: 201
       , headers: {
-          'Content-Type': 'application/json'
+          'Content-Type': 'application/json; charset=utf-8'
         , 'X-Foo': 'baz'
       }});
   
@@ -122,7 +126,11 @@ module.exports = {
           'Content-Type': 'text/plain'
         , 'X-Foo': 'bar'
       }});
-  
+
+    assert.response(app,
+      { url: '/status/text' },
+      { body: 'Oh noes!', status: 404 });
+
     assert.response(app,
       { url: '/status' },
       { body: 'Not Found'
@@ -207,12 +215,14 @@ module.exports = {
     assert.response(app,
       { url: '/javascripts/jquery.js' },
       { body: 'whatever'
-      , headers: { 'Content-Disposition': 'attachment; filename="jquery.js"' }});
+      , headers: { 'Content-Type': 'application/javascript'
+                 , 'Content-Disposition': 'attachment; filename="jquery.js"' }});
 
     assert.response(app,
       { url: '/style.css' },
       { body: 'some stylezzz'
-      , headers: { 'Content-Disposition': 'attachment' }});
+      , headers: { 'Content-Type': 'text/html; charset=utf-8'
+                 , 'Content-Disposition': 'attachment' }});
   },
   
   'test #redirect()': function(){
@@ -542,6 +552,10 @@ module.exports = {
         assert.equal(null, res.headers['content-disposition']);
       });
 
+    assert.response(app,
+      { url: '/some%20random%20text%20file.txt' },
+      { body: 'hello' });
+
     beforeExit(function(){
       calls.should.equal(1);
     });
@@ -568,7 +582,7 @@ module.exports = {
     var app = express.createServer();
     
     app.get('/', function(req, res){
-      res.clearCookie('rememberme');
+      res.clearCookie('rememberme', { path: '/foo' });
       res.redirect('/');
     });
     
@@ -576,7 +590,7 @@ module.exports = {
       { url: '/' },
       function(res){
         res.headers['set-cookie']
-          .should.eql(['rememberme=; expires=Thu, 01 Jan 1970 00:00:00 GMT']);
+          .should.eql(['rememberme=; path=/foo; expires=Thu, 01 Jan 1970 00:00:00 GMT']);
       });
   },
   

test/router.test.js

@@ -0,0 +1,281 @@
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('express')
+  , connect = require('connect')
+  , assert = require('assert')
+  , should = require('should')
+  , Route = express.Route;
+
+module.exports = {
+  'test route middleware': function(beforeExit){
+    var app = express.createServer()
+      , calls = 0;
+
+    function allow(role) {
+      return function(req, res, next) {
+        // this is totally not real, dont use this :)
+        // for tests only
+        if (req.headers['x-role'] == role) {
+          next();
+        } else {
+          res.send(401);
+        }
+      }
+    }
+    
+    function restrictAge(age) {
+      return function(req, res, next){
+        if (req.headers['x-age'] >= age) {
+          next();
+        } else {
+          res.send(403);
+        }
+      }
+    }
+
+    app.param('user', function(req, res, next, user){
+      ++calls;
+      next();
+    });
+
+    app.get('/xxx', allow('member'), restrictAge(18), function(req, res){
+      res.send(200);
+    });
+
+    app.get('/booze', [allow('member')], restrictAge(18), function(req, res){
+      res.send(200);
+    });
+
+    app.get('/tobi', [allow('member')], [[restrictAge(18)]], function(req, res){
+      res.send(200);
+    });
+    
+    app.get('/user/:user', [allow('member'), [[restrictAge(18)]]], function(req, res){
+      res.send(200);
+    });
+
+    ['xxx', 'booze', 'tobi', 'user/tj'].forEach(function(thing){
+      assert.response(app,
+        { url: '/' + thing },
+        { body: 'Unauthorized', status: 401 });
+      assert.response(app,
+        { url: '/' + thing, headers: { 'X-Role': 'member' }},
+        { body: 'Forbidden', status: 403 });
+      assert.response(app,
+        { url: '/' + thing, headers: { 'X-Role': 'member', 'X-Age': 18 }},
+        { body: 'OK', status: 200 });
+    });
+
+    beforeExit(function(){
+      calls.should.equal(3);
+    });
+  },
+
+  'test named capture groups': function(){
+    var app = express.createServer();
+
+    app.get('/user/:id([0-9]{2,10})', function(req, res){
+      res.send('user ' + req.params.id);
+    });
+
+    app.post('/pin/save/:lat(\\d+.\\d+)/:long(\\d+.\\d+)', function(req, res){
+      res.send(req.params.lat + ' ' + req.params.long);
+    });
+
+    app.post('/pin/save2/:lat([0-9]+.[0-9]+)/:long([0-9]+.[0-9]+)', function(req, res){
+      res.send(req.params.lat + ' ' + req.params.long);
+    });
+
+    assert.response(app,
+      { url: '/pin/save/1.2/3.4', method: 'POST' },
+      { body: '1.2 3.4' });
+
+    assert.response(app,
+      { url: '/pin/save2/1.2/3.4', method: 'POST' },
+      { body: '1.2 3.4' });
+
+    assert.response(app,
+      { url: '/user/12' },
+      { body: 'user 12' });
+    
+    assert.response(app,
+      { url: '/user/ab' },
+      { body: 'Cannot GET /user/ab' });
+  },
+  
+  'test .param()': function(){
+    var app = express.createServer();
+
+    var users = [
+        { name: 'tj' }
+      , { name: 'tobi' }
+      , { name: 'loki' }
+      , { name: 'jane' }
+      , { name: 'bandit' }
+    ];
+
+    app.param('user', function(req, res, next, id){
+      if (req.user = users[id]) {
+        next();
+      } else {
+        next(new Error('failed to find user'));
+      }
+    });
+
+    app.get('/user/:user', function(req, res, next){
+      res.send('user ' + req.user.name);
+    });
+
+    assert.response(app,
+      { url: '/user/0' },
+      { body: 'user tj' });
+    
+    assert.response(app,
+      { url: '/user/1' },
+      { body: 'user tobi' });
+  },
+  
+  'test OPTIONS': function(){
+    var app = express.createServer();
+    
+    app.get('/', function(){});
+    app.get('/user/:id', function(){});
+    app.put('/user/:id', function(){});
+    
+    assert.response(app,
+      { url: '/', method: 'OPTIONS' },
+      { headers: { Allow: 'GET' }});
+    
+    assert.response(app,
+      { url: '/user/12', method: 'OPTIONS' },
+      { headers: { Allow: 'GET,PUT' }});
+  },
+  
+  'test app.lookup': function(){
+    var app = express.createServer();
+    app.get('/user', function(){});
+    app.get('/user/:id', function(){});
+    app.get('/user/:id/:op?', function(){});
+    app.put('/user/:id', function(){});
+    app.get('/user/:id/edit', function(){});
+
+    var route = app.get('/user/:id')[0]
+    route.should.be.an.instanceof(Route);
+    route.callback.should.be.a('function');
+    route.path.should.equal('/user/:id');
+    route.regexp.should.be.an.instanceof(RegExp);
+    route.method.should.equal('get');
+    route.keys.should.eql(['id']);
+
+    app.get('/user').should.have.length(1);
+    app.get('/user/:id').should.have.length(1);
+    app.get('/user/:id/:op?').should.have.length(1);
+    app.put('/user/:id').should.have.length(1);
+    app.get('/user/:id/edit').should.have.length(1);
+    app.get('/').should.have.be.empty;
+    app.all('/user/:id').should.have.length(2);
+
+    app.lookup.get('/user').should.have.length(1);
+    app.lookup.get('/user/:id').should.have.length(1);
+    app.lookup.get('/user/:id/:op?').should.have.length(1);
+    app.lookup.put('/user/:id').should.have.length(1);
+    app.lookup.get('/user/:id/edit').should.have.length(1);
+    app.lookup.get('/').should.have.be.empty;
+    app.lookup.all('/user/:id').should.have.length(2);
+    app.lookup('/user/:id').should.have.length(2);
+  },
+
+  'test app.remove': function(){
+    var app = express.createServer();
+    app.get('/user', function(){});
+    app.get('/user', function(){});
+    app.put('/user', function(){});
+
+    app.get('/user').should.have.length(2);
+    var removed = app.remove.get('/user');
+    removed.should.have.length(2);
+
+    var removed = app.remove.get('/user');
+    removed.should.have.length(0);
+    app.get('/user').should.have.length(0);
+
+    app.get('/user/:id', function(){});
+    app.put('/user/:id', function(){});
+    app.del('/user/:id', function(){});
+
+    app.remove.all('/user/:id').should.have.length(3);
+    app.remove.all('/user/:id').should.have.length(0);
+    
+    app.get('/user/:id', function(){});
+    app.put('/user/:id', function(){});
+    app.del('/user/:id', function(){});
+
+    app.remove('/user/:id').should.have.length(3);
+  },
+  
+  'test app.match': function(){
+    var app = express.createServer();
+    app.get('/user', function(){});
+    app.get('/user/:id', function(){});
+    app.get('/user/:id/:op?', function(){});
+    app.put('/user/:id', function(){});
+    app.get('/user/:id/edit', function(){});
+
+    var route = app.match.get('/user/12')[0];
+    route.should.be.an.instanceof(Route);
+    route.callback.should.be.a('function');
+    route.path.should.equal('/user/:id');
+    route.regexp.should.be.an.instanceof(RegExp);
+    route.method.should.equal('get');
+    route.keys.should.eql(['id']);
+    //route.params.id.should.equal('12');
+
+    app.match.get('/user').should.have.length(1);
+    app.match.get('/user/12').should.have.length(2);
+    app.match.get('/user/12/:op?').should.have.length(1);
+    app.match.put('/user/100').should.have.length(1);
+    app.match.get('/user/5/edit').should.have.length(2);
+    app.match.get('/').should.have.be.empty;
+    app.match.all('/user/123').should.have.length(3);
+    app.match('/user/123').should.have.length(3);
+  },
+
+  'test Collection': function(){
+    var app = express.createServer();
+    app.get('/user', function(){});
+    app.get('/user/:id', function(){});
+    app.get('/user/:id/:op?', function(){});
+    app.put('/user/:id', function(){});
+    app.get('/user/:id/edit', function(){});
+
+    var ret = app.match.all('/user/12').remove();
+    ret.should.have.length(3);
+    app.match.all('/user/12').should.have.length(0);
+    app.get('/user/:id').should.have.length(0);
+  },
+  
+  'test "case sensitive routes" setting': function(){
+    var app = express.createServer();
+
+    app.enable('case sensitive routes');
+
+    app.get('/account', function(req, res){
+      res.send('account');
+    });
+    
+    app.get('/Account', function(req, res){
+      res.send('Account');
+    });
+
+    assert.response(app,
+      { url: '/account' },
+      { body: 'account' });
+
+    assert.response(app,
+      { url: '/Account' },
+      { body: 'Account' });
+  }
+};

test/view.test.js

@@ -105,6 +105,7 @@ module.exports = {
   'test #render()': function(){
     var app = create();
     app.set('view engine', 'jade');
+    app.register('haml', require('hamljs'));
   
     app.get('/', function(req, res){
       res.render('index.jade', { layout: false });
@@ -657,6 +658,14 @@ module.exports = {
     assert.response(app,
       { url: '/error' },
       { status: 500 });
+
+    app.get('/underscore', function(req, res, next){
+      res.partial('foobar');
+    });
+
+    assert.response(app,
+      { url: '/underscore' },
+      { body: '<p>two</p>' });
   },
   
   'test #partial() with several calls': function(){