Remove individual per-method lodash deps (this is already done on v1.…

…0, just backportin')

lib/hooks/blueprints/actionUtil.js

@@ -3,11 +3,11 @@
  */
 
 var util = require('util');
-var isString = require('lodash.isstring');
-var isArray = require('lodash.isarray');
-var isObject = require('lodash.isobject');
-var isUndefined = require('lodash.isundefined');
-var _ = require('lodash'); // TODO: replace lodash with individual per-method packages
+var _ = require('lodash');
+var isString = _.isString;
+var isArray = _.isArray;
+var isObject = _.isObject;
+var isUndefined = _.isUndefined;
 var mergeDefaults = require('merge-defaults');
 var validateWhereClauseStrict = require('./criteria-validator/validate-where-clause-strict');
 

package.json

@@ -64,14 +64,6 @@
     "i18n": "0.8.1",
     "include-all": "^1.0.0",
     "lodash": "3.10.1",
-    "lodash.isarray": "3.0.4",
-    "lodash.iserror": "3.1.1",
-    "lodash.isfunction": "3.0.8",
-    "lodash.isnull": "3.0.0",
-    "lodash.isobject": "3.0.2",
-    "lodash.isregexp": "3.0.5",
-    "lodash.isstring": "3.0.1",
-    "lodash.isundefined": "3.0.1",
     "merge-defaults": "~0.2.1",
     "method-override": "2.3.5",
     "mock-req": "0.2.0",

test/helpers/test-spawning-sails-lift-child-process-in-cwd.js

@@ -3,10 +3,7 @@
  */
 
 var path = require('path');
-var isString = require('lodash.isstring');
-var isUndefined = require('lodash.isundefined');
-var isFunction = require('lodash.isfunction');
-var isArray = require('lodash.isarray');
+var _ = require('lodash');
 var request = require('request');
 var MProcess = require('machinepack-process');
 
@@ -42,10 +39,10 @@ var MProcess = require('machinepack-process');
  */
 module.exports = function testSpawningSailsLiftChildProcessInCwd (opts){
 
-  if (!isArray(opts.liftCliArgs)){
+  if (!_.isArray(opts.liftCliArgs)){
     throw new Error('Consistency violation: Missing or invalid option (`liftCliArgs` should be an array)  in `testSpawningSailsLiftChildProcessInCwd()`. I may just be a test helper, but I\'m serious about assertions!!!');
   }
-  if (!isString(opts.pathToSailsCLI)){
+  if (!_.isString(opts.pathToSailsCLI)){
     throw new Error('Consistency violation: Missing or invalid option (`pathToSailsCLI` should be a string) in `testSpawningSailsLiftChildProcessInCwd()`. I may just be a test helper, but I\'m serious about assertions!!!');
   }
 
@@ -116,7 +113,7 @@ module.exports = function testSpawningSailsLiftChildProcessInCwd (opts){
     // Now if httpRequestInstructions were provided, we ping to the server to see whether this puppy
     // is ready to handle all those hot hot HTTP requests we have planned for it.
     // (expectations of response vary based on options passed to this helper)
-    if (!isUndefined(opts.httpRequestInstructions)){
+    if (!_.isUndefined(opts.httpRequestInstructions)){
       // If the `opts.expectFailedLift` flag was provided, we're actually expecting an error here.
       if (opts.expectFailedLift) {
         it('should FAIL when a `'+opts.httpRequestInstructions.method+'` request is sent to `'+opts.httpRequestInstructions.uri+', because we\'re expecting Sails to have failed when attempting to lift`', function(done) {
@@ -149,7 +146,7 @@ module.exports = function testSpawningSailsLiftChildProcessInCwd (opts){
 
     // Now run any additional tests.
     // (i.e. this function contains `it` blocks)
-    if (isFunction(opts.fnWithAdditionalTests)) {
+    if (_.isFunction(opts.fnWithAdditionalTests)) {
       opts.fnWithAdditionalTests();
     }