Release 1.0.6

This prevents JSONP callbacks from being used as an XSS vector. The set
of acceptable characters is intentionally more limited than the full
set of valid characters in JS identifiers in order to avoid complexity,
but this could be expanded in the future if necessary.

.gitmodules

@@ -1,18 +1,21 @@
 [submodule "support/expresso"]
 	path = support/expresso
 	url = git://github.com/visionmedia/expresso.git
-[submodule "support/jade"]
-	path = support/jade
-	url = git://github.com/visionmedia/jade.git
 [submodule "support/haml"]
 	path = support/haml
 	url = git://github.com/visionmedia/haml.js.git
 [submodule "support/ejs"]
 	path = support/ejs
-	url = http://github.com/visionmedia/ejs.git
+	url = git://github.com/visionmedia/ejs.git
 [submodule "support/connect-form"]
 	path = support/connect-form
-	url = http://github.com/visionmedia/connect-form.git
+	url = git://github.com/visionmedia/connect-form.git
 [submodule "support/connect"]
 	path = support/connect
-	url = http://github.com/senchalabs/connect.git
+	url = git://github.com/senchalabs/connect.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

.npmignore

@@ -0,0 +1,4 @@
+test
+support
+examples
+docs

.pomo

@@ -1,21 +0,0 @@
---- 
-- !ruby/object:Pomo::Task 
-  complete: false
-  description: 
-  length: 25
-  name: TM bundle
-- !ruby/object:Pomo::Task 
-  complete: false
-  description: 
-  length: 25
-  name: blog
-- !ruby/object:Pomo::Task 
-  complete: false
-  description: 
-  length: 25
-  name: release on nodejs group
-- !ruby/object:Pomo::Task 
-  complete: false
-  description: 
-  length: 25
-  name: Beta

History.md

@@ -1,4 +1,157 @@
 
