Merge pull request #241 from samhashemi/bump-deps

Bump lodash to v4

ampersand-state.js

@@ -1,21 +1,21 @@
 'use strict';
 /*$AMPERSAND_VERSION*/
-var uniqueId = require('lodash.uniqueid');
-var assign = require('lodash.assign');
+var uniqueId = require('lodash/uniqueId');
+var assign = require('lodash/assign');
 var cloneObj = function(obj) { return assign({}, obj); };
-var omit = require('lodash.omit');
-var escape = require('lodash.escape');
-var forOwn = require('lodash.forown');
-var includes = require('lodash.includes');
-var isString = require('lodash.isstring');
-var isObject = require('lodash.isobject');
-var isDate = require('lodash.isdate');
-var isFunction = require('lodash.isfunction');
-var _isEqual = require('lodash.isequal'); // to avoid shadowing
-var has = require('lodash.has');
-var result = require('lodash.result');
-var bind = require('lodash.bind'); // because phantomjs doesn't have Function#bind
-var union = require('lodash.union');
+var omit = require('lodash/omit');
+var escape = require('lodash/escape');
+var forOwn = require('lodash/forOwn');
+var includes = require('lodash/includes');
+var isString = require('lodash/isString');
+var isObject = require('lodash/isObject');
+var isDate = require('lodash/isDate');
+var isFunction = require('lodash/isFunction');
+var _isEqual = require('lodash/isEqual'); // to avoid shadowing
+var has = require('lodash/has');
+var result = require('lodash/result');
+var bind = require('lodash/bind'); // because phantomjs doesn't have Function#bind
+var union = require('lodash/union');
 var Events = require('ampersand-events');
 var KeyTree = require('key-tree-store');
 var arrayNext = require('array-next');
@@ -103,12 +103,12 @@ assign(Base.prototype, Events, {
     serialize: function (options) {
         var attrOpts = assign({props: true}, options);
         var res = this.getAttributes(attrOpts, true);
-        forOwn(this._children, function (value, key) {
+        forOwn(this._children, bind(function (value, key) {
             res[key] = this[key].serialize();
-        }, this);
-        forOwn(this._collections, function (value, key) {
+        }, this));
+        forOwn(this._collections, bind(function (value, key) {
             res[key] = this[key].serialize();
-        }, this);
+        }, this));
         return res;
     },
 

package.json

@@ -15,34 +15,19 @@
     "url": "https://github.com/ampersandjs/ampersand-state/issues"
   },
   "dependencies": {
-    "ampersand-events": "^1.1.1",
+    "ampersand-events": "^2.0.1",
     "ampersand-version": "^1.0.0",
     "array-next": "~0.0.1",
     "key-tree-store": "^1.3.0",
-    "lodash.assign": "^3.2.0",
-    "lodash.bind": "^3.1.0",
-    "lodash.escape": "^3.0.0",
-    "lodash.forown": "^3.0.2",
-    "lodash.has": "^3.0.0",
-    "lodash.includes": "^3.1.3",
-    "lodash.isarray": "^3.0.4",
-    "lodash.isdate": "^3.0.1",
-    "lodash.isequal": "^3.0.1",
-    "lodash.isfunction": "^3.0.6",
-    "lodash.isobject": "^3.0.1",
-    "lodash.isstring": "^3.0.1",
-    "lodash.omit": "^3.1.0",
-    "lodash.result": "^3.0.0",
-    "lodash.union": "^3.1.0",
-    "lodash.uniqueid": "^3.0.0"
+    "lodash": "^4.11.1"
   },
   "devDependencies": {
     "ampersand-collection": "^1.3.2",
     "ampersand-registry": "0.x.x",
     "coveralls": "^2.11.4",
     "istanbul": "^0.4.0",
     "jshint": "^2.5.3",
-    "phantomjs": "^1.9.19",
+    "phantomjs": "^2.1.7",
     "precommit-hook": "^3.0.0",
     "tape": "^4.0.3",
     "zuul": "^3.9.0"