Merge branch 'canary' as 0.11.1

Author: knalli

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": "0.11.0",
+  "version": "0.11.1",
   "homepage": "http://github.com/knalli/angular-vertxbus",
   "main": "./dist/angular-vertxbus.js",
   "keywords": ["angular", "vertx", "facade", "websocket"],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-vertxbus",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "AngularJS facade and service acting as a Vert.x SockJS client",
   "main": "dist/angular-vertxbus.js",
   "keywords": ["angular", "vertx", "facade", "websocket"],

src/service.coffee

@@ -137,8 +137,8 @@ angular.module('knalli.angular-vertxbus')
     loginPromise = null
     # internal store of buffered messages
     messageQueue = new Queue(messageBuffer)
-    # internal map of deconstructors
-    deconstructors = new SimpleMap()
+    # internal map of callbacks
+    callbackMap = new SimpleMap()
 
     if enabled and vertxEventBus
       vertxEventBus.onopen = ->
@@ -194,20 +194,19 @@ angular.module('knalli.angular-vertxbus')
       registerHandler : (address, callback) ->
         return unless typeof callback is 'function'
         $log.debug("[Vert.x EB Service] Register handler for #{address}") if debugEnabled
-        return deconstructors.get(callback) if deconstructors.containsKey(callback) # already known
-        deconstructor = (message, replyTo) ->
+        callbackWrapper = (message, replyTo) ->
           callback(message, replyTo)
           $rootScope.$digest()
           return #void
-        deconstructor.displayName = "#{CONSTANTS.MODULE}/#{CONSTANTS.COMPONENT}: util.registerHandler (deconstructor)"
-        deconstructors.put(callback, deconstructor)
-        vertxEventBus.registerHandler address, deconstructors.get(callback)
+        callbackWrapper.displayName = "#{CONSTANTS.MODULE}/#{CONSTANTS.COMPONENT}: util.registerHandler (callback wrapper)"
+        callbackMap.put(callback, callbackWrapper)
+        vertxEventBus.registerHandler address, callbackWrapper
       # Remove a callback handler for the specified address match.
       unregisterHandler : (address, callback) ->
         return unless typeof callback is 'function'
         $log.debug("[Vert.x EB Service] Unregister handler for #{address}") if debugEnabled
-        vertxEventBus.unregisterHandler address, deconstructors.get(callback)
-        deconstructors.remove(callback)
+        vertxEventBus.unregisterHandler address, callbackMap.get(callback)
+        callbackMap.remove(callback)
         return #void
       # Send a message to the specified address (using EventBus.send).
       # @param address a required string for the targeting address in the bus

test/unit/angularVertxbusAdapterSpec.js

@@ -590,6 +590,60 @@ describe('knalli.angular-vertxbus', function () {
 
     });
 
+    describe('reconnect', function () {
+      var $timeout, vertxEventBus, vertxEventBusService;
+      beforeEach(inject(function (_vertxEventBus_, _vertxEventBusService_, _$timeout_) {
+        $timeout = _$timeout_;
+        vertxEventBus = _vertxEventBus_;
+        vertxEventBusService = _vertxEventBusService_;
+        // Mock bus is closed
+        _vertxEventBus_.readyState = function () {
+          return _vertxEventBus_.EventBus.OPEN;
+        };
+        var sendCalls = 0;
+        _vertxEventBus_.send = function () {
+          // do nothing, let it timeout
+        };
+        // extend object
+        vertxEventBus.getSendCalls = function () {
+          return sendCalls;
+        };
+      }));
+      it('should be a function', function () {
+        expect(typeof vertxEventBus.reconnect).to.be('function');
+      });
+      // Reconnect should be switch the connectivity, onopen() and onclose()
+      // must be delegated transparently
+      it('should re-add handler after a reconnet', function (done) {
+        this.timeout(20000);
+        var okHandler = false;
+        var myHandler = function () {
+          //$log.debug('[TEST] onhandle() called');
+          okHandler = true;
+        };
+
+        setTimeout(function () {
+          vertxEventBusService.addListener('lalelu', myHandler);
+          vertxEventBus.reconnect();
+          setTimeout(function () {
+            setTimeout(function () {
+              SockJS.currentMockInstance.onmessage({
+                data: JSON.stringify({
+                  address: 'lalelu',
+                  body: {
+                    data: '1x'
+                  },
+                  replyAddress: undefined
+                })
+              });
+              expect(okHandler).to.be(true);
+              done();
+            }, 2100);
+            $timeout.flush();
+          }, 100);
+        }, 100);
+      });
+    });
 
     describe('after adding and removing a handler via "registerHandler"', function () {
 

test/unit/mock/sockjs.coffee

@@ -22,9 +22,9 @@ class SockJS
     else
       window.setTimeout fn, 1
 
-  log: ->
+  log: (args...)->
     log = SockJS.currentMockInstance?.$log or window.console
-    log.debug.apply(this, arguments)
+    log.debug(args...)
 
   close: (mockOptions)->
     @log "[MOCK] SockJS.close()"