cubism 0.1.0.pre9 → 0.1.0.pre12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 579dec94521951d33b64eb0c211a210fe86cc89f927a79489cd05258593e3634
-  data.tar.gz: 21d48a1e4c42ad33e27e11c1128930d22c2103120307a8bd0351d5321d520f9a
+  metadata.gz: 8cd7c7ee681cabc05fd5329e7e6c17fd030d037beb100440faf1ef190a614ddf
+  data.tar.gz: a772708b9dc6a32c5a37766d203ea6a4b119eac57368378121e6b4da9f2b50f6
 SHA512:
-  metadata.gz: 57c779b3efd7deae25de93339ab19d4a673e2bfae83e3f0d02e62741780b8320d4f1e1dd1c2a4c07bfec3a42c417eb5c59e5fbdfddd43a586c28ed9f945e546a
-  data.tar.gz: 999b2cae4e2d0c506fd08a02dad104c7e66f50f863fd9f5a58fa600e4fa2d0409ad81d88819905541423b68fccb9d80589a03dafc75c6c6a510aed2966f164fb
+  metadata.gz: b47525bcc5545b289624615b66215b68467c2a2ba35a7b5335c944bdfacc68d0c6d60c430c93ad1b18470db7e7d3a58313f232b35bc32a34b21847f4a28f086b
+  data.tar.gz: 4595ebf829643d556613ebc5ca03e19f35cc6601a8c435f0dfea3c4e9cc7c08966c94ae69996e87d0e8c572d1d0decc8e6bd1cfa9ee7840a7abad29909f3ab7f

data/README.md

