Merge pull request WardCunningham#109 from nrn/master

Express: Farming and openID

server/express/lib/farm.coffee

@@ -27,6 +27,8 @@ module.exports = exports = (argv) ->
       newargv.p = hosts[req.headers.host]
       newargv.d = path.join(argv.r or path.join(__dirname, '..', '..', '..'), 'data', req.headers.host)
       newargv.u = "http://#{req.headers.host}"
-      runningServers.push(server(newargv))
-      bounce(hosts[req.headers.host])
+      local = server(newargv)
+      runningServers.push(local)
+      local.once "ready", ->
+        bounce(hosts[req.headers.host])
   ).listen(argv.p)

server/express/lib/server.coffee

@@ -17,12 +17,14 @@ module.exports = exports = (argv) ->
   http = require('http')
   hbs = require('hbs')
   favicon = require('./favicon.coffee')
-  passport = require('passport')
+  random = require('./random_id.coffee')
+  passportImport = require('passport')
   OpenIDstrat = require('passport-openid').Strategy
   # defaultargs.coffee exports a function that takes the argv object that is passed in and then does its
   # best to supply sane defaults for any arguments that are missing.
   argv = require('./defaultargs')(argv)
-
+
+  passport = new passportImport.Passport()
   # Tell pagehandler where to find data, and default data.
   pagehandler = require('./page')(argv)
 
@@ -50,7 +52,8 @@ module.exports = exports = (argv) ->
           console.log("Claimed by #{id}")
           owner = id
           cb())
-      else cb()
+      else
+        cb()
     )
 
   # Make sure that an action can only be taken
@@ -304,7 +307,7 @@ module.exports = exports = (argv) ->
         resp.on('error', (e) ->
           console.log("Error: #{e}")
         )
-        resp.on('end', -
+        resp.on('end', ->
           actionCB(JSON.parse(responsedata))
         )
       ).on('error', (e) ->
@@ -356,5 +359,7 @@ module.exports = exports = (argv) ->
   #### Starting the server.
   setOwner null, ->
     app.listen(argv.p, argv.o if argv.o)
+    app.emit "ready"
     console.log("Smallest Federated Wiki server listening on #{app.address().port} in mode: #{app.settings.env}")
+
   app

server/express/test/server.coffee

@@ -8,8 +8,15 @@ pagehandler = require('../lib/page.coffee')(argv)
 
 describe 'server', ->
   describe '#actionCB()', ->
-    runningServer = server(argv)
-    routeCB = runningServer.routes.routes.put[0].callbacks[1]
+    runningServer = {}
+    routeCB = {}
+    before((done) ->
+      runningServer = server(argv)
+      runningServer.once("ready", ->
+        routeCB = runningServer.routes.routes.put[0].callbacks[1]
+        done()
+      )
+    )
     req = {
       body: {}
       params: [ "asdf-test-page" ]
@@ -78,4 +85,5 @@ describe 'server', ->
       res.send = createSend(test, done)
       routeCB(req, res)
 
-    runningServer.close()
+    after( ->
+      runningServer.close())