Merge pull request #1303 from robby/patch-1

Using latest version of connect

.gitignore

@@ -11,3 +11,4 @@ lib-cov
 benchmarks/graphs
 testing.js
 node_modules/
+testing

History.md

@@ -1,10 +1,95 @@
 
+2.5.11 / 2012-06-29 
+==================
+
+  * Fixed backport of req.protocol
+
+2.5.10 / 2012-06-15 
+==================
+
+  * Remove annoying engines field from package.json
+  * Backport support for trusting X-Forwarded-Proto
+  * use version of `package.json` for `express` command
+
+2.5.9/ 2012-04-02 
+==================
+
+  * Added support for PURGE request method [pbuyle]
+  * Fixed `express(1)` generated app `app.address()` before `listening` [mmalecki]
+
+2.5.8 / 2012-02-08 
+==================
+
+  * Update mkdirp dep. Closes #991
+
+2.5.7 / 2012-02-06 
+==================
+
+  * Fixed `app.all` duplicate DELETE requests [mscdex]
+
+2.5.6 / 2012-01-13 
+==================
+
+  * Updated hamljs dev dep. Closes #953
+
+2.5.5 / 2012-01-08 
+==================
+
+  * Fixed: set `filename` on cached templates [matthewleon]
+
+2.5.4 / 2012-01-02 
+==================
+
+  * Fixed `express(1)` eol on 0.4.x. Closes #947
+
+2.5.3 / 2011-12-30 
+==================
+
+  * Fixed `req.is()` when a charset is present
+
+2.5.2 / 2011-12-10 
+==================
+
+  * Fixed: express(1) LF -> CRLF for windows
+
+2.5.1 / 2011-11-17 
+==================
+
+  * Changed: updated connect to 1.8.x
+  * Removed sass.js support from express(1)
+
+2.5.0 / 2011-10-24 
+==================
+
+  * Added ./routes dir for generated app by default
+  * Added npm install reminder to express(1) app gen
+  * Added 0.5.x support
+  * Removed `make test-cov` since it wont work with node 0.5.x
+  * Fixed express(1) public dir for windows. Closes #866
+
+2.4.7 / 2011-10-05 
+==================
+
+  * Added mkdirp to express(1). Closes #795
+  * Added simple _json-config_ example
+  * Added  shorthand for the parsed request's pathname via `req.path`
+  * Changed connect dep to 1.7.x to fix npm issue...
+  * Fixed `res.redirect()` __HEAD__ support. [reported by xerox]
+  * Fixed `req.flash()`, only escape args
+  * Fixed absolute path checking on windows. Closes #829 [reported by andrewpmckenzie]
+
+2.4.6 / 2011-08-22 
+==================
+
+  * Fixed multiple param callback regression. Closes #824 [reported by TroyGoode]
+
 2.4.5 / 2011-08-19 
 ==================
 
   * Added support for routes to handle errors. Closes #809
   * Added `app.routes.all()`. Closes #803
-  * Added "basepath" setting to work in conjunction with reverse proxies etc.   * Refactored `Route` to use a single array of callbacks
+  * Added "basepath" setting to work in conjunction with reverse proxies etc.   
+  * Refactored `Route` to use a single array of callbacks
   * Added support for multiple callbacks for `app.param()`. Closes #801
 Closes #805
   * Changed: removed .call(self) for route callbacks

Makefile

