Release 3.0.0beta5

Add "make check" support.

.gitignore

@@ -1,3 +1,18 @@
+coverage.html
 .DS_Store
+lib-cov
 *.seed
-*.log
+*.log
+*.csv
+*.dat
+*.out
+*.pid
+*.swp
+*.swo
+benchmarks/graphs
+testing
+node_modules/
+testing
+.coverage_data
+cover_html
+test.js

.gitmodules

@@ -1,15 +0,0 @@
-[submodule "lib/support/oo"]
-	path = lib/support/oo
-	url = git://github.com/visionmedia/js-oo.git
-[submodule "lib/support/ext"]
-	path = lib/support/ext
-	url = git://github.com/visionmedia/ext.js.git
-[submodule "lib/support/sass"]
-	path = lib/support/sass
-	url = git://github.com/visionmedia/sass.js.git
-[submodule "lib/support/haml"]
-	path = lib/support/haml
-	url = git://github.com/creationix/haml-js.git
-[submodule "lib/support/class"]
-	path = lib/support/class
-	url = git://github.com/visionmedia/class.js.git

.npmignore

@@ -0,0 +1,9 @@
+.git*
+docs/
+examples/
+support/
+test/
+testing.js
+.DS_Store
+coverage.html
+lib-cov

.travis.yml

@@ -0,0 +1,3 @@
+language: node_js
+node_js:
+  - 0.6

History.md

@@ -1,4 +1,790 @@
 
