Merge pull request #1536 from jdalton/lodash

Gruntfile.js

@@ -6,7 +6,7 @@ var path           = require('path'),
     when           = require('when'),
     semver         = require('semver'),
     fs             = require('fs'),
-    _              = require('underscore'),
+    _              = require('lodash'),
     spawn          = require('child_process').spawn,
     buildDirectory = path.resolve(process.cwd(), '.build'),
     distDirectory  = path.resolve(process.cwd(), '.dist'),
@@ -380,7 +380,7 @@ var path           = require('path'),
                             'core/shared/vendor/jquery/jquery-ui-1.10.3.custom.min.js',
                             'core/client/assets/lib/jquery-utils.js',
                             'core/client/assets/lib/uploader.js',
-                            'core/shared/vendor/underscore.js',
+                            'core/shared/vendor/lodash.underscore.js',
                             'core/shared/vendor/backbone/backbone.js',
                             'core/shared/vendor/handlebars/handlebars-runtime.js',
                             'core/shared/vendor/moment.js',
@@ -435,7 +435,7 @@ var path           = require('path'),
                             'core/shared/vendor/jquery/jquery-ui-1.10.3.custom.min.js',
                             'core/client/assets/lib/jquery-utils.js',
                             'core/client/assets/lib/uploader.js',
-                            'core/shared/vendor/underscore.js',
+                            'core/shared/vendor/lodash.underscore.js',
                             'core/shared/vendor/backbone/backbone.js',
                             'core/shared/vendor/handlebars/handlebars-runtime.js',
                             'core/shared/vendor/moment.js',

core/server/api/db.js

@@ -5,7 +5,7 @@ var dataExport       = require('../data/export'),
     path             = require('path'),
     when             = require('when'),
     nodefn           = require('when/node/function'),
-    _                = require('underscore'),
+    _                = require('lodash'),
     schema           = require('../data/schema').tables,
     configPaths      = require('../config/paths'),
     api              = {},

core/server/api/index.js

@@ -1,7 +1,7 @@
 // # Ghost Data API
 // Provides access to the data model
 
-var _             = require('underscore'),
+var _             = require('lodash'),
     when          = require('when'),
     config        = require('../config'),
     errors        = require('../errorHandling'),

core/server/api/notifications.js

@@ -1,5 +1,5 @@
 var when               = require('when'),
-    _                  = require('underscore'),
+    _                  = require('lodash'),
     // Holds the persistent notifications
     notificationsStore = [],
     notifications;

core/server/api/posts.js

@@ -1,5 +1,5 @@
 var when                   = require('when'),
-    _                      = require('underscore'),
+    _                      = require('lodash'),
     dataProvider           = require('../models'),
     permissions            = require('../permissions'),
     canThis                = permissions.canThis,

core/server/api/settings.js

@@ -1,4 +1,4 @@
-var _            = require('underscore'),
+var _            = require('lodash'),
     dataProvider = require('../models'),
     when         = require('when'),
     errors       = require('../errorHandling'),

core/server/api/users.js

@@ -1,5 +1,5 @@
 var when               = require('when'),
-    _                  = require('underscore'),
+    _                  = require('lodash'),
     dataProvider       = require('../models'),
     settings           = require('./settings'),
     ONE_DAY            = 86400000,

core/server/apps/index.js

@@ -1,5 +1,5 @@
 
-var _           = require('underscore'),
+var _           = require('lodash'),
     when        = require('when'),
     errors      = require('../errorHandling'),
     api         = require('../api'),

core/server/apps/loader.js

@@ -1,6 +1,6 @@
 
 var path = require('path'),
-    _    = require('underscore'),
+    _    = require('lodash'),
     when = require('when'),
     appProxy = require('./proxy'),
     config = require('../config'),

core/server/apps/proxy.js

@@ -1,4 +1,4 @@
-var _           = require('underscore'),
+var _           = require('lodash'),
     api         = require('../api'),
     helpers     = require('../helpers'),
     filters     = require('../filters');

core/server/apps/sandbox.js

@@ -1,8 +1,8 @@
 
