Merge pull request #32 from electricimp/develop

v3.1.1

Author: Pavel Petroshenko

.gitignore

@@ -1,2 +1 @@
-
-.DS_Store
+auth.info

ConnectionManager.lib.nut

@@ -35,7 +35,7 @@ const CM_DEFAULT_CALLBACK_ID = "DEFAULT_CB_ID";
 
 class ConnectionManager {
 
-    static VERSION = "3.1.0";
+    static VERSION = "3.1.1";
 
     // Settings
     _connectTimeout     = null;
@@ -361,9 +361,25 @@ class ConnectionManager {
         }
     }
 
+    function _invokeCallbacks(callbacks, arg = null) {
+        foreach (id, clbk in callbacks) {
+            local ctx = {
+                "arg"      : arg,
+                "ctxClbk"  : clbk
+            };
+            if (clbk && typeof clbk == "function") {
+                // TODO: we assume that null is not a valid value of the argument, it's null only if it's unset.
+                if (arg == null) {
+                    imp.wakeup(0, function() {ctxClbk();}.bindenv(ctx));
+                } else {
+                    imp.wakeup(0, function() {ctxClbk(arg);}.bindenv(ctx));
+                }
+            }
+        }
+    }
+
     // Runs whenever we connect or call connect()
     function _onConnectedFlow() {
-
         // Set the BlinkUp State
         _setBlinkUpState();
 
@@ -378,14 +394,8 @@ class ConnectionManager {
 
         // Run the global onConnected Handler if it exists
         if (_onConnect != null) {
-                // Invoke all the callbacks in the loop
-            foreach (id, callback in _onConnect) {
-                callback                            &&
-                    typeof callback == "function"   &&
-                    imp.wakeup(0, function() {
-                        callback();
-                    }.bindenv(this));
-            }
+            // Invoke all the callbacks in the loop
+            _invokeCallbacks(_onConnect);
         }
 
         _processQueue();
@@ -399,11 +409,7 @@ class ConnectionManager {
 
         // Run the global onDisconnected Handler if it exists
         if (_onDisconnect != null) {
-            imp.wakeup(0, function() {
-                foreach (id, callback in _onDisconnect) {
-                    callback && callback(expected);
-                }
-            }.bindenv(this));
+            _invokeCallbacks(_onDisconnect, expected);
         }
 
         if (_stayConnected) {
@@ -424,12 +430,7 @@ class ConnectionManager {
         _connecting = false;
         _connected = false;
         if (_onTimeout != null) {
-            imp.wakeup(0, function() {
-                // Invoke all the callbacks
-                foreach (id, callback in _onTimeout) {
-                    callback && callback();
-                }
-            }.bindenv(this));
+            _invokeCallbacks(_onTimeout);
         }
 
         if (_retryOnTimeout) {

README.md

@@ -1,10 +1,10 @@
-# ConnectionManager 3.1.0 #
+# ConnectionManager 3.1.1 #
 
 The ConnectionManager class is an Electric Imp device-side library created to simplify connect and disconnect flows.
 
 **Note** If you are using ConnectionManager in your code, you should ensure that you *never* call [**server.connect()**](https://developer.electricimp.com/api/server/connect) or [**server.disconnect()**](https://developer.electricimp.com/api/server/disconnect). Instead you should only use ConnectionManager’s [*connect()*](#connect) and [*disconnect()*](#disconnectforce-flushtimeout) methods.
 
-**To include this library in your project, add** `#require "ConnectionManager.lib.nut:3.1.0"` **at the top of your device code.**
+**To include this library in your project, add** `#require "ConnectionManager.lib.nut:3.1.1"` **at the top of your device code.**
 
 ## Class Usage ##
 
@@ -27,7 +27,7 @@ ConnectionManager can be instantiated with an optional table of settings that mo
 #### Example ####
 
 ```squirrel
-#require "ConnectionManager.lib.nut:3.1.0"
+#require "ConnectionManager.lib.nut:3.1.1"
 
 // Instantiate ConnectionManager so BlinkUp is always enabled,
 // and we automatically aggressively try to reconnect on disconnect

example/ConnectionManager.example.nut

@@ -23,7 +23,7 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 
 
-#require "ConnectionManager.lib.nut:3.1.0"
+#require "ConnectionManager.lib.nut:3.1.1"
 
 // Instantiate ConnectionManager so BlinkUp is always enabled,
 // and starts connected.

tests/ConnectDisconnectTest.test.nut

@@ -30,7 +30,7 @@ class ConnectDisconnectTest extends CommonTest {
     function setUp() {
         _setUp();
     }
-    
+
     /*
     * disconnects and connects device using CM
     *
@@ -139,7 +139,7 @@ class ConnectDisconnectTest extends CommonTest {
                 assertTrue(!server.isconnected(), "should NOT be connected!");
 
                 _cm.onConnect(function() {
-                    assertEqual(counter, 2, "counter should be 2 now");
+                    assertEqual(counter, 2, "counter should be 2 now, while it is: " + counter);
                     counter++;
                     resolve();
                 }.bindenv(this));