foreign_office 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66c0acf7def09497bd9be0e9a071c68436d08db0
-  data.tar.gz: b33fb3acfbdce38c10ba9f06cc7e3206697275a5
+  metadata.gz: cbf32739fee81b0bc8be61f18f585e721dd01736
+  data.tar.gz: e42d37d55f26e121d7a83c100da65c9cc26214fd
 SHA512:
-  metadata.gz: 03794deaa596219d2fd150ed9dea1fe497b87f01d206e1581fb2bcdc267a1d45c74d3ce1ec3f4b29863d0b7315f1c0f59ac47cfa13a04f64c6ec625d4b193fee
-  data.tar.gz: 75a019150860afecdd3c0e19cabe9eea880dfcacb4294141efd9a15e6d9f4a09618a44d42451d08136d74799d923688ab0edbab7f551e68aabb566078a54e99c
+  metadata.gz: cc81bc349c49729151305bdd30342b4579e13576fd71eaad7a8ab65a32f81b49332f2ab3f513649a5443c5ebb0503a88918b83dfe69c6098a6b1e9413b0cf41a
+  data.tar.gz: b4a5b2ca24a7edb259078888ca1b29391a2da2be4fde9d6b49a359e925c612c9cb3d2f75637779bc5fe2d888e5080dc7a0dcad2861dda93b22a010da38f29d16

data/app/assets/javascripts/foreign_office.js

@@ -9,10 +9,12 @@ var ForeignOffice = Class.extend({
     this.channels_by_name = [];
   },
   config: function(config){
-    third_party_busname = this.busMap(config.bus_name)
-    if (typeof(eval(third_party_busname)) != 'undefined') {
-      bus_class = eval(config.bus_name);
-    } else {
+    bus_class = eval(config.bus_name);
+    third_party_library = this.library_name_for(config.bus_name)
+    try {
+      bus_class = eval(third_party_library)
+    }
+    catch(err){
       bus_class = TestBus
     }
     this.bus = new bus_class(config);
@@ -33,9 +35,9 @@ var ForeignOffice = Class.extend({
   channelNames: function(){
     return $.map(this.channels,function(channel){return channel.channel_name});
   },
-  busMap: function(bus_name) {
-    var map = { PubnubBus: 'PUBNUB',
-                PusherBus: 'Pusher'}[bus_name]
+  library_name_for: function(bus_name){
+    var library_map = {PubnubBus: 'PUBNUB', PusherBus: 'Pusher'}
+    return library_map[bus_name]
   }
 });
 
@@ -44,6 +46,8 @@ foreign_office = new ForeignOffice();
 var ForeignOfficeChannel = Class.extend({
   init: function(channel_name){
     var foreign_office_channel = this;
+    debug_logger.log("Subscribing to: ");
+    debug_logger.log(channel_name);
     foreign_office.bus.subscribe({
       channel : channel_name,
       callback : function(m){

data/app/assets/javascripts/pubnub_bus.js

@@ -1,5 +1,6 @@
 var PubnubBus = Class.extend({
   init: function(config){
+    debug_logger.log("initializing pubnub js")
     this.pubnub = PUBNUB.init({
       publish_key   : config.publish_key,
       subscribe_key : config.subscribe_key,
@@ -7,9 +8,10 @@ var PubnubBus = Class.extend({
     });
   },
   subscribe: function(subscription){
+    debug_logger.log("subscribing with PubnubBus")
+    debug_logger.log(subscription)
     this.pubnub.subscribe({
       channel : subscription.channel,
-      backfill: true,
       message : function(m){subscription.callback(m)}
     });
 

data/app/assets/javascripts/pusher_bus.js

@@ -7,5 +7,6 @@ var PusherBus = Class.extend({
     this.channel.bind('publish', function(data){
       subscription.callback(data);
     })
-  }
+  },
+  third_party_library: 'Pusher'
 })

data/lib/foreign_office/busses/pubnub_bus.rb

@@ -44,17 +44,16 @@ class ForeignOffice::Busses::PubnubBus < ForeignOffice::Busses::GenericBus
     self.connection.publish(
       channel:  message[:channel],
       message:  message,
-      http_sync: true,
-      callback: lambda{|response|
-        if 0 == JSON.parse(response.instance_variable_get(:@response)).first #pubnub publishing failed
-          if attempts <= 3
-            self.publish!(message, attempts) #retry if we failed
-          else
-            Rails.logger.debug("ForeignOffice#publish! failed after #{attempts} attempts. message: #{message.inspect}")
-          end
-        end
-      }
-    )
+      http_sync: true
+    ) do |envelope|
+      if '200' != envelope.status_code.to_s
+        Rails.logger.error "ForeignOffice error esponse:"
+        Rails.logger.error envelope.message
+        Rails.logger.error envelope.channel
+        Rails.logger.error envelope.status_code
+        Rails.logger.error envelope.timetoken
+      end
+    end
   end
 
 end

data/lib/foreign_office/version.rb

@@ -1,3 +1,3 @@
 module ForeignOffice
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreign_office
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Eric Draut
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails