updating express modules and making needed changes to get server to s…

…tart

app.js

@@ -10,15 +10,14 @@ _ = require('underscore');
 // Require our base libs
 
 var config      = require('./lib/config-load')();
-var inject      = require('./lib/inject');
 var balance     = require('./lib/balance');
 var middleware  = require('./lib/middleware');
 var locals      = require('./lib/locals');
 var flash       = require('./lib/flash');
 var mongoose    = require('./lib/mongoose');
 var redis       = require('./lib/redis');
 var reload      = require('./lib/reload')();
-var emailer       = require('./lib/emailer');
+var emailer     = require('./lib/emailer');
 
 // Require our components
 
@@ -41,7 +40,7 @@ function createApp(config) {
   // libs
   mongoose(app, config);
   redis(app);
-  inject(app);
+  // inject(app);
   middleware(app);
   locals(app);
   flash(app);

components/dashboard/index.js

@@ -1,12 +1,13 @@
-var path = require('path');
+var path        = require('path');
+var serveStatic = require('serve-static');
 
 module.exports = function(app) {
 
-  app.use(require('express')['static'](path.join(__dirname, 'public')));
+  app.use(serveStatic(path.join(__dirname, 'public')));
 
   app.get('/dashboard', app.user.loggedIn, function(req, res) {
     return res.render(path.join(__dirname, 'dashboard'), {
       user: req.session.user
     });
   });
-};
+};

components/user/index.js

