cubism 0.2.1 → 0.2.2

data/lib/cubism/preprocessor.rb

@@ -36,7 +36,10 @@ module Cubism
     def evaluate_view(erubi, view_context)
       view = Class.new(ActionView::Base) {
         include view_context._routes.url_helpers
-        class_eval("define_method(:_template) { |local_assigns, output_buffer| #{erubi.src} }", erubi.filename.nil? ? "(erubi)" : erubi.filename, 0)
+
+        # Deliberately not __FILE__/__LINE__: the eval'd source is the user's
+        # template, so backtraces have to point there and not at this file.
+        class_eval("define_method(:_template) { |local_assigns, output_buffer| #{erubi.src} }", erubi.filename.nil? ? "(erubi)" : erubi.filename, 0) # standard:disable Style/EvalWithLocation
       }.empty
       view._run(:_template, nil, {}, ActionView::OutputBuffer.new)
     end

data/lib/cubism/version.rb

@@ -1,3 +1,3 @@
 module Cubism
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@minthesize/cubism",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Lightweight Resource-Based Presence Solution with CableReady.",
   "main": "./dist/cubism.umd.min.js",
   "module": "./dist/cubism.min.js",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cubism
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Julian Rubisch
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: kredis
   requirement: !ruby/object:Gem::Requirement
@@ -71,14 +71,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.35.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.35.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -179,50 +179,6 @@ files:
 - package.json~
 - rollup.config.js
 - rollup.config.js~
-- test/block_container_test.rb
-- test/block_source_test.rb
-- test/broadcaster_test.rb
-- test/channels/cubism/presence_channel_test.rb
-- test/cubicle_store_test.rb
-- test/cubism_test.rb
-- test/dummy/app/channels/application_cable/channel.rb
-- test/dummy/app/channels/application_cable/connection.rb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/jobs/application_job.rb
-- test/dummy/app/mailers/application_mailer.rb
-- test/dummy/app/models/application_record.rb
-- test/dummy/app/models/post.rb
-- test/dummy/app/models/user.rb
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/application_controller_renderer.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/content_security_policy.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/permissions_policy.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/puma.rb
-- test/dummy/config/routes.rb
-- test/dummy/db/migrate/20220102072929_create_posts.rb
-- test/dummy/db/migrate/20220102073003_create_users.rb
-- test/dummy/db/schema.rb
-- test/dummy/test/models/post_test.rb
-- test/dummy/test/models/user_test.rb
-- test/helpers/cubism_helper_test.rb
-- test/integration/navigation_test.rb
-- test/models/concerns/presence_test.rb
-- test/models/concerns/user_test.rb
-- test/rendering/preprocessor_test.rb
-- test/test_helper.rb
 - yarn.lock
 homepage: https://github.com/julianrubisch/cubism
 licenses:
@@ -237,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -247,48 +203,4 @@ requirements: []
 rubygems_version: 3.6.7
 specification_version: 4
 summary: Lightweight Resource-Based Presence Solution with CableReady
-test_files:
-- test/block_container_test.rb
-- test/block_source_test.rb
-- test/broadcaster_test.rb
-- test/channels/cubism/presence_channel_test.rb
-- test/cubicle_store_test.rb
-- test/cubism_test.rb
-- test/dummy/app/channels/application_cable/channel.rb
-- test/dummy/app/channels/application_cable/connection.rb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/jobs/application_job.rb
-- test/dummy/app/mailers/application_mailer.rb
-- test/dummy/app/models/application_record.rb
-- test/dummy/app/models/post.rb
-- test/dummy/app/models/user.rb
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/application_controller_renderer.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/content_security_policy.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/permissions_policy.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/puma.rb
-- test/dummy/config/routes.rb
-- test/dummy/db/migrate/20220102072929_create_posts.rb
-- test/dummy/db/migrate/20220102073003_create_users.rb
-- test/dummy/db/schema.rb
-- test/dummy/test/models/post_test.rb
-- test/dummy/test/models/user_test.rb
-- test/helpers/cubism_helper_test.rb
-- test/integration/navigation_test.rb
-- test/models/concerns/presence_test.rb
-- test/models/concerns/user_test.rb
-- test/rendering/preprocessor_test.rb
-- test/test_helper.rb
+test_files: []

data/test/block_container_test.rb

