Update default responses

* Denormalize response code by removing `build-outlet-function` factory.  This just makes the response code clearer.
* No more use of `jsonx` -- when `res.json()` is used, errors are turned into stack traces first unless they have a `.toJSON()`
* Only `badRequest` and `serverError` can send output
* No more view guessing / second arguments
* Default 500 handler uses `serverError` instead of `negotiate`

lib/hooks/responses/defaults/badRequest.js

@@ -2,7 +2,7 @@
  * Module dependencies
  */
 
-var buildOutletFunction = require('../helpers/build-outlet-function');
+var _ = require('@sailshq/lodash');
 
 
 
@@ -23,16 +23,53 @@ var buildOutletFunction = require('../helpers/build-outlet-function');
  * ```
  */
 
-module.exports = function badRequest(data, options) {
+module.exports = function badRequest(data) {
 
-  var config = {
-    logMessage: 'Sending 400 ("Bad Request") response',
-    statusCode: 400,
-    logData: true,
-    isError: true,
-    isGuessView: true
-  };
+  // Get access to `req` and `res`
+  var req = this.req;
+  var res = this.res;
 
-  buildOutletFunction(this.req, this.res, data, options, config);
+  // Get access to `sails`
+  var sails = req._sails;
+
+  // Log error to console
+  if (data !== undefined) {
+    sails.log.verbose('Sending 400 ("Bad Request") response: \n', data);
+  }
+
+  // Set status code
+  res.status(400);
+
+  // If appropriate, serve data as JSON.
+  if (req.wantsJSON) {
+    // If the data is an error instance and it doesn't have a custom .toJSON(),
+    // use its stack instead (otherwise res.json() will turn it into an empty dictionary).
+    if (_.isError(data)) {
+      if (!_.isFunction(data.toJSON)) {
+        data = data.stack;
+      }
+    }
+    return res.json(data);
+  }
+
+  return res.view('400', { data: data }, function (err, html) {
+
+    // If a view error occured, fall back to JSON.
+    if (err) {
+      //
+      // Additionally:
+      // • If the view was missing, ignore the error but provide a verbose log.
+      if (err.code === 'E_VIEW_FAILED') {
+        sails.log.verbose('res.badRequest() :: Could not locate view for error page (sending JSON instead).  Details: ', err);
+      }
+      // Otherwise, if this was a more serious error, log to the console with the details.
+      else {
+        sails.log.warn('res.badRequest() :: When attempting to render error page view, an error occured (sending JSON instead).  Details: ', err);
+      }
+      return res.json(data);
+    }
+
+    return res.send(html);
+  });
 
 };

lib/hooks/responses/defaults/forbidden.js

@@ -2,7 +2,7 @@
  * Module dependencies
  */
 
-var buildOutletFunction = require('../helpers/build-outlet-function');
+var _ = require('@sailshq/lodash');
 
 
 
@@ -20,17 +20,41 @@ var buildOutletFunction = require('../helpers/build-outlet-function');
  * ```
  */
 
