Merge pull request #6 from s-silva/development

Integrated Electrolyte and updated Express to version 4.2.x

 
 
 // # home
 // # home
 
 
-module.exports = home
+var mongoose = require('mongoose')
+exports = module.exports = home
 
 
-function home(req, res, next) {
-  res.render('home')
+function home(lib, settings) {
+  return {
+
+	  render: function(req, res, next) {
+	    res.render('home')
+	  },
+
+	  about: function(req, res, next) {
+      res.send(200, 'Hello, this is Igloo.')
+	  }
+
+	}
 }
 }
+
+exports['@require'] = [ 'lib', 'settings' ];

 
 
 // # user
 // # user
 
 
-var mongoose = require('mongoose')
-var common = require('./common')
+var mongoose = require('mongoose'),
+    common = require('./common'),
+    Schema = mongoose.Schema,
+    mongooseTypes = require('mongoose-types')
 
 
-var Schema = mongoose.Schema
-var mongooseTypes = require('mongoose-types')
 mongooseTypes.loadTypes(mongoose)
 mongooseTypes.loadTypes(mongoose)
 
 
 var Email = mongoose.SchemaTypes.Email
 var Email = mongoose.SchemaTypes.Email
 
 
-var User = module.exports = new Schema({
+var User = new Schema({
   email: {
   email: {
     type: Email,
     type: Email,
     required: true,
     required: true,
@@ -19,3 +19,5 @@ var User = module.exports = new Schema({
 })
 })
 
 
 User.plugin(common)
 User.plugin(common)
+
+module.exports = User;

@@ -7,7 +7,17 @@ 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')
+var dataNode = require('../lib/dataNode')
+
 
 
 module.exports = function(lib, callback) {
 module.exports = function(lib, callback) {
 
 
@@ -22,6 +32,15 @@ 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'));
+
+  // set-up data nodes (inject data)
+  ioc.loader(dataNode(lib, 'lib'));
+  ioc.loader(dataNode(app, 'app'));
+
   // set the default views directory
   // set the default views directory
   app.set('views', lib.config.viewsDir)
   app.set('views', lib.config.viewsDir)
 
 
@@ -32,27 +51,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,20 +83,20 @@ 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(errorHandler())
+
 
 
   callback(null, app)
   callback(null, app)
 
 
+  return {app: app, lib: lib}
 }
 }
+

@@ -2,7 +2,6 @@
 // # auth
 // # auth
 
 
 var passport = require('passport')
 var passport = require('passport')
-
 var lib, app
 var lib, app
 
 
 module.exports = function(_lib, _app) {
 module.exports = function(_lib, _app) {
@@ -32,3 +31,7 @@ function deserializeUser(id, done) {
     done(err, user)
     done(err, user)
   })
   })
 }
 }
+
+
+ 
+

@@ -18,7 +18,7 @@ var environments = {
     host: 'localhost',
     host: 'localhost',
     db: {
     db: {
       host: 'localhost',
       host: 'localhost',
-      dbname: 'TODO',
+      dbname: 'mydb',
       port: '27017',
       port: '27017',
       opts: {}
       opts: {}
     },
     },

 
 
 // # 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
@@ -11,8 +13,10 @@ module.exports = function(_lib, _app) {
 
 
 function routes() {
 function routes() {
 
 
-  var controllers = require('../app/controllers')(lib)
+  var home = IoC.create('controllers/home')
 
 
-  app.get('/', controllers.home)
+  app.get('/', home.render)
+  app.get('/about', home.about)
 
 
 }
 }
+

+/**
+ * Module dependencies.
+ */
+var config = require('./index');
+
+
+/**
+ * Initialize settings.
+ */
+exports = module.exports = function(lib, app) {
+  var settings = new Settings(config);
+  return settings;
+}
+
+
+/**
+ * Component annotations.
+ */
+exports['@singleton'] = true;
+
+
+/**
+ * Settings component
+ */
+
+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;
+}

+/**
+ * Add following code to auth() function in
+ * ./config/auth.js
+ *
+ * It's better to keep 'returnURL' and 'realm'
+ * in settings.
+ */
+
+
+var GoogleStrategy = require('passport-google').Strategy
+
+passport.use( new GoogleStrategy({
+    returnURL: 'http://localhost:3000/auth/google/callback',
+    realm: 'http://localhost:3000',
+    passReqToCallback: true
+  },
+  function(req, identifier, profile, done) {
+
+    var email = profile.emails[ 0 ].value
+    var User = lib.db.model('User')
+
+    // save user
+    User.findOne({
+        email: email
+    }, function( err, user ) {
+
+      if (!user) {
+        User.create({
+          email: email,
+          name: profile.displayName,
+        }, function(err, user) {
+
+          // Update lastToken
+          user.lastToken = identifier
+          user.save()
+          return done( err, user )
+        });
+
+      } else {
+        // Update lastToken
+        user.lastToken = identifier
+        user.save()
+        return done( err, user )
+      }
+      
+    });
+  }
+));

+/**
+ * Add following code to routes() function in
+ * your ./config/routes.js file.
+ */
+
+var passport = require('passport')
+
+// auth route
+
+app.get('/auth/google', function(req,res,next) { 
+		// add remember me details etc. here
+   	next()
+  },
+  passport.authenticate('google', { failureRedirect: '/', failureFlash: true }),
+  function(req, res) {
+  	res.redirect('/')
+  });
+
+// auth callback
+
+app.get('/auth/google/callback',
+  passport.authenticate( 'google', {
+    failureRedirect: '/'
+  }),
+  function(req, res, next) {
+    var redirectTo = req.session.redirectTo;
+
+    // Successful authentication, redirect to dashboard page.
+    if ( redirectTo ) {
+        req.session.redirectTo = null
+        res.redirect(redirectTo)
+    } else {
+        res.redirect('/logged-in')
+    }
+  }
+);
+
+// log out
+
+app.get('/logout', function(req, res){
+  req.logout()
+  res.redirect('/')
+});
+
+// sample log-in message
+
+app.get('/logged-in', function(req, res){
+  req.send(200, 'Hey!')
+});

+/**
+ * Mongoose create route.
+ * Use this in a controller and setup a route
+ * to create function.
+ */
+
+exports = module.exports = home
+
+function home(db, _User) {
+  return {
+
+    create: function(req, res, next) {
+
+      // create user object using db ('lib/db') connection
+      // and models/user
+      
+      var User = db.model('User', _User);
+
+      User.create({email: 'somebody@example.com'}, function( err, user ) {
+        if(err)
+          res.send(500, 'Igloo: Something went wrong.')
+        else
+          res.send(200, 'Igloo: Created user.')
+      });
+
+    }
+
+  }
+}
+
+exports['@require'] = [ 'lib/db', 'models/user' ];

+
+/**
+ * This is the missing data injection functionality in
+ * electrolyte. Based on electrolyte/loaders/node.js, the
+ * default script loader.
+ *
+ */
+
+module.exports = function(data, options) {
+  if ('string' == typeof options) {
+    options = { dirname: options }
+  }
+
+  return function(id) {
+
+    var newId = null;
+
+    if(id){
+      var dir = options.dirname + '/'
+
+      if(id.indexOf(dir) === 0)
+        newId = id.substr(dir.length)
+    }
+
+    if(newId)
+      return data[newId]
+    else
+      return data
+  }
+}

@@ -10,4 +10,3 @@ module.exports = function(config) {
   lib.config = config
   lib.config = config
   return lib
   return lib
 }
 }
-

@@ -10,3 +10,4 @@ var logger = module.exports = new (winston.Logger)({
     })
     })
   ]
   ]
 })
 })
+

@@ -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
 
 

@@ -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,13 @@
     "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",
+    "cookie-parser": "~1.1.0",
+    "errorhandler": "~1.0.1",
+    "body-parser": "~1.2.0",
+    "serve-favicon": "~2.0.0"
   }
   }
 }
 }