+3.0.0beta5 / 2012-07-03 
+==================
+
+  * add "make check" support
+  * add route-map example
+  * add `res.json(obj, status)` support back for BC
+  * add "methods" dep, remove internal methods module
+  * update connect dep
+  * update auth example to utilize cores pbkdf2
+  * updated tests to use "supertest"
+
+3.0.0beta4 / 2012-06-25 
+==================
+
+  * Added `req.auth`
+  * Added `req.range(size)`
+  * Added `res.links(obj)`
+  * Added `res.send(body, status)` support back for backwards compat
+  * Added `.default()` support to `res.format()`
+  * Added 2xx / 304 check to `req.fresh`
+  * Revert "Added + support to the router"
+  * Fixed `res.send()` freshness check, respect res.statusCode
+
+3.0.0beta3 / 2012-06-15 
+==================
+
+  * Added hogan `--hjs` to express(1) [nullfirm]
+  * Added another example to content-negotiation
+  * Added `fresh` dep
+  * Changed: `res.send()` always checks freshness
+  * Fixed: expose connects mime module. Cloases #1165
+
+3.0.0beta2 / 2012-06-06 
+==================
+
+  * Added `+` support to the router
+  * Added `req.host`
+  * Changed `req.param()` to check route first
+  * Update connect dep
+
+3.0.0beta1 / 2012-06-01 
+==================
+
+  * Added `res.format()` callback to override default 406 behaviour
+  * Fixed `res.redirect()` 406. Closes #1154
+
+3.0.0alpha5 / 2012-05-30 
+==================
+
+  * Added `req.ip`
+  * Added `{ signed: true }` option to `res.cookie()`
+  * Removed `res.signedCookie()`
+  * Changed: dont reverse `req.ips`
+  * Fixed "trust proxy" setting check for `req.ips`
+
+3.0.0alpha4 / 2012-05-09 
+==================
+
+  * Added: allow `[]` in jsonp callback. Closes #1128
+  * Added `PORT` env var support in generated template. Closes #1118 [benatkin]
+  * Updated: connect 2.2.2
+
+3.0.0alpha3 / 2012-05-04 
+==================
+
+  * Added public `app.routes`. Closes #887
+  * Added _view-locals_ example
+  * Added _mvc_ example
+  * Added `res.locals.use()`. Closes #1120
+  * Added conditional-GET support to `res.send()`
+  * Added: coerce `res.set()` values to strings
+  * Changed: moved `static()` in generated apps below router
+  * Changed: `res.send()` only set ETag when not previously set
+  * Changed connect 2.2.1 dep
+  * Changed: `make test` now runs unit / acceptance tests
+  * Fixed req/res proto inheritance
+
+3.0.0alpha2 / 2012-04-26 
+==================
+
+  * Added `make benchmark` back
+  * Added `res.send()` support for `String` objects
+  * Added client-side data exposing example
+  * Added `res.header()` and `req.header()` aliases for BC
+  * Added `express.createServer()` for BC
+  * Perf: memoize parsed urls
+  * Perf: connect 2.2.0 dep
+  * Changed: make `expressInit()` middleware self-aware
+  * Fixed: use app.get() for all core settings
+  * Fixed redis session example
+  * Fixed session example. Closes #1105
+  * Fixed generated express dep. Closes #1078
+
+3.0.0alpha1 / 2012-04-15 
+==================
+
+  * Added `app.locals.use(callback)`
+  * Added `app.locals` object
+  * Added `app.locals(obj)`
+  * Added `res.locals` object
+  * Added `res.locals(obj)`
+  * Added `res.format()` for content-negotiation
+  * Added `app.engine()`
+  * Added `res.cookie()` JSON cookie support
+  * Added "trust proxy" setting
+  * Added `req.subdomains`
+  * Added `req.protocol`
+  * Added `req.secure`
+  * Added `req.path`
+  * Added `req.ips`
+  * Added `req.fresh`
+  * Added `req.stale`
+  * Added comma-delmited / array support for `req.accepts()`
+  * Added debug instrumentation
+  * Added `res.set(obj)`
+  * Added `res.set(field, value)`
+  * Added `res.get(field)`
+  * Added `app.get(setting)`. Closes #842
+  * Added `req.acceptsLanguage()`
+  * Added `req.acceptsCharset()`
+  * Added `req.accepted`
+  * Added `req.acceptedLanguages`
+  * Added `req.acceptedCharsets`
+  * Added "json replacer" setting
+  * Added "json spaces" setting
+  * Added X-Forwarded-Proto support to `res.redirect()`. Closes #92
+  * Added `--less` support to express(1)
+  * Added `express.response` prototype
+  * Added `express.request` prototype
+  * Added `express.application` prototype
+  * Added `app.path()`
+  * Added `app.render()`
+  * Added `res.type()` to replace `res.contentType()`
+  * Changed: `res.redirect()` to add relative support
+  * Changed: enable "jsonp callback" by default
+  * Changed: renamed "case sensitive routes" to "case sensitive routing"
+  * Rewrite of all tests with mocha
+  * Removed "root" setting
+  * Removed `res.redirect('home')` support
+  * Removed `req.notify()`
+  * Removed `app.register()`
+  * Removed `app.redirect()`
+  * Removed `app.is()`
+  * Removed `app.helpers()`
+  * Removed `app.dynamicHelpers()`
+  * Fixed `res.sendfile()` with non-GET. Closes #723
+  * Fixed express(1) public dir for windows. Closes #866
+
+2.5.9/ 2012-04-02 
+==================
+
+  * Added support for PURGE request method [pbuyle]
+  * Fixed `express(1)` generated app `app.address()` before `listening` [mmalecki]
+
+2.5.8 / 2012-02-08 
+==================
+
+  * Update mkdirp dep. Closes #991
+
+2.5.7 / 2012-02-06 
+==================
+
+  * Fixed `app.all` duplicate DELETE requests [mscdex]
+
+2.5.6 / 2012-01-13 
+==================
+
+  * Updated hamljs dev dep. Closes #953
+
+2.5.5 / 2012-01-08 
+==================
+
+  * Fixed: set `filename` on cached templates [matthewleon]
+
+2.5.4 / 2012-01-02 
+==================
+
+  * Fixed `express(1)` eol on 0.4.x. Closes #947
+
+2.5.3 / 2011-12-30 
+==================
+
+  * Fixed `req.is()` when a charset is present
+
+2.5.2 / 2011-12-10 
+==================
+
+  * Fixed: express(1) LF -> CRLF for windows
+
+2.5.1 / 2011-11-17 
+==================
+
+  * Changed: updated connect to 1.8.x
+  * Removed sass.js support from express(1)
+
+2.5.0 / 2011-10-24 
+==================
+
+  * Added ./routes dir for generated app by default
+  * Added npm install reminder to express(1) app gen
+  * Added 0.5.x support
+  * Removed `make test-cov` since it wont work with node 0.5.x
+  * Fixed express(1) public dir for windows. Closes #866
+
+2.4.7 / 2011-10-05 
+==================
+
+  * Added mkdirp to express(1). Closes #795
+  * Added simple _json-config_ example
+  * Added  shorthand for the parsed request's pathname via `req.path`
+  * Changed connect dep to 1.7.x to fix npm issue...
+  * Fixed `res.redirect()` __HEAD__ support. [reported by xerox]
+  * Fixed `req.flash()`, only escape args
+  * Fixed absolute path checking on windows. Closes #829 [reported by andrewpmckenzie]
+
+2.4.6 / 2011-08-22 
+==================
+
+  * Fixed multiple param callback regression. Closes #824 [reported by TroyGoode]
+
+2.4.5 / 2011-08-19 
+==================
+
+  * Added support for routes to handle errors. Closes #809
+  * Added `app.routes.all()`. Closes #803
+  * Added "basepath" setting to work in conjunction with reverse proxies etc.   
+  * Refactored `Route` to use a single array of callbacks
+  * Added support for multiple callbacks for `app.param()`. Closes #801
+Closes #805
+  * Changed: removed .call(self) for route callbacks
+  * Dependency: `qs >= 0.3.1`
+  * Fixed `res.redirect()` on windows due to `join()` usage. Closes #808
+
+2.4.4 / 2011-08-05 
+==================
+
+  * Fixed `res.header()` intention of a set, even when `undefined`
+  * Fixed `*`, value no longer required
+  * Fixed `res.send(204)` support. Closes #771
+
+2.4.3 / 2011-07-14 
+==================
+
+  * Added docs for `status` option special-case. Closes #739
+  * Fixed `options.filename`, exposing the view path to template engines
+
+2.4.2. / 2011-07-06 
+==================
+
+  * Revert "removed jsonp stripping" for XSS
+
+2.4.1 / 2011-07-06 
+==================
+
+  * Added `res.json()` JSONP support. Closes #737
+  * Added _extending-templates_ example. Closes #730
+  * Added "strict routing" setting for trailing slashes
+  * Added support for multiple envs in `app.configure()` calls. Closes #735
+  * Changed: `res.send()` using `res.json()`
+  * Changed: when cookie `path === null` don't default it
+  * Changed; default cookie path to "home" setting. Closes #731
+  * Removed _pids/logs_ creation from express(1)
+
+2.4.0 / 2011-06-28 
+==================
+
+  * Added chainable `res.status(code)`
+  * Added `res.json()`, an explicit version of `res.send(obj)`
+  * Added simple web-service example
+
+2.3.12 / 2011-06-22 
+==================
+
+  * \#express is now on freenode! come join!
+  * Added `req.get(field, param)`
+  * Added links to Japanese documentation, thanks @hideyukisaito!
+  * Added; the `express(1)` generated app outputs the env
+  * Added `content-negotiation` example
+  * Dependency: connect >= 1.5.1 < 2.0.0
+  * Fixed view layout bug. Closes #720
+  * Fixed; ignore body on 304. Closes #701
+
+2.3.11 / 2011-06-04 
+==================
+
+  * Added `npm test`
+  * Removed generation of dummy test file from `express(1)`
+  * Fixed; `express(1)` adds express as a dep
+  * Fixed; prune on `prepublish`
+
+2.3.10 / 2011-05-27 
+==================
+
+  * Added `req.route`, exposing the current route
+  * Added _package.json_ generation support to `express(1)`
+  * Fixed call to `app.param()` function for optional params. Closes #682
+
+2.3.9 / 2011-05-25 
+==================
+
+  * Fixed bug-ish with `../' in `res.partial()` calls
+
+2.3.8 / 2011-05-24
+==================
+
+  * Fixed `app.options()`
+
+2.3.7 / 2011-05-23
+==================
+
+  * Added route `Collection`, ex: `app.get('/user/:id').remove();`
+  * Added support for `app.param(fn)` to define param logic
+  * Removed `app.param()` support for callback with return value
+  * Removed module.parent check from express(1) generated app. Closes #670
+  * Refactored router. Closes #639
+
+2.3.6 / 2011-05-20 
+==================
+
+  * Changed; using devDependencies instead of git submodules
+  * Fixed redis session example
+  * Fixed markdown example
+  * Fixed view caching, should not be enabled in development
+
+2.3.5 / 2011-05-20 
+==================
+
+  * Added export `.view` as alias for `.View`
+
+2.3.4 / 2011-05-08 
+==================
+
+  * Added `./examples/say`
+  * Fixed `res.sendfile()` bug preventing the transfer of files with spaces
+
+2.3.3 / 2011-05-03 
+==================
+
+  * Added "case sensitive routes" option.
+  * Changed; split methods supported per rfc [slaskis]
+  * Fixed route-specific middleware when using the same callback function several times
+
+2.3.2 / 2011-04-27 
+==================
+
+  * Fixed view hints
+
+2.3.1 / 2011-04-26 
+==================
+
+  * Added `app.match()` as `app.match.all()`
+  * Added `app.lookup()` as `app.lookup.all()`
+  * Added `app.remove()` for `app.remove.all()`
+  * Added `app.remove.VERB()`
+  * Fixed template caching collision issue. Closes #644
+  * Moved router over from connect and started refactor
+
+2.3.0 / 2011-04-25 
+==================
+
+  * Added options support to `res.clearCookie()`
+  * Added `res.helpers()` as alias of `res.locals()`
+  * Added; json defaults to UTF-8 with `res.send()`. Closes #632. [Daniel   * Dependency `connect >= 1.4.0`
+  * Changed; auto set Content-Type in res.attachement [Aaron Heckmann]
+  * Renamed "cache views" to "view cache". Closes #628
+  * Fixed caching of views when using several apps. Closes #637
+  * Fixed gotcha invoking `app.param()` callbacks once per route middleware. 
+Closes #638
+  * Fixed partial lookup precedence. Closes #631
+Shaw]
+
+2.2.2 / 2011-04-12 
+==================
+
+  * Added second callback support for `res.download()` connection errors
+  * Fixed `filename` option passing to template engine
+
+2.2.1 / 2011-04-04 
+==================
+
+  * Added `layout(path)` helper to change the layout within a view. Closes #610
+  * Fixed `partial()` collection object support.
+    Previously only anything with `.length` would work.
+    When `.length` is present one must still be aware of holes,
+    however now `{ collection: {foo: 'bar'}}` is valid, exposes
+    `keyInCollection` and `keysInCollection`.
+
+  * Performance improved with better view caching
+  * Removed `request` and `response` locals
+  * Changed; errorHandler page title is now `Express` instead of `Connect`
+
+2.2.0 / 2011-03-30 
+==================
+
+  * Added `app.lookup.VERB()`, ex `app.lookup.put('/user/:id')`. Closes #606
+  * Added `app.match.VERB()`, ex `app.match.put('/user/12')`. Closes #606
+  * Added `app.VERB(path)` as alias of `app.lookup.VERB()`.
+  * Dependency `connect >= 1.2.0`
+
+2.1.1 / 2011-03-29 
+==================
+
+  * Added; expose `err.view` object when failing to locate a view
+  * Fixed `res.partial()` call `next(err)` when no callback is given [reported by aheckmann]
+  * Fixed; `res.send(undefined)` responds with 204 [aheckmann]
+
+2.1.0 / 2011-03-24 
+==================
+
+  * Added `<root>/_?<name>` partial lookup support. Closes #447
+  * Added `request`, `response`, and `app` local variables
+  * Added `settings` local variable, containing the app's settings
+  * Added `req.flash()` exception if `req.session` is not available
+  * Added `res.send(bool)` support (json response)
+  * Fixed stylus example for latest version
+  * Fixed; wrap try/catch around `res.render()`
+
+2.0.0 / 2011-03-17 
+==================
+
+  * Fixed up index view path alternative.
+  * Changed; `res.locals()` without object returns the locals
+
+2.0.0rc3 / 2011-03-17 
+==================
+
+  * Added `res.locals(obj)` to compliment `res.local(key, val)`
+  * Added `res.partial()` callback support
+  * Fixed recursive error reporting issue in `res.render()`
+
+2.0.0rc2 / 2011-03-17 
+==================
+
+  * Changed; `partial()` "locals" are now optional
+  * Fixed `SlowBuffer` support. Closes #584 [reported by tyrda01]
+  * Fixed .filename view engine option [reported by drudge]
+  * Fixed blog example
+  * Fixed `{req,res}.app` reference when mounting [Ben Weaver]
+
+2.0.0rc / 2011-03-14 
+==================
+
+  * Fixed; expose `HTTPSServer` constructor
+  * Fixed express(1) default test charset. Closes #579 [reported by secoif]
+  * Fixed; default charset to utf-8 instead of utf8 for lame IE [reported by NickP]
+
+2.0.0beta3 / 2011-03-09 
+==================
+
+  * Added support for `res.contentType()` literal
+    The original `res.contentType('.json')`,
+    `res.contentType('application/json')`, and `res.contentType('json')`
+    will work now.
+  * Added `res.render()` status option support back
+  * Added charset option for `res.render()`
+  * Added `.charset` support (via connect 1.0.4)
+  * Added view resolution hints when in development and a lookup fails
+  * Added layout lookup support relative to the page view.
+    For example while rendering `./views/user/index.jade` if you create
+    `./views/user/layout.jade` it will be used in favour of the root layout.
+  * Fixed `res.redirect()`. RFC states absolute url [reported by unlink]
+  * Fixed; default `res.send()` string charset to utf8
+  * Removed `Partial` constructor (not currently used)
+
+2.0.0beta2 / 2011-03-07 
+==================
+
+  * Added res.render() `.locals` support back to aid in migration process
+  * Fixed flash example
+
+2.0.0beta / 2011-03-03 
+==================
+
+  * Added HTTPS support
+  * Added `res.cookie()` maxAge support
+  * Added `req.header()` _Referrer_ / _Referer_ special-case, either works
+  * Added mount support for `res.redirect()`, now respects the mount-point
+  * Added `union()` util, taking place of `merge(clone())` combo
+  * Added stylus support to express(1) generated app
+  * Added secret to session middleware used in examples and generated app
+  * Added `res.local(name, val)` for progressive view locals
+  * Added default param support to `req.param(name, default)`
+  * Added `app.disabled()` and `app.enabled()`
+  * Added `app.register()` support for omitting leading ".", either works
+  * Added `res.partial()`, using the same interface as `partial()` within a view. Closes #539
+  * Added `app.param()` to map route params to async/sync logic
+  * Added; aliased `app.helpers()` as `app.locals()`. Closes #481
+  * Added extname with no leading "." support to `res.contentType()`
+  * Added `cache views` setting, defaulting to enabled in "production" env
+  * Added index file partial resolution, eg: partial('user') may try _views/user/index.jade_.
+  * Added `req.accepts()` support for extensions
+  * Changed; `res.download()` and `res.sendfile()` now utilize Connect's
+    static file server `connect.static.send()`.
+  * Changed; replaced `connect.utils.mime()` with npm _mime_ module
+  * Changed; allow `req.query` to be pre-defined (via middleware or other parent
+  * Changed view partial resolution, now relative to parent view
+  * Changed view engine signature. no longer `engine.render(str, options, callback)`, now `engine.compile(str, options) -> Function`, the returned function accepts `fn(locals)`.
+  * Fixed `req.param()` bug returning Array.prototype methods. Closes #552
+  * Fixed; using `Stream#pipe()` instead of `sys.pump()` in `res.sendfile()`
+  * Fixed; using _qs_ module instead of _querystring_
+  * Fixed; strip unsafe chars from jsonp callbacks
+  * Removed "stream threshold" setting
+
+1.0.8 / 2011-03-01 
+==================
+
+  * Allow `req.query` to be pre-defined (via middleware or other parent app)
+  * "connect": ">= 0.5.0 < 1.0.0". Closes #547
+  * Removed the long deprecated __EXPRESS_ENV__ support
+
+1.0.7 / 2011-02-07 
+==================
+
+  * Fixed `render()` setting inheritance.
+    Mounted apps would not inherit "view engine"
+
+1.0.6 / 2011-02-07 
+==================
+
+  * Fixed `view engine` setting bug when period is in dirname
+
+1.0.5 / 2011-02-05 
+==================
+
+  * Added secret to generated app `session()` call
+
+1.0.4 / 2011-02-05 
+==================
+
+  * Added `qs` dependency to _package.json_
+  * Fixed namespaced `require()`s for latest connect support
+
+1.0.3 / 2011-01-13 
+==================
+
+  * Remove unsafe characters from JSONP callback names [Ryan Grove]
+
+1.0.2 / 2011-01-10 
+==================
+
+  * Removed nested require, using `connect.router`
+
+1.0.1 / 2010-12-29 
+==================
+
+  * Fixed for middleware stacked via `createServer()`
+    previously the `foo` middleware passed to `createServer(foo)`
+    would not have access to Express methods such as `res.send()`
+    or props like `req.query` etc.
+
+1.0.0 / 2010-11-16 
+==================
+
+  * Added; deduce partial object names from the last segment.
+    For example by default `partial('forum/post', postObject)` will
+    give you the _post_ object, providing a meaningful default.
+  * Added http status code string representation to `res.redirect()` body
+  * Added; `res.redirect()` supporting _text/plain_ and _text/html_ via __Accept__.
+  * Added `req.is()` to aid in content negotiation
+  * Added partial local inheritance [suggested by masylum]. Closes #102
+    providing access to parent template locals.
+  * Added _-s, --session[s]_ flag to express(1) to add session related middleware
+  * Added _--template_ flag to express(1) to specify the
+    template engine to use.
+  * Added _--css_ flag to express(1) to specify the 
+    stylesheet engine to use (or just plain css by default).
+  * Added `app.all()` support [thanks aheckmann]
+  * Added partial direct object support.
+    You may now `partial('user', user)` providing the "user" local,
+    vs previously `partial('user', { object: user })`.
+  * Added _route-separation_ example since many people question ways
+    to do this with CommonJS modules. Also view the _blog_ example for
+    an alternative.
+  * Performance; caching view path derived partial object names
+  * Fixed partial local inheritance precedence. [reported by Nick Poulden] Closes #454
+  * Fixed jsonp support; _text/javascript_ as per mailinglist discussion
+
+1.0.0rc4 / 2010-10-14 
+==================
+
+  * Added _NODE_ENV_ support, _EXPRESS_ENV_ is deprecated and will be removed in 1.0.0
+  * Added route-middleware support (very helpful, see the [docs](http://expressjs.com/guide.html#Route-Middleware))
+  * Added _jsonp callback_ setting to enable/disable jsonp autowrapping [Dav Glass]
+  * Added callback query check on response.send to autowrap JSON objects for simple webservice implementations [Dav Glass]
+  * Added `partial()` support for array-like collections. Closes #434
+  * Added support for swappable querystring parsers
+  * Added session usage docs. Closes #443
+  * Added dynamic helper caching. Closes #439 [suggested by maritz]
+  * Added authentication example
+  * Added basic Range support to `res.sendfile()` (and `res.download()` etc)
+  * Changed; `express(1)` generated app using 2 spaces instead of 4
+  * Default env to "development" again [aheckmann]
+  * Removed _context_ option is no more, use "scope"
+  * Fixed; exposing _./support_ libs to examples so they can run without installs
+  * Fixed mvc example
+
+1.0.0rc3 / 2010-09-20 
+==================
+
+  * Added confirmation for `express(1)` app generation. Closes #391
+  * Added extending of flash formatters via `app.flashFormatters`
+  * Added flash formatter support. Closes #411
+  * Added streaming support to `res.sendfile()` using `sys.pump()` when >= "stream threshold"
+  * Added _stream threshold_ setting for `res.sendfile()`
+  * Added `res.send()` __HEAD__ support
+  * Added `res.clearCookie()`
+  * Added `res.cookie()`
+  * Added `res.render()` headers option
+  * Added `res.redirect()` response bodies
+  * Added `res.render()` status option support. Closes #425 [thanks aheckmann]
+  * Fixed `res.sendfile()` responding with 403 on malicious path
+  * Fixed `res.download()` bug; when an error occurs remove _Content-Disposition_
+  * Fixed; mounted apps settings now inherit from parent app [aheckmann]
+  * Fixed; stripping Content-Length / Content-Type when 204
+  * Fixed `res.send()` 204. Closes #419
+  * Fixed multiple _Set-Cookie_ headers via `res.header()`. Closes #402
+  * Fixed bug messing with error handlers when `listenFD()` is called instead of `listen()`. [thanks guillermo]
+
+
+1.0.0rc2 / 2010-08-17 
+==================
+
+  * Added `app.register()` for template engine mapping. Closes #390
+  * Added `res.render()` callback support as second argument (no options)
+  * Added callback support to `res.download()`
+  * Added callback support for `res.sendfile()`
+  * Added support for middleware access via `express.middlewareName()` vs `connect.middlewareName()`
+  * Added "partials" setting to docs
+  * Added default expresso tests to `express(1)` generated app. Closes #384
+  * Fixed `res.sendfile()` error handling, defer via `next()`
+  * Fixed `res.render()` callback when a layout is used [thanks guillermo]
+  * Fixed; `make install` creating ~/.node_libraries when not present
+  * Fixed issue preventing error handlers from being defined anywhere. Closes #387 
+
+1.0.0rc / 2010-07-28
+==================
+
+  * Added mounted hook. Closes #369
+  * Added connect dependency to _package.json_
+
+  * Removed "reload views" setting and support code
+    development env never caches, production always caches.
+
+  * Removed _param_ in route callbacks, signature is now
+    simply (req, res, next), previously (req, res, params, next).
+    Use _req.params_ for path captures, _req.query_ for GET params.
+
+  * Fixed "home" setting
+  * Fixed middleware/router precedence issue. Closes #366
+  * Fixed; _configure()_ callbacks called immediately. Closes #368
+	
+1.0.0beta2 / 2010-07-23
+==================
+
+  * Added more examples
+  * Added; exporting `Server` constructor
+  * Added `Server#helpers()` for view locals
+  * Added `Server#dynamicHelpers()` for dynamic view locals. Closes #349
+  * Added support for absolute view paths
+  * Added; _home_ setting defaults to `Server#route` for mounted apps. Closes #363
+  * Added Guillermo Rauch to the contributor list
+  * Added support for "as" for non-collection partials. Closes #341
+  * Fixed _install.sh_, ensuring _~/.node_libraries_ exists. Closes #362 [thanks jf]
+  * Fixed `res.render()` exceptions, now passed to `next()` when no callback is given [thanks guillermo]
+  * Fixed instanceof `Array` checks, now `Array.isArray()`
+  * Fixed express(1) expansion of public dirs. Closes #348
+  * Fixed middleware precedence. Closes #345
+  * Fixed view watcher, now async [thanks aheckmann]
+
+1.0.0beta / 2010-07-15
+==================
+
+  * Re-write
+    - much faster
+    - much lighter
+    - Check [ExpressJS.com](http://expressjs.com) for migration guide and updated docs
+
+0.14.0 / 2010-06-15
+==================
+
+  * Utilize relative requires
+  * Added Static bufferSize option [aheckmann]
+  * Fixed caching of view and partial subdirectories [aheckmann]
+  * Fixed mime.type() comments now that ".ext" is not supported
+  * Updated haml submodule
+  * Updated class submodule
+  * Removed bin/express
+
+0.13.0 / 2010-06-01
+==================
+
+  * Added node v0.1.97 compatibility
+  * Added support for deleting cookies via Request#cookie('key', null)
+  * Updated haml submodule
+  * Fixed not-found page, now using using charset utf-8
+  * Fixed show-exceptions page, now using using charset utf-8
+  * Fixed view support due to fs.readFile Buffers
+  * Changed; mime.type() no longer accepts ".type" due to node extname() changes
+
+0.12.0 / 2010-05-22
+==================
+
+  * Added node v0.1.96 compatibility
+  * Added view `helpers` export which act as additional local variables
+  * Updated haml submodule
+  * Changed ETag; removed inode, modified time only
+  * Fixed LF to CRLF for setting multiple cookies
+  * Fixed cookie complation; values are now urlencoded
+  * Fixed cookies parsing; accepts quoted values and url escaped cookies
+
+0.11.0 / 2010-05-06
+==================
+
+  * Added support for layouts using different engines
+    - this.render('page.html.haml', { layout: 'super-cool-layout.html.ejs' })
+    - this.render('page.html.haml', { layout: 'foo' }) // assumes 'foo.html.haml'
+    - this.render('page.html.haml', { layout: false }) // no layout
+  * Updated ext submodule
+  * Updated haml submodule
+  * Fixed EJS partial support by passing along the context. Issue #307
+
+0.10.1 / 2010-05-03
+==================
+
+  * Fixed binary uploads.
+
+0.10.0 / 2010-04-30
+==================
+
+  * Added charset support via Request#charset (automatically assigned to 'UTF-8' when respond()'s
+    encoding is set to 'utf8' or 'utf-8'.
+  * Added "encoding" option to Request#render(). Closes #299
+  * Added "dump exceptions" setting, which is enabled by default.
+  * Added simple ejs template engine support
+  * Added error reponse support for text/plain, application/json. Closes #297
+  * Added callback function param to Request#error()
+  * Added Request#sendHead()
+  * Added Request#stream()
+  * Added support for Request#respond(304, null) for empty response bodies
+  * Added ETag support to Request#sendfile()
+  * Added options to Request#sendfile(), passed to fs.createReadStream()
+  * Added filename arg to Request#download()
+  * Performance enhanced due to pre-reversing plugins so that plugins.reverse() is not called on each request
+  * Performance enhanced by preventing several calls to toLowerCase() in Router#match()
+  * Changed; Request#sendfile() now streams
+  * Changed; Renamed Request#halt() to Request#respond(). Closes #289
+  * Changed; Using sys.inspect() instead of JSON.encode() for error output
+  * Changed; run() returns the http.Server instance. Closes #298
+  * Changed; Defaulting Server#host to null (INADDR_ANY)
+  * Changed; Logger "common" format scale of 0.4f
+  * Removed Logger "request" format
+  * Fixed; Catching ENOENT in view caching, preventing error when "views/partials" is not found
+  * Fixed several issues with http client
+  * Fixed Logger Content-Length output
+  * Fixed bug preventing Opera from retaining the generated session id. Closes #292
+
+0.9.0 / 2010-04-14
+==================
+
+  * Added DSL level error() route support
+  * Added DSL level notFound() route support
+  * Added Request#error()
+  * Added Request#notFound()
+  * Added Request#render() callback function. Closes #258
+  * Added "max upload size" setting
+  * Added "magic" variables to collection partials (\_\_index\_\_, \_\_length\_\_, \_\_isFirst\_\_, \_\_isLast\_\_). Closes #254
+  * Added [haml.js](http://github.com/visionmedia/haml.js) submodule; removed haml-js
+  * Added callback function support to Request#halt() as 3rd/4th arg
+  * Added preprocessing of route param wildcards using param(). Closes #251
+  * Added view partial support (with collections etc)
+  * Fixed bug preventing falsey params (such as ?page=0). Closes #286
+  * Fixed setting of multiple cookies. Closes #199
+  * Changed; view naming convention is now NAME.TYPE.ENGINE (for example page.html.haml)
+  * Changed; session cookie is now httpOnly
+  * Changed; Request is no longer global
+  * Changed; Event is no longer global
+  * Changed; "sys" module is no longer global
+  * Changed; moved Request#download to Static plugin where it belongs
+  * Changed; Request instance created before body parsing. Closes #262
+  * Changed; Pre-caching views in memory when "cache view contents" is enabled. Closes #253
+  * Changed; Pre-caching view partials in memory when "cache view partials" is enabled
+  * Updated support to node --version 0.1.90
+  * Updated dependencies
+  * Removed set("session cookie") in favour of use(Session, { cookie: { ... }})
+  * Removed utils.mixin(); use Object#mergeDeep()
+  
 0.8.0 / 2010-03-19
 ==================
 

LICENSE

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

Makefile

@@ -1,27 +1,40 @@
 
-NODE = node
-COFFEE = coffee
+REPORTER = dot
 
-all: test
-	
-install: bin/express
-	install bin/express /usr/local/bin/express
+docs: docs/express.md
 
-test:
-	@$(NODE) spec/node.js all
-	
-app: app-chat
-	
-app-chat:
-	@$(NODE) examples/chat/app.js
-	
-app-upload:
-	@$(NODE) examples/upload/app.js
-	
-app-coffee-upload: compile-coffee
-	@$(NODE) examples/coffee-upload/app.js
-	
-compile-coffee:
-	@$(COFFEE) examples/coffee-upload/app.coffee
-	
-.PHONY: install test app
+docs/express.md: docs/application.md docs/request.md docs/response.md
+	cat $^ > $@
+
+docs/%.md: lib/%.js
+	@mkdir -p docs
+	dox --raw < $< | ./support/docs > $@
+
+check: test
+
+test: test-unit test-acceptance
+
+test-unit:
+	@NODE_ENV=test ./node_modules/.bin/mocha \
+		--reporter $(REPORTER) \
+		--bail
+
+test-acceptance:
+	@NODE_ENV=test ./node_modules/.bin/mocha \
+		--reporter $(REPORTER) \
+		--bail \
+		test/acceptance/*.js
+
+test-cov: lib-cov
+	@EXPRESS_COV=1 $(MAKE) test REPORTER=html-cov > coverage.html
+
+lib-cov:
+	@jscoverage lib lib-cov
+
+docclean:
+	rm -fr docs
+
+benchmark:
+	@./support/bench
+
+.PHONY: docs docclean test test-unit test-acceptance benchmark

Readme.md

@@ -1,110 +1,167 @@
 
-# Express
-      
-  Insanely fast (and small) server-side JavaScript web development framework
-  built on **node.js** and the **V8 JavaScript engine**.
+![express logo](http://f.cl.ly/items/0V2S1n0K1i3y1c122g04/Screen%20Shot%202012-04-11%20at%209.59.42%20AM.png)
 
-  * Visit the [Wiki](http://wiki.github.com/visionmedia/express) for documentation
-  * Visit the [Google Group](http://groups.google.com/group/express-js) for discussion
+  Fast, unopinionated, minimalist web framework for [node](http://nodejs.org). [![Build Status](https://secure.travis-ci.org/visionmedia/express.png)](http://travis-ci.org/visionmedia/express)
 
-## Features (so far)
+```js
+var express = require('express');
+var app = express();
+
+app.get('/', function(req, res){
+  res.send('Hello World');
+});
+
+app.listen(3000);
+```
 
-  * Sexy DSL with robust sinatra-like routing
-  * High performance
-  * Session support
-  * Cache API
-  * RESTful HTTP client
-  * Mime helpers
-  * Redirection helpers
-  * Multipart file upload support
-  * Test helpers (mock requests etc)
-  * Environment based configuration
-  * Light-weight JavaScript class implementation via [class.js](http://github.com/visionmedia/class.js/)
-  * Persistent flash messages
-  * Route passing
-  * View support (ejs, haml, sass, etc)
-  * Full test coverage
-  * Logger plugin with several formats
-  * Extremely readable specs
-  
 ## Installation
 
-  Install the [Kiwi package manager for nodejs](http://github.com/visionmedia/kiwi)
-  and run:
+    $ npm install -g express
+
+ To install the 3.0 alpha:
+ 
+    $ npm install -g express@3.0
+
+## Quick Start
+
+ The quickest way to get started with express is to utilize the executable `express(1)` to generate an application as shown below:
+
+ Create the app:
+
+    $ npm install -g express
+    $ express /tmp/foo && cd /tmp/foo
+
+ Install dependencies:
+
+    $ npm install
+
+ Start the server:
+
+    $ node app
+
+## Features
+
+  * Built on [Connect](http://github.com/senchalabs/connect)
+  * Robust routing
+  * HTTP helpers (redirection, caching, etc)
+  * View system supporting 14+ template engines
+  * Content negotiation
+  * Focus on high performance
+  * Environment based configuration
+  * Executable for generating applications quickly
+  * High test coverage
+
+## Philosophy
+
+  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.
   
-      $ kiwi -v install express
-      
-or
+  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.
 
-  Install via git clone:
-  
-      $ git clone git://github.com/visionmedia/express.git && cd express && git submodule update --init
-
-## Performance
-
-  Extensive performance enhancements have not yet been made,
-  since we are focusing on the framework it-self at the moment. 
-  
-  However if you are interested view the premature [benchmarks for Express framework](http://vision-media.ca/resources/nodejs/express-nodejs-web-development-framework-performance).
-
-## Examples
-
-Below is a tiny Express application. View the [Wiki](http://wiki.github.com/visionmedia/express/) for detailed information.
-
-    require.paths.unshift('express/lib')
-    require('express')
-    
-    get('/user', function(){
-      this.redirect('/user/' + this.currentUser.id)
-    })
-    
-    get('/user/:id', function(id){
-      this.render('user.haml.html', {
-        locals: {
-          user: this.currentUser,
-          usersOnline: Session.store.length()
-        }
-      })
-    })
-
-    run()
-    
-## Running Tests
-
-Express uses the [JSpec](http://jspec.info) BDD JavaScript testing
-framework to write and run elegant spec suites. JSpec is frozen 
-to spec/lib and **does not** require separate installation.
-
-    $ make test
-    
-Run individual suites:
-
-    $ node spec/node.js core
-    $ node spec/node.js mime
-    $ node spec/node.js routing
-    ...
-    
-Express is currently being developed with node --version:
-    v0.1.32
-    
 ## More Information
 
-  * [JavaScript Extensions & Utilities](http://github.com/visionmedia/ext.js)
-  * [JavaScript Sass](http://github.com/visionmedia/sass.js)
-  * Featured in [Advanced JavaScript e-book](http://www.dev-mag.com/2010/02/18/advanced-javascript/) for only $4
-    
+  * Join #express on freenode
+  * [Google Group](http://groups.google.com/group/express-js) for discussion
+  * Follow [tjholowaychuk](http://twitter.com/tjholowaychuk) on twitter for updates
+  * Visit the [Wiki](http://github.com/visionmedia/express/wiki)
+  * [日本語ドキュメンテーション](http://hideyukisaito.com/doc/expressjs/) by [hideyukisaito](https://github.com/hideyukisaito)
+  * [Русскоязычная документация](http://express-js.ru/)
+
+## Viewing Examples
+
+First install the dev dependencies to install all the example / test suite deps:
+
+    $ cd express
+    $ npm install
+
+then run whichever tests you want:
+
+    $ node examples/content-negotiation
+
+## Running Tests
+
+To run the test suite first invoke the following command within the repo, installing the development dependencies:
+
+    $ npm install
+
+then run the tests:
+
+    $ make test
+
 ## Contributors
 
-  * TJ Holowaychuk (visionmedia) <tj@vision-media.ca>
-  * Aaron Heckmann (aheckmann) <aaron.heckmann+github@gmail.com>
-  * Ciaran Jessup (ciaranj) <ciaranj@gmail.com>
-  * Gareth Jones (csausdev) <gareth.jones@sensis.com.au>
-    
+```
+project: express
+commits: 3559
+active : 468 days
+files  : 237
+authors: 
+ 1891	Tj Holowaychuk          53.1%
+ 1285	visionmedia             36.1%
+  182	TJ Holowaychuk          5.1%
+   54	Aaron Heckmann          1.5%
+   34	csausdev                1.0%
+   26	ciaranj                 0.7%
+   21	Robert Sköld          0.6%
+    6	Guillermo Rauch         0.2%
+    3	Dav Glass               0.1%
+    3	Nick Poulden            0.1%
+    2	Randy Merrill           0.1%
+    2	Benny Wong              0.1%
+    2	Hunter Loftis           0.1%
+    2	Jake Gordon             0.1%
+    2	Brian McKinney          0.1%
+    2	Roman Shtylman          0.1%
+    2	Ben Weaver              0.1%
+    2	Dave Hoover             0.1%
+    2	Eivind Fjeldstad        0.1%
+    2	Daniel Shaw             0.1%
+    1	Matt Colyer             0.0%
+    1	Pau Ramon               0.0%
+    1	Pero Pejovic            0.0%
+    1	Peter Rekdal Sunde      0.0%
+    1	Raynos                  0.0%
+    1	Teng Siong Ong          0.0%
+    1	Viktor Kelemen          0.0%
+    1	ctide                   0.0%
+    1	8bitDesigner            0.0%
+    1	isaacs                  0.0%
+    1	mgutz                   0.0%
+    1	pikeas                  0.0%
+    1	shuwatto                0.0%
+    1	tstrimple               0.0%
+    1	ewoudj                  0.0%
+    1	Adam Sanderson          0.0%
+    1	Andrii Kostenko         0.0%
+    1	Andy Hiew               0.0%
+    1	Arpad Borsos            0.0%
+    1	Ashwin Purohit          0.0%
+    1	Benjen                  0.0%
+    1	Darren Torpey           0.0%
+    1	Greg Ritter             0.0%
+    1	Gregory Ritter          0.0%
+    1	James Herdman           0.0%
+    1	Jim Snodgrass           0.0%
+    1	Joe McCann              0.0%
+    1	Jonathan Dumaine        0.0%
+    1	Jonathan Palardy        0.0%
+    1	Jonathan Zacsh          0.0%
+    1	Justin Lilly            0.0%
+    1	Ken Sato                0.0%
+    1	Maciej Małecki         0.0%
+    1	Masahiro Hayashi        0.0%
+```
+
 ## License 
 
 (The MIT License)
 
-Copyright (c) 2009 TJ Holowaychuk <tj@vision-media.ca>
+Copyright (c) 2009-2012 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

bin/express

@@ -1,63 +1,403 @@
 #!/usr/bin/env node
 
-var arg,
-    dir = '.',
-    fs = require('fs'),
-    sys = require('sys'),
-    args = process.argv.slice(2)
+/**
+ * Module dependencies.
+ */
 
-// Parse arguments
+var exec = require('child_process').exec
+  , program = require('commander')
+  , mkdirp = require('mkdirp')
+  , pkg = require('../package.json')
+  , version = pkg.version
+  , os = require('os')
+  , fs = require('fs');
 
-while (arg = args.shift())
-  switch (arg) {
-    case '-h':
-    case '--help':
-     sys.print('Usage: express [options] [dir]\n')
-     break
-    default:
-      dir = arg
-  }
-  
-// Helpers
+// CLI
 
-function confirm(msg, fn) {
-  sys.print(msg)
-  process.stdio.open()
-  process.stdio.addListener('data', function(chunk){
-    switch (chunk.trim().toLowerCase()) {
-      case 'yes':
-      case 'y':
-        return process.stdio.close(),
-               fn(true)
-      case 'no':
-      case 'n':
-        return process.stdio.close(),
-               fn(false)
-      default:
-        sys.print(msg)
+program
+  .version(version)
+  .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 = 'win32' == os.platform() ? '\r\n' : '\n'
+
+// Template engine
+
+program.template = 'jade';
+if (program.ejs) program.template = 'ejs';
+if (program.jshtml) program.template = 'jshtml';
+if (program.hogan) program.template = 'hjs';
+
+/**
+ * Routes index template.
+ */
+
+var index = [
+    ''
+  , '/*'
+  , ' * GET home page.'
+  , ' */'
+  , ''
+  , 'exports.index = function(req, res){'
+  , '  res.render(\'index\', { title: \'Express\' });'
+  , '};'
+].join(eol);
+
+/**
+ * Jade layout template.
+ */
+
+var jadeLayout = [
+    'doctype 5'
+  , 'html'
+  , '  head'
+  , '    title= title'
+  , '    link(rel=\'stylesheet\', href=\'/stylesheets/style.css\')'
+  , '  body'
+  , '    block content'
+].join(eol);
+
+/**
+ * Jade index template.
+ */
+
+var jadeIndex = [
+    'extends layout'
+  , ''
+  , 'block content'
+  , '  h1= title'
+  , '  p Welcome to #{title}'
+].join(eol);
+
+/**
+ * EJS index template.
+ */
+
+var ejsIndex = [
+    '<!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);
+
+/**
+ * JSHTML layout template.
+ */
+
+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.
+ */
+
+var css = [
+    'body {'
+  , '  padding: 50px;'
+  , '  font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;'
+  , '}'
+  , ''
+  , 'a {'
+  , '  color: #00B7FF;'
+  , '}'
+].join(eol);
+
+/**
+ * Default less template.
+ */
+
+var less = [
+    'body {'
+  , '  padding: 50px;'
+  , '  font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;'
+  , '}'
+  , ''
+  , 'a {'
+  , '  color: #00B7FF;'
+  , '}'
+].join(eol);
+
+/**
+ * Default stylus template.
+ */
+
+var stylus = [
+    'body'
+  , '  padding: 50px'
+  , '  font: 14px "Lucida Grande", Helvetica, Arial, sans-serif'
+  , 'a'
+  , '  color: #00B7FF'
+].join(eol);
+
+/**
+ * App template.
+ */
+
+var app = [
+    ''
+  , '/**'
+  , ' * Module dependencies.'
+  , ' */'
+  , ''
+  , 'var express = require(\'express\')'
+  , '  , routes = require(\'./routes\')'
+  , '  , http = require(\'http\');'
+  , ''
+  , 'var app = express();'
+  , ''
+  , 'app.configure(function(){'
+  , '  app.set(\'port\', process.env.PORT || 3000);'
+  , '  app.set(\'views\', __dirname + \'/views\');'
+  , '  app.set(\'view engine\', \':TEMPLATE\');'
+  , '  app.use(express.favicon());'
+  , '  app.use(express.logger(\'dev\'));'
+  , '  app.use(express.bodyParser());'
+  , '  app.use(express.methodOverride());{sess}'
+  , '  app.use(app.router);{css}'
+  , '  app.use(express.static(__dirname + \'/public\'));'
+  , '});'
+  , ''
+  , 'app.configure(\'development\', function(){'
+  , '  app.use(express.errorHandler());'
+  , '});'
+  , ''
+  , 'app.get(\'/\', routes.index);'
+  , ''
+  , 'http.createServer(app).listen(app.get(\'port\'), function(){'
+  , '  console.log("Express server listening on port " + app.get(\'port\'));'
+  , '});'
+  , ''
+].join(eol);
+
+// Generate application
+
+(function createApplication(path) {
+  emptyDirectory(path, function(empty){
+    if (empty || program.force) {
+      createApplicationAt(path);
+    } else {
+      program.confirm('destination is not empty, continue? ', function(ok){
+        if (ok) {
+          process.stdin.destroy();
+          createApplicationAt(path);
+        } else {
+          abort('aborting');
+        }
+      });
     }
-  })
+  });
+})(path);
+
+/**
+ * Create application at the given directory `path`.
+ *
+ * @param {String} path
+ */
+
+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 (program.css) {
+        case 'less':
+          write(path + '/public/stylesheets/style.less', less);
+          break;
+        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);
+    });
+
+    mkdir(path + '/views', function(){
+      switch (program.template) {
+        case 'ejs':
+          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 (program.css) {
+      case 'less':
+        app = app.replace('{css}', eol + '  app.use(require(\'less-middleware\')({ src: __dirname + \'/public\' }));');
+        break;
+      case 'stylus':
+        app = app.replace('{css}', eol + '  app.use(require(\'stylus\').middleware(__dirname + \'/public\'));');
+        break;
+      default:
+        app = app.replace('{css}', '');
+    }
+
+    // Session support
+    app = app.replace('{sess}', program.sessions
+      ? eol + '  app.use(express.cookieParser(\'your secret here\'));' + eol + '  app.use(express.session());'
+      : '');
+
+    // Template support
+    app = app.replace(':TEMPLATE', program.template);
+
+    // package.json
+    var pkg = {
+        name: 'application-name'
+      , version: '0.0.1'
+      , private: true
+      , scripts: { start: 'node app' }
+      , dependencies: {
+        express: version
+      }
+    }
+
+    if (program.template) pkg.dependencies[program.template] = '*';
+
+    // CSS Engine support
+    switch (program.css) {
+      case 'less':
+        pkg.dependencies['less-middleware'] = '*';
+        break;
+      default:
+        if (program.css) {
+          pkg.dependencies[program.css] = '*';
+        }
+    }
+
+    write(path + '/package.json', JSON.stringify(pkg, null, 2));
+    write(path + '/app.js', app);
+  });
 }
 
-function createTemplateIn(dir, mode) {
-  fs.writeFile(dir + '/app.js', '// your app here')
-  fs.mkdir(dir + '/views', mode)
-  fs.mkdir(dir + '/public', mode, function(err){
-    if (err) throw err
-    fs.mkdir(dir + '/public/javascripts', mode)
-    fs.mkdir(dir + '/public/stylesheets', mode)
-    fs.mkdir(dir + '/public/images', mode)
-  })
+/**
+ * Check if the given directory `path` is empty.
+ *
+ * @param {String} path
+ * @param {Function} fn
+ */
+
+function emptyDirectory(path, fn) {
+  fs.readdir(path, function(err, files){
+    if (err && 'ENOENT' != err.code) throw err;
+    fn(!files || !files.length);
+  });
 }
 
-// Setup template
+/**
+ * echo str > path.
+ *
+ * @param {String} path
+ * @param {String} str
+ */
 
-fs.readdir(dir, function(err, files){
-  if (err) throw err
-  if (files.length)
-    confirm(dir + ' is not empty, continue? ', function(ok){
-      if (ok) createTemplateIn(dir, 0666)
-    })
-  else
-    createTemplateIn(dir, 0666)
-})
+function write(path, str) {
+  fs.writeFile(path, str);
+  console.log('   \x1b[36mcreate\x1b[0m : ' + path);
+}
+
+/**
+ * Mkdir -p.
+ *
+ * @param {String} path
+ * @param {Function} fn
+ */
+
+function mkdir(path, fn) {
+  mkdirp(path, 0755, function(err){
+    if (err) throw err;
+    console.log('   \033[36mcreate\033[0m : ' + path);
+    fn && fn();
+  });
+}
+
+/**
+ * Exit with the given `str`.
+ *
+ * @param {String} str
+ */
+
+function abort(str) {
+  console.error(str);
+  process.exit(1);
+}

client.js

@@ -0,0 +1,25 @@
+
+var http = require('http');
+
+var times = 50;
+
+while (times--) {
+  var req = http.request({
+      port: 3000
+    , method: 'POST'
+    , headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+  });
+
+  req.on('response', function(res){
+    console.log(res.statusCode);
+  });
+
+  var n = 500000;
+  while (n--) {
+    req.write('foo=bar&bar=baz&');
+  }
+
+  req.write('foo=bar&bar=baz');
+
+  req.end();
+}

docs/application.md

@@ -0,0 +1,181 @@
+
+# app
+
+  Application prototype.
+
+# app.use()
+
+  Proxy `connect#use()` to apply settings to
+  mounted applications.
+
+# app.engine()
+
+  Register the given template engine callback `fn`
+  as `ext`.
+  
+  By default will `require()` the engine based on the
+  file extension. For example if you try to render
+  a "foo.jade" file Express will invoke the following internally:
+  
+      app.engine('jade', require('jade').__express);
+  
+  For engines that do not provide `.__express` out of the box,
+  or if you wish to "map" a different extension to the template engine
+  you may use this method. For example mapping the EJS template engine to
+  ".html" files
+  
+      app.engine('html', require('ejs').renderFile);
+  
+  In this case EJS provides a `.renderFile()` method with
+  the same signature that Express expects: `(path, options, callback)`,
+  though note that it aliases this method as `ejs.__express` internally
+  so if you're using ".ejs" extensions you dont need to do anything.
+  
+  Some template engines do not follow this convention, the
+  [Consolidate.js](https://github.com/visionmedia/consolidate.js)
+  library was created to map all of node's popular template
+  engines to follow this convention, thus allowing them to
+  work seemlessly within Express.
+
+# app.param()
+
+  Map the given param placeholder `name`(s) to the given callback(s).
+  
+  Parameter mapping is used to provide pre-conditions to routes
+  which use normalized placeholders. For example a _:user_id_ parameter
+  could automatically load a user's information from the database without
+  any additional code,
+  
+  The callback uses the samesignature as middleware, the only differencing
+  being that the value of the placeholder is passed, in this case the _id_
+  of the user. Once the `next()` function is invoked, just like middleware
+  it will continue on to execute the route, or subsequent parameter functions.
+  
+       app.param('user_id', function(req, res, next, id){
+         User.find(id, function(err, user){
+           if (err) {
+             next(err);
+           } else if (user) {
+             req.user = user;
+             next();
+           } else {
+             next(new Error('failed to load user'));
+           }
+         });
+       });
+
+# app.set()
+
+  Assign `setting` to `val`, or return `setting`'s value.
+  
+     app.set('foo', 'bar');
+     app.get('foo');
+     // => "bar"
+  
+  Mounted servers inherit their parent server's settings.
+
+# app.enabled()
+
+  Check if `setting` is enabled (truthy).
+  
+     app.enabled('foo')
+     // => false
+  
+     app.enable('foo')
+     app.enabled('foo')
+     // => true
+
+# app.disabled()
+
+  Check if `setting` is disabled.
+  
+     app.disabled('foo')
+     // => true
+  
+     app.enable('foo')
+     app.disabled('foo')
+     // => false
+
+# app.enable()
+
+  Enable `setting`.
+
+# app.disable()
+
+  Disable `setting`.
+
+# app.configure()
+
+  Configure callback for zero or more envs,
+  when no `env` is specified that callback will
+  be invoked for all environments. Any combination
+  can be used multiple times, in any order desired.
+  
+  ## Examples
+  
+     app.configure(function(){
+       // executed for all envs
+     });
+  
+     app.configure('stage', function(){
+       // executed staging env
+     });
+  
+     app.configure('stage', 'production', function(){
+       // executed for stage and production
+     });
+  
+  ## Note
+  
+   These callbacks are invoked immediately, and
+   are effectively sugar for the following.
+  
+      var env = process.env.NODE_ENV || 'development';
+  
+       switch (env) {
+         case 'development':
+           ...
+           break;
+         case 'stage':
+           ...
+           break;
+         case 'production':
+           ...
+           break;
+       }
+
+# app.all()
+
+  Special-cased "all" method, applying the given route `path`,
+  middleware, and callback to _every_ HTTP method.
+
+# app.render()
+
+  Render the given view `name` name with `options`
+  and a callback accepting an error and the
+  rendered template string.
+  
+  ## Example
+  
+     app.render('email', { name: 'Tobi' }, function(err, html){
+       // ...
+     })
+
+# app.listen()
+
+  Listen for connections.
+  
+  A node `http.Server` is returned, with this
+  application (which is a `Function`) as its
+  callback. If you wish to create both an HTTP
+  and HTTPS server you may do so with the "http"
+  and "https" modules as shown here.
+  
+     var http = require('http')
+       , https = require('https')
+       , express = require('express')
+       , app = express();
+  
+     http.createServer(app).listen(80);
+     http.createServer({ ... }, app).listen(443);
+

docs/express.md

@@ -0,0 +1,506 @@
+
+# app
+
+  Application prototype.
+
+# app.use()
+
+  Proxy `connect#use()` to apply settings to
+  mounted applications.
+
+# app.engine()
+
+  Register the given template engine callback `fn`
+  as `ext`.
+  
+  By default will `require()` the engine based on the
+  file extension. For example if you try to render
+  a "foo.jade" file Express will invoke the following internally:
+  
+      app.engine('jade', require('jade').__express);
+  
+  For engines that do not provide `.__express` out of the box,
+  or if you wish to "map" a different extension to the template engine
+  you may use this method. For example mapping the EJS template engine to
+  ".html" files
+  
+      app.engine('html', require('ejs').renderFile);
+  
+  In this case EJS provides a `.renderFile()` method with
+  the same signature that Express expects: `(path, options, callback)`,
+  though note that it aliases this method as `ejs.__express` internally
+  so if you're using ".ejs" extensions you dont need to do anything.
+  
+  Some template engines do not follow this convention, the
+  [Consolidate.js](https://github.com/visionmedia/consolidate.js)
+  library was created to map all of node's popular template
+  engines to follow this convention, thus allowing them to
+  work seemlessly within Express.
+
+# app.param()
+
+  Map the given param placeholder `name`(s) to the given callback(s).
+  
+  Parameter mapping is used to provide pre-conditions to routes
+  which use normalized placeholders. For example a _:user_id_ parameter
+  could automatically load a user's information from the database without
+  any additional code,
+  
+  The callback uses the samesignature as middleware, the only differencing
+  being that the value of the placeholder is passed, in this case the _id_
+  of the user. Once the `next()` function is invoked, just like middleware
+  it will continue on to execute the route, or subsequent parameter functions.
+  
+       app.param('user_id', function(req, res, next, id){
+         User.find(id, function(err, user){
+           if (err) {
+             next(err);
+           } else if (user) {
+             req.user = user;
+             next();
+           } else {
+             next(new Error('failed to load user'));
+           }
+         });
+       });
+
+# app.set()
+
+  Assign `setting` to `val`, or return `setting`'s value.
+  
+     app.set('foo', 'bar');
+     app.get('foo');
+     // => "bar"
+  
+  Mounted servers inherit their parent server's settings.
+
+# app.enabled()
+
+  Check if `setting` is enabled (truthy).
+  
+     app.enabled('foo')
+     // => false
+  
+     app.enable('foo')
+     app.enabled('foo')
+     // => true
+
+# app.disabled()
+
+  Check if `setting` is disabled.
+  
+     app.disabled('foo')
+     // => true
+  
+     app.enable('foo')
+     app.disabled('foo')
+     // => false
+
+# app.enable()
+
+  Enable `setting`.
+
+# app.disable()
+
+  Disable `setting`.
+
+# app.configure()
+
+  Configure callback for zero or more envs,
+  when no `env` is specified that callback will
+  be invoked for all environments. Any combination
+  can be used multiple times, in any order desired.
+  
+  ## Examples
+  
+     app.configure(function(){
+       // executed for all envs
+     });
+  
+     app.configure('stage', function(){
+       // executed staging env
+     });
+  
+     app.configure('stage', 'production', function(){
+       // executed for stage and production
+     });
+  
+  ## Note
+  
+   These callbacks are invoked immediately, and
+   are effectively sugar for the following.
+  
+      var env = process.env.NODE_ENV || 'development';
+  
+       switch (env) {
+         case 'development':
+           ...
+           break;
+         case 'stage':
+           ...
+           break;
+         case 'production':
+           ...
+           break;
+       }
+
+# app.all()
+
+  Special-cased "all" method, applying the given route `path`,
+  middleware, and callback to _every_ HTTP method.
+
+# app.render()
+
+  Render the given view `name` name with `options`
+  and a callback accepting an error and the
+  rendered template string.
+  
+  ## Example
+  
+     app.render('email', { name: 'Tobi' }, function(err, html){
+       // ...
+     })
+
+# app.listen()
+
+  Listen for connections.
+  
+  A node `http.Server` is returned, with this
+  application (which is a `Function`) as its
+  callback. If you wish to create both an HTTP
+  and HTTPS server you may do so with the "http"
+  and "https" modules as shown here.
+  
+     var http = require('http')
+       , https = require('https')
+       , express = require('express')
+       , app = express();
+  
+     http.createServer(app).listen(80);
+     http.createServer({ ... }, app).listen(443);
+
+
+# req
+
+  Request prototype.
+
+# req.get
+
+  Return request header.
+  
+  The `Referrer` header field is special-cased,
+  both `Referrer` and `Referer` are interchangeable.
+  
+  ## Examples
+  
+      req.get('Content-Type');
+      // => "text/plain"
+      
+      req.get('content-type');
+      // => "text/plain"
+      
+      req.get('Something');
+      // => undefined
+  
+  Aliased as `req.header()`.
+
+# req.accepts()
+
+  Check if the given `type(s)` is acceptable, returning
+  the best match when true, otherwise `undefined`, in which
+  case you should respond with 406 "Not Acceptable".
+  
+  The `type` value may be a single mime type string
+  such as "application/json", the extension name
+  such as "json", a comma-delimted list such as "json, html, text/plain",
+  or an array `["json", "html", "text/plain"]`. When a list
+  or array is given the _best_ match, if any is returned.
+  
+  ## Examples
+  
+      // Accept: text/html
+      req.accepts('html');
+      // => "html"
+  
+      // Accept: text/*, application/json
+      req.accepts('html');
+      // => "html"
+      req.accepts('text/html');
+      // => "text/html"
+      req.accepts('json, text');
+      // => "json"
+      req.accepts('application/json');
+      // => "application/json"
+  
+      // Accept: text/*, application/json
+      req.accepts('image/png');
+      req.accepts('png');
+      // => undefined
+  
+      // Accept: text/*;q=.5, application/json
+      req.accepts(['html', 'json']);
+      req.accepts('html, json');
+      // => "json"
+
+# req.acceptsCharset()
+
+  Check if the given `charset` is acceptable,
+  otherwise you should respond with 406 "Not Acceptable".
+
+# req.acceptsLanguage()
+
+  Check if the given `lang` is acceptable,
+  otherwise you should respond with 406 "Not Acceptable".
+
+# req.param()
+
+  Return the value of param `name` when present or `defaultValue`.
+  
+   - Checks route placeholders, ex: _/user/:id_
+   - Checks body params, ex: id=12, {"id":12}
+   - Checks query string params, ex: ?id=12
+  
+  To utilize request bodies, `req.body`
+  should be an object. This can be done by using
+  the `connect.bodyParser()` middleware.
+
+# req.is()
+
+  Check if the incoming request contains the "Content-Type" 
+  header field, and it contains the give mime `type`.
+  
+  ## Examples
+  
+       // With Content-Type: text/html; charset=utf-8
+       req.is('html');
+       req.is('text/html');
+       req.is('text/*');
+       // => true
+      
+       // When Content-Type is application/json
+       req.is('json');
+       req.is('application/json');
+       req.is('application/*');
+       // => true
+      
+       req.is('html');
+       // => false
+
+
+# res
+
+  Response prototype.
+
+# res.status()
+
+  Set status `code`.
+
+# res.send()
+
+  Send a response.
+  
+  ## Examples
+  
+      res.send(new Buffer('wahoo'));
+      res.send({ some: 'json' });
+      res.send('<p>some html</p>');
+      res.send(404, 'Sorry, cant find that');
+      res.send(404);
+
+# res.json()
+
+  Send JSON response.
+  
+  ## Examples
+  
+      res.json(null);
+      res.json({ user: 'tj' });
+      res.json(500, 'oh noes!');
+      res.json(404, 'I dont have that');
+
+# res.sendfile()
+
+  Transfer the file at the given `path`.
+  
+  Automatically sets the _Content-Type_ response header field.
+  The callback `fn(err)` is invoked when the transfer is complete
+  or when an error occurs. Be sure to check `res.sentHeader`
+  if you wish to attempt responding, as the header and some data
+  may have already been transferred.
+  
+  ## Options
+  
+    - `maxAge` defaulting to 0
+    - `root`   root directory for relative filenames
+  
+  ## Examples
+  
+   The following example illustrates how `res.sendfile()` may
+   be used as an alternative for the `static()` middleware for
+   dynamic situations. The code backing `res.sendfile()` is actually
+   the same code, so HTTP cache support etc is identical.
+  
+      app.get('/user/:uid/photos/:file', function(req, res){
+        var uid = req.params.uid
+          , file = req.params.file;
+      
+        req.user.mayViewFilesFrom(uid, function(yes){
+          if (yes) {
+            res.sendfile('/uploads/' + uid + '/' + file);
+          } else {
+            res.send(403, 'Sorry! you cant see that.');
+          }
+        });
+      });
+
+# res.download()
+
+  Transfer the file at the given `path` as an attachment.
+  
+  Optionally providing an alternate attachment `filename`,
+  and optional callback `fn(err)`. The callback is invoked
+  when the data transfer is complete, or when an error has
+  ocurred. Be sure to check `res.headerSent` if you plan to respond.
+  
+  This method uses `res.sendfile()`.
+
+# res.format()
+
+  Respond to the Acceptable formats using an `obj`
+  of mime-type callbacks.
+  
+  This method uses `req.accepted`, an array of
+  acceptable types ordered by their quality values.
+  When "Accept" is not present the _first_ callback
+  is invoked, otherwise the first match is used. When
+  no match is performed the server responds with
+  406 "Not Acceptable".
+  
+  Content-Type is set for you, however if you choose
+  you may alter this within the callback using `res.type()`
+  or `res.set('Content-Type', ...)`.
+  
+     res.format({
+       'text/plain': function(){
+         res.send('hey');
+       },
+     
+       'text/html': function(){
+         res.send('<p>hey</p>');
+       },
+     
+       'appliation/json': function(){
+         res.send({ message: 'hey' });
+       }
+     });
+  
+  In addition to canonicalized MIME types you may
+  also use extnames mapped to these types:
+  
+     res.format({
+       text: function(){
+         res.send('hey');
+       },
+     
+       html: function(){
+         res.send('<p>hey</p>');
+       },
+     
+       json: function(){
+         res.send({ message: 'hey' });
+       }
+     });
+  
+  By default Express passes an `Error`
+  with a `.status` of 406 to `next(err)`
+  if a match is not made, however you may
+  provide an optional callback `fn` to
+  be invoked instead.
+
+# res.attachment()
+
+  Set _Content-Disposition_ header to _attachment_ with optional `filename`.
+
+# res.set
+
+  Set header `field` to `val`, or pass
+  an object of header fields.
+  
+  ## Examples
+  
+     res.set('Accept', 'application/json');
+     res.set({ Accept: 'text/plain', 'X-API-Key': 'tobi' });
+  
+  Aliased as `res.header()`.
+
+# res.get()
+
+  Get value for header `field`.
+
+# res.clearCookie()
+
+  Clear cookie `name`.
+
+# res.cookie()
+
+  Set cookie `name` to `val`, with the given `options`.
+  
+  ## Options
+  
+     - `maxAge`   max-age in milliseconds, converted to `expires`
+     - `signed`   sign the cookie
+     - `path`     defaults to "/"
+  
+  ## Examples
+  
+     // "Remember Me" for 15 minutes
+     res.cookie('rememberme', '1', { expires: new Date(Date.now() + 900000), httpOnly: true });
+  
+     // save as above
+     res.cookie('rememberme', '1', { maxAge: 900000, httpOnly: true })
+
+# res.redirect()
+
+  Redirect to the given `url` with optional response `status`
+  defaulting to 302.
+  
+  The given `url` can also be the name of a mapped url, for
+  example by default express supports "back" which redirects
+  to the _Referrer_ or _Referer_ headers or "/".
+  
+  ## Examples
+  
+     res.redirect('/foo/bar');
+     res.redirect('http://example.com');
+     res.redirect(301, 'http://example.com');
+     res.redirect('../login'); // /blog/post/1 -> /blog/login
+  
+  ## Mounting
+  
+    When an application is mounted, and `res.redirect()`
+    is given a path that does _not_ lead with "/". For 
+    example suppose a "blog" app is mounted at "/blog",
+    the following redirect would result in "/blog/login":
+  
+       res.redirect('login');
+  
+    While the leading slash would result in a redirect to "/login":
+  
+       res.redirect('/login');
+
+# res.render()
+
+  Render `view` with the given `options` and optional callback `fn`.
+  When a callback function is given a response will _not_ be made
+  automatically, otherwise a response of _200_ and _text/html_ is given.
+  
+  ## Options
+   
+   - `status`    Response status code (`res.statusCode`)
+   - `charset`   Set the charset (`res.charset`)
+  
+  ## Reserved locals
+  
+   - `cache`     boolean hinting to the engine it should cache
+   - `filename`  filename of the view being rendered
+

docs/request.md

@@ -0,0 +1,107 @@
+
+# req
+
+  Request prototype.
+
+# req.get
+
+  Return request header.
+  
+  The `Referrer` header field is special-cased,
+  both `Referrer` and `Referer` are interchangeable.
+  
+  ## Examples
+  
+      req.get('Content-Type');
+      // => "text/plain"
+      
+      req.get('content-type');
+      // => "text/plain"
+      
+      req.get('Something');
+      // => undefined
+  
+  Aliased as `req.header()`.
+
+# req.accepts()
+
+  Check if the given `type(s)` is acceptable, returning
+  the best match when true, otherwise `undefined`, in which
+  case you should respond with 406 "Not Acceptable".
+  
+  The `type` value may be a single mime type string
+  such as "application/json", the extension name
+  such as "json", a comma-delimted list such as "json, html, text/plain",
+  or an array `["json", "html", "text/plain"]`. When a list
+  or array is given the _best_ match, if any is returned.
+  
+  ## Examples
+  
+      // Accept: text/html
+      req.accepts('html');
+      // => "html"
+  
+      // Accept: text/*, application/json
+      req.accepts('html');
+      // => "html"
+      req.accepts('text/html');
+      // => "text/html"
+      req.accepts('json, text');
+      // => "json"
+      req.accepts('application/json');
+      // => "application/json"
+  
+      // Accept: text/*, application/json
+      req.accepts('image/png');
+      req.accepts('png');
+      // => undefined
+  
+      // Accept: text/*;q=.5, application/json
+      req.accepts(['html', 'json']);
+      req.accepts('html, json');
+      // => "json"
+
+# req.acceptsCharset()
+
+  Check if the given `charset` is acceptable,
+  otherwise you should respond with 406 "Not Acceptable".
+
+# req.acceptsLanguage()
+
+  Check if the given `lang` is acceptable,
+  otherwise you should respond with 406 "Not Acceptable".
+
+# req.param()
+
+  Return the value of param `name` when present or `defaultValue`.
+  
+   - Checks route placeholders, ex: _/user/:id_
+   - Checks body params, ex: id=12, {"id":12}
+   - Checks query string params, ex: ?id=12
+  
+  To utilize request bodies, `req.body`
+  should be an object. This can be done by using
+  the `connect.bodyParser()` middleware.
+
+# req.is()
+
+  Check if the incoming request contains the "Content-Type" 
+  header field, and it contains the give mime `type`.
+  
+  ## Examples
+  
+       // With Content-Type: text/html; charset=utf-8
+       req.is('html');
+       req.is('text/html');
+       req.is('text/*');
+       // => true
+      
+       // When Content-Type is application/json
+       req.is('json');
+       req.is('application/json');
+       req.is('application/*');
+       // => true
+      
+       req.is('html');
+       // => false
+

docs/response.md

@@ -0,0 +1,218 @@
+
+# res
+
+  Response prototype.
+
+# res.status()
+
+  Set status `code`.
+
+# res.send()
+
+  Send a response.
+  
+  ## Examples
+  
+      res.send(new Buffer('wahoo'));
+      res.send({ some: 'json' });
+      res.send('<p>some html</p>');
+      res.send(404, 'Sorry, cant find that');
+      res.send(404);
+
+# res.json()
+
+  Send JSON response.
+  
+  ## Examples
+  
+      res.json(null);
+      res.json({ user: 'tj' });
+      res.json(500, 'oh noes!');
+      res.json(404, 'I dont have that');
+
+# res.sendfile()
+
+  Transfer the file at the given `path`.
+  
+  Automatically sets the _Content-Type_ response header field.
+  The callback `fn(err)` is invoked when the transfer is complete
+  or when an error occurs. Be sure to check `res.sentHeader`
+  if you wish to attempt responding, as the header and some data
+  may have already been transferred.
+  
+  ## Options
+  
+    - `maxAge` defaulting to 0
+    - `root`   root directory for relative filenames
+  
+  ## Examples
+  
+   The following example illustrates how `res.sendfile()` may
+   be used as an alternative for the `static()` middleware for
+   dynamic situations. The code backing `res.sendfile()` is actually
+   the same code, so HTTP cache support etc is identical.
+  
+      app.get('/user/:uid/photos/:file', function(req, res){
+        var uid = req.params.uid
+          , file = req.params.file;
+      
+        req.user.mayViewFilesFrom(uid, function(yes){
+          if (yes) {
+            res.sendfile('/uploads/' + uid + '/' + file);
+          } else {
+            res.send(403, 'Sorry! you cant see that.');
+          }
+        });
+      });
+
+# res.download()
+
+  Transfer the file at the given `path` as an attachment.
+  
+  Optionally providing an alternate attachment `filename`,
+  and optional callback `fn(err)`. The callback is invoked
+  when the data transfer is complete, or when an error has
+  ocurred. Be sure to check `res.headerSent` if you plan to respond.
+  
+  This method uses `res.sendfile()`.
+
+# res.format()
+
+  Respond to the Acceptable formats using an `obj`
+  of mime-type callbacks.
+  
+  This method uses `req.accepted`, an array of
+  acceptable types ordered by their quality values.
+  When "Accept" is not present the _first_ callback
+  is invoked, otherwise the first match is used. When
+  no match is performed the server responds with
+  406 "Not Acceptable".
+  
+  Content-Type is set for you, however if you choose
+  you may alter this within the callback using `res.type()`
+  or `res.set('Content-Type', ...)`.
+  
+     res.format({
+       'text/plain': function(){
+         res.send('hey');
+       },
+     
+       'text/html': function(){
+         res.send('<p>hey</p>');
+       },
+     
+       'appliation/json': function(){
+         res.send({ message: 'hey' });
+       }
+     });
+  
+  In addition to canonicalized MIME types you may
+  also use extnames mapped to these types:
+  
+     res.format({
+       text: function(){
+         res.send('hey');
+       },
+     
+       html: function(){
+         res.send('<p>hey</p>');
+       },
+     
+       json: function(){
+         res.send({ message: 'hey' });
+       }
+     });
+  
+  By default Express passes an `Error`
+  with a `.status` of 406 to `next(err)`
+  if a match is not made, however you may
+  provide an optional callback `fn` to
+  be invoked instead.
+
+# res.attachment()
+
+  Set _Content-Disposition_ header to _attachment_ with optional `filename`.
+
+# res.set
+
+  Set header `field` to `val`, or pass
+  an object of header fields.
+  
+  ## Examples
+  
+     res.set('Accept', 'application/json');
+     res.set({ Accept: 'text/plain', 'X-API-Key': 'tobi' });
+  
+  Aliased as `res.header()`.
+
+# res.get()
+
+  Get value for header `field`.
+
+# res.clearCookie()
+
+  Clear cookie `name`.
+
+# res.cookie()
+
+  Set cookie `name` to `val`, with the given `options`.
+  
+  ## Options
+  
+     - `maxAge`   max-age in milliseconds, converted to `expires`
+     - `signed`   sign the cookie
+     - `path`     defaults to "/"
+  
+  ## Examples
+  
+     // "Remember Me" for 15 minutes
+     res.cookie('rememberme', '1', { expires: new Date(Date.now() + 900000), httpOnly: true });
+  
+     // save as above
+     res.cookie('rememberme', '1', { maxAge: 900000, httpOnly: true })
+
+# res.redirect()
+
+  Redirect to the given `url` with optional response `status`
+  defaulting to 302.
+  
+  The given `url` can also be the name of a mapped url, for
+  example by default express supports "back" which redirects
+  to the _Referrer_ or _Referer_ headers or "/".
+  
+  ## Examples
+  
+     res.redirect('/foo/bar');
+     res.redirect('http://example.com');
+     res.redirect(301, 'http://example.com');
+     res.redirect('../login'); // /blog/post/1 -> /blog/login
+  
+  ## Mounting
+  
+    When an application is mounted, and `res.redirect()`
+    is given a path that does _not_ lead with "/". For 
+    example suppose a "blog" app is mounted at "/blog",
+    the following redirect would result in "/blog/login":
+  
+       res.redirect('login');
+  
+    While the leading slash would result in a redirect to "/login":
+  
+       res.redirect('/login');
+
+# res.render()
+
+  Render `view` with the given `options` and optional callback `fn`.
+  When a callback function is given a response will _not_ be made
+  automatically, otherwise a response of _200_ and _text/html_ is given.
+  
+  ## Options
+   
+   - `status`    Response status code (`res.statusCode`)
+   - `charset`   Set the charset (`res.charset`)
+  
+  ## Reserved locals
+  
+   - `cache`     boolean hinting to the engine it should cache
+   - `filename`  filename of the view being rendered
+

examples/auth/app.js

@@ -0,0 +1,121 @@
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('../../lib/express')
+  , hash = require('./pass').hash;
+
+var app = module.exports = express();
+
+app.use(express.bodyParser());
+app.use(express.cookieParser('shhhh, very secret'));
+app.use(express.session());
+
+app.set('view engine', 'ejs');
+app.set('views', __dirname + '/views');
+
+// Session-persisted message middleware
+
+app.locals.use(function(req,res){
+  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>';
+})
+
+// dummy database
+
+var users = {
+  tj: { name: 'tj' }
+};
+
+// 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;
+});
+
+
+// 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
+  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) {
+  if (req.session.user) {
+    next();
+  } else {
+    req.session.error = 'Access denied!';
+    res.redirect('/login');
+  }
+}
+
+app.get('/', function(req, res){
+  res.redirect('login');
+});
+
+app.get('/restricted', restrict, function(req, res){
+  res.send('Wahoo! restricted area');
+});
+
+app.get('/logout', function(req, res){
+  // destroy the user's session to log them out
+  // will be re-created next request
+  req.session.destroy(function(){
+    res.redirect('/');
+  });
+});
+
+app.get('/login', function(req, res){
+  if (req.session.user) {
+    req.session.success = 'Authenticated as ' + req.session.user.name
+      + ' click to <a href="/logout">logout</a>. '
+      + ' You may now access <a href="/restricted">/restricted</a>.';
+  }
+  res.render('login');
+});
+
+app.post('/login', function(req, res){
+  authenticate(req.body.username, req.body.password, function(err, user){
+    if (user) {
+      // Regenerate session when signing in
+      // to prevent fixation 
+      req.session.regenerate(function(){
+        // Store the user's primary key 
+        // in the session store to be retrieved,
+        // or in this case the entire user object
+        req.session.user = user;
+        res.redirect('back');
+      });
+    } else {
+      req.session.error = 'Authentication failed, please check your '
+        + ' username and password.'
+        + ' (use "tj" and "foobar")';
+      res.redirect('login');
+    }
+  });
+});
+
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}

examples/auth/pass.js

@@ -0,0 +1,46 @@
+
+// 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, fn);
+  } 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);
+      });
+    });
+  }
+};

