Skip to content

Commit

Permalink
lodash->sailshq/lodash to pick up the _.isFunction() I backported fro…
Browse files Browse the repository at this point in the history
…m JDs patch in Lodash 4. (see lodash/lodash#2768)
  • Loading branch information
mikermcneil committed Nov 19, 2016
1 parent e5ae9ba commit ea842a3
Show file tree
Hide file tree
Showing 93 changed files with 348 additions and 348 deletions.
2 changes: 1 addition & 1 deletion bin/_commander.js
Expand Up @@ -2,7 +2,7 @@
* Module dependencies
*/

var _ = require('lodash');
var _ = require('@sailshq/lodash');
var program = require('commander');


Expand Down
2 changes: 1 addition & 1 deletion bin/sails-console.js
Expand Up @@ -8,7 +8,7 @@
var nodepath = require('path');
var REPL = require('repl');
var fs = require('fs');
var _ = require('lodash');
var _ = require('@sailshq/lodash');
var chalk = require('chalk');
var CaptainsLog = require('captains-log');
var Sails = require('../lib/app');
Expand Down
2 changes: 1 addition & 1 deletion bin/sails-deploy.js
Expand Up @@ -5,7 +5,7 @@
* Module dependencies
*/

var _ = require('lodash');
var _ = require('@sailshq/lodash');
var util = require('util');
var path = require('path');
var rconf = require('../lib/app/configuration/rc');
Expand Down
2 changes: 1 addition & 1 deletion bin/sails-generate.js
Expand Up @@ -5,7 +5,7 @@
* Module dependencies
*/

var _ = require('lodash');
var _ = require('@sailshq/lodash');
var util = require('util');
var path = require('path');
var async = require('async');
Expand Down
2 changes: 1 addition & 1 deletion bin/sails-lift.js
Expand Up @@ -6,7 +6,7 @@
*/

var nodepath = require('path');
var _ = require('lodash');
var _ = require('@sailshq/lodash');
var chalk = require('chalk');
var captains = require('captains-log');
var package = require('../package.json');
Expand Down
2 changes: 1 addition & 1 deletion bin/sails-new.js
Expand Up @@ -6,7 +6,7 @@
*/

var nodepath = require('path');
var _ = require('lodash');
var _ = require('@sailshq/lodash');
var sailsgen = require('sails-generate');
var package = require('../package.json');
var rconf = require('../lib/app/configuration/rc');
Expand Down
2 changes: 1 addition & 1 deletion bin/sails-www.js
Expand Up @@ -6,7 +6,7 @@
*/

var nodepath = require('path');
var _ = require('lodash');
var _ = require('@sailshq/lodash');
var CaptainsLog = require('captains-log');
var Sails = require('../lib/app');
var rconf = require('../lib/app/configuration/rc');
Expand Down
2 changes: 1 addition & 1 deletion bin/sails.js
Expand Up @@ -5,7 +5,7 @@
* Module dependencies
*/

var _ = require('lodash');
var _ = require('@sailshq/lodash');
var program = require('./_commander');
var package = require('../package.json');
var NOOP = function() {};
Expand Down
2 changes: 1 addition & 1 deletion lib/app/Sails.js
Expand Up @@ -3,7 +3,7 @@
*/

var events = require('events');
var _ = require('lodash');
var _ = require('@sailshq/lodash');
var util = require('util');
var loadSails = require('./load');
var mixinAfter = require('./private/after');
Expand Down
2 changes: 1 addition & 1 deletion lib/app/configuration/index.js
Expand Up @@ -2,7 +2,7 @@
* Module dependencies.
*/

var _ = require('lodash');
var _ = require('@sailshq/lodash');
var path = require('path');
var DEFAULT_HOOKS = require('./default-hooks');

Expand Down
2 changes: 1 addition & 1 deletion lib/app/configuration/load.js
Expand Up @@ -2,7 +2,7 @@
* Module dependencies.
*/

var _ = require('lodash');
var _ = require('@sailshq/lodash');
var async = require('async');
var CaptainsLog = require('captains-log');
var path = require('path');
Expand Down
2 changes: 1 addition & 1 deletion lib/app/get-route-for.js
Expand Up @@ -3,7 +3,7 @@
*/

var util = require('util');
var _ = require('lodash');
var _ = require('@sailshq/lodash');
var sailsUtil = require('sails-util');


Expand Down
2 changes: 1 addition & 1 deletion lib/app/index.js
Expand Up @@ -4,7 +4,7 @@

// try {console.time('require_core');}catch(e){}
var Sails = require('./Sails');
var _ = require('lodash');
var _ = require('@sailshq/lodash');


/**
Expand Down
2 changes: 1 addition & 1 deletion lib/app/lift.js
Expand Up @@ -3,7 +3,7 @@
*/

var async = require('async');
var _ = require('lodash');
var _ = require('@sailshq/lodash');
var chalk = require('chalk');

/**
Expand Down
2 changes: 1 addition & 1 deletion lib/app/load.js
@@ -1,5 +1,5 @@
var async = require('async');
var _ = require('lodash');
var _ = require('@sailshq/lodash');
var util = require('util');
var __Configuration = require('./configuration');
var __initializeHooks = require('./private/loadHooks');
Expand Down
2 changes: 1 addition & 1 deletion lib/app/lower.js
Expand Up @@ -3,7 +3,7 @@
*/

var async = require('async');
var _ = require('lodash');
var _ = require('@sailshq/lodash');


/**
Expand Down
2 changes: 1 addition & 1 deletion lib/app/private/after.js
Expand Up @@ -2,7 +2,7 @@
* Module dependencies
*/

var _ = require('lodash');
var _ = require('@sailshq/lodash');
var async = require('async');


Expand Down
2 changes: 1 addition & 1 deletion lib/app/private/exposeGlobals.js
Expand Up @@ -2,7 +2,7 @@
* Module dependencies.
*/

var _ = require('lodash');
var _ = require('@sailshq/lodash');
var async = require('async');


Expand Down
2 changes: 1 addition & 1 deletion lib/app/private/initialize.js
Expand Up @@ -3,7 +3,7 @@
*/

var util = require('util');
var _ = require('lodash');
var _ = require('@sailshq/lodash');
var async = require('async');


Expand Down
2 changes: 1 addition & 1 deletion lib/app/private/inspect.js
Expand Up @@ -3,7 +3,7 @@
*/

var util = require('util');
var _ = require('lodash');
var _ = require('@sailshq/lodash');



Expand Down
2 changes: 1 addition & 1 deletion lib/app/private/loadHooks.js
@@ -1,4 +1,4 @@
var _ = require('lodash');
var _ = require('@sailshq/lodash');
var async = require('async');
var __hooks = require('../../hooks');
var defaultsDeep = require('merge-defaults');
Expand Down
2 changes: 1 addition & 1 deletion lib/app/private/toJSON.js
Expand Up @@ -2,7 +2,7 @@
* Module dependencies
*/

var _ = require('lodash');
var _ = require('@sailshq/lodash');


/**
Expand Down
2 changes: 1 addition & 1 deletion lib/app/request.js
Expand Up @@ -2,7 +2,7 @@
* Module dependencies.
*/

var _ = require('lodash');
var _ = require('@sailshq/lodash');
var util = require('util');
var QS = require('querystring');
var Transform = require('stream').Transform;
Expand Down
2 changes: 1 addition & 1 deletion lib/hooks/blueprints/actionUtil.js
Expand Up @@ -3,7 +3,7 @@
*/

var util = require('util');
var _ = require('lodash');
var _ = require('@sailshq/lodash');
var isString = _.isString;
var isArray = _.isArray;
var isObject = _.isObject;
Expand Down
2 changes: 1 addition & 1 deletion lib/hooks/blueprints/actions/add.js
Expand Up @@ -2,7 +2,7 @@
* Module dependencies
*/
var actionUtil = require('../actionUtil');
var _ = require('lodash');
var _ = require('@sailshq/lodash');
var async = require('async');

/**
Expand Down
66 changes: 33 additions & 33 deletions lib/hooks/blueprints/actions/create.js
Expand Up @@ -2,7 +2,7 @@
* Module dependencies
*/
var actionUtil = require('../actionUtil');
var _ = require('lodash');
var _ = require('@sailshq/lodash');

/**
* Create Record
Expand All @@ -19,36 +19,36 @@ var _ = require('lodash');
*/
module.exports = function createRecord (req, res) {

var Model = actionUtil.parseModel(req);

// Create data object (monolithic combination of all parameters)
// Omit the blacklisted params (like JSONP callback param, etc.)
var data = actionUtil.parseValues(req);


// Create new instance of model using data from params
Model.create(data).exec(function created (err, newInstance) {

// Differentiate between waterline-originated validation errors
// and serious underlying issues. Respond with badRequest if a
// validation error is encountered, w/ validation info.
if (err) return res.negotiate(err);

// If we have the pubsub hook, use the model class's publish method
// to notify all subscribers about the created item
if (req._sails.hooks.pubsub) {
if (req.isSocket) {
Model.subscribe(req, newInstance);
Model.introduce(newInstance);
}
// Make sure data is JSON-serializable before publishing
var publishData = _.isArray(newInstance) ?
_.map(newInstance, function(instance) {return instance.toJSON();}) :
newInstance.toJSON();
Model.publishCreate(publishData, !req.options.mirror && req);
}

// Send JSONP-friendly response if it's supported
res.created(newInstance);
});
var Model = actionUtil.parseModel(req);

// Create data object (monolithic combination of all parameters)
// Omit the blacklisted params (like JSONP callback param, etc.)
var data = actionUtil.parseValues(req);


// Create new instance of model using data from params
Model.create(data).exec(function created (err, newInstance) {

// Differentiate between waterline-originated validation errors
// and serious underlying issues. Respond with badRequest if a
// validation error is encountered, w/ validation info.
if (err) return res.negotiate(err);

// If we have the pubsub hook, use the model class's publish method
// to notify all subscribers about the created item
if (req._sails.hooks.pubsub) {
if (req.isSocket) {
Model.subscribe(req, newInstance);
Model.introduce(newInstance);
}
// Make sure data is JSON-serializable before publishing
var publishData = _.isArray(newInstance) ?
_.map(newInstance, function(instance) {return instance.toJSON();}) :
newInstance.toJSON();
Model.publishCreate(publishData, !req.options.mirror && req);
}

// Send JSONP-friendly response if it's supported
res.created(newInstance);
});
};
2 changes: 1 addition & 1 deletion lib/hooks/blueprints/actions/find.js
Expand Up @@ -2,7 +2,7 @@
* Module dependencies
*/
var actionUtil = require('../actionUtil'),
_ = require('lodash');
_ = require('@sailshq/lodash');

/**
* Find Records
Expand Down
2 changes: 1 addition & 1 deletion lib/hooks/blueprints/actions/remove.js
Expand Up @@ -2,7 +2,7 @@
* Module dependencies
*/
var actionUtil = require('../actionUtil');
var _ = require('lodash');
var _ = require('@sailshq/lodash');


/**
Expand Down
2 changes: 1 addition & 1 deletion lib/hooks/blueprints/actions/update.js
Expand Up @@ -4,7 +4,7 @@

var actionUtil = require('../actionUtil');
var util = require('util');
var _ = require('lodash');
var _ = require('@sailshq/lodash');


/**
Expand Down

0 comments on commit ea842a3

Please sign in to comment.