Merge branch 'develop' into develop-event-queryerror

Author: scottinet

.travis.yml

@@ -11,17 +11,17 @@ addons:
     - g++-4.9
 script:
 - npm run build && npm test && cat ./coverage/lcov.info | ./node_modules/.bin/codecov
+- chmod 755 ${TRAVIS_BUILD_DIR}/deploy.sh && sh -c "${TRAVIS_BUILD_DIR}/deploy.sh"
 before_install:
 - export CC="gcc-4.9" CXX="g++-4.9"
 install:
 - npm install
-after_success:
-- chmod 755 ${TRAVIS_BUILD_DIR}/deploy.sh && sh -c "${TRAVIS_BUILD_DIR}/deploy.sh"
 env:
   global:
     secure: EZ+XXJFDtehmag7wt8JbutqgzpkkJUCzkEWw6W+p7MIxWenLyuGv/RUu7KGqAloOud1cZbmZGSfRx/vsPvxRjo+ZC7aaPqb74qRvfctGdlJTtEffS2jFno1pEppJzCR4n7vocSfMVYtOD6oHP67lXwn/Qnh++WUkZaV137m5+7rqiYgJ+JTeSs5jBRZ6X7VNoNz8tZXejQ+FOymCFQTS2JM/rSZX9NEK+OwUEhEjRcxqWMm2avk6NAQNAL3WQuIBJQH8lxEJxOXkMc0rQZZ09AoLpqJKzsaicaZMInt5JstPo2e9vJfhi+PpRSNhErIff36aCHWRYYDPKl5x6IelZpBfZeTdrs4V2TbRi1y0ELbgMG1FHS4HAw3vTnh4/49g01lAJed4UguFRc6MzwTLAL8uPG/zFe8snm9+kaf4pL7yO89Hf3eltE03+N//tyVv+X/jdSca2dBZ9FMeLE5pJ2jlRiKitCLjXmLUEMMxEwNF7K/IvOrD9wue3JXK0UogOpcXfppk++pNTijsZluU1Yj7k3fGFeS8d6rIU0Yj40y6/VMaJeL4EXlARRsGLigUKVjQL6+/N5xudlsCng+EG+WVIy4wEEPH0QgjUkPTgWx1NrUlTwjskE0cdqDOBu39WkRFJHHECYFPTfTuDJ7xxuuibFTQmUFu2zjbYfYKhPE=
 deploy:
   provider: npm
+  skip_cleanup: true
   email: support@kuzzle.io
   api_key:
     secure: 3EACVlwZMonqJEl5OVcr1KnV6xg73Is7mILWzLM2i9ZdECHiv3ViQ7uAX24oSpxlDJEdqJ+1UO5uNMqJmGW3k+DDXGWaTSOf5bIOvPPTytUGQMedNucbhF4y0NytO8bfuMFx1Kr2tNcl1db6iLt7LO6lFl1uGcpMiaf2B8dpi3+f+WBAErMkPg3yNXcOMENSml/rt5iJFmF5pBHFAJ5D3CaoUGdqZXeFXNA/Zdhxt0BCpkOnt83+dYSLfIIIS2XZw1fM3lWXndWVQDiRFZWJZjp6PfSKDFmFyxxXmcYDOkzx/YecZtN2BCBzwsjq6C5mgN2GGW/WCk1munYCWrWCLc95LExoolQRuxsIDB1le22GNUNOzrTlZRPLruuFmwDAJc9Z05EcMnv2O74oHqfsRpYoSlWFDWlJEgtJyGjex2EP8W+jYNyMJumD/ywY/xXY4MDQPfaYt38KZECAHPbWCUA4zDbFDMMcAfdPhayLtkQYzTRE4Q5+aYbxd7bQi0c1AoM26BSDVkK8+W+dncu/5L0+mLQOqL5cJJtxVSQhuYSEV/h7Vgt77NOimZOSBxn2PNhf5AII0XDIN/Y1DLMCxgSATvkRmjEwr6qe1bcAik4vpK76qPkg8TMUQryY5s4J/qSBC4K53JER/PUiGO9JM7eYDktHnLlnKFgnY8YD+8I=

dist/kuzzle.js