+1.0.6 / 2011-02-07 
+==================
+
+  * Fixed `view engine` setting bug when period is in dirname
+
+1.0.5 / 2011-02-05 
+==================
+
+  * Added secret to generated app `session()` call
+
+1.0.4 / 2011-02-05 
+==================
+
+  * Added `qs` dependency to _package.json_
+  * Fixed namespaced `require()`s for latest connect support
+
+1.0.3 / 2011-01-13 
+==================
+
+  * Remove unsafe characters from JSONP callback names [Ryan Grove]
+
+1.0.2 / 2011-01-10 
+==================
+
+  * Removed nested require, using `connect.router`
+
+1.0.1 / 2010-12-29 
+==================
+
+  * Fixed for middleware stacked via `createServer()`
+    previously the `foo` middleware passed to `createServer(foo)`
+    would not have access to Express methods such as `res.send()`
+    or props like `req.query` etc.
+
+1.0.0 / 2010-11-16 
+==================
+
+  * Added; deduce partial object names from the last segment.
+    For example by default `partial('forum/post', postObject)` will
+    give you the _post_ object, providing a meaningful default.
+  * Added http status code string representation to `res.redirect()` body
+  * Added; `res.redirect()` supporting _text/plain_ and _text/html_ via __Accept__.
+  * Added `req.is()` to aid in content negotiation
+  * Added partial local inheritance [suggested by masylum]. Closes #102
+    providing access to parent template locals.
+  * Added _-s, --session[s]_ flag to express(1) to add session related middleware
+  * Added _--template_ flag to express(1) to specify the
+    template engine to use.
+  * Added _--css_ flag to express(1) to specify the 
+    stylesheet engine to use (or just plain css by default).
+  * Added `app.all()` support [thanks aheckmann]
+  * Added partial direct object support.
+    You may now `partial('user', user)` providing the "user" local,
+    vs previously `partial('user', { object: user })`.
+  * Added _route-separation_ example since many people question ways
+    to do this with CommonJS modules. Also view the _blog_ example for
+    an alternative.
+  * Performance; caching view path derived partial object names
+  * Fixed partial local inheritance precedence. [reported by Nick Poulden] Closes #454
+  * Fixed jsonp support; _text/javascript_ as per mailinglist discussion
+
+1.0.0rc4 / 2010-10-14 
+==================
+
+  * Added _NODE_ENV_ support, _EXPRESS_ENV_ is deprecated and will be removed in 1.0.0
+  * Added route-middleware support (very helpful, see the [docs](http://expressjs.com/guide.html#Route-Middleware))
+  * Added _jsonp callback_ setting to enable/disable jsonp autowrapping [Dav Glass]
+  * Added callback query check on response.send to autowrap JSON objects for simple webservice implementations [Dav Glass]
+  * Added `partial()` support for array-like collections. Closes #434
+  * Added support for swappable querystring parsers
+  * Added session usage docs. Closes #443
+  * Added dynamic helper caching. Closes #439 [suggested by maritz]
+  * Added authentication example
+  * Added basic Range support to `res.sendfile()` (and `res.download()` etc)
+  * Changed; `express(1)` generated app using 2 spaces instead of 4
+  * Default env to "development" again [aheckmann]
+  * Removed _context_ option is no more, use "scope"
+  * Fixed; exposing _./support_ libs to examples so they can run without installs
+  * Fixed mvc example
+
+1.0.0rc3 / 2010-09-20 
+==================
+
+  * Added confirmation for `express(1)` app generation. Closes #391
+  * Added extending of flash formatters via `app.flashFormatters`
+  * Added flash formatter support. Closes #411
+  * Added streaming support to `res.sendfile()` using `sys.pump()` when >= "stream threshold"
+  * Added _stream threshold_ setting for `res.sendfile()`
+  * Added `res.send()` __HEAD__ support
+  * Added `res.clearCookie()`
+  * Added `res.cookie()`
+  * Added `res.render()` headers option
+  * Added `res.redirect()` response bodies
+  * Added `res.render()` status option support. Closes #425 [thanks aheckmann]
+  * Fixed `res.sendfile()` responding with 403 on malicious path
+  * Fixed `res.download()` bug; when an error occurs remove _Content-Disposition_
+  * Fixed; mounted apps settings now inherit from parent app [aheckmann]
+  * Fixed; stripping Content-Length / Content-Type when 204
+  * Fixed `res.send()` 204. Closes #419
+  * Fixed multiple _Set-Cookie_ headers via `res.header()`. Closes #402
+  * Fixed bug messing with error handlers when `listenFD()` is called instead of `listen()`. [thanks guillermo]
+
+
+1.0.0rc2 / 2010-08-17 
+==================
+
+  * Added `app.register()` for template engine mapping. Closes #390
+  * Added `res.render()` callback support as second argument (no options)
+  * Added callback support to `res.download()`
+  * Added callback support for `res.sendfile()`
+  * Added support for middleware access via `express.middlewareName()` vs `connect.middlewareName()`
+  * Added "partials" setting to docs
+  * Added default expresso tests to `express(1)` generated app. Closes #384
+  * Fixed `res.sendfile()` error handling, defer via `next()`
+  * Fixed `res.render()` callback when a layout is used [thanks guillermo]
+  * Fixed; `make install` creating ~/.node_libraries when not present
+  * Fixed issue preventing error handlers from being defined anywhere. Closes #387 
+
+1.0.0rc / 2010-07-28
+==================
+
+  * Added mounted hook. Closes #369
+  * Added connect dependency to _package.json_
+
+  * Removed "reload views" setting and support code
+    development env never caches, production always caches.
+
+  * Removed _param_ in route callbacks, signature is now
+    simply (req, res, next), previously (req, res, params, next).
+    Use _req.params_ for path captures, _req.query_ for GET params.
+
+  * Fixed "home" setting
+  * Fixed middleware/router precedence issue. Closes #366
+  * Fixed; _configure()_ callbacks called immediately. Closes #368
+	
+1.0.0beta2 / 2010-07-23
+==================
+
+  * Added more examples
+  * Added; exporting `Server` constructor
+  * Added `Server#helpers()` for view locals
+  * Added `Server#dynamicHelpers()` for dynamic view locals. Closes #349
+  * Added support for absolute view paths
+  * Added; _home_ setting defaults to `Server#route` for mounted apps. Closes #363
+  * Added Guillermo Rauch to the contributor list
+  * Added support for "as" for non-collection partials. Closes #341
+  * Fixed _install.sh_, ensuring _~/.node_libraries_ exists. Closes #362 [thanks jf]
+  * Fixed `res.render()` exceptions, now passed to `next()` when no callback is given [thanks guillermo]
+  * Fixed instanceof `Array` checks, now `Array.isArray()`
+  * Fixed express(1) expansion of public dirs. Closes #348
+  * Fixed middleware precedence. Closes #345
+  * Fixed view watcher, now async [thanks aheckmann]
+
 1.0.0beta / 2010-07-15
 ==================
 

LICENSE

@@ -0,0 +1,22 @@
+(The MIT License)
+
+Copyright (c) 2009-2010 TJ Holowaychuk <tj@vision-media.ca>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Makefile

@@ -1,18 +1,20 @@
 
-PREFIX = /usr/local
+PREFIX ?= /usr/local
 LIB_PREFIX = ~/.node_libraries
 
 DOCS = docs/index.md \
 	   docs/executable.md \
 	   docs/contrib.md \
 	   docs/guide.md \
-	   docs/migrate.md
+	   docs/migrate.md \
+	   docs/applications.md
 
 MANPAGES =$(DOCS:.md=.1)
 HTMLDOCS =$(DOCS:.md=.html)
 
 install: install-docs
 	@mkdir -p $(PREFIX)/bin
+	@mkdir -p $(LIB_PREFIX)
 	cp -f bin/express $(PREFIX)/bin/express
 	cp -fr lib/express $(LIB_PREFIX)/express
 
@@ -22,27 +24,28 @@ uninstall: uninstall-docs
 
 install-support:
 	cd support/connect && $(MAKE) install
-	cd support/jade && $(MAKE) install
 
 uninstall-support:
 	cd support/connect && $(MAKE) uninstall
-	cd support/jade && $(MAKE) uninstall
 
 install-docs:
+	@mkdir -p $(PREFIX)/share/man/man1
 	cp -f docs/executable.1 $(PREFIX)/share/man/man1/express.1
 
 uninstall-docs:
 	rm -f $(PREFIX)/share/man/man1/express.1
 
 test:
-	@CONNECT_ENV=test ./support/expresso/bin/expresso \
+	@NODE_ENV=test ./support/expresso/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
+
 test-cov:
 	@TESTFLAGS=--cov $(MAKE) test
 
@@ -51,7 +54,9 @@ docs: docs/api.html $(MANPAGES) $(HTMLDOCS)
 	@./support/toc.js docs/guide.html
 
 docs/api.html: lib/express/*.js
-	dox --title Express \
+	dox \
+		--private \
+		--title Express \
 		--desc "High performance web framework for [node](http://nodejs.org)." \
 		$(shell find lib/express/* -type f) > $@
 

Readme.md

@@ -2,7 +2,7 @@
 # Express
       
   Insanely fast (and small) server-side JavaScript web development framework
-  built on [node](http://nodejs.org) and [Connect](http://github.com/extjs/Connect).
+  built on [node](http://nodejs.org) and [Connect](http://github.com/senchalabs/connect).
   
      var app = express.createServer();
     
@@ -16,29 +16,26 @@
 
 npm:
 
-    $ npm install connect
     $ npm install express
 
-curl (or similar):
+curl:
 
-    $ curl -# http://github.com/visionmedia/express/raw/master/install.sh | sh
-
-git clone, first update the submodules:
-
-    $ git submodule update --init
-    $ make install
-    $ make install-support
+    $ curl -# http://expressjs.com/install.sh | sh
 
 ## Features
 
   * Robust routing
   * Redirection helpers
+  * Dynamic view helpers
+  * Content negotiation
   * Focus on high performance
   * View rendering and partials support
   * Environment based configuration
   * Session based flash notifications
-  * Built on [Connect](http://extjs.github.com/Connect)
+  * Built on [Connect](http://github.com/senchalabs/connect)
+  * High test coverage
   * Executable for generating applications quickly
+  * Application level view options
 
 Via Connect:
 
@@ -59,27 +56,27 @@ The following are the major contributors of Express (in no specific order).
   * TJ Holowaychuk ([visionmedia](http://github.com/visionmedia))
   * Ciaran Jessup ([ciaranj](http://github.com/ciaranj))
   * Aaron Heckmann ([aheckmann](http://github.com/aheckmann))
+  * Guillermo Rauch ([guille](http://github.com/guille))
 
 ## More Information
 
+  * Express [Contrib](http://github.com/visionmedia/express-contrib) repo for additional functionality
   * Follow [tjholowaychuk](http://twitter.com/tjholowaychuk) on twitter for updates
   * [Google Group](http://groups.google.com/group/express-js) for discussion
-  * [JavaScript Extensions & Utilities](http://github.com/visionmedia/ext.js)
-  * [JavaScript Sass](http://github.com/visionmedia/sass.js)
-  * [JavaScript Haml](http://github.com/visionmedia/haml.js)
-  * [JavaScript Jade](http://github.com/visionmedia/jade) spiritual successor of Haml
+  * Visit the [Wiki](http://github.com/visionmedia/express/wiki)
 
-## Running Tests
-
-Express uses the [Expresso](http://github.com/visionmedia/expresso) TDD
-framework to write and run elegant test suites extremely fast. First `$ git submodule update --init`, then run:
-
-    $ make test
+## Node Compatibility
     
 The latest release of Express is compatible with node --version:
 
-    v0.1.100
-    
+    v0.2.5
+
+and connect --version:
+
+    0.3.0
+
+Express 1.x is maintained in the _1.x_ branch.
+
 ## License 
 
 (The MIT License)

bin/express

@@ -4,48 +4,66 @@
  * Module dependencies.
  */
 
-var sys = require('sys'),
-    fs = require('fs'),
-    childProcess = require('child_process');
+var fs = require('fs')
+  , sys = require('sys')
+  , exec = require('child_process').exec;
 
 /**
  * Framework version.
  */
 
-var version = '1.0.0beta';
+var version = '1.0.6';
+
+/**
+ * stdin stream.
+ */
+
+var stdin;
+
+/**
+ * Add session support.
+ */
+
+var sessions = false;
+
+/**
+ * CSS engine to utilize.
+ */
+
+var cssEngine;
+
+/**
+ * Template engine to utilize.
+ */
+
+var templateEngine = 'jade';
 
 /**
  * Usage documentation.
  */
 
 var usage = ''
-    + '\x1b[1mUsage\x1b[0m: express [options] [PATH]\n'
-    + '\n'
-    + '\x1b[1mOptions\x1b[0m:\n'
-    + '  -v, --version Output framework version\n'
-    + '  -h, --help    Output help information\n';
+  + '\x1b[1mUsage\x1b[0m: express [options] [PATH]\n'
+  + '\n'
+  + '\x1b[1mOptions\x1b[0m:\n'
+  + '  -s, --sessions         Add session support\n'
+  + '  -t, --template ENGINE  Add template ENGINE support (jade|ejs). Defaults to jade\n'
+  + '  -c, --css ENGINE       Add stylesheet ENGINE support (less|sass). Defaults to plain css\n'
+  + '  -v, --version          Output framework version\n'
+  + '  -h, --help             Output help information\n'
+  ;
 
 /**
  * Jade layout template.
  */
 
 var jadeLayout = [
-    '!!!',
-    'html',
-    '  head',
-    '    title= title',
-    '    link(rel=\'stylesheet\', href=\'/stylesheets/style.css\')',
-    '  body!= body'
-].join('\n');
-
-/**
- * Default sass template.
- */
-
-var sass = [
-    'body',
-    '  :padding 50px',
-    '  :font 14px "Lucida Grande", "Helvetica Nueue", Arial, sans-serif'
+    '!!!'
+  , 'html'
+  , '  head'
+  , '    title= title'
+  , '    link(rel=\'stylesheet\', href=\'/stylesheets/style.css\')'
+  , '  body!= body'
 ].join('\n');
 
 /**
@@ -53,8 +71,93 @@ var sass = [
  */
 
 var jadeIndex = [
-    'h1= title',
-    'p Welcome to #{title}'
+    'h1= title'
+  , 'p Welcome to #{title}'
+].join('\n');
+
+/**
+ * EJS layout template.
+ */
+
+var ejsLayout = [
+    '<!DOCTYPE html>'
+  , '<html>'
+  , '  <head>'
+  , '    <title><%= title %></title>'
+  , '    <link rel=\'stylesheet\' href=\'/stylesheets/style.css\' />'
+  , '  </head>'
+  , '  <body>'
+  , '    <%- body %>'
+  , '  </body>'
+  , '</html>'
+].join('\n');
+
+/**
+ * EJS index template.
+ */
+
+var ejsIndex = [
+    '<h1><%= title %></h1>'
+  , '<p>Welcome to <%= title %></p>'
+  ].join('\n');
+
+/**
+ * Default css template.
+ */
+
+var css = [
+    'body {'
+  , '  padding: 50px;'
+  , '  font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;'
+  , '}'
+].join('\n');
+
+/**
+ * Default less template.
+ */
+
+var less = [
+    'body {'
+  , '  padding: 50px;'
+  , '  font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;'
+  , '}'
+].join('\n');
+
+/**
+ * Default sass template.
+ */
+
+var sass = [
+    'body'
+  , '  :padding 50px'
+  , '  :font 14px "Lucida Grande", Helvetica, Arial, sans-serif'
+].join('\n');
+
+/**
+ * App test template.
+ */
+
+var appTest = [
+    ""
+  , "// Run $ expresso"
+  , ""
+  , "/**"
+  , " * Module dependencies."
+  , " */"
+  , ""
+  , "var app = require('../app')"
+  , "  , assert = require('assert');"
+  , "",
+  , "module.exports = {"
+  , "  'GET /': function(){"
+  , "    assert.response(app,"
+  , "      { url: '/' },"
+  , "      { status: 200, headers: { 'Content-Type': 'text/html; charset=utf-8' }},"
+  , "      function(res){"
+  , "        assert.includes(res.body, '<title>Express</title>');"
+  , "      });"
+  , "  }"
+  , "};"
 ].join('\n');
 
 /**
@@ -62,88 +165,198 @@ var jadeIndex = [
  */
 
 var app = [
-    '',
-    '/**',
-    ' * Module dependencies.',
-    ' */',
-    '',
-    'var express = require(\'express\'),',
-    '    connect = require(\'connect\');',
-    '',
-    '// Create and export Express app',
-    '',
-    'var app = express.createServer();',
-    '',
-    '// Configuration',
-    '',
-    'app.configure(function(){',
-    '    app.set(\'views\', __dirname + \'/views\');',
-    '    app.use(\'/\', connect.bodyDecoder());',
-    '    app.use(\'/\', connect.methodOverride());',
-    '    app.use(\'/\', connect.compiler({ src: __dirname + \'/public\', enable: [\'sass\'] }));',
-    '    app.use(\'/\', connect.staticProvider(__dirname + \'/public\'));',
-    '});',
-    '',
-    'app.configure(\'development\', function(){',
-    '    app.set(\'reload views\', 1000);',
-    '    app.use(\'/\', connect.errorHandler({ dumpExceptions: true, showStack: true })); ',
-    '});',
-    '',
-    'app.configure(\'production\', function(){',
-    '   app.use(\'/\', connect.errorHandler()); ',
-    '});',
-    '',
-    '// Routes',
-    '',
-    'app.get(\'/\', function(req, res){',
-    '    res.render(\'index.jade\', {',
-    '        locals: {',
-    '            title: \'Express\'',
-    '        }',
-    '    });',
-    '});',
-    '',
-    'app.listen(3000);',
     ''
+  , '/**'
+  , ' * Module dependencies.'
+  , ' */'
+  , ''
+  , 'var express = require(\'express\');'
+  , ''
+  , 'var app = module.exports = express.createServer();'
+  , ''
+  , '// Configuration'
+  , ''
+  , 'app.configure(function(){'
+  , '  app.set(\'views\', __dirname + \'/views\');'
+  , '  app.set(\'view engine\', \':TEMPLATE\');'
+  , '  app.use(express.bodyDecoder());'
+  , '  app.use(express.methodOverride());:SESS:CSS'
+  , '  app.use(app.router);'
+  , '  app.use(express.staticProvider(__dirname + \'/public\'));'
+  , '});'
+  , ''
+  , 'app.configure(\'development\', function(){'
+  , '  app.use(express.errorHandler({ dumpExceptions: true, showStack: true })); '
+  , '});'
+  , ''
+  , 'app.configure(\'production\', function(){'
+  , '  app.use(express.errorHandler()); '
+  , '});'
+  , ''
+  , '// Routes'
+  , ''
+  , 'app.get(\'/\', function(req, res){'
+  , '  res.render(\'index\', {'
+  , '    locals: {'
+  , '      title: \'Express\''
+  , '    }'
+  , '  });'
+  , '});'
+  , ''
+  , '// Only listen on $ node app.js'
+  , ''
+  , 'if (!module.parent) {'
+  , '  app.listen(3000);'
+  , '  console.log("Express server listening on port %d", app.address().port)'
+  , '}'
+  , ''
 ].join('\n');
 
 // Parse arguments
 
-var args = process.argv.slice(2),
-    path = '.';
+var args = process.argv.slice(2)
+  , path = '.';
+
 while (args.length) {
-    var arg = args.shift();
-    switch (arg) {
-        case '-h':
-        case '--help':
-            abort(usage);
-            break;
-        case '-v':
-        case '--version':
-            abort(version);
-            break;
-        default:
-            path = arg;
-    }
+  var arg = args.shift();
+  switch (arg) {
+    case '-h':
+    case '--help':
+      abort(usage);
+      break;
+    case '-v':
+    case '--version':
+      abort(version);
+      break;
+    case '-s':
+    case '--session':
+    case '--sessions':
+      sessions = true;
+      break;
+    case '-c':
+    case '--css':
+      args.length
+        ? (cssEngine = args.shift())
+        : abort('--css requires an argument');
+      break;
+    case '-t':
+    case '--template':
+      args.length
+        ? (templateEngine = args.shift())
+        : abort('--template requires an argument');
+      break;
+    default:
+        path = arg;
+  }
 }
 
 // Generate application
 
 (function createApplication(path) {
-    mkdir(path, function(){
-        mkdir(path + '/pids');
-        mkdir(path + '/logs');
-        mkdir(path + '/public/{javascripts,stylesheets,images}', function(){
-            write(path + '/public/stylesheets/style.sass', sass);
-        });
-        mkdir(path + '/views/partials', function(){
-            write(path + '/views/layout.jade', jadeLayout);
-            write(path + '/views/index.jade', jadeIndex);
-        });
-        write(path + '/app.js', app);
-    });
+  emptyDirectory(path, function(empty){
+    if (empty) {
+      createApplicationAt(path);
+    } else {
+      confirm('destination is not empty, continue? ', function(ok){
+        if (ok) {
+          stdin.destroy();
+          createApplicationAt(path);
+        } else {
+          abort('aborting');
+        }
+      });
+    }
+  });
 })(path);
 
+/**
+ * Create application at the given directory `path`.
+ *
+ * @param {String} path
+ */
+
+function createApplicationAt(path) {
+  mkdir(path, function(){
+    mkdir(path + '/pids');
+    mkdir(path + '/logs');
+    mkdir(path + '/public/javascripts');
+    mkdir(path + '/public/images');
+    mkdir(path + '/public/stylesheets', function(){
+      switch (cssEngine) {
+        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 + '/views/partials', function(){
+      switch (templateEngine) {
+        case 'ejs':
+          write(path + '/views/layout.ejs', ejsLayout);
+          write(path + '/views/index.ejs', ejsIndex);
+          break;
+        case 'jade':
+          write(path + '/views/layout.jade', jadeLayout);
+          write(path + '/views/index.jade', jadeIndex);
+          break;
+      }
+    });
+    mkdir(path + '/test', function(){
+      write(path + '/test/app.test.js', appTest);
+    });
+
+    // CSS Engine support
+    switch (cssEngine) {
+      case 'sass':
+      case 'less':
+        app = app.replace(':CSS', '\n  app.use(express.compiler({ src: __dirname + \'/public\', enable: [\'' + cssEngine + '\'] }));');
+        break;
+      default:
+        app = app.replace(':CSS', '');
+    }
+
+    // Session support
+    app = app.replace(':SESS', sessions
+      ? '\n  app.use(express.cookieDecoder());\n  app.use(express.session({ secret: \'your secret here\' }));'
+      : '');
+
+    // Template support
+    app = app.replace(':TEMPLATE', templateEngine);
+
+    write(path + '/app.js', app);
+
+    // Suggestions
+    process.on('exit', function(){
+      if (cssEngine) {
+        console.log('   - make sure you have installed %s: \x1b[33m$ npm install %s\x1b[0m'
+          , cssEngine
+          , cssEngine);
+      }
+      console.log('   - make sure you have installed %s: \x1b[33m$ npm install %s\x1b[0m'
+        , templateEngine
+        , templateEngine);
+    });
+  });
+}
+
+/**
+ * Check if the given directory `path` is empty.
+ *
+ * @param {String} path
+ * @param {Function} fn
+ */
+
+function emptyDirectory(path, fn) {
+  fs.readdir(path, function(err, files){
+    if (err && err.errno !== process.ENOENT) throw err;
+    fn(!files || !files.length);
+  });
+}
+
 /**
  * echo str > path.
  *
@@ -152,8 +365,38 @@ while (args.length) {
  */
 
 function write(path, str) {
-    fs.writeFile(path, str);
-    sys.puts('   create : ' + path);
+  fs.writeFile(path, str);
+  console.log('   \x1b[33mcreate\x1b[0m : ' + path);
+}
+
+/**
+ * Prompt confirmation with the given `msg`.
+ *
+ * @param {String} msg
+ * @param {Function} fn
+ */
+
+function confirm(msg, fn) {
+  prompt(msg, function(val){
+    fn(/^ *y(es)?/i.test(val));
+  });
+}
+
+/**
+ * Prompt input with the given `msg` and callback `fn`.
+ *
+ * @param {String} msg
+ * @param {Function} fn
+ */
+
+function prompt(msg, fn) {
+  stdin = stdin || process.openStdin();
+  sys[msg[msg.length - 1] == ' ' ? 'print' : 'puts'](msg);
+  stdin.setEncoding('ascii');
+  stdin.addListener('data', function(data){
+    fn(data);
+    stdin.removeListener('data', arguments.callee);
+  });
 }
 
 /**
@@ -164,11 +407,11 @@ function write(path, str) {
  */
 
 function mkdir(path, fn) {
-    childProcess.exec('mkdir -p ' + path, function(err){
-        if (err) throw err;
-        sys.puts('   create : ' + path);
-        fn && fn();
-    });
+  exec('mkdir -p ' + path, function(err){
+    if (err) throw err;
+    console.log('   \x1b[33mcreate\x1b[0m : ' + path);
+    fn && fn();
+  });
 }
 
 /**
@@ -178,6 +421,6 @@ function mkdir(path, fn) {
  */
 
 function abort(str) {
-    sys.error(str);
-    process.exit(1);
-}
+  console.error(str);
+  process.exit(1);
+}

docs/applications.1

@@ -0,0 +1,70 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "APPLICATIONS" "" "October 2010" "" ""
+.
+.SH "NAME"
+\fBapplications\fR
+.
+.P
+Learnboost \fIhttp://learnboost\.com\fR is a free online gradebook application, aimed to crush the competition with innovative, realtime, enjoyable features\.
+.
+.P
+ \fIhttp://learnboost\.com\fR
+.
+.P
+Storify \fIhttp://storify\.com\fR lets you turn what people post on social media websites into compelling stories\.
+.
+.P
+ \fIhttp://storify\.com\fR
+.
+.P
+Pakistan Survey \fIhttp://pakistansurvey\.org/\fR by Development Seed \fIhttp://developmentseed\.org\fR, provides in\-depth agency\-specific analysis from regional experts with data from 1,000 interviews across 120 villages in all seven tribal agencies and mapping of 142 reported drone strikes in FATA through July 2010\.
+.
+.P
+ \fIhttp://pakistansurvey\.org\fR
+.
+.P
+Markup\.IO \fIhttp://markup\.io\fR allows you to draw directly on \fIany\fR website, then share with others to share your thoughts\.
+.
+.P
+ \fIhttp://markup\.io\fR
+.
+.P
+Scrabb\.ly \fIhttp://scrabb\.ly\fR is a massively multiplayer scrabble game initially created for the Node Knockout \fIhttp://nodeknockout\.com/\fR competition\.
+.
+.P
+ \fIhttp://scrabb\.ly\fR
+.
+.P
+ClickDummy \fIhttp://clickdummy\.net/\fR is a rapid mockup prototyping application for designers and dummies\.
+.
+.P
+ \fIhttp://clickdummy\.net\fR
+.
+.P
+Node Knockout \fIhttp://nodeknockout\.com\fR organized the first ever node\-specific competition with hundreds of contestants\.
+.
+.P
+ \fIhttp://nodeknockout\.com\fR
+.
+.P
+Widescript \fIhttp://widescript\.com\fR is an innovative app that helps you focus and interact with your texts \- on your desktop, your couch or on the go\.
+.
+.P
+ \fIhttp://widescript\.com\fR
+.
+.P
+e\-resistable \fIhttp://www\.e\-resistible\.co\.uk/\fR is an online order takeaway system providing an intuitive way to fill your belly from your computer!
+.
+.P
+ \fIhttp://www\.e\-resistible\.co\.uk\fR
+.
+.P
+Top Twitter Trends \fIhttp://toptwittertrends\.com\fR utilizes MongoDB, Socket\.IO, jQuery and many other exciting libraries to bring you trending tweets in realtime\.
+.
+.P
+ \fIhttp://toptwittertrends\.com\fR
+.
+.P
+The applications shown above are not listed in any specific order\. To have an application added or removed please contact TJ Holowaychuk \fIhttp://github\.com/visionmedia\fR\.

docs/applications.html

@@ -0,0 +1,252 @@
+<html>
+	<head>
+		<title>Express - node web framework</title>
+		<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
+		<style>
+			#tagline {
+			  margin-left: 75px;
+			  margin-bottom: 30px;
+			  color: rgba(255,255,255,0.7); }
+			html {
+			  background: #1c1c1c url(images/bg.tile.jpg); }
+
+			body {
+			  margin: 0;
+			  padding-bottom: 30px;
+			  font: 14px/1.4 "Helvetica Neue", "Lucida Grande", "Arial";
+			  font-size: 14px;
+			  line-height: 1.5;
+			  -webkit-font-smoothing: antialiased;
+			  background: url(images/bg.jpg) 50% 0 no-repeat;
+			  color: #8b8b8b; }
+
+			* {
+			  outline: none; }
+
+			em {
+			  color: white; }
+
+			a img {
+			  border: none !important; }
+
+			a {
+			  font-weight: bold;
+			  text-decoration: none;
+			  color: white;
+			  -webkit-transition-property: opacity, -webkit-transform, color, background-color, padding, -webkit-box-shadow;
+			  -webkit-transition-duration: 0.15s;
+			  -webkit-transition-timing-function: ease-out; }
+			  a:hover {
+			    opacity: 0.8; }
+
+			h1, h2, h3, h4 {
+			  margin: 45px 0 0 0;
+			  color: white;
+			  text-shadow: 1px 2px 2px rgba(0,0,0,0.6); }
+
+			h3 {
+			  font-size: 18px; }
+			h4 {
+			  margin-left: 10px;
+			  font-size: 14px;
+			}
+
+			pre {
+			  margin: 20px 10px;
+			  padding: 25px 20px;
+			  background: rgba(0,0,0,0.5);
+			  border: 1px solid #323232;
+			  -webkit-box-shadow: 1px 2px 2px rgba(0,0,0,0.6);
+			  -moz-box-shadow: 1px 2px 2px rgba(0,0,0,0.6);
+			  -webkit-border-radius: 5px;
+			  -moz-border-radius: 5px; }
+
+			code {
+			  font-family: "Helvetica Neue", "Lucida Grande", "Arial"; }
+
+			ul {
+			  margin: 15px 0;
+			  padding: 0 0 0 35px; }
+			  ul li {
+			    margin: 0;
+			    padding: 2px 0;
+			    list-style: square; }
+          ul li ul {
+            margin: 0;
+            padding-left: 12px;
+          }
+
+      .man-name, #Express { display:none; }
+
+			.sect {
+			  margin-left: 40px; }
+			img {
+			  margin-left: 20px;
+			  margin-bottom: 15px;
+			}
+
+			#logo {
+			  display: block;
+			  margin-left: 30%;
+			  margin-bottom: 30px;
+			  width: 194px;
+			  height: 51px;
+			  background: url(images/logo.png) 0 0 no-repeat;
+			  text-indent: -99999px; }
+			  #logo:hover {
+			    opacity: 0.7; }
+			  #logo:active {
+			    opacity: 0.3; }
+
+			#ribbon {
+			  position: fixed;
+			  top: 0;
+			  right: 0;
+			  z-index: 2; }
+
+			#wrapper {
+			  width: 100%;
+			  min-height: 800px;
+			  background: url(images/top.png) 0 0 repeat-x; }
+
+			#container {
+			  margin: 0 auto;
+			  padding-top: 80px;
+			  width: 550px; }
+
+			#toc {
+				position: fixed;
+				top: 0;
+				left: 0;
+				margin: 0 0 0 15px;
+				padding: 15px;
+				height: 100%;
+				background: rgba(0,0,0,0.2);
+				overflow: auto;
+				border-right: 1px solid rgba(255,255,255,0.05);
+			}
+			#toc li {
+				padding: 0;
+				list-style: none;
+			}
+			#toc li a {
+				font-size: 11px;
+			}
+			#menu {
+			  margin-left: 65px;
+			  padding: 0;
+			  padding-bottom: 30px; }
+			  #menu li {
+			    display: inline;
+			    list-style: none; }
+			    #menu li a {
+			      display: block;
+			      float: left;
+			      margin: 0 2px;
+			      padding: 3px 15px;
+			      background: rgba(0,0,0,0.2);
+			      -webkit-border-radius: 8px;
+			      -moz-border-radius: 8px;
+			      -webkit-box-shadow: 1px 2px 2px rgba(0,0,0,0.6);
+			      -moz-box-shadow: 1px 2px 2px rgba(0,0,0,0.6);
+			      -webkit-transition-property: opacity, -webkit-transform, color, background-color, -webkit-box-shadow;
+			      -webkit-transition-duration: 0.15s;
+			      -webkit-transition-timing-function: ease-out; }
+			      #menu li a:hover,
+			      #menu li a.active {
+			        background: rgba(0,0,0,0.5); }
+			      #menu li a:active {
+			        background: rgba(0,0,0,0.1);
+			        -webkit-box-shadow: 1px 1px 1px rgba(0,0,0,0.4);
+			        -moz-box-shadow: 1px 1px 1px rgba(0,0,0,0.4); }
+		</style>
+		<script>
+		  $(function(){
+		    $('.section').hide();
+		    $('.toggle, a.section-title').toggle(function(){
+		      $(this).siblings('ul').fadeIn(300);
+		      return false;
+		    }, function(){
+		      $(this).siblings('ul').fadeOut(300);
+		      return false;
+		    });
+		  });
+		</script>
+	</head>
+	<body>
+		<a href='http://github.com/visionmedia/express'> 
+		  <img alt='Fork me on GitHub' id='ribbon' src='http://s3.amazonaws.com/github/ribbons/forkme_right_white_ffffff.png' /> 
+		</a>
+		<div id="wrapper">
+			<div id="container">
+				<a href='http://github.com/visionmedia/express' id='logo'>Express</a> 
+				<p id="tagline">
+				   High performance, high class web development for
+				  <a href="http://nodejs.org">Node.js</a>
+				</p>
+				<ul id="menu">
+					<li><a href="index.html">Home</a></li>
+					<li><a href="guide.html">Guide</a></li>
+					<li><a href="contrib.html">Contributing</a></li>
+					<li><a href="applications.html">Applications</a></li>
+				</ul>
+<div class='mp'>
+<h2 id="Express">Express</h2>
+<p class="man-name">
+  <code>applications</code>
+</p>
+
+
+<br />
+
+
+<p><a href="http://learnboost.com">Learnboost</a> is a free online gradebook application, aimed to crush the competition with innovative, realtime, enjoyable features.</p>
+
+<p><a href="http://learnboost.com"><img src="images/apps/learnboost.png" alt="LearnBoost" /></a></p>
+
+<p><a href="http://storify.com">Storify</a> lets you turn what people post on social media websites into compelling stories.</p>
+
+<p><a href="http://storify.com"><img src="images/apps/storify.png" alt="Storify" /></a></p>
+
+<p><a href="http://pakistansurvey.org/">Pakistan Survey</a> by <a href="http://developmentseed.org">Development Seed</a>, provides in-depth agency-specific analysis from regional experts with data from 1,000 interviews across 120 villages in all seven tribal agencies and mapping of 142 reported drone strikes in FATA through July 2010.</p>
+
+<p><a href="http://pakistansurvey.org"><img src="images/apps/developmentseed.png" alt="Pakistan Survey" /></a></p>
+
+<p><a href="http://markup.io">Markup.IO</a> allows you to draw directly on <em>any</em> website, then share with others to share your thoughts.</p>
+
+<p><a href="http://markup.io"><img src="images/apps/markupio.png" alt="Markup.IO" /></a></p>
+
+<p><a href="http://scrabb.ly">Scrabb.ly</a> is a massively multiplayer scrabble game initially created for the <a href="http://nodeknockout.com/">Node Knockout</a> competition.</p>
+
+<p><a href="http://scrabb.ly"><img src="images/apps/scrabbly.png" alt="Online Realtime Scrabble" /></a></p>
+
+<p><a href="http://clickdummy.net/">ClickDummy</a> is a rapid mockup prototyping application for designers and dummies.</p>
+
+<p><a href="http://clickdummy.net"><img src="images/apps/clickdummy.png" alt="Mockup Prototying" /></a></p>
+
+<p><a href="http://nodeknockout.com">Node Knockout</a> organized the first ever node-specific competition with hundreds of contestants.</p>
+
+<p><a href="http://nodeknockout.com"><img src="images/apps/nodeko.png" alt="Node Knockout Competition Express" /></a></p>
+
+<p><a href="http://widescript.com">Widescript</a> is an innovative app that helps you focus and interact with your texts - on your desktop, your couch or on the go.</p>
+
+<p><a href="http://widescript.com"><img src="images/apps/widescript.png" alt="Widescript" /></a></p>
+
+<p><a href="http://www.e-resistible.co.uk/">e-resistable</a> is an online order takeaway system providing an intuitive way to fill your belly from your computer!</p>
+
+<p><a href="http://www.e-resistible.co.uk"><img src="images/apps/e-resistable.png" alt="Online Takeaway" /></a></p>
+
+<p><a href="http://toptwittertrends.com">Top Twitter Trends</a> utilizes MongoDB, Socket.IO, jQuery and many other exciting libraries to bring you trending tweets in realtime.</p>
+
+<p><a href="http://toptwittertrends.com"><img src="images/apps/toptwittertrends.png" alt="Twitter Trends" /></a></p>
+
+<br />
+
+
+<p>The applications shown above are not listed in any specific order. To have an application added or removed please contact <a href="http://github.com/visionmedia">TJ Holowaychuk</a>.</p>
+
+</div>
+			</div>
+		</div>
+	</body>
+</html>

docs/applications.md

