cubism 0.1.0.pre10 → 0.1.0.pre11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 976cb8cfb5c2fe6edb6dd6e541c74361ae17dd12ce717bafadcb6ff6bdd1b9f1
-  data.tar.gz: a3e777efd1df0423ab4754ed30fe119b6497197ec2bc8ee564304385b907849d
+  metadata.gz: cf5d9eed6d97039688a2f51dd5ddab248619879ad47d50abbf37bab73d7f7d56
+  data.tar.gz: 8120474f22abf5ee4b9bc2497e91ef2e68f41aea79f59fde4ae1c9e577a75dd7
 SHA512:
-  metadata.gz: 163db944110832cefb97406ebc7c4c98b231fdf98d9cce25abe164469eb64d9930d5aa1689c53426605dd11e42cbb721e314430a7b1ec1b7acc37449a676f702
-  data.tar.gz: b1c4052e437c7ebe723615e4b3316f1ac5d538aa2008b87957aca8762cd04bf61aed0f930aac42256aa07340d1c05652611fdcd47cad2f4b2e9d870393999e18
+  metadata.gz: fe7a0bca6d22807e0eb6b81e612ee8d435f67380a5aec20df253a86a92606642f907a67341b845159b2ae498dfcc0d7c56c1f49fb3425e1470789140adf4939e
+  data.tar.gz: dd6925f36a82fcfab2de5a888b1d974b151fb9a14a7c4cf76cab9f3ffde28b865790c09dd4b97b19a8284192cef644847a3c944b06e53dd2d690ef8da2a7245e

data/app/helpers/cubism_helper.rb

@@ -2,29 +2,27 @@ 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)
-    filename, lineno = block.source_location
     block_location = block.source_location.join(":")
-    resource_user_key = "#{resource.to_gid}:#{user.to_gid}"
-    digested_block_key = ActiveSupport::Digest.hexdigest("#{block_location}:#{resource_user_key}")
+    block_source = Cubism::BlockSource.find_or_create(
+      location: block_location,
+      view_context: self
+    )
+
+    resource_gid = resource.to_gid.to_s
 