@@ -1,6 +1,6 @@
 {
   "name": "kuzzle-sdk",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "Official Javascript SDK for Kuzzle",
   "author": "The Kuzzle Team <support@kuzzle.io>",
   "repository": {

dist/kuzzle.js.map

@@ -110,15 +110,18 @@ module.exports = Kuzzle = function (host, options, cb) {
     },
     host: {
       value: host,
+      writable: true,
       enumerable: true
     },
     wsPort: {
       value: (options && typeof options.wsPort === 'number') ? options.wsPort : 7513,
-      enumerable: true
+      enumerable: true,
+      writable: true
     },
     ioPort: {
       value: (options && typeof options.ioPort === 'number') ? options.ioPort : 7512,
-      enumerable: true
+      enumerable: true,
+      writable: true
     },
     sslConnection: {
       value: (options && typeof options.sslConnection === 'boolean') ? options.sslConnection : false,
@@ -315,10 +318,12 @@ module.exports = Kuzzle = function (host, options, cb) {
 Kuzzle.prototype.connect = function () {
   var self = this;
 
-  if (!self.network) {
-    self.network = networkWrapper(self.host, self.wsPort, self.ioPort, self.sslConnection);
+  if (self.network) {
+    self.disconnect();
   }
 
+  self.network = networkWrapper(self.host, self.wsPort, self.ioPort, self.sslConnection);
+
   if (['initializing', 'ready', 'disconnected', 'error', 'offline'].indexOf(this.state) === -1) {
     if (self.connectCB) {
       self.connectCB(null, self);
@@ -1005,6 +1010,7 @@ Kuzzle.prototype.disconnect = function () {
 
   this.state = 'disconnected';
   this.network.close();
+  this.network = null;
 
   for (collection in this.collections) {
     if (this.collections.hasOwnProperty(collection)) {

package.json

@@ -69,8 +69,8 @@ describe('Kuzzle constructor', () => {
       should(kuzzle).have.propertyWithDescriptor('reconnectionDelay', { enumerable: true, writable: false, configurable: false });
       should(kuzzle).have.propertyWithDescriptor('jwtToken', { enumerable: true, writable: true, configurable: false });
       should(kuzzle).have.propertyWithDescriptor('offlineQueueLoader', { enumerable: true, writable: true, configurable: false });
-      should(kuzzle).have.propertyWithDescriptor('wsPort', { enumerable: true, writable: false, configurable: false });
-      should(kuzzle).have.propertyWithDescriptor('ioPort', { enumerable: true, writable: false, configurable: false });
+      should(kuzzle).have.propertyWithDescriptor('wsPort', { enumerable: true, writable: true, configurable: false });
+      should(kuzzle).have.propertyWithDescriptor('ioPort', { enumerable: true, writable: true, configurable: false });
       should(kuzzle).have.propertyWithDescriptor('sslConnection', { enumerable: true, writable: false, configurable: false });
     });
 
@@ -291,6 +291,20 @@ describe('Kuzzle constructor', () => {
         }, 10);
       });
 
+      it('should first disconnect if it was connected', function () {
+        var
+          kuzzle = new Kuzzle('nowhere', {connect: 'manual'}),
+          disconnectStub = sinon.stub();
+
+        kuzzle.disconnect = disconnectStub;
+        kuzzle.connect();
+
+        should(kuzzle.disconnect.called).be.false();
+
+        kuzzle.connect();
+        should(kuzzle.disconnect.called).be.true();
+      });
+
       describe('=> on connection error', () => {
         beforeEach(function () {
           networkStub.onConnectError = function (cb) {
@@ -382,22 +396,25 @@ describe('Kuzzle constructor', () => {
 
         it('should dequeue requests automatically on a connection success', function (done) {
           var
-            dequeued = false,
-            kuzzle,
-            KuzzleRewired = rewire(kuzzleSource),
-            revert = KuzzleRewired.__set__('dequeue', function () { dequeued = true; });
+            dequeueStub = sinon.stub(),
+            kuzzle;
 
           this.timeout(500);
 
-          kuzzle = new KuzzleRewired('nowhere', {connect: 'manual', autoReplay: false, autoQueue: false}, () => {
-            should(kuzzle.state).be.exactly('connected');
-            should(dequeued).be.true();
-            revert();
-            done();
-          });
+          kuzzle = new Kuzzle('nowhere', {connect: 'manual', autoReplay: false, autoQueue: false});
 
-          kuzzle.network = networkStub;
+          kuzzle.queuing = true;
+          kuzzle.offlineQueue.push({query: 'foo'});
+          kuzzle.addListener('offlineQueuePop', dequeueStub);
           kuzzle.connect();
+
+          setTimeout(function () {
+            should(dequeueStub.called).be.true();
+            should(kuzzle.state).be.exactly('connected');
+            should(kuzzle.queuing).be.false();
+            should(kuzzle.offlineQueue).be.empty();
+            done();
+          }, 20);
         });
       });
 

src/kuzzle.js

@@ -399,7 +399,7 @@ describe('Kuzzle methods', function () {
       kuzzle.collections = { foo: {}, bar: {}, baz: {} };
       kuzzle.disconnect();
 
-      should(kuzzle.network.close.called).be.true();
+      should(kuzzle.network).be.null();
       should(kuzzle.collections).be.empty();
       should(function () { kuzzle.isValid(); }).throw(Error);
     });