Merge branch 'main' into v4

Author: joelhawksley

.tool-versions

@@ -1 +1 @@
-ruby 3.4.1
+ruby 3.4.2

Gemfile.lock

@@ -88,7 +88,7 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
-    ast (2.4.2)
+    ast (2.4.3)
     base64 (0.2.0)
     benchmark (0.4.0)
     benchmark-ips (2.14.0)
@@ -168,7 +168,6 @@ GEM
     matrix (0.4.2)
     method_source (1.1.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.8)
     minitest (5.25.5)
     net-imap (0.5.6)
       date
@@ -180,8 +179,21 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.18.3)
-      mini_portile2 (~> 2.8.2)
+    nokogiri (1.18.5-aarch64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.5-aarch64-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.5-arm-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.5-arm-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.5-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.5-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.5-x86_64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.5-x86_64-linux-musl)
       racc (~> 1.4)
     parallel (1.26.3)
     parser (3.3.7.1)
@@ -279,7 +291,7 @@ GEM
       rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.38.1)
+    rubocop-ast (1.40.0)
       parser (>= 3.3.1.0)
     rubocop-md (2.0.0)
       lint_roller (~> 1.1)
@@ -362,7 +374,14 @@ GEM
     zeitwerk (2.7.2)
 
 PLATFORMS
-  ruby
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
   allocation_stats
@@ -397,7 +416,7 @@ DEPENDENCIES
   yard-activesupport-concern (< 1)
 
 RUBY VERSION
-   ruby 3.4.1p0
+   ruby 3.4.2p28
 
 BUNDLED WITH
-   2.5.3
+   2.6.2

docs/CHANGELOG.md

@@ -72,6 +72,14 @@ nav_order: 5
 
     *Tiago Menegaz*, *Joel Hawksley*
 
+* Add unused mechanism for inheriting config from parent modules to enable future engine-local configuration.
+
+    *Simon Fish*
+
+* Improve handling of malformed component edge case when mocking components in tests.
+
+    *Martin Meyerhoff*, *Joel Hawksley*
+
 * Add Content Harmony & Learn To Be to list of companies using ViewComponent.
 
     *Kane Jamison*

docs/Gemfile.lock

@@ -218,7 +218,7 @@ GEM
       gemoji (>= 3, < 5)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0, < 5.0)
-    json (2.10.1)
+    json (2.10.2)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)

lib/view_component/base.rb

@@ -26,6 +26,10 @@ class << self
       #
       # @return [ActiveSupport::OrderedOptions]
       def config
+        module_parents.each do |m|
+          config = m.try(:config).try(:view_component)
+          return config if config
+        end
         ViewComponent::Config.current
       end
     end

lib/view_component/configurable.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module ViewComponent
+  module Configurable
+    extend ActiveSupport::Concern
+
+    included do
+      next if respond_to?(:config) && config.respond_to?(:view_component) && config.respond_to_missing?(:test_controller)
+
+      include ActiveSupport::Configurable
+
+      configure do |config|
+        config.view_component ||= ActiveSupport::InheritableOptions.new
+      end
+    end
+  end
+end

test/sandbox/test/base_test.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "test_helper"
+require "view_component/configurable"
 
 class ViewComponent::Base::UnitTest < Minitest::Test
   def test_identifier
@@ -145,4 +146,54 @@ def test_no_method_error_does_not_reference_missing_helper
     MESSAGE
     assert !exception_message_regex.match?(exception.message)
   end
+
+  module TestModuleWithoutConfig
+    class SomeComponent < ViewComponent::Base
+    end
+  end
+
+  # Config defined on top-level module as opposed to engine.
+  module TestModuleWithConfig
+    include ViewComponent::Configurable
+
+    configure do |config|
+      config.view_component.test_controller = "AnotherController"
+    end
+
+    class SomeComponent < ViewComponent::Base
+    end
+  end
+
+  module TestAlreadyConfigurableModule
+    include ActiveSupport::Configurable
+    include ViewComponent::Configurable
+
+    configure do |config|
+      config.view_component.test_controller = "AnotherController"
+    end
+
+    class SomeComponent < ViewComponent::Base
+    end
+  end
+
+  module TestAlreadyConfiguredModule
+    include ActiveSupport::Configurable
+
+    configure do |config|
+      config.view_component = ActiveSupport::InheritableOptions[test_controller: "AnotherController"]
+    end
+
+    include ViewComponent::Configurable
+
+    class SomeComponent < ViewComponent::Base
+    end
+  end
+
+  def test_uses_module_configuration
+    # We override this ourselves in test/sandbox/config/environments/test.rb.
+    assert_equal "IntegrationExamplesController", TestModuleWithoutConfig::SomeComponent.test_controller
+    assert_equal "AnotherController", TestModuleWithConfig::SomeComponent.test_controller
+    assert_equal "AnotherController", TestAlreadyConfigurableModule::SomeComponent.test_controller
+    assert_equal "AnotherController", TestAlreadyConfiguredModule::SomeComponent.test_controller
+  end
 end

test/sandbox/test/rendering_test.rb

@@ -16,8 +16,7 @@ def test_render_inline_allocations
     MyComponent.ensure_compiled
 
     allocations = (Rails.version.to_f >= 8.0) ?
-      {"3.5.0" => 73, "3.4.2" => 75, "3.3.7" => 76} :
-      {"3.3.7" => 75, "3.2.7" => 74}
+      {"3.5.0" => 73, "3.4.2" => 75, "3.3.7" => 76} : {"3.3.7" => 75, "3.2.7" => 74}
 
     assert_allocations(**allocations) do
       render_inline(MyComponent.new)
@@ -1254,4 +1253,19 @@ def test_turbo_stream_format_custom_variant
       end
     end
   end
+
+  # In https://github.com/ViewComponent/view_component/issues/2187,
+  # the Solidus test suite built mocked components by hand, resulting
+  # in a difficult-to-debug error. While this test case is quite narrow,
+  # it isolates the unintentional error masking we were doing.
+  def test_render_anonymous_component_without_template
+    location = caller(1, 1).first
+    mock_component = Class.new(MyComponent)
+    mock_component.define_singleton_method(:name) { "Foo" }
+    mock_component.define_singleton_method(:to_s) { "#{name} (#{location})" }
+
+    assert_nothing_raised do
+      render_inline(mock_component.new)
+    end
+  end
 end