Merge pull request #4 from ef-ctx/unsubscribe_fix

feat(session): unsubscribe returns a promise
ef-ctx · Dec 8, 2015 · 6015452 · 6015452
2 parents abb4d45 + c8e702b
commit 6015452
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 14 deletions.
diff --git a/dist/ngAutobahn.js b/dist/ngAutobahn.js
@@ -490,12 +490,15 @@
                  ***************************************************************/
 
                 function unsubscribeBroker(brokerFacade) {
+                    var broker;
+
                     if (!brokerFacade) {
                         throw new Error('ngAutobahnSession.unsubscribeBroker error. No broker provided');
                     } else {
-                        var broker = _getBrokerByBrokerFacade(brokerFacade);
-                        _unsubscribeBroker(broker);
-                        delete _brokers[broker.subscription.id];
+                        broker = _getBrokerByBrokerFacade(brokerFacade);
+
+                        return _unsubscribeBroker(broker)
+                            .then(_deleteBroker);
                     }
                 }
 
@@ -588,8 +591,22 @@
                  * HELPERS
                  ***************************************************************/
 
+                function _deleteBroker(broker) {
+                    delete _brokers[broker.subscription.id];
+                }
+
                 function _unsubscribeBroker(broker) {
-                    _session.unsubscribe(broker.subscription);
+                    var defer = $q.defer();
+
+                    _session.unsubscribe(broker.subscription)
+                        .then(_resolveBroker, defer.reject);
+
+                    return defer.promise;
+
+                    function _resolveBroker() {
+                        defer.resolve(broker);
+                    }
+
                 }
 
                 function _unsubscribeAllBrokers() {

diff --git a/dist/ngAutobahn.min.js b/dist/ngAutobahn.min.js
diff --git a/src/lib/ngAutobahn/session/session.js b/src/lib/ngAutobahn/session/session.js
@@ -105,12 +105,15 @@
                  ***************************************************************/
 
                 function unsubscribeBroker(brokerFacade) {
+                    var broker;
+
                     if (!brokerFacade) {
                         throw new Error('ngAutobahnSession.unsubscribeBroker error. No broker provided');
                     } else {
-                        var broker = _getBrokerByBrokerFacade(brokerFacade);
-                        _unsubscribeBroker(broker);
-                        delete _brokers[broker.subscription.id];
+                        broker = _getBrokerByBrokerFacade(brokerFacade);
+
+                        return _unsubscribeBroker(broker)
+                            .then(_deleteBroker);
                     }
                 }
 
@@ -203,8 +206,22 @@
                  * HELPERS
                  ***************************************************************/
 
+                function _deleteBroker(broker) {
+                    delete _brokers[broker.subscription.id];
+                }
+
                 function _unsubscribeBroker(broker) {
-                    _session.unsubscribe(broker.subscription);
+                    var defer = $q.defer();
+
+                    _session.unsubscribe(broker.subscription)
+                        .then(_resolveBroker, defer.reject);
+
+                    return defer.promise;
+
+                    function _resolveBroker() {
+                        defer.resolve(broker);
+                    }
+
                 }
 
                 function _unsubscribeAllBrokers() {

diff --git a/src/lib/ngAutobahn/session/session.spec.js b/src/lib/ngAutobahn/session/session.spec.js
@@ -23,7 +23,11 @@ describe('ngAutobahnSession', function () {
                     defer.resolve();
                     return defer.promise;
                 },
-                unsubscribe: function () {}
+                unsubscribe: function () {
+                    var defer = $q.defer();
+                    defer.resolve();
+                    return defer.promise;
+                }
             }
         },
         handlers = {
@@ -371,10 +375,6 @@ describe('ngAutobahnSession', function () {
             $timeout.flush();
         }));
 
-        it('SHOULD be a function', function () {
-            expect(typeof _session.unsubscribeBroker).toBe('function');
-        });
-
         describe('IF a broker is provided', function () {
             it('SHOULD invoke autobahn.session.unsubscribe with the broker´s subscription', function () {
                 _session.unsubscribeBroker(_broker);