cubism 0.1.0.pre4 → 0.1.0.pre8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af6a4e98fdf0f80e86235cd109e063af6535651ab112bb6b50329eda64eae2ef
-  data.tar.gz: 85dd646220a2d3b040ac409489e52462f969fbd935d66abe234f1eeebf51828c
+  metadata.gz: 78c13f49ff9ec762c87ff5140d567612115ac17fe0daf8bea9de1be4787e6c2e
+  data.tar.gz: bcd07dee292eecf9cfd24b3ff370abefb85b17c703ab99cca5e34910fbc70734
 SHA512:
-  metadata.gz: c8eb831972225222b251825d9accccbebdb09aaf9298c963a0355501be3a94ecd6d26be1af60dd78bc74ee279da83cf24aa612a73cb90a33b07ade5e64e00619
-  data.tar.gz: 18e35469a81269c4b23e17fb141543594fb44d0195c8e48650d7c895c82ed0c2dfa4ad65ddab6a06a194b2ddc8c252de64c4fdb5403b940acb925d72d044f758
+  metadata.gz: 36bfdca925bd8dd03b739d83cf8bffa1d896ae2c27c130ee1e880091ca93ed02ceace37f04575930e9912cbb4ce88bf8e7090e114c763952bb401e06ccabc4a5
+  data.tar.gz: 94849aee2342f7309723638b898f4f3719a98e4c7ffc52559ce981fda7164d9d270f6b9248dfafbe55c2db3a858230af5de2931b611c5567dcfeb3e97dd1e213

data/README.md

@@ -92,8 +92,8 @@ CableReady.initialize({ consumer });
 The `cubicle_for` helper accepts the following options as keyword arguments:
 
 - `exclude_current_user (true|false)`: Whether or not to exclude the current user from the list of present users broadcasted to the view. Useful e.g. for "typing..." indicators.
-- `appear_trigger`: a JavaScript event name (e.g. `:focus`) to use. The default is `:connect`, i.e. register a user as "appeared"/"present" when the element connects to the DOM.
-- `disappear_trigger`: a JavaScript event name (e.g. `:blur`) to use. The default is `:disconnect`, i.e. remove a user form the present users list when the element disconnects from the DOM.
+- `appear_trigger`: JavaScript event names (e.g. `["focus", "debounced:input]`) to use. (Can also be a singular string, which will be converted to an array). The default is `:connect`, i.e. register a user as "appeared"/"present" when the element connects to the DOM.
+- `disappear_trigger`: a JavaScript event name (e.g. `:blur`) to use. (Can also be a singular string, which will be converted to an array). The default is `:disconnect`, i.e. remove a user form the present users list when the element disconnects from the DOM.
 - `trigger_root`: a CSS selector to attach the appear/disappear events to. Defaults to the `cubicle-element` itself.
 - `html_options` are passed to the TagBuilder.
 
@@ -177,4 +177,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 <!-- markdownlint-restore -->
 <!-- prettier-ignore-end -->
 
-<!-- ALL-CONTRIBUTORS-LIST:END -->
+<!-- ALL-CONTRIBUTORS-LIST:END -->

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/app/helpers/cubism_helper.rb

@@ -9,7 +9,7 @@ module CubismHelper
     tag.cubicle_element(
       identifier: signed_stream_identifier(resource.to_gid.to_s),
       user: user.to_sgid.to_s,
-      "appear-trigger": appear_trigger,
+      "appear-trigger": Array(appear_trigger).join(","),
       "disappear-trigger": disappear_trigger,
       "trigger-root": trigger_root,
       id: "cubicle-#{digested_id}",

data/app/helpers/cubism_helper.rb~

@@ -3,22 +3,18 @@ module CubismHelper
 
   def cubicle_for(resource, user, html_options: {}, appear_trigger: :connect, disappear_trigger: nil, trigger_root: nil, exclude_current_user: true, &block)
     key = "#{block.source_location.join(":")}:#{resource.to_gid}:#{user.to_gid}"
-    verifiable_id = CableReady.signed_stream_verifier.generate(key)
-
-    Cubism.store[verifiable_id] = Cubism::BlockStoreItem.new(context: self, block: block.dup)
-    template = capture(&block)
+    digested_id = ActiveSupport::Digest.hexdigest(key)
 
+    Cubism.store[digested_id] = Cubism::BlockStoreItem.new(context: self, block: block.dup)
     tag.cubicle_element(
       identifier: signed_stream_identifier(resource.to_gid.to_s),
       user: user.to_sgid.to_s,
       "appear-trigger": appear_trigger,
       "disappear-trigger": disappear_trigger,
       "trigger-root": trigger_root,
-      id: "cubicle-#{verifiable_id}",
+      id: "cubicle-#{digested_id}",
       "exclude-current-user": exclude_current_user,
       **html_options
-    ) do
-      content_tag(:template, template, {slot: "template"})
-    end
+    )
   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.pre4"
+  VERSION = "0.1.0.pre8"
 end

data/lib/cubism/version.rb~

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

metadata

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