examples/auth/views/layout.ejs

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

examples/auth/views/login.ejs

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

examples/big-view/index.js

@@ -0,0 +1,24 @@
+
+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 });
+});
+
+app.listen(3000);
+console.log('Express listening 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/chat/app.js

@@ -1,79 +0,0 @@
-
-require.paths.unshift('lib')
-require('express')
-require('express/plugins')
-
-var messages = [],
-    utils = require('express/utils')
-    
-configure(function(){
-  use(MethodOverride)
-  use(ContentLength)
-  use(Cookie)
-  use(Cache, { lifetime: (5).minutes, reapInterval: (1).minute })
-  use(Session, { lifetime: (15).minutes, reapInterval: (1).minute })
-  use(Static)
-  use(Logger)
-  set('root', __dirname)
-})
-
-get('/', function(){
-  this.pass('/chat')
-})
-
-get('/chat', function(){ 
-  var self = this
-  Session.store.length(function(err, len){
-    self.render('chat.haml.html', {
-      locals: {
-        title: 'Chat',
-        messages: messages,
-        name: self.session.name,
-        usersOnline: len
-      }
-    })
-  })
-})
-
-post('/chat', function(){
-  this.session.name = this.param('name')
-  messages
-    .push(utils.escape(this.param('name')) + ': ' + utils.escape(this.param('message'))
-    .replace(/(http:\/\/[^\s]+)/g, '<a href="$1" target="express-chat">$1</a>')
-    .replace(/:\)/g, '<img src="http://icons3.iconfinder.netdna-cdn.com/data/icons/ledicons/emoticon_smile.png">'))
-  this.halt(200)
-})
-
-get('/chat/messages', function(){
-  var self = this,
-      previousLength = messages.length,
-      timer = setInterval(function(){
-    if (messages.length > previousLength)
-      self.contentType('json'),
-      previousLength = messages.length,
-      self.halt(200, JSON.encode(messages)),
-      clearInterval(timer)
-  }, 100)
-})
-
-get('/*.css', function(file){
-  this.render(file + '.sass.css', { layout: false })
-})
-
-get('/error/view', function(){
-  this.render('does.not.exist')
-})
-
-get('/error', function(){
-  throw new Error('oh noes!')
-})
-
-get('/simple', function(){
-  return 'Hello :)'
-})
-
-get('/favicon.ico', function(){
-  this.halt()
-})
-
-run()