@@ -4,7 +4,9 @@
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 [![Twitter follow](https://img.shields.io/twitter/follow/julian_rubisch?style=social)](https://twitter.com/julian_rubisch)
 
-Lightweight Resource-Based Presence Solution with CableReady
+Lightweight Resource-Based Presence Solution with CableReady.
+
+`Cubism` provides real-time updates of who is viewing or interacting with whatever resources you need. Whether you want Slack's "X is typing..." indicator or an e-commerce "5 other customers are viewing this item" notice, `Cubism` gives you everything you need "under the hood" so that you can focus on what really matters—end-user functionality.
 
 ## Table of Contents
 
@@ -12,6 +14,7 @@ Lightweight Resource-Based Presence Solution with CableReady
 - [Usage](#usage)
 - [Installation](#installation)
 - [API](#api)
+- [Limitations](#limitations)
 - [Gotchas](#gotchas)
 - [Contributing](#contributing)
 - [License](#license)
@@ -54,6 +57,8 @@ Using the `cubicle_for` helper, you can set up a presence indicator. It will
 <% end %>
 ```
 
+**Important!** due to technical limitations the cubism block does _not_ act as a closure, i.e. it has _only_ access to the `users` variable passed to it - think of it more as a self-contained component.
+
 ## Installation
 Add this line to your application's Gemfile:
 
@@ -91,12 +96,18 @@ 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`: 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.
+- `scope`: declare a scope in which presence indicators should appear. For example, if you want to divide between index and show views, do `scope: :index` and `scope: :show` respectively (default: `""`).
+- `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 (default: `true`).
+- `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. Another special value is `:intersect`, which fires when the `trigger_root` comes into the viewport.
+- `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. Analoguous to above, `:intersect` means that `disappear` will fire when the `trigger_root` is scrolled out of the viewport.
 - `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.
 
+## Limitations
+
+### Supported Template Handlers
+- ERB
+
 ## Gotchas
 
 ### Usage with ViewComponent

data/app/channels/cubism/presence_channel.rb

@@ -3,7 +3,7 @@ class Cubism::PresenceChannel < ActionCable::Channel::Base
 
   def subscribed
     if resource.present?
-      stream_from params[:element_id]
+      stream_from element_id
       resource.cubicle_element_ids << element_id
       resource.excluded_user_id_for_element_id[element_id] = user.id if exclude_current_user?
     else
@@ -20,11 +20,11 @@ class Cubism::PresenceChannel < ActionCable::Channel::Base
   end
 
   def appear
-    resource.present_users.add(user.id)
+    resource.set_present_users_for_scope(resource.present_users_for_scope(scope).add(user.id), scope) if scope
   end
 
   def disappear
-    resource.present_users.remove(user.id)
+    resource.set_present_users_for_scope(resource.present_users_for_scope(scope).delete(user.id), scope) if scope
   end
 
   private
@@ -35,7 +35,15 @@ class Cubism::PresenceChannel < ActionCable::Channel::Base
   end
 
   def user
-    GlobalID::Locator.locate_signed(params[:user])
+    block_container&.user
+  end
+
+  def scope
+    block_container&.scope
+  end
+
+  def block_container
+    Cubism.block_store[element_id]
   end
 
   def exclude_current_user?
@@ -43,7 +51,8 @@ class Cubism::PresenceChannel < ActionCable::Channel::Base
   end
 
   def element_id
-    params[:element_id]
+    /cubicle-(?<element_id>.+)/ =~ params[:element_id]
+    element_id
   end
 
   def url

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

@@ -3,7 +3,7 @@ class Cubism::PresenceChannel < ActionCable::Channel::Base
 
   def subscribed
     if resource.present?
-      stream_from params[:element_id]
+      stream_from element_id
       resource.cubicle_element_ids << element_id
       resource.excluded_user_id_for_element_id[element_id] = user.id if exclude_current_user?
     else
@@ -20,11 +20,11 @@ class Cubism::PresenceChannel < ActionCable::Channel::Base
   end
 
   def appear
-    resource.present_users.add(user.id)
+    resource.set_present_users_for_scope(resource.present_users_for_scope(scope).add(user.id), scope)
   end
 
   def disappear
-    resource.present_users.remove(user.id)
+    resource.set_present_users_for_scope(resource.present_users_for_scope(scope).delete(user.id), scope)
   end
 
   private
@@ -35,7 +35,15 @@ class Cubism::PresenceChannel < ActionCable::Channel::Base
   end
 
   def user
-    GlobalID::Locator.locate_signed(params[:user])
+    block_container.user
+  end
+
+  def scope
+    block_container.scope
+  end
+
+  def block_container
+    Cubism.block_store[element_id]
   end
 
   def exclude_current_user?
@@ -43,7 +51,8 @@ class Cubism::PresenceChannel < ActionCable::Channel::Base
   end
 
   def element_id
-    params[:element_id]
+    /cubicle-(?<element_id>.+)/ =~ params[:element_id]
+    element_id
   end
 
   def url

data/app/helpers/cubism_helper.rb

@@ -1,18 +1,33 @@
 module CubismHelper
   include CableReady::StreamIdentifier
 
-  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}"
-    digested_id = ActiveSupport::Digest.hexdigest(key)
+  def cubicle_for(resource, user, scope: "", html_options: {}, appear_trigger: :connect, disappear_trigger: nil, trigger_root: nil, exclude_current_user: true, &block)
+    block_location = block.source_location.join(":")
+    block_source = Cubism::BlockSource.find_or_create(
+      location: block_location,
+      view_context: self
+    )
+
+    resource_gid = resource.to_gid.to_s
+
+    block_container = Cubism::BlockContainer.new(
+      block_location: block_location,
+      block_source: block_source,
+      resource_gid: resource_gid,
+      user_gid: user.to_gid.to_s,
+      scope: scope
+    )
+
+    digested_block_key = block_container.digest
+
+    Cubism.block_store.fetch(digested_block_key, block_container)
 
-    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,
+      identifier: signed_stream_identifier(resource_gid),
       "appear-trigger": Array(appear_trigger).join(","),
       "disappear-trigger": disappear_trigger,
       "trigger-root": trigger_root,
-      id: "cubicle-#{digested_id}",
+      id: "cubicle-#{digested_block_key}",
       "exclude-current-user": exclude_current_user,
       **html_options
     )

data/app/helpers/cubism_helper.rb~

@@ -0,0 +1,36 @@
+module CubismHelper
+  include CableReady::StreamIdentifier
+
+  def cubicle_for(resource, user, scope: "", html_options: {}, appear_trigger: :connect, disappear_trigger: nil, trigger_root: nil, exclude_current_user: true, &block)
+    block_location = block.source_location.join(":")
+    block_source = Cubism::BlockSource.find_or_create(
+      location: block_location,
+      view_context: self
+    )
+
+    resource_gid = resource.to_gid.to_s
+
+    block_container = Cubism::BlockContainer.new(
+      block_location: block_location,
+      block_source: block_source,
+      resource_gid: resource_gid,
+      user_gid: user.to_gid.to_s,
+      scope: scope
+    )
+
+    digested_block_key = block_container.digest
+
+    Cubism.block_store.fetch(digested_block_key, block_container)
+
+    tag.cubicle_element(
+      identifier: signed_stream_identifier(resource_gid),
+      "appear-trigger": Array(appear_trigger).join(","),
+      "disappear-trigger": disappear_trigger,
+      "trigger-root": trigger_root,
+      scope: scope,
+      id: "cubicle-#{digested_block_key}",
+      "exclude-current-user": exclude_current_user,
+      **html_options
+    )
+  end
+end

data/app/models/concerns/cubism/presence.rb

@@ -2,7 +2,7 @@ module Cubism::Presence
   extend ActiveSupport::Concern
 
   included do
-    kredis_set :present_users, after_change: :stream_presence
+    kredis_hash :present_users, after_change: :stream_presence
     kredis_set :cubicle_element_ids
     kredis_hash :excluded_user_id_for_element_id
   end
@@ -11,8 +11,16 @@ module Cubism::Presence
     Cubism::Broadcaster.new(resource: self).broadcast
   end
 
-  def present_users_for_element_id(element_id)
-    users = Cubism.user_class.find(present_users.members)
+  def present_users_for_scope(scope = "")
+    present_users[scope].present? ? Marshal.load(present_users[scope]) : Set.new
+  end
+
+  def set_present_users_for_scope(user_ids, scope = "")
+    present_users[scope] = Marshal.dump(Set.new(user_ids))
+  end
+
+  def present_users_for_element_id_and_scope(element_id, scope = "")
+    users = Cubism.user_class.find(present_users_for_scope(scope).to_a)
     users.reject! { |user| user.id == excluded_user_id_for_element_id[element_id].to_i }
 
     users

data/app/models/concerns/cubism/presence.rb~

@@ -10,4 +10,11 @@ module Cubism::Presence
   def stream_presence
     Cubism::Broadcaster.new(resource: self).broadcast
   end
+
+  def present_users_for_element_id(element_id)
+    users = Cubism.user_class.find(present_users.members)
+    users.reject! { |user| user.id == excluded_user_id_for_element_id[element_id].to_i }
+
+    users
+  end
 end

data/lib/cubism/broadcaster.rb

@@ -13,16 +13,25 @@ module Cubism
 
     def broadcast
       resource.cubicle_element_ids.to_a.each do |element_id|
-        /cubicle-(?<block_key>.+)/ =~ element_id
-        block = Cubism.store[block_key].block
-        view_context = Cubism.store[block_key].context
-        html = view_context.capture(resource.present_users_for_element_id(element_id), &block)
+        block_container = Cubism.block_store[element_id]
+
+        next if block_container.blank?
+
+        present_users = resource.present_users_for_element_id_and_scope(element_id, block_container.scope)
+
+        block_source = block_container.block_source
+
+        html = ApplicationController.render(inline: block_source.source, locals: {"#{block_source.variable_name}": present_users})
+
+        selector = "cubicle-element#cubicle-#{element_id}[identifier='#{signed_stream_identifier(resource.to_global_id.to_s)}']"
 
         cable_ready[element_id].inner_html(
-          selector: "cubicle-element##{element_id}[identifier='#{signed_stream_identifier(resource.to_global_id.to_s)}']",
+          selector: selector,
           html: html
-        ).broadcast
+        )
       end
+
+      cable_ready.broadcast
     end
   end
 end

data/lib/cubism/broadcaster.rb~

@@ -13,25 +13,25 @@ module Cubism
 
     def broadcast
       resource.cubicle_element_ids.to_a.each do |element_id|
-        /cubicle-(?<block_key>.+)/ =~ element_id
-        block = Cubism.store[block_key].block
-        view_context = Cubism.store[block_key].context
-        html = view_context.capture(users_for(resource, element_id), &block)
+        block_container = Cubism.block_store[element_id]
+
+        next if block_container.blank?
+
+        present_users = resource.present_users_for_element_id_and_scope(element_id, block_container.scope)
+
+        block_source = block_container.block_source
+
+        html = ApplicationController.render(inline: block_source.source, locals: {"#{block_source.variable_name}": present_users})
+
+        selector = "cubicle-element#cubicle-#{element_id}[identifier='#{signed_stream_identifier(resource.to_global_id.to_s)}'][scope='#{block_container.scope}']"
 
         cable_ready[element_id].inner_html(
-          selector: "cubicle-element##{element_id}[identifier='#{signed_stream_identifier(resource.to_global_id.to_s)}']",
+          selector: selector,
           html: html
-        ).broadcast
+        )
       end
-    end
-
-    private
-
-    def users_for(resource, element_id)
-      users = Cubism.user_class.find(resource.present_users.members)
-      users.reject! { |user| user.id == resource.excluded_user_id_for_element_id[element_id].to_i }
 
-      users
+      cable_ready.broadcast
     end
   end
 end

data/lib/cubism/cubicle_block_store.rb~

@@ -1,21 +1,32 @@
 module Cubism
   class CubicleBlockStore
-    include Singleton
+    delegate_missing_to :@blocks
 
     def initialize
-      @blocks = {}
+      @blocks = Kredis.hash "cubism-blocks"
     end
 
     def [](key)
-      @blocks[key]
+      Marshal.load(@blocks[key]) if @blocks[key]
     end
 
     def []=(key, value)
       mutex.synchronize do
-        @blocks[key] = value
+        @blocks[key] = Marshal.dump value
       end
     end
 
+    def clear
+      mutex.synchronize do
+        # kredis #remove
+        @blocks.remove
+      end
+    end
+
+    def size
+      @blocks.to_h.size
+    end
+
     private
 
     def mutex
@@ -23,5 +34,23 @@ module Cubism
     end
   end
 
-  BlockStoreItem = Struct.new(:context, :block, keyword_init: true)
+  BlockStoreItem = Struct.new(:block_location, :block_source, :user_gid, :resource_gid, keyword_init: true) do
+    def user
+      GlobalID::Locator.locate self[:user_gid]
+    end
+
+    def resource
+      GlobalID::Locator.locate self[:resource_gid]
+    end
+
+    def marshal_dump
+      to_h
+    end
+
+    def marshal_load(serialized_item)
+      %i[block_location block_source user_gid resource_gid].each do |arg|
+        send("#{arg}=", serialized_item[arg])
+      end
+    end
+  end
 end

data/lib/cubism/cubicle_store.rb

@@ -0,0 +1,141 @@
+module Cubism
+  class CubicleStore
+    delegate_missing_to :@blocks
+
+    def initialize(key)
+      @blocks = Kredis.hash key
+    end
+
+    def [](key)
+      Marshal.load(@blocks[key]) if @blocks[key]
+    end
+
+    def []=(key, value)
+      mutex.synchronize do
+        @blocks[key] = Marshal.dump value
+      end
+    end
+
+    def fetch(key, value = nil, &block)
+      if self[key].nil?
+        yield value if block
+        self[key] = value
+      end
+
+      self[key]
+    end
+
+    def clear
+      mutex.synchronize do
+        # kredis #remove
+        @blocks.remove
+      end
+    end
+
+    def size
+      @blocks.to_h.size
+    end
+
+    private
+
+    def mutex
+      @mutex ||= Mutex.new
+    end
+  end
+
+  # Container for cubicle blocks
+  BlockContainer = Struct.new(
+    :block_location,
+    :block_source,
+    :user_gid,
+    :resource_gid,
+    :scope,
+    keyword_init: true
+  ) do
+    def initialize(*args)
+      super
+
+      @filename, _lineno = block_location.split(":")
+    end
+
+    def user
+      GlobalID::Locator.locate self[:user_gid]
+    end
+
+    def resource
+      GlobalID::Locator.locate self[:resource_gid]
+    end
+
+    def scope
+      self[:scope] || ""
+    end
+
+    def digest
+      resource_user_key = [resource_gid, user_gid, scope].join(":")
+
+      ActiveSupport::Digest.hexdigest("#{block_location}:#{File.read(@filename)}:#{resource_user_key}")
+    end
+
+    def marshal_dump
+      to_h.merge(block_source: block_source.digest)
+    end
+
+    def marshal_load(serialized_item)
+      members.excluding(:block_source).each do |arg|
+        send("#{arg}=", serialized_item[arg])
+      end
+
+      self.block_source = Cubism.source_store[serialized_item[:block_source]]
+    end
+  end
+
+  # Container for cubicle block sources
+  BlockSource = Struct.new(
+    :location,
+    :source,
+    :variable_name,
+    :view_context,
+    keyword_init: true
+  ) do
+    def self.find_or_create(location:, view_context:)
+      instance = new(location: location, view_context: view_context)
+
+      Cubism.source_store.fetch(instance.digest, instance) do |instance|
+        instance.parse!
+      end
+
+      instance
+    end
+
+    def initialize(*args)
+      super
+
+      @filename, @lineno = location.split(":")
+      @lineno = @lineno.to_i
+    end
+
+    def parse!
+      return if location.start_with?("inline template")
+
+      lines = File.readlines(@filename)[@lineno - 1..]
+
+      preprocessor = Cubism::Preprocessor.new(source: lines.join.squish, view_context: view_context)
+      self.variable_name = preprocessor.block_variable_name
+      self.source = preprocessor.process
+    end
+
+    def digest
+      ActiveSupport::Digest.hexdigest("#{location}:#{File.read(@filename)}")
+    end
+
+    def marshal_dump
+      to_h.except(:view_context)
+    end
+
+    def marshal_load(serialized_item)
+      members.excluding(:view_context).each do |arg|
+        send("#{arg}=", serialized_item[arg])
+      end
+    end
+  end
+end

data/lib/cubism/cubicle_store.rb~

@@ -0,0 +1,141 @@
+module Cubism
+  class CubicleStore
+    delegate_missing_to :@blocks
+
+    def initialize(key)
+      @blocks = Kredis.hash key
+    end
+
+    def [](key)
+      Marshal.load(@blocks[key]) if @blocks[key]
+    end
+
+    def []=(key, value)
+      mutex.synchronize do
+        @blocks[key] = Marshal.dump value
+      end
+    end
+
+    def fetch(key, value = nil, &block)
+      if self[key].nil?
+        yield value if block
+        self[key] = value
+      end
+
+      self[key]
+    end
+
+    def clear
+      mutex.synchronize do
+        # kredis #remove
+        @blocks.remove
+      end
+    end
+
+    def size
+      @blocks.to_h.size
+    end
+
+    private
+
+    def mutex
+      @mutex ||= Mutex.new
+    end
+  end
+
+  # Container for cubicle blocks
+  BlockContainer = Struct.new(
+    :block_location,
+    :block_source,
+    :user_gid,
+    :resource_gid,
+    :scope,
+    keyword_init: true
+  ) do
+    def initialize(*args)
+      super
+
+      @filename, _lineno = block_location.split(":")
+    end
+
+    def user
+      GlobalID::Locator.locate self[:user_gid]
+    end
+
+    def resource
+      GlobalID::Locator.locate self[:resource_gid]
+    end
+
+    def scope
+      self[:scope] || ""
+    end
+
+    def digest
+      resource_user_key = [resource_gid, user_gid].join(":")
+
+      ActiveSupport::Digest.hexdigest("#{block_location}:#{File.read(@filename)}:#{resource_user_key}")
+    end
+
+    def marshal_dump
+      to_h.merge(block_source: block_source.digest)
+    end
+
+    def marshal_load(serialized_item)
+      members.excluding(:block_source).each do |arg|
+        send("#{arg}=", serialized_item[arg])
+      end
+
+      self.block_source = Cubism.source_store[serialized_item[:block_source]]
+    end
+  end
+
+  # Container for cubicle block sources
+  BlockSource = Struct.new(
+    :location,
+    :source,
+    :variable_name,
+    :view_context,
+    keyword_init: true
+  ) do
+    def self.find_or_create(location:, view_context:)
+      instance = new(location: location, view_context: view_context)
+
+      Cubism.source_store.fetch(instance.digest, instance) do |instance|
+        instance.parse!
+      end
+
+      instance
+    end
+
+    def initialize(*args)
+      super
+
+      @filename, @lineno = location.split(":")
+      @lineno = @lineno.to_i
+    end
+
+    def parse!
+      return if location.start_with?("inline template")
+
+      lines = File.readlines(@filename)[@lineno - 1..]
+
+      preprocessor = Cubism::Preprocessor.new(source: lines.join.squish, view_context: view_context)
+      self.variable_name = preprocessor.block_variable_name
+      self.source = preprocessor.process
+    end
+
+    def digest
+      ActiveSupport::Digest.hexdigest("#{location}:#{File.read(@filename)}")
+    end
+
+    def marshal_dump
+      to_h.except(:view_context)
+    end
+
+    def marshal_load(serialized_item)
+      members.excluding(:view_context).each do |arg|
+        send("#{arg}=", serialized_item[arg])
+      end
+    end
+  end
+end

data/lib/cubism/engine.rb

@@ -1,4 +1,8 @@
 module Cubism
   class Engine < ::Rails::Engine
+    initializer "cubism.stores" do
+      Cubism.block_store = Cubism::CubicleStore.new("cubism-blocks")
+      Cubism.source_store = Cubism::CubicleStore.new("cubism-source")
+    end
   end
 end

data/lib/cubism/engine.rb~

@@ -0,0 +1,7 @@
+module Cubism
+  class Engine < ::Rails::Engine
+    initializer "cubism.block_store" do
+      Cubism.block_store = Cubism::CubicleBlockStore.new
+    end
+  end
+end

data/lib/cubism/preprocessor.rb

@@ -0,0 +1,33 @@
+module Cubism
+  class Preprocessor
+    attr_reader :block_variable_name
+
+    def initialize(source:, view_context:)
+      match_data = /<%=\s+cubicle_for.+?\|(\w+)\|\s+%>/.match(source)
+      start_pos = match_data&.end(0) || 0
+      @block_variable_name = match_data[1] if match_data
+      @source = source[start_pos..]
+      @view_context = view_context
+    end
+
+    def process
+      begin
+        do_parse
+      rescue NameError
+        # we ignore any name errors from unset instance variables or local assigns here
+      end
+
+      @source
+    end
+
+    private
+
+    def do_parse
+      ActionView::Template::Handlers::ERB::Erubi.new(@source).evaluate(@view_context)
+    rescue SyntaxError
+      end_at_end = /(<%\s+end\s+%>)\z/.match(@source)
+      @source = end_at_end ? @source[..-(end_at_end[0].length + 1)] : @source[..-2]
+      do_parse
+    end
+  end
+end

data/lib/cubism/preprocessor.rb~

@@ -0,0 +1,30 @@
+module Cubism
+  class Preprocessor
+    def initialize(source:, view_context:)
+      match_data = /<%=\s+cubicle_for.+\|.+\|\s+%>/.match(source)
+      start_pos = match_data&.end(0) || 0
+      @source = source[start_pos..]
+      @view_context = view_context
+    end
+
+    def process
+      begin
+        do_parse
+      rescue NameError
+        # we ignore any name errors from unset instance variables or local assigns here
+      end
+
+      @source
+    end
+
+    private
+
+    def do_parse
+      ActionView::Template::Handlers::ERB::Erubi.new(@source).evaluate(@view_context)
+    rescue SyntaxError
+      end_at_end = /(<%\s+end\s+%>)\z/.match(@source)
+      @source = end_at_end ? @source[..-(end_at_end[0].length + 1)] : @source[..-2]
+      do_parse
+    end
+  end
+end

data/lib/cubism/version.rb

@@ -1,3 +1,3 @@
 module Cubism
-  VERSION = "0.1.0.pre9"
+  VERSION = "0.1.0.pre12"
 end

data/lib/cubism/version.rb~

@@ -1,3 +1,3 @@
 module Cubism
-  VERSION = "0.1.0.pre8"
+  VERSION = "0.1.0.pre11"
 end

data/lib/cubism.rb

@@ -3,14 +3,17 @@ require "kredis"
 require "cubism/version"
 require "cubism/engine"
 require "cubism/broadcaster"
-require "cubism/cubicle_block_store"
+require "cubism/cubicle_store"
+require "cubism/preprocessor"
 
 module Cubism
   extend ActiveSupport::Autoload
 
   autoload :Broadcaster, "cubism/broadcaster"
+  autoload :Preprocessor, "cubism/preprocessor"
 
   mattr_accessor :user_class, instance_writer: false, instance_reader: false
 
-  mattr_reader :store, instance_reader: false, default: Cubism::CubicleBlockStore.instance
+  mattr_accessor :block_store, instance_reader: false
+  mattr_accessor :source_store, instance_reader: false
 end

data/lib/cubism.rb~

@@ -4,13 +4,15 @@ require "cubism/version"
 require "cubism/engine"
 require "cubism/broadcaster"
 require "cubism/cubicle_block_store"
+require "cubism/preprocessor"
 
 module Cubism
   extend ActiveSupport::Autoload
 
   autoload :Broadcaster, "cubism/broadcaster"
+  autoload :Preprocessor, "cubism/preprocessor"
 
   mattr_accessor :user_class, instance_writer: false, instance_reader: false
 
-  mattr_reader :store, instance_reader: false, default: Cubism::CubicleBlockStore.instance
+  mattr_accessor :block_store, instance_reader: false
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cubism
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre9
+  version: 0.1.0.pre12
 platform: ruby
 authors:
 - Julian Rubisch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-09 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -135,6 +135,7 @@ files:
 - app/channels/cubism/presence_channel.rb
 - app/channels/cubism/presence_channel.rb~
 - app/helpers/cubism_helper.rb
+- app/helpers/cubism_helper.rb~
 - app/models/concerns/cubism/presence.rb
 - app/models/concerns/cubism/presence.rb~
 - app/models/concerns/cubism/user.rb
@@ -144,9 +145,15 @@ files:
 - lib/cubism.rb~
 - lib/cubism/broadcaster.rb
 - lib/cubism/broadcaster.rb~
-- lib/cubism/cubicle_block_store.rb
 - lib/cubism/cubicle_block_store.rb~
+- lib/cubism/cubicle_source_store.rb~
+- lib/cubism/cubicle_store.rb
+- lib/cubism/cubicle_store.rb~
 - lib/cubism/engine.rb
+- lib/cubism/engine.rb~
+- lib/cubism/parser.rb~
+- lib/cubism/preprocessor.rb
+- lib/cubism/preprocessor.rb~
 - lib/cubism/version.rb
 - lib/cubism/version.rb~
 - lib/tasks/cubism_tasks.rake

data/lib/cubism/cubicle_block_store.rb

@@ -1,35 +0,0 @@
-module Cubism
-  class CubicleBlockStore
-    include Singleton
-
-    delegate_missing_to :@blocks
-
-    def initialize
-      @blocks = {}
-    end
-
-    def [](key)
-      @blocks[key]
-    end
-
-    def []=(key, value)
-      mutex.synchronize do
-        @blocks[key] = value
-      end
-    end
-
-    def clear
-      mutex.synchronize do
-        @blocks.clear
-      end
-    end
-
-    private
-
-    def mutex
-      @mutex ||= Mutex.new
-    end
-  end
-
-  BlockStoreItem = Struct.new(:context, :block, keyword_init: true)
-end