foreign_office 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e607b876892172ef11ee3dfc659ba5834ce1ec91
-  data.tar.gz: 539b25bdc3f9d4cc9460c76cfa93409231e23042
+  metadata.gz: ffa19274a9c4f956525240daf76d9fff4b59baa5
+  data.tar.gz: ca6e62d10fc74ae7bcea1274627e79ae87af8e14
 SHA512:
-  metadata.gz: cff5a2eaa2a31204e457c4aa4d4d8afcd90b5337c4ef38c104e7f4b089395d4a611790652c97c7bcb5d21d8c10d10e96b2e450b5655db80e6f5ad6003a99c840
-  data.tar.gz: a9f16d86b53bbc089ed848a50d7ae0396c232c9b352fc8f7685d0414bd2e6ece9970d01530b45494a2d2f0c4df6dfc59c76592cec3b874078c4329e2ee149ee3
+  metadata.gz: a90ad073122328872eb22db38205dde687f70ea3c69a5a218fbea4014107418e2715c8baf1af198b4d1d87dba4646755703a3e24bef9bbd443edf32f35376a86
+  data.tar.gz: 0b16680cbb1ecd2529392ecc48a53b59267475a7a47d901f2de47822da99d2b1bce1d1231bf08b296a876dfc2ddf58015d7e46d53a160b49b93e01e070556ddd

data/app/assets/javascripts/foreign_office.js

@@ -23,17 +23,33 @@ var ForeignOffice = Class.extend({
     var listener_class = eval(getSubClass($listener.data('listener'),'ForeignOfficeListener'));
     var listener = new listener_class($listener);
     var this_channel;
-    if($.inArray(listener.channel,this.channelNames()) == -1){
+    var this_foreign_office = this;
+    if($.inArray(listener.channel,this_foreign_office.channelNames()) == -1){
       this_channel = new ForeignOfficeChannel(listener.channel)
-      this.channels.push(this_channel);
-      this.channels_by_name[listener.channel] = this_channel;
+      this_foreign_office.channels.push(this_channel);
+      this_foreign_office.channels_by_name[listener.channel] = this_channel;
     } else {
-      var this_channel = this.channels_by_name[listener.channel];
+      var this_channel = this_foreign_office.channels_by_name[listener.channel];
     }
     this_channel.addListener(listener);
   },
   channelNames: function(){
     return $.map(this.channels,function(channel){return channel.channel_name});
+  },
+  connect: function(){
+    this.connection_status = 'connected';
+  },
+  disconnection: function(){
+    if('connected' == this.connection_status){
+      this.connection_status = 'disconnected'
+      alert('We lost the connection to the server. No refresh data will be available. Thanks, -the Foreign Office.')
+    }
+  },
+  reconnection: function(){
+    if('disconnected' == this.connection_status){
+      this.connection_status = 'connected'
+      alert("We're connected to the server again. Refresh data will now be available. Thanks, -the Foreign Office.")
+    }
   }
 });
 

data/app/assets/javascripts/pubnub_bus.js

@@ -12,7 +12,11 @@ var PubnubBus = Class.extend({
     debug_logger.log(subscription)
     this.pubnub.subscribe({
       channel : subscription.channel,
-      message : function(m){subscription.callback(m)}
+      restore : true,
+      disconnect : function(){foreign_office.disconnection(); debug_logger.log('Lost connection to: '); debug_logger.log(subscription.channel)},
+      reconnect : function(){foreign_office.reconnection(); debug_logger.log('Reestablished connection to: '); debug_logger.log(subscription.channel)},
+      connect : function(){foreign_office.connect(); debug_logger.log("Connected to: "); debug_logger.log(subscription.channel)},
+      message : function(m,env,channel){subscription.callback(m)}
     });
 
   }

data/lib/foreign_office/version.rb

@@ -1,3 +1,3 @@
 module ForeignOffice
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreign_office
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Eric Draut
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails