foreign_office 0.17.5 → 0.17.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10d73ea47137df4fd2ee5f9a9b7c67161c62ba5e78abf683f148a5f67463d653
-  data.tar.gz: bb4a555e893139952195def37440a97d7cbbabcb1f7550b7dedadbaeef9bf7cd
+  metadata.gz: 2df33e9ed279630f8e8b5f08df6963749e7bf6051a1fc1a782f0c89ca43623ac
+  data.tar.gz: 814fdf748bb2d70f3e9fa2936525a677e90e640fba3d488b02985521ab4e3b87
 SHA512:
-  metadata.gz: ad5a45b4ebb04b281d7dbdadf595666955d2fcdec102e52b2734801b6559a35f8478b7db977ce683c975d0c86da688a7477ac87c1af98ebf1f2768d71e51ee38
-  data.tar.gz: fb40f3168cf80fc7ccf0d1a22be0c2f00bc257969ee6263f5a9898263e85b87d75c256d48963ec087c2abafbb8df56ae21b486056aed47babbbdd65feb71da59
+  metadata.gz: 4a48185cf5957605756c9cc0cc424066a951870a4a48152b18f8301f35332fbfa1d040e2e63387bd31c8bbbf0c2c269f9ef737eb2c793bcd006ccd0ffb3144df
+  data.tar.gz: fdb9b3102b5e8462ac52f9c9cb8f208b2d54a09bcd562c6c63d80fee4103ef750dcaced5cb8ed9b64c5bc2f615da9bec681a8eed50e0ded9511f5ed4300f3b8e

data/app/jobs/presence_channel_publish_job.rb

@@ -2,8 +2,12 @@ class PresenceChannelPublishJob < ApplicationJob
   queue_as :default
 
   def perform(obj_id, obj_class_name, serialized_state)
+    obj_class = obj_class_name.constantize
     serialized_state.symbolize_keys!
-    channel_name = "presence-#{obj_class_name}#{obj_id}"
+    channel_name = "presence-#{obj_class.foreign_office_channel_prefix}#{obj_id}"
+    if browser_tab_id = serialized_state[:browser_tab_id]
+      channel_name += "@#{browser_tab_id}"
+    end
     if (!ForeignOffice.bus.connection.respond_to?(:channel_users) ||
         ForeignOffice.bus.connection.channel_users(channel_name)[:users].any?)
 

data/lib/foreign_office/broadcaster.rb

@@ -13,7 +13,7 @@ module ForeignOffice
         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)
+          ForeignOffice.publish(channel: "#{self.class.foreign_office_channel_prefix}#{self.id}", object: self.serialize)
         end
       rescue => e
         Rails.logger.error "Failed to broadcast change: #{e.inspect}"
@@ -38,6 +38,11 @@ module ForeignOffice
       def channel_presence_required?
         @channel_presence_required
       end
+
+      def foreign_office_channel_prefix
+        self.name.gsub(/::/,'-')
+      end
+
     end
 
   end

data/lib/foreign_office/foreign_office_helper.rb

@@ -2,9 +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, presence: false )
-      presence_prefix = presence ? 'presence-' : ''
-      channel = "#{presence_prefix}#{resource.class.name}#{resource.id}"
+      exclude_value: nil, browser_tab_id: nil)
+      presence_prefix = resource.class.channel_presence_required? ? 'presence-' : ''
+      channel = "#{presence_prefix}#{resource.class.foreign_office_channel_prefix}#{resource.id}"
       channel += "@#{browser_tab_id}" if browser_tab_id
       data_attrs = "data-listener=true data-channel=#{channel}"
       if delete
@@ -24,7 +24,7 @@ module ForeignOffice
     end
 
     def progress_indicator_attrs(resource, key)
-      data_attrs = "data-foreign-office-progress-indicator=true data-channel=#{resource.class.name}#{resource.id}"
+      data_attrs = "data-foreign-office-progress-indicator=true data-channel=#{resource.class.foreign_office_channel_prefix}#{resource.id}"
       data_attrs += " data-key=#{key}"
     end
 
@@ -51,9 +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, presence: false)
-      presence_prefix = presence ? 'presence-' : ''
-      channel = "#{presence_prefix}#{resource.class.name}#{resource.id}"
+      exclude_value: nil, browser_tab_id: nil)
+      presence_prefix = resource.class.channel_presence_required? ? 'presence-' : ''
+      channel = "#{presence_prefix}#{resource.class.foreign_office_channel_prefix}#{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.17.5"
+  VERSION = "0.17.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreign_office
 version: !ruby/object:Gem::Version
-  version: 0.17.5
+  version: 0.17.6
 platform: ruby
 authors:
 - Eric Draut
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-30 00:00:00.000000000 Z
+date: 2018-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails