updated dependencies

Author: scottinet

dist/kuzzle.js

@@ -2077,7 +2077,7 @@ function KuzzleDataMapping(kuzzleDataCollection, mapping) {
     //read-only properties
     collection: {
       value: kuzzleDataCollection,
-      eunmerable: true
+      enumerable: true
     },
     kuzzle: {
       value: kuzzleDataCollection.kuzzle,
@@ -3037,7 +3037,7 @@ KuzzleProfile.prototype.hydrate = function (options, cb) {
       return cb(error);
     }
 
-    cb(null, new KuzzleProfile(self, response.result._id, response.result._source));
+    cb(null, new KuzzleProfile(self, self.id, {roles: response.result.hits}));
   });
 };
 
@@ -3764,7 +3764,7 @@ function KuzzleSecurityDocument(kuzzleSecurity, id, content) {
   });
 
   if (content) {
-    this.setContent(content);
+    this.setContent(content, true);
   }
 
   // promisifying
@@ -3781,13 +3781,25 @@ function KuzzleSecurityDocument(kuzzleSecurity, id, content) {
 }
 
 /**
+ * Replaces the current content with new data.
+ * Changes made by this function won’t be applied until the save method is called.
  *
  * @param {Object} data - New securityDocument content
+ * @param {boolean} replace - if true: replace this document content with the provided data.
  *
  * @return {Object} this
  */
-KuzzleSecurityDocument.prototype.setContent = function (data) {
-  this.content = data;
+KuzzleSecurityDocument.prototype.setContent = function (data, replace) {
+  var self = this;
+
+  if (replace) {
+    this.content = data;
+  }
+  else {
+    Object.keys(data).forEach(function (key) {
+      self.content[key] = data[key];
+    });
+  }
 
   return this;
 };
@@ -3901,11 +3913,16 @@ KuzzleUser.prototype.hydrate = function (options, cb) {
   }
 
   self.kuzzle.query(this.kuzzleSecurity.buildQueryArgs('getProfile'), {_id: this.content.profile}, options, function (error, response) {
+    var hydratedUser;
+
     if (error) {
       return cb(error);
     }
 
-    cb(null, new KuzzleUser(self, response.result._id, response.result._source));
+    hydratedUser = new KuzzleUser(self.kuzzleSecurity, self.id, self.content);
+    hydratedUser.setProfile(new KuzzleProfile(self.kuzzleSecurity, response.result._id, response.result._source));
+
+    cb(null, hydratedUser);
   });
 };
 

dist/kuzzle.min.js

@@ -24,23 +24,23 @@
   "main": "index.js",
   "license": "Apache-2.0",
   "dependencies": {
-    "bluebird": "3.1.1",
+    "bluebird": "3.3.1",
     "node-uuid": "1.4.7",
-    "socket.io-client": "1.4.4"
+    "socket.io-client": "1.4.5"
   },
   "devDependencies": {
     "browserify": "13.0.0",
     "codecov": "^1.0.1",
     "grunt": "0.4.5",
     "grunt-browserify": "^4.0.1",
-    "grunt-contrib-jshint": "^0.11.3",
-    "grunt-contrib-uglify": "0.11.0",
-    "gruntify-eslint": "^1.0.1",
+    "grunt-contrib-jshint": "^1.0.0",
+    "grunt-contrib-uglify": "0.11.1",
+    "gruntify-eslint": "^2.0.0",
     "istanbul": "0.4.2",
     "istanbul-middleware": "0.2.2",
-    "mocha": "2.3.4",
+    "mocha": "2.4.5",
     "proxyquire": "^1.7.3",
     "rewire": "^2.5.0",
-    "should": "8.1.1"
+    "should": "8.2.2"
   }
 }