examples/chat/public/javascripts/app.js

@@ -1,28 +0,0 @@
-
-$(function(){
-  // Send message
-  $('form').submit(function(){
-    var message = $('input[name=message]'),
-        name = $('input[name=name]')
-    if (message.val()) 
-      $.post('/chat', { name: name.val(), message: message.val() }, function(){
-        message.val('')
-      })
-    else
-      message.css('border', '1px solid red')
-    return false
-  })
-  
-  // Longpoll
-  ;(function poll(){
-    $.getJSON('/chat/messages', function(messages){
-      $('#messages').empty()
-      $.each(messages, function(i, msg){
-        $('#messages')
-          .append('<li>' + msg + '</li>')
-          .get(0).scrollTop = $('#messages').get(0).scrollHeight
-      })
-      poll()
-    })
-  })()
-})

examples/chat/views/chat.haml.html

@@ -1,10 +0,0 @@
-%h1 Chat
-%img.bubble{ src: '/public/images/bubble.png' }
-%ul#messages
-  :each msg in messages
-    %li= msg
-%form{ method: 'post' }
-  %input{ type: 'hidden', name: '_method', value: 'put' }
-  %input{ type: 'text', name: 'name', value: name || 'guest' }
-  %input{ type: 'text', name: 'message' }
-  %input{ type: 'submit', value: 'Send' }

