Implemented data injection feature to support asynchronously generated objects l…

…ike lib, some code clean-up, added mongoose example

@@ -4,7 +4,7 @@
 var mongoose = require('mongoose')
 var mongoose = require('mongoose')
 exports = module.exports = home
 exports = module.exports = home
 
 
-function home(app, lib, modeluser) {
+function home(lib, settings) {
   return {
   return {
 
 
 	  render: function(req, res, next) {
 	  render: function(req, res, next) {
@@ -12,16 +12,10 @@ function home(app, lib, modeluser) {
 	  },
 	  },
 
 
 	  about: function(req, res, next) {
 	  about: function(req, res, next) {
-      // save project data
-      var User = mongoose.model('User', modeluser);
-      console.log(modeluser);
-      User.create({name: 'john'}, function( err, project ) {
-        res.send(200, 'Hello, this is Igloo.')
-      });
-
+      res.send(200, 'Hello, this is Igloo.')
 	  }
 	  }
 
 
 	}
 	}
 }
 }
 
 
-exports['@require'] = [ 'mongo', 'redis', 'models/user' ];
+exports['@require'] = [ 'lib', 'settings' ];

@@ -8,30 +8,16 @@ var mongoose = require('mongoose'),
 
 
 mongooseTypes.loadTypes(mongoose)
 mongooseTypes.loadTypes(mongoose)
 
 
-//var Email = mongoose.SchemaTypes.Email
+var Email = mongoose.SchemaTypes.Email
 
 
 var User = new Schema({
 var User = new Schema({
-  /*email: {
+  email: {
     type: Email,
     type: Email,
     required: true,
     required: true,
     unique: true
     unique: true
-  }*/
-  name: String
+  }
 })
 })
 
 
 User.plugin(common)
 User.plugin(common)
 
 
-module.exports = User;
-
-
-var MUser =  mongoose.model('User', User);
-
-var user = new MUser({
-  name: 'user@example.com',
-});
-
-MUser.create({name: 'john'}, function( err, project ) {
-  console.log(200, 'Hello, this is Igloo.')
-});
-
-console.log(MUser.db);
+module.exports = User;

@@ -16,6 +16,7 @@ var errorHandler = require('errorhandler')
 var serveFavicon = require('serve-favicon')
 var serveFavicon = require('serve-favicon')
 var cookieParser = require('cookie-parser')
 var cookieParser = require('cookie-parser')
 var bodyParser = require('body-parser')
 var bodyParser = require('body-parser')
+var dataNode = require('../lib/dataNode')
 
 
 
 
 module.exports = function(lib, callback) {
 module.exports = function(lib, callback) {
@@ -35,7 +36,10 @@ module.exports = function(lib, callback) {
   ioc.loader('controllers', ioc.node('app/controllers'));
   ioc.loader('controllers', ioc.node('app/controllers'));
   ioc.loader('models', ioc.node('app/models'));
   ioc.loader('models', ioc.node('app/models'));
   ioc.loader(ioc.node('config'));
   ioc.loader(ioc.node('config'));
-  ioc.loader(ioc.node('lib'));
+
+  // 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)
@@ -88,10 +92,11 @@ module.exports = function(lib, callback) {
   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())
   app.use(errorHandler())
 
 
 
 
   callback(null, app)
   callback(null, app)
 
 
+  return {app: app, lib: lib}
 }
 }
+

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

@@ -6,8 +6,6 @@ var config = require('./index');
 
 
 /**
 /**
  * Initialize settings.
  * Initialize settings.
- *
- * This component configures the application's settings.
  */
  */
 exports = module.exports = function(lib, app) {
 exports = module.exports = function(lib, app) {
   var settings = new Settings(config);
   var settings = new Settings(config);
@@ -21,6 +19,9 @@ exports = module.exports = function(lib, app) {
 exports['@singleton'] = true;
 exports['@singleton'] = true;
 
 
 
 
+/**
+ * Settings component
+ */
 
 
 function Settings(initial) {
 function Settings(initial) {
   if(initial)
   if(initial)

+/**
+ * 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
 }
 }
-

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

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

@@ -12,11 +12,6 @@ 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)

@@ -10,7 +10,6 @@ module.exports = schemas
 function schemas(lib, callback) {
 function schemas(lib, callback) {
 
 
   _.each(models, function(schema, name) {
   _.each(models, function(schema, name) {
-  	console.log(name, '333');
     lib.db.model(name, schema)
     lib.db.model(name, schema)
   })
   })