Release 0.0.4-patch

@@ -24,19 +24,6 @@ eskimo --help
 ```
 
 
-## Components
-
-Using `electrolyte`, you an inject the following dependencies into your app with `eskimo`:
-
-* `app` - returns an instance of `express()`
-* `error-handler` - returns an error handler that can be used via `app.use`
-* `db` - returns connection to MongoDB
-* `logger` - returns a Winston logger instance
-* `model-common-plugin` - returns a Mongoose plugin for common schema paths
-* `sessions` - returns connection to Redis
-* `settings` - returns config
-
-
 ## Contributors
 
 * Nick Baugh <niftylettuce@gmail.com>

 
-// # db
+// # boot - db
 
 var mongoose = require('mongoose')
 var _ = require('underscore')
@@ -30,4 +30,4 @@ exports = module.exports = function(logger, settings) {
 }
 
 exports['@singleton'] = true
-exports['@require'] = [ 'logger', 'settings' ]
+exports['@require'] = [ 'igloo/logger', 'igloo/settings' ]

 
-// # error handler
+// # boot - error handler
 
 var _ = require('underscore')
 var util = require('util')
 
 exports = module.exports = function(logger, settings) {
 
-  return function(err, req, res, next) {
-
-    // set default error status code
-    res.statusCode = (_.isNumber(err.status)) ? err.status : 500
-
-    if (!_.isString(err.message))
-      err.message = 'An unknown error has occured, please try again'
-
-    if (_.isObject(err) && _.isNumber(err.code) && err.code === 11000) {
-      // <https://github.com/LearnBoost/mongoose/issues/2129>
-      var field = err.message.split('index: test.')[1].split('.$')[1]
-      // now we have `email_1 dup key`
-      field = field.split(' dup key')[0]
-      field = field.substring(0, field.lastIndexOf('_'))
-      err.message = util.format('Duplicate %s already exists in database, try making a more unique value', field)
-      err.param = field
-    }
-
-    // if we pass an error object, then we want to simply return the message...
-    // if we pass an object, then we want to do a stack trace, and then return the object + stack
-    var error = {}
-
-    // set error type
-    error.type = _.isString(err.param) ? 'invalid_request_error' : 'api_error'
-
-    if (error.type === 'invalid_request_error' && res.statusCode === 500)
-      res.statusCode = 400
-
-    // set error message and stack trace
-    if (util.isError(err)) {
-      error.message = err.message
-    } else {
-      _.extend(error, err)
-    }
-
-    // set status code for BadRequestError
-    if (_.isString(error.name) && error.name === 'BadRequestError') {
-      error.type = 'invalid_request_error'
-      res.statusCode = 400
-      delete error.name
-    }
-
-    if (settings.showStack)
-      error.stack = _.isUndefined(err.stack) ? new Error(err.message).stack : err.stack
-
-    // set error level
-    var level = (res.statusCode < 500) ? 'warn' : 'error'
-    logger[level](error)
-
-    // set error back to warning if it was warn
-    // logger level type = "warn"
-    // req.flash messages type = "warning"
-    if (level === 'warn')
-      level = 'warning'
-
-    // if we have a mongoose validation err
-    // then we know to output all the errors
-    if (_.isObject(error.errors) && !_.isEmpty(error.errors)) {
-      var messages = []
-      _.each(error.errors, function(errMsg) {
-        if (_.isString(errMsg.message))
-          messages.push(errMsg.message)
-      })
-      if (!_.isEmpty(messages))
-        error.message = messages.join(' ')
-    }
-
-    res.format({
-      text: function() {
-        res.send(error.message)
-      },
-      html: function() {
-        req.flash(level, error.message)
-        res.redirect('back')
-      },
-      json: function() {
-        res.json({ error: error })
+  return function() {
+
+    var app = this
+
+    app.use(function(err, req, res, next) {
+
+      // set default error status code
+      res.statusCode = (_.isNumber(err.status)) ? err.status : 500
+
+      if (!_.isString(err.message))
+        err.message = 'An unknown error has occured, please try again'
+
+      if (_.isObject(err) && _.isNumber(err.code) && err.code === 11000) {
+        // <https://github.com/LearnBoost/mongoose/issues/2129>
+        var field = err.message.split('index: test.')[1].split('.$')[1]
+        // now we have `email_1 dup key`
+        field = field.split(' dup key')[0]
+        field = field.substring(0, field.lastIndexOf('_'))
+        err.message = util.format('Duplicate %s already exists in database, try making a more unique value', field)
+        err.param = field
+      }
+
+      // if we pass an error object, then we want to simply return the message...
+      // if we pass an object, then we want to do a stack trace, and then return the object + stack
+      var error = {}
+
+      // set error type
+      error.type = _.isString(err.param) ? 'invalid_request_error' : 'api_error'
+
+      if (error.type === 'invalid_request_error' && res.statusCode === 500)
+        res.statusCode = 400
+
+      // set error message and stack trace
+      if (util.isError(err)) {
+        error.message = err.message
+      } else {
+        _.extend(error, err)
       }
+
+      // set status code for BadRequestError
+      if (_.isString(error.name) && error.name === 'BadRequestError') {
+        error.type = 'invalid_request_error'
+        res.statusCode = 400
+        delete error.name
+      }
+
+      if (settings.showStack)
+        error.stack = _.isUndefined(err.stack) ? new Error(err.message).stack : err.stack
+
+      // set error level
+      var level = (res.statusCode < 500) ? 'warn' : 'error'
+      logger[level](error)
+
+      // set error back to warning if it was warn
+      // logger level type = "warn"
+      // req.flash messages type = "warning"
+      if (level === 'warn')
+        level = 'warning'
+
+      // if we have a mongoose validation err
+      // then we know to output all the errors
+      if (_.isObject(error.errors) && !_.isEmpty(error.errors)) {
+        var messages = []
+        _.each(error.errors, function(errMsg) {
+          if (_.isString(errMsg.message))
+            messages.push(errMsg.message)
+        })
+        if (!_.isEmpty(messages))
+          error.message = messages.join(' ')
+      }
+
+      res.format({
+        text: function() {
+          res.send(error.message)
+        },
+        html: function() {
+          req.flash(level, error.message)
+          res.redirect('back')
+        },
+        json: function() {
+          res.json({ error: error })
+        }
+      })
+
     })
 
   }
@@ -91,4 +97,4 @@ exports = module.exports = function(logger, settings) {
 }
 
 exports['@singleton'] = true
-exports['@require'] = [ 'logger', 'settings' ]
+exports['@require'] = [ 'igloo/logger', 'igloo/settings' ]

 
-// # logger
+// # boot - logger
 
 var mergeDefaults = require('merge-defaults')
 var winston = require('winston')
@@ -46,4 +46,4 @@ exports = module.exports = function(settings) {
 }
 
 exports['@singleton'] = true
-exports['@require'] = [ 'settings' ]
+exports['@require'] = [ 'igloo/settings' ]

 
-// # boot - model common plugin
+// # boot - mongoose plugin
 
 var _ = require('underscore')
 var jsonSelect = require('mongoose-json-select')
@@ -58,4 +58,4 @@ exports = module.exports = function(settings) {
 }
 
 exports['@singleton'] = true
-exports['@require'] = [ 'settings' ]
+exports['@require'] = [ 'igloo/settings' ]

+
+// # boot - server
+
+// Inspired by `bixby-server` by Jared Hanson
+
+var https = require('https')
+var http = require('http')
+var cluster = require('cluster')
+var os = require('os')
+var path = require('path')
+
+exports = module.exports = function(logger, settings) {
+
+  return function(done) {
+
+    if (cluster.isMaster && settings.server.cluster) {
+
+      var size = settings.server.cluster.size || os.cpus().length
+
+      logger.info('creating cluster with %d workers', size)
+
+      for (var i=0; i<size; i++) {
+        logger.info('spawning worker #%d', i + 1)
+        cluster.fork()
+      }
+
+      cluster.on('fork', function(worker) {
+        logger.info('worker #%s with pid %d spawned', worker.id, worker.process.pid)
+      })
+
+      cluster.on('online', function(worker) {
+        logger.info('worker #%s with pid %d online', worker.id, worker.process.pid)
+      })
+
+      cluster.on('listening', function(worker, addr) {
+        logger.info('worker #%s with pid %d listening on %s:%d', worker.id, worker.process.pid, addr.address, addr.port)
+      })
+
+      cluster.on('disconnect', function(worker) {
+        logger.info('worker #%s with pid %d disconnected', worker.id, worker.process.pid)
+      })
+
+      cluster.on('exit', function(worker, code, signal) {
+        logger.error('worker #%s with pid %d exited with code/signal', worker.id, worker.process.pid, signal, code)
+        if (worker.suicide) return
+        logger.info('worker #%s restarting', worker.id)
+        cluster.fork()
+      })
+
+    } else {
+
+      if (settings.server.ssl.enabled)
+        this.server = https.createServer(settings.server.ssl.options, this)
+      else
+        this.server = http.createServer(this)
+
+      this.server.listen(settings.server.port, settings.server.host, function() {
+        var addr = this.address()
+        logger.info('app listening on %s:%d', addr.address, addr.port)
+        done()
+      })
+
+    }
+
+  }
+
+}
+
+exports['@singleton'] = true
+exports['@require'] = [ 'igloo/logger', 'igloo/settings' ]

 
-// # sessions
+// # boot - sessions
 
 var session = require('express-session')
 var RedisStore = require('connect-redis')(session)
@@ -19,4 +19,4 @@ exports = module.exports = function(logger, settings) {
 }
 
 exports['@singleton'] = true
-exports['@require'] = [ 'logger', 'settings' ]
+exports['@require'] = [ 'igloo/logger', 'igloo/settings' ]

 
-// # settings
+// # boot - settings
 
+var _ = require('underscore')
+var util = require('util')
 var mergeDefaults = require('merge-defaults')
 
 exports = module.exports = function(config) {
@@ -9,6 +11,9 @@ exports = module.exports = function(config) {
 
   var env = process.env.NODE_ENV || 'development'
 
+  if (!_.isObject(config[env]))
+    throw new Error(util.format('Unknown environment %s', env))
+
   mergeDefaults(settings, config[env], config.defaults)
 
   return settings

 
-// # app
+// # boot - update notifier
 
-var express = require('express')
-var winstonRequestLogger = require('winston-request-logger')
-var bootable = require('bootable')
 var _ = require('underscore')
 var updateNotifier = require('update-notifier')
-var path = require('path')
-var expressResource = require('express-resource')
 
 exports = module.exports = function(logger, settings) {
 
-  // check for updates to all packages when not in production
-  if (settings.updateNotifier.enabled)
-    _.each(settings.pkg.dependencies, function(version, name) {
-      var notifier = updateNotifier({
-        packageName: name,
-        packageVersion: version,
-        optOut: settings.updateNotifier.dependencies[name] || false,
-        updateCheckInterval: settings.updateNotifier.updateCheckInterval | 1000 * 60 * 60, // hourly
-        updateCheckTimeout: settings.updateNotifier.updateCheckTimeout | 1000 * 20 // 20 seconds
+  return function() {
+
+    // check for updates to all packages when not in production
+    if (settings.updateNotifier.enabled)
+      _.each(settings.pkg.dependencies, function(version, name) {
+        var notifier = updateNotifier({
+          packageName: name,
+          packageVersion: version,
+          optOut: settings.updateNotifier.dependencies[name] || false,
+          updateCheckInterval: settings.updateNotifier.updateCheckInterval | 1000 * 60 * 60, // hourly
+          updateCheckTimeout: settings.updateNotifier.updateCheckTimeout | 1000 * 20 // 20 seconds
+        })
+        if (_.isUndefined(notifier.update) || !_.isString(notifier.update.latest)) return
+        logger.warn(
+          '%s of %s released (current: %s), run `npm install -S %s@%s` to upgrade',
+          notifier.update.latest,
+          name,
+          version,
+          name,
+          notifier.update.latest
+        )
       })
-      if (_.isUndefined(notifier.update) || !_.isString(notifier.update.latest)) return
-      logger.warn(
-        '%s of %s released (current: %s), run `npm install -S %s@%s` to upgrade',
-        notifier.update.latest,
-        name,
-        version,
-        name,
-        notifier.update.latest
-      )
-    })
-
-  // create the app
-  var app = bootable(express())
-
-  // winston request logger before everything else
-  // but only if it was enabled in settings
-  if (settings.logger.requests)
-    app.use(winstonRequestLogger.create(logger))
-
-  // integrate express-resource
-  app = expressResource(app)
-
-  return app
+
+  }
 
 }
 
 exports['@singleton'] = true
-exports['@require'] = [ 'logger', 'settings' ]
+exports['@require'] = [ 'igloo/logger', 'igloo/settings' ]

@@ -15,18 +15,7 @@
 // # igloo
 
 var path = require('path')
-var os = require('os')
-var cluster = require('cluster')
 
-var bootDir = path.join(__dirname, 'boot')
-
-module.exports = {
-  loader: function(id) {
-    return require(path.join(bootDir, id))
-  },
-  app: function(IoC) {
-    IoC.loader(IoC.node(bootDir))
-    var app = IoC.create('app')
-    return app
-  }
+module.exports = function(id) {
+  return require(path.join(__dirname, 'boot', id))
 }

 {
   "name": "igloo",
-  "version": "0.0.4",
+  "version": "0.0.4-patch",
   "description": "Igloo is a lightweight, fast, and minimal framework for rapid development",
-  "main": "./index.js",
+  "main": "./lib",
   "repository": {
     "type": "git",
     "url": "git://github.com/niftylettuce/igloo.git"
@@ -18,8 +18,6 @@
     "chalk": "^0.4.0",
     "commander": "^2.2.0",
     "connect-redis": "~2.0.0",
-    "express": "~4.2.0",
-    "express-resource": "git://github.com/niftylettuce/express-resource",
     "express-session": "^1.2.1",
     "merge-defaults": "^0.1.0",
     "mongoose": "~3.8.7",
@@ -28,7 +26,6 @@
     "underscore": "~1.6.0",
     "update-notifier": "git://github.com/niftylettuce/update-notifier",
     "winston": "git://github.com/niftylettuce/winston",
-    "winston-mongodb": "~0.4.3",
-    "winston-request-logger": "^1.0.5"
+    "winston-mongodb": "~0.4.3"
   }
 }