-module.exports = function forbidden (data, options) {
-
-  var config = {
-    logMessage: 'Sending 403 ("Forbidden") response',
-    statusCode: 403,
-    logData: true,
-    isError: true,
-    isGuessView: false,
-    name: 'forbidden'
-  };
-
-  buildOutletFunction(this.req, this.res, data, options, config);
+module.exports = function forbidden () {
+
+  // Get access to `req` and `res`
+  var req = this.req;
+  var res = this.res;
+
+  // Get access to `sails`
+  var sails = req._sails;
+
+  // Set status code
+  res.status(403);
+
+  // If appropriate, serve data as JSON.
+  if (req.wantsJSON) {
+    return res.send();
+  }
+
+  return res.view('403', function (err, html) {
+
+    // If a view error occured, fall back to JSON.
+    if (err) {
+      //
+      // Additionally:
+      // • If the view was missing, ignore the error but provide a verbose log.
+      if (err.code === 'E_VIEW_FAILED') {
+        sails.log.verbose('res.forbidden() :: Could not locate view for error page (sending text instead).  Details: ', err);
+      }
+      // Otherwise, if this was a more serious error, log to the console with the details.
+      else {
+        sails.log.warn('res.forbidden() :: When attempting to render error page view, an error occured (sending text instead).  Details: ', err);
+      }
+      return res.send('FORBIDDEN');
+    }
+
+    return res.send(html);
+  });
 
 };

lib/hooks/responses/defaults/notFound.js

@@ -2,7 +2,7 @@
  * Module dependencies
  */
 
-var buildOutletFunction = require('../helpers/build-outlet-function');
+var _ = require('@sailshq/lodash');
 
 
 
@@ -25,17 +25,41 @@ var buildOutletFunction = require('../helpers/build-outlet-function');
  * automatically.
  */
 
-module.exports = function notFound (data, options) {
+module.exports = function notFound (data) {
 
-  var config = {
-    logMessage: 'Sending 404 ("Not Found") response',
-    statusCode: 404,
-    logData: true,
-    isError: true,
-    isGuessView: false,
-    name: 'notFound'
-  };
+  // Get access to `req` and `res`
+  var req = this.req;
+  var res = this.res;
 
-  buildOutletFunction(this.req, this.res, data, options, config);
+  // Get access to `sails`
+  var sails = req._sails;
+
+  // Set status code
+  res.status(404);
+
+  // If appropriate, serve data as JSON.
+  if (req.wantsJSON) {
+    return res.send();
+  }
+
+  return res.view('404', function (err, html) {
+
+    // If a view error occured, fall back to JSON.
+    if (err) {
+      //
+      // Additionally:
+      // • If the view was missing, ignore the error but provide a verbose log.
+      if (err.code === 'E_VIEW_FAILED') {
+        sails.log.verbose('res.notFound() :: Could not locate view for error page (sending text instead).  Details: ', err);
+      }
+      // Otherwise, if this was a more serious error, log to the console with the details.
+      else {
+        sails.log.warn('res.notFound() :: When attempting to render error page view, an error occured (sending text instead).  Details: ', err);
+      }
+      return res.send('NOT FOUND');
+    }
+
+    return res.send(html);
+  });
 
 };

lib/hooks/responses/defaults/ok.js

@@ -2,7 +2,7 @@
  * Module dependencies
  */
 
-var buildOutletFunction = require('../helpers/build-outlet-function');
+var _ = require('@sailshq/lodash');
 
 
 
@@ -19,17 +19,26 @@ var buildOutletFunction = require('../helpers/build-outlet-function');
  *          - pass string to render specified view
  */
 
-module.exports = function sendOK (data, options) {
+module.exports = function sendOK (data) {
 
-  var config = {
-    logMethod: 'silly',
-    logMessage: 'res.ok() :: Sending 200 ("OK") response',
-    statusCode: 200,
-    logData: false,
-    isError: false,
-    isGuessView: true
-  };
+  // Get access to `req` and `res`
+  var req = this.req;
+  var res = this.res;
 
-  buildOutletFunction(this.req, this.res, data, options, config);
+  // Get access to `sails`
+  var sails = req._sails;
+
+  // Set status code
+  res.status(200);
+
+  // If the data is an error instance and it doesn't have a custom .toJSON(),
+  // use its stack instead (otherwise res.json() will turn it into an empty dictionary).
+  if (_.isError(data)) {
+    if (!_.isFunction(data.toJSON)) {
+      data = data.stack;
+    }
+  }
+
+  return res.json(data);
 
 };

lib/hooks/responses/defaults/serverError.js

@@ -2,7 +2,7 @@
  * Module dependencies
  */
 
-var buildOutletFunction = require('../helpers/build-outlet-function');
+var _ = require('@sailshq/lodash');
 
 
 
@@ -20,18 +20,58 @@ var buildOutletFunction = require('../helpers/build-outlet-function');
  * automatically.
  */
 
-module.exports = function serverError (data, options) {
+module.exports = function serverError (data) {
 
-  var config = {
-    logMethod: 'error',
-    logMessage: 'Sending 500 ("Server Error") response',
-    statusCode: 500,
-    logData: true,
-    isError: true,
-    isGuessView: false,
-    name: 'serverError'
-  };
+  // Get access to `req` and `res`
+  var req = this.req;
+  var res = this.res;
 
-  buildOutletFunction(this.req, this.res, data, options, config);
+  // Get access to `sails`
+  var sails = req._sails;
+
+  // Log error to console
+  if (data !== undefined) {
+    sails.log.error('Sending 500 ("Server Error") response: \n', data);
+  }
+
+  // Don't output error data with response in production.
+  if (sails.config.environment === 'production' && sails.config.keepResponseErrors !== true) {
+    data = undefined;
+  }
+
+  // Set status code
+  res.status(500);
+
+  // If appropriate, serve data as JSON.
+  if (req.wantsJSON) {
+    // If the data is an error instance and it doesn't have a custom .toJSON(),
+    // use its stack instead (otherwise res.json() will turn it into an empty dictionary).
+    if (_.isError(data)) {
+      if (!_.isFunction(data.toJSON)) {
+        data = data.stack;
+      }
+    }
+    return res.json(data);
+  }
+
+  return res.view('500', { error: data }, function (err, html) {
+
+    // If a view error occured, fall back to JSON.
+    if (err) {
+      //
+      // Additionally:
+      // • If the view was missing, ignore the error but provide a verbose log.
+      if (err.code === 'E_VIEW_FAILED') {
+        sails.log.verbose('res.serverError() :: Could not locate view for error page (sending JSON instead).  Details: ', err);
+      }
+      // Otherwise, if this was a more serious error, log to the console with the details.
+      else {
+        sails.log.warn('res.serverError() :: When attempting to render error page view, an error occured (sending JSON instead).  Details: ', err);
+      }
+      return res.json(data);
+    }
+
+    return res.send(html);
+  });
 
 };