foreign_office 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5dc54e45b5f8ad26dc7fd81bfe6fb22f7d288e0
-  data.tar.gz: 9fca354069d71f858748e472519f38e0eb7801a3
+  metadata.gz: a1ea1f080a84fe5cd99fa101db37262bf0fa8e48
+  data.tar.gz: 6332d013e2db46090c59c6dbe6c4b3832b931de4
 SHA512:
-  metadata.gz: f7b8c668c82b18e387b7854051b238c9ae15eb31d83e079dcffc4ed712fd706dbb4bab459d99900f852ceb5cdda449e808c63dad1b69428aecd46bb4839412a7
-  data.tar.gz: 5e02f7f7e9801f21598fffe41a71207666cf289080eb759998dcf1736998a59e3ec1830edffbf107ab246521bc0e8d9e09a6f49d9a1e3387f6c7a872af87af59
+  metadata.gz: 7616e1147b548a44bea060431c8080d086a390a929d0ccbfbb0afa4a528380fb6588d79b59fba8160acc0b356d301d94a712f7a19175883758bd63b3e6cc2e30
+  data.tar.gz: f3ea362d256d732df3cfb57342b0994c2a7e4e115f49a387e3daf4e68f2dd7ed5b63a83f5f2f4d8196583625e7ddc0ba08a01707ca83c9a473997d4c0474fdf9

data/app/assets/javascripts/foreign_office.js

@@ -1,16 +1,15 @@
 //= require debug_logger
+//= require pubnub_bus
+//= require pusher_bus
+
 var ForeignOffice = Class.extend({
   init: function(){
-    this.pubnub = PUBNUB.init({
-      publish_key   : 'pub-c-1146120f-14f7-4649-9dee-3b21a519d573',
-      subscribe_key : 'sub-c-9d1b308c-a5f1-11e2-87b3-12313f022c90',
-      ssl           : true
-    });
     this.channels = [];
     this.channels_by_name = [];
   },
-  connection: function(){
-    return this.pubnub;
+  config: function(config){
+    bus_class = eval(config.bus_name);
+    this.bus = new bus_class(config);
   },
   addListener: function($listener){
     var listener_class = eval(getSubClass($listener.data('listener'),'ForeignOfficeListener'));
@@ -35,10 +34,11 @@ foreign_office = new ForeignOffice();
 var ForeignOfficeChannel = Class.extend({
   init: function(channel_name){
     var foreign_office_channel = this;
-    foreign_office.connection().subscribe({
+    foreign_office.bus.subscribe({
       channel : channel_name,
-      backfill: true,
-      message : function(m){foreign_office_channel.handleMessage(m)}
+      callback : function(m){
+        foreign_office_channel.handleMessage(m)
+      }
     });
     this.channel_name = channel_name;
     this.listeners = [];
@@ -46,7 +46,6 @@ var ForeignOfficeChannel = Class.extend({
   handleMessage: function(m){
     debug_logger.log("Got a message: ");
     debug_logger.log(m);
-    console.log(this);
     $.each(this.listeners,function(i,listener){
       debug_logger.log("sending message to listener: ");
       debug_logger.log(listener);

data/app/assets/javascripts/pubnub_bus.js

@@ -0,0 +1,17 @@
+var PubnubBus = Class.extend({
+  init: function(config){
+    this.pubnub = PUBNUB.init({
+      publish_key   : config.publish_key,
+      subscribe_key : config.subscribe_key,
+      ssl           : config.ssl
+    });
+  },
+  subscribe: function(subscription){
+    this.pubnub.subscribe({
+      channel : subscription.channel,
+      backfill: true,
+      message : function(m){subscription.callback(m)}
+    });
+
+  }
+})

data/app/assets/javascripts/pusher_bus.js

@@ -0,0 +1,11 @@
+var PusherBus = Class.extend({
+  init: function(config){
+    this.pusher = new Pusher(config.key);
+  },
+  subscribe: function(subscription){
+    this.channel = this.pusher.subscribe(subscription.channel);
+    this.channel.bind('publish', function(data){
+      subscription.callback(data);
+    })
+  }
+})

data/lib/foreign_office.rb

@@ -10,6 +10,12 @@ module ForeignOffice
     autoload :FakeForeignOffice,  'foreign_office/test/fake_foreign_office'
   end
 
+  def self.config(config)
+    self.bus = config[:bus][:klass]
+    self.bus.config(config[:bus])
+    @publish_method = config[:publish_method]
+  end
+
   def self.bus=(bus)
     @bus = bus
   end
@@ -68,4 +74,5 @@ module ForeignOffice
 
 end
 require 'foreign_office/busses/generic_bus'
-require 'foreign_office/busses/pubnub_bus'
+require 'foreign_office/busses/pubnub_bus'
+require 'foreign_office/busses/pusher_bus'

data/lib/foreign_office/busses/pubnub_bus.rb

@@ -1,5 +1,11 @@
 class ForeignOffice::Busses::PubnubBus < ForeignOffice::Busses::GenericBus
 
+  def self.config(config)
+    self.publish_key = config[:publish_key]
+    self.subscribe_key = config[:subscribe_key]
+    self.secret_key = config[:secret_key]
+  end
+
   def self.publish_key=(publish_key)
     @publish_key = publish_key
   end

data/lib/foreign_office/busses/pusher_bus.rb

@@ -1,2 +1,48 @@
-class PusherBus < GenericBus
+class ForeignOffice::Busses::PusherBus < ForeignOffice::Busses::GenericBus
+  def self.config(config)
+    self.app_id = config[:app_id]
+    self.key = config[:key]
+    self.secret = config[:secret]
+  end
+
+  def self.app_id=(app_id)
+    @app_id = app_id
+  end
+
+  def self.app_id
+    @app_id
+  end
+  
+  def self.key=(key)
+    @key = key
+  end
+
+  def self.key
+    @key
+  end
+  
+  def self.secret=(secret)
+    @secret = secret
+  end
+
+  def self.secret
+    @secret
+  end
+  
+  def self.connection
+    @pusher ||= Pusher::Client.new({
+      app_id: self.app_id,
+      key: self.key,
+      secret: self.secret
+    })
+  end
+
+  def self.publish(message)
+    message.symbolize_keys!
+    self.connection.trigger(
+      message[:channel],
+      'publish',
+      message
+    )
+  end
 end

data/lib/foreign_office/version.rb

@@ -1,3 +1,3 @@
 module ForeignOffice
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreign_office
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Eric Draut
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -79,6 +79,8 @@ files:
 - Rakefile
 - app/assets/javascripts/debug_logger.js
 - app/assets/javascripts/foreign_office.js
+- app/assets/javascripts/pubnub_bus.js
+- app/assets/javascripts/pusher_bus.js
 - lib/foreign_office.rb
 - lib/foreign_office/busses/generic_bus.rb
 - lib/foreign_office/busses/pubnub_bus.rb