@@ -1,105 +0,0 @@
-require "test_helper"
-
-class BlockContainerTest < ActiveSupport::TestCase
-  FIXTURES_DIR = File.expand_path("./fixtures", __dir__)
-
-  setup do
-    @cwd = Dir.pwd
-    @tmp_dir = Dir.mktmpdir
-
-    FileUtils.cp_r FIXTURES_DIR, @tmp_dir
-    Dir.chdir @tmp_dir
-
-    @post = posts(:one)
-    @user = users(:one)
-  end
-
-  teardown do
-    Dir.chdir @cwd
-    FileUtils.rm_r @tmp_dir
-  end
-
-  test "block container digest changes when file contents change" do
-    template = "fixtures/_cubicle_partial"
-
-    digest1 = Cubism::BlockContainer.new(
-      block_location: "#{template_tmp_path(template)}.html.erb:1",
-      resource_gid: @post.to_gid.to_s,
-      user_gid: @user.to_gid.to_s
-    ).digest
-
-    change_template(template)
-
-    digest2 = Cubism::BlockContainer.new(
-      block_location: "#{template_tmp_path(template)}.html.erb:1",
-      resource_gid: @post.to_gid.to_s,
-      user_gid: @user.to_gid.to_s
-    ).digest
-
-    refute_equal digest1, digest2
-  end
-
-  test "block container digest changes when user changes" do
-    template = "fixtures/_cubicle_partial"
-
-    digest1 = Cubism::BlockContainer.new(
-      block_location: "#{template_tmp_path(template)}.html.erb:1",
-      resource_gid: @post.to_gid.to_s,
-      user_gid: @user.to_gid.to_s
-    ).digest
-
-    digest2 = Cubism::BlockContainer.new(
-      block_location: "#{template_tmp_path(template)}.html.erb:1",
-      resource_gid: @post.to_gid.to_s,
-      user_gid: users(:two).to_gid.to_s
-    ).digest
-
-    refute_equal digest1, digest2
-  end
-
-  test "block container digest changes when resource changes" do
-    template = "fixtures/_cubicle_partial"
-
-    digest1 = Cubism::BlockContainer.new(
-      block_location: "#{template_tmp_path(template)}.html.erb:1",
-      resource_gid: @post.to_gid.to_s,
-      user_gid: @user.to_gid.to_s
-    ).digest
-
-    digest2 = Cubism::BlockContainer.new(
-      block_location: "#{template_tmp_path(template)}.html.erb:1",
-      resource_gid: posts(:two).to_gid.to_s,
-      user_gid: @user.to_gid.to_s
-    ).digest
-
-    refute_equal digest1, digest2
-  end
-
-  test "block container digest changes when block_location changes" do
-    template = "fixtures/_cubicle_partial"
-
-    digest1 = Cubism::BlockContainer.new(
-      block_location: "#{template_tmp_path(template)}.html.erb:1",
-      resource_gid: @post.to_gid.to_s,
-      user_gid: @user.to_gid.to_s
-    ).digest
-
-    digest2 = Cubism::BlockContainer.new(
-      block_location: "#{template_tmp_path(template)}.html.erb:2",
-      resource_gid: @post.to_gid.to_s,
-      user_gid: @user.to_gid.to_s
-    ).digest
-
-    refute_equal digest1, digest2
-  end
-
-  private
-
-  def template_tmp_path(template)
-    Pathname.new(@tmp_dir).join(template).to_path
-  end
-
-  def change_template(template)
-    File.write("#{template}.html.erb", "\nTHIS WAS CHANGED!")
-  end
-end

data/test/block_source_test.rb

@@ -1,102 +0,0 @@
-require "test_helper"
-
-class BlockSourceTest < ActionView::TestCase
-  FIXTURES_DIR = File.expand_path("./fixtures", __dir__)
-
-  setup do
-    @cwd = Dir.pwd
-    @tmp_dir = Dir.mktmpdir
-
-    FileUtils.cp_r FIXTURES_DIR, @tmp_dir
-    Dir.chdir @tmp_dir
-
-    @post = posts(:one)
-    @user = users(:one)
-  end
-
-  teardown do
-    Dir.chdir @cwd
-    FileUtils.rm_r @tmp_dir
-  end
-
-  test "block source digest changes when file contents change" do
-    template = "fixtures/_cubicle_partial"
-
-    digest1 = Cubism::BlockSource.new(
-      location: "#{template_tmp_path(template)}.html.erb:1",
-      view_context: self
-    ).digest
-
-    change_template(template)
-
-    digest2 = Cubism::BlockSource.new(
-      location: "#{template_tmp_path(template)}.html.erb:1",
-      view_context: self
-    ).digest
-
-    refute_equal digest1, digest2
-  end
-
-  test "block source digest changes when block_location changes" do
-    template = "fixtures/_cubicle_partial"
-
-    digest1 = Cubism::BlockSource.new(
-      location: "#{template_tmp_path(template)}.html.erb:1",
-      view_context: self
-    ).digest
-
-    digest2 = Cubism::BlockSource.new(
-      location: "#{template_tmp_path(template)}.html.erb:2",
-      view_context: self
-    ).digest
-
-    refute_equal digest1, digest2
-  end
-
-  test "can be created in the store by source location" do
-    template = "fixtures/_cubicle_partial"
-
-    assert_equal 0, Cubism.source_store.size
-
-    Cubism::BlockSource.any_instance.expects(:parse!).once
-
-    Cubism::BlockSource.find_or_create(
-      location: "#{template_tmp_path(template)}.html.erb:1",
-      view_context: self
-    )
-
-    assert_equal 1, Cubism.source_store.size
-  end
-
-  test "existing block source is returned and not parsed" do
-    template = "fixtures/_cubicle_partial"
-
-    instance = Cubism::BlockSource.new(
-      location: "#{template_tmp_path(template)}.html.erb:1",
-      view_context: self
-    )
-
-    Cubism.source_store[instance.digest] = instance
-
-    assert_equal 1, Cubism.source_store.size
-
-    Cubism::BlockSource.any_instance.expects(:parse!).never
-
-    Cubism::BlockSource.find_or_create(
-      location: "#{template_tmp_path(template)}.html.erb:1",
-      view_context: self
-    )
-
-    assert_equal 1, Cubism.source_store.size
-  end
-
-  private
-
-  def template_tmp_path(template)
-    Pathname.new(@tmp_dir).join(template).to_path
-  end
-
-  def change_template(template)
-    File.write("#{template}.html.erb", "\nTHIS WAS CHANGED!")
-  end
-end

data/test/broadcaster_test.rb

@@ -1,66 +0,0 @@
-require "test_helper"
-
-class BroadcasterTest < ActionView::TestCase
-  include CableReady::StreamIdentifier
-
-  setup do
-    @post = posts(:one)
-    @post.stubs(:cubicle_element_ids).returns(%w[foo bar])
-    @post.stubs(:present_users_for_element_id_and_scope).with("foo", "").returns([users(:one)])
-    @post.stubs(:present_users_for_element_id_and_scope).with("bar", "").returns([users(:two)])
-
-    @post_2 = posts(:two)
-    @post_2.stubs(:cubicle_element_ids).returns(%w[baz])
-    @post_2.stubs(:present_users_for_element_id_and_scope).with("baz", :edit).returns([users(:one)])
-    @post_2.stubs(:present_users_for_element_id_and_scope).with("baz", :show).returns([])
-
-    block_source_foo = Cubism::BlockSource.new(location: "test:1", variable_name: "users", source: "<div><%= users.map(&:username).to_sentence %></div>", view_context: self)
-    block_source_bar = Cubism::BlockSource.new(location: "test:1", variable_name: "present_users", source: "<div><%= present_users.map(&:username).to_sentence %></div>", view_context: self)
-
-    Cubism.stubs(:block_store).returns({
-      "foo" => Cubism::BlockContainer.new(block_location: "test:1", block_source: block_source_foo, user_gid: users(:one).to_gid.to_s, resource_gid: posts(:one).to_gid.to_s),
-      "bar" => Cubism::BlockContainer.new(block_location: "test:1", block_source: block_source_bar, user_gid: users(:two).to_gid.to_s, resource_gid: posts(:one).to_gid.to_s),
-      "baz" => Cubism::BlockContainer.new(block_location: "test:1", block_source: block_source_foo, user_gid: users(:one).to_gid.to_s, resource_gid: posts(:two).to_gid.to_s, scope: :edit)
-    })
-  end
-
-  test "it broadcasts to all registered element ids with default scopes" do
-    with_mocked_cable_ready({"foo" => {"" => users(:one)}, "bar" => {"" => users(:two)}}, @post) do |cable_ready_mock|
-      @broadcaster = Cubism::Broadcaster.new(resource: @post)
-
-      @broadcaster.expects(:cable_ready).returns(cable_ready_mock).times(3)
-
-      @broadcaster.broadcast
-    end
-  end
-
-  test "it broadcasts to all registered element ids and respects scopes" do
-    with_mocked_cable_ready({"baz" => {"edit" => users(:one)}}, @post_2) do |cable_ready_mock|
-      @broadcaster = Cubism::Broadcaster.new(resource: @post_2)
-
-      @broadcaster.expects(:cable_ready).returns(cable_ready_mock).twice
-
-      @broadcaster.broadcast
-    end
-  end
-end
-
-def with_mocked_cable_ready(elements_with_users_and_scopes, resource)
-  cable_ready_mock = mock
-  cable_ready_mock.expects(:broadcast).once
-
-  elements_with_users_and_scopes.each do |element_id, scoped_users|
-    cable_ready_channel = mock
-    scoped_users.each do |scope, user|
-      cable_ready_channel
-        .expects(:inner_html)
-        .with({
-          selector: "cubicle-element#cubicle-#{element_id}[identifier='#{signed_stream_identifier(resource.to_global_id.to_s)}']",
-          html: "<div>#{user.username}</div>"
-        })
-    end
-    cable_ready_mock.expects(:[]).with(element_id).returns(cable_ready_channel)
-  end
-
-  yield cable_ready_mock
-end

