cubism 0.1.0.pre5 → 0.1.0.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4486331e2d59695363fc4e2019ffe4fe7498a1b8d13e5ced08864b4f8fe1613c
-  data.tar.gz: a80f6add8477c622884f0f985efcda533e5b7d3a13f50a2ebb39fd4fba1a3f69
+  metadata.gz: 10a5083117c16883fd1794f09ed204481d6adfef8143c2f243d56030aa438054
+  data.tar.gz: f40048d57269c6bf2d4fc4c8cdfb91f4e4021da157c35fcf0f0b8d46c59f8929
 SHA512:
-  metadata.gz: c07214a8095195319734a15296c4a302c59cd9107bb20b8839e52e1994f8447f7cf1065737fe3446b7743c29d0ce15621033a7a8fe44aab3624a467724482e8e
-  data.tar.gz: e5c9bab8327f4ff0adb46cd6a3465fedb6729597e41eb8dafd5695b870806642a9c28f36b7c3e0e51a0c882c2b42eab6edc6971c2bee34e214b16cf34b17215d
+  metadata.gz: 8d6410ee9e19694330c836a8580de898ef4ccb560fcdd562ff1f199d83db357538952809f156d1eb29991f15d7a925dbb4cd97bacf0b498a8e037d2187de537d
+  data.tar.gz: 400663fdce10836259b1affe8197e2c57da63358912529b4ff79bddbe052ac16251e1032b904a921467fd1290ea11100b16764c9ce61b6eaaeab9d634cf83401

data/app/channels/cubism/presence_channel.rb

@@ -3,7 +3,7 @@ class Cubism::PresenceChannel < ActionCable::Channel::Base
 
   def subscribed
     if resource.present?
-      stream_for resource
+      stream_from params[:element_id]
       resource.cubicle_element_ids << element_id
       resource.excluded_user_id_for_element_id[element_id] = user.id if exclude_current_user?
     else

data/app/channels/cubism/presence_channel.rb~

@@ -4,7 +4,8 @@ class Cubism::PresenceChannel < ActionCable::Channel::Base
   def subscribed
     if resource.present?
       stream_for resource
-      resource.present_users.add(user.id)
+      resource.cubicle_element_ids << element_id
+      resource.excluded_user_id_for_element_id[element_id] = user.id if exclude_current_user?
     else
       reject
     end
@@ -13,6 +14,16 @@ class Cubism::PresenceChannel < ActionCable::Channel::Base
   def unsubscribed
     return unless resource.present?
 
+    resource.cubicle_element_ids.remove(element_id)
+    resource.excluded_user_id_for_element_id.delete(element_id)
+    disappear
+  end
+
+  def appear
+    resource.present_users.add(user.id)
+  end
+
+  def disappear
     resource.present_users.remove(user.id)
   end
 
@@ -26,4 +37,16 @@ class Cubism::PresenceChannel < ActionCable::Channel::Base
   def user
     GlobalID::Locator.locate_signed(params[:user])
   end
+
+  def exclude_current_user?
+    params[:exclude_current_user]
+  end
+
+  def element_id
+    params[:element_id]
+  end
+
+  def url
+    params[:url]
+  end
 end

data/lib/cubism/broadcaster.rb

@@ -18,10 +18,10 @@ module Cubism
         view_context = Cubism.store[block_key].context
         html = view_context.capture(users_for(resource, element_id), &block)
 
-        cable_ready[Cubism::PresenceChannel].inner_html(
+        cable_ready[element_id].inner_html(
           selector: "cubicle-element##{element_id}[identifier='#{signed_stream_identifier(resource.to_global_id.to_s)}']",
           html: html
-        ).broadcast_to(resource)
+        ).broadcast
       end
     end
 

data/lib/cubism/broadcaster.rb~

@@ -1,3 +1,5 @@
+require "cable_ready"
+
 module Cubism
   class Broadcaster
     include CableReady::Broadcaster

data/lib/cubism/version.rb

@@ -1,3 +1,3 @@
 module Cubism
-  VERSION = "0.1.0.pre5"
+  VERSION = "0.1.0.pre6"
 end

data/lib/cubism/version.rb~

@@ -1,3 +1,3 @@
 module Cubism
-  VERSION = "0.1.0.pre4"
+  VERSION = "0.1.0.pre5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cubism
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre5
+  version: 0.1.0.pre6
 platform: ruby
 authors:
 - Julian Rubisch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
+date: 2021-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails