Updated express (to v4), added basic electrolyte functionality

 
 
 // # home
 // # home
 
 
-module.exports = home
+exports = module.exports = home
 
 
-function home(req, res, next) {
-  res.render('home')
+function home(app, lib, modeluser) {
+  return {
+
+	  render: function(req, res, next) {
+	    res.render('home')
+	  },
+
+	  about: function(req, res, next) {
+      // save project data
+      var User = modeluser;
+
+      console.log(User);
+
+      /*var user = new User({
+          email: 'user@example.com',
+      });
+*/
+      var upsertData = User;//user.toObject();
+      delete upsertData._id;
+	
+      User.update({email: 'user@example.com'}, upsertData, {upsert: true}, function( err, project ) {
+
+          if(err){
+              res.send(500, {message: 'Error saving project data'});
+              return console.error('Error creating project data');
+          }
+
+          res.send(200, {message: 'success'});
+
+      });
+
+	  	res.send(200, 'Hello, this is Igloo.')
+	  }
+
+	}
 }
 }
+
+exports['@require'] = [ 'mongo', 'redis', 'models/user' ];

@@ -7,7 +7,16 @@ var dynamicHelpers = require('./dynamic-helpers')
 var development = require('./development')
 var development = require('./development')
 var production = require('./production')
 var production = require('./production')
 var auth = require('./auth')
 var auth = require('./auth')
+var settings = require('./settings')
 var routes = require('./routes')
 var routes = require('./routes')
+var ioc = require('electrolyte')
+var session = require('express-session')
+var methodOverride = require('method-override')
+var errorHandler = require('errorhandler')
+var serveFavicon = require('serve-favicon')
+var cookieParser = require('cookie-parser')
+var bodyParser = require('body-parser')
+
 
 
 module.exports = function(lib, callback) {
 module.exports = function(lib, callback) {
 
 
@@ -22,6 +31,12 @@ module.exports = function(lib, callback) {
   // trust proxy
   // trust proxy
   app.enable('trust proxy')
   app.enable('trust proxy')
 
 
+  // set-up electrolyte
+  ioc.loader('controllers', ioc.node('app/controllers'));
+  ioc.loader('models', ioc.node('app/models'));
+  ioc.loader(ioc.node('config'));
+  ioc.loader(ioc.node('lib'));
+
   // set the default views directory
   // set the default views directory
   app.set('views', lib.config.viewsDir)
   app.set('views', lib.config.viewsDir)
 
 
@@ -32,27 +47,31 @@ module.exports = function(lib, callback) {
   app.locals.pretty = true
   app.locals.pretty = true
 
 
   // ignore GET /favicon.ico
   // ignore GET /favicon.ico
-  app.use(express.favicon(lib.config.favicon))
+  app.use(serveFavicon(lib.config.favicon))
 
 
   // development only config
   // development only config
-  app.configure('development', development(lib, app))
+  switch(lib.config.env){
+  case 'development':
+    development(lib, app);
+    break;
 
 
-  // production only config
-  app.configure('production', production(lib, app))
+  case 'production':
+    production(lib, app)
+    break;
+  }
 
 
   // pass a secret to cookieParser() for signed cookies
   // pass a secret to cookieParser() for signed cookies
-  app.use(express.cookieParser(lib.config.cookieParser))
+  app.use(cookieParser(lib.config.cookieParser))
 
 
   // parse request bodies
   // parse request bodies
-  app.use(express.json())
-  app.use(express.urlencoded())
+  app.use(bodyParser())
 
 
   // support _method (PUT in forms etc)
   // support _method (PUT in forms etc)
-  app.use(express.methodOverride())
+  app.use(methodOverride())
 
 
   // add req.session cookie support
   // add req.session cookie support
-  app.use(express.session(lib.config.session))
-
+  app.use(session(lib.config.session))
+  
   // add flash message support
   // add flash message support
   app.use(flash())
   app.use(flash())
 
 
@@ -60,19 +79,18 @@ module.exports = function(lib, callback) {
   app.use(dynamicHelpers)
   app.use(dynamicHelpers)
 
 
   // add support for authentication
   // add support for authentication
-  app.configure(auth(lib, app))
+  auth(lib, app)()
 
 
   // load the routes
   // load the routes
-  app.configure(routes(lib, app))
-
-  // make the middleware order matter
-  app.use(app.router)
+  routes(lib, app)()
 
 
   // static server
   // static server
   app.use(express.static(lib.config.publicDir, lib.config.staticServer))
   app.use(express.static(lib.config.publicDir, lib.config.staticServer))
 
 
   // error handling
   // error handling
-  app.use(express.errorHandler())
+  //app.use(express.errorHandler())
+  app.use(errorHandler())
+
 
 
   callback(null, app)
   callback(null, app)
 
 

 
 
 // # routes
 // # routes
 
 
+var IoC = require('electrolyte')
+
 var lib, app
 var lib, app
 
 
+
 module.exports = function(_lib, _app) {
 module.exports = function(_lib, _app) {
   lib = _lib
   lib = _lib
   app = _app
   app = _app
@@ -10,9 +13,10 @@ module.exports = function(_lib, _app) {
 }
 }
 
 
 function routes() {
 function routes() {
+  var self = app;
 
 
-  var controllers = require('../app/controllers')(lib)
-
-  app.get('/', controllers.home)
+  var home = IoC.create('controllers/home')
 
 
+  app.get('/', home.render)
+  app.get('/about', home.about)
 }
 }

+/**
+ * Module dependencies.
+ */
+var config = require('./index');
+
+
+/**
+ * Initialize settings.
+ *
+ * This component configures the application's settings.
+ */
+exports = module.exports = function(lib, app) {
+  var settings = new Settings(config);
+  return settings;
+}
+
+
+/**
+ * Component annotations.
+ */
+exports['@singleton'] = true;
+
+
+
+function Settings(initial) {
+  if(initial)
+  	this._hash = initial;
+  else
+  	this._hash = {};
+}
+
+Settings.prototype.get = function(key) {
+  return this._hash[key];
+}
+
+Settings.prototype.set = function(key, val) {
+  this._hash[key] = val;
+}

@@ -10,3 +10,8 @@ var logger = module.exports = new (winston.Logger)({
     })
     })
   ]
   ]
 })
 })
