3.17.0

fixes #2308

.gitignore

@@ -1,5 +1,5 @@
+coverage/
 .DS_Store
-lib-cov
 *.seed
 *.log
 *.csv
@@ -9,5 +9,8 @@ lib-cov
 *.swp
 *.swo
 benchmarks/graphs
-testing.js
+testing
 node_modules/
+testing
+test.js
+.idea

.npmignore

@@ -1,7 +1,10 @@
 .git*
+benchmarks/
+coverage/
 docs/
 examples/
 support/
 test/
 testing.js
 .DS_Store
+.travis.yml

.travis.yml

@@ -0,0 +1,11 @@
+language: node_js
+node_js:
+  - "0.8"
+  - "0.10"
+  - "0.11"
+matrix:
+  allow_failures:
+    - node_js: "0.11"
+  fast_finish: true
+script: "npm run-script test-travis"
+after_script: "npm install coveralls@2.10.0 && cat ./coverage/lcov.info | coveralls"

LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2009-2011 TJ Holowaychuk <tj@vision-media.ca>
+Copyright (c) 2009-2013 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

Makefile

@@ -1,35 +0,0 @@
-
-DOCS = $(shell find docs/*.md)
-HTMLDOCS =$(DOCS:.md=.html)
-TESTS = $(shell find test/*.test.js)
-
-test:
-	@NODE_ENV=test ./node_modules/.bin/expresso \
-		-I lib \
-		$(TESTFLAGS) \
-		$(TESTS)
-
-test-cov:
-	@TESTFLAGS=--cov $(MAKE) test
-
-docs: $(HTMLDOCS)
-	@ echo "... generating TOC"
-	@./support/toc.js docs/guide.html
-
-%.html: %.md
-	@echo "... $< -> $@"
-	@markdown $< \
-	  | cat docs/layout/head.html - docs/layout/foot.html \
-	  > $@
-
-site:
-	rm -fr /tmp/docs \
-	  && cp -fr docs /tmp/docs \
-	  && git checkout gh-pages \
-  	&& cp -fr /tmp/docs/* . \
-		&& echo "done"
-
-docclean:
-	rm -f docs/*.{1,html}
-
-.PHONY: site test test-cov docs docclean

Readme.md

@@ -1,23 +1,25 @@
+[![express logo](http://f.cl.ly/items/0V2S1n0K1i3y1c122g04/Screen%20Shot%202012-04-11%20at%209.59.42%20AM.png)](http://expressjs.com/)
 
-# Express
-      
-  Insanely fast (and small) server-side JavaScript web development framework
-  built on [node](http://nodejs.org) and [Connect](http://github.com/senchalabs/connect).
-  
-     var app = express.createServer();
-     
-     app.get('/', function(req, res){
-       res.send('Hello World');
-     });
-     
-     app.listen(3000);
+  Fast, unopinionated, minimalist web framework for [node](http://nodejs.org).
+
+  [![NPM version](https://img.shields.io/npm/v/express.svg?style=flat)](https://www.npmjs.org/package/express)
+  [![Build Status](https://img.shields.io/travis/strongloop/express.svg?style=flat)](https://travis-ci.org/strongloop/express)
+  [![Coverage Status](https://img.shields.io/coveralls/strongloop/express.svg?style=flat)](https://coveralls.io/r/strongloop/express)
+  [![Gittip](https://img.shields.io/gittip/dougwilson.svg?style=flat)](https://www.gittip.com/dougwilson/)
+
+```js
+var express = require('express');
+var app = express();
+
+app.get('/', function(req, res){
+  res.send('Hello World');
+});
+
+app.listen(3000);
+```
 
 ## Installation
 
-    $ npm install express
-
-or to access the `express(1)` executable install globally:
-
     $ npm install -g express
 
 ## Quick Start
@@ -31,97 +33,83 @@ or to access the `express(1)` executable install globally:
 
  Install dependencies:
 
-    $ npm install -d
+    $ npm install
 
  Start the server:
 
-    $ node app.js
+    $ node app
 
 ## Features
 
+  * Built on [Connect](http://github.com/senchalabs/connect)
   * Robust routing
-  * Redirection helpers
-  * Dynamic view helpers
+  * HTTP helpers (redirection, caching, etc)
+  * View system supporting 14+ template engines
   * Content negotiation
   * Focus on high performance
-  * View rendering and partials support
   * Environment based configuration
-  * Session based flash notifications
-  * Built on [Connect](http://github.com/senchalabs/connect)
-  * High test coverage
   * Executable for generating applications quickly
-  * Application level view options
+  * High test coverage
 
-Via Connect:
+## Philosophy
 
-  * Session support
-  * Cache API
-  * Mime helpers
-  * ETag support
-  * Persistent flash notifications
-  * Cookie support
-  * JSON-RPC
-  * Logging
-  * and _much_ more!
+  The Express philosophy is to provide small, robust tooling for HTTP servers, making
+  it a great solution for single page applications, web sites, hybrids, or public
+  HTTP APIs.
 
-## Contributors
-
-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))
+  Built on Connect, you can use _only_ what you need, and nothing more. Applications
+  can be as big or as small as you like, even a single file. Express does
+  not force you to use any specific ORM or template engine. With support for over
+  14 template engines via [Consolidate.js](http://github.com/visionmedia/consolidate.js),
+  you can quickly craft your perfect framework.
 
 ## More Information
 
-  * #express on freenode
-  * [express-expose](http://github.com/visionmedia/express-expose) expose objects, functions, modules and more to client-side js with ease
-  * [express-configure](http://github.com/visionmedia/express-configuration) async configuration support
-  * [express-messages](http://github.com/visionmedia/express-messages) flash notification rendering helper
-  * [express-namespace](http://github.com/visionmedia/express-namespace) namespaced route support
-  * [express-params](https://github.com/visionmedia/express-params) param pre-condition functions
-  * [express-mongoose](https://github.com/LearnBoost/express-mongoose) plugin for easy rendering of Mongoose async Query results
-  * Follow [tjholowaychuk](http://twitter.com/tjholowaychuk) on twitter for updates
+  * [Website and Documentation](http://expressjs.com/) stored at [strongloop/expressjs.com](https://github.com/strongloop/expressjs.com)
+  * Join #express on freenode
   * [Google Group](http://groups.google.com/group/express-js) for discussion
-  * Visit the [Wiki](http://github.com/visionmedia/express/wiki)
-  * [日本語ドキュメンテーション](http://hideyukisaito.com/doc/expressjs/) by [hideyukisaito](https://github.com/hideyukisaito)
-  * Screencast - [Introduction](http://bit.ly/eRYu0O)
-  * Screencast - [View Partials](http://bit.ly/dU13Fx)
-  * Screencast - [Route Specific Middleware](http://bit.ly/hX4IaH)
-  * Screencast - [Route Path Placeholder Preconditions](http://bit.ly/eNqmVs)
-
-## Node Compatibility
-
-Express 1.x is compatible with node 0.2.x and connect < 1.0.
-
-Express 2.x is compatible with node 0.4.x and connect 1.x
+  * Follow [tjholowaychuk](http://twitter.com/tjholowaychuk) on twitter for updates
+  * Visit the [Wiki](http://github.com/strongloop/express/wiki)
+  * [Русскоязычная документация](http://jsman.ru/express/)
+  * Run express examples [online](https://runnable.com/express)
 
 ## Viewing Examples
 
-First install the dev dependencies to install all the example / test suite deps:
+Clone the Express repo, then install the dev dependencies to install all the example / test suite dependencies:
 
+    $ git clone git://github.com/strongloop/express.git --depth 1
+    $ cd express
     $ npm install
 
-then run whichever tests you want:
+Then run whichever tests you want:
 
-    $ node examples/jade/app.js
+    $ node examples/content-negotiation
+
+You can also view live examples here:
+
+<a href="https://runnable.com/express" target="_blank"><img src="https://runnable.com/external/styles/assets/runnablebtn.png" style="width:67px;height:25px;"></a>
 
 ## Running Tests
 
-To run the test suite first invoke the following command within the repo, installing the development dependencies:
+To run the test suite, first invoke the following command within the repo, installing the development dependencies:
 
     $ npm install
 
-then run the tests:
+Then run the tests:
 
-    $ make test
+```sh
+$ npm test
+```
 
-## License 
+## Contributors
+
+  https://github.com/strongloop/express/graphs/contributors
+
+## License
 
 (The MIT License)
 
-Copyright (c) 2009-2011 TJ Holowaychuk &lt;tj@vision-media.ca&gt;
+Copyright (c) 2009-2012 TJ Holowaychuk &lt;tj@vision-media.ca&gt;
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

benchmarks/Makefile

@@ -0,0 +1,13 @@
+
+all:
+	@./run 1 middleware
+	@./run 5 middleware
+	@./run 10 middleware
+	@./run 15 middleware
+	@./run 20 middleware
+	@./run 30 middleware
+	@./run 50 middleware
+	@./run 100 middleware
+	@echo
+
+.PHONY: all

benchmarks/middleware.js

@@ -0,0 +1,23 @@
+
+var http = require('http');
+var express = require('..');
+var app = express();
+
+// number of middleware
+
+var n = parseInt(process.env.MW || '1', 10);
+console.log('  %s middleware', n);
+
+while (n--) {
+  app.use(function(req, res, next){
+    next();
+  });
+}
+
+var body = new Buffer('Hello World');
+
+app.use(function(req, res, next){
+  res.send(body);
+});
+
+app.listen(3333);

benchmarks/run

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+echo
+MW=$1 node $2 &
+pid=$!
+
+sleep 2
+
+wrk 'http://localhost:3333/?foo[bar]=baz' \
+  -d 3 \
+  -c 50 \
+  -t 8 \
+  | grep 'Requests/sec' \
+  | awk '{ print "  " $2 }'
+
+kill $pid

bin/express

@@ -4,76 +4,102 @@
  * Module dependencies.
  */
 
-var fs = require('fs')
-  , exec = require('child_process').exec;
+var program = require('commander')
+  , mkdirp = require('mkdirp')
+  , pkg = require('../package.json')
+  , version = pkg.version
+  , os = require('os')
+  , fs = require('fs');
+
+// CLI
+
+program
+  .version(version)
+  .usage('[options] [dir]')
+  .option('-s, --sessions', 'add session support')
+  .option('-e, --ejs', 'add ejs engine support (defaults to jade)')
+  .option('-J, --jshtml', 'add jshtml engine support (defaults to jade)')
+  .option('-H, --hogan', 'add hogan.js engine support')
+  .option('-c, --css <engine>', 'add stylesheet <engine> support (less|stylus) (defaults to plain css)')
+  .option('-f, --force', 'force on non-empty directory')
+  .parse(process.argv);
+
+// Path
+
+var path = program.args.shift() || '.';
+
+// end-of-line code
+
+var eol = os.EOL
+
+// Template engine
+
+program.template = 'jade';
+if (program.ejs) program.template = 'ejs';
+if (program.jshtml) program.template = 'jshtml';
+if (program.hogan) program.template = 'hjs';
 
 /**
- * Framework version.
+ * Routes index template.
  */
 
-var version = '2.4.3';
+var index = [
+    ''
+  , '/*'
+  , ' * GET home page.'
+  , ' */'
+  , ''
+  , 'exports.index = function(req, res){'
+  , '  res.render(\'index\', { title: \'Express\' });'
+  , '};'
+].join(eol);
 
 /**
- * Add session support.
+ * Routes users template.
  */
 
-var sessions = false;
-
-/**
- * CSS engine to utilize.
- */
-
-var cssEngine;
-
-/**
- * Template engine to utilize.
- */
-
-var templateEngine = 'jade';
-
-/**
- * Usage documentation.
- */
-
-var usage = ''
-  + '\n'
-  + '  Usage: express [options] [path]\n'
-  + '\n'
-  + '  Options:\n'
-  + '    -s, --sessions           add session support\n'
-  + '    -t, --template <engine>  add template <engine> support (jade|ejs). default=jade\n'
-  + '    -c, --css <engine>       add stylesheet <engine> support (less|sass|stylus). default=plain css\n'
-  + '    -v, --version            output framework version\n'
-  + '    -h, --help               output help information\n'
-  ;
+var users = [
+    ''
+  , '/*'
+  , ' * GET users listing.'
+  , ' */'
+  , ''
+  , 'exports.list = function(req, res){'
+  , '  res.send("respond with a resource");'
+  , '};'
+].join(eol);
 
 /**
  * Jade layout template.
  */
 
 var jadeLayout = [
-    '!!!'
+    'doctype html'
   , 'html'
   , '  head'
   , '    title= title'
   , '    link(rel=\'stylesheet\', href=\'/stylesheets/style.css\')'
-  , '  body!= body'
-].join('\n');
+  , '  body'
+  , '    block content'
+].join(eol);
 
 /**
  * Jade index template.
  */
 
 var jadeIndex = [
-    'h1= title'
-  , 'p Welcome to #{title}'
-].join('\n');
+    'extends layout'
+  , ''
+  , 'block content'
+  , '  h1= title'
+  , '  p Welcome to #{title}'
+].join(eol);
 
 /**
- * EJS layout template.
+ * EJS index template.
  */
 