examples/chat/views/layout.haml.html

@@ -1,11 +0,0 @@
-%html
-  %head
-    %title= title
-    %script{ src: '/public/javascripts/jquery.js' }
-    %script{ src: '/public/javascripts/app.js' }
-    %link{ rel: 'stylesheet', href: '/style.css' }
-  %body
-    #wrapper= body
-      #online 
-        Online:
-        %strong= usersOnline

examples/chat/views/style.sass.css

@@ -1,81 +0,0 @@
-body
-  :font-family "Helvetica Neue", "Lucida Grande", "Arial"
-  :font-size 13px
-  :text-align center
-  =text-stroke 1px rgba(255, 255, 255, 0.1)
-  :color #555
-  
-h1, h2
-  :margin 0
-  :font-size 22px
-  :color #343434
-h1
-  :text-shadow 1px 2px 2px #ddd
-  :font-size 60px
-  
-img.bubble
-  :position absolute
-  :top -25px
-  :left 120px
-  
-#wrapper
-  :position relative
-  :margin 100px auto
-  :width 500px
-  :text-align left
-  
-ul
-  :margin 0
-  :padding 0
-  :max-height 300px
-  :overflow-x hidden
-  li
-    :margin 5px 0
-    :padding 3px 8px
-    :list-style none
-    :border 1px solid #eee
-    =border-radius 3px
-    =border-radius 3px
-  li:hover
-    :cursor pointer
-    :color #2E2E2E
-
-input[type=text]
-  :padding 5px
-  :border 1px solid #ddd
-  :outline none
-  =border-radius 2px
-input[type=text]:focus
-  :border-color #00C3FF
-
-input[type=submit]
-  =border-radius 2px
-  =box-shadow 0 1px 2px #ddd
-  :padding 6px 10px
-  :border solid 1px #999
-  :background -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fff), to(#ddd))
-  :color #333
-  :text-decoration none
-  :cursor pointer
-  :display inline-block
-  :text-align center
-  :text-shadow 0px 1px 1px #fff
-  :line-height 1
-input[type=submit]:hover
-  :background -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fff), to(#E6E4E4))
-input[type=submit]:active
-  :background -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fff), to(#c7c7c7))
-input[name=name]
-  :width 80px
-  
-a
-  :color #1ABFF1
-  =transition-property padding
-  =transition-duration 0.15s
-a:hover
-  :padding 0 5px
-a:hover:before
-  :content 'visit: '
-  
-#online
-  :font-size 12px

examples/coffee-upload/app.coffee

@@ -1,35 +0,0 @@
-
-require.paths.unshift 'lib'
-require 'express'
-require 'express/plugins'
-
-configure ->
-  use MethodOverride
-  use ContentLength
-  use Cookie
-  use Session
-  use Flash
-  use Logger
-  use Static
-  set 'root', __dirname
-
-get '/', ->
-  @redirect('/upload')
-
-get '/upload', ->
-  @render 'upload.haml.html', {
-    locals: {
-      flashes: @flash 'info'
-    }
-  }
-
-post '/upload', ->
-  @param('images').each (image) =>
-    puts image.filename + ' -> ' + image.tempfile
-    @flash 'info', 'Uploaded ' + image.filename
-  @redirect '/upload'
-
-get '/*.css', (file) ->
-  @render file + '.sass.css', { layout: no }
-
-run()

examples/coffee-upload/views/layout.haml.html

@@ -1,14 +0,0 @@
-%html
-  %head
-    %title Upload
-    %script{ src: '/public/javascripts/jquery.js' }
-    %script{ src: '/public/javascripts/app.js' }
-    %link{ rel: 'stylesheet', href: '/style.css' }
-  %body
-    #wrapper
-      %h1 Upload
-      :if flashes
-        %ul.messages.info
-          :each msg in flashes
-            %li= msg
-      .body= body

examples/coffee-upload/views/style.sass.css

@@ -1,68 +0,0 @@
-body
-  :font-family "Helvetica Neue", "Lucida Grande", "Arial"
-  :font-size 13px
-  :text-align center
-  :-webkit-text-stroke 1px rgba(255, 255, 255, 0.1)
-  :color #555
-  
-h1, h2
-  :margin 0 0 15px 0
-  :font-size 22px
-  :color #343434
-h1
-  :text-shadow 1px 2px 2px #ddd
-  :font-size 60px
-h2
-  :margin-top 15px
-  
-#wrapper
-  :position relative
-  :margin 100px auto
-  :width 500px
-  :text-align left
-
-input[type=file]
-  :padding 5px
-  :border 1px solid #ddd
-  :outline none
-  :-webkit-border-radius 2px
-  :-moz-border-radius 2px
-input[type=file]:focus
-  :border-color #00C3FF
-
-input[type=submit]
-  :-webkit-border-radius 2px
-  :-moz-border-radius 2px
-  :-webkit-box-shadow 0 1px 2px #ddd
-  :-moz-box-shadow 0 1px 2px #ddd
-  :padding 6px 10px
-  :border solid 1px #999
-  :background -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fff), to(#ddd))
-  :color #333
-  :text-decoration none
-  :cursor pointer
-  :display inline-block
-  :text-align center
-  :text-shadow 0px 1px 1px #fff
-  :line-height 1
-input[type=submit]:hover
-  :background -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fff), to(#E6E4E4))
-input[type=submit]:active
-  :background -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fff), to(#c7c7c7))
-input[name=name]
-  :width 80px
-  
-form
-  .panel
-    :float left
-    :width 100%
-    :margin-bottom 15px
-    
-.messages
-  :margin 0
-  :padding 0
-  :border 1px solid #eee
-  =box-shadow 2px 2px 5px #eee
-  li
-    :padding 5px 10px
-    :list-style none

examples/coffee-upload/views/upload.haml.html

@@ -1,18 +0,0 @@
-:if typeof images !== 'undefined'
-  .images
-    :each img in images
-      %img{ src: img }
-
-%h2 Singles
-%form{ method: 'post', enctype: 'multipart/form-data' }
-  %input{ type: 'file', name: 'images[0]' }
-  %input{ type: 'file', name: 'images[1]' }
-  %input{ type: 'file', name: 'images[2]' }
-  .panel
-    %input{ type: 'submit', value: 'Upload' }
-    
-%h2 Multiple
-%form{ method: 'post', enctype: 'multipart/form-data' }
-  %input{ type: 'file', name: 'images[]', multiple: 'multiple' }
-  .panel
-    %input{ type: 'submit', value: 'Upload' }

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,41 @@
+
+var express = require('../../')
+  , app = module.exports = express()
+  , users = require('./db');
+
+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 abstract make things a bit more declarative:
+
+function format(mod) {
+  var obj = require(mod);
+  return function(req, res){
+    res.format(obj);
+  }
+}
+
+app.get('/users', format('./users'));
+
+if (!module.parent) {
+  app.listen(3000);
+  console.log('listening 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,32 @@
+
+/**
+ * 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');
+}
+
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express server listening on port 3000');
+}

examples/cookies/app.js

@@ -0,0 +1,54 @@
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('../../')
+  , app = module.exports = express();
+
+
+// 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());
+
+// custom log format
+if ('test' != process.env.NODE_ENV)
+  app.use(express.logger(':method :url'));
+
+// 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) {
+    res.send('Remembered :). Click to <a href="/forget">forget</a>!.');
+  } else {
+    res.send('<form method="post"><p>Check to <label>'
+      + '<input type="checkbox" name="remember"/> remember me</label> '
+      + '<input type="submit" value="Submit"/>.</p></form>');
+  }
+});
+
+app.get('/forget', function(req, res){
+  res.clearCookie('remember');
+  res.redirect('back');
+});
+
+app.post('/', function(req, res){
+  var minute = 60000;
+  if (req.body.remember) res.cookie('remember', 1, { maxAge: minute });
+  res.redirect('back');
+});
+
+if (!module.parent){
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}

examples/downloads/app.js

@@ -0,0 +1,44 @@
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('../../')
+  , app = module.exports = express();
+
+app.get('/', function(req, res){
+  res.send('<ul>'
+    + '<li>Download <a href="/files/amazing.txt">amazing.txt</a>.</li>'
+    + '<li>Download <a href="/files/missing.txt">missing.txt</a>.</li>'
+    + '</ul>');
+});
+
+// /files/* is accessed via req.params[0]
+// but here we name it :file
+app.get('/files/:file(*)', function(req, res, next){
+  var file = req.params.file
+    , path = __dirname + '/files/' + file;
+
+  res.download(path);
+});
+
+// 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 {
+    next(err);
+  }
+});
+
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}

examples/downloads/files/amazing.txt

@@ -0,0 +1 @@
+what an amazing download

examples/ejs/index.js

@@ -0,0 +1,46 @@
+
+/**
+ * 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 });
+});
+
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express app started on port 3000');
+}

examples/ejs/views/users.html

@@ -0,0 +1,6 @@
+<h1>Users</h1>
+<ul id="users">
+  <% users.forEach(function(user){ %>
+    <li><%= user.name %> <%= user.email %></li>
+  <% }) %>
+</ul>

examples/error-pages/index.js

@@ -0,0 +1,95 @@
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('../../')
+  , app = module.exports = express()
+  , silent = 'test' == process.env.NODE_ENV;
+
+app.set('views', __dirname + '/views');
+app.set('view engine', 'jade');
+
+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){
+  // respond with html page
+  if (req.accepts('html')) {
+    res.status(404);
+    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){
+  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!'));
+});
+
+if (!module.parent) {
+  app.listen(3000);
+  silent || console.log('Express started on port 3000');
+}

examples/error-pages/views/404.jade

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

examples/error-pages/views/500.jade

@@ -0,0 +1,10 @@
+
+// note that we extend a different
+// layout with jade for 4xx & 5xx
+// responses
+
+extends error
+
+block content
+  h1 Error: #{error.message}
+  pre= error.stack

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

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

@@ -0,0 +1,6 @@
+html
+  head 
+    title Custom Pages Example
+  body
+    h1 My Site
+    block content

examples/error/index.js

@@ -0,0 +1,48 @@
+
+/**
+ * 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!'));
+  });
+});
+
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}

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

@@ -0,0 +1,68 @@
+
+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();
+});
+
+// if you wanted to _always_ expose
+// the user you might do something like this:
+/*
+app.locals.use(function(req, res){
+  if (req.user) res.locals.expose.user = req.user;
+})
+*/
+
+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');
+});
+
+app.listen(3000);
+console.log('app listening 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/hello-world/index.js

@@ -0,0 +1,11 @@
+
+var express = require('../../');
+
+var app = express();
+
+app.get('/', function(req, res){
+  res.send('Hello World');
+});
+
+app.listen(3000);
+console.log('Express started on port 3000');

examples/jade/index.js

@@ -0,0 +1,46 @@
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('../../lib/express');
+
+// Path to our public directory
+
+var pub = __dirname + '/public';
+
+// Auto-compile sass to css with "compiler"
+// and then serve with connect's staticProvider
+
+var app = express.createServer();
+app.use(app.router);
+app.use(express.static(pub));
+app.use(express.errorHandler());
+
+// Optional since express defaults to CWD/views
+
+app.set('views', __dirname + '/views');
+
+// Set our default template engine to "jade"
+// which prevents the need for extensions
+// (although you can still mix and match)
+app.set('view engine', 'jade');
+
+function User(name, email) {
+  this.name = name;
+  this.email = email;
+}
+
+// Dummy users
+var users = [
+    new User('tj', 'tj@vision-media.ca')
+  , new User('ciaran', 'ciaranj@gmail.com')
+  , new User('aaron', 'aaron.heckmann+github@gmail.com')
+];
+
+app.get('/', function(req, res){
+  res.render('users', { users: users });
+});
+
+app.listen(3000);
+console.log('Express app started on port 3000');

examples/jade/public/stylesheets/style.css

@@ -0,0 +1,3 @@
+body {
+  padding: 50px 80px;
+  font: 14px "Helvetica Nueue", "Lucida Grande", Arial, sans-serif;}

examples/jade/views/header.jade

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

examples/jade/views/layout.jade

@@ -0,0 +1,5 @@
+!!! 5
+html
+  include header
+  body
+    block content

examples/jade/views/users/index.jade

@@ -0,0 +1,8 @@
+
+extends ../layout
+
+block content
+  h1 Users
+  #users
+    for user in users
+      include user

examples/jade/views/users/user.jade

@@ -0,0 +1,3 @@
+.user
+  h2= user.name
+  .email= user.email

examples/markdown/index.js

@@ -0,0 +1,45 @@
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('../../')
+  , fs = require('fs')
+  , md = require('github-flavored-markdown').parse;
+
+var app = module.exports = express();
+
+// register .md as an engine in express view system
+
+app.engine('md', function(path, options, fn){
+  fs.readFile(path, 'utf8', function(err, str){
+    if (err) return fn(err);
+    try {
+      var html = md(str);
+      html = html.replace(/\{([^}]+)\}/g, function(_, name){
+        return options[name] || '';
+      })
+      fn(null, html);
+    } catch(err) {
+      fn(err);
+    }
+  });
+})
+
+app.set('views', __dirname + '/views');
+
+// make it the default so we dont need .md
+app.set('view engine', 'md');
+
+app.get('/', function(req, res){
+  res.render('index', { title: 'Markdown Example' });
+})
+
+app.get('/fail', function(req, res){
+  res.render('missing', { title: 'Markdown Example' });
+})
+
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}