+
+/**
+ * Component annotations.
+ */
+exports['@singleton'] = true;

@@ -10,6 +10,11 @@ module.exports = function(_config) {
   return mongo
   return mongo
 }
 }
 
 
+/**
+ * Component annotations.
+ */
+exports['@singleton'] = true;
+
 function mongo(callback) {
 function mongo(callback) {
   var connection = mongoose.createConnection(
   var connection = mongoose.createConnection(
     config.db.host,
     config.db.host,

@@ -2,7 +2,8 @@
 // # redis
 // # redis
 
 
 var express = require('express')
 var express = require('express')
-var RedisStore = require('connect-redis')(express)
+var session = require('express-session')
+var RedisStore = require('connect-redis')(session)
 
 
 var config
 var config
 
 
@@ -11,6 +12,11 @@ module.exports = function(_config) {
   return redis
   return redis
 }
 }
 
 
+/**
+ * Component annotations.
+ */
+exports['@singleton'] = true;
+
 function redis(callback) {
 function redis(callback) {
   var connection = new RedisStore(config.redis)
   var connection = new RedisStore(config.redis)
   connection.on('error', callback)
   connection.on('error', callback)

@@ -20,9 +20,9 @@
     "passport": "~0.2.0",
     "passport": "~0.2.0",
     "express-rate": "0.0.1",
     "express-rate": "0.0.1",
     "jade": "~1.1.5",
     "jade": "~1.1.5",
-    "express": "~3.4.8",
+    "express": "~4.2.0",
     "mongoose": "~3.8.7",
     "mongoose": "~3.8.7",
-    "connect-redis": "~1.4.6",
+    "connect-redis": "~2.0.0",
     "underscore": "~1.6.0",
     "underscore": "~1.6.0",
     "async": "~0.2.10",
     "async": "~0.2.10",
     "winston": "~0.7.2",
     "winston": "~0.7.2",
@@ -30,6 +30,14 @@
     "less-middleware": "~0.1.15",
     "less-middleware": "~0.1.15",
     "connect-flash": "~0.1.1",
     "connect-flash": "~0.1.1",
     "winston-mongodb": "~0.4.3",
     "winston-mongodb": "~0.4.3",
-    "winston-request-logger": "~1.0.4"
+    "winston-request-logger": "~1.0.4",
+    "electrolyte": "*",
+    "express-session": "~1.1.0",
+    "method-override": "~1.0.1",
+    "static-favicon": "~2.0.0-alpha",
+    "cookie-parser": "~1.1.0",
+    "errorhandler": "~1.0.1",
+    "body-parser": "~1.2.0",
+    "serve-favicon": "^2.0.0"
   }
   }
 }
 }