@@ -1,16 +1,10 @@
 
 DOCS = $(shell find docs/*.md)
-HTMLDOCS =$(DOCS:.md=.html)
+HTMLDOCS = $(DOCS:.md=.html)
 TESTS = $(shell find test/*.test.js)
 
 test:
-	@NODE_ENV=test ./node_modules/.bin/expresso \
-		-I lib \
-		$(TESTFLAGS) \
-		$(TESTS)
-
-test-cov:
-	@TESTFLAGS=--cov $(MAKE) test
+	@NODE_ENV=test ./node_modules/.bin/expresso $(TESTS)
 
 docs: $(HTMLDOCS)
 	@ echo "... generating TOC"
@@ -32,4 +26,4 @@ site:
 docclean:
 	rm -f docs/*.{1,html}
 
-.PHONY: site test test-cov docs docclean
+.PHONY: site test docs docclean

Readme.md

@@ -95,7 +95,9 @@ The following are the major contributors of Express (in no specific order).
 
 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
+Express 2.x is compatible with node 0.4.x or 0.6.x, and connect 1.x
+
+Express 3.x (master) will be compatible with node 0.6.x and connect 2.x
 
 ## Viewing Examples
 

bin/express

@@ -5,13 +5,21 @@
  */
 
 var fs = require('fs')
-  , exec = require('child_process').exec;
+  , os = require('os')
+  , exec = require('child_process').exec
+  , mkdirp = require('mkdirp');
+
+/**
+ * Package information.
+ */
+
+var pkg = JSON.parse(fs.readFileSync(__dirname + '/../package.json'));
 
 /**
  * Framework version.
  */
 
-var version = '2.4.4';
+var version = pkg.version;
 
 /**
  * Add session support.
@@ -25,6 +33,14 @@ var sessions = false;
 
 var cssEngine;
 
+/**
+ * End-of-line code.
+ */
+
+var eol = os.platform
+  ? ('win32' == os.platform() ? '\r\n' : '\n')
+  : '\n';
+
 /**
  * Template engine to utilize.
  */
@@ -42,11 +58,26 @@ var usage = ''
   + '  Options:\n'
   + '    -s, --sessions           add session support\n'
   + '    -t, --template <engine>  add template <engine> support (jade|ejs). default=jade\n'
-  + '    -c, --css <engine>       add stylesheet <engine> support (less|sass|stylus). default=plain css\n'
+  + '    -c, --css <engine>       add stylesheet <engine> support (stylus). default=plain css\n'
   + '    -v, --version            output framework version\n'
   + '    -h, --help               output help information\n'
   ;
 
+/**
+ * Routes index template.
+ */
+
+var index = [
+    ''
+  , '/*'
+  , ' * GET home page.'
+  , ' */'
+  , ''
+  , 'exports.index = function(req, res){'
+  , '  res.render(\'index\', { title: \'Express\' })'
+  , '};'
+].join(eol);
+
 /**
  * Jade layout template.
  */
@@ -58,7 +89,7 @@ var jadeLayout = [
   , '    title= title'
   , '    link(rel=\'stylesheet\', href=\'/stylesheets/style.css\')'
   , '  body!= body'
-].join('\n');
+].join(eol);
 
 /**
  * Jade index template.
@@ -67,7 +98,7 @@ var jadeLayout = [
 var jadeIndex = [
     'h1= title'
   , 'p Welcome to #{title}'
-].join('\n');
+].join(eol);
 
 /**
  * EJS layout template.
@@ -84,7 +115,7 @@ var ejsLayout = [
   , '    <%- body %>'
   , '  </body>'
   , '</html>'
-].join('\n');
+].join(eol);
 
 /**
  * EJS index template.
@@ -93,7 +124,7 @@ var ejsLayout = [
 var ejsIndex = [
     '<h1><%= title %></h1>'
   , '<p>Welcome to <%= title %></p>'
-  ].join('\n');
+  ].join(eol);
 
 /**
  * Default css template.
@@ -108,34 +139,7 @@ var css = [
   , 'a {'
   , '  color: #00B7FF;'
   , '}'
-].join('\n');
-
-/**
- * Default less template.
- */
-
-var less = [
-    'body {'
-  , '  padding: 50px;'
-  , '  font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;'
-  , '}'
-  , ''
-  , 'a {'
-  , '  color: #00B7FF;'
-  , '}'
-].join('\n');
-
-/**
- * Default sass template.
- */
-
-var sass = [
-    'body'
-  , '  :padding 50px'
-  , '  :font 14px "Lucida Grande", Helvetica, Arial, sans-serif'
-  , 'a'
-  , '  :color #00B7FF'
-].join('\n');
+].join(eol);
 
 /**
  * Default stylus template.
@@ -147,7 +151,7 @@ var stylus = [
   , '  font: 14px "Lucida Grande", Helvetica, Arial, sans-serif'
   , 'a'
   , '  color: #00B7FF'
-].join('\n');
+].join(eol);
 
 /**
  * App template.
@@ -159,7 +163,8 @@ var app = [
   , ' * Module dependencies.'
   , ' */'
   , ''
-  , 'var express = require(\'express\');'
+  , 'var express = require(\'express\')'
+  , '  , routes = require(\'./routes\');'
   , ''
   , 'var app = module.exports = express.createServer();'
   , ''
@@ -175,25 +180,22 @@ var app = [
   , '});'
   , ''
   , 'app.configure(\'development\', function(){'
-  , '  app.use(express.errorHandler({ dumpExceptions: true, showStack: true })); '
+  , '  app.use(express.errorHandler({ dumpExceptions: true, showStack: true }));'
   , '});'
   , ''
   , 'app.configure(\'production\', function(){'
-  , '  app.use(express.errorHandler()); '
+  , '  app.use(express.errorHandler());'
   , '});'
   , ''
   , '// Routes'
   , ''
-  , 'app.get(\'/\', function(req, res){'
-  , '  res.render(\'index\', {'
-  , '    title: \'Express\''
-  , '  });'
+  , 'app.get(\'/\', routes.index);'
+  , ''
+  , 'app.listen(3000, function(){'
+  , '  console.log("Express server listening on port %d in %s mode", app.address().port, app.settings.env);'
   , '});'
   , ''
-  , 'app.listen(3000);'
-  , 'console.log("Express server listening on port %d in %s mode", app.address().port, app.settings.env);'
-  , ''
-].join('\n');
+].join(eol);
 
 // Parse arguments
 