-var ejsLayout = [
+var ejsIndex = [
     '<!DOCTYPE html>'
   , '<html>'
   , '  <head>'
@@ -81,19 +107,54 @@ var ejsLayout = [
   , '    <link rel=\'stylesheet\' href=\'/stylesheets/style.css\' />'
   , '  </head>'
   , '  <body>'
-  , '    <%- body %>'
+  , '    <h1><%= title %></h1>'
+  , '    <p>Welcome to <%= title %></p>'
   , '  </body>'
   , '</html>'
-].join('\n');
+].join(eol);
 
 /**
- * EJS index template.
+ * JSHTML layout template.
  */
 
-var ejsIndex = [
-    '<h1><%= title %></h1>'
-  , '<p>Welcome to <%= title %></p>'
-  ].join('\n');
+var jshtmlLayout = [
+    '<!DOCTYPE html>'
+  , '<html>'
+  , '  <head>'
+  , '    <title> @write(title) </title>'
+  , '    <link rel=\'stylesheet\' href=\'/stylesheets/style.css\' />'
+  , '  </head>'
+  , '  <body>'
+  , '    @write(body)'
+  , '  </body>'
+  , '</html>'
+].join(eol);
+
+/**
+ * JSHTML index template.
+ */
+
+var jshtmlIndex = [
+    '<h1>@write(title)</h1>'
+  , '<p>Welcome to @write(title)</p>'
+].join(eol);
+
+/**
+ * Hogan.js index template.
+ */
+var hoganIndex = [
+    '<!DOCTYPE html>'
+  , '<html>'
+  , '  <head>'
+  , '    <title>{{ title }}</title>'
+  , '    <link rel=\'stylesheet\' href=\'/stylesheets/style.css\' />'
+  , '  </head>'
+  , '  <body>'
+  , '    <h1>{{ title }}</h1>'
+  , '    <p>Welcome to {{ title }}</p>'
+  , '  </body>'
+  , '</html>'
+].join(eol);
 
 /**
  * Default css template.
@@ -108,7 +169,7 @@ var css = [
   , 'a {'
   , '  color: #00B7FF;'
   , '}'
-].join('\n');
+].join(eol);
 
 /**
  * Default less template.
@@ -123,19 +184,7 @@ var less = [
   , 'a {'
   , '  color: #00B7FF;'
   , '}'
-].join('\n');
-
-/**
- * Default sass template.
- */
-
-var sass = [
-    'body'
-  , '  :padding 50px'
-  , '  :font 14px "Lucida Grande", Helvetica, Arial, sans-serif'
-  , 'a'
-  , '  :color #00B7FF'
-].join('\n');
+].join(eol);
 
 /**
  * Default stylus template.
@@ -143,11 +192,11 @@ var sass = [
 
 var stylus = [
     'body'
-  , '  padding 50px'
-  , '  font 14px "Lucida Grande", Helvetica, Arial, sans-serif'
+  , '  padding: 50px'
+  , '  font: 14px "Lucida Grande", Helvetica, Arial, sans-serif'
   , 'a'
-  , '  color #00B7FF'
-].join('\n');
+  , '  color: #00B7FF'
+].join(eol);
 
 /**
  * App template.
@@ -160,87 +209,47 @@ var app = [
   , ' */'
   , ''
   , 'var express = require(\'express\');'
+  , 'var routes = require(\'./routes\');'
+  , 'var user = require(\'./routes/user\');'
+  , 'var http = require(\'http\');'
+  , 'var path = require(\'path\');'
   , ''
-  , 'var app = module.exports = express.createServer();'
+  , 'var app = express();'
   , ''
-  , '// Configuration'
+  , '// all environments'
+  , 'app.set(\'port\', process.env.PORT || 3000);'
+  , 'app.set(\'views\', path.join(__dirname, \'views\'));'
+  , 'app.set(\'view engine\', \':TEMPLATE\');'
+  , 'app.use(express.favicon());'
+  , 'app.use(express.logger(\'dev\'));'
+  , 'app.use(express.json());'
+  , 'app.use(express.urlencoded());'
+  , 'app.use(express.methodOverride());{sess}'
+  , 'app.use(app.router);{css}'
+  , 'app.use(express.static(path.join(__dirname, \'public\')));'
   , ''
-  , 'app.configure(function(){'
-  , '  app.set(\'views\', __dirname + \'/views\');'
-  , '  app.set(\'view engine\', \':TEMPLATE\');'
-  , '  app.use(express.bodyParser());'
-  , '  app.use(express.methodOverride());{sess}{css}'
-  , '  app.use(app.router);'
-  , '  app.use(express.static(__dirname + \'/public\'));'
+  , '// development only'
+  , 'if (\'development\' == app.get(\'env\')) {'
+  , '  app.use(express.errorHandler());'
+  , '}'
+  , ''
+  , 'app.get(\'/\', routes.index);'
+  , 'app.get(\'/users\', user.list);'
+  , ''
+  , 'http.createServer(app).listen(app.get(\'port\'), function(){'
+  , '  console.log(\'Express server listening on port \' + app.get(\'port\'));'
   , '});'
   , ''