@@ -1,9 +1,10 @@
-var path = require('path');
-var UserModel = require('./model/userModel')();
+var path        = require('path');
+var serveStatic = require('serve-static');
+var UserModel   = require('./model/userModel')();
 
 module.exports = function(app) {
 
-  app.use(require('express')['static'](path.join(__dirname, 'public')));
+  app.use(serveStatic(path.join(__dirname, 'public')));
 
   // hook model and other helpers into app
   app.user = {
@@ -102,4 +103,4 @@ function flash(message) {
 function addParams(req, res, next) {
   res.locals.querystring = req.query;
   return next();
-}
+}

lib/locals/index.js

@@ -14,53 +14,49 @@ module.exports = function(app) {
 
     res.locals.current_user = req.session && req.session.user || null;
     res.locals.is_logged_in = (res.locals.current_user !== null);
-    
+
     return next();
   });
 
-  app.locals({
-
-    inspect: function (obj, title) {
-      if (!title) title = '';
-      return '<div class="debug_output"><h3>'+title+'</h3><pre>'+require('util').inspect(obj, true, 5)+'</pre></div>';
-    },
+  app.locals.inspect = function (obj, title) {
+    if (!title) title = '';
+    return '<div class="debug_output"><h3>'+title+'</h3><pre>'+require('util').inspect(obj, true, 5)+'</pre></div>';
+  },
 
-    embedObj: function(obj, name) {
-      var escaped = JSON.stringify(obj);
-      return "<script> " + name + " = " + escaped + "; </script>";
-    },
+  app.locals.embedObj = function(obj, name) {
+    var escaped = JSON.stringify(obj);
+    return "<script> " + name + " = " + escaped + "; </script>";
+  },
 
-    embed: function(obj, name) {
-      return "<script> " + name + " = \"" + obj + "\"; </script>";
-    },
+  app.locals.embed = function(obj, name) {
+    return "<script> " + name + " = \"" + obj + "\"; </script>";
+  },
 
-    relative_date: function(olderDate) {
+  app.locals.relative_date = function(olderDate) {
 
-      if (typeof olderDate == "string") olderDate = new Date(olderDate);
-      newerDate = new Date();
+    if (typeof olderDate == "string") olderDate = new Date(olderDate);
+    newerDate = new Date();
 
-      var milliseconds = newerDate - olderDate;
+    var milliseconds = newerDate - olderDate;
 
-      var conversions = [
-        ["years", 31518720000],
-        ["months", 2626560000 /* assumes there are 30.4 days in a month */],
-        ["days", 86400000],
-        ["hours", 3600000],
-        ["minutes", 60000],
-        ["seconds", 1000]
-      ];
+    var conversions = [
+      ["years", 31518720000],
+      ["months", 2626560000 /* assumes there are 30.4 days in a month */],
+      ["days", 86400000],
+      ["hours", 3600000],
+      ["minutes", 60000],
+      ["seconds", 1000]
+    ];
 
-      for (var i = 0; i < conversions.length; i++) {
-        var result = Math.floor(milliseconds / conversions[i][1]);
-        if (result >= 2) {
-          return result + " " + conversions[i][0] + " ago";
-        }
+    for (var i = 0; i < conversions.length; i++) {
+      var result = Math.floor(milliseconds / conversions[i][1]);
+      if (result >= 2) {
+        return result + " " + conversions[i][0] + " ago";
       }
-
-      return "1 second ago";
     }
 
-  });
+    return "1 second ago";
+  }
 
 };
 

lib/middleware/index.js

@@ -1,30 +1,25 @@
-var express = require('express');
-var timeout = require('connect-timeout');
-var path = require('path');
+var methodOverride  = require('method-override');
+var bodyParser      = require('body-parser');
+var cookieParser    = require('cookie-parser');
+var path            = require('path');
+var compression     = require('compression');
+var serveStatic     = require('serve-static');
+var session         = require('express-session');
+var RedisStore      = require('connect-redis')(session);
+
 
 module.exports = function(app) {
-  var logger = require('./logger')(app);
-  var timeouts = timeout({
-    throwError: true,
-    time: app.config.request_timeout
-  });
-  var stylus = require('./stylus')(app);
-  var staticFiles = express['static'](path.join(__dirname, '../../public'));
-  var cookies = express.cookieParser(app.config.session_secret);
-  var sessions = require('./sessions')(app);
 
   // Settings
   app.set('view engine', 'jade');
 
   // Middleware
-  app.use(logger);
-  app.use(timeouts);
-  app.use(express.compress());
-  app.use(stylus);
-  app.inject('statics');
-  app.inject('statics', staticFiles);
-  app.use(cookies);
-  app.use(sessions);
-  app.use(express.bodyParser());
-  app.use(express.methodOverride());
-};
+  app.use(require('./logger')(app));
+  app.use(compression());
+  app.use(require('./stylus')(app));
+  app.use(serveStatic(path.join(__dirname, '../../public')));
+  app.use(cookieParser());
+  app.use(require('./sessions')(app));
+  app.use(bodyParser());
+  app.use(methodOverride());
+};

lib/middleware/sessions.js

@@ -1,11 +1,11 @@
-var express = require('express');
-var RedisStore = require('connect-redis')(express);
+var session = require('express-session');
+var RedisStore = require('connect-redis')(session);
 
 module.exports = function(app) {
-
-  return express.session({
+  return session({
+    secret: 'keyboard cat',
     store: new RedisStore({
       client: app.redis
     })
   });
-};
+};

package.json

@@ -1,38 +1,44 @@
 {
-    "name": "b12prj",
-    "version": "0.0.2",
-    "directories": {},
-    "engines": {
-        "node": "5.x"
-    },
-    "dependencies": {
-        "express": "4.13.4",
-        "connect": "3.4.1",
-        "connect-timeout": "1.7.0",
-        "connect-redis": "3.0.2",
-        "connect-parallel": "0.0.3",
-        "jade": "1.11.0",
-        "stylus": "0.53.0",
-        "mongoose": "4.4.3",
-        "mongoose-utils": "0.0.2",
-        "redis": "2.4.2",
-        "email": "0.2.6",
-        "nib": "1.1.0",
-        "underscore": "1.8.3",
-        "newrelic": "1.25.1",
-        "bcrypt": "0.8.5"
-    },
-    "devDependencies": {
-        "mocha": "2.4.5",
-        "should": "8.2.2",
-        "grunt": "0.4.5",
-        "bower": "1.7.7",
-        "grunt-contrib-clean": "0.7.0",
-        "grunt-contrib-copy": "0.8.2",
-        "grunt-contrib-concat": "0.5.1",
-        "grunt-contrib-uglify": "0.11.1"
-    },
-    "scripts": {
-        "lock": "scripts/module_lock.js"
-    }
-}
+  "name": "b12prj",
+  "version": "0.0.3",
+  "directories": {},
+  "engines": {
+    "node": "5.x"
+  },
+  "dependencies": {
+    "bcrypt": "0.8.5",
+    "body-parser": "^1.15.0",
+    "compression": "^1.6.1",
+    "connect": "3.4.1",
+    "connect-parallel": "0.0.3",
+    "connect-redis": "3.0.2",
+    "connect-timeout": "1.7.0",
+    "cookie-parser": "^1.4.1",
+    "email": "0.2.6",
+    "express": "4.13.4",
+    "express-session": "^1.13.0",
+    "jade": "1.11.0",
+    "method-override": "^2.3.5",
+    "mongoose": "4.4.3",
+    "mongoose-utils": "0.0.2",
+    "newrelic": "1.25.1",
+    "nib": "1.1.0",
+    "redis": "2.4.2",
+    "serve-static": "^1.10.2",
+    "stylus": "0.53.0",
+    "underscore": "1.8.3"
+  },
+  "devDependencies": {
+    "mocha": "2.4.5",
+    "should": "8.2.2",
+    "grunt": "0.4.5",
+    "bower": "1.7.7",
+    "grunt-contrib-clean": "0.7.0",
+    "grunt-contrib-copy": "0.8.2",
+    "grunt-contrib-concat": "0.5.1",
+    "grunt-contrib-uglify": "0.11.1"
+  },
+  "scripts": {
+    "lock": "scripts/module_lock.js"
+  }
+}

shared/views/layout.jade

@@ -1,6 +1,6 @@
 include ../../lib/flash/messages
 
-!!! 5
+doctype html
 html
   head
     meta(charset="utf-8")