From 0450980777a04a7dc18cde4d75af935397c85dd9 Mon Sep 17 00:00:00 2001
From: Luigi Pinca <luigipinca@gmail.com>
Date: Mon, 10 Mar 2014 17:48:09 +0100
Subject: [PATCH] migrated to express 4.x

---
 app.js        | 22 +++++++++++++---------
 lib/sparks.js |  4 ++--
 package.json  | 12 ++++++++----
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/app.js b/app.js
index c3155cc..693ac6b 100644
--- a/app.js
+++ b/app.js
@@ -2,13 +2,17 @@
  * Module dependencies.
  */
 
-var errorHandler = require('./lib/middleware/errorHandler')
+var cookieParser = require('cookie-parser')
+  , errorHandler = require('./lib/middleware/errorHandler')
   , express = require('express')
+  , favicon = require('static-favicon')
   , http = require('http')
   , port = require('./config').port
-  , redisstore = require('connect-redis')(express)
+  , session = require('express-session')
+  , RedisStore = require('connect-redis')(session)
   , secret = process.env.SITE_SECRET || 'shhhh, very secret'
   , site = require('./routes/site')
+  , urlencoded = require('body-parser').urlencoded
   , user = require('./routes/user')
   , usersdb = require('./lib/redis-clients').users;
 
@@ -18,22 +22,20 @@ var errorHandler = require('./lib/middleware/errorHandler')
 
 var app = express()
   , pub = __dirname + '/public' // Path to public directory
-  , sessionstore = new redisstore({client: usersdb})
+  , sessionstore = new RedisStore({client: usersdb})
   , server = http.createServer(app); // HTTP server object
 
 // Configuration
 app.set('view engine', 'jade');
 app.use('/static', express.static(pub, {maxAge: 2419200000})); // 4 weeks = 2419200000 ms
-app.use(express.favicon(pub + '/img/favicon.ico', {maxAge: 2419200000}));
-app.use(express.urlencoded());
-app.use(express.cookieParser(secret));
-app.use(express.session({
+app.use(favicon(pub + '/img/favicon.ico', {maxAge: 2419200000}));
+app.use(urlencoded());
+app.use(cookieParser(secret));
+app.use(session({
   cookie: {maxAge: 14400000}, // 4 h = 14400000 ms
   rolling: true,
   store: sessionstore
 }));
-app.use(app.router);
-app.use(errorHandler);
 
 // Routes
 app.get('/', site.home);
@@ -54,6 +56,8 @@ app.post('/signup', user.validateSignUp, user.userExists, user.emailExists, user
 app.get('/:room', site.room);
 app.get('/user/:username', user.profile);
 
+app.use(errorHandler);
+
 /**
  * Setting up the rooms.
  */
diff --git a/lib/sparks.js b/lib/sparks.js
index c719043..951c71a 100644
--- a/lib/sparks.js
+++ b/lib/sparks.js
@@ -5,8 +5,8 @@
 var config = require('../config')
   , fs = require('fs')
   , minify = require('uglify-js').minify
-  , parseCookie = require('express/node_modules/cookie').parse
-  , parseSignedCookies = require('express/node_modules/connect').utils.parseSignedCookies
+  , parseCookie = require('cookie-parser/node_modules/cookie').parse
+  , parseSignedCookies = require('cookie-parser/lib/parse').signedCookies
   , Primus = require('primus')
   , primus
   , primusemitter = require('primus-emitter')
diff --git a/package.json b/package.json
index 651dbd9..5b02cd3 100644
--- a/package.json
+++ b/package.json
@@ -2,15 +2,19 @@
   "analyze": false,
   "dependencies": {
     "async": "0.2.x",
+    "body-parser": "1.0.x",
     "canvas": "1.1.x",
-    "connect-redis": "1.4.x",
-    "express": "3.4.x",
-    "jade": "1.2.x",
+    "connect-redis": "1.5.x",
+    "cookie-parser": "1.0.x",
+    "express": "4.0.x",
+    "express-session": "1.0.x",
+    "jade": "1.3.x",
     "nodemailer": "0.6.x",
     "primus": "2.0.x",
     "primus-emitter": "3.0.x",
     "primus-rooms": "3.0.x",
     "redis": "0.10.x",
+    "static-favicon": "1.0.x",
     "uglify-js": "2.4.x",
     "ws": "0.4.x"
   },
@@ -30,5 +34,5 @@
     "start": "node app.js"
   },
   "subdomain": "binb",
-  "version": "0.4.5-1"
+  "version": "0.4.5-2"
 }
-- 
2.54.0