foreign_office 0.16.6 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 605ceee6b8967fa3a87fede021e512e87e8b65a5eb5fe32622e1c481c5ce5174
-  data.tar.gz: 649a6521d4aa91f6e314eba632d8d4ac2254c5d4d547a27c387cfac468b9996e
+  metadata.gz: 9d0c9446d27d1d583ef264ee14cf028f1ecc84a82d9fa7a300889205e4bcbfd6
+  data.tar.gz: b64b5d31d96a7d85d22138078a2205305df5cc1458d62610bd68f9d82fcfa990
 SHA512:
-  metadata.gz: f385241ee4b86e6414cbca7414463b772a3e9c4d5005670903980a00068a0909c517f0b153d1bfdcf44ba95167182bcbb55e44526393c9c61b8ce030723e312f
-  data.tar.gz: 3e716c0c8eab1fe8dc4fc9badafa6e417bf5313f2aa32f09c97a1b7cf66a655c3b1148c602e6141717e6413d3b1b38b1fcfbf5310296721babd1b6873a2f09a8
+  metadata.gz: 2d5c3db38421294c670162bd9d98cdeb43e2f52d89de1a38cf70bce84aaca81e680e076e409594544d79c856611875c22826e8e6d7bda248c4afc38d2de8283a
+  data.tar.gz: e79c2b10c802e27b7feeb382dcbefd43d9abff92bda3456cc628930f6b84c26d320748c7e481f6679c69154607dc92a77ee6ee825819429419991354625ce7cb

data/app/jobs/presence_channel_publish_job.rb

@@ -0,0 +1,32 @@
+class PresenceChannelPublishJob < ApplicationJob
+  queue_as :default
+
+  def perform(obj_id, obj_class_name, serialized_state)
+    serialized_state.symbolize_keys!
+    channel_name = "presence-#{obj_class_name}#{obj_id}"
+    channel_presence = ForeignOffice.bus.connection.channel_users(channel_name)
+    if channel_presence[:users].any?
+      ForeignOffice.publish(
+        channel: channel_name,
+        object: serialized_state
+      )
+    else
+      serialized_state[:foreign_office_retries] ||= 0
+      if serialized_state[:foreign_office_retries] < 4 # four total tries
+        retry_wait = 2**serialized_state[:foreign_office_retries]
+        serialized_state[:foreign_office_retries] += 1
+        PresenceChannelPublishJob.set(wait: retry_wait).perform_later(obj_id, obj_class_name, serialized_state)
+      else
+        failure_message = "PresenceChannelPublishJob: client never connected, not able to send"
+        dont_raise = StandardError.new(failure_message)
+        Bugsnag.notify(dont_raise) do |report|
+          report.severity = 'error'
+          report.add_tab(:presence_channel, obj_class_name: obj_class_name, obj_id: obj_id, serialized_state: serialized_state)
+        end
+        Rails.logger.error(failure_message)
+        Rails.logger.error("PresenceChannelPublishJob: #{obj_class_name}: #{obj_id}: #{serialized_state}")
+      end
+    end
+  end
+
+end

data/lib/foreign_office/broadcaster.rb

@@ -9,10 +9,12 @@ module ForeignOffice
 
       def broadcast_change
         Rails.logger.debug "Broadcasting change for #{self.inspect}..."
-        Rails.logger.debug "Class name: #{self.class.name}"
-        Rails.logger.debug "ID: #{self.id}"
         Rails.logger.debug "Serialize: #{self.serialize}"
-        ForeignOffice.publish(channel: "#{self.class.name}#{self.id}", object: self.serialize)
+        if self.class.channel_presence_required?
+          PresenceChannelPublishJob.set(wait: 1).perform_later(id, self.class.name, self.serialize)
+        else
+          ForeignOffice.publish(channel: "#{self.class.name}#{self.id}", object: self.serialize)
+        end
       rescue => e
         Rails.logger.error "Failed to broadcast change: #{e.inspect}"
         Rails.logger.debug e.backtrace.join("\n")
@@ -28,6 +30,15 @@ module ForeignOffice
       def broadcast_changes!
         self.send(:after_save, :handle_broadcast, {unless: :skip_all_callbacks})
       end
+
+      def require_channel_presence
+        @channel_presence_required = true
+      end
+
+      def channel_presence_required?
+        @channel_presence_required
+      end
     end
+
   end
-end
+end

data/lib/foreign_office/foreign_office_helper.rb

@@ -2,8 +2,9 @@ module ForeignOffice
   module ForeignOfficeHelper
     def listener_attrs(resource, key, reveal_hide: false, endpoint: nil, download: nil,
       trigger: nil, delete: nil, href_target: nil, create_modal: nil, mask_me: nil,
-      exclude_value: nil, browser_tab_id: nil )
-      channel = "#{resource.class.name}#{resource.id}"
+      exclude_value: nil, browser_tab_id: nil, presence: false )
+      presence_prefix = presence ? 'presence-' : ''
+      channel = "#{presence_prefix}#{resource.class.name}#{resource.id}"
       channel += "@#{browser_tab_id}" if browser_tab_id
       data_attrs = "data-listener=true data-channel=#{channel}"
       if delete
@@ -50,8 +51,9 @@ module ForeignOffice
 
     def listener_hash(resource, key, reveal_hide: false, endpoint: nil, download: nil,
       trigger: nil, delete: nil, href_target: nil, create_modal: nil, mask_me: nil,
-      exclude_value: nil, browser_tab_id: nil)
-      channel = "#{resource.class.name}#{resource.id}"
+      exclude_value: nil, browser_tab_id: nil, presence: false)
+      presence_prefix = presence ? 'presence-' : ''
+      channel = "#{presence_prefix}#{resource.class.name}#{resource.id}"
       channel += "@#{browser_tab_id}" if browser_tab_id
       hash = {listener: true, channel: channel}
       if delete

data/lib/foreign_office/version.rb

@@ -1,3 +1,3 @@
 module ForeignOffice
-  VERSION = "0.16.6"
+  VERSION = "0.17.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreign_office
 version: !ruby/object:Gem::Version
-  version: 0.16.6
+  version: 0.17.0
 platform: ruby
 authors:
 - Eric Draut
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-08 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -89,6 +89,7 @@ files:
 - app/assets/javascripts/pubnub_bus.js
 - app/assets/javascripts/pusher_bus.js
 - app/assets/javascripts/test_bus.js
+- app/jobs/presence_channel_publish_job.rb
 - lib/foreign_office.rb
 - lib/foreign_office/broadcaster.rb
 - lib/foreign_office/busses/generic_bus.rb