Release 2.3.5

reads better:

   express.view.lookup(...)

History.md

@@ -1,4 +1,15 @@
 
+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 
 ==================
 

bin/express

@@ -11,7 +11,7 @@ var fs = require('fs')
  * Framework version.
  */
 
-var version = '2.3.3';
+var version = '2.3.5';
 
 /**
  * Add session support.

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

@@ -167,7 +167,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
 
@@ -249,6 +249,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.

examples/say/app.js

@@ -0,0 +1,47 @@
+
+// Expose modules in ./support for demo purposes
+require.paths.unshift(__dirname + '/../../support');
+
+/**
+ * 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);

lib/express.js

@@ -28,7 +28,7 @@ var exports = module.exports = connect.middleware;
  * Framework version.
  */
 
-exports.version = '2.3.3';
+exports.version = '2.3.5';
 
 /**
  * Shortcut for `new Server(...)`.
@@ -58,7 +58,8 @@ exports.Route = Route;
  * View extensions.
  */
 
-require('./view');
+exports.View =
+exports.view = require('./view');
 
 /**
  * Response extensions.

lib/http.js

@@ -12,7 +12,7 @@
 var qs = require('qs')
   , connect = require('connect')
   , router = require('./router')
-  , methods = router.methods.concat(['del', 'all'])
+  , methods = router.methods.concat('del', 'all')
   , view = require('./view')
   , url = require('url')
   , utils = connect.utils;
@@ -475,7 +475,7 @@ app.configure = function(env, fn){
 
 // Generate routing methods
 
-function generateMethod(method){
+methods.forEach(function(method){
   app[method] = function(path){
     var self = this;
 
@@ -493,10 +493,7 @@ function generateMethod(method){
     this.routes[method].apply(this, arguments);
     return this;
   };
-  return arguments.callee;
-}
-
-methods.forEach(generateMethod);
+});
 
 // Alias delete as "del"
 

lib/request.js

@@ -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.
@@ -141,7 +142,7 @@ res.sendfile = function(path, options, fn){
     options = {};
   }
 
-  options.path = path;
+  options.path = encodeURIComponent(path);
   options.callback = fn;
   send(this.req, this, next, options);
 };
@@ -180,7 +181,7 @@ 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;
 };

lib/router/index.js

@@ -238,6 +238,8 @@ function router(fn, app){
     return ret;
   };
 
+  router.routes = routes;
+
   return router;
 }
 

lib/view.js

@@ -33,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.
  *
@@ -171,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
@@ -183,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 {
@@ -328,46 +412,10 @@ res._render = function(view, opts, fn, parent, sub){
     return renderPartial(self, path, opts, options, view);
   };
 
-  // cached view
-  if (app.cache[cid]) {
-    view = app.cache[cid];
-    options.filename = view.path;
-  // resolve view
-  } else {
-    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);
-
-    // 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;
-    }    
-
-    options.filename = view.path;
-    var engine = view.templateEngine;
-    view.fn = engine.compile(view.contents, options)
-    if (cacheViews) app.cache[cid] = view;
-  }
+  // View lookup
+  options.hint = app.enabled('hints');
+  view = exports.compile(view, app.cache, cid, options);
+  options.filename = view.path;
 
   // layout helper
   options.layout = function(path){

lib/view/view.js

@@ -49,7 +49,10 @@ function View(view, options) {
   this.name = this.basename.replace(this.extension, '');
   this.path = this.resolvePath();
   this.dirname = dirname(this.path);
-  if (options.attempts) options.attempts.push(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.3.3",
+  "version": "2.3.5",
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "contributors": [ 
     { "name": "TJ Holowaychuk", "email": "tj@vision-media.ca" }, 

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);
     });
@@ -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'
@@ -544,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);
     });

test/router.test.js

@@ -53,7 +53,7 @@ module.exports = {
       res.send(200);
     });
     
-    app.get('/user/:user', [allow('member')], [[restrictAge(18)]], function(req, res){
+    app.get('/user/:user', [allow('member'), [[restrictAge(18)]]], function(req, res){
       res.send(200);
     });