Fixed error handler

@@ -219,6 +219,12 @@ var errorHandler = IoC.create('igloo/error-handler')
 
 
 app.post('/user', createUser, errorHandler)
 app.post('/user', createUser, errorHandler)
 
 
+// you could also do:
+// app.post('/user', createUser)
+// app.use(errorHandler)
+// but make sure that `app.use(errorHandler)`
+// is the very last route middleware to be `use`'d
+
 function createUser(req, res, next) {
 function createUser(req, res, next) {
 
 
   if (!_.isString(req.body.name))
   if (!_.isString(req.body.name))

@@ -3,112 +3,114 @@
 
 
 var mergeDefaults = require('merge-defaults')
 var mergeDefaults = require('merge-defaults')
 var _ = require('underscore')
 var _ = require('underscore')
+var _str = require('underscore.string')
+_.mixin(_str.exports())
 var util = require('util')
 var util = require('util')
 
 
 exports = module.exports = function(logger, settings) {
 exports = module.exports = function(logger, settings) {
 
 
-  return function() {
+  return function(err, req, res, next) {
 
 
-    var app = this
+    // set default error status code
+    res.statusCode = (_.isNumber(err.status)) ? err.status : 500
 
 
-    app.use(function(err, req, res, next) {
+    if (!_.isString(err.message))
+      err.message = 'An unknown error has occured, please try again'
 
 
-      // set default error status code
-      res.statusCode = (_.isNumber(err.status)) ? err.status : 500
+    if (_.isObject(err) && _.isNumber(err.code) && err.code === 11000) {
+      // <https://github.com/LearnBoost/mongoose/issues/2129>
+      var field = err.message.split('index: ')[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 (!_.isString(err.message))
-        err.message = 'An unknown error has occured, please try again'
+    // 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 = {}
 
 
-      if (_.isObject(err) && _.isNumber(err.code) && err.code === 11000) {
-        // <https://github.com/LearnBoost/mongoose/issues/2129>
-        var field = err.message.split('index: ')[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 = res.statusCode < 500 ? 'invalid_request_error' : 'api_error'
-
-      if (_.isString(err.param)) {
-        error.type = 'invalid_request_error'
-        if (res.statusCode === 500)
-          res.statusCode = 400
-      }
-
-      /*
-      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 error type
+    error.type = res.statusCode < 500 ? 'invalid_request_error' : 'api_error'
 
 
-      // set status code for BadRequestError
-      if (_.isString(error.name) && error.name === 'BadRequestError') {
-        error.type = 'invalid_request_error'
+    if (_.isString(err.param)) {
+      error.type = 'invalid_request_error'
+      if (res.statusCode === 500)
         res.statusCode = 400
         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'
-
-      // 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() {
-          // set error back to warning if it was warn
-          // logger level type = "warn"
-          // req.flash messages type = "warning"
-          req.flash(level === 'warn' ? 'warning' : level, error.message)
-          res.redirect('back')
-        },
-        json: function() {
-          res.json({ error: error })
+    }
+
+    /*
+    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'
+
+    // if we have a mongoose validation err
+    // then we know to output all the errors
+    if (_.isObject(err.errors) && !_.isEmpty(err.errors)) {
+      var messages = []
+      _.each(err.errors, function(errMsg) {
+        // <https://github.com/syntagma/mongoose-error-helper/blob/master/lib/mongoose-error-helper.js>
+        // TODO: add support for enum, min, and max?
+        if (_.isString(errMsg.type) && errMsg.type === 'required' && _.isString(errMsg.path)) {
+          messages.push(util.format('%s is required', _.humanize(errMsg.path)))
+        } else if (_.isString(errMsg.message)) {
+          messages.push(errMsg.message)
         }
         }
       })
       })
-
-      if (_.isObject(req.log)) {
-        req.log.response_time = new Date().getTime() - req.log.response_time
-        req.log.status = res.statusCode
-        req.log.response_type = res.get('Content-Type')
-        req.log.response_body = error
-      } else {
-        req.log = error
+      if (!_.isEmpty(messages)) {
+        error.message = messages.join(', ')
+      }
+    }
+
+    res.format({
+      text: function() {
+        res.send(error.message)
+      },
+      html: function() {
+        // set error back to warning if it was warn
+        // logger level type = "warn"
+        // req.flash messages type = "warning"
+        req.flash(level === 'warn' ? 'warning' : level, error.message)
+        res.redirect('back')
+      },
+      json: function() {
+        res.json({ error: error })
       }
       }
+    })
 
 
-      logger[level](error.message, req.log)
+    if (_.isObject(req.log)) {
+      req.log.response_time = new Date().getTime() - req.log.response_time
+      req.log.status = res.statusCode
+      req.log.response_type = res.get('Content-Type')
+      req.log.response_body = error
+    } else {
+      req.log = error
+    }
 
 
-    })
+    logger[level](error.message, req.log)
 
 
   }
   }
 
 

@@ -36,13 +36,14 @@
     "express-session": "^1.2.1",
     "express-session": "^1.2.1",
     "merge-defaults": "^0.1.0",
     "merge-defaults": "^0.1.0",
     "nodemailer": "^1.3.0",
     "nodemailer": "^1.3.0",
+    "slack-winston": "^0.0.1",
     "to-camel-case": "^0.2.1",
     "to-camel-case": "^0.2.1",
     "underscore": "^1.6.0",
     "underscore": "^1.6.0",
+    "underscore.string": "^2.3.3",
     "update-notifier": "^0.2.0",
     "update-notifier": "^0.2.0",
     "winston": "git://github.com/niftylettuce/winston",
     "winston": "git://github.com/niftylettuce/winston",
     "winston-hipchat": "^0.1.1",
     "winston-hipchat": "^0.1.1",
-    "winston-mongodb": "~0.4.3",
-    "slack-winston": "^0.0.1"
+    "winston-mongodb": "~0.4.3"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "chai": "^1.9.1",
     "chai": "^1.9.1",