-    # the store item (identified by block location, resource, and user) might already be present
-    store_item = Cubism.store[digested_block_key] || Cubism::BlockStoreItem.new(
+    block_container = Cubism::BlockContainer.new(
       block_location: block_location,
-      resource_gid: resource.to_gid.to_s,
+      block_source: block_source,
+      resource_gid: resource_gid,
       user_gid: user.to_gid.to_s
     )
 
-    if Cubism.store[digested_block_key]&.block_source.blank? && !block_location.start_with?("inline template")
-      lines = File.readlines(filename)[lineno - 1..]
-
-      preprocessor = Cubism::Preprocessor.new(source: lines.join.squish, view_context: self)
-      store_item.block_source = preprocessor.process
-    end
+    digested_block_key = block_container.digest
 
-    Cubism.store[digested_block_key] = store_item
+    Cubism.block_store.fetch(digested_block_key, block_container)
 
     tag.cubicle_element(
-      identifier: signed_stream_identifier(resource.to_gid.to_s),
+      identifier: signed_stream_identifier(resource_gid),
       user: user.to_sgid.to_s,
       "appear-trigger": Array(appear_trigger).join(","),
       "disappear-trigger": disappear_trigger,

data/app/helpers/cubism_helper.rb~

@@ -2,26 +2,25 @@ 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)
-    filename, lineno = block.source_location
     block_location = block.source_location.join(":")
-    resource_user_key = "#{resource.to_gid}:#{user.to_gid}"
-    digested_block_key = ActiveSupport::Digest.hexdigest("#{block_location}:#{resource_user_key}")
 
-    Cubism.store[digested_block_key] = Cubism::BlockStoreItem.new(
+    resource_gid = resource.to_gid.to_s
+
+    store_item = Cubism::BlockStoreItem.new(
       block_location: block_location,
-      resource_gid: resource.to_gid.to_s,
-      user_gid: user.to_gid.to_s
+      resource_gid: resource_gid,
+      user_gid: user.to_gid.to_s,
+      view_context: self
     )
 
-    if Cubism.store[block_location].blank? && !block_location.start_with?("inline template")
-      lines = File.readlines(filename)[lineno - 1..]
+    digested_block_key = store_item.digest
+
+    store_item.parse!
 
-      preprocessor = Cubism::Preprocessor.new(source: lines.join.squish, view_context: self)
-      Cubism.store[block_location] = preprocessor.process
-    end
+    Cubism.block_store[digested_block_key] = store_item
 
     tag.cubicle_element(
-      identifier: signed_stream_identifier(resource.to_gid.to_s),
+      identifier: signed_stream_identifier(resource_gid),
       user: user.to_sgid.to_s,
       "appear-trigger": Array(appear_trigger).join(","),
       "disappear-trigger": disappear_trigger,

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

@@ -14,11 +14,13 @@ module Cubism
     def broadcast
       resource.cubicle_element_ids.to_a.each do |element_id|
         /cubicle-(?<block_key>.+)/ =~ element_id
-        store_item = Cubism.store[block_key]
+        block_container = Cubism.block_store[block_key]
 
-        next if store_item.blank?
+        next if block_container.blank?
 
-        html = ApplicationController.render(inline: store_item.block_source, locals: {users: resource.present_users_for_element_id(element_id)})
+        block_source = block_container.block_source
+
+        html = ApplicationController.render(inline: block_source.source, locals: {"#{block_source.variable_name}": resource.present_users_for_element_id(element_id)})
 
         cable_ready[element_id].inner_html(
           selector: "cubicle-element##{element_id}[identifier='#{signed_stream_identifier(resource.to_global_id.to_s)}']",

data/lib/cubism/broadcaster.rb~

@@ -1,11 +1,9 @@
 require "cable_ready"
-require "parser/current"
 
 module Cubism
   class Broadcaster
     include CableReady::Broadcaster
     include CableReady::StreamIdentifier
-    include ActionView::Helpers
 
     attr_reader :resource
 
@@ -16,33 +14,15 @@ module Cubism
     def broadcast
       resource.cubicle_element_ids.to_a.each do |element_id|
         /cubicle-(?<block_key>.+)/ =~ element_id
-        block_store_item = Cubism.store[block_key]
+        store_item = Cubism.block_store[block_key]
 
-        next if block_store_item.blank?
+        next if store_item.blank?
 
-        block_source = Cubism.store[block_store_item.block_location]
-        erubi = ActionView::Template::Handlers::ERB::Erubi.new(block_source)
-        ast = Parser::CurrentRuby.parse erubi.src
-
-        # html = ApplicationController.render(inline: block_source, locals: {current_user: block_store_item.user, "@project": block_store_item.resource, users: resource.present_users_for_element_id(element_id)})
-
-        # binding.pry
-
-        # context = ActionView::Base.with_view_paths(ActionController::Base.view_paths)
-        # erubi = ActionView::Template::Handlers::ERB::Erubi.new(File.read(filename), filename: filename)
-        # context = ApplicationController.new.view_context
-
-        # filename, lineno = block_store_item.block_location.split
-
-        # binding.pry
-
-        # 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)
+        html = ApplicationController.render(inline: store_item.block_source, locals: {"#{store_item.block_variable_name}": resource.present_users_for_element_id(element_id)})
 
         cable_ready[element_id].inner_html(
           selector: "cubicle-element##{element_id}[identifier='#{signed_stream_identifier(resource.to_global_id.to_s)}']",
-          html: "#{resource.present_users_for_element_id(element_id).map(&:id)}" 
+          html: html
         ).broadcast
       end
     end

data/lib/cubism/cubicle_block_store.rb~

@@ -1,29 +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
-        @blocks.clear
+        # kredis #remove
+        @blocks.remove
       end
     end
 
+    def size
+      @blocks.to_h.size
+    end
+
     private
 
     def mutex
@@ -31,7 +34,7 @@ module Cubism
     end
   end
 
-  BlockStoreItem = Struct.new(:block_location, :user_gid, :resource_gid, keyword_init: true) do
+  BlockStoreItem = Struct.new(:block_location, :block_source, :user_gid, :resource_gid, keyword_init: true) do
     def user
       GlobalID::Locator.locate self[:user_gid]
     end
@@ -39,5 +42,15 @@ module Cubism
     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,136 @@
+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,
+    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 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/cubicle_store.rb~

@@ -0,0 +1,136 @@
+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
+  BlockStoreItem = Struct.new(
+    :block_location,
+    :block_source,
+    :user_gid,
+    :resource_gid,
+    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 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.reverse_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,7 +1,8 @@
 module Cubism
   class Engine < ::Rails::Engine
-    initializer "cubism.store" do
-      Cubism.store = Cubism::CubicleBlockStore.new
+    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~

@@ -1,4 +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

@@ -1,8 +1,11 @@
 module Cubism
   class Preprocessor
+    attr_reader :block_variable_name
+
     def initialize(source:, view_context:)
-      match_data = /<%=\s+cubicle_for.+\|.+\|\s+%>/.match(source)
+      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

data/lib/cubism/preprocessor.rb~

@@ -1,7 +1,8 @@
 module Cubism
   class Preprocessor
     def initialize(source:, view_context:)
-      start_pos = /<%= cubicle_for/ =~ source
+      match_data = /<%=\s+cubicle_for.+\|.+\|\s+%>/.match(source)
+      start_pos = match_data&.end(0) || 0
       @source = source[start_pos..]
       @view_context = view_context
     end
@@ -16,10 +17,13 @@ module Cubism
       @source
     end
 
+    private
+
     def do_parse
       ActionView::Template::Handlers::ERB::Erubi.new(@source).evaluate(@view_context)
     rescue SyntaxError
-      @source = @source[..-2]
+      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

data/lib/cubism/version.rb

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

data/lib/cubism.rb

@@ -3,7 +3,7 @@ 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
@@ -14,5 +14,6 @@ module Cubism
 
   mattr_accessor :user_class, instance_writer: false, instance_reader: false
 
-  mattr_accessor :store, instance_reader: false
+  mattr_accessor :block_store, instance_reader: false
+  mattr_accessor :source_store, instance_reader: false
 end

data/lib/cubism.rb~

@@ -14,5 +14,5 @@ module Cubism
 
   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.pre10
+  version: 0.1.0.pre11
 platform: ruby
 authors:
 - Julian Rubisch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2022-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -145,8 +145,10 @@ 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~

data/lib/cubism/cubicle_block_store.rb

@@ -1,56 +0,0 @@
-module Cubism
-  class CubicleBlockStore
-    delegate_missing_to :@blocks
-
-    def initialize
-      @blocks = Kredis.hash "cubism-blocks"
-    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 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
-
-  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