Merge branch 'canary'

Author: knalli

.nvmrc

@@ -1 +1 @@
-4.1
+4.2

.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: node_js
 node_js:
-  - "4.1"
+  - "4.2"
 
 addons:
   code_climate:

Gruntfile.js

@@ -45,7 +45,7 @@ module.exports = function (grunt) {
       '<%= grunt.template.today("yyyy-mm-dd") %>\n' +
       '<%= pkg.homepage ? "* " + pkg.homepage + "\\n" : "" %>' +
       '* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>;' +
-      ' Licensed <%= _.pluck(pkg.licenses, "name").join(", ") %> */'
+      ' Licensed <%= pkg.license %> */'
     },
     clean : {
       dist : 'dist/',
@@ -172,7 +172,7 @@ module.exports = function (grunt) {
         '<%= grunt.template.today("yyyy-mm-dd") %>\n' +
         '<%= pkg.homepage ? "* " + pkg.homepage + "\\n" : "" %>' +
         '* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>;' +
-        ' Licensed <%= _.pluck(pkg.licenses, "name").join(", ") %> */\n'
+        ' Licensed <%= pkg.license %> */\n'
       },
       'dist-withPolyfill' : {
         src : [

bower.json

@@ -2,7 +2,7 @@
   "author": "Jan Philipp",
   "name": "angular-vertxbus",
   "description": "AngularJS facade and service acting as a Vert.x SockJS client",
-  "version": "3.0.2",
+  "version": "3.1.0",
   "homepage": "http://github.com/knalli/angular-vertxbus",
   "main": "./dist/angular-vertxbus.js",
   "keywords": [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-vertxbus",
-  "version": "3.0.2",
+  "version": "3.1.0",
   "description": "AngularJS facade and service acting as a Vert.x SockJS client",
   "main": "dist/angular-vertxbus.js",
   "keywords": [
@@ -56,9 +56,9 @@
     "grunt-karma": "^0.12.1",
     "grunt-ngdocs": "^0.2.9",
     "gruntify-eslint": "^1.1.0",
-    "istanbul": "^0.3.22",
+    "istanbul": "^0.4.0",
     "jasmine-core": "^2.3.4",
-    "karma": "^0.13.9",
+    "karma": "^0.13.11",
     "karma-babel-preprocessor": "^5.2.2",
     "karma-browserify": "^4.3.0",
     "karma-chrome-launcher": "^0.2.1",

src/lib/VertxEventBusWrapperProvider.js

@@ -1,5 +1,6 @@
 import EventBusAdapter from './adapter/EventBusAdapter';
 import NoopAdapter from './adapter/NoopAdapter';
+import ConnectionConfigHolder from './support/ConnectionConfigHolder';
 
 /**
  * @ngdoc service
@@ -12,6 +13,7 @@ import NoopAdapter from './adapter/NoopAdapter';
 const DEFAULTS = {
   enabled : true,
   debugEnabled : false,
+  initialConnectEnabled : true,
   urlServer : `${location.protocol}//${location.hostname}` + ((() => {
     if (location.port) {
       return `:${location.port}`;
@@ -45,6 +47,25 @@ let VertxEventBusWrapperProvider = function () {
     return this;
   };
 
+  /**
+   * @ngdoc method
+   * @module knalli.angular-vertxbus
+   * @methodOf knalli.angular-vertxbus.vertxEventBusProvider
+   * @name .#disableAutoConnect
+   *
+   * @description
+   * Disables the auto connection feature.
+   *
+   * This feature will be only available if `enable == true`.
+   *
+   * @param {boolean} [value=true] auto connect on startup
+   * @returns {object} this
+   */
+  this.disableAutoConnect = () => {
+    options.initialConnectEnabled = false;
+    return this;
+  };
+
   /**
    * @ngdoc method
    * @module knalli.angular-vertxbus
@@ -188,6 +209,15 @@ let VertxEventBusWrapperProvider = function () {
       if (instanceOptions.debugEnabled) {
         $log.debug('[Vert.x EB Stub] Enabled');
       }
+
+      // aggregate server connection params
+      instanceOptions.connectionConfig = new ConnectionConfigHolder({
+        urlServer : instanceOptions.urlServer,
+        urlPath : instanceOptions.urlPath
+      });
+      delete instanceOptions.urlServer;
+      delete instanceOptions.urlPath;
+
       return new EventBusAdapter(vertx.EventBus, $timeout, $log, instanceOptions);
     } else {
       if (instanceOptions.debugEnabled) {

src/lib/adapter/BaseAdapter.js

@@ -3,6 +3,9 @@ export default class BaseAdapter {
   constructor() {
   }
 
+  configureConnection() {
+  }
+
   connect() {
   }
 

src/lib/adapter/EventBusAdapter.js

@@ -1,6 +1,7 @@
 import {moduleName} from '../../config.js';
 
 import BaseAdapter from './BaseAdapter';
+import ConnectionConfigHolder from './../support/ConnectionConfigHolder';
 
 /**
  * @ngdoc service
@@ -84,8 +85,8 @@ export default class EventBusAdapter extends BaseAdapter {
   constructor(EventBus, $timeout, $log, {
     enabled,
     debugEnabled,
-    urlServer,
-    urlPath,
+    initialConnectEnabled,
+    connectionConfig,
     reconnectEnabled,
     sockjsReconnectInterval,
     sockjsOptions
@@ -98,19 +99,38 @@ export default class EventBusAdapter extends BaseAdapter {
     this.options = {
       enabled,
       debugEnabled,
-      urlServer,
-      urlPath,
+      initialConnectEnabled,
+      connectionConfig,
       reconnectEnabled,
       sockjsReconnectInterval,
       sockjsOptions
     };
     this.disconnectTimeoutEnabled = true;
-    // asap create connection
-    this.connect();
+    if (initialConnectEnabled) {
+      // asap create connection
+      this.connect();
+    }
+  }
+
+  /**
+   * @ngdoc method
+   * @module knalli.angular-vertxbus
+   * @methodOf knalli.angular-vertxbus.vertxEventBus
+   * @name .#configureConnect
+   *
+   * @description
+   * Reconfigure the connection details.
+   *
+   * @param {string} urlServer
+   * @param {string} [urlPath=/eventbus]
+   */
+  configureConnection(urlServer, urlPath = '/eventbus') {
+    this.options.connectionConfig = new ConnectionConfigHolder({urlServer, urlPath});
+    return this;
   }
 
   connect() {
-    let url = `${this.options.urlServer}${this.options.urlPath}`;
+    let url = `${this.options.connectionConfig.urlServer}${this.options.connectionConfig.urlPath}`;
     if (this.options.debugEnabled) {
       this.$log.debug(`[Vert.x EB Stub] Enabled: connecting '${url}'`);
     }

src/lib/support/ConnectionConfigHolder.js

@@ -0,0 +1,16 @@
+export default class ConnectionConfigHolder {
+
+  constructor({urlServer, urlPath}) {
+    this._urlServer = urlServer;
+    this._urlPath = urlPath;
+  }
+
+  get urlServer() {
+    return this._urlServer;
+  }
+
+  get urlPath() {
+    return this._urlPath;
+  }
+
+}

test/unit/binding/vertxEventBus.spec.js

@@ -265,4 +265,88 @@ describe('integration of module::vertxEventBus', function () {
 
   });
 
+  describe('vertxEventBus (w/o autoconnect)', function () {
+
+    var vertxEventBus, $timeout, $rootScope, $log;
+
+    beforeEach(module('knalli.angular-vertxbus', function (vertxEventBusProvider) {
+      // Override (improve test running time)
+      vertxEventBusProvider
+        .useDebug(true)
+        .useSockJsReconnectInterval(2000)
+        .useReconnect(false)
+        .disableAutoConnect();
+    }));
+
+    beforeEach(inject(function (_vertxEventBus_, _$timeout_, _$rootScope_, _$log_) {
+      vertxEventBus = _vertxEventBus_;
+      $timeout = _$timeout_;
+      $rootScope = _$rootScope_;
+      $log = _$log_;
+      SockJS.currentMockInstance.$log = $log;
+    }));
+
+    it('should not fail calling close() on non existing connection', function (done) {
+      this.timeout(20000);
+      setTimeout(function () {
+        vertxEventBus.close();
+        setTimeout(done, 1200);
+      }, 200);
+    });
+
+    it('should not fail calling reconnect() on non existing connection', function (done) {
+      this.timeout(20000);
+      setTimeout(function () {
+        vertxEventBus.reconnect(true);
+        setTimeout(done, 1200);
+      }, 200);
+    });
+
+    it('should not call the onopen function because no automatic connect', function (done) {
+      this.timeout(20000);
+      var onopenCount = 0;
+      vertxEventBus.onopen = function () {
+        $log.debug('onopen');
+        onopenCount++;
+      };
+      var oncloseCount = 0;
+      vertxEventBus.onclose = function () {
+        $log.debug('onclose');
+        oncloseCount++;
+      };
+      setTimeout(function () {
+        expect(onopenCount).to.be(0); // should be not called!
+        setTimeout(done, 1200);
+      }, 200);
+    });
+
+    it('should not call the onopen function because no automatic connect', function (done) {
+      this.timeout(20000);
+      var onopenCount = 0;
+      vertxEventBus.onopen = function () {
+        $log.debug('onopen');
+        onopenCount++;
+      };
+      var oncloseCount = 0;
+      vertxEventBus.onclose = function () {
+        $log.debug('onclose');
+        oncloseCount++;
+      };
+      setTimeout(function () {
+        expect(onopenCount).to.be(0); // should be not called!
+        $log.debug('apply connection config..');
+        vertxEventBus.configureConnection('http://localhost:1234', '/eventbus1');
+        vertxEventBus.connect();
+        setTimeout(function () {
+          $log.debug('check..');
+          expect(SockJS.currentMockInstance.url).to.be('http://localhost:1234/eventbus1');
+          expect(onopenCount).to.be(1);
+          expect(oncloseCount).to.be(0);
+          done();
+        }, 1200);
+      }, 200);
+    });
+
+  });
+
 });