data/test/channels/cubism/presence_channel_test.rb

@@ -1,72 +0,0 @@
-require "test_helper"
-
-class Cubism::PresenceChannelTest < ActionCable::Channel::TestCase
-  include CableReady::StreamIdentifier
-
-  setup do
-    @post = posts(:one)
-    @user = users(:one)
-
-    Post.any_instance.stubs(:cubicle_element_ids).returns([])
-    Post.any_instance.stubs(:excluded_user_id_for_element_id).returns({})
-    Post.any_instance.stubs(:present_users).returns({})
-
-    Cubism.stubs(:block_store).returns({
-      "foo" => Cubism::BlockContainer.new(block_location: "test:1", user_gid: @user.to_gid.to_s, resource_gid: @post.to_gid.to_s, scope: ""),
-      "bar" => Cubism::BlockContainer.new(block_location: "test:1", user_gid: @user.to_gid.to_s, resource_gid: @post.to_gid.to_s, scope: "edit")
-    })
-  end
-
-  test "rejects a subscription for invalid identifiers" do
-    subscribe identifier: "foo", element_id: "cubicle-bar"
-
-    assert subscription.rejected?
-  end
-
-  test "confirms a subscription for valid identifiers" do
-    subscribe identifier: signed_stream_identifier(@post.to_gid.to_s), element_id: "cubicle-bar"
-
-    assert subscription.confirmed?
-
-    assert_has_stream "bar"
-    assert_equal 1, @post.cubicle_element_ids.size
-  end
-
-  test "adds user_id to the excluded users hash if the exclude_current_user param is passed" do
-    subscribe identifier: signed_stream_identifier(@post.to_gid.to_s), element_id: "cubicle-bar", exclude_current_user: true
-
-    assert_equal({"bar" => @user.id}, @post.excluded_user_id_for_element_id)
-  end
-
-  test "adds a user to the present users list when appear is called" do
-    subscribe identifier: signed_stream_identifier(@post.to_gid.to_s), element_id: "cubicle-foo"
-    perform :appear
-
-    assert_equal [@user.id], @post.present_users_for_scope("").to_a
-  end
-
-  test "adds a user to a scope in the present users list when appear is called with a scope parameter" do
-    assert_equal [], @post.present_users_for_scope("edit").to_a
-    assert_equal [], @post.present_users_for_scope("show").to_a
-
-    subscribe identifier: signed_stream_identifier(@post.to_gid.to_s), element_id: "cubicle-bar", scope: "edit"
-    perform :appear
-
-    subscribe identifier: signed_stream_identifier(@post.to_gid.to_s), element_id: "bar", scope: "show"
-
-    assert_equal [@user.id], @post.present_users_for_scope("edit").to_a
-    assert_equal [], @post.present_users_for_scope("show").to_a
-  end
-
-  test "removes a user from the present users list when disappear is called" do
-    subscribe identifier: signed_stream_identifier(@post.to_gid.to_s), element_id: "cubicle-foo"
-
-    perform :appear
-
-    assert_equal [@user.id], @post.present_users_for_scope("").to_a
-
-    perform :disappear
-
-    assert_equal [], @post.present_users_for_scope("").to_a
-  end
-end

