ClearBlade
diff --git a/‎ClearBlade.js‎
Lines changed: 15 additions & 12 deletions b/‎ClearBlade.js‎
Lines changed: 15 additions & 12 deletions
diff --git a/‎test/ClearBladeSpec.js‎
Lines changed: 33 additions & 10 deletions b/‎test/ClearBladeSpec.js‎
Lines changed: 33 additions & 10 deletions
@@ -86,7 +86,7 @@ if (!window.console) {
      * @property URI
      * @type String
      */
-    ClearBlade.URI = options.URI || "https://platform.clearblade.com";
+    ClearBlade.URI = options.URI || "http://162.209.79.118";
     /**
      * This is the property that tells the API whether or not the API will log to the console
      * This should be left `false` in production
@@ -950,12 +950,13 @@ if (!window.console) {
    * <p>{boolean} [cleanSession] The server will persist state of the session if true. Not avaliable in beta.</p>
    * <p>{boolean} [useSSL] The option to use SSL websockets. Default is false for now.</p>
    * <p>{object} [invocationContext] An object to wrap all the important variables needed for the onFalure and onSuccess functions. The default is empty.</p>
-   * <p>{function} [onSuccess] A callback to operate on the result of a sucessful connect. In beta the default is empty.</p>
-   * <p>{function} [onFailure] A callback to operate on the result of an unsuccessful connect. In beta the default is also empty.</p>
+   * <p>{function} [onSuccess] A callback to operate on the result of a sucessful connect. In beta the default is just the invoking of the `callback` parameter with the data from the connection.</p>
+   * <p>{function} [onFailure] A callback to operate on the result of an unsuccessful connect. In beta the default is just the invoking of the `callback` parameter with the data from the connection.</p>
    * <p>{Object} [hosts] An array of hosts to attempt to connect too. Sticks to the first one that works. The default is "platform.clearblade.com".</p>
    * <p>{Object} [ports] An array of ports to try, it also sticks to thef first one that works. The defaults are 80,8080,1337.</p>
    *</p>
-   * @param {function} callback Callback to be run upon connection
+   * @param {function} callback Callback to be run upon either succeessful or
+   * failed connection
    * @example <caption> A standard connect</caption>
    * var callback = function (data) {
    *   console.log(data);
@@ -971,35 +972,37 @@ if (!window.console) {
     conf.password = ClearBlade.appSecret;
     conf.cleanSession = options.cleanSession || true;
     conf.useSSL = options.useSSL || false; //up for debate. ole' perf vs sec argument
-    conf.hosts = ["platform.clearblade.com"];
+    conf.hosts = ["64.49.226.26"];
     conf.ports = [1337];
 
     var onConnectionLost = function(){
-      alert("connection lost- attempting to reestablish");
+      console.log("ClearBlade Messaging connection lost- attempting to reestablish");
       that.client.connect(conf);
     };
 
     var onMessageArrived = function(message){
-      console.log("message arrived: "+message.payloadString);
+      // messageCallback from Subscribe()
       that.messageCallback(message.payloadString);
     };
 
     var clientID = Math.floor(Math.random() * 10e12).toString();
     this.client = new Messaging.Client(conf.hosts[0],conf.ports[0],clientID);
     this.client.onConnectionLost = onConnectionLost;
     this.client.onMessageArrived = onMessageArrived; 
-    var onConnect = function(data) {
+    // the mqtt websocket library uses "onConnect," but our terminology uses
+    // "onSuccess" and "onFailure"
+    var onSuccess = function(data) {
       callback(data);
     };
 
-    this.client.onConnect = onConnect;
+    this.client.onConnect = onSuccess;
     var onFailure = function(err) {
-      alert("failed to connect");
+      console.log("ClearBlade Messaging failed to connect");
       callback(err);
     };
 
-    conf.onSuccess = onConnect;
-    conf.onFailure = onFailure;
+    conf.onSuccess = options.onSuccess || onSuccess;
+    conf.onFailure = options.onFailure || onFailure;
 
     this.client.connect(conf);
   };
 
@@ -333,6 +333,16 @@ describe("Query objects should", function () {
 describe("The ClearBlade Messaging module", function() {
   var flag, messaging, msgReceived;
 
+  var onMessageArrived = function(message) {
+    flag = true;
+    msgReceived = message;
+  };  
+  var onConnect = function(data) {
+    flag = true;
+    // Once a connection has been made, make a subscription and send a message.
+    messaging.Subscribe('/test', {}, onMessageArrived);
+  };
+
   beforeEach(function () {
     var initOptions = {
       appKey: 'c49ee8a80ae2e3d5b4edfaa7eb75',
@@ -342,16 +352,6 @@ describe("The ClearBlade Messaging module", function() {
   });
 
   it("should be able to subscribe and send/receive a message", function () {
-    var onMessageArrived = function(message) {
-      flag = true;
-      msgReceived = message;
-    };  
-    var onConnect = function(data) {
-      flag = true;
-      // Once a connection has been made, make a subscription and send a message.
-      messaging.Subscribe('/test', {}, onMessageArrived);
-    };
-
     runs(function() {
       flag = false;
       messaging = new ClearBlade.Messaging({}, onConnect);
@@ -374,4 +374,27 @@ describe("The ClearBlade Messaging module", function() {
       expect(msgReceived).toEqual('hello');
     });
   });
+
+  it("should use the callbacks I pass into Subscribe()", function () {
+    var successMsg;
+
+    // Custom success callback to use in Subscribe options
+    var onSuccess = function(data) {
+      flag = true;
+      successMsg = 'EXECUTED';
+    };
+
+    runs(function() {
+      flag = false;
+      messaging = new ClearBlade.Messaging({onSuccess:onSuccess}, onConnect);
+    });
+
+    waitsFor(function() {
+      return flag;
+    }, "Did not connect", 3000);
+
+    runs(function() {
+      expect(successMsg).toEqual('EXECUTED');
+    });
+  });
 });