examples/markdown/views/index.md

@@ -0,0 +1,4 @@
+
+# {title}
+
+Just an example view rendered with _markdown_.

examples/multipart/app.js

@@ -0,0 +1,36 @@
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('../../')
+  , format = require('util').format;
+
+var app = module.exports = express()
+
+// bodyParser in connect 2.x uses node-formidable to parse 
+// the multipart form data.
+app.use(express.bodyParser())
+
+app.get('/', function(req, res){
+  res.send('<form method="post" enctype="multipart/form-data">'
+    + '<p>Title: <input type="text" name="title" /></p>'
+    + '<p>Image: <input type="file" name="image" /></p>'
+    + '<p><input type="submit" value="Upload" /></p>'
+    + '</form>');
+});
+
+app.post('/', function(req, res, next){
+  // the uploaded file can be found as `req.files.image` and the
+  // title field as `req.body.title`
+  res.send(format('\nuploaded %s (%d Kb) to %s as %s'
+    , req.files.image.name
+    , req.files.image.size / 1024 | 0 
+    , req.files.image.path
+    , req.body.title));
+});
+
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}

examples/mvc/controllers/main/index.js

@@ -0,0 +1,4 @@
+
+exports.index = function(req, res){
+  res.redirect('/users');
+};

examples/mvc/controllers/pet/index.js