data/test/cubicle_store_test.rb

@@ -1,34 +0,0 @@
-require "test_helper"
-
-class CubicleStoreTest < ActiveSupport::TestCase
-  setup do
-    @store = Cubism::CubicleStore.new("cubism-test")
-  end
-
-  test "empty value just retrieves the key" do
-    @store["foo"] = "bar"
-
-    value = @store.fetch("foo")
-
-    refute_nil @store["foo"]
-    assert_equal "bar", value
-  end
-
-  test "fetch assigns value to empty key" do
-    assert_nil @store["foo"]
-
-    value = @store.fetch("foo", "bar")
-
-    refute_nil @store["foo"]
-    assert_equal "bar", value
-  end
-
-  test "fetch retrieves value for existing key, and does not overwrite it" do
-    @store["foo"] = "baz"
-
-    value = @store.fetch("foo", "bar")
-
-    refute_nil @store["foo"]
-    assert_equal "baz", value
-  end
-end

data/test/cubism_test.rb

@@ -1,7 +0,0 @@
-require "test_helper"
-
-class CubismTest < ActiveSupport::TestCase
-  test "it has a version number" do
-    assert Cubism::VERSION
-  end
-end

data/test/dummy/app/channels/application_cable/channel.rb

@@ -1,4 +0,0 @@
-module ApplicationCable
-  class Channel < ActionCable::Channel::Base
-  end
-end

data/test/dummy/app/channels/application_cable/connection.rb

@@ -1,4 +0,0 @@
-module ApplicationCable
-  class Connection < ActionCable::Connection::Base
-  end
-end

data/test/dummy/app/controllers/application_controller.rb

@@ -1,2 +0,0 @@
-class ApplicationController < ActionController::Base
-end

data/test/dummy/app/helpers/application_helper.rb

@@ -1,2 +0,0 @@
-module ApplicationHelper
-end

data/test/dummy/app/jobs/application_job.rb

@@ -1,7 +0,0 @@
-class ApplicationJob < ActiveJob::Base
-  # Automatically retry jobs that encountered a deadlock
-  # retry_on ActiveRecord::Deadlocked
-
-  # Most jobs are safe to ignore if the underlying records are no longer available
-  # discard_on ActiveJob::DeserializationError
-end

data/test/dummy/app/mailers/application_mailer.rb

@@ -1,4 +0,0 @@
-class ApplicationMailer < ActionMailer::Base
-  default from: "from@example.com"
-  layout "mailer"
-end

data/test/dummy/app/models/application_record.rb

@@ -1,3 +0,0 @@
-class ApplicationRecord < ActiveRecord::Base
-  self.abstract_class = true
-end

data/test/dummy/app/models/post.rb

@@ -1,3 +0,0 @@
-class Post < ApplicationRecord
-  include Cubism::Presence
-end

data/test/dummy/app/models/user.rb

@@ -1,3 +0,0 @@
-class User < ApplicationRecord
-  include Cubism::User
-end

data/test/dummy/config/application.rb

@@ -1,22 +0,0 @@
-require_relative "boot"
-
-require "rails/all"
-
-# Require the gems listed in Gemfile, including any gems
-# you've limited to :test, :development, or :production.
-Bundler.require(*Rails.groups)
-require "cubism"
-
-module Dummy
-  class Application < Rails::Application
-    config.load_defaults Rails::VERSION::STRING.to_f
-
-    # Configuration for the application, engines, and railties goes here.
-    #
-    # These settings can be overridden in specific environments using the files
-    # in config/environments, which are processed later.
-    #
-    # config.time_zone = "Central Time (US & Canada)"
-    # config.eager_load_paths << Rails.root.join("extras")
-  end
-end

data/test/dummy/config/boot.rb

@@ -1,5 +0,0 @@
-# Set up gems listed in the Gemfile.
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../Gemfile", __dir__)
-
-require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
-$LOAD_PATH.unshift File.expand_path("../../../lib", __dir__)

data/test/dummy/config/environment.rb

@@ -1,5 +0,0 @@
-# Load the Rails application.
-require_relative "application"
-
-# Initialize the Rails application.
-Rails.application.initialize!