Update interfaces for node 0.8 and express 3.0

app/lib/runner.js

@@ -12,7 +12,7 @@ Runner.exec = function(command, args, hollaback) {
   child.stderr.on("data", function(chunk) {
     error += chunk.toString();
   });
-  child.on("exit", function(code) {
+  child.on("close", function(code) {
     if (error) {
       hollaback(error);
     } else {

app/socket_routes.js

@@ -23,7 +23,8 @@ module.exports = function(server, sessionStore) {
     io.set("authorization", function(data, hollaback) {
       var sid = cookie.parse(data.headers.cookie)["connect.sid"];
       if (!sid) return hollaback(null, false);
-      sessionStore.get(querystring.unescape(sid), function(error, session) {
+      var parsedSessionId = sid.match(/s:([^.]*)/)[1];
+      sessionStore.get(parsedSessionId, function(error, session) {
         if (error) return hollaback(error);
         if (session) {
           data.session = session;
@@ -54,10 +55,10 @@ module.exports = function(server, sessionStore) {
     });
   };
 
-  function refreshVotes(track, socket) {
+  function refreshVotes(track) {
     TrackManager.metadata(track.id, function(error, track) {
       if (error) return;
-      socket.emit("votes", track.meta.votes || {});
+      io.sockets.emit("votes", track.meta.votes || {});
     });
   };
 
@@ -143,7 +144,7 @@ module.exports = function(server, sessionStore) {
             if (error) return;
             refreshLikes(user, socket);
             if (track.id === Player.properties().track.id) {
-              refreshVotes(Player.properties().track, socket);
+              refreshVotes(Player.properties().track);
               TrackManager.score(track.id, function(error, score) {
                 if (score < 0) {
                   Player.next(function() {});
@@ -200,7 +201,7 @@ module.exports = function(server, sessionStore) {
 
     Player.on("track", function(properties) {
       io.sockets.emit("player/track", properties.track);
-      refreshVotes(properties.track, socket);
+      refreshVotes(properties.track);
     });
 
 

boot.js

@@ -1,5 +1,6 @@
 var path              = require("path");
 var underscore        = require("underscore");
+var http              = require("http");
 var express           = require("express");
 var assetbuilder      = require("asset_builder");
 var passport          = require("passport");
@@ -18,8 +19,10 @@ var Airfoil           = require(path.join(app.root, "app", "lib", "application_i
 var sessionStore = new express.session.MemoryStore;
 
 function initExpress() {
-  var server = express.createServer();
-  server.configure(function() {
+  var application = express();
+  var server = http.createServer(application);
+  var router = express
+  application.configure(function() {
     this.use(express.errorHandler({
       showStack: true,
       dumpExceptions: true
@@ -32,14 +35,14 @@ function initExpress() {
     this.use(express.session(underscore.extend({store: sessionStore}, settings.session)));
     this.use(passport.initialize());
     this.use(passport.session());
-    this.use(express.router(authentication));
-    this.use(express.router(httpRoutes));
+    authentication(application);
+    httpRoutes(application);
     this.set("views", path.join("app", "views"));
     this.set("view engine", "jade");
-    this.set("view options", {layout: false });
+    this.set("view options", {layout: false});
   });
 
-  assetbuilder.registerViewHelpers(server);
+  assetbuilder.registerViewHelpers(application);
   assetbuilder.registerPreprocessor(emberPreprocessor);
   assetbuilder.configure({ env: app.env });
 

config/authentication.js

@@ -24,7 +24,6 @@ passport.deserializeUser(function(obj, done) {
 
 passport.use(new Strategy(underscore.extend(passportSettings, settings.google_auth), function(accessToken, refreshToken, profile, hollaback) {
   var user = profile["_json"];
-  console.log(user);
   if (!user.email.match("@" + settings.google_auth.domain)) return hollaback(null, false);
   db.collection("users", function(error, collection) {
     if (error) return hollaback(error);

package.json

@@ -1,24 +1,24 @@
 {
   "name": "spotbox_server",
-  "version": "2.0.0-alpha1",
+  "version": "2.0.0-alpha2",
   "author": "Andrew Grieser <agrieser@gmail.com>, Tony Schneider <tonywok@gmail.com>",
   "description": "Jukebox",
   "dependencies": {
-    "express":               "2.5.10",
-    "cookie":                "0.0.3",
-    "passport":              "0.1.10",
-    "passport-google-oauth": "0.1.4",
-    "jade":                  "0.26.1",
-    "socket.io":             "0.9.6",
-    "asset_builder":         "0.2.2",
-    "redis":                 "0.7.2",
-    "mongodb":               "1.0.2",
-    "underscore":            "1.3.3",
-    "underscore.string":     "2.2.0rc",
+    "express":               "3.0.0beta4",
+    "cookie":                "*",
+    "passport":              "*",
+    "passport-google-oauth": "*",
+    "jade":                  "*",
+    "socket.io":             "*",
+    "asset_builder":         "*",
+    "redis":                 "*",
+    "mongodb":               "*",
+    "underscore":            "*",
+    "underscore.string":     "*",
     "async_runner":          "git://github.com/agrieser/async_runner.git"
   },
   "license": "MIT",
   "engine": {
-    "node": ">=0.6"
+    "node": ">=0.8"
   }
 }