Release 0.14.1

.gitignore

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

.gitmodules

@@ -0,0 +1,15 @@
+[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/class"]
+	path = lib/support/class
+	url = git://github.com/visionmedia/class.js.git
+[submodule "lib/support/haml"]
+	path = lib/support/haml
+	url = git://github.com/visionmedia/haml.js.git
+[submodule "lib/support/multipart"]
+	path = lib/support/multipart
+	url = git://github.com/isaacs/multipart-js.git

.npmignore

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

.travis.yml

@@ -1,3 +0,0 @@
-language: node_js
-node_js:
-  - "0.10"

LICENSE

@@ -1,22 +0,0 @@
-(The MIT License)
-
-Copyright (c) 2009-2013 TJ Holowaychuk <tj@vision-media.ca>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'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,34 +1,39 @@
+		
+AB = ab
+ABFLAGS = -n 3000 -c 50
+NODE = node
+COFFEE = coffee
 
-MOCHA_OPTS= --check-leaks
-REPORTER = dot
+all: test
+	
+test:
+	@$(NODE) spec/node.js all
+	
+app: app-chat
+	
+prof:
+	@$(NODE) --prof --prof_auto examples/chat/app.js
+	
+app-chat:
+	@$(NODE) examples/chat/app.js
 
-check: test
+app-hello-world:
+	@$(NODE) examples/hello-world/app.js
 
-test: test-unit test-acceptance
+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
 
-test-unit:
-	@NODE_ENV=test ./node_modules/.bin/mocha \
-		--reporter $(REPORTER) \
-		--globals setImmediate,clearImmediate \
-		$(MOCHA_OPTS)
+benchmark: benchmarks/run
+	@./benchmarks/run
+	@./benchmarks/graph
 
-test-acceptance:
-	@NODE_ENV=test ./node_modules/.bin/mocha \
-		--reporter $(REPORTER) \
-		--bail \
-		test/acceptance/*.js
+graphs:
+	@./benchmarks/graph
 
-test-cov: lib-cov
-	@EXPRESS_COV=1 $(MAKE) test REPORTER=html-cov > coverage.html
-
-lib-cov:
-	@jscoverage lib lib-cov
-
-bench:
-	@$(MAKE) -C benchmarks
-
-clean:
-	rm -f coverage.html
-	rm -fr lib-cov
-
-.PHONY: test test-unit test-acceptance bench clean
+.PHONY: install test app benchmark graphs

Readme.md

@@ -1,110 +1,121 @@
-[![express logo](http://f.cl.ly/items/0V2S1n0K1i3y1c122g04/Screen%20Shot%202012-04-11%20at%209.59.42%20AM.png)](http://expressjs.com/)
 
-  Fast, unopinionated, minimalist web framework for [node](http://nodejs.org).
+# Express
+      
+  Insanely fast (and small) server-side JavaScript web development framework
+  built on **node.js** and the **V8 JavaScript engine**.
 
-  [![Build Status](https://secure.travis-ci.org/visionmedia/express.png)](http://travis-ci.org/visionmedia/express) [![Gittip](http://img.shields.io/gittip/visionmedia.png)](https://www.gittip.com/visionmedia/)
+  * Visit the [Wiki](http://wiki.github.com/visionmedia/express) for documentation
+  * Visit the [Google Group](http://groups.google.com/group/express-js) for discussion
+  
+  Express will soon run on the [Connect](http://github.com/extjs/Connect) project, a middleware layer for nodejs.
 
-```js
-var express = require('express');
-var app = express();
-
-app.get('/', function(req, res){
-  res.send('Hello World');
-});
-
-app.listen(3000);
-```
+## Features (so far)
 
+  * Sexy DSL with robust sinatra-like routing
+  * High performance
+  * Session support
+  * Cache API
+  * RESTful HTTP client
+  * Mime helpers
+  * ETag support
+  * 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)
+  * View partials
+  * View globals/helpers support
+  * Full test coverage
+  * Logger plugin with several formats
+  * Upload size restrictions
+  * Extremely readable specs
+  * Cookie support
+  
 ## Installation
 
-    $ npm install -g express
+  Install the [Kiwi package manager for nodejs](http://github.com/visionmedia/kiwi)
+  and run:
+  
+      $ kiwi install express
 
-## Quick Start
+or via npm:
 
- The quickest way to get started with express is to utilize the executable `express(1)` to generate an application as shown below:
+      $ npm install express
 
- Create the app:
+or
 
-    $ npm install -g express
-    $ express /tmp/foo && cd /tmp/foo
+  Install via git clone:
+  
+      $ git clone git://github.com/visionmedia/express.git && cd express && git submodule update --init
 
- Install dependencies:
+## Examples
 
-    $ npm install
+Below is a tiny Express application. View the [Wiki](http://wiki.github.com/visionmedia/express/) for detailed information.
 
- 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.
-
-  Built on Connect, you can use _only_ what you need, and nothing more. Applications
-  can be as big or as small as you like, even a single file. Express does
-  not force you to use any specific ORM or template engine. With support for over
-  14 template engines via [Consolidate.js](http://github.com/visionmedia/consolidate.js),
-  you can quickly craft your perfect framework.
-
-## More Information
-
-  * [Website and Documentation](http://expressjs.com/) stored at [visionmedia/expressjs.com](https://github.com/visionmedia/expressjs.com)
-  * 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://jsman.ru/express/)
-  * Run express examples [online](https://runnable.com/express)
-
-## Viewing Examples
-
-Clone the Express repo, then install the dev dependencies to install all the example / test suite dependencies:
-
-    $ git clone git://github.com/visionmedia/express.git --depth 1
-    $ cd express
-    $ npm install
-
-Then run whichever tests you want:
-
-    $ node examples/content-negotiation
-
-You can also view live examples here:
-
-<a href="https://runnable.com/express" target="_blank"><img src="https://runnable.com/external/styles/assets/runnablebtn.png" style="width:67px;height:25px;"></a>
+    require.paths.unshift('express/lib')
+    require('express')
+    
+    configure(function(){
+      set('root', __dirname)
+    })
+    
+    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
 
-To run the test suite, first invoke the following command within the repo, installing the development dependencies:
-
-    $ npm install
-
-Then run the 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
+    ...
+    
+The latest release of Express is compatible with node --version:
+    v0.1.98
+    
+With _EDGE_ Express we do our best to keep up to date with node's _EDGE_
+    
+## More Information
+
+  * [JavaScript Extensions &amp; 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
+  * [Express vs Sinatra Benchmarks](http://tjholowaychuk.com/post/543953703/express-vs-sinatra-benchmarks)
+    
 ## Contributors
 
-  https://github.com/visionmedia/express/graphs/contributors
-
-## License
+  * TJ Holowaychuk (visionmedia) &lt;tj@vision-media.ca&gt;
+  * Aaron Heckmann (aheckmann) &lt;aaron.heckmann+github@gmail.com&gt;
+  * Ciaran Jessup (ciaranj) &lt;ciaranj@gmail.com&gt;
+  * Gareth Jones (csausdev) &lt;gareth.jones@sensis.com.au&gt;
+    
+## License 
 
 (The MIT License)
 
-Copyright (c) 2009-2012 TJ Holowaychuk &lt;tj@vision-media.ca&gt;
+Copyright (c) 2009 TJ Holowaychuk &lt;tj@vision-media.ca&gt;
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

benchmarks/Makefile

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

benchmarks/express/haml.js

@@ -0,0 +1,16 @@
+
+require.paths.unshift('lib')
+require('express')
+require('express/plugins')
+
+configure(function(){
+  //enable('cache view contents')
+  set('root', __dirname)
+  set('views', __dirname + '/../shared')
+})
+
+get('/', function(){
+  this.render('page.html.haml')
+})
+
+run()

benchmarks/express/sass.js

@@ -0,0 +1,16 @@
+
+require.paths.unshift('lib')
+require('express')
+require('express/plugins')
+
+configure(function(){
+  //enable('cache view contents')
+  set('root', __dirname)
+  set('views', __dirname + '/../shared')
+})
+
+get('/', function(){
+  this.render('style.css.sass', { layout: false })
+})
+
+run()

benchmarks/express/simple.js

@@ -0,0 +1,9 @@
+
+require.paths.unshift('lib')
+require('express')
+
+get('/', function(){
+  return 'Hello World'
+})
+
+run()

benchmarks/express/static.js

@@ -0,0 +1,15 @@
+
+require.paths.unshift('lib')
+require('express')
+require('express/plugins')
+
+configure(function(){
+  use(Static)
+  set('root', __dirname)
+})
+
+get('/', function(){
+  this.sendfile('benchmarks/shared/jquery.js')
+})
+
+run()

benchmarks/express/static.large.js

@@ -0,0 +1,15 @@
+
+require.paths.unshift('lib')
+require('express')
+require('express/plugins')
+
+configure(function(){
+  use(Static)
+  set('root', __dirname)
+})
+
+get('/', function(){
+  this.sendfile('benchmarks/shared/huge.js')
+})
+
+run()

benchmarks/graph

@@ -0,0 +1,84 @@
+#!/usr/bin/env bash
+
+COL=${COL-9}
+
+#
+# Log <msg ...>
+# 
+# <msg ...>
+#
+
+log(){
+  echo "... $@"
+}
+
+#
+# Output gnuplot script for line graph.
+# 
+# <title> <node> <express> <sinatra>
+#
+
+function line() {
+  cat <<-EOF
+set terminal png
+set output "benchmarks/graphs/$1.png"
+set title "$1"
+set size 1,0.7
+set grid y
+set key left top
+set xlabel "request"
+set ylabel "response time (ms)"
+plot "benchmarks/$2" using $COL smooth sbezier with lines title "node", \\
+     "benchmarks/$3" using $COL smooth sbezier with lines title "express", \\
+     "benchmarks/$4" using $COL smooth sbezier with lines title "sinatra thin"
+EOF
+}
+
+#
+# Output gnuplot script for bar graph.
+# 
+# <title> <node> <express> <sinatra>
+#
+
+function bar() {
+cat <<-EOF
+set terminal png
+set output "benchmarks/graphs/$1.rps.png"
+set title "$1"
+set size 0.7,0.5
+set grid y
+set key left top
+set ylabel "requests per second"
+plot "benchmarks/$1.rps.dat" using 2: xtic(1) with histogram title ""
+EOF
+}
+
+mkdir -p benchmarks/graphs
+
+for type in simple haml sass static static.large; do
+  plot=benchmarks/graphs/$type.p
+  log generating benchmarks/graphs/$type.png
+  line $type \
+       node/$type.js.dat \
+       express/$type.js.dat \
+       thin/$type.ru.dat \
+       > $plot
+  gnuplot $plot
+  
+  log generating benchmarks/graphs/$type.rps.png
+  plot=benchmarks/graphs/$type.rps.p
+  dat=benchmarks/$type.rps.dat
+  :> $dat
+  for server in node express thin; do
+    case $server in
+      node|express) ext=js ;;
+      thin) ext=ru ;;
+    esac
+    rps=$(cat benchmarks/$server/$type.$ext.out | grep "Requests per second:" | awk '{ print $4 }')
+    echo $server $rps >> $dat
+  done
+  bar $type > $plot
+  gnuplot $plot
+done
+
+rm benchmarks/graphs/*.p

benchmarks/middleware.js

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

benchmarks/node/simple.js

@@ -0,0 +1,8 @@
+
+var fs = require('fs'),
+    http = require('http')
+
+http.createServer(function(req, res) {
+  res.writeHead(200, { 'Content-Type': 'text/plain', 'Content-Length': 11 })
+  res.end('Hello World', 'ascii')
+}).listen(3000, 'localhost')

benchmarks/node/static.js

@@ -0,0 +1,14 @@
+
+var fs = require('fs'),
+    http = require('http')
+
+http.createServer(function(req, res) {
+  res.writeHead(200, { 'Content-Type': 'text/plain', 'Transfer-Encoding': 'chunked' })
+  fs.createReadStream('benchmarks/shared/jquery.js')
+    .addListener('data', function(data){
+      res.write(data, 'binary')
+    })
+    .addListener('end', function(){
+      res.end()
+    })
+}).listen(3000, 'localhost')

benchmarks/node/static.large.js

@@ -0,0 +1,14 @@
+
+var fs = require('fs'),
+    http = require('http')
+
+http.createServer(function(req, res) {
+  res.writeHead(200, { 'Content-Type': 'text/plain', 'Transfer-Encoding': 'chunked' })
+  fs.createReadStream('benchmarks/shared/huge.js')
+    .addListener('data', function(data){
+      res.write(data, 'binary')
+    })
+    .addListener('end', function(){
+      res.end()
+    })
+}).listen(3000, 'localhost')

benchmarks/run

@@ -1,16 +1,61 @@
 #!/usr/bin/env bash
 
-echo
-MW=$1 node $2 &
-pid=$!
+SLEEP=${SLEEP-2}
+ABFLAGS=${ABFLAGS-"-n 2000 -c 50"}
+ADDR=${ADDR-http://127.0.0.1:3000/}
+AB=${AB-ab}
 
-sleep 2
+#
+# Log <msg ...>
+# 
+# <msg ...>
+#
 
-wrk 'http://localhost:3333/?foo[bar]=baz' \
-  -d 3 \
-  -c 50 \
-  -t 8 \
-  | grep 'Requests/sec' \
-  | awk '{ print "  " $2 }'
+log(){
+  echo "... $@"
+}
 
-kill $pid
+#
+# Benchmark <type> and <file>
+# 
+#   - starts the server
+#   - allows $SLEEP seconds for startup
+#   - runs $AB
+#   - kills the server process
+# 
+# <type> <file>
+#
+
+bm(){
+  local type=$1
+  local file=$2
+  log benchmarking $type $file
+  case $type in
+    node|express)
+      node benchmarks/$type/$file &
+      ;;
+    thin)
+      thin -R benchmarks/thin/$file -p 3000 start &
+      ;;
+  esac
+  pid=$!
+  sleep $SLEEP
+  $AB $ABFLAGS -g benchmarks/$type/$file.dat $ADDR > benchmarks/$type/$file.out
+  log $(cat benchmarks/$type/$file.out | grep Requests)
+  kill -KILL $pid
+}
+
+log ab $ABFLAGS $ADDR
+bm node simple.js
+bm node static.js
+bm node static.large.js
+bm express simple.js
+bm express static.js
+bm express static.large.js
+bm express haml.js
+bm express sass.js
+bm thin simple.ru
+bm thin static.ru
+bm thin static.large.ru
+bm thin haml.ru
+bm thin sass.ru

benchmarks/shared/layout.haml

@@ -0,0 +1,6 @@
+!!!
+%html
+  %head
+    %title Wahoo
+  %body
+    #primary= yield

benchmarks/shared/layout.html.haml

@@ -0,0 +1,6 @@
+!!!
+%html
+  %head
+    %title Wahoo
+  %body
+    #primary!= body

benchmarks/shared/page.haml

@@ -0,0 +1,10 @@
+%h1 Some title
+%ul
+  %li a
+  %li b
+  %li c
+  %li
+    %ol
+      %li d
+      %li e
+      %li f

benchmarks/shared/page.html.haml

@@ -0,0 +1,10 @@
+%h1 Some title
+%ul
+  %li a
+  %li b
+  %li c
+  %li
+    %ol
+      %li d
+      %li e
+      %li f

benchmarks/shared/style.css.sass

@@ -0,0 +1,73 @@
+body
+  :font-family "Helvetica Neue", "Lucida Grande", "Arial"
+  :font-size 13px
+  :text-align center
+  :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
+  li:hover
+    :cursor pointer
+    :color #2E2E2E
+
+input[type=text]
+  :padding 5px
+  :border 1px solid #ddd
+  :outline none
+input[type=text]:focus
+  :border-color #00C3FF
+
+input[type=submit]
+  :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
+a:hover
+  :padding 0 5px
+a:hover:before
+  :content 'visit: '
+  
+#online
+  :font-size 12px

benchmarks/thin/haml.ru

@@ -0,0 +1,14 @@
+
+require 'rubygems'
+require 'sinatra'
+require 'haml'
+
+configure do
+  set 'views', File.dirname(__FILE__) + '/../shared'
+end
+
+get '/' do
+  haml :page, :ugly => true
+end
+
+run Sinatra::Application

benchmarks/thin/sass.ru

@@ -0,0 +1,14 @@
+
+require 'rubygems'
+require 'sinatra'
+require 'sass'
+
+configure do
+  set 'views', File.dirname(__FILE__) + '/../shared'
+end
+
+get '/' do
+  sass :'style.css'
+end
+
+run Sinatra::Application

benchmarks/thin/simple.ru

@@ -0,0 +1,9 @@
+
+require 'rubygems'
+require 'sinatra'
+
+get '/' do
+  'Hello World'
+end
+
+run Sinatra::Application

benchmarks/thin/static.large.ru

@@ -0,0 +1,9 @@
+
+require 'rubygems'
+require 'sinatra'
+
+get '/' do
+  send_file 'benchmarks/shared/huge.js'
+end
+
+run Sinatra::Application

benchmarks/thin/static.ru

@@ -0,0 +1,9 @@
+
+require 'rubygems'
+require 'sinatra'
+
+get '/' do
+  send_file 'benchmarks/shared/jquery.js'
+end
+
+run Sinatra::Application

examples/auth/app.js

@@ -1,127 +0,0 @@
-/**
- * Module dependencies.
- */
-
-var express = require('../..')
-  , hash = require('./pass').hash
-  , bodyParser = require('body-parser')
-  , cookieParser = require('cookie-parser')
-  , session = require('express-session')
-
-var app = module.exports = express();
-
-// config
-
-app.set('view engine', 'ejs');
-app.set('views', __dirname + '/views');
-
-// middleware
-
-app.use(bodyParser());
-app.use(cookieParser('shhhh, very secret'));
-app.use(session());
-
-// Session-persisted message middleware
-
-app.use(function(req, res, next){
-  var err = req.session.error
-    , msg = req.session.success;
-  delete req.session.error;
-  delete req.session.success;
-  res.locals.message = '';
-  if (err) res.locals.message = '<p class="msg error">' + err + '</p>';
-  if (msg) res.locals.message = '<p class="msg success">' + msg + '</p>';
-  next();
-});
-
-// 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, click to <a href="/logout">logout</a>');
-});
-
-app.get('/logout', function(req, res){
-  // destroy the user's session to log them out
-  // will be re-created next request
-  req.session.destroy(function(){
-    res.redirect('/');
-  });
-});
-
-app.get('/login', function(req, res){
-  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;
-        req.session.success = 'Authenticated as ' + user.name
-          + ' click to <a href="/logout">logout</a>. '
-          + ' You may now access <a href="/restricted">/restricted</a>.';
-        res.redirect('back');
-      });
-    } else {
-      req.session.error = 'Authentication failed, please check your '
-        + ' username and password.'
-        + ' (use "tj" and "foobar")';
-      res.redirect('login');
-    }
-  });
-});
-
-if (!module.parent) {
-  app.listen(3000);
-  console.log('Express started on port 3000');
-}

examples/auth/pass.js

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

examples/auth/views/foot.ejs

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

examples/auth/views/head.ejs

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

examples/auth/views/login.ejs

@@ -1,22 +0,0 @@
-
-<% var title = 'Authentication Example' %>
-<% include head %>
-
-<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>
-
-<% include foot %>

examples/big-view/index.js

@@ -1,25 +0,0 @@
-
-var express = require('../..')
-  , logger = require('morgan')
-  , 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(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

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

@@ -0,0 +1,80 @@
+
+require.paths.unshift('lib')
+require('express')
+require('express/plugins')
+
+var messages = [],
+    utils = require('express/utils'),
+    http = require('express/http')
+    
+configure(function(){
+  use(Logger)
+  use(MethodOverride)
+  use(ContentLength)
+  use(Cookie)
+  use(Cache, { lifetime: (5).minutes, reapInterval: (1).minute })
+  use(Session, { lifetime: (15).minutes, reapInterval: (1).minute })
+  use(Static)
+  set('root', __dirname)
+})
+
+get('/', function(){ 
+  this.pass('/chat')
+})
+
+get('/chat', function(){
+  var self = this
+  Session.store.length(function(err, len){
+    self.render('chat.html.haml', {
+      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.respond(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.respond(200, JSON.encode(messages)),
+      clearInterval(timer)
+  }, 100)
+})
+
+get('/*.css', function(file){
+  this.render(file + '.css.sass', { 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.notFound()
+})
+
+run()

examples/chat/public/javascripts/app.js

@@ -0,0 +1,28 @@
+
+$(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.html.haml

@@ -0,0 +1,9 @@
+%h1 Chat
+%img.bubble{ src: '/public/images/bubble.png' }
+%ul#messages
+  != this.partial('message.html.haml', { collection: messages })
+%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.html.haml

@@ -0,0 +1,12 @@
+%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/partials/message.html.haml

@@ -0,0 +1 @@
+%li= message

examples/chat/views/style.css.sass

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

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

examples/content-negotiation/db.js

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

examples/content-negotiation/index.js

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

examples/content-negotiation/users.js

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

@@ -1,34 +0,0 @@
-
-/**
- * Module dependencies.
- */
-
-var express = require('../../');
-var favicon = require('static-favicon');
-var cookie-parser = require('cookie-parser');
-
-var app = module.exports = express();
-
-// ignore GET /favicon.ico
-app.use(favicon());
-
-// pass a secret to cookieParser() for signed cookies
-app.use(cookieParser('manny is cool'));
-
-// add req.session cookie support
-app.use(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

@@ -1,58 +0,0 @@
-
-/**
- * Module dependencies.
- */
-
-var express = require('../../')
-  , app = module.exports = express()
-  , favicon = require('static-favicon')
-  , logger = require('morgan')
-  , cookieParser = require('cookie-parser')
-  , bodyParser = require('body-parser')
-
-
-// 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(favicon());
-
-// custom log format
-if ('test' != process.env.NODE_ENV)
-  app.use(logger(':method :url'));
-
-// parses request cookies, populating
-// req.cookies and req.signedCookies
-// when the secret is passed, used
-// for signing the cookies.
-app.use(cookieParser('my secret here'));
-
-// parses json, x-www-form-urlencoded, and multipart/form-data
-app.use(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/cors/index.js

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

examples/cors/public/index.html

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

examples/downloads/app.js

@@ -1,44 +0,0 @@
-
-/**
- * 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

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

examples/ejs/index.js

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

examples/ejs/views/footer.html

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

examples/ejs/views/header.html

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

examples/ejs/views/users.html

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

examples/error-pages/index.js

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

examples/error-pages/views/404.jade

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

examples/error-pages/views/500.jade

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

examples/error-pages/views/error.jade

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

examples/error-pages/views/index.jade

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

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

examples/error/index.js

@@ -1,47 +0,0 @@
-
-/**
- * Module dependencies.
- */
-
-var express = require('../../')
-  , logger = require('morgan')
-  , app = module.exports = express()
-  , test = app.get('env') == 'test';
-
-if (!test) app.use(logger('dev'));
-
-// 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!'));
-  });
-});
-
-// the error handler is placed after routes
-// if it were above it would not receive errors
-// from app.get() etc
-app.use(error);
-
-if (!module.parent) {
-  app.listen(3000);
-  console.log('Express started on port 3000');
-}

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

@@ -1,61 +0,0 @@
-
-var express = require('../..')
-  , logger = require('morgan')
-  , 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(logger('dev'));
-
-// earlier on expose an object
-// that we can tack properties on.
-// all res.locals props are exposed
-// to the templates, so "expose" will
-// be present.
-
-app.use(function(req, res, next){
-  res.locals.expose = {};
-  // you could alias this as req or res.expose
-  // to make it shorter and less annoying
-  next();
-});
-
-// pretend we loaded a user
-
-app.use(function(req, res, next){
-  req.user = new User('Tobi');
-  next();
-});
-
-app.get('/', function(req, res){
-  res.redirect('/user');
-});
-
-app.get('/user', function(req, res){
-  // we only want to expose the user
-  // to the client for this route:
-  res.locals.expose.user = req.user;
-  res.render('page');
-});
-
-app.listen(3000);
-console.log('app listening on port 3000');

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

@@ -1,14 +0,0 @@
-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/app.js

@@ -0,0 +1,19 @@
+
+require.paths.unshift('lib')
+require('express')
+    
+configure(function(){
+  set('root', __dirname)
+})
+
+get('/', function(){
+  this.render('front.html.ejs', {
+    locals: {
+      title: 'Hello World',
+      name: 'Joe',
+      items: ['one', 'two', 'three']
+    }
+  })
+})
+
+run()

examples/hello-world/index.js

@@ -1,11 +0,0 @@
-
-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/hello-world/views/front.html.ejs

@@ -0,0 +1,9 @@
+<h1><%= title %></h1>
+<%= this.partial("greeting.html.ejs", { locals: { name: name } }) %>
+<% if (items && items.length) { %>
+    <ul>
+        <% for (var i = 0; i < items.length; ++i) { %>
+            <li><%= items[i] %></li>
+        <% } %>
+    </ul>
+<% } %>

examples/hello-world/views/layout.html.ejs

@@ -0,0 +1,8 @@
+<html>
+    <head>
+      <title><%= title %></title>
+    </head>
+    <body>
+        <%= body %>
+    </body>
+</html>

examples/hello-world/views/partials/greeting.html.ejs

@@ -0,0 +1 @@
+Welcome back, <strong><%= name %></strong>!

examples/jade/index.js

@@ -1,45 +0,0 @@
-
-/**
- * Module dependencies.
- */
-
-var express = require('../../lib/express');
-
-// Path to our public directory
-
-var pub = __dirname + '/public';
-
-// setup middleware
-
-var app = express();
-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

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

examples/jade/views/header.jade

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

examples/jade/views/layout.jade

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

examples/jade/views/users/index.jade

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

examples/jade/views/users/user.jade

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

examples/markdown/index.js

@@ -1,45 +0,0 @@
-
-/**
- * Module dependencies.
- */
-
-var express = require('../..')
-  , fs = require('fs')
-  , md = require('marked').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

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

examples/multipart/index.js

@@ -1,36 +0,0 @@
-
-/**
- * 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

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

examples/mvc/controllers/pet/index.js

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

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

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

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

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

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

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

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

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

@@ -1,93 +0,0 @@
-var express = require('../..');
-var logger = require('morgan');
-var session = require('express-session');
-var cookieParser = require('cookie-parser');
-var bodyParser = require('body-parser');
-
-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;
-};
-
-// log
-if (!module.parent) app.use(logger('dev'));
-
-// serve static files
-app.use(express.static(__dirname + '/public'));
-
-// session support
-app.use(cookieParser('some secret here'));
-app.use(session());
-
-// parse request bodies (req.body)
-app.use(bodyParser());
-
-// expose the "messages" local variable when views are rendered
-app.use(function(req, res, next){
-  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
-   });
-  */
-
-  next();
-  // empty or "flush" the messages so they
-  // don't build up
-  req.session.messages = [];
-});
-
-// 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

@@ -1,73 +0,0 @@
-
-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';
-          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

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

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