-  , '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\', {'
-  , '    title: \'Express\''
-  , '  });'
-  , '});'
-  , ''
-  , 'app.listen(3000);'
-  , 'console.log("Express server listening on port %d in %s mode", app.address().port, app.settings.env);'
-  , ''
-].join('\n');
-
-// Parse arguments
-
-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;
-    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;
-  }
-}
+].join(eol);
 
 // Generate application
 
 (function createApplication(path) {
   emptyDirectory(path, function(empty){
-    if (empty) {
+    if (empty || program.force) {
       createApplicationAt(path);
     } else {
-      confirm('destination is not empty, continue? ', function(ok){
+      program.confirm('destination is not empty, continue? ', function(ok){
         if (ok) {
           process.stdin.destroy();
           createApplicationAt(path);
@@ -259,72 +268,104 @@ while (args.length) {
  */
 
 function createApplicationAt(path) {
+  console.log();
+  process.on('exit', function(){
+    console.log();
+    console.log('   install dependencies:');
+    console.log('     $ cd %s && npm install', path);
+    console.log();
+    console.log('   run the app:');
+    console.log('     $ node app');
+    console.log();
+  });
+
   mkdir(path, function(){
+    mkdir(path + '/public');
     mkdir(path + '/public/javascripts');
     mkdir(path + '/public/images');
     mkdir(path + '/public/stylesheets', function(){
-      switch (cssEngine) {
-        case 'stylus':
-          write(path + '/public/stylesheets/style.styl', stylus);
-          break;
+      switch (program.css) {
         case 'less':
           write(path + '/public/stylesheets/style.less', less);
           break;
-        case 'sass':
-          write(path + '/public/stylesheets/style.sass', sass);
+        case 'stylus':
+          write(path + '/public/stylesheets/style.styl', stylus);
           break;
         default:
           write(path + '/public/stylesheets/style.css', css);
       }
     });
+
+    mkdir(path + '/routes', function(){
+      write(path + '/routes/index.js', index);
+      write(path + '/routes/user.js', users);
+    });
+
     mkdir(path + '/views', function(){
-      switch (templateEngine) {
+      switch (program.template) {
         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;
+        case 'jshtml':
+          write(path + '/views/layout.jshtml', jshtmlLayout);
+          write(path + '/views/index.jshtml', jshtmlIndex);
+          break;
+        case 'hjs':
+          write(path + '/views/index.hjs', hoganIndex);
+          break;
+
       }
     });
 
     // CSS Engine support
-    switch (cssEngine) {
-      case 'sass':
+    switch (program.css) {
       case 'less':
-        app = app.replace('{css}', '\n  app.use(express.compiler({ src: __dirname + \'/public\', enable: [\'' + cssEngine + '\'] }));');
+        app = app.replace('{css}', eol + 'app.use(require(\'less-middleware\')({ src: path.join(__dirname, \'public\') }));');
         break;
       case 'stylus':
-        app = app.replace('{css}', '\n  app.use(require(\'stylus\').middleware({ src: __dirname + \'/public\' }));');
+        app = app.replace('{css}', eol + 'app.use(require(\'stylus\').middleware(path.join(__dirname, \'public\')));');
         break;
       default:
         app = app.replace('{css}', '');
     }
 
     // Session support
-    app = app.replace('{sess}', sessions
-      ? '\n  app.use(express.cookieParser());\n  app.use(express.session({ secret: \'your secret here\' }));'
+    app = app.replace('{sess}', program.sessions
+      ? eol + 'app.use(express.session({ secret: \'your secret here\' }));'
       : '');
 
     // Template support
-    app = app.replace(':TEMPLATE', templateEngine);
+    app = app.replace(':TEMPLATE', program.template);
 
     // package.json
-    var json = '{\n';
-    json += '    "name": "application-name"\n';
-    json += '  , "version": "0.0.1"\n';
-    json += '  , "private": true\n';
-    json += '  , "dependencies": {\n';
-    json += '      "express": "' + version + '"\n';
-    if (cssEngine) json += '    , "' + cssEngine + '": ">= 0.0.1"\n';
-    if (templateEngine) json += '    , "' + templateEngine + '": ">= 0.0.1"\n';
-    json += '  }\n';
-    json += '}';
+    var pkg = {
+        name: 'application-name'
+      , version: '0.0.1'
+      , private: true
+      , scripts: { start: 'node app.js' }
+      , dependencies: {
+        express: version
+      }
+    }
 
+    if (program.template) pkg.dependencies[program.template] = '*';
 
-    write(path + '/package.json', json);
+    // CSS Engine support
+    switch (program.css) {
+      case 'less':
+        pkg.dependencies['less-middleware'] = '~0.1.15';
+        break;
+      default:
+        if (program.css) {
+          pkg.dependencies[program.css] = '*';
+        }
+    }
+
+    write(path + '/package.json', JSON.stringify(pkg, null, 2));
     write(path + '/app.js', app);
   });
 }
@@ -355,41 +396,6 @@ function write(path, str) {
   console.log('   \x1b[36mcreate\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) {
-  // prompt
-  if (' ' == msg[msg.length - 1]) {
-    process.stdout.write(msg);
-  } else {
-    console.log(msg);
-  }
-
-  // stdin
-  process.stdin.setEncoding('ascii');
-  process.stdin.once('data', function(data){
-    fn(data);
-  }).resume();
-}
-
 /**
  * Mkdir -p.
  *
@@ -398,9 +404,9 @@ function prompt(msg, fn) {
  */
 
 function mkdir(path, fn) {
-  exec('mkdir -p ' + path, function(err){
+  mkdirp(path, 0755, function(err){
     if (err) throw err;
-    console.log('   \x1b[36mcreate\x1b[0m : ' + path);
+    console.log('   \033[36mcreate\033[0m : ' + path);
     fn && fn();
   });
 }

docs/applications.html

@@ -1,246 +0,0 @@
-<html>
-	<head>
-		<title>Express - node web framework</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<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: 75px;
-			  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="screencasts.html">Screencasts</a></li>
-					<li><a href="applications.html">Applications</a></li>
-				</ul>
-
-
-<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 &ndash; 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>
-	</body>
-</html>

docs/applications.md

@@ -1,47 +0,0 @@
-
-<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.html

@@ -1,240 +0,0 @@
-<html>
-	<head>
-		<title>Express - node web framework</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<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: 75px;
-			  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="screencasts.html">Screencasts</a></li>
-					<li><a href="applications.html">Applications</a></li>
-				</ul>
-<h3>Development Dependencies</h3>
-
-<p>First install the dev dependencies by executing the following command in the repo&rsquo;s directory:</p>
-
-<pre><code>$ npm install
-</code></pre>
-
-<h3>Running Tests</h3>
-
-<p>Express uses the <a href="http://github.com/visionmedia/expresso">Expresso</a> TDD
-framework to write and run elegant test suites extremely fast. To run all test suites
-simply execute:</p>
-
-<pre><code>$ make test
-</code></pre>
-
-<p>To target specific suites we may specify the files via:</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>Contributions</h3>
-
-<p>To accept a contribution, you should follow these guidelines:</p>
-
-<ul>
-<li>All tests <em>must</em> pass</li>
-<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>2</em> spaces.</li>
-</ul>
-
-
-<h3>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>
-	</body>
-</html>

docs/contrib.md

@@ -1,37 +0,0 @@
-
-### Development Dependencies
-
-First install the dev dependencies by executing the following command in the repo's directory:
-
-    $ npm install
-
-### Running Tests
-
-Express uses the [Expresso](http://github.com/visionmedia/expresso) TDD
-framework to write and run elegant test suites extremely fast. To run all test suites
-simply execute:
-
-    $ make test
-
-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:
-
-  * All tests _must_ pass
-  * 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 _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.html

@@ -1,216 +0,0 @@
-<html>
-	<head>
-		<title>Express - node web framework</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<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: 75px;
-			  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="screencasts.html">Screencasts</a></li>
-					<li><a href="applications.html">Applications</a></li>
-				</ul>
-<h2>Synopsis</h2>
-
-<pre><code>express [options] [PATH]
-</code></pre>
-
-<h2>Description</h2>
-
-<p>The <em>express</em> executable generates apps at the given <strong>PATH</strong> or the
-current working directory. Although Express is not bound to a specific
-application structure, this executable creates a maintainable base app.</p>
-
-<h2>Options</h2>
-
-<pre><code>  -s, --sessions         Add session support
-  -t, --template ENGINE  Add template ENGINE support (jade|ejs). Defaults to jade
-  -c, --css ENGINE       Add stylesheet ENGINE support (less|sass|stylus). Defaults to plain css
-  -v, --version          Output framework version
-  -h, --help             Output help information
-</code></pre>
-			</div>
-		</div>
-	</body>
-</html>

docs/executable.md

@@ -1,21 +0,0 @@
-
-## Synopsis
-
-    express [options] [PATH]
-
-## Description
-
-The _express_ executable generates apps at the given **PATH** or the 
-current working directory. Although Express is not bound to a specific
-application structure, this executable creates a maintainable base app.
-
-## Options
-
-      -s, --sessions         Add session support
-      -t, --template ENGINE  Add template ENGINE support (jade|ejs). Defaults to jade
-      -c, --css ENGINE       Add stylesheet ENGINE support (less|sass|stylus). Defaults to plain css
-      -v, --version          Output framework version
-      -h, --help             Output help information
-
-
-

docs/index.html

@@ -1,266 +0,0 @@
-<html>
-	<head>
-		<title>Express - node web framework</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<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: 75px;
-			  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="screencasts.html">Screencasts</a></li>
-					<li><a href="applications.html">Applications</a></li>
-				</ul>
-<pre><code>var app = express.createServer();
-
-app.get('/', function(req, res){
-    res.send('Hello World');
-});
-
-app.listen(3000);
-</code></pre>
-
-<h2>Features</h2>
-
-<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>Application mounting</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://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>
-
-
-<h2>Contributors</h2>
-
-<p>The following are the major contributors of Express (in no specific order).</p>
-
-<ul>
-<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>
-
-
-<h2>Third-Party Modules</h2>
-
-<p>The following modules compliment or extend Express directly:</p>
-
-<ul>
-<li><a href="http://github.com/visionmedia/express-resource">express-resource</a> provides resourceful routing</li>
-<li><a href="http://github.com/visionmedia/express-messages">express-messages</a> flash message notification rendering</li>
-<li><a href="http://github.com/visionmedia/express-configuration">express-configure</a> async configuration support (load settings from redis etc)</li>
-<li><a href="http://github.com/visionmedia/express-namespace">express-namespace</a> namespaced routing support</li>
-<li><a href="http://github.com/visionmedia/express-expose">express-expose</a> expose objects, functions, modules and more to client-side js</li>
-<li><a href="https://github.com/visionmedia/express-params">express-params</a> app.param() extensions</li>
-<li><a href="https://github.com/LearnBoost/express-mongoose">express-mongoose</a> plugin for easy rendering of Mongoose async Query results</li>
-</ul>
-
-
-<h2>More Information</h2>
-
-<ul>
-<li>#express on freenode</li>
-<li>Follow <a href="http://twitter.com/tjholowaychuk">tjholowaychuk</a> on twitter for updates</li>
-<li><a href="http://groups.google.com/group/express-js">Google Group</a> for discussion</li>
-<li>Visit the <a href="http://github.com/visionmedia/express/wiki">Wiki</a></li>
-<li><a href="http://hideyukisaito.com/doc/expressjs/">日本語ドキュメンテーション</a> by <a href="https://github.com/hideyukisaito">hideyukisaito</a></li>
-<li>Screencast &ndash; <a href="http://bit.ly/eRYu0O">Introduction</a></li>
-<li>Screencast &ndash; <a href="http://bit.ly/dU13Fx">View Partials</a></li>
-<li>Screencast &ndash; <a href="http://bit.ly/hX4IaH">Route Specific Middleware</a></li>
-<li>Screencast &ndash; <a href="http://bit.ly/eNqmVs">Route Path Placeholder Preconditions</a></li>
-</ul>
-
-			</div>
-		</div>
-	</body>
-</html>

docs/index.md

@@ -1,53 +0,0 @@
-
-    var app = express.createServer();
-    
-    app.get('/', function(req, res){
-        res.send('Hello World');
-    });
-
-    app.listen(3000);
-
-## Features
-
-  * Robust routing
-  * Redirection helpers
-  * Dynamic view helpers
-  * Application level view options
-  * Content negotiation
-  * Application mounting
-  * Focus on high performance
-  * View rendering and partials support
-  * Environment based configuration
-  * Session based flash notifications
-  * Built on [Connect](http://github.com/senchalabs/connect)
-  * [Executable](executable.html) for generating applications quickly
-  * High test coverage
-
-## Contributors
-
-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))
-
-## Third-Party Modules
-
-The following modules compliment or extend Express directly:
-
-  * [express-resource](http://github.com/visionmedia/express-resource) provides resourceful routing
-  * [express-messages](http://github.com/visionmedia/express-messages) flash message notification rendering
-  * [express-configure](http://github.com/visionmedia/express-configuration) async configuration support (load settings from redis etc)
-  * [express-namespace](http://github.com/visionmedia/express-namespace) namespaced routing support
-  * [express-expose](http://github.com/visionmedia/express-expose) expose objects, functions, modules and more to client-side js
-  * [express-params](https://github.com/visionmedia/express-params) app.param() extensions
-  * [express-mongoose](https://github.com/LearnBoost/express-mongoose) plugin for easy rendering of Mongoose async Query results 
-
-## More Information
-
-  * \#express on freenode
-  * Follow [tjholowaychuk](http://twitter.com/tjholowaychuk) on twitter for updates
-  * [Google Group](http://groups.google.com/group/express-js) for discussion
-  * Visit the [Wiki](http://github.com/visionmedia/express/wiki)
-  * [日本語ドキュメンテーション](http://hideyukisaito.com/doc/expressjs/) by [hideyukisaito](https://github.com/hideyukisaito)

docs/layout/foot.html

@@ -1,4 +0,0 @@
-			</div>
-		</div>
-	</body>
-</html>

docs/layout/head.html

@@ -1,193 +0,0 @@
-<html>
-	<head>
-		<title>Express - node web framework</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<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: 75px;
-			  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="screencasts.html">Screencasts</a></li>
-					<li><a href="applications.html">Applications</a></li>
-				</ul>

docs/migrate.html

@@ -1,394 +0,0 @@
-<html>
-	<head>
-		<title>Express - node web framework</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<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: 75px;
-			  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="screencasts.html">Screencasts</a></li>
-					<li><a href="applications.html">Applications</a></li>
-				</ul>
-<h3>Express 1.x to 2.x Migration</h3>
-
-<h3>HTTPS</h3>
-
-<p> Creating an HTTPS server is simply, simply pass the TLS options to <em>express.createServer()</em>:</p>
-
-<pre><code> var app = express.createServer({
-     key: ...
-   , cert: ...
- });
-
- app.listen(443);
-</code></pre>
-
-<h3>req.header() Referrer</h3>
-
-<p> Previously if anyone was doing something similar to:</p>
-
-<pre><code> req.headers.referrer || req.headers.referer
- req.header('Referrer') || req.header('Referer')
-</code></pre>
-
-<p> With the new special-case we may now simply use <em>Referrer</em> which will return either if defined:</p>
-
-<pre><code> req.header('Referrer')
-</code></pre>
-
-<h3>res.local(name, val)</h3>
-
-<p> Previously all local variables had to be passed to <em>res.render()</em>, or either <em>app.helpers()</em> or <em>app.dynamicHelpers()</em>, now we may do this at the request-level progressively. The <em>res.local()</em> method accepts a <em>name</em> and <em>val</em>, however the locals passed to <em>res.render()</em> will take precedence.</p>
-
-<p> For example we may utilize this feature to create locals in middleware:</p>
-
-<pre><code> function loadUser(req, res, next) {
-   User.get(req.params.id, function(err, user){
-     res.local('user', user);
-     next();
-   });
- }
-
- app.get('/user/:id', loadUser, function(req, res){
-   res.render('user');
- });
-</code></pre>
-
-<h3>req.param(name[, defaultValue])</h3>
-
-<p> Previously only <em>name</em> was accepted, so some of you may have been doing the following:</p>
-
-<pre><code> var id = req.param('id') || req.user.id;
-</code></pre>
-
-<p> The new <em>defaultValue</em> argument can handle this nicely:</p>
-
-<pre><code> var id = req.param('id', req.user.id);
-</code></pre>
-
-<h3>app.helpers() / app.locals()</h3>
-
-<p>  <em>app.locals()</em> is now an alias of <em>app.helpers()</em>, as helpers makes more sense for functions.</p>
-
-<h3>req.accepts(type)</h3>
-
-<p>  <em>req.accepts()</em> now accepts extensions:</p>
-
-<pre><code>  // Accept: text/html
-  req.accepts('html');
-  req.accepts('.html');
-  // =&gt; true
-
-  // Accept: text/*; application/json
-  req.accepts('html');
-  req.accepts('text/*');
-  req.accepts('text/plain');
-  req.accepts('application/json');
-  // =&gt; true
-
-  req.accepts('image/png');
-  req.accepts('png');
-  // =&gt; false
-</code></pre>
-
-<h3>res.cookie()</h3>
-
-<p> Previously only directly values could be passed, so for example:</p>
-
-<pre><code>res.cookie('rememberme', 'yes', { expires: new Date(Date.now() + 900000) });
-</code></pre>
-
-<p>However now we have the alternative <em>maxAge</em> property which may be used to set <em>expires</em> relative to <em>Date.now()</em> in milliseconds, so our example above can now become:</p>
-
-<pre><code>res.cookie('rememberme', 'yes', { maxAge: 900000 });
-</code></pre>
-
-<h3>res.download() / res.sendfile()</h3>
-
-<p> Both of these methods now utilize Connect&rsquo;s static file server behind the scenes (actually the previous Express code was ported to Connect 1.0). With this change comes a change to the callback as well. Previously the <em>path</em> and <em>stream</em> were passed, however now only an <em>error</em> is passed, when no error has occurred the callback will be invoked indicating that the file transfer is complete. The callback remains optional:</p>
-
-<pre><code> res.download('/path/to/file');
-
- res.download('/path/to/file', function(err){
-   if (err) {
-     console.error(err);
-   } else {
-     console.log('transferred');
-   }
- });
-</code></pre>
-
-<p> The <em>stream threshold</em> setting was removed.</p>
-
-<h3>res.render()</h3>
-
-<p> Previously locals were passed as a separate key:</p>
-
-<pre><code> res.render('user', { layout: false, locals: { user: user }});
-</code></pre>
-
-<p> In Express 2.0 both the locals and the options are one in the same, meaning you cannot have a local variable named <em>layout</em> as it is reserved for express, however this cleans up the API:</p>
-
-<pre><code> res.render('user', { layout: false, user: user });
-</code></pre>
-
-<h3>res.partial()</h3>
-
-<p> Express 2.0 adds the <em>res.partial()</em> method, helpful for rendering partial fragments over WebSockets or Ajax requests etc. The API is identical to the <em>partial()</em> calls within views.</p>
-
-<pre><code> // render a collection of comments
- res.partial('comment', [comment1, comment2]); 
-
- // render a single comment
- res.partial('comment', comment);
-</code></pre>
-
-<h3>partial() locals</h3>
-
-<p> Both <em>res.partial()</em> and the <em>partial()</em> functions accept a single object consisting of both the options and the locals. Previously with Express 1.x you may pass <em>user</em> to a partial, along with <em>date</em> like so:</p>
-
-<pre><code>   partial('user', { object: user, locals: { date: new Date }})
-</code></pre>
-
-<p>or perhaps if you preferred not to use the inferred name <em>user</em> you may used a local for this as well:</p>
-
-<pre><code>   partial('user', { locals: { user: user, date: new Date }})
-</code></pre>
-
-<p> With recent changes to Express 2.x the object passed is now both, so the following is valid for the <em>object</em> option and locals:</p>
-
-<pre><code>   partial('user', { object: user, date: new Date })
-</code></pre>
-
-<p> Or the following which is equivalent, however the local var name is explicitly set to <em>user</em> instead of deduced from the filename.</p>
-
-<pre><code>   partial('user', { user: user, date: new Date })
-</code></pre>
-
-<p> When a &ldquo;basic&rdquo; object aka <em>{}</em> or <em>new Object</em> is passed, it is considered options, otherwise it is considered the <em>object</em>. The following are equivalent:</p>
-
-<pre><code>  partial('user', user); 
-  partial('user', { object: user }); 
-</code></pre>
-
-<h3>Template Engine Compliance</h3>
-
-<p> To comply with Express previously engines needed the following signature:</p>
-
-<pre><code> engine.render(str, options, function(err){});
-</code></pre>
-
-<p> Now they must export a <em>compile()</em> function, returning a function which when called with local variables will render the template. This allows Express to cache the compiled function in memory during production.</p>
-
-<pre><code> var fn = engine.compile(str, options);
- fn(locals);
-</code></pre>
-
-<h3>View Partial Lookup</h3>
-
-<p> Previously partials were loaded relative to the now removed <em>view partials</em> directory setting, or by default <em>views/partials</em>, now they are relative to the view calling them, read more on <a href="guide.html#view-lookup">view lookup</a>.</p>
-
-<h3>Mime Types</h3>
-
-<p> Express and Connect now utilize the <em>mime</em> module in npm, so to add more use:</p>
-
-<pre><code> require('mime').define({ 'foo/bar': ['foo', 'bar'] });
-</code></pre>
-
-<h3>static() middleware</h3>
-
-<p> Previously named <code>staticProvider()</code>, the now <code>static()</code> middleware takes a single directory path, followed by options.</p>
-
-<pre><code> app.use(express.static(__dirname + '/public', { maxAge: oneYear }));
-</code></pre>
-
-<p>Previously when using options the <code>root</code> option would be used for this:</p>
-
-<pre><code> app.use(express.staticProvider({ root: __dirname + '/public', maxAge: oneYear }));
-</code></pre>
-			</div>
-		</div>
-	</body>
-</html>

docs/migrate.md

@@ -1,177 +0,0 @@
-
-### Express 1.x to 2.x Migration
-
-### HTTPS
-
- Creating an HTTPS server is simply, simply pass the TLS options to _express.createServer()_:
- 
-     var app = express.createServer({
-         key: ...
-       , cert: ...
-     });
-
-     app.listen(443);
-
-### req.header() Referrer
-
- Previously if anyone was doing something similar to:
- 
-     req.headers.referrer || req.headers.referer
-     req.header('Referrer') || req.header('Referer')
-
- With the new special-case we may now simply use _Referrer_ which will return either if defined:
- 
-     req.header('Referrer')
-
-### res.local(name, val)
-
- Previously all local variables had to be passed to _res.render()_, or either _app.helpers()_ or _app.dynamicHelpers()_, now we may do this at the request-level progressively. The _res.local()_ method accepts a _name_ and _val_, however the locals passed to _res.render()_ will take precedence.
-
- For example we may utilize this feature to create locals in middleware:
-
-     function loadUser(req, res, next) {
-       User.get(req.params.id, function(err, user){
-         res.local('user', user);
-         next();
-       });
-     }
-
-     app.get('/user/:id', loadUser, function(req, res){
-       res.render('user');
-     });
-
-### req.param(name[, defaultValue])
-
- Previously only _name_ was accepted, so some of you may have been doing the following:
- 
-     var id = req.param('id') || req.user.id;
-
- The new _defaultValue_ argument can handle this nicely:
- 
-     var id = req.param('id', req.user.id);
-
-### app.helpers() / app.locals()
-
-  _app.locals()_ is now an alias of _app.helpers()_, as helpers makes more sense for functions.
-
-### req.accepts(type)
-
-  _req.accepts()_ now accepts extensions:
-  
-  
-      // Accept: text/html
-      req.accepts('html');
-      req.accepts('.html');
-      // => true
-      
-      // Accept: text/*; application/json
-      req.accepts('html');
-      req.accepts('text/*');
-      req.accepts('text/plain');
-      req.accepts('application/json');
-      // => true
-      
-      req.accepts('image/png');
-      req.accepts('png');
-      // => false
-
-### res.cookie()
-
- Previously only directly values could be passed, so for example:
-
-    res.cookie('rememberme', 'yes', { expires: new Date(Date.now() + 900000) });
-
-However now we have the alternative _maxAge_ property which may be used to set _expires_ relative to _Date.now()_ in milliseconds, so our example above can now become:
-
-    res.cookie('rememberme', 'yes', { maxAge: 900000 });
-
-### res.download() / res.sendfile()
-
- Both of these methods now utilize Connect's static file server behind the scenes (actually the previous Express code was ported to Connect 1.0). With this change comes a change to the callback as well. Previously the _path_ and _stream_ were passed, however now only an _error_ is passed, when no error has occurred the callback will be invoked indicating that the file transfer is complete. The callback remains optional:
- 
-     res.download('/path/to/file');
-
-     res.download('/path/to/file', function(err){
-       if (err) {
-         console.error(err);
-       } else {
-         console.log('transferred');
-       }
-     });
-
- The _stream threshold_ setting was removed.
-
-### res.render()
-
- Previously locals were passed as a separate key:
- 
-     res.render('user', { layout: false, locals: { user: user }});
-
- In Express 2.0 both the locals and the options are one in the same, meaning you cannot have a local variable named _layout_ as it is reserved for express, however this cleans up the API:
- 
-     res.render('user', { layout: false, user: user });
-
-### res.partial()
-
- Express 2.0 adds the _res.partial()_ method, helpful for rendering partial fragments over WebSockets or Ajax requests etc. The API is identical to the _partial()_ calls within views.
- 
-     // render a collection of comments
-     res.partial('comment', [comment1, comment2]); 
-
-     // render a single comment
-     res.partial('comment', comment);
-
-### partial() locals
-
- Both _res.partial()_ and the _partial()_ functions accept a single object consisting of both the options and the locals. Previously with Express 1.x you may pass _user_ to a partial, along with _date_ like so:
- 
-       partial('user', { object: user, locals: { date: new Date }})
-
-or perhaps if you preferred not to use the inferred name _user_ you may used a local for this as well:
-
-       partial('user', { locals: { user: user, date: new Date }})
-
- With recent changes to Express 2.x the object passed is now both, so the following is valid for the _object_ option and locals:
- 
-       partial('user', { object: user, date: new Date })
-
- Or the following which is equivalent, however the local var name is explicitly set to _user_ instead of deduced from the filename.
- 
-       partial('user', { user: user, date: new Date })
-
- When a "basic" object aka _{}_ or _new Object_ is passed, it is considered options, otherwise it is considered the _object_. The following are equivalent:
- 
-      partial('user', user); 
-      partial('user', { object: user }); 
-
-### Template Engine Compliance
-
- To comply with Express previously engines needed the following signature:
- 
-     engine.render(str, options, function(err){});
-
- Now they must export a _compile()_ function, returning a function which when called with local variables will render the template. This allows Express to cache the compiled function in memory during production.
- 
-     var fn = engine.compile(str, options);
-     fn(locals);
-
-### View Partial Lookup
-
- Previously partials were loaded relative to the now removed _view partials_ directory setting, or by default _views/partials_, now they are relative to the view calling them, read more on [view lookup](guide.html#view-lookup).
-
-### Mime Types
-
- Express and Connect now utilize the _mime_ module in npm, so to add more use:
- 
-     require('mime').define({ 'foo/bar': ['foo', 'bar'] });
-
-### static() middleware
-
- Previously named `staticProvider()`, the now `static()` middleware takes a single directory path, followed by options.
- 
-     app.use(express.static(__dirname + '/public', { maxAge: oneYear }));
-
-Previously when using options the `root` option would be used for this:
-
-     app.use(express.staticProvider({ root: __dirname + '/public', maxAge: oneYear }));
-

docs/screencasts.html

@@ -1,224 +0,0 @@
-<html>
-	<head>
-		<title>Express - node web framework</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<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: 75px;
-			  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="screencasts.html">Screencasts</a></li>
-					<li><a href="applications.html">Applications</a></li>
-				</ul>
-<h3>Introduction</h3>
-
-<p>This introduction screencast covers the basics of Express, and how to get started with your first application.</p>
-
-<object classid='clsid:d27cdb6e-ae6d-11cf-96b8-444553540000' codebase='http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,115,0' width='560' height='345'><param name='movie' value='http://screenr.com/Content/assets/screenr_1116090935.swf' /><param name='flashvars' value='i=139583' /><param name='allowFullScreen' value='true' /><embed src='http://screenr.com/Content/assets/screenr_1116090935.swf' flashvars='i=139583' allowFullScreen='true' width='560' height='345' pluginspage='http://www.macromedia.com/go/getflashplayer'></embed></object>
-
-
-<h3>View Partials</h3>
-
-<p>In this screencast we work with partials to display a collection of users using the <a href="http://jade-lang.com">Jade</a> template engine, and learn about view path resolution.</p>
-
-<object classid='clsid:d27cdb6e-ae6d-11cf-96b8-444553540000' codebase='http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,115,0' width='560' height='345'><param name='movie' value='http://screenr.com/Content/assets/screenr_1116090935.swf' /><param name='flashvars' value='i=139591' /><param name='allowFullScreen' value='true' /><embed src='http://screenr.com/Content/assets/screenr_1116090935.swf' flashvars='i=139591' allowFullScreen='true' width='560' height='345' pluginspage='http://www.macromedia.com/go/getflashplayer'></embed></object>
-
-
-<h3>Route Specific Middleware</h3>
-
-<p>In the screencast below we learn about the benefits of route-specific middleware.</p>
-
-<object classid='clsid:d27cdb6e-ae6d-11cf-96b8-444553540000' codebase='http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,115,0' width='560' height='345'><param name='movie' value='http://screenr.com/Content/assets/screenr_1116090935.swf' /><param name='flashvars' value='i=140296' /><param name='allowFullScreen' value='true' /><embed src='http://screenr.com/Content/assets/screenr_1116090935.swf' flashvars='i=140296' allowFullScreen='true' width='560' height='345' pluginspage='http://www.macromedia.com/go/getflashplayer'></embed></object>
-
-
-<h3>Route Param Preconditions</h3>
-
-<p>Learn about route parameter (<em>/user/:id</em>) pre-conditions, providing automated validation, and loading of data via the named route param segments.</p>
-
-<object classid='clsid:d27cdb6e-ae6d-11cf-96b8-444553540000' codebase='http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,115,0' width='560' height='345'><param name='movie' value='http://screenr.com/Content/assets/screenr_1116090935.swf' /><param name='flashvars' value='i=140300' /><param name='allowFullScreen' value='true' /><embed src='http://screenr.com/Content/assets/screenr_1116090935.swf' flashvars='i=140300' allowFullScreen='true' width='560' height='345' pluginspage='http://www.macromedia.com/go/getflashplayer'></embed></object>
-
-			</div>
-		</div>
-	</body>
-</html>

docs/screencasts.md

@@ -1,24 +0,0 @@
-
-### Introduction
-
-This introduction screencast covers the basics of Express, and how to get started with your first application.
-
-<object classid='clsid:d27cdb6e-ae6d-11cf-96b8-444553540000' codebase='http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,115,0' width='560' height='345'><param name='movie' value='http://screenr.com/Content/assets/screenr_1116090935.swf' /><param name='flashvars' value='i=139583' /><param name='allowFullScreen' value='true' /><embed src='http://screenr.com/Content/assets/screenr_1116090935.swf' flashvars='i=139583' allowFullScreen='true' width='560' height='345' pluginspage='http://www.macromedia.com/go/getflashplayer'></embed></object>
-
-### View Partials
-
-In this screencast we work with partials to display a collection of users using the [Jade](http://jade-lang.com) template engine, and learn about view path resolution.
-
-<object classid='clsid:d27cdb6e-ae6d-11cf-96b8-444553540000' codebase='http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,115,0' width='560' height='345'><param name='movie' value='http://screenr.com/Content/assets/screenr_1116090935.swf' /><param name='flashvars' value='i=139591' /><param name='allowFullScreen' value='true' /><embed src='http://screenr.com/Content/assets/screenr_1116090935.swf' flashvars='i=139591' allowFullScreen='true' width='560' height='345' pluginspage='http://www.macromedia.com/go/getflashplayer'></embed></object>
-
-### Route Specific Middleware
-
-In the screencast below we learn about the benefits of route-specific middleware.
-
-<object classid='clsid:d27cdb6e-ae6d-11cf-96b8-444553540000' codebase='http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,115,0' width='560' height='345'><param name='movie' value='http://screenr.com/Content/assets/screenr_1116090935.swf' /><param name='flashvars' value='i=140296' /><param name='allowFullScreen' value='true' /><embed src='http://screenr.com/Content/assets/screenr_1116090935.swf' flashvars='i=140296' allowFullScreen='true' width='560' height='345' pluginspage='http://www.macromedia.com/go/getflashplayer'></embed></object>
-
-### Route Param Preconditions
-
-Learn about route parameter (_/user/:id_) pre-conditions, providing automated validation, and loading of data via the named route param segments.
-
-<object classid='clsid:d27cdb6e-ae6d-11cf-96b8-444553540000' codebase='http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,115,0' width='560' height='345'><param name='movie' value='http://screenr.com/Content/assets/screenr_1116090935.swf' /><param name='flashvars' value='i=140300' /><param name='allowFullScreen' value='true' /><embed src='http://screenr.com/Content/assets/screenr_1116090935.swf' flashvars='i=140300' allowFullScreen='true' width='560' height='345' pluginspage='http://www.macromedia.com/go/getflashplayer'></embed></object>

examples/auth/app.js

@@ -1,61 +1,67 @@
-
 /**
  * Module dependencies.
  */
 
-var express = require('../../lib/express')
-  , crypto = require('crypto');
+var express = require('../..')
+  , hash = require('./pass').hash;
 
-var app = express.createServer(
-    express.bodyParser()
-  , express.cookieParser()
-  , express.session({ secret: 'keyboard cat' })
-);
+var app = module.exports = express();
+
+// config
 
-app.set('views', __dirname + '/views');
 app.set('view engine', 'ejs');
+app.set('views', __dirname + '/views');
 
-// Message helper, ideally we would use req.flash()
-// however this is more light-weight for an example
+// middleware
 
-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>';
-  }
+app.use(express.urlencoded({ extended: false }));
+app.use(express.session({ secret: 'shhhh, very secret' }));
+
+// Session-persisted message middleware
+
+app.use(function(req, res, next){
+  var err = req.session.error
+    , msg = req.session.success;
+  delete req.session.error;
+  delete req.session.success;
+  res.locals.message = '';
+  if (err) res.locals.message = '<p class="msg error">' + err + '</p>';
+  if (msg) res.locals.message = '<p class="msg success">' + msg + '</p>';
+  next();
 });
 
-// Generate a salt for the user to prevent rainbow table attacks
+// dummy database
 
 var users = {
-  tj: {
-    name: 'tj'
-    , salt: 'randomly-generated-salt'
-    , pass: hash('foobar', 'randomly-generated-salt')
-  }
+  tj: { name: 'tj' }
 };
 
-// Used to generate a hash of the plain-text password + salt
+// when you create a user, generate a salt
+// and hash the password ('foobar' is the pass here)
+
+hash('foobar', function(err, salt, hash){
+  if (err) throw err;
+  // store the salt & hash in the "db"
+  users.tj.salt = salt;
+  users.tj.hash = hash;
+});
+
 
-function hash(msg, key) {
-  return crypto.createHmac('sha256', key).update(msg).digest('hex');
-}
 // Authenticate using our plain-object database of doom!
 
 function authenticate(name, pass, fn) {
+  if (!module.parent) console.log('authenticating %s:%s', name, pass);
   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 hash against the pass / salt, if there is a match we
   // found the user
-  if (user.pass == hash(pass, user.salt)) return fn(null, user);
-  // Otherwise password is invalid
-  fn(new Error('invalid password'));
+  hash(pass, user.salt, function(err, hash){
+    if (err) return fn(err);
+    if (hash == user.hash) return fn(null, user);
+    fn(new Error('invalid password'));
+  })
 }
 
 function restrict(req, res, next) {
@@ -67,33 +73,23 @@ function restrict(req, res, next) {
   }
 }
 
-function accessLogger(req, res, next) {
-  console.log('/restricted accessed by %s', req.session.user.name);
-  next();
-}
-
 app.get('/', function(req, res){
-  res.redirect('/login');
+  res.redirect('login');
 });
 
-app.get('/restricted', restrict, accessLogger, function(req, res){
-  res.send('Wahoo! restricted area');
+app.get('/restricted', restrict, function(req, res){
+  res.send('Wahoo! restricted area, click to <a href="/logout">logout</a>');
 });
 
 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');
+    res.redirect('/');
   });
 });
 
 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');
 });
 
@@ -107,16 +103,22 @@ app.post('/login', function(req, res){
         // in the session store to be retrieved,
         // or in this case the entire user object
         req.session.user = user;
+        req.session.success = 'Authenticated as ' + user.name
+          + ' click to <a href="/logout">logout</a>. '
+          + ' You may now access <a href="/restricted">/restricted</a>.';
         res.redirect('back');
       });
     } else {
       req.session.error = 'Authentication failed, please check your '
         + ' username and password.'
         + ' (use "tj" and "foobar")';
-      res.redirect('back');
+      res.redirect('login');
     }
   });
 });
 
-app.listen(3000);
-console.log('Express started on port 3000');
+/* istanbul ignore next */
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}

examples/auth/pass.js

@@ -0,0 +1,48 @@
+
+// check out https://github.com/visionmedia/node-pwd
+
+/**
+ * Module dependencies.
+ */
+
+var crypto = require('crypto');
+
+/**
+ * Bytesize.
+ */
+
+var len = 128;
+
+/**
+ * Iterations. ~300ms
+ */
+
+var iterations = 12000;
+
+/**
+ * Hashes a password with optional `salt`, otherwise
+ * generate a salt for `pass` and invoke `fn(err, salt, hash)`.
+ *
+ * @param {String} password to hash
+ * @param {String} optional salt
+ * @param {Function} callback
+ * @api public
+ */
+
+exports.hash = function (pwd, salt, fn) {
+  if (3 == arguments.length) {
+    crypto.pbkdf2(pwd, salt, iterations, len, function(err, hash){
+      fn(err, hash.toString('base64'));
+    });
+  } else {
+    fn = salt;
+    crypto.randomBytes(len, function(err, salt){
+      if (err) return fn(err);
+      salt = salt.toString('base64');
+      crypto.pbkdf2(pwd, salt, iterations, len, function(err, hash){
+        if (err) return fn(err);
+        fn(null, salt, hash.toString('base64'));
+      });
+    });
+  }
+};

examples/auth/views/foot.ejs

@@ -0,0 +1,2 @@
+  </body>
+</html>

examples/auth/views/head.ejs

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Authentication Example</title>
+    <title><%= title %></title>
     <style>
       body {
         padding: 50px;
@@ -16,6 +16,3 @@
     </style>
   </head>
   <body>
-    <%- body %>
-  </body>
-</html>

examples/auth/views/login.ejs

@@ -1,6 +1,10 @@
+
+<% var title = 'Authentication Example' %>
+<% include head %>
+
 <h1>Login</h1>
 <%- message %>
-Try accessing <a href="/restricted">/restricted</a>.
+Try accessing <a href="/restricted">/restricted</a>, then authenticate with "tj" and "foobar".
 <form method="post" action="/login">
   <p>
     <label>Username:</label>
@@ -13,4 +17,6 @@ Try accessing <a href="/restricted">/restricted</a>.
   <p>
     <input type="submit" value="Login">
   </p>
-</form>
+</form>
+
+<% include foot %>

examples/big-view/index.js

@@ -0,0 +1,27 @@
+
+var express = require('../..')
+  , app = express();
+
+app.set('views', __dirname);
+app.set('view engine', 'jade');
+
+var pets = [];
+
+var n = 1000;
+while (n--) {
+  pets.push({ name: 'Tobi', age: 2, species: 'ferret' });
+  pets.push({ name: 'Loki', age: 1, species: 'ferret' });
+  pets.push({ name: 'Jane', age: 6, species: 'ferret' });
+}
+
+app.use(express.logger('dev'));
+
+app.get('/', function(req, res){
+  res.render('pets', { pets: pets });
+});
+
+/* istanbul ignore next */
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}

examples/big-view/pets.jade

@@ -0,0 +1,12 @@
+style.
+  body {
+    padding: 50px;
+    font: 16px "Helvetica Neue", Helvetica;
+  }
+
+table
+  for pet in pets
+    tr
+      td= pet.name
+      td= pet.age
+      td= pet.species

examples/blog/app.js

@@ -1,58 +0,0 @@
-
-/**
- * Module dependencies.
- */
-
-var express = require('../../lib/express')
-  , messages = require('express-messages');
-
-var app = module.exports = express.createServer();
-
-// Config
-
-app.set('views', __dirname + '/views');
-app.set('view engine', 'jade');
-
-// mount hook
-
-app.mounted(function(other){
-  console.log('ive been mounted!');
-});
-
-// Flash message helper provided by express-messages
-// $ npm install express-messages
-
-app.dynamicHelpers({
-    messages: messages
-  , base: function(){
-    // return the app's mount-point
-    // so that urls can adjust. For example
-    // if you run this example /post/add works
-    // however if you run the mounting example
-    // it adjusts to /blog/post/add
-    return '/' == app.route ? '' : app.route;
-  }
-});
-
-// Middleware
-
-app.configure(function(){
-  app.use(express.logger('\x1b[33m:method\x1b[0m \x1b[32m:url\x1b[0m :response-time'));
-  app.use(express.bodyParser());
-  app.use(express.methodOverride());
-  app.use(express.cookieParser());
-  app.use(express.session({ secret: 'keyboard cat' }));
-  app.use(app.router);
-  app.use(express.static(__dirname + '/public'));
-  app.use(express.errorHandler({ dumpExceptions: true, showStack: true }));
-});
-
-// Routes
-
-require('./routes/site')(app);
-require('./routes/post')(app);
-
-if (!module.parent) {
-  app.listen(3000);
-  console.log('Express started on port 3000');
-}

examples/blog/models/post.js

@@ -1,67 +0,0 @@
-
-// Fake data store
-
-var ids = 0
-  , db = {};
-
-var Post = exports = module.exports = function Post(title, body) {
-  this.id = ++ids;
-  this.title = title;
-  this.body = body;
-  this.createdAt = new Date;
-};
-
-Post.prototype.save = function(fn){
-  db[this.id] = this;
-  fn();
-};
-
-Post.prototype.validate = function(fn){
-  if (!this.title) return fn(new Error('_title_ required'));
-  if (!this.body) return fn(new Error('_body_ required'));
-  if (this.body.length < 10) {
-    return fn(new Error(
-        '_body_ should be at least **10** characters long, was only _' + this.title.length + '_'));
-  }
-  fn();
-};
-
-
-Post.prototype.update = function(data, fn){
-  this.updatedAt = new Date;
-  for (var key in data) {
-    if (undefined != data[key]) {
-      this[key] = data[key];
-    }
-  }
-  this.save(fn);
-};
-
-Post.prototype.destroy = function(fn){
-  exports.destroy(this.id, fn);
-};
-
-exports.count = function(fn){
-  fn(null, Object.keys(db).length);
-};
-
-exports.all = function(fn){
-  var arr = Object.keys(db).reduce(function(arr, id){
-    arr.push(db[id]);
-    return arr;
-  }, []);
-  fn(null, arr);
-};
-
-exports.get = function(id, fn){
-  fn(null, db[id]);
-};
-
-exports.destroy = function(id, fn) {
-  if (db[id]) {
-    delete db[id];
-    fn();
-  } else {
-    fn(new Error('post ' + id + ' does not exist'));
-  }
-};

examples/blog/public/style.css

@@ -1,58 +0,0 @@
-body {
-  font: 13px "Helvetica Neue", Arial, sans-serif;
-  color: #111;
-  padding: 60px 80px;
-}
-h1, h2 {
-  color: #c00;
-}
-a {
-  color: #c00;
-  text-decoration: none;
-}
-a:hover {
-  text-decoration: underline;
-}
-label {
-  padding: 6px 0;
-  display: block;
-  text-transform: lowercase;
-}
-textarea,
-input {
-  outline: none;
-  padding: 5px;
-  background: #f1f1f1;
-  border: 1px solid #aaa;
-}
-textarea:focus,
-input:focus {
-  background: #fff;
-}
-textarea {
-  width: 500px;
-  height: 200px;
-}
-a.edit {
-  margin-left: 10px;
-  font-size: 11px;
-  font-weight: normal;
-}
-.date {
-  font-size: 11px;
-}
-#messages ul {
-  padding: 10px;
-  border: 1px solid;
-}
-#messages ul li {
-  list-style: none;
-}
-#messages ul.info {
-  color: #2EBBE6;
-  background: #F7FBFD;
-}
-#messages ul.error {
-  color: #E4250C;
-  background: #FDEAE7;
-}

examples/blog/routes/post.js

@@ -1,95 +0,0 @@
-
-/**
- * Module dependencies.
- */
-
-var basicAuth = require('../../../lib/express').basicAuth
-  , Post = require('../models/post');
-
-module.exports = function(app){
-  /**
-   * Apply basic auth to all post related routes
-   */
-
-  app.all('/post(/*)?', basicAuth(function(user, pass){
-    return 'admin' == user && 'express' == pass;
-  }));
-
-  /**
-   * Map :post to the database, loading
-   * every time :post is present.
-   */
-
-  app.param('post', function(req, res, next, id){
-    Post.get(id, function(err, post){
-      if (err) return next(err);
-      if (!post) return next(new Error('failed to load post ' + id));
-      req.post = post;
-      next();
-    });
-  });
-
-  /**
-   * Add a post.
-   */
-
-  app.get('/post/add', function(req, res){
-    res.render('post/form', { post: {}});
-  });
-
-  /**
-   * Save a post.
-   */
-
-  app.post('/post', function(req, res){
-    var data = req.body.post
-      , post = new Post(data.title, data.body);
-
-    post.validate(function(err){
-      if (err) {
-        req.flash('error', err.message);
-        return res.redirect('back');
-      }
-
-      post.save(function(err){
-        req.flash('info', 'Successfully created post _%s_', post.title);
-        res.redirect('/post/' + post.id);
-      });  
-    });
-  });
-
-  /**
-   * Display the post.
-   */
-
-  app.get('/post/:post', function(req, res){
-    res.render('post', { post: req.post });
-  });
-
-  /**
-   * Display the post edit form.
-   */
-
-  app.get('/post/:post/edit', function(req, res){
-    res.render('post/form', { post: req.post });
-  });
-
-  /**
-   * Update post. Typically a data layer would handle this stuff.
-   */
-
-  app.put('/post/:post', function(req, res, next){
-    var post = req.post;
-    post.validate(function(err){
-      if (err) {
-        req.flash('error', err.message);
-        return res.redirect('back');
-      }
-      post.update(req.body.post, function(err){
-        if (err) return next(err);
-        req.flash('info', 'Successfully updated post');
-        res.redirect('back');
-      });
-    });
-  });
-};

examples/blog/routes/site.js

@@ -1,19 +0,0 @@
-
-/**
- * Module dependencies.
- */
-
-var Post = require('../models/post');
-
-module.exports = function(app){
-  app.get('/', function(req, res){
-    Post.count(function(err, count){
-      Post.all(function(err, posts){
-        res.render('index', {
-            count: count
-          , posts: posts
-        });
-      });
-    });
-  });
-};

examples/blog/views/index.jade

@@ -1,19 +0,0 @@
-h1 Blog
-
-!= messages()
-
-- if (count)
-  p Display all #{count} post(s)
-  #posts!= partial('post', posts)
-- else
-  p 
-    | It looks like you have no posts!
-  p
-    | Click
-    a(href=base + '/post/add') here 
-    | to create a post. Login
-    | as
-    em "admin" 
-    | and
-    em "express"
-    | .

examples/blog/views/layout.jade

@@ -1,7 +0,0 @@
-!!! 5
-html
-  head
-    title Blog
-    link(rel='stylesheet', href=base + '/style.css')
-  body
-    #container!= body

examples/blog/views/post/form.jade

@@ -1,20 +0,0 @@
-
-- if (post.title)
-  h1 Editing #{post.title}
-- else
-  h1 New Post
-
-!= messages()
-
-form#post(action=base + '/post' + (post.title ? '/' + post.id : ''), method='post')
-  - if (post.title)
-    input(type='hidden', name='_method', value='put')
-  p
-    label(for='post[title]') Title:
-    input(type='text', name='post[title]', value=post.title)
-  p
-    label(for='post[body]') Body:
-    textarea(name='post[body]')= post.body || ''
-  p
-    input(type='submit', value=post.title ? 'Update' : 'Create')
-  

examples/blog/views/post/index.jade

@@ -1,16 +0,0 @@
-.post
-  // title
-  h2
-    = post.title
-    a.edit(href=base + '/post/' + post.id + '/edit') Edit
-  
-  // flash messages
-  != messages()
-  
-  // dates
-  p.date.created Created at #{post.createdAt}
-  - if (post.updatedAt)
-    p.date.updated Updated at #{post.updatedAt}
-  
-  // body
-  pre.body= post.body

examples/content-negotiation/app.js

@@ -1,47 +0,0 @@
-
-/**
- * Module dependencies.
- */
-
-var express = require('../../lib/express');
-
-var app = express.createServer();
-
-var users = [
-    { name: 'tobi' }
-  , { name: 'loki' }
-  , { name: 'jane' }
-];
-
-function provides(type) {
-  return function(req, res, next){
-    if (req.accepts(type)) return next();
-    next('route');
-  }
-}
-
-// curl http://localhost:3000/users -H "Accept: application/json"
-
-app.get('/users', provides('json'), function(req, res){
-  res.send(users);
-});
-
-// curl http://localhost:3000/users -H "Accept: text/html"
-
-app.get('/users', provides('html'), function(req, res){
-  res.send('<ul>' + users.map(function(user){
-    return '<li>' + user.name + '</li>';
-  }).join('\n') + '</ul>');
-});
-
-// curl http://localhost:3000/users -H "Accept: text/plain"
-
-app.get('/users', function(req, res, next){
-  res.contentType('txt');
-  res.send(users.map(function(user){
-    return user.name;
-  }).join(', '));
-});
-
-app.listen(3000);
-console.log('Express server listening on port 3000');

examples/content-negotiation/db.js

@@ -0,0 +1,8 @@
+
+var users = [];
+
+users.push({ name: 'Tobi' });
+users.push({ name: 'Loki' });
+users.push({ name: 'Jane' });
+
+module.exports = users;

examples/content-negotiation/index.js

@@ -0,0 +1,44 @@
+var express = require('../../')
+  , app = module.exports = express()
+  , users = require('./db');
+
+// so either you can deal with different types of formatting 
+// for expected response in index.js
+app.get('/', function(req, res){
+  res.format({
+    html: function(){
+      res.send('<ul>' + users.map(function(user){
+        return '<li>' + user.name + '</li>';
+      }).join('') + '</ul>');
+    },
+
+    text: function(){
+      res.send(users.map(function(user){
+        return ' - ' + user.name + '\n';
+      }).join(''));
+    },
+
+    json: function(){
+      res.json(users);
+    }
+  })
+});
+
+// or you could write a tiny middleware like
+// this to add a layer of abstraction
+// and make things a bit more declarative:
+
+function format(path) {
+  var obj = require(path);
+  return function(req, res){
+    res.format(obj);
+  }
+}
+
+app.get('/users', format('./users'));
+
+/* istanbul ignore next */
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}

examples/content-negotiation/users.js

@@ -0,0 +1,18 @@
+
+var users = require('./db');
+
+exports.html = function(req, res){
+  res.send('<ul>' + users.map(function(user){
+    return '<li>' + user.name + '</li>';
+  }).join('') + '</ul>');
+};
+
+exports.text = function(req, res){
+  res.send(users.map(function(user){
+    return ' - ' + user.name + '\n';
+  }).join(''));
+};
+
+exports.json = function(req, res){
+  res.json(users);
+};

examples/cookie-sessions/index.js

@@ -0,0 +1,33 @@
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('../../');
+
+var app = module.exports = express();
+
+// ignore GET /favicon.ico
+app.use(express.favicon());
+
+// pass a secret to cookieParser() for signed cookies
+app.use(express.cookieParser('manny is cool'));
+
+// add req.session cookie support
+app.use(express.cookieSession());
+
+// do something with the session
+app.use(count);
+
+// custom middleware
+function count(req, res) {
+  req.session.count = req.session.count || 0;
+  var n = req.session.count++;
+  res.send('viewed ' + n + ' times\n');
+}
+
+/* istanbul ignore next */
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}

examples/cookies/app.js

@@ -3,22 +3,28 @@
  * Module dependencies.
  */
 
-var express = require('../../lib/express');
+var express = require('../../')
+  , app = module.exports = 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[36m:method\x1b[0m \x1b[90m:url\x1b[0m :response-time' }),
+// add favicon() before logger() so
+// GET /favicon.ico requests are not
+// logged, because this middleware
+// reponds to /favicon.ico and does not
+// call next()
+app.use(express.favicon());
 
-  // Provides req.cookies
-  express.cookieParser(),
+// custom log format
+if ('test' != process.env.NODE_ENV) app.use(express.logger(':method :url'));
 
-  // Parses x-www-form-urlencoded request bodies (and json)
-  express.bodyParser()
-);
+// parses request cookies, populating
+// req.cookies and req.signedCookies
+// when the secret is passed, used 
+// for signing the cookies.
+app.use(express.cookieParser('my secret here'));
+
+// parses json, x-www-form-urlencoded, and multipart/form-data
+app.use(express.bodyParser());
 
 app.get('/', function(req, res){
   if (req.cookies.remember) {
@@ -41,5 +47,8 @@ app.post('/', function(req, res){
   res.redirect('back');
 });
 
-app.listen(3000);
-console.log('Express started on port 3000');
+/* istanbul ignore next */
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}

examples/cors/index.js

@@ -0,0 +1,46 @@
+/**
+ * Module dependencies.
+ */
+
+var express = require('../..')
+  , app = express()
+  , api = express();
+
+// app middleware
+
+app.use(express.static(__dirname + '/public'));
+
+// api middleware
+
+api.use(express.logger('dev'));
+api.use(express.bodyParser());
+
+/**
+ * CORS support.
+ */
+
+api.all('*', function(req, res, next){
+  if (!req.get('Origin')) return next();
+  // use "*" here to accept any origin
+  res.set('Access-Control-Allow-Origin', 'http://localhost:3000');
+  res.set('Access-Control-Allow-Methods', 'GET, POST');
+  res.set('Access-Control-Allow-Headers', 'X-Requested-With, Content-Type');
+  // res.set('Access-Control-Allow-Max-Age', 3600);
+  if ('OPTIONS' == req.method) return res.send(200);
+  next();
+});
+
+/**
+ * POST a user.
+ */
+
+api.post('/user', function(req, res){
+  console.log(req.body);
+  res.send(201);
+});
+
+app.listen(3000);
+api.listen(3001);
+
+console.log('app listening on 3000');
+console.log('api listening on 3001');

examples/cors/public/index.html

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <body>
+    <script>
+      var req = new XMLHttpRequest;
+      req.open('POST', 'http://localhost:3001/user', false);
+      req.setRequestHeader('Content-Type', 'application/json');
+      req.send('{"name":"tobi","species":"ferret"}');
+      console.log(req.responseText);
+    </script>
+  </body>
+</html>

examples/downloads/app.js

@@ -3,9 +3,8 @@
  * Module dependencies.
  */
 
-var express = require('../../lib/express');
-
-var app = express.createServer();
+var express = require('../../')
+  , app = module.exports = express();
 
 app.get('/', function(req, res){
   res.send('<ul>'
@@ -19,33 +18,28 @@ app.get('/', function(req, res){
 app.get('/files/:file(*)', function(req, res, next){
   var file = req.params.file
     , path = __dirname + '/files/' + file;
-  // either res.download(path) and let
-  // express handle failures, or provide
-  // a callback as shown below
-  res.download(path, function(err){
-    // if an error occurs in this callback
-    // the file most likely does not exist,
-    // and it's safe to respond or next(err)
-    if (err) return next(err);
 
-    // the file has been transferred, do not respond
-    // from here, though you may use this callback
-    // for stats etc.
-    console.log('transferred %s', path);
-  }, function(err){
-    // this second optional callback is used when
-    // an error occurs during transmission
-  });
+  res.download(path);
 });
 
-app.error(function(err, req, res, next){
-  if ('ENOENT' == err.code) {
+// error handling middleware. Because it's
+// below our routes, you will be able to
+// "intercept" errors, otherwise Connect
+// will respond with 500 "Internal Server Error".
+app.use(function(err, req, res, next){
+  // special-case 404s,
+  // remember you could
+  // render a 404 template here
+  if (404 == err.status) {
+    res.statusCode = 404;
     res.send('Cant find that file, sorry!');
   } else {
-    // Not a 404
     next(err);
   }
 });
 
-app.listen(3000);
-console.log('Express started on port 3000');
+/* istanbul ignore next */
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}

examples/ejs/app.js

@@ -1,31 +0,0 @@
-
-/**
- * Module dependencies.
- */
-
-var express = require('../../lib/express');
-
-var app = express.createServer();
-
-// Register ejs as .html
-
-app.register('.html', require('ejs'));
-
-// Optional since express defaults to CWD/views
-
-app.set('views', __dirname + '/views');
-app.set('view engine', 'html');
-
-// Dummy users
-var users = [
-    { name: 'tj', email: 'tj@sencha.com' }
-  , { name: 'ciaran', email: 'ciaranj@gmail.com' }
-  , { name: 'aaron', email: 'aaron.heckmann+github@gmail.com' }
-];
-
-app.get('/', function(req, res){
-  res.render('users', { users: users });
-});
-
-app.listen(3000);
-console.log('Express app started on port 3000');

examples/ejs/index.js

@@ -0,0 +1,51 @@
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('../../');
+
+var app = module.exports = express();
+
+// Register ejs as .html. If we did
+// not call this, we would need to
+// name our views foo.ejs instead
+// of foo.html. The __express method
+// is simply a function that engines
+// use to hook into the Express view
+// system by default, so if we want
+// to change "foo.ejs" to "foo.html"
+// we simply pass _any_ function, in this
+// case `ejs.__express`.
+
+app.engine('.html', require('ejs').__express);
+
+// Optional since express defaults to CWD/views
+
+app.set('views', __dirname + '/views');
+
+// Without this you would need to
+// supply the extension to res.render()
+// ex: res.render('users.html').
+app.set('view engine', 'html');
+
+// Dummy users
+var users = [
+  { name: 'tobi', email: 'tobi@learnboost.com' },
+  { name: 'loki', email: 'loki@learnboost.com' },
+  { name: 'jane', email: 'jane@learnboost.com' }
+];
+
+app.get('/', function(req, res){
+  res.render('users', {
+    users: users,
+    title: "EJS example",
+    header: "Some users"
+  });
+});
+
+/* istanbul ignore next */
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}

examples/ejs/views/footer.html

@@ -0,0 +1,2 @@
+</body>
+</html>

examples/ejs/views/header.html

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title> <%= title %> </title>
+  <style type="text/css">
+    body {
+      padding: 50px;
+      font: 13px Helvetica, Arial, sans-serif;
+    }
+  </style>
+</head>
+<body>

examples/ejs/views/layout.html

@@ -1,6 +0,0 @@
-<html>
-  <body>
-    <h1>Users</h1>
-    <%- body %>
-  </body>
-</html>

examples/ejs/views/users.html

@@ -0,0 +1,10 @@
+<% include header.html %>
+
+<h1>Users</h1>
+<ul id="users">
+  <% users.forEach(function(user){ %>
+    <li><%= user.name %> &lt;<%= user.email %>&gt;</li>
+  <% }) %>
+</ul>
+
+<% include footer.html %>

examples/ejs/views/users/index.html

@@ -1,3 +0,0 @@
-<ul id="users">
-  <%- partial('user', users) %>
-</ul>

examples/ejs/views/users/user.html

@@ -1 +0,0 @@
-<li><%= user.name %> &lt;<%= user.email %>&gt;</li>

examples/error-pages/app.js

@@ -1,83 +0,0 @@
-
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
-/**
- * Module dependencies.
- */
-
-var express = require('../../lib/express');
-
-var app = express.createServer();
-app.set('views', __dirname + '/views');
-app.set('view engine', 'jade');
-
-// 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('":method :url" :status'));
-
-// "app.router" positions our routes 
-// specifically above the middleware
-// assigned below
-
-app.use(app.router);
-
-// Since this is the last non-error-handling
-// middleware use()d, we assume 404, as nothing else
-// responded.
-
-app.use(function(req, res, next){
-  // the status option, or res.statusCode = 404
-  // are equivalent, however with the option we
-  // get the "status" local available as well
-  res.render('404', { status: 404, url: req.url });
-});
-
-// error-handling middleware, take the same form
-// as regular middleware, however they require an
-// arity of 4, aka the signature (err, req, res, next).
-// when connect has an error, it will invoke ONLY error-handling
-// middleware.
-
-// If we were to next() here any remaining non-error-handling
-// middleware would then be executed, or if we next(err) to
-// continue passing the error, only error-handling middleware
-// would remain being executed, however here
-// we simply respond with an error page.
-
-
-app.use(function(err, req, res, next){
-  // we may use properties of the error object
-  // here and next(err) appropriately, or if
-  // we possibly recovered from the error, simply next().
-  res.render('500', {
-      status: err.status || 500
-    , error: err
-  });
-});
-
-// Routes
-
-app.get('/', function(req, res){
-  res.render('index.jade');
-});
-
-app.get('/404', function(req, res, next){
-  next();
-});
-
-app.get('/403', function(req, res, next){
-  var err = new Error('not allowed!');
-  err.status = 403;
-  next(err);
-});
-
-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/index.js

@@ -0,0 +1,111 @@
+/**
+ * Module dependencies.
+ */
+
+var express = require('../../')
+  , app = module.exports = express()
+  , silent = 'test' == process.env.NODE_ENV;
+
+// general config
+app.set('views', __dirname + '/views');
+app.set('view engine', 'jade');
+
+// our custom "verbose errors" setting
+// which we can use in the templates
+// via settings['verbose errors']
+app.enable('verbose errors');
+
+// disable them in production
+// use $ NODE_ENV=production node examples/error-pages
+if ('production' == app.settings.env) app.disable('verbose errors');
+
+app.use(express.favicon());
+
+silent || app.use(express.logger('dev'));
+
+// "app.router" positions our routes 
+// above the middleware defined below,
+// this means that Express will attempt
+// to match & call routes _before_ continuing
+// on, at which point we assume it's a 404 because
+// no route has handled the request.
+
+app.use(app.router);
+
+// Since this is the last non-error-handling
+// middleware use()d, we assume 404, as nothing else
+// responded.
+
+// $ curl http://localhost:3000/notfound
+// $ curl http://localhost:3000/notfound -H "Accept: application/json"
+// $ curl http://localhost:3000/notfound -H "Accept: text/plain"
+
+app.use(function(req, res, next){
+  res.status(404);
+  
+  // respond with html page
+  if (req.accepts('html')) {
+    res.render('404', { url: req.url });
+    return;
+  }
+
+  // respond with json
+  if (req.accepts('json')) {
+    res.send({ error: 'Not found' });
+    return;
+  }
+
+  // default to plain-text. send()
+  res.type('txt').send('Not found');
+});
+
+// error-handling middleware, take the same form
+// as regular middleware, however they require an
+// arity of 4, aka the signature (err, req, res, next).
+// when connect has an error, it will invoke ONLY error-handling
+// middleware.
+
+// If we were to next() here any remaining non-error-handling
+// middleware would then be executed, or if we next(err) to
+// continue passing the error, only error-handling middleware
+// would remain being executed, however here
+// we simply respond with an error page.
+
+app.use(function(err, req, res, next){
+  // we may use properties of the error object
+  // here and next(err) appropriately, or if
+  // we possibly recovered from the error, simply next().
+  res.status(err.status || 500);
+  res.render('500', { error: err });
+});
+
+// Routes
+
+app.get('/', function(req, res){
+  res.render('index.jade');
+});
+
+app.get('/404', function(req, res, next){
+  // trigger a 404 since no other middleware
+  // will match /404 after this one, and we're not
+  // responding here
+  next();
+});
+
+app.get('/403', function(req, res, next){
+  // trigger a 403 error
+  var err = new Error('not allowed!');
+  err.status = 403;
+  next(err);
+});
+
+app.get('/500', function(req, res, next){
+  // trigger a generic (500) error
+  next(new Error('keyboard cat!'));
+});
+
+/* istanbul ignore next */
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}

examples/error-pages/views/404.jade

@@ -1 +1,5 @@
-h2 Cannot find #{url}
+
+extends error
+
+block content
+  h2 Cannot find #{url}

examples/error-pages/views/500.jade

@@ -1,2 +1,13 @@
-h1 Error: #{error.message}
-pre= error.stack
+
+// note that we extend a different
+// layout with jade for 4xx & 5xx
+// responses
+
+extends error
+
+block content
+  h1 Error: #{error.message}
+  if settings['verbose errors']
+    pre= error.stack
+  else
+    p An error ocurred!

examples/error-pages/views/error.jade

@@ -0,0 +1,6 @@
+html
+  head 
+    title Error
+  body
+    h1 An error occurred!
+    block content

examples/error-pages/views/index.jade

@@ -1,11 +1,15 @@
-h2 Pages Example
-ul
-  li 
-    | visit 
-    a(href="/500") 500
-  li
-    | visit
-    a(href="/404") 404
-  li
-    | visit
-    a(href='/403') 403
+
+extends layout
+
+block content
+  h2 Pages Example
+  ul
+    li 
+      | visit 
+      a(href="/500") 500
+    li
+      | visit 
+      a(href="/404") 404
+    li
+      | visit 
+      a(href='/403') 403

examples/error-pages/views/layout.jade

@@ -3,4 +3,4 @@ html
     title Custom Pages Example
   body
     h1 My Site
-    != body
+    block content

examples/error/app.js

@@ -1,26 +0,0 @@
-
-/**
- * Module dependencies.
- */
-
-var express = require('../../lib/express');
-
-var app = express.createServer();
-
-app.get('/', function(req, res){
-  // Caught and passed down to the errorHandler middleware
-  throw new Error('something broke!');
-});
-
-app.get('/next', function(req, res, next){
-  // We can also pass exceptions to next()
-  next(new Error('oh no!'))
-});
-
-// 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('/', express.errorHandler({ dump: true, stack: true }));
-
-app.listen(3000);
-console.log('app listening on port 3000');

examples/error/index.js

@@ -0,0 +1,49 @@
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('../../')
+  , app = module.exports = express()
+  , test = app.get('env') == 'test';
+
+if (!test) app.use(express.logger('dev'));
+app.use(app.router);
+
+// the error handler is strategically
+// placed *below* the app.router; if it
+// were above it would not receive errors
+// from app.get() etc 
+app.use(error);
+
+// error handling middleware have an arity of 4
+// instead of the typical (req, res, next),
+// otherwise they behave exactly like regular
+// middleware, you may have several of them,
+// in different orders etc.
+
+function error(err, req, res, next) {
+  // log it
+  if (!test) console.error(err.stack);
+
+  // respond with 500 "Internal Server Error".
+  res.send(500);
+}
+
+app.get('/', function(req, res){
+  // Caught and passed down to the errorHandler middleware
+  throw new Error('something broke!');
+});
+
+app.get('/next', function(req, res, next){
+  // We can also pass exceptions to next()
+  process.nextTick(function(){
+    next(new Error('oh no!'));
+  });
+});
+
+/* istanbul ignore next */
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}

examples/expose-data-to-client/index.js

@@ -0,0 +1,63 @@
+
+var express = require('../..')
+  , app = express();
+
+app.set('view engine', 'jade');
+app.set('views', __dirname + '/views');
+
+function User(name) {
+  this.private = 'heyyyy';
+  this.secret = 'something';
+  this.name = name;
+  this.id = 123;
+}
+
+// You'll probably want to do
+// something like this so you
+// dont expose "secret" data.
+
+User.prototype.toJSON = function(){
+  return {
+    id: this.id,
+    name: this.name
+  }
+};
+
+app.use(express.logger('dev'));
+
+// earlier on expose an object
+// that we can tack properties on.
+// all res.locals props are exposed
+// to the templates, so "expose" will
+// be present.
+
+app.use(function(req, res, next){
+  res.locals.expose = {};
+  // you could alias this as req or res.expose
+  // to make it shorter and less annoying
+  next();
+});
+
+// pretend we loaded a user
+
+app.use(function(req, res, next){
+  req.user = new User('Tobi');
+  next();
+});
+
+app.get('/', function(req, res){
+  res.redirect('/user');
+});
+
+app.get('/user', function(req, res){
+  // we only want to expose the user
+  // to the client for this route:
+  res.locals.expose.user = req.user;
+  res.render('page');
+});
+
+/* istanbul ignore next */
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}

examples/expose-data-to-client/views/page.jade

@@ -0,0 +1,14 @@
+html
+  head
+    title Express
+    script.
+      // call this whatever you like,
+      // or dump them into individual
+      // props like "var user ="
+      var data = !{JSON.stringify(expose)}
+  body
+    h1 Expose client data
+    p The following was exposed to the client:
+    pre
+      script.
+        document.write(JSON.stringify(data, null, 2))

examples/extending-templates/app.js

@@ -1,66 +0,0 @@
-
-/**
- * Module dependencies.
- */
-
-var express = require('../../lib/express');
-
-var app = express.createServer();
-
-// Register ejs as .html
-
-app.register('.html', require('ejs'));
-
-// Optional since express defaults to CWD/views
-
-app.set('views', __dirname + '/views');
-app.set('view engine', 'html');
-
-// Dummy users
-var users = [
-    { name: 'tj', email: 'tj@sencha.com' }
-  , { name: 'ciaran', email: 'ciaranj@gmail.com' }
-  , { name: 'aaron', email: 'aaron.heckmann+github@gmail.com' }
-];
-
-// dynamic helpers are simply functions that are invoked
-// per request (once), passed both the request and response
-// objects. These can be used for request-specific
-// details within a view, such telling the layout which
-// scripts to include.
-app.dynamicHelpers({
-  // by simply returning an object here
-  // we can set it's properties such as "page.title"
-  // within a view, and it remains specific to that request,
-  // so it would be valid to do:
-  //   page.title = user.name + "'s account"
-  page: function() {
-    return {};
-  },
-
-  // the scripts array here is assigned once,
-  // so by returning a closure, we can use script(path)
-  // in a template, instead of something like
-  // scripts.push(path).
-  script: function(req){
-    req._scripts = [];
-    return function(path){
-      req._scripts.push(path);
-    }
-  },
-
-  // to expose our scripts array for iteration within
-  // our views (typically the layout), we simply return it
-  // here, and since composite types are mutable, it will
-  // contain all of the paths pushed with the helper above.
-  scripts: function(req){
-    return req._scripts;
-  }
-});
-
-app.get('/', function(req, res){
-  res.render('users', { users: users });
-});
-
-app.listen(3000);
-console.log('Express app started on port 3000');

examples/extending-templates/views/layout.html

@@ -1,11 +0,0 @@
-<html>
-  <head>
-    <title><%- page.title %></title>
-    <% for (var i in scripts) { %>
-      <script src="<%= scripts[i] %>"></script>
-    <% } %>
-  </head>
-  <body>
-    <%- body %>
-  </body>
-</html>

examples/extending-templates/views/users/index.html

@@ -1,8 +0,0 @@
-<% page.title = 'Users' %>
-<% script('/javascripts/jquery.js') %>
-<% script('/javascripts/users.js') %>
-
-<h1>Users</h1>
-<ul id="users">
-  <%- partial('user', users) %>
-</ul>

examples/extending-templates/views/users/user.html

@@ -1 +0,0 @@
-<li><%= user.name %> &lt;<%= user.email %>&gt;</li>

examples/flash/app.js

@@ -1,46 +0,0 @@
-
-/**
- * Module dependencies.
- */
-
-var express = require('../../lib/express');
-
-// App with session support
-
-var app = express.createServer(
-    express.cookieParser()
-  , express.session({ secret: 'keyboard cat' })
-);
-
-// View settings
-
-app.set('views', __dirname + '/views');
-app.set('view engine', 'ejs');
-
-app.dynamicHelpers({
-  // express-messages is a dynamicHelper that
-  // renders the flash messages to HTML for you
-  //    $ npm install express-messages
-  messages: require('express-messages')
-});
-
-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

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

examples/flash/views/layout.ejs

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

examples/form/app.js

@@ -1,81 +0,0 @@
-
-// Expose modules in ./support for demo purposes
-require.paths.unshift(__dirname + '/../../support');
-
-/**
- * Module dependencies.
- */
-
-var express = require('../../lib/express');
-
-var app = express.createServer();
-
-// Here we use the bodyDecoder middleware
-// to parse urlencoded request bodies
-// which populates req.body
-app.use(express.bodyParser());
-    
-// 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.cookieParser());
-
-// Required by req.flash() for persistent
-// notifications
-app.use(express.session({ secret: 'keyboard cat' }));
-
-app.get('/', function(req, res){
-  // get ?name=foo
-  var name = req.param('name') || '';
-  
-  // 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(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 + '" />'
-    + '</form>');
-});
-
-app.post('/', function(req, res){
-  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
-  req.flash('info', 'Updated ' + req.body.name);
-  res.redirect('/?name=' + req.body.name);
-});
-
-app.listen(3000);
-console.log('Express app started on port 3000');

examples/format/app.js

@@ -1,68 +0,0 @@
-
-/**
- * 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.statusCode = 200;
-  res.setHeader('Content-Type', 'text/html');
-  res.write('<p>Visit /item/2</p>');
-  res.write('<p>Visit /item/2.json</p>');
-  res.write('<p>Visit /item/2.xml</p>');
-  res.end();
-});
-
-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,113 +0,0 @@
-
-/**
- * Module dependencies.
- */
-
-var express = require('../../lib/express')
-  , http = require('http');
-
-var app = express.createServer();
-
-// Expose our views
-
-app.set('views', __dirname + '/views');
-app.set('view engine', 'jade');
-
-/**
- * Request github json api `path`.
- *
- * @param {String} path
- * @param {Function} fn
- * @api public
- */
-
-function request(path, fn){
-  var client = http.createClient(80, 'github.com')
-    , req = client.request('GET', '/api/v2/json' + path, { Host: 'github.com' });
-  req.on('response', function(res){
-    res.body = '';
-    res.on('data', function(chunk){ res.body += chunk; });
-    res.on('end', function(){
-      try {
-        fn(null, JSON.parse(res.body));
-      } catch (err) {
-        fn(err);
-      }
-    });
-  });
-  req.end();
-}
-
-/**
- * Sort repositories by watchers desc.
- *
- * @param {Array} repos
- * @api public
- */
-
-function sort(repos){
-  return repos.sort(function(a, b){
-    if (a.watchers == b.watchers) return 0;
-    if (a.watchers > b.watchers) return -1;
-    if (a.watchers < b.watchers) return 1;
-  });
-}
-
-/**
- * Tally up total watchers.
- *
- * @param {Array} repos
- * @return {Number}
- * @api public
- */
-
-function totalWatchers(repos) {
-  return repos.reduce(function(sum, repo){
-    return sum + repo.watchers;
-  }, 0);
-}
-
-/**
- * Default to my user name :)
- */
-
-app.get('/', function(req, res){
-  res.redirect('/repos/visionmedia');
-});
-
-/**
- * Display repos.
- */
-
-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', { users: users });
-    }
-  })(names.shift());
-});
-
-// Serve statics from ./public
-app.use(express.static(__dirname + '/public'));
-
-// Listen on port 3000
-app.listen(3000);
-console.log('Express app started on port 3000');

examples/github/public/style.css

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

examples/github/views/index.jade

@@ -1,8 +0,0 @@
-- 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/github/views/layout.jade

@@ -1,7 +0,0 @@
-!!!
-html
-  head
-    title Github Example
-    link(rel="stylesheet", href="/style.css")
-  body
-    #container!= body