foreign_office 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 282c3c4b8ff90905d3823b2433eda8b3b0f37363
-  data.tar.gz: 49ba79061facb79abde3bca7280784d8601b800c
+  metadata.gz: f9cae84ec5a250d5b67b21834f8dbb24c4e6b81c
+  data.tar.gz: 9b082f9d7fb8053984ba920abe5e3213ecfb6ec3
 SHA512:
-  metadata.gz: c70c8f92d2cd9aa95f4f494861dd63cfb9305dad062a9c32d1dc7c382cf6cf42abda65ef42921bd50176a1603429be0b09196f1f59b524637327a284e18de917
-  data.tar.gz: 723a5a87cc3574a79802ad40257993155b43cf0b8f8d12472aaab699a4423b5419cd5bd6b65894d959442a78d7e70f915577fca7f86de1b06b724b2db5296ce6
+  metadata.gz: 8d8122df27dc7f63ffe264d7c01c48210d409f6f20eeed278d5f7ed7c323999d37f075ec7849e3a7b1b9e21f61b7a68e7d5917d075cd5709c22295bc89fb1fcb
+  data.tar.gz: 644da196de535ee346021b947c1fd4e8c5ac8db6885074d8010856e0712430c9616c0f8a00da0356208ef2a14f813e5a60c2a10b7bfcdb8696277ad6be9dd8a9

data/app/assets/javascripts/foreign_office.js

@@ -68,6 +68,10 @@ var ForeignOffice = Class.extend({
       alert(this.reconnect_alert)
     }
   },
+  //If the bus broadcasts the channel as part of the message...
+  handleMessage: function(m){
+    this.channels_by_name[m.channel].handleMessage(m.message)
+  },
   bind_listeners: function(){
     window.any_time_manager.register('listener','addListener',this);
     window.any_time_manager.load();
@@ -83,6 +87,7 @@ var ForeignOfficeChannel = Class.extend({
     debug_logger.log(channel_name);
     foreign_office.bus.subscribe({
       channel : channel_name,
+      //If the bus binds the callback to the channel object...
       callback : function(m){
         foreign_office_channel.handleMessage(m)
       }

data/app/assets/javascripts/pubnub_bus.js

@@ -12,13 +12,9 @@ var PubnubBus = Class.extend({
       debug_logger.log("about to unload page")
       pubnubbus.unsubscribe()
     };
-  },
-  subscribe: function(subscription){
-    debug_logger.log("subscribing with PubnubBus")
-    debug_logger.log(subscription)
     this.pubnub.addListener({
       message : function(m){
-        subscription.callback(m.message)
+        foreign_office.handleMessage(m)
       },
       status: function(s){
         debug_logger.log("Foreign Office PubnubBus:")
@@ -42,6 +38,10 @@ var PubnubBus = Class.extend({
         }
       }
     });
+  },
+  subscribe: function(subscription){
+    debug_logger.log("subscribing with PubnubBus")
+    debug_logger.log(subscription)
     this.pubnub.subscribe({
       channels : [subscription.channel]
     });

data/lib/foreign_office/version.rb

@@ -1,3 +1,3 @@
 module ForeignOffice
-  VERSION = "0.15.0"
+  VERSION = "0.15.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreign_office
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Eric Draut
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-26 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A light framework that provides functionality for listeners on web clients