Release 0.7.3

This reverts commit 31fdba80d4.

.gitignore

@@ -1 +1,3 @@
 .DS_Store
+*.seed
+*.log

.gitmodules

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

History.md

@@ -1,4 +1,29 @@
 
+0.7.3 / 2010-03-16
+==================
+
+  * Added package.json
+  * Fixed requiring of haml / sass due to kiwi removal
+
+0.7.2 / 2010-03-16
+==================
+
+  * Fixed GIT submodules (HAH!)
+
+0.7.1 / 2010-03-16
+==================
+
+  * Changed; Express now using submodules again until a PM is adopted
+  * Changed; chat example using millisecond conversions from ext
+
+0.7.0 / 2010-03-15
+==================
+
+  * Added Request#pass() support (finds the next matching route, or the given path)
+  * Added Logger plugin (default "common" format replaces CommonLogger)
+  * Removed Profiler plugin
+  * Removed CommonLogger plugin
+
 0.6.0 / 2010-03-11
 ==================
 

Readme.md

@@ -24,14 +24,16 @@
   
 ## Installation
 
-Currently Express must be cloned (or downloaded), you can use the following command to
-get rolling and initialize the submodule dependencies:
+  Install the [Kiwi package manager for nodejs](http://github.com/visionmedia/kiwi)
+  and run:
+  
+      $ kiwi -v install express
+      
+or
 
-    $ git clone git://github.com/visionmedia/express.git && cd express && git submodule update --init && make app
-    
-Or with the [gh](http://github.com/visionmedia/gh) utility:
-
-    $ gh clone visionmedia express && cd express && git submodule update --init && make app
+  Install via git clone:
+  
+      $ git://github.com/visionmedia/express.git && cd express && git submodule update --init
 
 ## Performance
 
@@ -42,30 +44,24 @@ Or with the [gh](http://github.com/visionmedia/gh) utility:
 
 ## Examples
 
-Below is a minimal app example when express is already within your load path.
+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')
-    require('express/plugins')
     
-    configure(function(){
-      use(MethodOverride)
-      use(ContentLength)
-      set('root', __dirname)
+    get('/user', function(){
+      this.redirect('/user/' + this.currentUser.id)
     })
     
-    get('/hello', function(){
-      this.contentType('html')
-      return '<h1>World<h1>'
-    })
-    
-    get('/user/:id?', function(id) {
+    get('/user/:id', function(id){
       this.render('user.haml.html', {
         locals: {
-          name: id ? 'User ' + id : 'You' 
+          user: this.currentUser,
+          usersOnline: Session.store.length()
         }
       })
     })
-    
+
     run()
   
 ## Running Tests
@@ -84,7 +80,7 @@ Run individual suites:
     ...
     
 Express is currently being developed with node --version:
-    v0.1.31
+    v0.1.32
     
 ## More Information
 

examples/chat/app.js

@@ -4,25 +4,20 @@ require('express')
 require('express/plugins')
 
 var messages = [],
-    utils = require('express/utils'),
-    kiwi = require('kiwi')
-
+    utils = require('express/utils')
+    
 configure(function(){
-  var fiveMinutes = 300000,
-      oneMinute = 60000
-  kiwi.seed('haml')
-  kiwi.seed('sass')
   use(MethodOverride)
   use(ContentLength)
-  use(CommonLogger)
   use(Cookie)
-  use(Cache, { lifetime: fiveMinutes, reapInterval: oneMinute })
-  use(Session, { lifetime: fiveMinutes, reapInterval: oneMinute })
+  use(Cache, { lifetime: (5).minutes, reapInterval: (1).minute })
+  use(Session, { lifetime: (15).minutes, reapInterval: (1).minute })
+  use(Logger)
   set('root', __dirname)
 })
 
 get('/', function(){
-  this.redirect('/chat')
+  this.pass('/chat')
 })
 
 get('/chat', function(){

examples/upload/app.js

@@ -3,17 +3,13 @@ require.paths.unshift('lib')
 require('express')
 require('express/plugins')
 
-var kiwi = require('kiwi')
-
 configure(function(){
-  kiwi.seed('haml')
-  kiwi.seed('sass')
   use(MethodOverride)
   use(ContentLength)
-  use(CommonLogger)
   use(Cookie)
   use(Session)
   use(Flash)
+  use(Logger)
   set('root', __dirname)
 })
 

lib/express.js

@@ -1,5 +1,7 @@
 
-var kiwi = require('kiwi')
-kiwi.require('oo', '>= 1.2.0')
-kiwi.require('ext', '>= 0.2.2')
+require.paths.unshift(__dirname + '/support/ext/lib')
+require.paths.unshift(__dirname + '/support/haml/lib')
+require.paths.unshift(__dirname + '/support/sass/lib')
+require('ext')
+require('support/oo/lib/oo')
 require('express/core')

lib/express/core.js

@@ -104,10 +104,19 @@ Router = Class({
    * @api private
    */
   
-  route: function(){
-    var route = this.matchingRoute()
-    if (route)
-      return route.fn.apply(this.request, this.request.captures.slice(1))
+  route: function() { 
+    var body, 
+        route = this.matchingRoute()
+    if (route) {
+      body = route.fn.apply(this.request, this.request.captures.slice(1));
+      if (this.request.passed) {
+        if (typeof this.request.passed === 'string')
+          this.request.url.pathname = this.request.passed
+        this.request.passed = false
+        return this.route()
+      }
+      return body
+    }
     else if (this.request.accepts('html') && set('helpful 404'))
       this.request.halt(404, require('express/pages/not-found').render(this.request))
     else
@@ -121,10 +130,13 @@ Router = Class({
    * @api private
    */
   
-  matchingRoute: function(){
-    return Express.routes.find(function(route){
-      return this.match(route)
-    }, this)
+  matchingRoute: function() {
+    this.lastMatchingRoute = this.lastMatchingRoute || 0
+    var routes = Express.routes, route
+    while (route = routes[this.lastMatchingRoute++]) 
+      if (this.match(route))
+        break
+    return route
   },
   
   /**
@@ -302,7 +314,7 @@ Server = Class({
 // --- Express
 
 Express = { 
-  version: '0.6.0',
+  version: '0.7.3',
   config: [],
   routes: [],
   plugins: [],

lib/express/plugins.js

@@ -1,13 +1,11 @@
 
 // Express - Plugins - Copyright TJ Holowaychuk <tj@vision-media.ca> (MIT Licensed)
 
-var utils = require('express/utils')
-utils.mixin(require('express/plugins/hooks'))
-utils.mixin(require('express/plugins/flash'))
-utils.mixin(require('express/plugins/cache'))
-utils.mixin(require('express/plugins/cookie'))
-utils.mixin(require('express/plugins/session'))
-utils.mixin(require('express/plugins/profiler'))
-utils.mixin(require('express/plugins/common-logger'))
-utils.mixin(require('express/plugins/content-length'))
-utils.mixin(require('express/plugins/method-override'))
+global.merge(require('express/plugins/hooks'))
+global.merge(require('express/plugins/flash'))
+global.merge(require('express/plugins/cache'))
+global.merge(require('express/plugins/cookie'))
+global.merge(require('express/plugins/session'))
+global.merge(require('express/plugins/logger'))
+global.merge(require('express/plugins/content-length'))
+global.merge(require('express/plugins/method-override'))

lib/express/plugins/common-logger.js

@@ -1,50 +0,0 @@
-
-// Express - CommonLogger - Copyright TJ Holowaychuk <tj@vision-media.ca> (MIT Licensed)
-
-/**
- * Months.
- */
-
-var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
-
-/**
- * Format _date_.
- *
- * @param  {Date} date
- * @return {string}
- * @api private
- */
- 
-function format(date) {
-  var d = date.getDate(),
-      m = months[date.getMonth()],
-      y = date.getFullYear(),
-      h = date.getHours(),
-      mi = date.getMinutes(),
-      s = date.getSeconds()
-  return (d < 10 ? '0' : '') + d + '/' + m + '/' + y + ' ' +
-         (h < 10 ? '0' : '') + h + ':' + (mi < 10 ? '0' : '') + 
-         mi + ':' + (s < 10 ? '0' : '') + s
-}
-
-// --- CommonLogger
- 
-exports.CommonLogger = Plugin.extend({
-  on: {
-    
-    /**
-     * Output log data.
-     */
-    
-    response: function(event) {
-      puts([event.request.connection.remoteAddress, 
-            '-', 
-            '-',
-            '[' + format(new Date) + ']', 
-            '"' + event.request.method.toUpperCase() + ' ' + (event.request.url.pathname || '/') + 
-            ' HTTP/' + event.request.httpVersion + '"',
-            event.request.response.status,
-            event.request.response.headers['content-length'] || 0].join(' ')) 
-    }
-  }
-})

lib/express/plugins/logger.js

@@ -0,0 +1,80 @@
+
+// Express - Logger - Copyright TJ Holowaychuk <tj@vision-media.ca> (MIT Licensed)
+
+/**
+ * Module dependencies.
+ */
+ 
+var sys = require('sys')
+
+/**
+ * Log formats
+ */
+ 
+var formats = {
+  common: function(event, start) {
+    printf('%s - - [%s] "%s %s HTTP/%d" %s %d %0.3f',
+      event.request.connection.remoteAddress,
+      (new Date).format('%d/%b/%Y %H:%M:%S'),
+      event.request.method.uppercase,
+      event.request.url.pathname || '/',
+      event.request.httpVersion,
+      event.request.response.status,
+      event.request.response.headers['content-length'] || 0,
+      (Number(new Date) - start) / 1000)
+  },
+  combined: function(event, start) {
+    formats.common(event, start)
+    printf('"%s" "%s"', 
+      event.request.headers['referrer'] || event.request.headers['referer'] || '-',
+      event.request.headers['user-agent'])
+  },
+  plot: function(event, start) {
+    sys.print(Number(new Date) - start)
+  }
+}
+
+// --- Logger
+
+exports.Logger = Plugin.extend({ 
+  extend: {
+    
+    /**
+     * Initialize logger options.
+     *
+     * Options:
+     *
+     *   - format
+     *       'common' outputs log in CommonLog format (DEFAULT)
+     *       'combined' outputs log in Apache Combined format
+     *       'plot' outputs request duration in milliseconds only
+     *
+     * @param  {hash} options
+     * @api private
+     */
+
+    init: function(options) {
+      this.merge(options || {})
+    }
+  },
+  
+  on: {
+    
+    /**
+     * Start timer.
+     */
+    
+    request: function(event) {
+      this.start = Number(new Date)
+    },
+    
+    /**
+     * Output log data.
+     */
+    
+    response: function(event) {
+      formats[exports.Logger.format || 'common'](event, this.start)
+      sys.print('\n')
+    }
+  }
+})

lib/express/plugins/profiler.js

@@ -1,51 +0,0 @@
-
-// Express - Profiler - Copyright TJ Holowaychuk <tj@vision-media.ca> (MIT Licensed)
-
-var n = 0
-
-exports.Profiler = Plugin.extend({
-  extend: {
-    
-    /**
-     * Initialize profiler options.
-     *
-     * Options:
-     *
-     *   - format  'plot' outputs request duration in milliseconds only
-     *
-     * @param  {hash} options
-     * @api private
-     */
-    
-    init: function(options) {
-      this.merge(options || {})
-    }
-  },
-  
-  // --- Events
-  
-  on: {
-    
-    /**
-     * Start timer.
-     */
-    
-    request: function(event) {
-      this.start = Number(new Date)
-    },
-    
-    /**
-     * Output duration.
-     */
-    
-    response: function(event) {
-      if (exports.Profiler.format === 'plot')
-        puts(Number(new Date) - this.start)
-      else
-        puts(event.request.method + ' ' + 
-             event.request.url.pathname + ': ' + 
-             (Number(new Date) - this.start) + ' ms' +
-             ' #' + ++n)
-    }
-  }
-})

lib/express/plugins/session.js

@@ -168,12 +168,9 @@ exports.Session = Plugin.extend({
      */
     
     startReaper: function() {
-      var self = this,
-          oneDay = 86400000,
-          oneHour = 3600000
       setInterval(function(){
-        self.store.reap(self.lifetime || oneDay)
-      }, self.reapInterval || self.reapEvery || oneHour)
+        this.store.reap(this.lifetime || (1).day)
+      }, this.reapInterval || this.reapEvery || (1).hour, this)
     }
   },
   

lib/express/request.js

@@ -178,6 +178,22 @@ exports.Request = Class({
     });
   },
   
+  /**
+   * Pass control to the next matching route, or
+   * the given _path_.
+   *
+   * NOTE: _path_ may be the request pathname only,
+   * and may not contain a query string etc.
+   *
+   * @param {string} path
+   * @api public
+   */
+  
+  pass: function(path) {
+    this.passed = path || true
+    return this
+  },
+  
   /**
    * Set Content-Type header to the mime type
    * for the given _path_, which calls mime.type().

package.json

@@ -0,0 +1,14 @@
+{
+  "name": "Express",
+  "description": "Sinatra inspired web development framework",
+  "version": "0.7.3",
+  "keywords": ["framework", "sinatra", "web", "rest", "restful"],
+  "directories": {
+    "lib": "lib"
+  },
+  "scripts": {
+    "install": "git submodule update --init",
+    "test": "make test"
+  },
+  "engines": { "node": ">= 0.1.30" }
+}

seed.yml

@@ -1,9 +1,4 @@
 ---
   name: Express
   description: Sinatra inspired web development framework
-  version: 0.6.0
-  dependencies:
-    - ext >= 0.2.2
-    - oo >= 1.2.0
-    - sass >= 0.3.0
-    - haml >= 0.1.2
+  version: 0.7.3

spec/node.js

@@ -25,7 +25,6 @@ specs = {
     'plugins',
     'plugins.cache',
     'plugins.view',
-    'plugins.common-logger',
     'plugins.content-length',
     'plugins.method-override',
     'plugins.body-decoder',

spec/spec.plugins.common-logger.js

@@ -1,23 +0,0 @@
-
-describe 'Express'
-  before_each
-    reset()
-    use(require('express/plugins/common-logger').CommonLogger)
-  end
-  
-  describe 'CommonLogger'
-    describe 'on'
-      describe 'response'
-        it 'should output in common log format'
-          GLOBAL.stub('puts')
-          GLOBAL.should.receive('puts')
-          get('/style.css', function(){
-            this.contentType('css')
-            return 'body { background: #000; }'
-          })
-          get('/style.css')
-        end
-      end
-    end
-  end
-end

spec/spec.request.js

@@ -198,6 +198,33 @@ describe 'Express'
         })
         get('/public/app.js').body.should.eql 'public, app, js'
       end
-    end    
+    end
+    
+    describe '#pass()'
+      it 'should pass control to the next matching route'
+        get('/user', function(){ 
+          this.pass()
+        })
+        get('/user', function(){
+          this.pass()
+          return 'nodejs'
+        })
+        get('/user', function(){ return 'success'})
+        get('/user').body.should.eql 'success'
+      end
+      
+      describe 'given a string'
+        it 'should pass to the given route'
+          get('/user', function(){
+            this.pass('/user/1')
+          })
+          get('/user/:id', function(){
+            return 'Supa doopa usa'
+          })
+          get('/user').body.should.eql 'Supa doopa usa'
+        end
+      end
+    end
+        
   end
 end