@@ -0,0 +1,26 @@
+
+var db = require('../../db');
+
+exports.engine = 'jade';
+
+exports.before = function(req, res, next){
+  var pet = db.pets[req.params.pet_id];
+  if (!pet) return next(new Error('Pet not found'));
+  req.pet = pet;
+  next();
+};
+
+exports.show = function(req, res, next){
+  res.render('show', { pet: req.pet });
+};
+
+exports.edit = function(req, res, next){
+  res.render('edit', { pet: req.pet });
+};
+
+exports.update = function(req, res, next){
+  var body = req.body;
+  req.pet.name = body.user.name;
+  res.message('Information updated!');
+  res.redirect('/pet/' + req.pet.id);
+};

examples/mvc/controllers/pet/views/edit.jade

@@ -0,0 +1,7 @@
+link(rel='stylesheet', href='/style.css')
+h1= pet.name
+form(action='/pet/#{pet.id}', method='post')
+  input(type='hidden', name='_method', value='put')
+  label Name: 
+    input(type='text', name='user[name]', value=pet.name)
+  input(type='submit', value='Update')

examples/mvc/controllers/pet/views/show.jade

@@ -0,0 +1,6 @@
+link(rel='stylesheet', href='/style.css')
+
+h1= pet.name
+  a(href='/pet/#{pet.id}/edit')  edit
+
+p You are viewing #{pet.name}

examples/mvc/controllers/user-pet/index.js

@@ -0,0 +1,17 @@
+
+var db = require('../../db');
+
+exports.name = 'pet';
+exports.prefix = '/user/:user_id';
+
+exports.create = function(req, res, next){
+  var id = req.params.user_id;
+  var user = db.users[id];
+  var body = req.body;
+  if (!user) return next(new Error('User not found'));
+  var pet = { name: body.pet.name };
+  pet.id = db.pets.push(pet) - 1;
+  user.pets.push(pet);
+  res.message('Added pet ' + body.pet.name);
+  res.redirect('/user/' + id);
+};

examples/mvc/controllers/user/index.js

@@ -0,0 +1,34 @@
+
+var db = require('../../db');
+
+exports.before = function(req, res, next){
+  var id = req.params.user_id;
+  if (!id) return next();
+  // pretend to query a database...
+  process.nextTick(function(){
+    req.user = db.users[id];
+    // cant find that user
+    if (!req.user) return next(new Error('User not found'));
+    // found it, move on to the routes
+    next();
+  });
+}
+
+exports.list = function(req, res, next){
+  res.render('list', { users: db.users });
+};
+
+exports.edit = function(req, res, next){
+  res.render('edit', { user: req.user });
+};
+
+exports.show = function(req, res, next){
+  res.render('show', { user: req.user });
+};
+
+exports.update = function(req, res, next){
+  var body = req.body;
+  req.user.name = body.user.name;
+  res.message('Information updated!');
+  res.redirect('/user/' + req.user.id);
+};

examples/mvc/controllers/user/views/edit.html

@@ -0,0 +1,12 @@
+<link rel="stylesheet" href="/style.css" />
+<h1><%= user.name %></h1>
+<form action='/user/<%= user.id %>' method='post'>
+  <input type="hidden" name="_method" value="put" />
+  <label>Name: <input type="text" name="user[name]" value="<%= user.name %>" /></label>
+  <input type="submit" value="Update" />
+</form>
+
+<form action='/user/<%= user.id %>/pet' method='post'>
+  <label>Pet: <input type="text" name="pet[name]" placeholder="name" /></label>
+  <input type="submit" value="Add" />
+</form>

examples/mvc/controllers/user/views/list.html

@@ -0,0 +1,8 @@
+<link rel="stylesheet" href="/style.css" />
+<h1>Users</h1>
+<p>Click a user below to view their pets.</p>
+<ul>
+  <% users.forEach(function(user){ %>
+    <li><a href="/user/<%= user.id %>"><%= user.name %></a></li>
+  <% }) %>
+</ul>

examples/mvc/controllers/user/views/show.html

@@ -0,0 +1,21 @@
+<link rel="stylesheet" href="/style.css" />
+<h1><%= user.name %> <a href="/user/<%= user.id %>/edit">edit</a></h1>
+
+<% if (hasMessages) { %>
+  <ul id="messages">
+    <% messages.forEach(function(msg){ %>
+      <li><%= msg %></li>
+    <% }) %>
+  </ul>
+<% } %>
+
+<% if (user.pets.length) { %>
+  <p>View <%= user.name %>s pets:</p>
+  <ul>
+    <% user.pets.forEach(function(pet){ %>
+      <li><a href="/pet/<%= pet.id %>"><%= pet.name %></a></li>
+    <% }) %>
+  </ul>
+<% } else { %>
+  <p>No pets!</p>
+<% } %>

examples/mvc/db.js

