Merge pull request #27 from dynamiccast/upgrade-lodash

Upgrade to lodash 4

Author: dynamiccast

lib/api/blueprints/_util/actionUtil.js

@@ -1,7 +1,3 @@
-var omit          = require('lodash/object/omit');
-var isObject      = require('lodash/lang/isObject');
-var util          = require('util');
-
 /**
  * Utility methods used in built-in blueprint actions.
  *
@@ -14,51 +10,34 @@ module.exports = {
    * @param  {Request} req
    * @return {WLCollection}
    */
-  parseModel: function ( req ) {
+  parseModel: function(req) {
 
     // Ensure a model can be deduced from the request options.
     var model = req.options.model || req.options.controller;
-    if ( !model ) throw new Error( util.format( 'No "model" specified in route options.' ) );
+    if (!model) {
+      throw new Error('No "model" specified in route options.');
+    }
 
-    var Model = req._sails.models[ model ];
-    if ( !Model ) throw new Error( util.format( 'Invalid route option, "model".\nI don\'t know about any models named: `%s`', model ) );
+    var Model = req._sails.models[model];
+    if (!Model) {
+      throw new Error('Invalid route option, "model". No model named: ' + model);
+    }
 
     return Model;
   },
 
-    /**
+  /**
    * Parse `values` for a Waterline `create` or `update` from all
    * request parameters.
    *
    * @param  {Request} req
    * @return {Object}
    */
-  parseValues: function ( req, model ) {
-    // Create data object (monolithic combination of all parameters)
-    // Omit the blacklisted params (like JSONP callback param, etc.)
-
-    // Allow customizable blacklist for params NOT to include as values.
-    req.options.values = req.options.values || {};
-    req.options.values.blacklist = req.options.values.blacklist;
+  parseValues: function(req, model) {
 
-    // Validate blacklist to provide a more helpful error msg.
-    var blacklist = req.options.values.blacklist;
-    if ( blacklist && !isArray( blacklist ) ) {
-      throw new Error( 'Invalid `req.options.values.blacklist`. Should be an array of strings (parameter names.)' );
-    }
-
-    // Get values using the model identity as resource identifier
-    var values = req.body.data.attributes || {};
+    var values = req.body.data.attributes || {};
     values.id = req.allParams()['id'];
 
-    // Omit built-in runtime config (like query modifiers)
-    values = omit( values, blacklist || [] );
-
-    // Omit any params w/ undefined values
-    values = omit( values, function ( p ) {
-      if ( _.isUndefined( p ) ) return true;
-    });
-
     return values;
   },
 
@@ -69,7 +48,7 @@ module.exports = {
    * @param  {Request} req
    * @return {Integer|String}
    */
-  parsePk: function ( req ) {
+  parsePk: function(req) {
 
     return req.options.id || ( req.options.where && req.options.where.id ) || req.allParams()['id'];
   },
@@ -81,11 +60,12 @@ module.exports = {
    * @param  {Request} req
    * @return {Integer|String}
    */
-  requirePk: function ( req ) {
-    var pk = module.exports.parsePk( req );
+  requirePk: function(req) {
+
+    var pk = module.exports.parsePk(req);
 
     // Validate the required `id` parameter
-    if ( !pk ) {
+    if (!pk) {
 
       var err = new Error(
         'No `id` parameter provided.' +

lib/api/blueprints/destroy.js

@@ -1,8 +1,7 @@
 /**
  * Module dependencies
  */
-var util = require( 'util' ),
-  actionUtil = require( './_util/actionUtil' );
+const actionUtil = require( './_util/actionUtil' );
 
 /**
  * Destroy One Record

lib/api/blueprints/update.js

@@ -1,9 +1,4 @@
-/**
- * Module dependencies
- */
-
-var actionUtil  = require( './_util/actionUtil' );
-var util        = require( 'util' );
+const actionUtil = require( './_util/actionUtil' );
 
 /**
  * Update One Record
@@ -39,9 +34,7 @@ module.exports = function updateOneRecord(req, res) {
     // returns an array, just use the first item.  If more than one
     // record was returned, something is amiss.
     if ( !records || !records.length || records.length > 1 ) {
-      req._sails.log.warn(
-        util.format( 'Unexpected output from `%s.update`.', Model.globalId )
-      );
+      req._sails.log.warn('Unexpected output from `' + Model.globalId + '.update`.');
     }
 
     var updatedRecord = records[0];

lib/hook.js

@@ -286,7 +286,7 @@ module.exports = function(sails) {
         // -> or implicitly by globalId
         // -> or implicitly by controller id
         var routeConfig = sails.router.explicitRoutes[controllerId] || {};
-        var modelFromGlobalId = _.findWhere(sails.models, {globalId: globalId});
+        var modelFromGlobalId = _.find(sails.models, {globalId: globalId});
         var modelId = config.model || routeConfig.model || (modelFromGlobalId && modelFromGlobalId.identity) || controllerId;
 
         // If the orm hook is enabled, it has already been loaded by this time,
@@ -342,7 +342,7 @@ module.exports = function(sails) {
             _bindRoute(_getRoute('%s/destroy/:id?'), 'destroy');
 
             // Bind add/remove "shortcuts" for each `collection` associations
-            _(Model.associations).where({type: 'collection'}).forEach(function (association) {
+            _(Model.associations).filter({type: 'collection'}).forEach(function (association) {
               var alias = association.alias;
               var _getAssocRoute = _.partialRight(util.format, baseRoute, alias);
               var opts = _.merge({ alias: alias }, routeOpts);
@@ -366,15 +366,15 @@ module.exports = function(sails) {
 
             // Bind "rest" blueprint/shadow routes based on known associations in our model's schema
             // Bind add/remove for each `collection` associations
-            _(Model.associations).where({type: 'collection'}).forEach(function (association) {
+            _(Model.associations).filter({type: 'collection'}).forEach(function (association) {
               var alias = association.alias;
               var _getAssocRoute = _.partialRight(util.format, baseRestRoute, alias);
               var opts = _.merge({ alias: alias }, routeOpts);
               sails.log.silly('Binding RESTful association blueprint `'+alias+'` for',controllerId);
 
               _bindRoute( _getAssocRoute('post %s/:parentid/%s/:id?'),     'add', opts );
               _bindRoute( _getAssocRoute('delete %s/:parentid/%s/:id?'),   'remove', opts );
-            }).value();
+            });
 
             // and populate for both `collection` and `model` associations
             _(Model.associations).forEach(function (association) {
@@ -384,7 +384,7 @@ module.exports = function(sails) {
               sails.log.silly('Binding RESTful association blueprint `'+alias+'` for',controllerId);
 
               _bindRoute( _getAssocRoute('get %s/:parentid/%s/:id?'), 'populate', opts );
-            }).value();
+            });
           }
         }
       });

package.json

@@ -4,7 +4,7 @@
   "description": "Blueprints to turn a Sails.js API into a JSON API",
   "main": "index.js",
   "scripts": {
-    "test": "npm run-script test-jsonapi ; npm run-script test-unit",
+    "test": "npm run-script test-unit && npm run-script test-jsonapi",
     "test-jsonapi": "cd tests/dummy ; npm test",
     "test-unit": "mocha tests/unit/**/*.test.js"
   },
@@ -27,7 +27,7 @@
   "dependencies": {
     "json-api-serializer": "1.1.0",
     "jsonapi-validator": "^2.0.0",
-    "lodash": "3.10.1",
+    "lodash": "^4.13.1",
     "pluralize": "^2.0.0",
     "util": "^0.10.3"
   },