@@ -259,7 +261,16 @@ while (args.length) {
  */
 
 function createApplicationAt(path) {
+  console.log();
+  process.on('exit', function(){
+    console.log();
+    console.log('   dont forget to install dependencies:');
+    console.log('   $ cd %s && npm install', path);
+    console.log();
+  });
+
   mkdir(path, function(){
+    mkdir(path + '/public');
     mkdir(path + '/public/javascripts');
     mkdir(path + '/public/images');
     mkdir(path + '/public/stylesheets', function(){
@@ -267,16 +278,15 @@ function createApplicationAt(path) {
         case 'stylus':
           write(path + '/public/stylesheets/style.styl', stylus);
           break;
-        case 'less':
-          write(path + '/public/stylesheets/style.less', less);
-          break;
-        case 'sass':
-          write(path + '/public/stylesheets/style.sass', sass);
-          break;
         default:
           write(path + '/public/stylesheets/style.css', css);
       }
     });
+
+    mkdir(path + '/routes', function(){
+      write(path + '/routes/index.js', index);
+    });
+
     mkdir(path + '/views', function(){
       switch (templateEngine) {
         case 'ejs':
@@ -292,12 +302,8 @@ function createApplicationAt(path) {
 
     // CSS Engine support
     switch (cssEngine) {
-      case 'sass':
-      case 'less':
-        app = app.replace('{css}', '\n  app.use(express.compiler({ src: __dirname + \'/public\', enable: [\'' + cssEngine + '\'] }));');
-        break;
       case 'stylus':
-        app = app.replace('{css}', '\n  app.use(require(\'stylus\').middleware({ src: __dirname + \'/public\' }));');
+        app = app.replace('{css}', eol + '  app.use(require(\'stylus\').middleware({ src: __dirname + \'/public\' }));');
         break;
       default:
         app = app.replace('{css}', '');
@@ -305,22 +311,22 @@ function createApplicationAt(path) {
 
     // Session support
     app = app.replace('{sess}', sessions
-      ? '\n  app.use(express.cookieParser());\n  app.use(express.session({ secret: \'your secret here\' }));'
+      ? eol + '  app.use(express.cookieParser());' + eol + '  app.use(express.session({ secret: \'your secret here\' }));'
       : '');
 
     // Template support
     app = app.replace(':TEMPLATE', templateEngine);
 
     // package.json
-    var json = '{\n';
-    json += '    "name": "application-name"\n';
-    json += '  , "version": "0.0.1"\n';
-    json += '  , "private": true\n';
-    json += '  , "dependencies": {\n';
-    json += '      "express": "' + version + '"\n';
-    if (cssEngine) json += '    , "' + cssEngine + '": ">= 0.0.1"\n';
-    if (templateEngine) json += '    , "' + templateEngine + '": ">= 0.0.1"\n';
-    json += '  }\n';
+    var json = '{' + eol;
+    json += '    "name": "application-name"' + eol;
+    json += '  , "version": "0.0.1"' + eol;
+    json += '  , "private": true' + eol;
+    json += '  , "dependencies": {' + eol;
+    json += '      "express": "' + version + '"' + eol;
+    if (cssEngine) json += '    , "' + cssEngine + '": ">= 0.0.1"' + eol;
+    if (templateEngine) json += '    , "' + templateEngine + '": ">= 0.0.1"' + eol;
+    json += '  }' + eol;
     json += '}';
 
 
@@ -398,9 +404,9 @@ function prompt(msg, fn) {
  */
 
 function mkdir(path, fn) {
-  exec('mkdir -p ' + path, function(err){
+  mkdirp(path, 0755, function(err){
     if (err) throw err;
-    console.log('   \x1b[36mcreate\x1b[0m : ' + path);
+    console.log('   \033[36mcreate\033[0m : ' + path);
     fn && fn();
   });
 }

examples/jade/app.js

@@ -13,13 +13,17 @@ var pub = __dirname + '/public';
 // and then serve with connect's staticProvider
 
 var app = express.createServer();
+app.use(express.logger('dev'));
 app.use(express.compiler({ src: pub, enable: ['sass'] }));
 app.use(app.router);
 app.use(express.static(pub));
 app.use(express.errorHandler({ dump: true, stack: true }));
 
-// Optional since express defaults to CWD/views
+// we're using jade's template inheritance, so we dont need
+// the express layout concept
+app.set('view options', { layout: false });
 
+// Optional since express defaults to CWD/views
 app.set('views', __dirname + '/views');
 
 // Set our default template engine to "jade"
@@ -34,30 +38,15 @@ function User(name, email) {
 
 // Dummy users
 var users = [
-    new User('tj', 'tj@vision-media.ca')
-  , new User('ciaran', 'ciaranj@gmail.com')
-  , new User('aaron', 'aaron.heckmann+github@gmail.com')
+    new User('Tobi', 'tobi@learnboost.com')
+  , new User('Loki', 'loki@learnboost.com')
+  , new User('Jane', 'jane@learnboost.com')
 ];
 
 app.get('/', function(req, res){
   res.render('users', { users: users });
 });
 
-app.get('/users/callback', function(req, res){
-  // a callback is also accepted
-  res.partial('users/user', users, function(err, html){
-    if (err) throw err;
-    res.send(html);
-  });
-});
-
-app.get('/users', function(req, res){
-  // we can use res.partial() as if
-  // we were in a view, utilizing the same api
-  // to render a fragment
-  res.partial('users/user', users);
-});
-
 app.get('/users/list', function(req, res){
   // use "object" to utilize the name deduced from
   // the view filename. The examples below are equivalent

examples/jade/views/header.jade

@@ -1,3 +0,0 @@
-head
-  title Jade Example
-  link(rel="stylesheet", href="/stylesheets/style.css")

examples/jade/views/layout.jade

@@ -1,4 +1,8 @@
-!!!
+doctype 5
 html
-  include header
-  body!= body
+  head
+    block title
+      title Jade Example
+    link(rel="stylesheet", href="/stylesheets/style.css")
+  body
+    block content

examples/jade/views/users/index.jade

@@ -1,3 +1,12 @@
-- if (users.length)
-  h1 Users
-  #users!= partial('user', users)
+
+extends ../layout
+
+block title
+  title Users
+
+block content
+  if users.length
+    h1 Users
+    #users
+      for user in users
+        include ./user

examples/jade/views/users/list.jade

@@ -1,3 +1,4 @@
 ul#users
-  - each user in list
-    li!= partial('user', user)
+  for user in list
+    li
+      include ./user

examples/json-config/app.js

@@ -0,0 +1,26 @@
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('../../');
+
+app = express.createServer();
+
+// load the config for this environment (NODE_ENV)
+
+var config = require('./config')[app.settings.env];
+
+// apply settings
+
+for (var key in config) app.set(key, config[key]);
+
+// apply middleware
+
+config.middleware.forEach(app.use.bind(app));
+
+app.get('/', function(req, res){
+  res.render('index', { layout: false });
+});
+
+app.listen(3000);

examples/json-config/config.js

@@ -0,0 +1,19 @@
+
+// ok so it's not JSON, but close enough :)
+
+var express = require('../../');
+
+exports.development = {
+    'view engine': 'jade'
+  , 'views': __dirname + '/views'
+  , 'title': 'My Site'
+  , 'middleware': [
+      express.logger('dev')
+    , app.router
+    , express.static(__dirname + '/public')
+  ]
+};
+
+exports.production = {
+  
+};

examples/json-config/views/index.jade

@@ -0,0 +1,4 @@
+html
+  body
+    h1 #{settings.title}
+    p Simple example

lib/express.js

@@ -28,7 +28,7 @@ var exports = module.exports = connect.middleware;
  * Framework version.
  */
 
-exports.version = '2.4.5';
+exports.version = '2.5.11';
 
 /**
  * Shortcut for `new Server(...)`.

lib/http.js

@@ -1,4 +1,3 @@
-
 /*!
  * Express - HTTPServer
  * Copyright(c) 2010 TJ Holowaychuk <tj@vision-media.ca>
@@ -571,7 +570,7 @@ 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;
+    if ('all' == method || 'del' == method) return;
     app[method].apply(this, args);
   }, this);
   return this;

lib/request.js

@@ -12,6 +12,7 @@
 var http = require('http')
   , req = http.IncomingMessage.prototype
   , utils = require('./utils')
+  , parse = require('url').parse
   , mime = require('mime');
 
 /**
@@ -87,6 +88,17 @@ req.get = function(field, param){
   return RegExp.$1 || RegExp.$2;
 };
 
+/**
+ * Short-hand for `require('url').parse(req.url).pathname`.
+ *
+ * @return {String}
+ * @api public
+ */
+
+req.__defineGetter__('path', function(){
+  return parse(this.url).pathname;
+});
+
 /**
  * Check if the _Accept_ header is present, and includes the given `type`.
  *
@@ -123,8 +135,8 @@ req.accepts = function(type){
   // normalize extensions ".json" -> "json"
   if (type && '.' == type[0]) type = type.substr(1);
 
-  // when Accept does not exist, or is '*/*' return true 
-  if (!accept || '*/*' == accept) {
+  // when Accept does not exist, or contains '*/*' return true
+  if (!accept || ~accept.indexOf('*/*')) {
     return true;
   } else if (type) {
     // allow "html" vs "text/html" etc
@@ -217,10 +229,10 @@ req.flash = function(type, msg){
       , args = arguments
       , formatters = this.app.flashFormatters || {};
     formatters.__proto__ = flashFormatters;
-    msg = utils.miniMarkdown(utils.escape(msg));
+    msg = utils.miniMarkdown(msg);
     msg = msg.replace(/%([a-zA-Z])/g, function(_, format){
       var formatter = formatters[format];
-      if (formatter) return formatter(args[i++]);
+      if (formatter) return formatter(utils.escape(args[i++]));
     });
     return (msgs[type] = msgs[type] || []).push(msg);
   } else if (type) {
@@ -280,16 +292,18 @@ req.flash = function(type, msg){
 req.is = function(type){
   var fn = this.app.is(type);
   if (fn) return fn(this);
-  var contentType = this.headers['content-type'];
-  if (!contentType) return;
+  var ct = this.headers['content-type'];
+  if (!ct) return false;
+  ct = ct.split(';')[0];
   if (!~type.indexOf('/')) type = mime.lookup(type);
   if (~type.indexOf('*')) {
-    type = type.split('/')
-    contentType = contentType.split('/');
-    if ('*' == type[0] && type[1] == contentType[1]) return true;
-    if ('*' == type[1] && type[0] == contentType[0]) return true;
+    type = type.split('/');
+    ct = ct.split('/');
+    if ('*' == type[0] && type[1] == ct[1]) return true;
+    if ('*' == type[1] && type[0] == ct[0]) return true;
+    return false;
   }
-  return !! ~contentType.indexOf(type);
+  return !! ~ct.indexOf(type);
 };
 
 // Callback for isXMLHttpRequest / xhr
@@ -307,3 +321,37 @@ function isxhr() {
 
 req.__defineGetter__('isXMLHttpRequest', isxhr);
 req.__defineGetter__('xhr', isxhr);
+
+/**
+ * Return the protocol string "http" or "https"
+ * when requested with TLS. When the "trust proxy" 
+ * setting is enabled the "X-Forwarded-Proto" header
+ * field will be trusted. If you're running behind
+ * a reverse proxy that supplies https for you this
+ * may be enabled.
+ *
+ * @return {String}
+ * @api public
+ */
+
+req.__defineGetter__('protocol', function(){
+  var trustProxy = this.app.set('trust proxy');
+  return this.connection.encrypted
+    ? 'https'
+    : trustProxy
+      ? (this.header('X-Forwarded-Proto') || 'http')
+      : 'http';
+});
+
+/**
+ * Short-hand for:
+ *
+ *    req.protocol == 'https'
+ *
+ * @return {Boolean}
+ * @api public
+ */
+
+req.__defineGetter__('secure', function(){
+  return 'https' == this.protocol;
+});

lib/response.js

@@ -105,7 +105,7 @@ res.send = function(body, headers, status){
 
   // respond
   this.statusCode = status;
-  this.end('HEAD' == this.req.method ? undefined : body);
+  this.end('HEAD' == this.req.method ? null : body);
   return this;
 };
 
@@ -376,6 +376,7 @@ res.redirect = function(url, status){
     , req = this.req
     , base = app.set('basepath') || app.route
     , status = status || 302
+    , head = 'HEAD' == req.method
     , body;
 
   // Setup redirect map
@@ -401,9 +402,8 @@ res.redirect = function(url, status){
     if ('/' != base && 0 != url.indexOf(base)) url = base + url;
 
     // Absolute
-    var host = req.headers.host
-      , tls = req.connection.encrypted;
-    url = 'http' + (tls ? 's' : '') + '://' + host + url;
+    var host = req.headers.host;
+    url = req.protocol + '://' + host + url;
   }
 
   // Support text/{plain,html} by default
@@ -418,7 +418,7 @@ res.redirect = function(url, status){
   // Respond
   this.statusCode = status;
   this.header('Location', url);
-  this.end(body);
+  this.end(head ? null : body);
 };
 
 /**

lib/router/index.js

@@ -226,10 +226,11 @@ Router.prototype._dispatch = function(req, res, next){
 
     // param callbacks
     function param(err) {
+      paramIndex = 0;
       key = keys[i++];
       paramVal = key && req.params[key.name];
       paramCallbacks = key && params[key.name];
-    
+
       try {
         if ('route' == err) {
           nextRoute();

lib/router/methods.js

@@ -54,6 +54,14 @@ var RFC5323 = ['SEARCH'];
 
 var RFC5789 = ['PATCH'];
 
+/**
+ * PURGE Method for caching reverse-proxy
+ * http://wiki.squid-cache.org/SquidFaq/OperatingSquid#How_can_I_purge_an_object_from_my_cache.3F
+ * https://www.varnish-cache.org/docs/trunk/tutorial/purging.html
+ */
+
+var CACHE_PURGE = ['PURGE'];
+
 /**
  * Expose the methods.
  */
@@ -65,6 +73,7 @@ module.exports = [].concat(
   , RFC3648
   , RFC3744
   , RFC5323
-  , RFC5789).map(function(method){
+  , RFC5789
+  , CACHE_PURGE).map(function(method){
     return method.toLowerCase();
   });

lib/utils.js

@@ -5,6 +5,19 @@
  * MIT Licensed
  */
 
+/**
+ * Check if `path` looks absolute.
+ *
+ * @param {String} path
+ * @return {Boolean}
+ * @api private
+ */
+
+exports.isAbsolute = function(path){
+  if ('/' == path[0]) return true;
+  if (':' == path[1] && '\\' == path[2]) return true;
+};
+
 /**
  * Merge object `b` with `a` giving precedence to
  * values in object `a`.

lib/view.js

@@ -47,7 +47,10 @@ exports.register = View.register;
  */
 
 exports.compile = function(view, cache, cid, options){
-  if (cache && cid && cache[cid]) return cache[cid];
+  if (cache && cid && cache[cid]){
+    options.filename = cache[cid].path;
+    return cache[cid];
+  }
 
   // lookup
   view = exports.lookup(view, options);
@@ -58,13 +61,13 @@ exports.compile = function(view, cache, cid, options){
     var err = new Error('failed to locate view "' + view.original.view + '"');
     err.view = view.original;
     throw err;
-  }    
+  }
 
   // compile
   options.filename = view.path;
   view.fn = view.templateEngine.compile(view.contents, options);
   cache[cid] = view;
-  
+
   return view;
 };
 
@@ -81,11 +84,11 @@ exports.compile = function(view, cache, cid, options){
  *
  * Lookup:
  *
- *   - partial `_<name>` 
- *   - any `<name>/index` 
- *   - non-layout `../<name>/index` 
- *   - any `<root>/<name>` 
- *   - partial `<root>/_<name>` 
+ *   - partial `_<name>`
+ *   - any `<name>/index`
+ *   - non-layout `../<name>/index`
+ *   - any `<root>/<name>`
+ *   - partial `<root>/_<name>`
  *
  * @param {String} view
  * @param {Object} options
@@ -161,7 +164,7 @@ function renderPartial(res, view, options, parentLocals, parent){
 
   // Inherit locals from parent
   union(options, parentLocals);
-  
+
   // Merge locals
   if (locals) merge(options, locals);
 
@@ -202,7 +205,7 @@ function renderPartial(res, view, options, parentLocals, parent){
         options.lastInCollection = i == len - 1;
         object = val;
         buf += render();
-      }      
+      }
     } else {
       keys = Object.keys(collection);
       len = keys.length;
@@ -227,20 +230,20 @@ function renderPartial(res, view, options, parentLocals, parent){
 };
 
 /**
- * Render `view` partial with the given `options`. Optionally a 
+ * Render `view` partial with the given `options`. Optionally a
  * callback `fn(err, str)` may be passed instead of writing to
  * the socket.
  *
  * Options:
  *
- *   - `object` Single object with name derived from the view (unless `as` is present) 
+ *   - `object` Single object with name derived from the view (unless `as` is present)
  *
  *   - `as` Variable name for each `collection` value, defaults to the view name.
  *     * as: 'something' will add the `something` local variable
  *     * as: this will use the collection value as the template context
  *     * as: global will merge the collection value's properties with `locals`
  *
- *   - `collection` Array of objects, the name is derived from the view name itself. 
+ *   - `collection` Array of objects, the name is derived from the view name itself.
  *     For example _video.html_ will have a object _video_ available to it.
  *
  * @param  {String} view
@@ -294,7 +297,7 @@ res.partial = function(view, options, fn){
  * automatically, however otherwise a response of _200_ and _text/html_ is given.
  *
  * Options:
- *  
+ *
  *  - `scope`     Template evaluation context (the value of `this`)
  *  - `debug`     Output debugging information
  *  - `status`    Response status code
@@ -430,7 +433,7 @@ res._render = function(view, opts, fn, parent, sub){
   // partial return
   } else if (partial) {
     return str;
-  // render complete, and 
+  // render complete, and
   // callback given
   } else if (fn) {
     fn(null, str);
@@ -454,4 +457,4 @@ function hintAtViewPaths(view, options) {
     console.error('  - %s', path);
   });
   console.error();
-}
+}

lib/view/view.js

@@ -10,6 +10,7 @@
  */
 
 var path = require('path')
+  , utils = require('../utils')
   , extname = path.extname
   , dirname = path.dirname
   , basename = path.basename
@@ -99,7 +100,7 @@ View.prototype.resolvePath = function(){
   // Implicit engine
   if (!~this.basename.indexOf('.')) path += this.extension;
   // Absolute
-  if ('/' == path[0]) return path;
+  if (utils.isAbsolute(path)) return path;
   // Relative to parent
   if (this.relative && this.parent) return this.parent.dirname + '/' + path;
   // Relative to root

package.json

@@ -1,7 +1,7 @@
 {
   "name": "express",
   "description": "Sinatra inspired web development framework",
-  "version": "2.4.5",
+  "version": "2.5.11",
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "contributors": [ 
     { "name": "TJ Holowaychuk", "email": "tj@vision-media.ca" }, 
@@ -10,18 +10,19 @@
     { "name": "Guillermo Rauch", "email": "rauchg@gmail.com" }
   ],
   "dependencies": {
-    "connect": ">= 1.5.2 < 2.0.0",
-    "mime": ">= 0.0.1",
-    "qs": ">= 0.3.1"
+    "connect": "1.9.2",
+    "mime": "1.2.4",
+    "qs": "0.4.x",
+    "mkdirp": "0.3.0"
   },
   "devDependencies": {
     "connect-form": "0.2.1",
     "ejs": "0.4.2",
-    "expresso": "0.7.2",
-    "hamljs": "0.5.1",
-    "jade": "0.11.0",
+    "expresso": "0.9.2",
+    "hamljs": "0.6.x",
+    "jade": "0.16.2",
     "stylus": "0.13.0",
-    "should": "0.2.1",
+    "should": "0.3.2",
     "express-messages": "0.0.2",
     "node-markdown": ">= 0.0.1",
     "connect-redis": ">= 0.0.1"
@@ -33,6 +34,5 @@
   "scripts": {
     "test": "make test",
     "prepublish" : "npm prune"
-  },
-  "engines": { "node": ">= 0.4.1 < 0.5.0" }
+  }
 }

test/express.test.js

@@ -3,7 +3,7 @@
  * Module dependencies.
  */
 
-var express = require('express')
+var express = require('../')
   , connect = require('connect')
   , assert = require('assert')
   , should = require('should')
@@ -37,22 +37,22 @@ module.exports = {
   
   'test basic server': function(){
     var server = express.createServer();
-
+  
     server.get('/', function(req, res){
       server.set('env').should.equal('test');
       res.writeHead(200, {});
       res.end('wahoo');
     });
-
+  
     server.put('/user/:id', function(req, res){
       res.writeHead(200, {});
       res.end('updated user ' + req.params.id)
     });
-
+  
     server.del('/something', function(req, res){
       res.send('Destroyed');
     });
-
+  
     server.delete('/something/else', function(req, res){
       res.send('Destroyed');
     });
@@ -61,7 +61,7 @@ module.exports = {
       req.staff = { id: req.params.id };
       next();
     });
-
+  
     server.get('/staff/:id', function(req, res){
       res.send('GET Staff ' + req.staff.id);
     });
@@ -73,7 +73,7 @@ module.exports = {
     server.all('*', function(req, res){
       res.send('requested ' + req.url);
     });
-
+  
     assert.response(server,
       { url: '/' },
       { body: 'wahoo' });
@@ -81,15 +81,15 @@ module.exports = {
     assert.response(server,
       { url: '/user/12', method: 'PUT' },
       { body: 'updated user 12' });
-
+  
     assert.response(server,
       { url: '/something', method: 'DELETE' },
       { body: 'Destroyed' });
-
+  
     assert.response(server,
       { url: '/something/else', method: 'DELETE' },
       { body: 'Destroyed' });
-
+  
     assert.response(server,
       { url: '/staff/12' },
       { body: 'GET Staff 12' });
@@ -105,17 +105,17 @@ module.exports = {
   
   'test constructor middleware': function(beforeExit){
       var calls = [];
-
+  
       function one(req, res, next){
         calls.push('one');
         next();
       }
-
+  
       function two(req, res, next){
         calls.push('two');
         next();
       }
-
+  
       var app = express.createServer(one, two);
       app.get('/', function(req, res){
         res.writeHead(200, {});
@@ -144,14 +144,14 @@ module.exports = {
     assert.response(app,
       { url: '/' },
       { body: 'Internal Server Error' });
-
+  
     // Custom handler
     var app = express.createServer();
     
     app.error(function(err, req, res){
       res.send('Shit: ' + err.message, 500);
     });
-
+  
     app.get('/', function(req, res, next){
       next(new Error('broken'));
     });
@@ -174,7 +174,7 @@ module.exports = {
     app.error(function(err, req, res, next){
       res.send(err.message, 500);
     });
-
+  
     app.get('/', function(req, res, next){
       throw new Error('broken');
     });
@@ -220,7 +220,7 @@ module.exports = {
   
   'test #use()': function(){
     var app = express.createServer();
-
+  
     app.get('/users', function(req, res, next){
       next(new Error('fail!!'));
     });
@@ -244,13 +244,13 @@ module.exports = {
     }).configure('production', function(){
       calls.push('production');
     });
-
+  
     should.equal(ret, server, 'Test #configure() returns server for chaining');
-
+  
     assert.response(server,
         { url: '/' },
         { body: 'Cannot GET /' });
-
+  
     beforeExit(function(){
       calls.should.eql(['any', 'dev']);
     });
@@ -258,7 +258,7 @@ module.exports = {
   
   'test #configure() immediate call': function(){
     var app = express.createServer();
-
+  
     app.configure(function(){
       app.use(connect.bodyParser());
     });
@@ -266,18 +266,17 @@ module.exports = {
     app.post('/', function(req, res){
       res.send(req.param('name') || 'nope');
     });
-
+  
     assert.response(app,
       { url: '/', method: 'POST', data: 'name=tj', headers: { 'Content-Type': 'application/x-www-form-urlencoded' }},
       { body: 'tj' });
   },
-
+    
   'test #configure() precedence': function(){
     var app = express.createServer();
-
+  
     app.configure(function(){
       app.use(function(req, res, next){
-        res.writeHead(200, {});
         res.write('first');
         next();
       });
@@ -291,28 +290,28 @@ module.exports = {
       res.write(' route ');
       next();
     });
-
+  
     assert.response(app,
       { url: '/' },
       { body: 'first route last' });
   },
-
+  
   'test #configure() multiple envs': function(){
     var app = express.createServer();
     app.set('env', 'prod');
     var calls = [];
-
+  
     app.configure('stage', 'prod', function(){
       calls.push('stage/prod');
     });
-
+  
     app.configure('prod', function(){
       calls.push('prod');
     });
-
+  
     calls.should.eql(['stage/prod', 'prod']);
   },
-
+  
   'test #set()': function(){
     var app = express.createServer();
     var ret = app.set('title', 'My App').set('something', 'else');
@@ -320,7 +319,7 @@ module.exports = {
     app.set('title').should.equal('My App');
     app.set('something').should.equal('else');
   },
-
+  
   'test .settings': function(){
     var app = express.createServer();
     app.set('title', 'My App');
@@ -352,36 +351,36 @@ module.exports = {
     var app = express.createServer();
     
     app.use(connect.bodyParser());
-
+  
     assert.equal(2, app.stack.length);
     
     app.post('/', function(req, res){
       res.send(JSON.stringify(req.body || ''));
     });
     app.get('/', function(){
-
+  
     });
     assert.equal(3, app.stack.length);
-
+  
     assert.response(app,
       { url: '/', method: 'POST', data: 'name=tj', headers: { 'Content-Type': 'application/x-www-form-urlencoded' }},
       { body: '{"name":"tj"}' });
   },
-
+  
   'test "basepath" setting': function(){
     var app = express.createServer();
-
+  
     app.set('basepath', '/shop');
-
+  
     app.get('/redirect', function(req, res){
       res.redirect('/cart');
     });
-
+  
     assert.response(app,
       { url: '/redirect', headers: { Host: 'foo.com' }},
       { headers: { Location: 'http://foo.com/shop/cart' }});
   },
-
+  
   'test mounting': function(){
     var called
       , app = express.createServer()
@@ -394,16 +393,16 @@ module.exports = {
       assert.equal(this, map, 'mounted() is not in context of the child app');
       assert.equal(app, parent, 'mounted() was not called with parent app');
     });
-
+  
     reg.use(function(req, res){ res.end('hey'); });
     app.use('/regular', reg);
-
+  
     app.use('/blog', blog);
     app.use('/contact', map);
     blog.route.should.equal('/blog');
     map.route.should.equal('/contact');
     should.equal(true, called);
-
+  
     app.set("test", "parent setting");
     blog.set('test').should.equal('parent setting');
     
@@ -412,7 +411,7 @@ module.exports = {
       map.set('basepath').should.equal('/contact');
       res.send('main app');
     });
-
+  
     blog.get('/', function(req, res){
       res.send('blog index');
     });
@@ -437,26 +436,26 @@ module.exports = {
       { url: '/regular' },
       { body: 'hey' });
   },
-
+  
   'test .app property after returning control to parent': function() {
     var app = express.createServer()
       , blog = express.createServer();
-
+  
     // Mounted servers did not restore `req.app` and `res.app` when
     // passing control back to parent via `out()` in `#handle()`.
-
+  
     blog.get('/', function(req, res, next){
       req.app.should.equal(blog);
       res.app.should.equal(blog);
       next();
     });
-
+  
     app.use(blog);
-
+  
     app.use(function(req, res, next) {
       res.send((res.app === app) ? 'restored' : 'not-restored');
     });
-
+  
     assert.response(app,
       { url: '/' },
       { body: 'restored' }
@@ -467,23 +466,23 @@ module.exports = {
     function handle(req, res) {
       res.send('got ' + req.string);
     }
-
+  
     var app = express.createServer();
-
+  
     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: '/' },
       { body: 'got /' });
-
+  
     assert.response(app,
       { url: '/another' },
       { body: 'got /another' });
@@ -491,11 +490,11 @@ module.exports = {
   
   'invalid chars': function(){
     var app = express.createServer();
-
+  
     app.get('/:name', function(req, res, next){
       res.send('invalid');
     });
-
+  
     assert.response(app,
       { url: '/%a0' },
       { status: 500 });

test/request.test.js

@@ -3,12 +3,24 @@
  * Module dependencies.
  */
 
-var express = require('express')
+var express = require('../')
   , connect = require('connect')
   , assert = require('assert')
   , should = require('should');
 
 module.exports = {
+  'test #path': function(){
+    var app = express.createServer();
+
+    app.get('/search', function(req, res){
+      res.send(req.path);
+    });
+
+    assert.response(app,
+      { url: '/search?q=tobi' },
+      { body: '/search' });
+  },
+
   'test #isXMLHttpRequest': function(){
     var app = express.createServer();
 
@@ -155,12 +167,15 @@ module.exports = {
       req.flash('info').should.eql(['one']);
 
       req.flash('info', 'Email _sent_.');
-      req.flash('info', '<script>');
-      req.flash('info').should.eql(['Email <em>sent</em>.', '&lt;script&gt;']);
+      req.flash('info', '<em>%s</em>', 'html');
+      req.flash('info').should.eql(['Email <em>sent</em>.', '<em>html</em>']);
       
       req.flash('info', 'Welcome _%s_ to %s', 'TJ', 'something');
       req.flash('info').should.eql(['Welcome <em>TJ</em> to something']);
 
+      req.flash('info', 'Welcome %s', '<script>');
+      req.flash('info').should.eql(['Welcome &lt;script&gt;']);
+
       req.flash('error', 'Foo %u', 'bar');
       req.flash('error').should.eql(['Foo BAR']);
 

test/response.test.js

@@ -3,7 +3,7 @@
  * Module dependencies.
  */
 
-var express = require('express')
+var express = require('../')
   , Stream = require('stream').Stream
   , assert = require('assert')
   , should = require('should');
@@ -379,6 +379,10 @@ module.exports = {
       res.redirect('blog');
     });
 
+    assert.response(app,
+      { url: '/home', method: 'HEAD' },
+      { body: '' });
+
     assert.response(app,
       { url: '/html', headers: { Accept: 'text/html,text/plain', Host: 'foo.com' }},
       { body: '<p>Moved Temporarily. Redirecting to <a href="http://google.com">http://google.com</a></p>' });
@@ -506,10 +510,6 @@ module.exports = {
       });
     });
 
-    assert.response(app,
-      { url: '/forum' },
-      { body: 'got an error' });
-
     assert.response(app,
       { url: '/does-not-exist' },
       { body: 'got an error' });

test/router.test.js

@@ -3,7 +3,7 @@
  * Module dependencies.
  */
 
-var express = require('express')
+var express = require('../')
   , connect = require('connect')
   , assert = require('assert')
   , should = require('should')
@@ -789,5 +789,57 @@ module.exports = {
     assert.response(app,
       { url: '/user/12' },
       { body: 'recovered from error: fail' });
+  },
+  
+  'test multiple param callbacks': function(){
+    var app = express.createServer();
+
+    app.param('user', function(req, res, next, id){
+      req.user = { id: id };
+      next();
+    });
+
+    app.param('forum_id', function(req, res, next, id){
+      req.forum = { id: id };
+      next();
+    });
+
+    app.param('thread_id', function(req, res, next, id){
+      req.thread = { id: id };
+      next();
+    });
+
+    function array(req, res, next) {
+      req.arr = [req.user.id, req.forum.id, req.thread.id];
+      next();
+    }
+
+    app.get('/:user/:forum_id/:thread_id', array, function(req, res){
+      res.send(req.arr);
+    });
+
+    assert.response(app,
+      { url: '/1/2/3' },
+      { body: '["1","2","3"]' });
+  },
+
+  'test app.all for multiple deletes': function(beforeExit){
+    var app = express.createServer();
+
+    var deletes = 0;
+
+    app.all('*', function(req, res, next){
+      if (req.method === 'DELETE')
+        deletes++;
+      next();
+    });
+
+    assert.response(app,
+      { url: '/', method: 'DELETE' },
+      { status: 404 });
+
+    beforeExit(function(){
+      deletes.should.eql(1);
+    });
   }
 };

test/view.test.js

@@ -3,7 +3,7 @@
  * Module dependencies.
  */
 
-var express = require('express')
+var express = require('../')
   , connect = require('connect')
   , assert = require('assert')
   , should = require('should')