-var fs = require('fs'),
-    path = require('path'),
-    Module = require('module'),
-    _ = require('underscore');
+var fs      = require('fs'),
+    path    = require('path'),
+    Module  = require('module'),
+    _       = require('lodash');
 
 function AppSandbox(opts) {
     this.opts = _.defaults(opts || {}, AppSandbox.defaults);

core/server/config/paths.js

@@ -5,7 +5,7 @@ var moment            = require('moment'),
     path              = require('path'),
     when              = require('when'),
     url               = require('url'),
-    _                 = require('underscore'),
+    _                 = require('lodash'),
     requireTree       = require('../require-tree'),
     appRoot           = path.resolve(__dirname, '../../../'),
     corePath          = path.resolve(appRoot, 'core/'),

core/server/controllers/admin.js

@@ -1,5 +1,5 @@
 var config        = require('../config'),
-    _             = require('underscore'),
+    _             = require('lodash'),
     path          = require('path'),
     when          = require('when'),
     api           = require('../api'),

core/server/controllers/frontend.js

@@ -6,7 +6,7 @@
 
 var moment      = require('moment'),
     RSS         = require('rss'),
-    _           = require('underscore'),
+    _           = require('lodash'),
     url         = require('url'),
     when        = require('when'),
 

core/server/data/export/index.js

@@ -1,5 +1,5 @@
 var when      = require('when'),
-    _         = require('underscore'),
+    _         = require('lodash'),
     migration = require('../migration'),
     knex      = require('../../models/base').knex,
     schema    = require('../schema').tables,

core/server/data/fixtures/index.js

@@ -1,5 +1,5 @@
 var sequence   = require('when/sequence'),
-    _          = require('underscore'),
+    _          = require('lodash'),
     Post       = require('../../models/post').Post,
     Tag        = require('../../models/tag').Tag,
     Role       = require('../../models/role').Role,

core/server/data/import/000.js

@@ -1,5 +1,5 @@
 var when   = require('when'),
-    _      = require('underscore'),
+    _      = require('lodash'),
     models = require('../../models'),
     errors = require('../../errorHandling'),
     Importer000;

core/server/data/migration/index.js

@@ -1,4 +1,4 @@
-var _               = require('underscore'),
+var _               = require('lodash'),
     when            = require('when'),
     errors          = require('../../errorHandling'),
     client          = require('../../models/base').client,

core/server/errorHandling.js

@@ -1,5 +1,5 @@
 /*jslint regexp: true */
-var _           = require('underscore'),
+var _           = require('lodash'),
     colors      = require('colors'),
     fs          = require('fs'),
     configPaths = require('./config/paths'),
@@ -227,16 +227,16 @@ errors = {
     }
 };
 
-// Ensure our 'this' context in the functions
-_.bindAll(
-    errors,
-    'throwError',
-    'logError',
+// Ensure our 'this' context for methods and preserve method arity by
+// using Function#bind for expressjs
+_.each([
     'logAndThrowError',
     'logErrorWithRedirect',
     'renderErrorPage',
     'error404',
     'error500'
-);
+], function (funcName) {
+    errors[funcName] = errors[funcName].bind(errors);
+});
 
 module.exports = errors;

core/server/filters.js

@@ -1,5 +1,5 @@
 var when          = require('when'),
-    _             = require('underscore'),
+    _             = require('lodash'),
 
     defaults;
 

core/server/helpers/index.js

@@ -3,7 +3,7 @@ var downsize        = require('downsize'),
     moment          = require('moment'),
     path            = require('path'),
     polyglot        = require('node-polyglot').instance,
-    _               = require('underscore'),
+    _               = require('lodash'),
     when            = require('when'),
 
     api             = require('../api'),

core/server/index.js

@@ -7,7 +7,7 @@ var crypto      = require('crypto'),
     path        = require('path'),
     Polyglot    = require('node-polyglot'),
     semver      = require('semver'),
-    _           = require('underscore'),
+    _           = require('lodash'),
     when        = require('when'),
 
     api         = require('./api'),

core/server/mail.js

@@ -1,6 +1,6 @@
 var cp         = require('child_process'),
     url        = require('url'),
-    _          = require('underscore'),
+    _          = require('lodash'),
     when       = require('when'),
     nodefn     = require('when/node/function'),
     nodemailer = require('nodemailer'),

core/server/middleware/index.js

@@ -4,7 +4,7 @@
 
 var middleware = require('./middleware'),
     express     = require('express'),
-    _           = require('underscore'),
+    _           = require('lodash'),
     url         = require('url'),
     when        = require('when'),
     slashes     = require('connect-slashes'),

core/server/middleware/middleware.js

@@ -2,7 +2,7 @@
 // The following custom middleware functions are all unit testable, and have accompanying unit tests in
 // middleware_spec.js
 
-var _           = require('underscore'),
+var _           = require('lodash'),
     express     = require('express'),
     busboy      = require('./ghost-busboy'),
     config      = require('../config'),

core/server/models/base.js

@@ -2,7 +2,7 @@ var ghostBookshelf,
     Bookshelf = require('bookshelf'),
     when      = require('when'),
     moment    = require('moment'),
-    _         = require('underscore'),
+    _         = require('lodash'),
     uuid      = require('node-uuid'),
     config    = require('../config'),
     Validator = require('validator').Validator,

core/server/models/index.js

@@ -1,5 +1,5 @@
 var migrations = require('../data/migration'),
