0.3.4: express 3 support

package.json

@@ -3,7 +3,7 @@
   "name": "phantom",
   "description": "PhantomJS wrapper for Node",
   "homepage": "https://github.com/sgentle/phantomjs-node",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "repository": {
     "type": "git",
     "url": "git://github.com/sgentle/phantomjs-node.git"

phantom.coffee

@@ -32,23 +32,23 @@ module.exports =
     app = express.createServer()
     app.use express.static __dirname
 
-    app.listen()
+    appServer = app.listen()
 
     server = dnode()
 
     phantom = null
 
-    ps = startPhantomProcess app.address().port, args
+    ps = startPhantomProcess appServer.address().port, args
 
     ps.on 'exit', (code) ->
-      app.close()
+      appServer.close()
       phanta = (p for p in phanta when p isnt phantom)
 
     io =
       log: null,
       'client store expiration': 0
 
-    server.listen app, {io}, (obj, conn) ->
+    server.listen appServer, {io}, (obj, conn) ->
       phantom = conn.remote
       wrap phantom
       phanta.push phantom

test/adv.coffee

@@ -29,7 +29,7 @@ app.get '/', (req, res) ->
     </html>
   """
 
-app.listen()
+appServer = app.listen()
 
 describe "The phantom module"
   "Can create an instance with --load-images=no":
@@ -41,7 +41,7 @@ describe "The phantom module"
       topic: t (p) ->
         test = this
         p.createPage (page) ->
-          page.open "http://127.0.0.1:#{app.address().port}/", (status) =>
+          page.open "http://127.0.0.1:#{appServer.address().port}/", (status) =>
             setTimeout =>
               test.callback null, page, status
             , 1500
@@ -67,7 +67,7 @@ describe "The phantom module"
 
 
     teardown: (p) ->
-      app.close()
+      appServer.close()
       p.exit()
 
 

test/page.coffee

@@ -34,7 +34,7 @@ app.get '/', (req, res) ->
     </html>
   """
 
-app.listen()
+appServer = app.listen()
 
 describe "Pages"
   "A Phantom page":
@@ -46,7 +46,7 @@ describe "Pages"
 
     "can open a URL on localhost":
       topic: t (page) ->
-        page.open "http://127.0.0.1:#{app.address().port}/", (status) =>
+        page.open "http://127.0.0.1:#{appServer.address().port}/", (status) =>
           @callback null, page, status
 
       "and succeed": (err, page, status) ->
@@ -131,5 +131,5 @@ describe "Pages"
             fs.unlink fileName
 
     teardown: (page, ph) ->
-      app.close()
+      appServer.close()
       ph.exit()