Zappa diff to implement #25

zappa-express.diff

diff -rub -x .git zappa-github//src/zappa.coffee zappa/src/zappa.coffee
--- zappa-github//src/zappa.coffee	2011-06-16 15:12:35.000000000 +0200
+++ zappa/src/zappa.coffee	2011-05-16 20:33:06.000000000 +0200
@@ -15,7 +15,7 @@
     @current_app = null
 
     @locals =
-      app: (name) => @app name
+      app: (name,server) => @app name, server
       include: (path) => @include path
       require: require
       global: global
@@ -28,8 +28,8 @@
           @ensure_app 'default' unless @current_app?
           @current_app[name].apply @current_app, arguments
 
-  app: (name) ->
-    @ensure_app name
+  app: (name,server) ->
+    @ensure_app name, server
     @current_app = @apps[name]
   
   include: (file) ->
@@ -39,8 +39,8 @@
   define_with: (code) ->
     scoped(code)(@context, @locals)
 
-  ensure_app: (name) ->
-    @apps[name] = new App(name) unless @apps[name]?
+  ensure_app: (name,server) ->
+    @apps[name] = new App(name,server) unless @apps[name]?
     @current_app = @apps[name] unless @current_app?
 
   read_and_compile: (file) ->
@@ -76,7 +76,7 @@
       i++
 
 class App
-  constructor: (@name) ->
+  constructor: (@name,configure) ->
     @name ?= 'default'
     @port = 5678
     
@@ -85,6 +85,9 @@
       @http_server.register '.coffee', coffeekup
       @http_server.set 'view engine', 'coffee'
     @http_server.configure =>
+      if configure?
+        configure @http_server
+      else
       @http_server.use express.static("#{process.cwd()}/public")
       @http_server.use express.bodyParser()
       @http_server.use express.cookieParser()