@@ -0,0 +1,47 @@
+
+<br />
+
+[Learnboost](http://learnboost.com) is a free online gradebook application, aimed to crush the competition with innovative, realtime, enjoyable features.
+
+[![LearnBoost](images/apps/learnboost.png)](http://learnboost.com)
+
+[Storify](http://storify.com) lets you turn what people post on social media websites into compelling stories.
+
+[![Storify](images/apps/storify.png)](http://storify.com)
+
+
+[Pakistan Survey](http://pakistansurvey.org/) by [Development Seed](http://developmentseed.org), provides in-depth agency-specific analysis from regional experts with data from 1,000 interviews across 120 villages in all seven tribal agencies and mapping of 142 reported drone strikes in FATA through July 2010.
+
+[![Pakistan Survey](images/apps/developmentseed.png)](http://pakistansurvey.org)
+
+[Markup.IO](http://markup.io) allows you to draw directly on _any_ website, then share with others to share your thoughts.
+
+[![Markup.IO](images/apps/markupio.png)](http://markup.io)
+
+[Scrabb.ly](http://scrabb.ly) is a massively multiplayer scrabble game initially created for the [Node Knockout](http://nodeknockout.com/) competition.
+
+[![Online Realtime Scrabble](images/apps/scrabbly.png)](http://scrabb.ly)
+
+[ClickDummy](http://clickdummy.net/) is a rapid mockup prototyping application for designers and dummies.
+
+[![Mockup Prototying](images/apps/clickdummy.png)](http://clickdummy.net)
+
+[Node Knockout](http://nodeknockout.com) organized the first ever node-specific competition with hundreds of contestants.
+
+[![Node Knockout Competition Express](images/apps/nodeko.png)](http://nodeknockout.com)
+
+[Widescript](http://widescript.com) is an innovative app that helps you focus and interact with your texts - on your desktop, your couch or on the go.
+
+[![Widescript](images/apps/widescript.png)](http://widescript.com)
+
+[e-resistable](http://www.e-resistible.co.uk/) is an online order takeaway system providing an intuitive way to fill your belly from your computer!
+
+[![Online Takeaway](images/apps/e-resistable.png)](http://www.e-resistible.co.uk)
+
+[Top Twitter Trends](http://toptwittertrends.com) utilizes MongoDB, Socket.IO, jQuery and many other exciting libraries to bring you trending tweets in realtime.
+
+[![Twitter Trends](images/apps/toptwittertrends.png)](http://toptwittertrends.com)
+
+<br />
+
+The applications shown above are not listed in any specific order. To have an application added or removed please contact [TJ Holowaychuk](http://github.com/visionmedia).

docs/contrib.1

@@ -1,7 +1,10 @@
-.\" generated with Ronn/v0.6.6
-.\" http://github.com/rtomayko/ronn/
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CONTRIB" "" "July 2010" "" ""
+.TH "CONTRIB" "" "October 2010" "" ""
+.
+.SH "NAME"
+\fBcontrib\fR
 .
 .SS "Development Dependencies"
 Express development dependencies are stored within the \fI\./support\fR directory\. To update them execute:
@@ -42,6 +45,19 @@ $ make test TESTS=test/view\.test\.js
 .
 .IP "" 0
 .
+.P
+To check test coverage run:
+.
+.IP "" 4
+.
+.nf
+
+$ make test\-cov
+.
+.fi
+.
+.IP "" 0
+.
 .SS "Contributions"
 To accept a contribution, you should follow these guidelines:
 .
@@ -58,7 +74,9 @@ Your commit(s) should be \fIfocused\fR, do not commit once for several changes
 Do \fInot\fR alter release information such as the \fIversion\fR, or \fIHistory\.md\fR
 .
 .IP "\(bu" 4
-Indents are \fI4\fR spaces\.
+Indents are \fI2\fR spaces\.
 .
 .IP "" 0
-
+.
+.SS "Documentation"
+To contribute documentation edit the markdown files in \fI\./docs\fR, however do \fInot\fR run \fImake docs\fR, as they will be re\-built and published with each release\.

docs/contrib.html

@@ -1,20 +1,8 @@
 <html>
 	<head>
 		<title>Express - node web framework</title>
+		<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
 		<style>
-		    #header {
-				position: absolute;
-				top: 10px;
-				left: 0;
-		        padding: 12px 0;
-				text-indent: 40px;
-				width: 100%;
-		        border-top: 1px solid rgba(0,0,0,0.7);
-		        border-bottom: 1px solid rgba(0,0,0,0.7);
-		        background: rgba(255,255,255,0.1) url(http://www.sencha.com/favicon.ico) no-repeat 15px 50%;
-				text-align: left;
-				color: #fff;
-		    }
 			#tagline {
 			  margin-left: 75px;
 			  margin-bottom: 30px;
@@ -28,8 +16,7 @@
 			  font: 14px/1.4 "Helvetica Neue", "Lucida Grande", "Arial";
 			  font-size: 14px;
 			  line-height: 1.5;
-			  -webkit-text-stroke: 1px rgba(0, 0, 0, 0.1);
-			  -moz-text-stroke: 1px rgba(0, 0, 0, 0.1);
+			  -webkit-font-smoothing: antialiased;
 			  background: url(images/bg.jpg) 50% 0 no-repeat;
 			  color: #8b8b8b; }
 
@@ -52,13 +39,17 @@
 			  a:hover {
 			    opacity: 0.8; }
 
-			h1, h2, h3 {
+			h1, h2, h3, h4 {
 			  margin: 45px 0 0 0;
 			  color: white;
 			  text-shadow: 1px 2px 2px rgba(0,0,0,0.6); }
 
 			h3 {
 			  font-size: 18px; }
+			h4 {
+			  margin-left: 10px;
+			  font-size: 14px;
+			}
 
 			pre {
 			  margin: 20px 10px;
@@ -80,9 +71,19 @@
 			    margin: 0;
 			    padding: 2px 0;
 			    list-style: square; }
+          ul li ul {
+            margin: 0;
+            padding-left: 12px;
+          }
+
+      .man-name, #Express { display:none; }
 
 			.sect {
 			  margin-left: 40px; }
+			img {
+			  margin-left: 20px;
+			  margin-bottom: 15px;
+			}
 
 			#logo {
 			  display: block;
@@ -110,21 +111,22 @@
 
 			#container {
 			  margin: 0 auto;
-			  padding-top: 110px;
+			  padding-top: 80px;
 			  width: 550px; }
 
 			#toc {
 				position: fixed;
-				top: 60px;
+				top: 0;
 				left: 0;
 				margin: 0 0 0 15px;
 				padding: 15px;
 				height: 100%;
 				background: rgba(0,0,0,0.2);
+				overflow: auto;
 				border-right: 1px solid rgba(255,255,255,0.05);
 			}
 			#toc li {
-				padding: 1px 0;
+				padding: 0;
 				list-style: none;
 			}
 			#toc li a {
@@ -158,12 +160,23 @@
 			        -webkit-box-shadow: 1px 1px 1px rgba(0,0,0,0.4);
 			        -moz-box-shadow: 1px 1px 1px rgba(0,0,0,0.4); }
 		</style>
+		<script>
+		  $(function(){
+		    $('.section').hide();
+		    $('.toggle, a.section-title').toggle(function(){
+		      $(this).siblings('ul').fadeIn(300);
+		      return false;
+		    }, function(){
+		      $(this).siblings('ul').fadeOut(300);
+		      return false;
+		    });
+		  });
+		</script>
 	</head>
 	<body>
 		<a href='http://github.com/visionmedia/express'> 
 		  <img alt='Fork me on GitHub' id='ribbon' src='http://s3.amazonaws.com/github/ribbons/forkme_right_white_ffffff.png' /> 
 		</a>
-		<div id="header"><strong>Sencha</strong> labs</div>
 		<div id="wrapper">
 			<div id="container">
 				<a href='http://github.com/visionmedia/express' id='logo'>Express</a> 
@@ -175,9 +188,13 @@
 					<li><a href="index.html">Home</a></li>
 					<li><a href="guide.html">Guide</a></li>
 					<li><a href="contrib.html">Contributing</a></li>
-					<li><a href="migrate.html">1.x Migration</a></li>
+					<li><a href="applications.html">Applications</a></li>
 				</ul>
 <div class='mp'>
+<h2 id="Express">Express</h2>
+<p class="man-name">
+  <code>contrib</code>
+</p>
 <h3 id="Development-Dependencies">Development Dependencies</h3>
 
 <p>Express development dependencies are stored within the <em>./support</em> directory. To
@@ -200,6 +217,11 @@ simply execute:</p>
 <pre><code>$ make test TESTS=test/view.test.js
 </code></pre>
 
+<p>To check test coverage run:</p>
+
+<pre><code>$ make test-cov
+</code></pre>
+
 <h3 id="Contributions">Contributions</h3>
 
 <p>To accept a contribution, you should follow these guidelines:</p>
@@ -209,10 +231,15 @@ simply execute:</p>
 <li>Your alterations or additions <em>must</em> include tests</li>
 <li>Your commit(s) should be <em>focused</em>, do not commit once for several changes</li>
 <li>Do <em>not</em> alter release information such as the <em>version</em>, or <em>History.md</em></li>
-<li>Indents are <em>4</em> spaces.</li>
+<li>Indents are <em>2</em> spaces.</li>
 </ul>
 
 
+<h3 id="Documentation">Documentation</h3>
+
+<p>To contribute documentation edit the markdown files in <em>./docs</em>, however
+do <em>not</em> run <em>make docs</em>, as they will be re-built and published with each release.</p>
+
 </div>
 			</div>
 		</div>

docs/contrib.md

@@ -18,6 +18,10 @@ To target specific suites we may specify the files via:
 
     $ make test TESTS=test/view.test.js
 
+To check test coverage run:
+
+    $ make test-cov
+
 ### Contributions
 
 To accept a contribution, you should follow these guidelines:
@@ -26,4 +30,9 @@ To accept a contribution, you should follow these guidelines:
   * Your alterations or additions _must_ include tests
   * Your commit(s) should be _focused_, do not commit once for several changes
   * Do _not_ alter release information such as the _version_, or _History.md_
-  * Indents are _4_ spaces.
+  * Indents are _2_ spaces.
+
+### Documentation
+
+To contribute documentation edit the markdown files in _./docs_, however
+do _not_ run _make docs_, as they will be re-built and published with each release.

docs/executable.1

@@ -1,13 +1,16 @@
-.\" generated with Ronn/v0.6.6
-.\" http://github.com/rtomayko/ronn/
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "EXECUTABLE" "" "July 2010" "" ""
+.TH "EXECUTABLE" "" "October 2010" "" ""
+.
+.SH "NAME"
+\fBexecutable\fR
 .
 .SH "Synopsis"
 .
 .nf
 
-express [\-h|\-\-help] [\-v|\-\-version] [PATH]
+express [\-h|\-\-help] [\-v|\-\-version] [\-c|\-css ENGINE] [PATH]
 .
 .fi
 .
@@ -18,6 +21,8 @@ The \fBexpress\fR executable generates apps at the given \fBPATH\fR or the curre
 .
 .nf
 
+\-s, \-\-sessions        Add session support
+\-c, \-\-css ENGINE      Add css ENGINE support (less|sass)\. Defaults to plain css
 \-v, \-\-version         Output framework version
 \-h, \-\-help            Display help information
 .

docs/executable.html

@@ -1,20 +1,8 @@
 <html>
 	<head>
 		<title>Express - node web framework</title>
+		<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
 		<style>
-		    #header {
-				position: absolute;
-				top: 10px;
-				left: 0;
-		        padding: 12px 0;
-				text-indent: 40px;
-				width: 100%;
-		        border-top: 1px solid rgba(0,0,0,0.7);
-		        border-bottom: 1px solid rgba(0,0,0,0.7);
-		        background: rgba(255,255,255,0.1) url(http://www.sencha.com/favicon.ico) no-repeat 15px 50%;
-				text-align: left;
-				color: #fff;
-		    }
 			#tagline {
 			  margin-left: 75px;
 			  margin-bottom: 30px;
@@ -28,8 +16,7 @@
 			  font: 14px/1.4 "Helvetica Neue", "Lucida Grande", "Arial";
 			  font-size: 14px;
 			  line-height: 1.5;
-			  -webkit-text-stroke: 1px rgba(0, 0, 0, 0.1);
-			  -moz-text-stroke: 1px rgba(0, 0, 0, 0.1);
+			  -webkit-font-smoothing: antialiased;
 			  background: url(images/bg.jpg) 50% 0 no-repeat;
 			  color: #8b8b8b; }
 
@@ -52,13 +39,17 @@
 			  a:hover {
 			    opacity: 0.8; }
 
-			h1, h2, h3 {
+			h1, h2, h3, h4 {
 			  margin: 45px 0 0 0;
 			  color: white;
 			  text-shadow: 1px 2px 2px rgba(0,0,0,0.6); }
 
 			h3 {
 			  font-size: 18px; }
+			h4 {
+			  margin-left: 10px;
+			  font-size: 14px;
+			}
 
 			pre {
 			  margin: 20px 10px;
@@ -80,9 +71,19 @@
 			    margin: 0;
 			    padding: 2px 0;
 			    list-style: square; }
+          ul li ul {
+            margin: 0;
+            padding-left: 12px;
+          }
+
+      .man-name, #Express { display:none; }
 
 			.sect {
 			  margin-left: 40px; }
+			img {
+			  margin-left: 20px;
+			  margin-bottom: 15px;
+			}
 
 			#logo {
 			  display: block;
@@ -110,21 +111,22 @@
 
 			#container {
 			  margin: 0 auto;
-			  padding-top: 110px;
+			  padding-top: 80px;
 			  width: 550px; }
 
 			#toc {
 				position: fixed;
-				top: 60px;
+				top: 0;
 				left: 0;
 				margin: 0 0 0 15px;
 				padding: 15px;
 				height: 100%;
 				background: rgba(0,0,0,0.2);
+				overflow: auto;
 				border-right: 1px solid rgba(255,255,255,0.05);
 			}
 			#toc li {
-				padding: 1px 0;
+				padding: 0;
 				list-style: none;
 			}
 			#toc li a {
@@ -158,12 +160,23 @@
 			        -webkit-box-shadow: 1px 1px 1px rgba(0,0,0,0.4);
 			        -moz-box-shadow: 1px 1px 1px rgba(0,0,0,0.4); }
 		</style>
+		<script>
+		  $(function(){
+		    $('.section').hide();
+		    $('.toggle, a.section-title').toggle(function(){
+		      $(this).siblings('ul').fadeIn(300);
+		      return false;
+		    }, function(){
+		      $(this).siblings('ul').fadeOut(300);
+		      return false;
+		    });
+		  });
+		</script>
 	</head>
 	<body>
 		<a href='http://github.com/visionmedia/express'> 
 		  <img alt='Fork me on GitHub' id='ribbon' src='http://s3.amazonaws.com/github/ribbons/forkme_right_white_ffffff.png' /> 
 		</a>
-		<div id="header"><strong>Sencha</strong> labs</div>
 		<div id="wrapper">
 			<div id="container">
 				<a href='http://github.com/visionmedia/express' id='logo'>Express</a> 
@@ -175,12 +188,16 @@
 					<li><a href="index.html">Home</a></li>
 					<li><a href="guide.html">Guide</a></li>
 					<li><a href="contrib.html">Contributing</a></li>
-					<li><a href="migrate.html">1.x Migration</a></li>
+					<li><a href="applications.html">Applications</a></li>
 				</ul>
 <div class='mp'>
+<h2 id="Express">Express</h2>
+<p class="man-name">
+  <code>executable</code>
+</p>
 <h2 id="Synopsis">Synopsis</h2>
 
-<pre><code>express [-h|--help] [-v|--version] [PATH]
+<pre><code>express [-h|--help] [-v|--version] [-c|-css ENGINE] [PATH]
 </code></pre>
 
 <h2 id="Description">Description</h2>
@@ -191,7 +208,9 @@ application structure, this executable creates a maintainable base app.</p>
 
 <h2 id="Options">Options</h2>
 
-<pre><code>-v, --version         Output framework version
+<pre><code>-s, --sessions        Add session support
+-c, --css ENGINE      Add css ENGINE support (less|sass). Defaults to plain css
+-v, --version         Output framework version
 -h, --help            Display help information
 </code></pre>
 

docs/executable.md

@@ -1,7 +1,7 @@
 
 ## Synopsis
 
-    express [-h|--help] [-v|--version] [PATH]
+    express [-h|--help] [-v|--version] [-c|-css ENGINE] [PATH]
 
 ## Description
 
@@ -11,6 +11,8 @@ application structure, this executable creates a maintainable base app.
 
 ## Options
 
+    -s, --sessions        Add session support
+    -c, --css ENGINE      Add css ENGINE support (less|sass). Defaults to plain css
     -v, --version         Output framework version
     -h, --help            Display help information
 

docs/guide.md

@@ -1,21 +1,14 @@
 
 ### Installation
 
+curl:
+
+    $ curl -# http://expressjs.com/install.sh | sh
+
 npm:
 
-    $ npm install connect
     $ npm install express
 
-curl (or similar):
-
-    $ curl -# http://github.com/visionmedia/express/raw/master/install.sh | sh
-
-git clone, first update the submodules:
-
-    $ git submodule update --init
-    $ make install
-    $ make install-support
-
 ### Creating An Application
 
 The _express.Server_ now inherits from _http.Server_, however
@@ -39,19 +32,25 @@ prior to the environment specific callback.
 
 In the example below we only _dumpExceptions_, and respond with exception stack traces
 in _development_ mode, however for both environments we utilize _methodOverride_ and _bodyDecoder_.
+Note the use of _app.router_, which can (optionally) be used to mount the application routes,
+otherwise the first call to _app.{get,put,del,post}()_ will mount the routes.
 
     app.configure(function(){
-		app.use('/', connect.methodOverride());
-		app.use('/', connect.bodyDecoder());
-	});
-	
-	app.configure('development', function(){
-		app.use('/', connect.errorHandler({ dumpExceptions: true, showStack: true }));
-	});
-	
-	app.configure('production', function(){
-		app.use('/', connect.errorHandler());
-	});
+    	app.use(express.methodOverride());
+    	app.use(express.bodyDecoder());
+    	app.use(app.router);
+    });
+
+    app.configure('development', function(){
+    	app.use(express.staticProvider(__dirname + '/public'));
+    	app.use(express.errorHandler({ dumpExceptions: true, showStack: true }));
+    });
+
+    app.configure('production', function(){
+      var oneYear = 31557600000;
+    	app.use(express.staticProvider({ root: __dirname + '/public', maxAge: oneYear }));
+    	app.use(express.errorHandler());
+    });
 
 For internal and arbitrary settings Express provides the _set(key[, val])_, _enable(key)_, _disable(key)_ methods:
 
@@ -67,41 +66,57 @@ For internal and arbitrary settings Express provides the _set(key[, val])_, _ena
 		// same as app.set('some feature', false);
 	});
 
-To alter the environment we can set the _CONNECT_ENV_ environment variable,
-or more specifically _EXPRESS_ENV_, for example:
+To alter the environment we can set the _NODE_ENV_ environment variable, for example:
 
-    $ EXPRESS_ENV=production node app.js
+    $ NODE_ENV=production node app.js
+
+This is _very_ important, as many caching mechanisms are _only enabled_ when in production.
 
 ### Settings
 
 Express supports the following settings out of the box:
 
-  * _env_ Application environment set internally, use _app.set('env')_ to utilize
-  * _home_ Application base path used with _res.redirect()_
+  * _env_ Application environment set internally, use _app.set('env')_ on _Server#listen()_
+  * _home_ Application base path used for _res.redirect()_ and transparently handling mounted apps.
   * _views_ Root views directory defaulting to **CWD/views**
   * _view engine_ Default view engine name for views rendered without extensions
-  * _reload views_ Reloads altered views, by default watches for _mtime_ changes with
-      with a 5 minute interval. Example: _app.set('reload views', 60000);_
+  * _view options_ An object specifying global view options
+  * _partials_ Root view partials directory defaulting to _views_/partials.
+  * _stream threshold_ Bytesize indicating when a file should be streamed for _res.sendfile()_ using _fs.ReadStream()_ and _sys.pump()_.
 
 ### Routing
 
 Express utilizes the HTTP verbs to provide a meaningful, expressive routing API.
 For example we may want to render a user's account for the path _/user/12_, this
-can be done by defining the route below. The values associated to the named placeholders,
-are passed as the _third_ argument, which here we name _params_.
+can be done by defining the route below. The values associated to the named placeholders 
+are available as `req.params`.
 
-    app.get('/user/:id', function(req, res, params){
-		res.send('user ' + params.id);
-	});
+    app.get('/user/:id', function(req, res){
+  		res.send('user ' + req.params.id);
+  	});
 
 A route is simple a string which is compiled to a _RegExp_ internally. For example
 when _/user/:id_ is compiled, a simplified version of the regexp may look similar to:
 
     \/user\/([^\/]+)\/?
 
-Literal regular expressions may also be passed for complex uses:
+Regular expression literals may also be passed for complex uses. Since capture
+groups with literal _RegExp_'s are anonymous we can access them directly `req.params`.
 
-	app.get(/^\/foo(bar)?$/, function(){});
+    app.get(/^\/users?(?:\/(\d+)(?:\.\.(\d+))?)?/, function(req, res){
+        res.send(req.params);
+    });
+
+Curl requests against the previously defined route:
+
+       $ curl http://dev:3000/user
+       [null,null]
+       $ curl http://dev:3000/users
+       [null,null]
+       $ curl http://dev:3000/users/1
+       ["1",null]
+       $ curl http://dev:3000/users/1..15
+       ["1","15"]
 
 Below are some route examples, and the associated paths that they
 may consume:
@@ -134,39 +149,209 @@ may consume:
 	 /products.xml
 	 /products
 
+For example we can __POST__ some json, and echo the json back using the _bodyDecoder_ middleware which will parse json request bodies (as well as others), and place the result in _req.body_:
+
+    var express = require('express')
+      , app = express.createServer();
+
+    app.use(express.bodyDecoder());
+
+    app.post('/', function(req, res){
+      res.send(req.body);
+    });
+
+    app.listen(3000);
+
 ### Passing Route Control
 
-We may pass control to the next _matching_ route, by calling the _fourth_ parameter,
-the _next()_ function. When a match cannot be made, control is passed back to Connect.
+We may pass control to the next _matching_ route, by calling the _third_ argument,
+the _next()_ function. When a match cannot be made, control is passed back to Connect,
+and middleware continue to be invoked. The same is true for several routes which have the same path defined, they will simply be executed in order until one does _not_ call _next()_.
 
-	app.get('/users/:id?', function(req, res, params){
-		if (params.id) {
+	app.get('/users/:id?', function(req, res, next){
+		var id = req.params.id;
+		if (id) {
 			// do something
 		} else {
 			next();
 		}
 	});
 	
-	app.get('/users', function(req, res, params){
+	app.get('/users', function(req, res){
 		// do something else
 	});
 
+Express 1.0 also introduces the _all()_ method, which provides a route callback matching any HTTP method. This is useful in many ways, one example being the loading of resources before executing subsequent routes as shown below:
+
+    var express = require('express')
+      , app = express.createServer();
+
+    var users = [{ name: 'tj' }];
+
+    app.all('/user/:id/:op?', function(req, res, next){
+      req.user = users[req.params.id];
+      if (req.user) {
+        next();
+      } else {
+        next(new Error('cannot find user ' + req.params.id));
+      }
+    });
+
+    app.get('/user/:id', function(req, res){
+      res.send('viewing ' + req.user.name);
+    });
+
+    app.get('/user/:id/edit', function(req, res){
+      res.send('editing ' + req.user.name);
+    });
+
+    app.put('/user/:id', function(req, res){
+      res.send('updating ' + req.user.name);
+    });
+
+    app.get('*', function(req, res){
+      res.send('what???', 404);
+    });
+
+    app.listen(3000); 
+
 ### Middleware
 
-The Express _Plugin_ is no more! middleware via [Connect](http://github.com/extjs/Connect) can be
+Middleware via [Connect](http://github.com/senchalabs/connect) can be
 passed to _express.createServer()_ as you would with a regular Connect server. For example:
 
-	var connect = require('connect'),
-		express = require('express');
+	  var express = require('express');
 
     var app = express.createServer(
-		connect.logger(),
-		connect.bodyDecoder()
-	);
+	  	express.logger(),
+	  	express.bodyDecoder()
+	  );
 
 Alternatively we can _use()_ them which is useful when adding middleware within _configure()_ blocks:
 
-    app.use('/', connect.logger({ format: ':method :uri' }));
+    app.use(express.logger({ format: ':method :uri' }));
+
+Typically with connect middleware you would _require('connect')_ like so:
+
+    var connect = require('connect');
+    app.use(connect.logger());
+
+This is somewhat annoying, so express re-exports these middleware properties, however they are _identical_:
+
+    app.use(express.logger());
+
+### 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.
+
+Typically async data retrieval might look similar to below, where we take the _:id_ parameter, and attempt loading a user. 
+
+    app.get('/user/:id', function(req, res, next){
+        loadUser(req.params.id, function(err, user){
+            if (err) return next(err);
+            res.send('Viewing user ' + user.name);
+        });
+    });
+
+To keep things DRY and to increase readability we can apply this logic within a middleware. As you can see below, abstracting this logic into middleware allows us to reuse it, and clean up our route at the same time. 
+
+    function loadUser(req, res, next) {
+        // You would fetch your user from the db
+        var user = users[req.params.id];
+        if (user) {
+            req.user = user;
+            next();
+        } else {
+            next(new Error('Failed to load user ' + req.params.id));
+        }
+    }
+   
+    app.get('/user/:id', loadUser, function(req, res){
+        res.send('Viewing user ' + req.user.name);
+    });
+
+Multiple route middleware can be applied, and will be executed sequentially to apply further logic such as restricting access to a user account. In the example below only the authenticated user may edit his/her account.
+
+    function andRestrictToSelf(req, res, next) {
+        req.authenticatedUser.id == req.user.id
+            ? next()
+            : next(new Error('Unauthorized'));
+    }
+    
+    app.get('/user/:id/edit', loadUser, andRestrictToSelf, function(req, res){
+        res.send('Editing user ' + req.user.name);
+    });
+
+Keeping in mind that middleware are simply functions, we can define function that _returns_ the middleware in order to create a more expressive and flexible solution as shown below.
+
+    function andRestrictTo(role) {
+        return function(req, res, next) {
+          req.authenticatedUser.role == role
+              ? next()
+              : next(new Error('Unauthorized'));
+        }
+    }
+    
+    app.del('/user/:id', loadUser, andRestrictTo('admin'), function(req, res){
+        res.send('Deleted user ' + req.user.name);
+    });
+
+Commonly used "stacks" of middleware can be passed as an array (_applied recursively_), which can be mixed and matched to any degree.
+
+    var a = [middleware1, middleware2]
+      , b = [middleware3, middleware4]
+      , all = [a, b];
+    
+    app.get('/foo', a, function(){});
+    app.get('/bar', a, function(){});
+    
+    app.get('/', a, middleware3, middleware4, function(){});
+    app.get('/', a, b, function(){});
+    app.get('/', all, function(){});
+
+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.
+
+### 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.
+
+ A common example for _POST_ usage, is when "submitting" a form. Below we simply set our form method to "post" in our html, and control will be given to the route we have defined below it.
+ 
+     <form method="post" action="/">
+         <input type="text" name="user[name]" />
+         <input type="text" name="user[email]" />
+         <input type="submit" value="Submit" />
+     </form>
+
+By default Express does not know what to do with this request body, so we should add the _bodyDecoder_ middleware, which will parse _application/x-www-form-urlencoded_ request bodies and place the variables in _req.body_. We can do this by "using" the middleware as shown below:
+
+    app.use(express.bodyDecoder());
+
+Our route below will now have access to the _req.body.user_ object which will contain the _name_ and _email_ properties when defined.
+
+    app.post('/', function(req, res){
+        console.log(req.body.user);
+        res.redirect('back');
+    });
+
+When using methods such as _PUT_ with a form, we can utilize a hidden input named _\_method_, which can be used to alter the HTTP method. To do so we first need the _methodOverride_ middleware, which should be placed below _bodyDecoder_ so that it can utilize it's _req.body_ containing the form values.
+
+    app.use(express.bodyDecoder());
+    app.use(express.methodOverride());
+
+The reason that these are not always defaults, is simply because these are not required for Express to be fully functional. Depending on the needs of your application, you may not need these at all, your methods such as _PUT_ and _DELETE_ can still be accessed by clients which can use them directly, although _methodOverride_ provides a great solution for forms. Below shows what the usage of _PUT_ might look like:
+
+    <form method="post" action="/">
+      <input type="hidden" name="_method" value="put" />
+      <input type="text" name="user[name]" />
+      <input type="text" name="user[email]" />
+      <input type="submit" value="Submit" />    
+    </form>
+
+    app.put('/', function(){
+        console.log(req.body.user);
+        res.redirect('back');
+    });
 
 ### Error Handling
 
@@ -194,6 +379,11 @@ We can call _app.error()_ several times as shown below.
 Here we check for an instanceof _NotFound_ and show the
 404 page, or we pass on to the next error handler.
 
+Note that these handlers can be defined anywhere, as they
+will be placed below the route handlers on _listen()_. This 
+allows for definition within _configure()_ blocks so we can
+handle exceptions in different ways based on the environment.
+
 	app.error(function(err, req, res, next){
 	    if (err instanceof NotFound) {
 	        res.render('404.jade');
@@ -217,12 +407,12 @@ Our apps could also utilize the Connect _errorHandler_ middleware
 to report on exceptions. For example if we wish to output exceptions 
 in "development" mode to _stderr_ we can use:
 
-    app.use('/', connect.errorHandler({ dumpExceptions: true }));
+    app.use(express.errorHandler({ dumpExceptions: true }));
 
 Also during development we may want fancy html pages to show exceptions
 that are passed or thrown, so we can set _showStack_ to true:
 
-    app.use('/', connect.errorHandler({ showStack: true, dumpExceptions: true }));
+    app.use(express.errorHandler({ showStack: true, dumpExceptions: true }));
 
 The _errorHandler_ middleware also responds with _json_ if _Accept: application/json_
 is present, which is useful for developing apps that rely heavily on client-side JavaScript.
@@ -231,9 +421,8 @@ is present, which is useful for developing apps that rely heavily on client-side
 
 View filenames take the form _NAME_._ENGINE_, where _ENGINE_ is the name
 of the module that will be required. For example the view _layout.ejs_ will
-tell the view system to _require('ejs')_, the module being loaded must (currently)
-export the method _exports.render(str, options)_ to comply with Express, however 
-with will likely be extensible in the future.
+tell the view system to _require('ejs')_, the module being loaded must export the method _exports.render(str, options)_ to comply with Express, however 
+_app.register()_ can be used to map engines to file extensions, so that for example "foo.html" can be rendered by jade.
 
 Below is an example using [Haml.js](http://github.com/visionmedia/haml.js) to render _index.html_,
 and since we do not use _layout: false_ the rendered contents of _index.html_ will be passed as 
@@ -245,6 +434,53 @@ the _body_ local variable in _layout.haml_.
 		});
 	});
 
+The new _view engine_ setting allows us to specify our default template engine,
+so for example when using [Jade](http://github.com/visionmedia/jade) we could set:
+
+    app.set('view engine', 'jade');
+
+Allowing us to render with:
+
+    res.render('index');
+
+vs:
+
+    res.render('index.jade');
+
+When _view engine_ is set, extensions are entirely optional, however we can still
+mix and match template engines:
+
+    res.render('another-page.ejs');
+
+Express also provides the _view options_ setting, which is applied each time a view is rendered, so for example if you rarely use layouts you may set:
+
+	app.set('view options', {
+	    layout: false
+	});
+
+Which can then be overridden within the `res.render()` call if need be:
+
+    res.render('myview.ejs', { layout: true });
+
+When an alternate layout is required, we may also specify a path. For example if we have _view engine_ set to _jade_ and a file named _./views/mylayout.jade_ we can simply pass:
+
+    res.render('page', { layout: 'mylayout' });
+
+Otherwise we must specify the extension:
+
+    res.render('page', { layout: 'mylayout.jade' });
+
+These paths may also be absolute:
+
+    res.render('page', { layout: __dirname + '/../../mylayout.jade' });
+
+A good example of this is specifying custom _ejs_ opening and closing tags:
+
+	app.set('view options', {
+	    open: '{{',
+	    close: '}}'
+	});
+
 ### View Partials
 
 The Express view system has built-in support for partials and collections, which are
@@ -261,15 +497,72 @@ however if we wished we could use an ejs partial, within a haml view for example
 And once again even further, when rendering a collection we can simply pass
 an array, if no other options are desired:
 
-    partial('comments', comments);
+    partial('comment', comments);
+
+When using the partial collection support a few "magic" variables are provided
+for free:
+
+  * _firstInCollection_  True if this is the first object
+  * _indexInCollection_  Index of the object in the collection
+  * _lastInCollection_  True if this is the last object
+  * _collectionLength_  Length of the collection
+
+For documentation on altering the object name view [res.partial()](http://expressjs.com/guide.html#res-partial-view-options-).
 
 ### Template Engines
 
 Below are a few template engines commonly used with Express:
 
-  * [Jade](http://github.com/visionmedia/jade) haml.js successor
-  * [Haml](http://github.com/visionmedia/haml.js) indented templates
+  * [Jade](http://jade-lang.com) haml.js successor
+  * [Haml](http://github.com/visionmedia/haml.js) pythonic indented templates
   * [EJS](http://github.com/visionmedia/ejs) Embedded JavaScript
+  * [CoffeeKup](http://github.com/mauricemach/coffeekup) CoffeeScript based templating
+  * [Eco](http://github.com/sstephenson/eco) Embedded CoffeeScript
+  * [jQuery Templates](https://github.com/kof/node-jqtpl) for node
+
+### Session Support
+
+Sessions support can be added by using Connect's _session_ middleware. To do so we also need the _cookieDecoder_ middleware place above it, which will parse and populate cookie data to _req.cookies_. The session middleware requires only a `secret`.
+
+    app.use(express.cookieDecoder());
+    app.use(express.session({ secret: 'keyboard cat' }));
+
+By default the _session_ middleware uses the memory store bundled with Connect, however many implementations exist. For example [connect-redis](http://github.com/visionmedia/connect-redis) supplies a [Redis](http://code.google.com/p/redis/) session store and can be used as shown below:
+
+    var RedisStore = require('connect-redis');
+    app.use(express.cookieDecoder());
+    app.use(express.session({ store: new RedisStore, secret: 'keyboard cat' }));
+
+Now the _req.session_ and _req.sessionStore_ properties will be accessible to all routes and subsequent middleware. Properties on _req.session_ are automatically saved on a response, so for example if we wish to shopping cart data:
+
+    var RedisStore = require('connect-redis');
+    app.use(express.bodyDecoder());
+    app.use(express.cookieDecoder());
+    app.use(express.session({ store: new RedisStore, secret: 'keyboard cat' }));
+
+    app.post('/add-to-cart', function(req, res){
+      // Perhaps we posted several items with a form
+      // (use the bodyDecoder() middleware for this)
+      var items = req.body.items;
+      req.session.items = items;
+      res.redirect('back');
+    });
+
+    app.get('/add-to-cart', function(req, res){
+      // When redirected back to GET /add-to-cart
+      // we could check req.session.items && req.session.items.length
+      // to print out a message
+      if (req.session.items && req.session.items.length) {
+        req.flash('info', 'You have %s items in your cart', req.session.items.length);
+      }
+      res.render('shopping-cart');
+    });
+
+The _req.session_ object also has methods such as _Session#touch()_, _Session#destroy()_, _Session#regenerate()_ among others to maintain and manipulate sessions. For more information view the [Connect Session](http://senchalabs.github.com/connect/session.html) documentation.
+
+### Migration Guide
+
+ Pre-beta Express developers may reference the [Migration Guide](migrate.html) to get up to speed on how to upgrade your application.
 
 ### req.header(key[, defaultValue])
 
@@ -303,21 +596,70 @@ to "text/html" using the mime lookup table.
     req.accepts('png');
     // => false
 
+### req.is(type)
+
+Check if the incoming request contains the _Content-Type_
+header field, and it contains the give mime _type_.
+ 
+       // With Content-Type: text/html; charset=utf-8
+       req.is('html');
+       req.is('text/html');
+       // => true
+       
+       // When Content-Type is application/json
+       req.is('json');
+       req.is('application/json');
+       // => true
+       
+       req.is('html');
+       // => false
+  
+Ad-hoc callbacks can also be registered with Express, to perform
+assertions again the request, for example if we need an expressive
+way to check if our incoming request is an image, we can register _"an image"_
+callback:
+  
+        app.is('an image', function(req){
+          return 0 == req.headers['content-type'].indexOf('image');
+        });
+  
+Now within our route callbacks, we can use to to assert content types
+such as _"image/jpeg"_, _"image/png"_, etc.
+  
+       app.post('/image/upload', function(req, res, next){
+         if (req.is('an image')) {
+           // do something
+         } else {
+           next();
+         }
+       });
+
+Keep in mind this method is _not_ limited to checking _Content-Type_, you
+can perform any request assertion you wish.
+
+Wildcard matches can also be made, simplifying our example above for _"an image"_, by asserting the _subtype_ only:
+
+    req.is('image/*');
+
+We may also assert the _type_ as shown below, which would return true for _"application/json"_, and _"text/json"_.
+
+    req.is('*/json');
+
 ### req.param(name)
 
 Return the value of param _name_ when present.
 
-  - Checks route placeholders, ex: /user/:id
-  - Checks query string params, ex: ?id=12
-  - Checks urlencoded body params, ex: id=12
+  - Checks route placeholders (_req.params_), ex: /user/:id
+  - Checks query string params (_req.query_), ex: ?id=12
+  - Checks urlencoded body params (_req.body_), ex: id=12
 
 To utilize urlencoded request bodies, _req.body_
 should be an object. This can be done by using
-the _connect.bodyDecoder_ middleware.
+the _express.bodyDecoder_ middleware.
 
 ### req.flash(type[, msg])
 
-Queue flash _msg_ of the given _type_.
+Queue flash _msg_ of the given _type_. These messages are stored in the session (thus requiring the `session` middleware), enabling them to span one or more requests before flushing.
 
     req.flash('info', 'email sent');
     req.flash('error', 'email delivery failed');
@@ -333,6 +675,12 @@ Queue flash _msg_ of the given _type_.
     req.flash();
     // => { error: ['email delivery failed'], info: [] }
 
+Flash notification message may also utilize formatters, by default only the %s string formatter is available:
+
+    req.flash('info', 'email delivery to _%s_ from _%s_ failed.', toUser, fromUser);
+
+For HTML flash message check out the [express-contrib](https://github.com/visionmedia/express-contrib) library.
+
 ### req.isXMLHttpRequest
 
 Also aliased as _req.xhr_, this getter checks the _X-Requested-With_ header
@@ -374,8 +722,17 @@ Used by `res.download()` to transfer an arbitrary file.
 
     res.sendfile('path/to/my.file');
 
-**NOTE**: this is _not_ a replacement for Connect's _staticProvider_ middleware,
-nor does it perform any security checks, use with caution when using in a dynamic manor.
+This method accepts a callback which when given will be called on an exception, as well as when the transfer has completed. When a callback is not given, and the file has __not__ been streamed, _next(err)_ will be called on an exception.
+
+    res.sendfile(path, function(err, path){
+      if (err) {
+        // handle the error
+      } else {
+        console.log('transferred %s', path);
+      }
+    });
+
+When the filesize exceeds the _stream threshold_ (defaulting to 32k), the file will be streamed using _fs.ReadStream_ and _sys.pump()_.
 
 ### res.download(file[, filename])
 
@@ -395,6 +752,7 @@ The `res.send()` method is a high level response utility allowing you to pass
 objects to respond with json, strings for html, arbitrary _Buffer_s or numbers for status
 code based responses. The following are all valid uses:
 
+     res.send(); // 204
      res.send(new Buffer('wahoo'));
      res.send({ some: 'json' });
      res.send('<p>some html</p>');
@@ -420,14 +778,115 @@ Express supports "redirect mapping", which by default provides _home_, and _back
 The _back_ map checks the _Referrer_ and _Referer_ headers, while _home_ utilizes
 the "home" setting and defaults to "/".
 
+### res.cookie(name, val[, options])
+
+Sets the given cookie _name_ to _val_, with _options_ such as "httpOnly: true", "expires", "secure" etc.
+
+    // "Remember me" for 15 minutes 
+    res.cookie('rememberme', 'yes', { expires: new Date(Date.now() + 900000), httpOnly: true });
+
+To parse incoming _Cookie_ headers, use the _cookieDecoder_ middleware, which provides the _req.cookies_ object:
+
+    app.use(express.cookieDecoder());
+    
+    app.get('/', function(req, res){
+        // use req.cookies.rememberme
+    });
+
+### res.clearCookie(name)
+
+Clear cookie _name_ by setting "expires" far in the past.
+
+    res.clearCookie('rememberme');
+
+### res.render(view[, options[, fn]])
+
+Render _view_ with the given _options_ and optional callback _fn_.
+When a callback function is given a response will _not_ be made
+automatically, however otherwise a response of _200_ and _text/html_ is given.
+
+ Most engines accept one or more of the following options,
+ both [haml](http://github.com/visionmedia/haml.js) and [jade](http://github.com/visionmedia/jade) accept all:
+
+  - _scope_           Template evaluation context (value of _this_)
+  - _locals_          Object containing local variables
+  - _debug_           Output debugging information
+  - _status_          Response status code, defaults to 200
+  - _headers_         Response headers object
+
+### res.partial(view[, options])
+
+Render _view_ partial with the given _options_. This method is always available
+to the view as a local variable.
+
+- _object_ the object named by _as_ or derived from the view name
+- _as_ Variable name for each _collection_ or _object_ 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. 
+  For example _video.html_ will have a object _video_ available to it.
+
+The following are equivalent, and the name of collection value when passed
+to the partial will be _movie_ as derived from the name.
+
+    partial('theatre/movie.jade', { collection: movies });
+    partial('theatre/movie.jade', movies);
+    partial('movie.jade', { collection: movies });
+    partial('movie.jade', movies);
+    partial('movie', movies);
+    // In view: movie.director
+
+To change the local from _movie_ to _video_ we can use the "as" option:
+
+	partial('movie', { collection: movies, as: 'video' });
+	// In view: video.director
+
+Also we can make our movie the value of _this_ within our view so that instead
+of _movie.director_ we could use _this.director_.
+
+    partial('movie', { collection: movies, as: this });
+    // In view: this.director
+
+Another alternative is to "explode" the properties of the collection item into
+pseudo globals (local variables) by using _as: global_, which again is syntactic sugar:
+
+    partial('movie', { collection: movies, as: global });
+    // In view: director
+
+This same logic applies to a single partial object usage:
+
+    partial('movie', { object: movie, as: this });
+    // In view: this.director
+
+    partial('movie', { object: movie, as: global });
+    // In view: director
+
+    partial('movie', { object: movie, as: 'video' });
+    // In view: video.director
+
+    partial('movie', { object: movie });
+    // In view: movie.director
+
+When a non-collection (does _not_ have _.length_) is passed as the second argument, it is assumed to be the _object_, after which the object's local variable name is derived from the view name:
+
+    partial('movie', movie);
+    // => In view: movie.director
+
 ### app.set(name[, val])
 
 Apply an application level setting _name_ to _val_, or
 get the value of _name_ when _val_ is not present:
 
-    app.set('reload views', 200);
-    app.set('reload views');
-    // => 200
+    app.set('views', __dirname + '/views');
+    app.set('views');
+    // => ...path...
+
+Alternatively you may simply access the settings via _app.settings_:
+
+    app.settings.views
+    // => ...path...
 
 ### app.enable(name)
 
@@ -469,8 +928,8 @@ Now in a route we may call:
 
 We may also map dynamic redirects:
 
-    app.redirect('comments', function(req, res, params){
-        return '/post/' + params.id + '/comments';
+    app.redirect('comments', function(req, res){
+        return '/post/' + req.params.id + '/comments';
     });
 
 So now we may do the following, and the redirect will dynamically adjust to
@@ -491,6 +950,77 @@ should call _next(err)_ if it does not wish to deal with the exception:
 		res.send(err.message, 500);
 	});
 
+### app.helpers(obj)
+
+Registers static view helpers.
+
+    app.helpers({
+		name: function(first, last){ return first + ', ' + last },
+		firstName: 'tj',
+		lastName: 'holowaychuk'
+	});
+
+Our view could now utilize the _firstName_ and _lastName_ variables,
+as well as the _name()_ function exposed.
+
+    <%= name(firstName, lastName) %>
+
+### app.dynamicHelpers(obj)
+
+Registers dynamic view helpers. Dynamic view helpers
+are simply functions which accept _req_, _res_, and are
+evaluated against the _Server_ instance before a view is rendered. The _return value_ of this function
+becomes the local variable it is associated with.
+
+    app.dynamicHelpers({
+		session: function(req, res){
+			return req.session;
+		}
+    });
+
+All views would now have _session_ available so that session data can be accessed via _session.name_ etc:
+
+    <%= session.name %>
+
+### app.mounted(fn)
+
+Assign a callback _fn_ which is called when this _Server_ is passed to _Server#use()_.
+
+    var app = express.createServer(),
+        blog = express.createServer();
+    
+    blog.mounted(function(parent){
+        // parent is app
+        // "this" is blog
+    });
+    
+    app.use(blog);
+
+### app.register(ext, exports)
+
+Register the given template engine _exports_
+as _ext_. For example we may wish to map ".html"
+files to jade:
+
+     app.register('.html', require('jade'));
+
+This is also useful for libraries that may not
+match extensions correctly. For example my haml.js
+library is installed from npm as "hamljs" so instead
+of layout.hamljs, we can register the engine as ".haml":
+
+     app.register('.haml', require('haml-js'));
+
+For engines that do not comply with the Express
+specification, we can also wrap their api this way.
+
+     app.register('.foo', {
+         render: function(str, options) {
+             // perhaps their api is
+             // return foo.toHTML(str, options);
+         }
+     });
+
 ### app.listen([port[, host]])
 
 Bind the app server to the given _port_, which defaults to 3000. When _host_ is omitted all

docs/index.1

@@ -1,7 +1,10 @@
-.\" generated with Ronn/v0.6.6
-.\" http://github.com/rtomayko/ronn/
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "INDEX" "" "July 2010" "" ""
+.TH "INDEX" "" "October 2010" "" ""
+.
+.SH "NAME"
+\fBindex\fR
 .
 .IP "" 4
 .
@@ -28,6 +31,15 @@ Robust routing
 Redirection helpers
 .
 .IP "\(bu" 4
+Dynamic view helpers
+.
+.IP "\(bu" 4
+Application level view options
+.
+.IP "\(bu" 4
+Content negotiation
+.
+.IP "\(bu" 4
 Focus on high performance
 .
 .IP "\(bu" 4
@@ -40,11 +52,14 @@ Environment based configuration
 Session based flash notifications
 .
 .IP "\(bu" 4
-Built on Connect \fIhttp://extjs\.github\.com/Connect\fR
+Built on Connect \fIhttp://github\.com/senchalabs/connect\fR
 .
 .IP "\(bu" 4
 Executable \fIexecutable\.html\fR for generating applications quickly
 .
+.IP "\(bu" 4
+High test coverage
+.
 .IP "" 0
 .
 .SH "Contributors"
@@ -59,6 +74,9 @@ Ciaran Jessup (ciaranj \fIhttp://github\.com/ciaranj\fR)
 .IP "\(bu" 4
 Aaron Heckmann (aheckmann \fIhttp://github\.com/aheckmann\fR)
 .
+.IP "\(bu" 4
+Guillermo Rauch (guille \fIhttp://github\.com/guille\fR)
+.
 .IP "" 0
 .
 .SH "More Information"
@@ -73,13 +91,16 @@ Follow tjholowaychuk \fIhttp://twitter\.com/tjholowaychuk\fR on twitter for upda
 Annotated source documentation \fIapi\.html\fR
 .
 .IP "\(bu" 4
+View the Connect \fIhttp://github\.com/senchalabs/connect\fR repo for middleware usage
+.
+.IP "\(bu" 4
+View the Connect Wiki \fIhttp://wiki\.github\.com/senchalabs/connect/\fR for contrib middleware
+.
+.IP "\(bu" 4
+View the examples \fIhttp://github\.com/visionmedia/express/tree/master/examples/\fR
+.
+.IP "\(bu" 4
 View the source \fIhttp://github\.com/visionmedia/express\fR
 .
-.IP "\(bu" 4
-View the Connect \fIhttp://github\.com/extjs/Connect\fR repo for middleware usage
-.
-.IP "\(bu" 4
-View the Connect Wiki \fIhttp://wiki\.github\.com/extjs/Connect/\fR for contrib middleware
-.
 .IP "" 0
 

docs/index.html

@@ -1,20 +1,8 @@
 <html>
 	<head>
 		<title>Express - node web framework</title>
+		<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
 		<style>
-		    #header {
-				position: absolute;
-				top: 10px;
-				left: 0;
-		        padding: 12px 0;
-				text-indent: 40px;
-				width: 100%;
-		        border-top: 1px solid rgba(0,0,0,0.7);
-		        border-bottom: 1px solid rgba(0,0,0,0.7);
-		        background: rgba(255,255,255,0.1) url(http://www.sencha.com/favicon.ico) no-repeat 15px 50%;
-				text-align: left;
-				color: #fff;
-		    }
 			#tagline {
 			  margin-left: 75px;
 			  margin-bottom: 30px;
@@ -28,8 +16,7 @@
 			  font: 14px/1.4 "Helvetica Neue", "Lucida Grande", "Arial";
 			  font-size: 14px;
 			  line-height: 1.5;
-			  -webkit-text-stroke: 1px rgba(0, 0, 0, 0.1);
-			  -moz-text-stroke: 1px rgba(0, 0, 0, 0.1);
+			  -webkit-font-smoothing: antialiased;
 			  background: url(images/bg.jpg) 50% 0 no-repeat;
 			  color: #8b8b8b; }
 
@@ -52,13 +39,17 @@
 			  a:hover {
 			    opacity: 0.8; }
 
-			h1, h2, h3 {
+			h1, h2, h3, h4 {
 			  margin: 45px 0 0 0;
 			  color: white;
 			  text-shadow: 1px 2px 2px rgba(0,0,0,0.6); }
 
 			h3 {
 			  font-size: 18px; }
+			h4 {
+			  margin-left: 10px;
+			  font-size: 14px;
+			}
 
 			pre {
 			  margin: 20px 10px;
@@ -80,9 +71,19 @@
 			    margin: 0;
 			    padding: 2px 0;
 			    list-style: square; }
+          ul li ul {
+            margin: 0;
+            padding-left: 12px;
+          }
+
+      .man-name, #Express { display:none; }
 
 			.sect {
 			  margin-left: 40px; }
+			img {
+			  margin-left: 20px;
+			  margin-bottom: 15px;
+			}
 
 			#logo {
 			  display: block;
@@ -110,21 +111,22 @@
 
 			#container {
 			  margin: 0 auto;
-			  padding-top: 110px;
+			  padding-top: 80px;
 			  width: 550px; }
 
 			#toc {
 				position: fixed;
-				top: 60px;
+				top: 0;
 				left: 0;
 				margin: 0 0 0 15px;
 				padding: 15px;
 				height: 100%;
 				background: rgba(0,0,0,0.2);
+				overflow: auto;
 				border-right: 1px solid rgba(255,255,255,0.05);
 			}
 			#toc li {
-				padding: 1px 0;
+				padding: 0;
 				list-style: none;
 			}
 			#toc li a {
@@ -158,12 +160,23 @@
 			        -webkit-box-shadow: 1px 1px 1px rgba(0,0,0,0.4);
 			        -moz-box-shadow: 1px 1px 1px rgba(0,0,0,0.4); }
 		</style>
+		<script>
+		  $(function(){
+		    $('.section').hide();
+		    $('.toggle, a.section-title').toggle(function(){
+		      $(this).siblings('ul').fadeIn(300);
+		      return false;
+		    }, function(){
+		      $(this).siblings('ul').fadeOut(300);
+		      return false;
+		    });
+		  });
+		</script>
 	</head>
 	<body>
 		<a href='http://github.com/visionmedia/express'> 
 		  <img alt='Fork me on GitHub' id='ribbon' src='http://s3.amazonaws.com/github/ribbons/forkme_right_white_ffffff.png' /> 
 		</a>
-		<div id="header"><strong>Sencha</strong> labs</div>
 		<div id="wrapper">
 			<div id="container">
 				<a href='http://github.com/visionmedia/express' id='logo'>Express</a> 
@@ -175,9 +188,13 @@
 					<li><a href="index.html">Home</a></li>
 					<li><a href="guide.html">Guide</a></li>
 					<li><a href="contrib.html">Contributing</a></li>
-					<li><a href="migrate.html">1.x Migration</a></li>
+					<li><a href="applications.html">Applications</a></li>
 				</ul>
 <div class='mp'>
+<h2 id="Express">Express</h2>
+<p class="man-name">
+  <code>index</code>
+</p>
 <pre><code>var app = express.createServer();
 
 app.get('/', function(req, res){
@@ -192,12 +209,16 @@ app.listen(3000);
 <ul>
 <li>Robust routing</li>
 <li>Redirection helpers</li>
+<li>Dynamic view helpers</li>
+<li>Application level view options</li>
+<li>Content negotiation</li>
 <li>Focus on high performance</li>
 <li>View rendering and partials support</li>
 <li>Environment based configuration</li>
 <li>Session based flash notifications</li>
-<li>Built on <a href="http://extjs.github.com/Connect">Connect</a></li>
+<li>Built on <a href="http://github.com/senchalabs/connect">Connect</a></li>
 <li><a href="executable.html">Executable</a> for generating applications quickly</li>
+<li>High test coverage</li>
 </ul>
 
 
@@ -209,6 +230,7 @@ app.listen(3000);
 <li>TJ Holowaychuk (<a href="http://github.com/visionmedia">visionmedia</a>)</li>
 <li>Ciaran Jessup (<a href="http://github.com/ciaranj">ciaranj</a>)</li>
 <li>Aaron Heckmann (<a href="http://github.com/aheckmann">aheckmann</a>)</li>
+<li>Guillermo Rauch (<a href="http://github.com/guille">guille</a>)</li>
 </ul>
 
 
@@ -218,9 +240,10 @@ app.listen(3000);
 <li><a href="http://groups.google.com/group/express-js">Google Group</a> for discussion</li>
 <li>Follow <a href="http://twitter.com/tjholowaychuk">tjholowaychuk</a> on twitter for updates</li>
 <li>Annotated source <a href="api.html">documentation</a></li>
+<li>View the <a href="http://github.com/senchalabs/connect">Connect</a> repo for middleware usage</li>
+<li>View the <a href="http://wiki.github.com/senchalabs/connect/">Connect Wiki</a> for contrib middleware</li>
+<li>View the <a href="http://github.com/visionmedia/express/tree/master/examples/">examples</a></li>
 <li>View the <a href="http://github.com/visionmedia/express">source</a></li>
-<li>View the <a href="http://github.com/extjs/Connect">Connect</a> repo for middleware usage</li>
-<li>View the <a href="http://wiki.github.com/extjs/Connect/">Connect Wiki</a> for contrib middleware</li>
 </ul>
 
 

docs/index.md

@@ -11,12 +11,16 @@
 
   * Robust routing
   * Redirection helpers
+  * Dynamic view helpers
+  * Application level view options
+  * Content negotiation
   * Focus on high performance
   * View rendering and partials support
   * Environment based configuration
   * Session based flash notifications
-  * Built on [Connect](http://extjs.github.com/Connect)
+  * Built on [Connect](http://github.com/senchalabs/connect)
   * [Executable](executable.html) for generating applications quickly
+  * High test coverage
 
 ## Contributors
 
@@ -25,12 +29,14 @@ The following are the major contributors of Express (in no specific order).
   * TJ Holowaychuk ([visionmedia](http://github.com/visionmedia))
   * Ciaran Jessup ([ciaranj](http://github.com/ciaranj))
   * Aaron Heckmann ([aheckmann](http://github.com/aheckmann))
+  * Guillermo Rauch ([guille](http://github.com/guille))
 
 ## More Information
 
   * [Google Group](http://groups.google.com/group/express-js) for discussion
   * Follow [tjholowaychuk](http://twitter.com/tjholowaychuk) on twitter for updates
   * Annotated source [documentation](api.html)
+  * View the [Connect](http://github.com/senchalabs/connect) repo for middleware usage
+  * View the [Connect Wiki](http://wiki.github.com/senchalabs/connect/) for contrib middleware
+  * View the [examples](http://github.com/visionmedia/express/tree/master/examples/)
   * View the [source](http://github.com/visionmedia/express)
-  * View the [Connect](http://github.com/extjs/Connect) repo for middleware usage
-  * View the [Connect Wiki](http://wiki.github.com/extjs/Connect/) for contrib middleware

docs/layout/head.html

@@ -1,20 +1,8 @@
 <html>
 	<head>
 		<title>Express - node web framework</title>
+		<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
 		<style>
-		    #header {
-				position: absolute;
-				top: 10px;
-				left: 0;
-		        padding: 12px 0;
-				text-indent: 40px;
-				width: 100%;
-		        border-top: 1px solid rgba(0,0,0,0.7);
-		        border-bottom: 1px solid rgba(0,0,0,0.7);
-		        background: rgba(255,255,255,0.1) url(http://www.sencha.com/favicon.ico) no-repeat 15px 50%;
-				text-align: left;
-				color: #fff;
-		    }
 			#tagline {
 			  margin-left: 75px;
 			  margin-bottom: 30px;
@@ -28,8 +16,7 @@
 			  font: 14px/1.4 "Helvetica Neue", "Lucida Grande", "Arial";
 			  font-size: 14px;
 			  line-height: 1.5;
-			  -webkit-text-stroke: 1px rgba(0, 0, 0, 0.1);
-			  -moz-text-stroke: 1px rgba(0, 0, 0, 0.1);
+			  -webkit-font-smoothing: antialiased;
 			  background: url(images/bg.jpg) 50% 0 no-repeat;
 			  color: #8b8b8b; }
 
@@ -52,13 +39,17 @@
 			  a:hover {
 			    opacity: 0.8; }
 
-			h1, h2, h3 {
+			h1, h2, h3, h4 {
 			  margin: 45px 0 0 0;
 			  color: white;
 			  text-shadow: 1px 2px 2px rgba(0,0,0,0.6); }
 
 			h3 {
 			  font-size: 18px; }
+			h4 {
+			  margin-left: 10px;
+			  font-size: 14px;
+			}
 
 			pre {
 			  margin: 20px 10px;
@@ -80,9 +71,19 @@
 			    margin: 0;
 			    padding: 2px 0;
 			    list-style: square; }
+          ul li ul {
+            margin: 0;
+            padding-left: 12px;
+          }
+
+      .man-name, #Express { display:none; }
 
 			.sect {
 			  margin-left: 40px; }
+			img {
+			  margin-left: 20px;
+			  margin-bottom: 15px;
+			}
 
 			#logo {
 			  display: block;
@@ -110,21 +111,22 @@
 
 			#container {
 			  margin: 0 auto;
-			  padding-top: 110px;
+			  padding-top: 80px;
 			  width: 550px; }
 
 			#toc {
 				position: fixed;
-				top: 60px;
+				top: 0;
 				left: 0;
 				margin: 0 0 0 15px;
 				padding: 15px;
 				height: 100%;
 				background: rgba(0,0,0,0.2);
+				overflow: auto;
 				border-right: 1px solid rgba(255,255,255,0.05);
 			}
 			#toc li {
-				padding: 1px 0;
+				padding: 0;
 				list-style: none;
 			}
 			#toc li a {
@@ -158,12 +160,23 @@
 			        -webkit-box-shadow: 1px 1px 1px rgba(0,0,0,0.4);
 			        -moz-box-shadow: 1px 1px 1px rgba(0,0,0,0.4); }
 		</style>
+		<script>
+		  $(function(){
+		    $('.section').hide();
+		    $('.toggle, a.section-title').toggle(function(){
+		      $(this).siblings('ul').fadeIn(300);
+		      return false;
+		    }, function(){
+		      $(this).siblings('ul').fadeOut(300);
+		      return false;
+		    });
+		  });
+		</script>
 	</head>
 	<body>
 		<a href='http://github.com/visionmedia/express'> 
 		  <img alt='Fork me on GitHub' id='ribbon' src='http://s3.amazonaws.com/github/ribbons/forkme_right_white_ffffff.png' /> 
 		</a>
-		<div id="header"><strong>Sencha</strong> labs</div>
 		<div id="wrapper">
 			<div id="container">
 				<a href='http://github.com/visionmedia/express' id='logo'>Express</a> 
@@ -175,5 +188,5 @@
 					<li><a href="index.html">Home</a></li>
 					<li><a href="guide.html">Guide</a></li>
 					<li><a href="contrib.html">Contributing</a></li>
-					<li><a href="migrate.html">1.x Migration</a></li>
+					<li><a href="applications.html">Applications</a></li>
 				</ul>

docs/migrate.1

@@ -1,7 +1,10 @@
-.\" generated with Ronn/v0.6.6
-.\" http://github.com/rtomayko/ronn/
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "MIGRATE" "" "July 2010" "" ""
+.TH "MIGRATE" "" "October 2010" "" ""
+.
+.SH "NAME"
+\fBmigrate\fR
 .
 .SS "Built On Connect"
 Express 1\.x is written to run on\-top of the Connect \fIhttp://extjs\.github\.com/Connect\fR middlware framework, thus the \fIPlugin\fR has been replaced by Connect\'s middleware\. By abstracting our middleware to Connect we allow additional community frameworks to develop robust, high\-level frameworks using the same technologies as Express\.
@@ -74,12 +77,10 @@ Which we can now \fIuse()\fR within our app, or pass to the \fIexpress\.createSe
 .
 .nf
 
-var connect = require(\'connect\');
-
 var app = express\.createServer(
-    connect\.logger(),
-    connect\.methodOverride(),
-    connect\.cookie()
+    express\.logger(),
+    express\.methodOverride(),
+    express\.cookieDecoder()
 );
 .
 .fi
@@ -93,12 +94,11 @@ or:
 .
 .nf
 
-var connect = require(\'connect\');
 var app = express\.createServer();
 
-app\.use(\'/\', connect\.logger());
-app\.use(\'/\', connect\.methodOverride());
-app\.use(\'/\', connect\.cookieDecoder());
+app\.use(express\.logger());
+app\.use(express\.methodOverride());
+app\.use(express\.cookieDecoder());
 .
 .fi
 .
@@ -156,7 +156,7 @@ Polymorphic parameter access can be done using \fBreq\.param()\fR:
 .
 .nf
 
-app\.get(\'/user/:id\', function(){
+app\.get(\'/user/:id\', function(req, res){
     req\.param(\'id\');
 });
 .
@@ -165,14 +165,14 @@ app\.get(\'/user/:id\', function(){
 .IP "" 0
 .
 .P
-Route parameters are also passed as the third argument:
+Route parameters are available via \fBreq\.params\fR:
 .
 .IP "" 4
 .
 .nf
 
-app\.get(\'/user/:id\', function(req, res, params){
-    params\.id;
+app\.get(\'/user/:id\', function(req, res){
+    req\.params\.id;
 });
 .
 .fi
@@ -195,13 +195,13 @@ get(\'/\', function(){
 .IP "" 0
 .
 .P
-Now Express has access to Connect\'s \fInext()\fR function, which is passed as the fourth and final argument\. Calling \fInext()\fR will pass control to the next \fImatching route\fR, or continue down the stack of Connect middleware\.
+Now Express has access to Connect\'s \fInext()\fR function, which is passed as the third and final argument\. Calling \fInext()\fR will pass control to the next \fImatching route\fR, or continue down the stack of Connect middleware\.
 .
 .IP "" 4
 .
 .nf
 
-app\.get(\'/user/:id?\', function(req, res, params, next){
+app\.get(\'/user/:id?\', function(req, res, next){
     next();
 });
 

docs/migrate.html

@@ -1,20 +1,8 @@
 <html>
 	<head>
 		<title>Express - node web framework</title>
+		<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
 		<style>
-		    #header {
-				position: absolute;
-				top: 10px;
-				left: 0;
-		        padding: 12px 0;
-				text-indent: 40px;
-				width: 100%;
-		        border-top: 1px solid rgba(0,0,0,0.7);
-		        border-bottom: 1px solid rgba(0,0,0,0.7);
-		        background: rgba(255,255,255,0.1) url(http://www.sencha.com/favicon.ico) no-repeat 15px 50%;
-				text-align: left;
-				color: #fff;
-		    }
 			#tagline {
 			  margin-left: 75px;
 			  margin-bottom: 30px;
@@ -28,8 +16,7 @@
 			  font: 14px/1.4 "Helvetica Neue", "Lucida Grande", "Arial";
 			  font-size: 14px;
 			  line-height: 1.5;
-			  -webkit-text-stroke: 1px rgba(0, 0, 0, 0.1);
-			  -moz-text-stroke: 1px rgba(0, 0, 0, 0.1);
+			  -webkit-font-smoothing: antialiased;
 			  background: url(images/bg.jpg) 50% 0 no-repeat;
 			  color: #8b8b8b; }
 
@@ -52,13 +39,17 @@
 			  a:hover {
 			    opacity: 0.8; }
 
-			h1, h2, h3 {
+			h1, h2, h3, h4 {
 			  margin: 45px 0 0 0;
 			  color: white;
 			  text-shadow: 1px 2px 2px rgba(0,0,0,0.6); }
 
 			h3 {
 			  font-size: 18px; }
+			h4 {
+			  margin-left: 10px;
+			  font-size: 14px;
+			}
 
 			pre {
 			  margin: 20px 10px;
@@ -80,9 +71,19 @@
 			    margin: 0;
 			    padding: 2px 0;
 			    list-style: square; }
+          ul li ul {
+            margin: 0;
+            padding-left: 12px;
+          }
+
+      .man-name, #Express { display:none; }
 
 			.sect {
 			  margin-left: 40px; }
+			img {
+			  margin-left: 20px;
+			  margin-bottom: 15px;
+			}
 
 			#logo {
 			  display: block;
@@ -110,21 +111,22 @@
 
 			#container {
 			  margin: 0 auto;
-			  padding-top: 110px;
+			  padding-top: 80px;
 			  width: 550px; }
 
 			#toc {
 				position: fixed;
-				top: 60px;
+				top: 0;
 				left: 0;
 				margin: 0 0 0 15px;
 				padding: 15px;
 				height: 100%;
 				background: rgba(0,0,0,0.2);
+				overflow: auto;
 				border-right: 1px solid rgba(255,255,255,0.05);
 			}
 			#toc li {
-				padding: 1px 0;
+				padding: 0;
 				list-style: none;
 			}
 			#toc li a {
@@ -158,12 +160,23 @@
 			        -webkit-box-shadow: 1px 1px 1px rgba(0,0,0,0.4);
 			        -moz-box-shadow: 1px 1px 1px rgba(0,0,0,0.4); }
 		</style>
+		<script>
+		  $(function(){
+		    $('.section').hide();
+		    $('.toggle, a.section-title').toggle(function(){
+		      $(this).siblings('ul').fadeIn(300);
+		      return false;
+		    }, function(){
+		      $(this).siblings('ul').fadeOut(300);
+		      return false;
+		    });
+		  });
+		</script>
 	</head>
 	<body>
 		<a href='http://github.com/visionmedia/express'> 
 		  <img alt='Fork me on GitHub' id='ribbon' src='http://s3.amazonaws.com/github/ribbons/forkme_right_white_ffffff.png' /> 
 		</a>
-		<div id="header"><strong>Sencha</strong> labs</div>
 		<div id="wrapper">
 			<div id="container">
 				<a href='http://github.com/visionmedia/express' id='logo'>Express</a> 
@@ -175,9 +188,13 @@
 					<li><a href="index.html">Home</a></li>
 					<li><a href="guide.html">Guide</a></li>
 					<li><a href="contrib.html">Contributing</a></li>
-					<li><a href="migrate.html">1.x Migration</a></li>
+					<li><a href="applications.html">Applications</a></li>
 				</ul>
 <div class='mp'>
+<h2 id="Express">Express</h2>
+<p class="man-name">
+  <code>migrate</code>
+</p>
 <h3 id="Built-On-Connect">Built On Connect</h3>
 
 <p>Express 1.x is written to run on-top of the <a href="http://extjs.github.com/Connect">Connect</a> middlware
@@ -233,23 +250,20 @@ use(Cookie);
 
 <p>Which we can now <em>use()</em> within our app, or pass to the <em>express.createServer()</em> method:</p>
 
-<pre><code>var connect = require('connect');
-
-var app = express.createServer(
-    connect.logger(),
-    connect.methodOverride(),
-    connect.cookie()
+<pre><code>var app = express.createServer(
+    express.logger(),
+    express.methodOverride(),
+    express.cookieDecoder()
 );
 </code></pre>
 
 <p>or:</p>
 
-<pre><code>var connect = require('connect');
-var app = express.createServer();
+<pre><code>var app = express.createServer();
 
-app.use('/', connect.logger());
-app.use('/', connect.methodOverride());
-app.use('/', connect.cookieDecoder());
+app.use(express.logger());
+app.use(express.methodOverride());
+app.use(express.cookieDecoder());
 </code></pre>
 
 <p>For documentation on creating Connect middleware visit <a href="http://extjs.github.com/Connect/#Middleware-Authoring">Middleware Authoring</a>.</p>
@@ -280,15 +294,15 @@ fetching a route, query string, or request body parameter:</p>
 
 <p>Polymorphic parameter access can be done using <code>req.param()</code>:</p>
 
-<pre><code>app.get('/user/:id', function(){
+<pre><code>app.get('/user/:id', function(req, res){
     req.param('id');
 });
 </code></pre>
 
-<p>Route parameters are also passed as the third argument:</p>
+<p>Route parameters are available via <code>req.params</code>:</p>
 
-<pre><code>app.get('/user/:id', function(req, res, params){
-    params.id;
+<pre><code>app.get('/user/:id', function(req, res){
+    req.params.id;
 });
 </code></pre>
 
@@ -304,11 +318,11 @@ implemented for practical use:</p>
 </code></pre>
 
 <p>Now Express has access to Connect's <em>next()</em> function,
-which is passed as the fourth and final argument. Calling <em>next()</em> will
+which is passed as the third and final argument. Calling <em>next()</em> will
 pass control to the next <em>matching route</em>, or continue down the stack
 of Connect middleware.</p>
 
-<pre><code>app.get('/user/:id?', function(req, res, params, next){
+<pre><code>app.get('/user/:id?', function(req, res, next){
     next();
 });
 

docs/migrate.md

@@ -51,22 +51,19 @@ similar to below:
 
 Which we can now _use()_ within our app, or pass to the _express.createServer()_ method:
 
-	var connect = require('connect');
-
     var app = express.createServer(
-		connect.logger(),
-		connect.methodOverride(),
-		connect.cookie()
+		express.logger(),
+		express.methodOverride(),
+		express.cookieDecoder()
 	);
 
 or:
 
-    var connect = require('connect');
 	var app = express.createServer();
 
-	app.use('/', connect.logger());
-	app.use('/', connect.methodOverride());
-	app.use('/', connect.cookieDecoder());
+	app.use(express.logger());
+	app.use(express.methodOverride());
+	app.use(express.cookieDecoder());
 
 For documentation on creating Connect middleware visit [Middleware Authoring](http://extjs.github.com/Connect/#Middleware-Authoring).
 
@@ -93,14 +90,14 @@ fetching a route, query string, or request body parameter:
 
 Polymorphic parameter access can be done using `req.param()`:
 
-    app.get('/user/:id', function(){
+    app.get('/user/:id', function(req, res){
 		req.param('id');
 	});
 
-Route parameters are also passed as the third argument:
+Route parameters are available via `req.params`:
 
-    app.get('/user/:id', function(req, res, params){
-		params.id;
+    app.get('/user/:id', function(req, res){
+		req.params.id;
     });
 
 ### Passing Route Control
@@ -114,11 +111,11 @@ implemented for practical use:
     });
 
 Now Express has access to Connect's _next()_ function,
-which is passed as the fourth and final argument. Calling _next()_ will
+which is passed as the third and final argument. Calling _next()_ will
 pass control to the next _matching route_, or continue down the stack
 of Connect middleware.
 
-    app.get('/user/:id?', function(req, res, params, next){
+    app.get('/user/:id?', function(req, res, next){
 	    next();
     });
 

examples/auth/app.js

@@ -0,0 +1,126 @@
+
+// Expose modules in ./support for demo purposes
+require.paths.unshift(__dirname + '/../../support');
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('../../lib/express'),
+    crypto = require('crypto');
+
+var app = express.createServer();
+
+app.set('views', __dirname + '/views');
+app.set('view engine', 'ejs');
+
+app.use(express.bodyDecoder());
+app.use(express.cookieDecoder());
+app.use(express.session());
+
+// Message helper, ideally we would use req.flash()
+// however this is more light-weight for an example
+
+app.dynamicHelpers({
+    message: function(req){
+        var err = req.session.error,
+            msg = req.session.success;
+        delete req.session.error;
+        delete req.session.success;
+        if (err) return '<p class="msg error">' + err + '</p>';
+        if (msg) return '<p class="msg success">' + msg + '</p>';
+    }
+});
+
+// Generate a salt for the user to prevent rainbow table attacks
+
+var users = {
+    tj: {
+        name: 'tj',
+        salt: 'randomly-generated-salt',
+        pass: md5('foobar' + 'randomly-generated-salt')
+    }
+};
+
+// Used to generate a hash of the plain-text password + salt
+
+function md5(str) {
+    return crypto.createHash('md5').update(str).digest('hex');
+}
+
+// Authenticate using our plain-object database of doom!
+
+function authenticate(name, pass, fn) {
+    var user = users[name];
+    // query the db for the given username
+    if (!user) return fn(new Error('cannot find user'));
+    // apply the same algorithm to the POSTed password, applying
+    // the md5 against the pass / salt, if there is a match we
+    // found the user
+    if (user.pass == md5(pass + user.salt)) return fn(null, user);
+    // Otherwise password is invalid
+    fn(new Error('invalid password'));
+}
+
+function restrict(req, res, next) {
+  if (req.session.user) {
+    next();
+  } else {
+    req.session.error = 'Access denied!';
+    res.redirect('/login');
+  }
+}
+
+function accessLogger(req, res, next) {
+    console.log('/restricted accessed by %s', req.session.user.name);
+    next();
+}
+
+app.get('/', function(req, res){
+    res.redirect('/login');
+});
+
+app.get('/restricted', restrict, accessLogger, function(req, res){
+    res.send('Wahoo! restricted area');
+});
+
+app.get('/logout', function(req, res){
+    // destroy the user's session to log them out
+    // will be re-created next request
+    req.session.destroy(function(){
+        res.redirect('home');
+    });
+});
+
+app.get('/login', function(req, res){
+    if (req.session.user) {
+        req.session.success = 'Authenticated as ' + req.session.user.name
+            + ' click to <a href="/logout">logout</a>. '
+            + ' You may now access <a href="/restricted">/restricted</a>.';
+    }
+    res.render('login');
+});
+
+app.post('/login', function(req, res){
+    authenticate(req.body.username, req.body.password, function(err, user){
+        if (user) {
+            // Regenerate session when signing in
+            // to prevent fixation 
+            req.session.regenerate(function(){
+                // Store the user's primary key 
+                // in the session store to be retrieved,
+                // or in this case the entire user object
+                req.session.user = user;
+                res.redirect('back');
+            });
+        } else {
+            req.session.error = 'Authentication failed, please check your '
+                + ' username and password.'
+                + ' (use "tj" and "foobar")';
+            res.redirect('back');
+        }
+    });
+});
+
+app.listen(3000);
+console.log('Express started on port 3000');

examples/auth/views/layout.ejs

@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Authentication Example</title>
+    <style>
+      body {
+        padding: 50px;
+        font: 13px Helvetica, Arial, sans-serif;
+      }
+      .error {
+          color: red
+      }
+      .success {
+          color: green;
+      }
+    </style>
+  </head>
+  <body>
+    <%- body %>
+  </body>
+</html>

examples/auth/views/login.ejs

@@ -0,0 +1,16 @@
+<h1>Login</h1>
+<%- message %>
+Try accessing <a href="/restricted">/restricted</a>.
+<form method="post" action="/login">
+  <p>
+    <label>Username:</label>
+    <input type="text" name="username">
+  </p>
+  <p>
+    <label>Password:</label>
+    <input type="text" name="password">
+  </p>
+  <p>
+    <input type="submit" value="Login">
+  </p>
+</form>

examples/blog/app.js

@@ -0,0 +1,25 @@
+
+// Expose modules in ./support for demo purposes
+require.paths.unshift(__dirname + '/../../support');
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('./../../lib/express');
+
+// Our app IS the exports, this prevents require('./app').app,
+// instead it is require('./app');
+var app = module.exports = express.createServer();
+
+// Illustrates that an app can be broken into
+// several files, but yet extend the same app
+require('./main');
+require('./contact');
+
+// Illustrates that one app (Server instance) can
+// be "mounted" to another at the given route.
+app.use('/blog', require('./blog'));
+
+app.listen(3000);
+console.log('Express started on port 3000');

examples/blog/blog/index.js

@@ -0,0 +1,45 @@
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('./../../../lib/express'),
+    fs = require('fs');
+
+// Export our app as the module
+var app = module.exports = express.createServer();
+
+// Set views directory
+app.set('views', __dirname + '/views');
+
+// Load our posts
+var posts = JSON.parse(fs.readFileSync(__dirname + '/posts.json', 'utf8'));
+
+// Set our default view engine to "ejs"
+app.set('view engine', 'ejs');
+
+app.dynamicHelpers({
+    basepath: function(){
+        // "this" is the app, we can
+        // dynamically provide the "home"
+        // setting to all views
+        return this.set('home');
+    }
+});
+
+app.get('/', function(req, res){
+    res.render('index', {
+        locals: {
+            posts: posts
+        }
+    });
+});
+
+app.get('/post/:id', function(req, res){
+    var id = req.params.id;
+    res.render('post', {
+        locals: {
+            post: posts[id]
+        }
+    });
+});

examples/blog/blog/posts.json

@@ -0,0 +1,4 @@
+[
+ { "id": 0, "title": "Post one", "body": "Just some lame post" },
+ { "id": 1, "title": "Post two", "body": "Just another lame post" }
+]

examples/blog/blog/views/index.ejs

@@ -0,0 +1,2 @@
+<h2>Posts</h2>
+<%- partial('post', { collection: posts, as: global }) %>

examples/blog/blog/views/layout.ejs

@@ -0,0 +1,9 @@
+<html>
+    <head>
+        <title>Blog Example</title>
+    </head>
+    <body>
+        <h1>Best Blog Ever</h1>
+        <%- body %>
+    </body>
+</html>

examples/blog/blog/views/partials/post.ejs

@@ -0,0 +1,2 @@
+<h3><a href="<%= basepath %>/post/<%= id %>"><%= title %></a></h3>
+<p><%= body %></p>

examples/blog/blog/views/post.ejs

@@ -0,0 +1 @@
+<%- partial('post', { object: post, as: global }) %>

examples/blog/contact.js

@@ -0,0 +1,9 @@
+
+// in ./app.js we did "module.exports", allowing
+// us to grab the app from the parent module (the one 
+// which required it)
+var app = module.parent.exports;
+
+app.get('/contact', function(req, res){
+    res.send('<p>Wahoo contact page</p>');
+});

examples/blog/main.js

@@ -0,0 +1,10 @@
+
+// in ./app.js we did "module.exports", allowing
+// us to grab the app from the parent module (the one 
+// which required it)
+var app = module.parent.exports;
+
+app.get('/', function(req, res){
+    res.send('<p>Visit <a href="/blog">/blog</a>'
+        + ' or <a href="/contact">/contact</a></p>');
+});

examples/cookies/app.js

@@ -0,0 +1,46 @@
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('./../../lib/express');
+
+var app = express.createServer(
+    // Place default Connect favicon above logger so it is not in
+    // the logging output
+    express.favicon(),
+
+    // Custom logger format
+    express.logger({ format: '\x1b[1m:method\x1b[0m \x1b[33m:url\x1b[0m :response-time' }),
+
+    // Provides req.cookies
+    express.cookieDecoder(),
+
+    // Parses x-www-form-urlencoded request bodies (and json)
+    express.bodyDecoder()
+);
+
+app.get('/', function(req, res){
+    if (req.cookies.remember) {
+        res.send('Remembered :). Click to <a href="/forget">forget</a>!.');
+    } else {
+        res.send('<form method="post"><p>Check to <label>'
+            + '<input type="checkbox" name="remember"/> remember me</label> '
+            + '<input type="submit" value="Submit"/>.</p></form>');
+    }
+});
+
+app.get('/forget', function(req, res){
+    res.clearCookie('remember');
+    res.redirect('back');
+});
+
+app.post('/', function(req, res){
+    if (req.body.remember) {
+        res.cookie('remember', '1', { path: '/', expires: new Date(Date.now() + 900000), httpOnly: true });
+    }
+    res.redirect('back');
+});
+
+app.listen(3000);
+console.log('Express started on port 3000');

examples/downloads/app.js

@@ -0,0 +1,32 @@
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('./../../lib/express');
+
+var app = express.createServer();
+
+app.get('/', function(req, res){
+    res.send('<ul>'
+        + '<li>Download <a href="/files/amazing.txt">amazing.txt</a>.</li>'
+        + '<li>Download <a href="/files/missing.txt">missing.txt</a>.</li>'
+        + '</ul>');
+});
+
+app.get('/files/*', function(req, res){
+    var file = req.params[0];
+    res.download(__dirname + '/files/' + file);
+});
+
+app.error(function(err, req, res, next){
+    if (process.ENOENT == err.errno) {
+        res.send('Cant find that file, sorry!');
+    } else {
+        // Not a 404
+        next(err);
+    }
+});
+
+app.listen(3000);
+console.log('Express started on port 3000');

examples/downloads/files/amazing.txt

@@ -0,0 +1 @@
+wow supes cool are you glad you downloaded this?

examples/ejs/app.js

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

examples/error-pages/app.js

@@ -0,0 +1,103 @@
+
+// Expose modules in ./support for demo purposes
+require.paths.unshift(__dirname + '/../../support');
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('./../../lib/express');
+
+var app = express.createServer(),
+    sys = require('sys');
+
+// Serve default connect favicon
+app.use(express.favicon());
+
+// Logger is placed below favicon, so favicon.ico
+// requests will not be logged
+app.use(express.logger({ format: '":method :url" :status' }));
+
+// "app.router" positions our routes 
+// specifically above the middleware
+// assigned below
+
+app.use(app.router);
+
+// When no more middleware require execution, aka
+// our router is finished and did not respond, we
+// can assume that it is "not found". Instead of
+// letting Connect deal with this, we define our
+// custom middleware here to simply pass a NotFound
+// exception
+
+app.use(function(req, res, next){
+    next(new NotFound(req.url));
+});
+
+app.set('views', __dirname + '/views');
+
+// Provide our app with the notion of NotFound exceptions
+
+function NotFound(path){
+    this.name = 'NotFound';
+    if (path) {
+        Error.call(this, 'Cannot find ' + path);
+        this.path = path;
+    } else {
+        Error.call(this, 'Not Found');
+    }
+    Error.captureStackTrace(this, arguments.callee);
+}
+
+sys.inherits(NotFound, Error);
+
+// We can call app.error() several times as shown below.
+// Here we check for an instanceof NotFound and show the
+// 404 page, or we pass on to the next error handler.
+
+// These handlers could potentially be defined within
+// configure() blocks to provide introspection when
+// in the development environment.
+
+app.error(function(err, req, res, next){
+    if (err instanceof NotFound) {
+        res.render('404.jade', {
+            status: 404,
+            locals: {
+                error: err
+            }
+        });
+    } else {
+        next(err);
+    }
+});
+
+// Here we assume all errors as 500 for the simplicity of
+// this demo, however you can choose whatever you like
+
+app.error(function(err, req, res){
+    res.render('500.jade', {
+        status: 500,
+        locals: {
+            error: err
+        } 
+    });
+});
+
+// Routes
+
+app.get('/', function(req, res){
+    res.render('index.jade');
+});
+
+app.get('/404', function(req, res){
+    throw new NotFound;
+});
+
+app.get('/500', function(req, res, next){
+    next(new Error('keyboard cat!'));
+});
+
+app.listen(3000);
+console.log('Express app started on port 3000');

examples/error-pages/views/404.jade

@@ -0,0 +1,4 @@
+- if (error.path)
+  h2 Cannot find #{error.path}
+- else
+  h2 Page Not Found

examples/error/app.js

@@ -3,8 +3,7 @@
  * Module dependencies.
  */
 
-var express = require('./../../lib/express'),
-    connect = require('connect');
+var express = require('./../../lib/express');
 
 var app = express.createServer();
 
@@ -13,7 +12,7 @@ app.get('/', function(req, res){
     throw new Error('something broke!');
 });
 
-app.get('/next', function(req, res, params, next){
+app.get('/next', function(req, res, next){
     // We can also pass exceptions to next()
     next(new Error('oh no!'))
 });
@@ -21,6 +20,6 @@ app.get('/next', function(req, res, params, next){
 // The errorHandler middleware in this case will dump exceptions to stderr
 // as well as show the stack trace in responses, currently handles text/plain,
 // text/html, and application/json responses to aid in development
-app.use('/', connect.errorHandler({ dumpExceptions: true, showStack: true }));
+app.use('/', express.errorHandler({ dumpExceptions: true, showStack: true }));
 
 app.listen(3000);

examples/flash/app.js

@@ -0,0 +1,78 @@
+
+// Expose modules in ./support for demo purposes
+require.paths.unshift(__dirname + '/../../support');
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('../../lib/express');
+
+// App with session support
+
+var app = express.createServer(
+    express.cookieDecoder(),
+    express.session()
+);
+
+// View settings
+
+app.set('views', __dirname + '/views');
+app.set('view engine', 'ejs');
+
+// Dynamic helpers are functions which are executed
+// on each view render, unless dynamicHelpers is false.
+
+// So for example we do not need to call messages() in our
+// template, "messages" will be populated with the return
+// value of this function.
+
+app.dynamicHelpers({
+    messages: function(req, res){
+        // In the case of flash messages
+        // we return a function, allowing
+        // flash messages to only be flushed
+        // when called, otherwise every request
+        // will flush flash messages regardless.
+        return function(){
+            // Grab the flash messages
+            var messages = req.flash();
+            // We will render the "messages.ejs" partial
+            return res.partial('messages', {
+                // Our target object is our messages
+                object: messages,
+                // We want it to be named "types" in the partial
+                // since they are keyed like this:
+                // { info: ['foo'], error: ['bar']}
+                as: 'types',
+                // Pass a local named "hasMessages" so we can easily
+                // check if we have any messages at all
+                locals: { hasMessages: Object.keys(messages).length },
+                // We dont want dynamicHelpers in this partial, as
+                // it would cause infinite recursion
+                dynamicHelpers: false
+            });
+        }
+    }
+});
+
+app.dynamicHelpers({
+    // Another dynamic helper example. Since dynamic
+    // helpers resolve at view rendering time, we can
+    // "inject" the "page" local variable per request
+    // providing us with the request url.
+    page: function(req, res){
+        return req.url;
+    } 
+});
+
+app.get('/', function(req, res){
+    // Not very realistic notifications but illustrates usage
+    req.flash('info', 'email queued');
+    req.flash('info', 'email sent');
+    req.flash('error', 'delivery failed');
+    res.render('index');
+});
+
+app.listen(3000);
+console.log('Express app started on port 3000');

examples/flash/views/index.ejs

@@ -0,0 +1,3 @@
+<h1>Flash Message Example</h1>
+<p>on page <%- page %></p>
+<%- messages() %>

examples/flash/views/layout.ejs

@@ -0,0 +1,5 @@
+<html>
+    <body>
+        <%- body %>
+    </body>
+</html>

examples/flash/views/partials/messages.ejs

@@ -0,0 +1,12 @@
+<% if (hasMessages) { %>
+    <div id="messages">
+        <% for (var type in types) { %>
+            <h2><%= type %> messages</h2>
+            <ul id="<%= type %>">
+                <% types[type].forEach(function(msg){ %>
+                    <li><%= msg %></li>
+                <% }) %>
+            </ul>
+        <% } %>
+    </div>
+<% } %>

examples/form/app.js

@@ -4,20 +4,26 @@
  */
 
 var express = require('./../../lib/express'),
-    connect = require('connect'),
     sys = require('sys');
 
-var app = express.createServer(
-    // Here we use the bodyDecoder middleware
-    // to parse urlencoded request bodies
-    // which populates req.body
-    connect.bodyDecoder(),
+var app = express.createServer();
+
+// Here we use the bodyDecoder middleware
+// to parse urlencoded request bodies
+// which populates req.body
+app.use(express.bodyDecoder());
     
-    // The methodOverride middleware allows us
-    // to set a hidden input of _method to an arbitrary
-    // HTTP method to support app.put(), app.del() etc
-    connect.methodOverride()
-);
+// The methodOverride middleware allows us
+// to set a hidden input of _method to an arbitrary
+// HTTP method to support app.put(), app.del() etc
+app.use(express.methodOverride());
+
+// Required by session
+app.use(express.cookieDecoder());
+
+// Required by req.flash() for persistent
+// notifications
+app.use(express.session());
 
 app.get('/', function(req, res){
     // get ?name=foo
@@ -26,9 +32,26 @@ app.get('/', function(req, res){
     // Switch the button label based if we have a name
     var label = name ? 'Update' : 'Save';
 
+    // Buffer all flash messages.
+    // Typically this would all be done in a template
+    // however for illustration purposes we iterate
+    // here.
+    
+    // The messages in req.flash() persist until called,
+    // at which time they are flushed from the session
+    var msgs = '<ul>',
+        flash = req.flash();
+    Object.keys(flash).forEach(function(type){
+        flash[type].forEach(function(msg){
+            msgs += '<li class="' + type + '">' + msg + '</li>';
+        });
+    });
+    msgs += '</ul>';
+
     // If we have a name, we are updating,
     // so add the hidden _method input
-    res.send('<form method="post">'
+    res.send(msgs
+        + '<form method="post">'
         + (name ? '<input type="hidden" value="put" name="_method" />' : '')
         + 'Name: <input type="text" name="name" value="' + name + '" />'
         + '<input type="submit" value="' + label + '" />'
@@ -36,15 +59,21 @@ app.get('/', function(req, res){
 });
 
 app.post('/', function(req, res){
-    // Typically here we would create a resource
-    sys.puts('saved ' + req.body.name);
-    res.redirect('/?name=' + req.body.name);
+    if (req.body.name) {
+        // Typically here we would create a resource
+        req.flash('info', 'Saved ' + req.body.name);
+        res.redirect('/?name=' + req.body.name);
+    } else {
+        req.flash('error', 'Error: name required');
+        res.redirect('/');
+    }
 });
 
 app.put('/', function(req, res){
     // Typically here we would update a resource
-    sys.puts('updated ' + req.body.name);
+    req.flash('info', 'Updated ' + req.body.name);
     res.redirect('/?name=' + req.body.name);
 });
 
-app.listen(3000);
+app.listen(3000);
+console.log('Express app started on port 3000');

examples/format/app.js

@@ -0,0 +1,63 @@
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('../../lib/express');
+
+var app = express.createServer();
+
+// Fake items
+
+var items = [
+    { name: 'foo' },
+    { name: 'bar' },
+    { name: 'baz' }
+];
+
+// Routes
+
+app.get('/', function(req, res, next){
+    res.send('Visit /item/2');
+});
+
+app.get('/item/:id.:format?', function(req, res, next){
+    var id = req.params.id,
+        format = req.params.format,
+        item = items[id];
+    // Ensure item exists
+    if (item) {
+        // Serve the format
+        switch (format) {
+            case 'json':
+                // Detects json
+                res.send(item);
+                break;
+            case 'xml':
+                // Set contentType as xml then sends
+                // the string
+                var xml = ''
+                    + '<items>'
+                    + '<item>' + item.name + '</item>'
+                    + '</items>';
+                res.contentType('.xml');
+                res.send(xml);
+                break;
+            case 'html':
+            default:
+                // By default send some hmtl
+                res.send('<h1>' + item.name + '</h1>');
+        }
+    } else {
+        // We could simply pass route control and potentially 404
+        // by calling next(), or pass an exception like below.
+        next(new Error('Item ' + id + ' does not exist'));
+    }
+});
+
+// Middleware
+
+app.use(express.errorHandler({ showStack: true }));
+
+app.listen(3000);
+console.log('Express app started on port 3000');

examples/github/app.js

@@ -1,10 +1,12 @@
 
+// Expose modules in ./support for demo purposes
+require.paths.unshift(__dirname + '/../../support');
+
 /**
  * Module dependencies.
  */
 
 var express = require('./../../lib/express'),
-    connect = require('connect'),
     http = require('http');
 
 var app = express.createServer();
@@ -79,25 +81,39 @@ app.get('/', function(req, res){
  * Display repos.
  */
 
-app.get('/repos/:user', function(req, res, params, next){
-    var name = params.user;
-    request('/repos/show/' + name, function(err, user){
-        if (err) {
-            next(err)
+app.get('/repos/*', function(req, res, next){
+    var names = req.params[0].split('/'),
+        users = [];
+    (function fetchData(name){
+        // We have a user name
+        if (name) {
+            console.log('... fetching \x1b[33m%s\x1b[0m', name);
+            request('/repos/show/' + name, function(err, user){
+                if (err) {
+                    next(err)
+                } else {
+                    user.totalWatchers = totalWatchers(user.repositories);
+                    user.repos = sort(user.repositories);
+                    user.name = name;
+                    users.push(user);
+                    fetchData(names.shift());
+                }
+            });
+        // No more users
         } else {
+            console.log('... done');
             res.render('index.jade', {
                 locals: {
-                    totalWatchers: totalWatchers(user.repositories),
-                    repos: sort(user.repositories),
-                    name: name
+                    users: users
                 }
             });
         }
-    });
+    })(names.shift());
 });
 
 // Serve statics from ./public
-app.use('/', connect.staticProvider(__dirname + '/public'));
+app.use(express.staticProvider(__dirname + '/public'));
 
 // Listen on port 3000
-app.listen(3000);
+app.listen(3000);
+console.log('Express app started on port 3000');

examples/github/public/style.css

@@ -1,6 +1,6 @@
 body {
     padding: 30px 50px;
-    font: 12px/1.4 "Lucida Grande", "Helvetica Nueue", Arial, sans-serif;
+    font: 12px/1.4 "Helvetica Neue", Arial, sans-serif;
 }
 a {
     color: #00AAFF;
@@ -9,3 +9,11 @@ a {
 a:hover {
     text-decoration: underline;
 }
+.user {
+  margin: 0 10px;
+  float: left;
+  width: 25%;
+}
+table td:nth-child(2) {
+  padding: 0 5px;
+}

examples/github/views/index.jade

@@ -1,5 +1,8 @@
-h1= name
-p.summary
-  | <a href="http://github.com/#{name}">#{name}</a> has <strong>#{repos.length}</strong> repositories 
-  | with a total of <strong>#{totalWatchers}</strong> watchers.
-table#repos!= partial('repo', repos)
+- each user in users
+  .user
+    h2= user.name
+    p.summary
+      | <a href="http://github.com/#{user.name}">#{user.name}</a> has
+      | <strong>#{user.repos.length}</strong> repositories 
+      | with a total of <strong>#{user.totalWatchers}</strong> watchers.
+    table#repos!= partial('repo', user.repos)

examples/jade/app.js

@@ -1,10 +1,12 @@
 
+// Expose modules in ./support for demo purposes
+require.paths.unshift(__dirname + '/../../support');
+
 /**
  * Module dependencies.
  */
 
-var express = require('./../../lib/express'),
-    connect = require('connect');
+var express = require('./../../lib/express');
 
 // Path to our public directory
 
@@ -14,23 +16,17 @@ var pub = __dirname + '/public';
 // and then serve with connect's staticProvider
 
 var app = express.createServer(
-    connect.compiler({ src: pub, enable: ['sass'] }),
-    connect.staticProvider(pub)
+    express.compiler({ src: pub, enable: ['sass'] }),
+    express.staticProvider(pub)
 );
 
 // Optional since express defaults to CWD/views
 
 app.set('views', __dirname + '/views');
 
-// Enable auto-reloading of view contents when changed
-// with an interval of 1000 milliseconds. Start the app
-// with $ node examples/jade/app.js
-// then alter some views :)
-
-app.set('reload views', 1000);
-// or app.enable('reload views'); for defaults
-
-// Re-compile
+// Set our default template engine to "jade"
+// which prevents the need for extensions (although you can still mix and match)
+app.set('view engine', 'jade');
 
 // Dummy users
 var users = [
@@ -40,11 +36,12 @@ var users = [
 ];
 
 app.get('/', function(req, res){
-    res.render('users.jade', {
+    res.render('users', {
         locals: {
             users: users
         }
     });
 });
 
-app.listen(3000);
+app.listen(3000);
+console.log('Express app started on port 3000');

examples/multipart/app.js

@@ -1,28 +1,30 @@
 
+// Expose modules in ./support for demo purposes
+require.paths.unshift(__dirname + '/../../support');
+
 /**
  * Module dependencies.
  */
 
-var express = require('./../../lib/express'),
-    form = require('./../../support/connect-form'),
-    connect = require('connect'),
+var express = require('../../lib/express'),
+    form = require('connect-form'),
     sys = require('sys');
 
 var app = express.createServer(
     // connect-form (http://github.com/visionmedia/connect-form)
     // middleware uses the formidable middleware to parse urlencoded
     // and multipart form data
-    form()
+    form({ keepExtensions: true })
 );
 
 app.get('/', function(req, res){
-    res.send('<form method="post" enctype="form-data/multipart">'
+    res.send('<form method="post" enctype="multipart/form-data">'
         + '<p>Image: <input type="file" name="image" /></p>'
         + '<p><input type="submit" value="Upload" /></p>'
         + '</form>');
 });
 
-app.post('/', function(req, res, params, next){
+app.post('/', function(req, res, next){
 
     // connect-form adds the req.form object
     // we can (optionally) define onComplete, passing
@@ -31,7 +33,9 @@ app.post('/', function(req, res, params, next){
         if (err) {
             next(err);
         } else {
-            sys.puts('\nuploaded ' + files.image.filename);
+            console.log('\nuploaded %s to %s', 
+                files.image.filename,
+                files.image.path);
             res.redirect('back');
         }
     });
@@ -44,4 +48,5 @@ app.post('/', function(req, res, params, next){
     });
 });
 
-app.listen(3000);
+app.listen(3000);
+console.log('Express app started on port 3000');

examples/mvc/app.js

@@ -0,0 +1,16 @@
+
+// Expose modules in ./support for demo purposes
+require.paths.unshift(__dirname + '/../../support');
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('../../lib/express');
+
+var app = express.createServer();
+
+require('./mvc').boot(app);
+
+app.listen(3000);
+console.log('Express app started on port 3000');

examples/mvc/controllers/app.js

@@ -0,0 +1,9 @@
+
+module.exports = {
+    
+    // /
+    
+    index: function(req, res){
+        res.render();
+    }
+};

examples/mvc/controllers/user.js

@@ -0,0 +1,55 @@
+
+// Fake user database for example
+
+var users = [
+    { id: 0, name: 'TJ', email: 'tj@vision-media.ca' },
+    { id: 1, name: 'Simon', email: 'simon@vision-media.ca' }
+];
+
+function get(id, fn) {
+    if (users[id]) {
+        fn(null, users[id]);
+    } else {
+        fn(new Error('User ' + id + ' does not exist'));
+    }
+}
+
+module.exports = {
+    
+    // /users
+    
+    index: function(req, res){
+        res.render(users);
+    },
+
+    // /users/:id
+
+    show: function(req, res, next){
+        get(req.params.id, function(err, user){
+            if (err) return next(err);
+            res.render(user);
+        });
+    },
+    
+    // /users/:id/edit
+    
+    edit: function(req, res, next){
+        get(req.params.id, function(err, user){
+            if (err) return next(err);
+            res.render(user);
+        });
+    },
+    
+    // PUT /users/:id
+    
+    update: function(req, res, next){
+        var id = req.params.id;
+        get(id, function(err){
+            if (err) return next(err);
+            var user = users[id] = req.body.user;
+            user.id = id;
+            req.flash('info', 'Successfully updated _' + user.name + '_.');
+            res.redirect('back');
+        });
+    }
+};

examples/mvc/mvc.js

@@ -0,0 +1,151 @@
+
+/**
+ * Module dependencies.
+ */
+
+var fs = require('fs'),
+    express = require('../../lib/express');
+
+exports.boot = function(app){
+    bootApplication(app);
+    bootControllers(app);
+};
+
+// App settings and middleware
+
+function bootApplication(app) {
+    app.use(express.logger({ format: ':method :url :status' }));
+    app.use(express.bodyDecoder());
+    app.use(express.methodOverride());
+    app.use(express.cookieDecoder());
+    app.use(express.session());
+    app.use(app.router);
+    app.use(express.staticProvider(__dirname + '/public'));
+
+    // Example 500 page
+    app.error(function(err, req, res){
+        console.dir(err)
+        res.render('500');
+    });
+
+    // Example 404 page via simple Connect middleware
+    app.use(function(req, res){
+        res.render('404');
+    });
+
+    // Setup ejs views as default, with .html as the extension
+    app.set('views', __dirname + '/views');
+    app.register('.html', require('ejs'));
+    app.set('view engine', 'html');
+
+    // Some dynamic view helpers
+    app.dynamicHelpers({
+        request: function(req){
+            return req;
+        },
+
+        hasMessages: function(req){
+            return Object.keys(req.session.flash || {}).length;
+        },
+
+        messages: function(req){
+            return function(){
+                var msgs = req.flash();
+                return Object.keys(msgs).reduce(function(arr, type){
+                    return arr.concat(msgs[type]);
+                }, []);
+            }
+        }
+    });
+}
+
+// Bootstrap controllers
+
+function bootControllers(app) {
+    fs.readdir(__dirname + '/controllers', function(err, files){
+        if (err) throw err;
+        files.forEach(function(file){
+            bootController(app, file);
+        });
+    });
+}
+
+// Example (simplistic) controller support
+
+function bootController(app, file) {
+    var name = file.replace('.js', ''),
+        actions = require('./controllers/' + name),
+        plural = name + 's', // realistically we would use an inflection lib
+        prefix = '/' + plural; 
+
+    // Special case for "app"
+    if (name == 'app') {
+        prefix = '/';
+    }
+
+    Object.keys(actions).map(function(action){
+        var fn = controllerAction(name, plural, action, actions[action]);
+        switch(action) {
+            case 'index':
+                app.get(prefix, fn);
+                break;
+            case 'show':
+                app.get(prefix + '/:id.:format?', fn);
+                break;
+            case 'add':
+                app.get(prefix + '/:id/add', fn);
+                break;
+            case 'create':
+                app.post(prefix + '/:id', fn);
+                break;
+            case 'edit':
+                app.get(prefix + '/:id/edit', fn);
+                break;
+            case 'update':
+                app.put(prefix + '/:id', fn);
+                break;
+            case 'destroy':
+                app.del(prefix + '/:id', fn);
+                break;
+        }
+    });
+}
+
+// Proxy res.render() to add some magic
+
+function controllerAction(name, plural, action, fn) {
+    return function(req, res, next){
+        var render = res.render,
+            format = req.params.format,
+            path = __dirname + '/views/' + name + '/' + action + '.html';
+        res.render = function(obj, options, fn){
+            res.render = render;
+            // Template path
+            if (typeof obj === 'string') {
+                return res.render(obj, options, fn);
+            }
+
+            // Format support
+            if (action == 'show' && format) {
+                if (format === 'json') {
+                    return res.send(obj);
+                } else {
+                    throw new Error('unsupported format "' + format + '"');
+                }
+            }
+
+            // Render template
+            res.render = render;
+            options = options || {};
+            options.locals = options.locals || {};
+            // Expose obj as the "users" or "user" local
+            if (action == 'index') {
+                options.locals[plural] = obj;
+            } else {
+                options.locals[name] = obj;
+            }
+            return res.render(path, options, fn);
+        };
+        fn.apply(this, arguments);
+    };
+}

examples/mvc/public/style.css

@@ -0,0 +1,24 @@
+body {
+  padding: 30px;
+  font: 12px/1.4 "Helvetica Nueue", "Lucida Grande", Arial, sans-serif;
+}
+a {
+  color: #00aaff;
+  text-decoration: none;
+}
+a:hover {
+  text-decoration: underline;
+}
+#messages {
+  width: 95%;
+  margin-bottom: 15px;
+  padding: 10px;
+  border: 1px solid #00DD00;
+  -webkit-box-shadow: 1px 1px 4px rgba(0,0,0,0.2);
+}
+#messages li {
+  list-style: none;
+}
+#messages em {
+  font-weight: bold;
+}

examples/mvc/views/404.html

@@ -0,0 +1,2 @@
+<h1>Cannot find <%= request.url %></h1>
+<p>Sorry we failed to locate this page or resource.</p>

examples/mvc/views/500.html

@@ -0,0 +1,2 @@
+<h1>Internal Server Error</h1>
+<p>Sorry an error has occurred, please try refreshing the page or navigate back to <a href="/">home</a>.</p>

examples/mvc/views/app/index.html

@@ -0,0 +1,10 @@
+<h1>Application Index</h1>
+<p>Try visiting one of the following urls:</p>
+<ul>
+    <li><a href="/users">/users</a></li>
+    <li><a href="/users/1">/users/1</a></li>
+    <li><a href="/users/1.json">/users/1.json</a></li>
+    <li><a href="/users/1/edit">/users/1/edit</a></li>
+    <li><a href="/accounts">/accounts (404, non existent)</a></li>
+    <li><a href="/users/1.foo">/users/1.foo (500, unsupported format)</a></li>
+</ul>

examples/mvc/views/layout.html

@@ -0,0 +1,9 @@
+<html>
+    <head>
+        <title>Express - MVC Example</title>
+        <link rel="stylesheet" href="/style.css" />
+    </head>
+    <body>
+        <%- body %>
+    </body>
+</html>

examples/mvc/views/partials/messages.html

@@ -0,0 +1,7 @@
+<% if (hasMessages) { %>
+  <ul id="messages">
+      <% messages().forEach(function(msg){ %>
+        <li><%- msg %></li>
+      <% }) %>
+  </ul>
+<% } %>

examples/mvc/views/user/edit.html

@@ -0,0 +1,8 @@
+<h1>Editing user <%= user.name %></h1>
+<%- partial('messages') %>
+<form method="post" action="/users/<%= user.id %>">
+  <input type="hidden" name="_method" value="put" />
+  <p>Name: <input type="text" name="user[name]", value="<%= user.name %>" /></p>
+  <p>Email: <input type="text" name="user[email]", value="<%= user.email %>" /></p>
+  <p><input type="submit" value="Update" /></p>
+</form>

examples/mvc/views/user/index.html

@@ -0,0 +1,7 @@
+<h1>Users</h1>
+<%- partial('messages') %>
+<ul>
+    <% users.forEach(function(user){ %>
+        <li><a href="/users/<%= user.id %>"><%= user.name %></a></li>
+    <% }) %>
+</ul>

examples/mvc/views/user/show.html

@@ -0,0 +1,7 @@
+<h1>Viewing user #<%= user.id %></h1>
+<%- partial('messages') %>
+<ul>
+  <li><%- user.name %></li>
+  <li><%- user.email %></li>
+  <li><a href="<%= user.id %>/edit">Edit</a> this user</li>
+</ul>

examples/pages/app.js

@@ -1,58 +0,0 @@
-
-/**
- * Module dependencies.
- */
-
-var express = require('./../../lib/express');
-
-var app = express.createServer(),
-    sys = require('sys');
-
-app.set('views', __dirname + '/views');
-
-// Provide our app with the notion of NotFound exceptions
-
-function NotFound(msg){
-    this.name = 'NotFound';
-    Error.call(this, msg);
-    Error.captureStackTrace(this, arguments.callee);
-}
-
-sys.inherits(NotFound, Error);
-
-app.get('/', function(req, res){
-    res.render('index.jade');
-});
-
-app.get('/404', function(req, res){
-    throw new NotFound;
-});
-
-app.get('/500', function(req, res){
-    throw new Error('keyboard cat!');
-});
-
-// We can call app.error() several times as shown below.
-// Here we check for an instanceof NotFound and show the
-// 404 page, or we pass on to the next error handler.
-
-app.error(function(err, req, res, next){
-    if (err instanceof NotFound) {
-        res.render('404.jade');
-    } else {
-        next(err);
-    }
-});
-
-// Here we assume all errors as 500 for the simplicity of
-// this demo, however you can choose whatever you like
-
-app.error(function(err, req, res){
-    res.render('500.jade', {
-       locals: {
-           error: err
-       } 
-    });
-});
-
-app.listen(3000);

examples/pages/views/404.jade

@@ -1 +0,0 @@
-h2 Page Not Found

examples/resource/app.js

@@ -0,0 +1,75 @@
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('../../lib/express');
+
+var app = express.createServer();
+
+// Ad-hoc example resource method
+
+app.resource = function(path, obj) {
+    this.get(path, obj.index);
+    this.get(path + '/:a..:b', function(req, res){
+        var a = parseInt(req.params.a, 10),
+            b = parseInt(req.params.b, 10);
+        obj.range(req, res, a, b);
+    });
+    this.get(path + '/:id', obj.show);
+    this.del(path + '/:id', obj.destroy);
+};
+
+// Fake records
+
+var users = [
+    { name: 'tj' },
+    { name: 'ciaran' },
+    { name: 'aaron' },
+    { name: 'guillermo' },
+    { name: 'simon' },
+    { name: 'tobi' }
+];
+
+// Fake controller
+
+var User = {
+    index: function(req, res){
+        res.send(users);
+    },
+    show: function(req, res){
+        res.send(users[req.params.id] || { error: 'Cannot find user' });
+    },
+    destroy: function(req, res){
+        var id = req.params.id;
+        var destroyed = id in users;
+        delete users[id];
+        res.send(destroyed ? 'destroyed' : 'Cannot find user');
+    },
+    range: function(req, res, a, b){
+        res.send(users.slice(a, b+1));
+    }
+};
+
+// curl http://localhost:3000/users     -- responds with all users
+// curl http://localhost:3000/users/1   -- responds with user 1
+// curl http://localhost:3000/users/4   -- responds with error
+// curl http://localhost:3000/users/1..3 -- responds with several users
+// curl -X DELETE http://localhost:3000/users/1  -- deletes the user
+
+app.resource('/users', User);
+
+app.get('/', function(req, res){
+    res.send([
+        '<h1>Examples:</h1> <ul>',
+        '<li>GET /users</li>',
+        '<li>GET /users/1</li>',
+        '<li>GET /users/3</li>',
+        '<li>GET /users/1..3</li>',
+        '<li>DELETE /users/4</li>',
+        '</ul>',
+    ].join('\n')); 
+});
+
+app.listen(3000);
+console.log('Express app started on port 3000');

examples/route-middleware/app.js

@@ -0,0 +1,86 @@
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('../../lib/express');
+
+var app = express.createServer();
+
+// Example requests:
+//     curl http://localhost:3000/user/0
+//     curl http://localhost:3000/user/0/edit
+//     curl http://localhost:3000/user/1
+//     curl http://localhost:3000/user/1/edit (unauthorized since this is not you)
+//     curl -X DELETE http://localhost:3000/user/0 (unauthorized since you are not an admin)
+
+// Dummy users
+var users = [
+    { id: 0, name: 'tj', email: 'tj@vision-media.ca', role: 'member' },
+    { id: 1, name: 'ciaran', email: 'ciaranj@gmail.com', role: 'member' },
+    { id: 2, name: 'aaron', email: 'aaron.heckmann+github@gmail.com', role: 'admin' }
+];
+
+function loadUser(req, res, next) {
+    // You would fetch your user from the db
+    var user = users[req.params.id];
+    if (user) {
+        req.user = user;
+        next();
+    } else {
+        next(new Error('Failed to load user ' + req.params.id));
+    }
+}
+
+function andRestrictToSelf(req, res, next) {
+    // If our authenticated user is the user we are viewing
+    // then everything is fine :)
+    if (req.authenticatedUser.id == req.user.id) {
+        next();
+    } else {
+        // You may want to implement specific exceptions
+        // such as UnauthorizedError or similar so that you
+        // can handle these in app.error() specifically
+        // (view ./examples/pages for this)
+        next(new Error('Unauthorized'));
+    }
+}
+
+function andRestrictTo(role) {
+    return function(req, res, next) {
+        if (req.authenticatedUser.role == role) {
+            next();
+        } else {
+            next(new Error('Unauthorized'));
+        }
+    }
+}
+
+// Middleware for faux authentication
+// you would of course implement something real,
+// but this illustrates how an authenticated user
+// may interacte with middleware
+
+app.use(function(req, res, next){
+    req.authenticatedUser = users[0];
+    next();
+});
+
+app.get('/', function(req, res){
+    res.redirect('/user/0');
+});
+
+app.get('/user/:id', loadUser, function(req, res){
+    res.send('Viewing user ' + req.user.name);
+});
+
+app.get('/user/:id/edit', loadUser, andRestrictToSelf, function(req, res){
+    res.send('Editing user ' + req.user.name);
+});
+
+app.del('/user/:id', loadUser, andRestrictTo('admin'), function(req, res){
+    res.send('Deleted user ' + req.user.name);
+});
+
+app.listen(3000);
+console.log('Express app started on port 3000');

examples/route-separation/app.js

@@ -0,0 +1,41 @@
+
+// Expose modules in ./support for demo purposes
+require.paths.unshift(__dirname + '/../../support');
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('../../lib/express')
+  , app = express.createServer()
+  , site = require('./site')
+  , post = require('./post')
+  , user = require('./user');
+
+// Config
+
+app.set('view engine', 'ejs');
+app.set('views', __dirname + '/views');
+app.use(express.bodyDecoder());
+app.use(express.methodOverride());
+app.use(express.staticProvider(__dirname + '/public'));
+
+// General
+
+app.get('/', site.index);
+
+// User
+
+app.all('/users', user.list);
+app.all('/user/:id/:op?', user.load);
+app.get('/user/:id', user.view);
+app.get('/user/:id/view', user.view);
+app.get('/user/:id/edit', user.edit);
+app.put('/user/:id/edit', user.update);
+
+// Posts
+
+app.get('/posts', post.list);
+
+app.listen(3000);
+console.log('Express app started on port 3000');

examples/route-separation/post.js

@@ -0,0 +1,17 @@
+
+// Fake posts database
+
+var posts = [
+      { title: 'Foo', body: 'some foo bar' }
+    , { title: 'Foo bar', body: 'more foo bar' }
+    , { title: 'Foo bar baz', body: 'more foo bar baz' }
+  ];
+
+exports.list = function(req, res){
+  res.render('post/list', {
+    locals: {
+        title: 'Posts'
+      , posts: posts
+    }
+  });
+};

examples/route-separation/public/style.css

@@ -0,0 +1,24 @@
+body {
+  padding: 50px;
+  font: 14px "Helvetica Neue", Arial, sans-serif;
+}
+a {
+  color: #00AEFF;
+  text-decoration: none;
+}
+a.edit {
+  color: #000;
+  opacity: .3;
+}
+a.edit::before {
+  content: '[ ';
+}
+a.edit::after {
+  content: ' ]';
+}
+dt {
+  font-weight: bold;
+}
+dd {
+  margin: 15px;
+}

examples/route-separation/site.js

@@ -0,0 +1,8 @@
+
+exports.index = function(req, res){
+  res.render('index', {
+    locals: {
+      title: 'Route Separation Example'
+    }
+  });
+};

examples/route-separation/user.js

@@ -0,0 +1,53 @@
+
+// Fake user database
+
+var users = [
+      { name: 'TJ', email: 'tj@vision-media.ca' }
+    , { name: 'Tobi', email: 'tobi@vision-media.ca' }
+  ];
+
+exports.list = function(req, res){
+  res.render('user/list', {
+    locals: {
+        title: 'Users'
+      , users: users
+    }
+  });
+};
+
+exports.load = function(req, res, next){
+  var id = req.params.id;
+  req.user = users[id];
+  if (req.user) {
+    next();
+  } else {
+    next(new Error('cannot find user ' + id));
+  }
+};
+
+exports.view = function(req, res){
+  res.render('user/view', {
+    locals: {
+        title: 'Viewing user ' + req.user.name
+      , user: req.user
+    }
+  });
+};
+
+exports.edit = function(req, res){
+  res.render('user/edit', {
+    locals: {
+        title: 'Editing user ' + req.user.name
+      , user: req.user
+    }
+  });
+};
+
+exports.update = function(req, res){
+  // Normally you would handle all kinds of
+  // validation and save back to the db
+  var user = req.body.user;
+  req.user.name = user.name;
+  req.user.email = user.email;
+  res.redirect('back');
+};

examples/route-separation/views/index.ejs

@@ -0,0 +1,4 @@
+<ul>
+  <li>Visit the <a href="/users">users</a> page</li>
+  <li>Visit the <a href="/posts">posts</a> page</li>
+</ul>

examples/route-separation/views/layout.ejs

@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <title><%= title %></title>
+    <link href="/style.css" rel="stylesheet" />
+  </head>
+  <body>
+    <%- body %>
+  </body>
+</html>

examples/route-separation/views/post/list.ejs

@@ -0,0 +1,7 @@
+<h1>Posts</h1>
+<dl id="posts">
+  <% posts.forEach(function(post){ %>
+    <dt><%= post.title %></dt>
+    <dd><%= post.body %></dd>
+  <% }) %>
+</dl>

examples/route-separation/views/user/edit.ejs

@@ -0,0 +1,9 @@
+<h1>Editing <%= user.name %></h1>
+<div id="user">
+  <form method="post">
+    <input type="hidden" value="put" name="_method" />
+    <p>Name: <input type="text" value="<%= user.name %>" name="user[name]"/></p>
+    <p>Email: <input type="text" value="<%= user.email %>" name="user[email]"/></p>
+    <p><input type="submit" value="Save" /></p>
+  </form>
+</div>

examples/route-separation/views/user/list.ejs

@@ -0,0 +1,9 @@
+<h1>Users</h1>
+<ul id="users">
+  <% users.forEach(function(user, id){ %>
+    <li>
+      <a href="/user/<%= id %>"><%= user.name %></a>
+      <a class="edit" href="/user/<%= id %>/edit">edit</a>
+    </li>
+  <% }) %>
+</ul>

examples/route-separation/views/user/view.ejs

@@ -0,0 +1,4 @@
+<h1><%= user.name %></h1>
+<div id="user">
+  <p>Email: <%= user.email %></p>
+</div>