-    _          = require('underscore');
+    _          = require('lodash');
 
 module.exports = {
     Post: require('./post').Post,

core/server/models/post.js

@@ -1,6 +1,6 @@
 var Post,
     Posts,
-    _ = require('underscore'),
+    _ = require('lodash'),
     uuid = require('node-uuid'),
     when = require('when'),
     errors = require('../errorHandling'),

core/server/models/settings.js

@@ -2,7 +2,7 @@ var Settings,
     ghostBookshelf = require('./base'),
     validator      = ghostBookshelf.validator,
     uuid           = require('node-uuid'),
-    _              = require('underscore'),
+    _              = require('lodash'),
     errors         = require('../errorHandling'),
     when           = require('when'),
     defaultSettings;

core/server/models/user.js

@@ -1,6 +1,6 @@
 var User,
     Users,
-    _              = require('underscore'),
+    _              = require('lodash'),
     uuid           = require('node-uuid'),
     when           = require('when'),
     errors         = require('../errorHandling'),

core/server/permissions/index.js

@@ -1,7 +1,7 @@
 // canThis(someUser).edit.posts([id]|[[ids]])
 // canThis(someUser).edit.post(somePost|somePostId)
 
-var _                   = require('underscore'),
+var _                   = require('lodash'),
     when                = require('when'),
     Models              = require('../models'),
     objectTypeModelMap  = require('./objectTypeModelMap'),

core/server/storage/base.js

@@ -1,4 +1,4 @@
-var _       = require('underscore'),
+var _       = require('lodash'),
     moment  = require('moment'),
     path    = require('path'),
     when    = require('when'),

core/server/storage/localfilesystem.js

@@ -1,7 +1,7 @@
 // # Local File System Image Storage module
 // The (default) module for storing images, using the local file system
 
-var _       = require('underscore'),
+var _       = require('lodash'),
     express = require('express'),
     fs      = require('fs-extra'),
     nodefn  = require('when/node/function'),

core/server/update-check.js

@@ -25,7 +25,7 @@ var crypto   = require('crypto'),
     semver   = require('semver'),
     when     = require('when'),
     nodefn   = require('when/node/function'),
-    _        = require('underscore'),
+    _        = require('lodash'),
     url      = require('url'),
 
     api      = require('./api'),

core/test/functional/api/posts_test.js

@@ -1,7 +1,7 @@
 /*globals describe, before, after, beforeEach, afterEach, it */
 var testUtils = require('../../utils'),
     should = require('should'),
-    _ = require('underscore'),
+    _ = require('lodash'),
     request = require('request');
 
 request = request.defaults({jar: true});

core/test/functional/api/settings_test.js

@@ -1,7 +1,7 @@
 /*globals describe, before, beforeEach, afterEach, it */
 var testUtils = require('../../utils'),
     should = require('should'),
-    _ = require('underscore'),
+    _ = require('lodash'),
     request = require('request');
 
 request = request.defaults({jar:true})

core/test/functional/api/tags_test.js

@@ -1,7 +1,7 @@
 /*globals describe, before, beforeEach, afterEach, it */
 var testUtils = require('../../utils'),
     should = require('should'),
-    _ = require('underscore'),
+    _ = require('lodash'),
     request = require('request');
 
 request = request.defaults({jar:true})

core/test/functional/api/users_test.js

@@ -1,7 +1,7 @@
 /*globals describe, before, beforeEach, afterEach, it */
 var testUtils = require('../../utils'),
     should = require('should'),
-    _ = require('underscore'),
+    _ = require('lodash'),
     request = require('request');
 
 request = request.defaults({jar:true})

core/test/integration/model/model_posts_spec.js

@@ -1,7 +1,7 @@
 /*globals describe, before, beforeEach, afterEach, it */
 var testUtils = require('../../utils'),
     should = require('should'),
-    _ = require('underscore'),
+    _ = require('lodash'),
     when = require('when'),
     sequence = require('when/sequence'),
 

core/test/integration/model/model_settings_spec.js

@@ -1,7 +1,7 @@
 /*globals describe, before, beforeEach, afterEach, it*/
 var testUtils = require('../../utils'),
     should = require('should'),
-    _ = require("underscore"),
+    _ = require("lodash"),
 
     // Stuff we are testing
     Models = require('../../../server/models'),

core/test/integration/model/model_tags_spec.js

@@ -1,6 +1,6 @@
 /*globals describe, before, beforeEach, afterEach, it */
 var testUtils = require('../../utils'),
-    _ = require("underscore"),
+    _ = require("lodash"),
     when = require('when'),
     sequence = require('when/sequence'),
     should = require('should'),

core/test/integration/model/model_users_spec.js

@@ -2,7 +2,7 @@
 var testUtils = require('../../utils'),
     should = require('should'),
     when = require('when'),
-    _ = require('underscore'),
+    _ = require('lodash'),
     errors = require('../../../server/errorHandling'),
     sinon = require('sinon'),
     uuid = require('node-uuid'),

core/test/unit/apps_spec.js

@@ -1,14 +1,14 @@
 /*globals describe, beforeEach, afterEach,  before, it*/
-var fs = require('fs'),
-    path = require('path'),
-    should = require('should'),
-    sinon = require('sinon'),
-    _ = require("underscore"),
-    helpers = require('../../server/helpers'),
-    filters = require('../../server/filters'),
+var fs         = require('fs'),
+    path       = require('path'),
+    should     = require('should'),
+    sinon      = require('sinon'),
+    _          = require('lodash'),
+    helpers    = require('../../server/helpers'),
+    filters    = require('../../server/filters'),
 
     // Stuff we are testing
-    appProxy = require('../../server/apps/proxy'),
+    appProxy   = require('../../server/apps/proxy'),
     AppSandbox = require('../../server/apps/sandbox');
 
 describe('Apps', function () {

core/test/unit/config_spec.js

@@ -5,7 +5,7 @@ var should         = require('should'),
     when           = require('when'),
     path           = require('path'),
     fs             = require('fs'),
-    _              = require('underscore'),
+    _              = require('lodash'),
     rewire         = require("rewire"),
 
     testUtils      = require('../utils'),

core/test/unit/export_spec.js

@@ -3,7 +3,7 @@ var testUtils = require('../utils'),
     should = require('should'),
     sinon = require('sinon'),
     when = require('when'),
-    _ = require("underscore"),
+    _ = require("lodash"),
     errors = require('../../server/errorHandling'),
 
     // Stuff we are testing

core/test/unit/filters_spec.js

@@ -4,7 +4,7 @@ var testUtils = require('../utils'),
     sinon = require('sinon'),
     when = require('when'),
     path = require('path'),
-    _ = require('underscore'),
+    _ = require('lodash'),
 
     // Stuff we are testing
     Filters = require('../../server/filters').Filters;

core/test/unit/import_spec.js

@@ -4,7 +4,7 @@ var testUtils = require('../utils'),
     sinon = require('sinon'),
     when = require('when'),
     assert = require('assert'),
-    _ = require("underscore"),
+    _ = require("lodash"),
     errors = require('../../server/errorHandling'),
 
     // Stuff we are testing

core/test/unit/mail_spec.js

@@ -4,7 +4,7 @@ var testUtils = require('../utils'),
     sinon = require('sinon'),
     when = require('when'),
 
-    _ = require("underscore"),
+    _ = require("lodash"),
     cp = require('child_process'),
 
     // Stuff we are testing

core/test/unit/middleware_spec.js

@@ -3,7 +3,7 @@ var assert          = require('assert'),
     should          = require('should'),
     sinon           = require('sinon'),
     when            = require('when'),
-    _               = require('underscore'),
+    _               = require('lodash'),
     express         = require('express'),
     api             = require('../../server/api'),
     middleware      = require('../../server/middleware').middleware;

core/test/unit/permissions_spec.js

@@ -3,7 +3,7 @@ var testUtils = require('../utils'),
     should = require('should'),
     sinon = require('sinon'),
     when = require('when'),
-    _ = require("underscore"),
+    _ = require("lodash"),
     errors = require('../../server/errorHandling'),
 
     // Stuff we are testing

core/test/unit/server_helpers_index_spec.js

@@ -3,7 +3,7 @@ var testUtils   = require('../utils'),
     should      = require('should'),
     sinon       = require('sinon'),
     when        = require('when'),
-    _           = require('underscore'),
+    _           = require('lodash'),
     path        = require('path'),
     rewire      = require('rewire'),
     api         = require('../../server/api'),

core/test/unit/server_helpers_template_spec.js

@@ -3,7 +3,7 @@ var testUtils = require('../utils'),
     should    = require('should'),
     sinon     = require('sinon'),
     when      = require('when'),
-    _         = require('underscore'),
+    _         = require('lodash'),
     path      = require('path'),
     hbs = require('express-hbs'),
 

core/test/utils/api.js

@@ -1,4 +1,4 @@
-var _ = require('underscore'),
+var _ = require('lodash'),
     url = require('url'),
     ApiRouteBase = '/ghost/api/v0.1/',
     host = 'localhost',

core/test/utils/fixtures/data-generator.js

@@ -1,4 +1,4 @@
-var _ = require('underscore'),
+var _ = require('lodash'),
     uuid = require('node-uuid'),
     DataGenerator = {};
 

package.json

@@ -50,7 +50,7 @@
         "semver": "2.2.1",
         "showdown": "0.3.1",
         "sqlite3": "2.1.19",
-        "underscore": "1.5.2",
+        "lodash": "2.4.1",
         "unidecode": "0.1.3",
         "validator": "1.4.0",
         "when": "2.7.0"