Merge branch 'master' into update-kuzzle-security-document

Conflicts:
	package.json

Author: STAFYNIAK Sacha

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,
@@ -2663,13 +2663,18 @@ KuzzleRoom.prototype.count = function (cb) {
   var data;
 
   this.kuzzle.callbackRequired('KuzzleRoom.count', cb);
+
   data = this.kuzzle.addHeaders({body: {roomId: this.roomId}}, this.headers);
 
   if (this.subscribing) {
     this.queue.push({action: 'count', args: [cb]});
     return this;
   }
 
+  if (!this.roomId) {
+    throw new Error('KuzzleRoom.count: cannot count subscriptions on an inactive room');
+  }
+
   this.kuzzle.query(this.collection.buildQueryArgs('subscribe', 'count'), data, function (err, res) {
     if (err) {
       return cb(err);
@@ -2702,6 +2707,8 @@ KuzzleRoom.prototype.renew = function (filters, cb) {
     filters = null;
   }
 
+  self.kuzzle.callbackRequired('KuzzleRoom.renew', cb);
+
   /*
     Skip subscription renewal if another one was performed a moment before
    */
@@ -2728,8 +2735,6 @@ KuzzleRoom.prototype.renew = function (filters, cb) {
     return self;
   }
 
-  self.kuzzle.callbackRequired('KuzzleRoom.renew', cb);
-
   self.unsubscribe();
   self.roomId = null;
   self.subscribing = true;
@@ -3037,7 +3042,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 +3769,7 @@ function KuzzleSecurityDocument(kuzzleSecurity, id, content) {
   });
 
   if (content) {
-    this.setContent(content);
+    this.setContent(content, true);
   }
 
   // promisifying
@@ -3781,13 +3786,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 +3918,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

@@ -1,6 +1,6 @@
 {
   "name": "kuzzle-sdk",
-  "version": "1.6.2",
+  "version": "1.6.4",
   "description": "Official Javascript SDK for Kuzzle",
   "author": "The Kuzzle Team <[email protected]>",
   "repository": {
@@ -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",
+    "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"
   }
 }

dist/kuzzle.min.map

@@ -24,7 +24,7 @@ function KuzzleDataMapping(kuzzleDataCollection, mapping) {
     //read-only properties
     collection: {
       value: kuzzleDataCollection,
-      eunmerable: true
+      enumerable: true
     },
     kuzzle: {
       value: kuzzleDataCollection.kuzzle,

package.json

@@ -126,13 +126,18 @@ KuzzleRoom.prototype.count = function (cb) {
   var data;
 
   this.kuzzle.callbackRequired('KuzzleRoom.count', cb);
+
   data = this.kuzzle.addHeaders({body: {roomId: this.roomId}}, this.headers);
 
   if (this.subscribing) {
     this.queue.push({action: 'count', args: [cb]});
     return this;
   }
 
+  if (!this.roomId) {
+    throw new Error('KuzzleRoom.count: cannot count subscriptions on an inactive room');
+  }
+
   this.kuzzle.query(this.collection.buildQueryArgs('subscribe', 'count'), data, function (err, res) {
     if (err) {
       return cb(err);
@@ -165,6 +170,8 @@ KuzzleRoom.prototype.renew = function (filters, cb) {
     filters = null;
   }
 
+  self.kuzzle.callbackRequired('KuzzleRoom.renew', cb);
+
   /*
     Skip subscription renewal if another one was performed a moment before
    */
@@ -191,8 +198,6 @@ KuzzleRoom.prototype.renew = function (filters, cb) {
     return self;
   }
 
-  self.kuzzle.callbackRequired('KuzzleRoom.renew', cb);
-
   self.unsubscribe();
   self.roomId = null;
   self.subscribing = true;

src/kuzzleDataMapping.js

@@ -71,6 +71,7 @@ describe('KuzzleRoom methods', function () {
         body: {}
       };
       room = new KuzzleRoom(dataCollection);
+      room.roomId = 'foobar';
     });
 
     it('should send the right query to Kuzzle', function () {
@@ -111,6 +112,11 @@ describe('KuzzleRoom methods', function () {
         done();
       });
     });
+
+    it('should fail if the room has no room ID', function () {
+      room.roomId = undefined;
+      should(function () {room.count(function () {})}).throw();
+    });
   });
 
   describe('#renew', function () {