@@ -0,0 +1,15 @@
+
+// faux database
+
+var pets = exports.pets = [];
+
+pets.push({ name: 'Tobi', id: 0 });
+pets.push({ name: 'Loki', id: 1 });
+pets.push({ name: 'Jane', id: 2 });
+pets.push({ name: 'Raul', id: 3 });
+
+var users = exports.users = [];
+
+users.push({ name: 'TJ', pets: [pets[0], pets[1], pets[2]], id: 0  });
+users.push({ name: 'Guillermo', pets: [pets[3]], id: 1 });
+users.push({ name: 'Nathan', pets: [], id: 2 });

examples/mvc/index.js

@@ -0,0 +1,92 @@
+
+var express = require('../..');
+
+var app = module.exports = express();
+
+// settings
+
+// map .renderFile to ".html" files
+app.engine('html', require('ejs').renderFile);
+
+// make ".html" the default
+app.set('view engine', 'html');
+
+// set views for error and 404 pages
+app.set('views', __dirname + '/views');
+
+// define a custom res.message() method
+// which stores messages in the session
+app.response.message = function(msg){
+  // reference `req.session` via the `this.req` reference
+  var sess = this.req.session;
+  // simply add the msg to an array for later
+  sess.messages = sess.messages || [];
+  sess.messages.push(msg);
+  return this;
+};
+
+// expose the "messages" local variable when views are rendered
+app.locals.use(function(req, res){
+  var msgs = req.session.messages || [];
+
+  // expose "messages" local variable
+  res.locals.messages = msgs;
+
+  // expose "hasMessages"
+  res.locals.hasMessages = !! msgs.length;
+
+  /* This is equivalent:
+   res.locals({
+     messages: msgs,
+     hasMessages: !! msgs.length
+   });
+  */
+
+  // empty or "flush" the messages so they
+  // don't build up
+  req.session.messages = [];
+});
+
+// log
+if (!module.parent) app.use(express.logger('dev'));
+
+// serve static files
+app.use(express.static(__dirname + '/public'));
+
+// session support
+app.use(express.cookieParser('some secret here'));
+app.use(express.session());
+
+// parse request bodies (req.body)
+app.use(express.bodyParser());
+
+// support _method (PUT in forms etc)
+app.use(express.methodOverride());
+
+// load controllers
+require('./lib/boot')(app, { verbose: !module.parent });
+
+// assume "not found" in the error msgs
+// is a 404. this is somewhat silly, but
+// valid, you can do whatever you like, set
+// properties, use instanceof etc.
+app.use(function(err, req, res, next){
+  // treat as 404
+  if (~err.message.indexOf('not found')) return next();
+
+  // log it
+  console.error(err.stack);
+
+  // error page
+  res.status(500).render('5xx');
+});
+
+// assume 404 since no middleware responded
+app.use(function(req, res, next){
+  res.status(404).render('404', { url: req.originalUrl });
+});
+
+if (!module.parent) {
+  app.listen(3000);
+  console.log('\n  listening on port 3000\n');
+}

examples/mvc/lib/boot.js

@@ -0,0 +1,74 @@
+
+var express = require('../../..')
+  , fs = require('fs');
+
+module.exports = function(parent, options){
+  var verbose = options.verbose;
+  fs.readdirSync(__dirname + '/../controllers').forEach(function(name){
+    verbose && console.log('\n   %s:', name);
+    var obj = require('./../controllers/' + name)
+      , name = obj.name || name
+      , prefix = obj.prefix || ''
+      , app = express()
+      , method
+      , path;
+
+    // allow specifying the view engine
+    if (obj.engine) app.set('view engine', obj.engine);
+    app.set('views', __dirname + '/../controllers/' + name + '/views');
+
+    // before middleware support
+    if (obj.before) {
+      path = '/' + name + '/:' + name + '_id';
+      app.all(path, obj.before);
+      verbose && console.log('     ALL %s -> before', path);
+      path = '/' + name + '/:' + name + '_id/*';
+      app.all(path, obj.before);
+      verbose && console.log('     ALL %s -> before', path);
+    }
+
+    // generate routes based
+    // on the exported methods
+    for (var key in obj) {
+      // "reserved" exports
+      if (~['name', 'prefix', 'engine', 'before'].indexOf(key)) continue;
+      // route exports
+      switch (key) {
+        case 'show':
+          method = 'get';
+          path = '/' + name + '/:' + name + '_id';
+          app[method](path, obj[key]);
+          break;
+        case 'list':
+          method = 'get';
+          path = '/' + name + 's';
+          break;
+        case 'edit':
+          method = 'get';
+          path = '/' + name + '/:' + name + '_id/edit';
+          break;
+        case 'update':
+          method = 'put';
+          path = '/' + name + '/:' + name + '_id';
+          break;
+        case 'create':
+          method = 'post';
+          path = '/' + name;
+          break;
+        case 'index':
+          method = 'get';
+          path = '/';
+          break;
+        default:
+          throw new Error('unrecognized route: ' + name + '.' + key);
+      }
+
+      path = prefix + path;
+      app[method](path, obj[key]);
+      verbose && console.log('     %s %s -> %s', method.toUpperCase(), path, key);
+    }
+
+    // mount the app
+    parent.use(app);
+  });
+};

examples/mvc/public/style.css

@@ -0,0 +1,14 @@
+body {
+  padding: 50px;
+  font: 16px "Helvetica Neue", Helvetica, Arial;
+}
+a {
+  color: #107aff;
+  text-decoration: none;
+}
+a:hover {
+  text-decoration: underline;
+}
+h1 a {
+  font-size: 16px;
+}

examples/mvc/views/404.html

@@ -0,0 +1,3 @@
+<link rel="stylesheet" href="/style.css" />
+<h1>404: Not Found</h1>
+<p>Sorry we can't find <%= url %></p>

examples/mvc/views/5xx.html

@@ -0,0 +1,3 @@
+<link rel="stylesheet" href="/style.css" />
+<h1>500: Internal Server Error</h1>
+<p>Looks like something blew up!</p>

examples/params/app.js

@@ -0,0 +1,70 @@
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('../../')
+  , app = module.exports = express();
+
+// Faux database
+
+var users = [
+    { name: 'tj' }
+  , { name: 'tobi' }
+  , { name: 'loki' }
+  , { name: 'jane' }
+  , { name: 'bandit' }
+];
+
+// Convert :to and :from to integers
+
+app.param(['to', 'from'], function(req, res, next, num, name){ 
+  req.params[name] = num = parseInt(num, 10);
+  if( isNaN(num) ){
+    next(new Error('failed to parseInt '+num));
+  } else {
+    next();
+  }
+});
+
+// Load user by id
+
+app.param('user', function(req, res, next, id){
+  if (req.user = users[id]) {
+    next();
+  } else {
+    next(new Error('failed to find user'));
+  }
+});
+
+/**
+ * GET index.
+ */
+
+app.get('/', function(req, res){
+  res.send('Visit /user/0 or /users/0-2');
+});
+
+/**
+ * GET :user.
+ */
+
+app.get('/user/:user', function(req, res, next){
+  res.send('user ' + req.user.name);
+});
+
+/**
+ * GET users :from - :to.
+ */
+
+app.get('/users/:from-:to', function(req, res, next){
+  var from = req.params.from
+    , to = req.params.to
+    , names = users.map(function(user){ return user.name; });
+  res.send('users ' + names.slice(from, to).join(', '));
+});
+
+if (!module.parent) {
+  app.listen(3000);
+  console.log('Express started on port 3000');
+}

examples/partials/app.js

@@ -0,0 +1,32 @@
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('../../lib/express');
+
+var app = express.createServer();
+
+// Optional since express defaults to CWD/views
+
+app.set('views', __dirname + '/views');
+
+// Set our default template engine to "jade"
+// which prevents the need for extensions
+// (although you can still mix and match)
+app.set('view engine', 'jade');
+
+// Dummy record
+var ninja = {
+  name: 'leonardo',
+  summary: { email: 'hunter.loftis+github@gmail.com', master: 'splinter', description: 'peaceful leader' },
+  weapons: ['katana', 'fists', 'shell'],
+  victims: ['shredder', 'brain', 'beebop', 'rocksteady']
+};
+
+app.get('/', function(req, res){
+  res.render('ninja', { ninja: ninja });
+});
+
+app.listen(3000);
+console.log('Express app started on port 3000');

examples/partials/views/layout.jade

@@ -0,0 +1,5 @@
+!!!
+html
+  head
+    title Partials Example
+  body!= body

examples/partials/views/li.jade

@@ -0,0 +1 @@
+li= value

examples/partials/views/ninja/_weapon.jade

@@ -0,0 +1 @@
+li.weapon= weapon

examples/partials/views/ninja/index.jade

@@ -0,0 +1,22 @@
+h1= ninja.name
+
+// file, partial name, and partial object all match ('summary')
+// the partial filename prefix '_' is completely optional.
+
+// In this case we need to specify ninja.summary as the object
+// option, since it is a "plain" object Express cannot otherwise
+// tell if it is intended to be locals, or THE summary object
+#summary!= partial('summary', { object: ninja.summary })
+
+// file, partial name = '_weapon', resolves to 'weapon' object within partial
+#weapons
+  h2 Weapons
+  // the weapon partial is rendered once per item in
+  // the weapons array or "collection"
+  ul!= partial('weapon', ninja.weapons)
+  
+// partial name 'victim' resolves to 'victim.jade'
+// or 'victim/index.jade', providing the "victim" local
+#victims
+  h2 Victims
+  ul!= partial('victim', ninja.victims)

examples/partials/views/ninja/summary.jade

@@ -0,0 +1,4 @@
+h2 Summary
+p= summary.email
+p= summary.description
+p taught by master #{summary.master}

examples/partials/views/ninja/victim/index.jade

@@ -0,0 +1,5 @@
+// this is insane overkill, I do not recommend
+// doing tiny partials like this as it gets expensive
+// with collections, however this illustrates the new
+// partial lookup mechanism
+!= partial('../../li', { object: victim, as: 'value' })

examples/resource/app.js

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

examples/route-loading/boot.js

@@ -0,0 +1,26 @@
+
+/**
+ * Module dependencies.
+ */
+
+var vm = require('vm')
+  , fs = require('fs');
+
+module.exports = function(app, db){
+  var dir = __dirname + '/routes';
+  // grab a list of our route files
+  fs.readdirSync(dir).forEach(function(file){
+    var str = fs.readFileSync(dir + '/' + file, 'utf8');
+    // inject some pseudo globals by evaluating
+    // the file with vm.runInNewContext()
+    // instead of loading it with require(). require's
+    // internals use similar, so dont be afraid of "boot time".
+    var context = { app: app, db: db };
+    // we have to merge the globals for console, process etc
+    for (var key in global) context[key] = global[key];
+    // note that this is essentially no different than ... just using
+    // global variables, though it's only YOUR code that could influence
+    // them, which is a bonus.
+    vm.runInNewContext(str, context, file);
+  });
+};

examples/route-loading/index.js

@@ -0,0 +1,20 @@
+
+/**
+ * Module dependencies.
+ */
+
+var express = require('../../lib/express')
+  , app = express()
+  , db = { users: [] };
+
+app.set('views', __dirname + '/views');
+app.set('view engine', 'jade');
+app.use(express.bodyParser());
+
+// pretend db is a database, could be
+// whatever you like
+require('./boot')(app, db);
+
+app.listen(3000);
+console.log('Express app started on port 3000');
+

examples/route-loading/routes/main.js

@@ -0,0 +1,4 @@
+
+app.get('/', function(req, res){
+  res.render('index');
+});

examples/route-loading/routes/user.js

@@ -0,0 +1,18 @@
+
+app.get('/users', function(req, res){
+  res.render('user/list', { users: db.users });
+});
+
+app.get('/user/add', function(req, res){
+  res.render('user/add');
+});
+
+app.post('/user', function(req, res){
+  var user = req.body.user;
+  db.users.push(user);
+  res.redirect('/users');
+});
+
+app.get('/user/:id', function(req, res){
+  res.render('user');
+});

examples/route-loading/views/index.jade

@@ -0,0 +1,8 @@
+
+extends layout
+
+block content
+  h2 Route sharing example
+  ul
+    li: a(href='/user/add') Add user
+    li: a(href='/users') User list

examples/route-loading/views/layout.jade

@@ -0,0 +1,11 @@
+doctype html
+html
+  head
+    title Route loading example
+    style
+      body {
+        padding: 50px;
+        font: 14px/1.5 solid helvetica, arial, sans-serif;
+      }
+  body
+    block content

examples/route-loading/views/user/add.jade

@@ -0,0 +1,9 @@
+
+extends ../layout
+
+block content
+  h2 Add a user
+  form(action='/user', method='post')
+    p: input(type='text', name='user[name]', placeholder='Username')
+    p: input(type='text', name='user[email]', placeholder='Email')
+    p: input(type='submit', value='Add')

examples/route-loading/views/user/index.jade

@@ -0,0 +1,10 @@
+
+extends ../layout
+
+block content
+  h1= user.name
+  table
+    tbody
+      tr
+        td Email
+        td= user.email

examples/route-loading/views/user/list.jade

@@ -0,0 +1,10 @@
+
+extends ../layout
+
+block content
+  h1 Users
+  if users.length
+    for user in users
+      include index
+  else
+    p No users, head over to <a href='/user/add'>/user/add</a> to create one.

examples/route-map/index.js

@@ -0,0 +1,63 @@
+
+var express = require('../../lib/express')
+  , verbose = process.env.NODE_ENV != 'test'
+  , app = module.exports = express();
+
+app.map = function(a, route){
+  route = route || '';
+  for (var key in a) {
+    switch (typeof a[key]) {
+      // { '/path': { ... }}
+      case 'object':
+        app.map(a[key], route + key);
+        break;
+      // get: function(){ ... }
+      case 'function':
+        if (verbose) console.log('%s %s', key, route);
+        app[key](route, a[key]);
+        break;
+    }
+  }
+};
+
+var users = {
+  list: function(req, res){
+    res.send('user list');
+  },
+
+  get: function(req, res){
+    res.send('user ' + req.params.uid);
+  },
+
+  del: function(req, res){
+    res.send('delete users');
+  }
+};
+
+var pets = {
+  list: function(req, res){
+    res.send('user ' + req.params.uid + '\'s pets');
+  },
+
+  del: function(req, res){
+    res.send('delete ' + req.params.uid + '\'s pet ' + req.params.pid);
+  }
+};
+
+app.map({
+  '/users': {
+    get: users.list,
+    del: users.del,
+    '/:uid': {
+      get: users.get,
+      '/pets': {
+        get: pets.list,
+        '/:pid': {
+          del: pets.del
+        }
+      }
+    }
+  }
+});
+
+app.listen(3000);

examples/route-middleware/app.js

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

examples/route-separation/app.js

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

examples/route-separation/post.js

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

examples/route-separation/public/style.css

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

examples/route-separation/site.js

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