view_component 4.1.0 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 819e2fcc432b7272d23885e2ea361725b7eae87f4aeb216b2100500cadfd1ffc
-  data.tar.gz: 3958ff12852ee60b017ddeea924073bf7a787efe70d47929e692726fcd791adb
+  metadata.gz: 761d9451b4af2b617182339d3a356985d119be9ff490018815d9affd6ede89dc
+  data.tar.gz: 508b8e0699e11bbed4f649cebc9df0015e08e45b1cf92c1c528f13d566422c79
 SHA512:
-  metadata.gz: ef854e693634333b5843a3cfb13f02271775c05856af79e439335f6154b2be9b4781fd4fa0a931eaad7f928048e9232cbd764dffc87fd64ee1730ec3c3af169c
-  data.tar.gz: 15300b4f6d30eaa481210993b6ff17cdfb5647498af89a25d951a961bbc6fe48c400dff287574ccf51f0c742d8dc753fd7ae6b753fe278af67b29bb95e0c315d
+  metadata.gz: 4820e68ab750d1c89901c2244527e8896d42a270afb20d8add4c0437fab80d7f4623e9da3817baafda390d94c77c0d5e79959f95772fedc571b132565fcd8bca
+  data.tar.gz: 1a3118de2ce98910b40ba370b13618083c396565a7b2db128eea39de7263c2d17240865caf2f94c7e83ee9113537cd5d18f6b6c3c80e137d5f5e15f1f823ba17

data/docs/CHANGELOG.md

@@ -10,15 +10,131 @@ nav_order: 6
 
 ## main
 
+## 4.6.0
+
+* Add `view_identifier` to the `render.view_component` instrumentation event payload, containing the path to the component's template file (e.g. `app/components/my_component.html.erb`). For components using inline render methods, `view_identifier` will be `nil`.
+
+    *GitHub Copilot*
+
+* Replace deprecated `require_dependency` with `require` in preview loading.
+
+    *GitHub Copilot*
+
+* Return `html_safe` empty string from `render_in` when `render?` is false.
+
+    *Copilot*
+
+## 4.5.0
+
+* Fix initialization ordering issue causing missing asset errors in Sprockets.
+
+    *Cameron Dutro*
+
+## 4.4.0
+
+* Fix segfaults when Ruby coverage is enabled.
+
+    *George Holborn*, *Joel Hawksley*
+
+* Add `protocol` parameter to `with_request_url` test helper to enable testing with HTTPS protocol.
+
+    *Joel Hawksley*
+
+## 4.3.0
+
+* Fix load order issues for 3rd-party template handlers.
+
+    *Cameron Dutro*
+
+* Fix segfault when Ruby coverage is enabled with Rails 8.1 ERB templates.
+
+    *George Holborn*
+
+* Automatically merge dependabot PRs.
+
+    *Joel Hawksley*
+
+* Use Ruby 4.0.0 in CI and dev.
+
+    *Joel Hawksley*
+
+## 4.2.0
+
+* Fix translation scope resolution in deeply nested component blocks (3+ levels). Translations called inside deeply nested slot blocks using `renders_many`/`renders_one` were incorrectly resolving to an intermediate component's scope instead of the partial's scope where the block was defined. The fix captures the virtual path at block definition time and restores it during block execution, ensuring translations always resolve relative to where the block was created regardless of nesting depth.
+
+    *Nathaniel Watts*
+
+* Allow `render_inline` with Nokogiri::HTML5 to parse more arbitrary content including bare table content otherwise illegal fragments like `<td>`.
+
+    *Jonathan Rochkind*
+
+* Remove known issue from docs as ActiveScaffold is [now compatible](https://github.com/activescaffold/active_scaffold/pull/743) with ViewComponent.
+
+    *David Löwenfels*
+
+* Add test to document the current behavior for resolving relative translation keys within partial blocks. When rendering a partial, relative translation keys are resolved relative to the partial's own path rather than the caller’s path. This test ensures that this behavior remains consistent.
+
+    *Oussama Hilal*
+
+* Allow I18n calls in `render?`.
+
+    *23tux*
+
+* ViewComponent now works without `rails` and `railties` gems loaded, enabling compatibility with Bridgetown 2.0.
+
+    *Tom Lord*
+
+* Capture partial block in the component's context, allowing access to the component instance inside the block.
+
+    *23tux*
+
+* Add `after_compile` class method hook to enable extensions to run logic after component compilation.
+
+    *Jose Solás*
+
+* Fix outdated reference to preview layout configuration in docs.
+
+    *Lucas Geron*
+
+* Allow ruby-head CI job to fail without failing workflow.
+
+    *Hakan Ensari*
+
+* Fix bug where error line numbers were incorrect in Rails 8.1.
+
+    *Joel Hawksley*
+
+* Remove `< 8.2` upper bound for `activesupport` and `actionview` dependencies.
+
+    *Hans Lemuet*
+
+* Test compatibility with Herb/ReActionView.
+
+    *Joel Hawksley*
+
+* Remove Who Uses ViewComponent section from docs.
+
+    *Joel Hawksley*
+
+## 4.1.1
+
+* Resolve deprecation warning for `ActiveSupport::Configurable`.
+
+    *Simon Fish*
+
+* Make `ViewComponent::VERSION` accessible to other gems by default.
+
+    *Hans Lemuet*
+
 ## 4.1.0
 
 * Add Rails 8.1 support.
 
     *Hans Lemuet*
 
-* Add Carwow to list of companies using ViewComponent.
+* Declare `actionview` as a `view_component` gem dependency.
 
-    *Tom Lord*
+    *Michal Cichra*
 
 ## 4.0.2
 
@@ -498,10 +614,6 @@ This release makes the following breaking changes:
 
     *Martin Meyerhoff*, *Joel Hawksley*
 
-* Add Content Harmony & Learn To Be to list of companies using ViewComponent.
-
-    *Kane Jamison*
-
 * Clarify error message about render-dependent logic.
 
   Error messages about render-dependent logic were sometimes inaccurate, saying `during initialization` despite also being raised after a component had been initialized but before it was rendered.
@@ -520,10 +632,6 @@ This release makes the following breaking changes:
 
     *Reegan Viljoen*
 
-* Add HomeStyler AI to list of companies using ViewComponent.
-
-    *JP Balarini*
-
 ## 3.21.0
 
 * Updates testing docs to include an example of how to use with RSpec.
@@ -534,10 +642,6 @@ This release makes the following breaking changes:
 
     *KAWAKAMI Moeki*
 
-* Add FreeATS to list of companies using ViewComponent.
-
-    *Ilia Liamshin*
-
 * Ensure HTML output safety wrapper is used for all inline templates.
 
     *Joel Hawksley*
@@ -588,10 +692,6 @@ This release makes the following breaking changes:
 
     *Blake Williams*
 
-* Add [Niva]([niva.co](https://www.niva.co/)) to companies who use `ViewComponent`.
-
-    *Daniel Vu Dao*
-
 * Fix `preview_paths` in docs.
 
     *Javier Aranda*
@@ -656,10 +756,6 @@ This release makes the following breaking changes:
 
     *Joel Hawksley*
 
-* Add Kicksite to list of companies using ViewComponent.
-
-    *Adil Lari*
-
 * Allow overridden slot methods to use `super`.
 
     *Andrew Schwartz*
@@ -899,10 +995,6 @@ This release makes the following breaking changes:
 
     *Simon Fish*
 
-* Add Simundia to list of companies using ViewComponent.
-
-    *Alexandre Ignjatovic*
-
 * Reduce UnboundMethod objects by memoizing initialize_parameters.
 
     *Rainer Borene*
@@ -953,10 +1045,6 @@ This release makes the following breaking changes:
 
     *milk1000cc*
 
-* Add PeopleForce to list of companies using ViewComponent.
-
-    *Volodymyr Khandiuk*
-
 ## 3.5.0
 
 * Add Skroutz to users list.
@@ -1031,14 +1119,6 @@ This release makes the following breaking changes:
 
     *Joel Hawksley*
 
-* Add Ophelos to list of companies using ViewComponent.
-
-    *Graham Rogers*
-
-* Add FlightLogger to list of companies using ViewComponent.
-
-    *Joseph Carpenter*
-
 * Fix coverage reports overwriting each other when running locally.
 
     *Jonathan del Strother*
@@ -1278,14 +1358,6 @@ Run into an issue with this release? [Let us know](https://github.com/ViewCompon
 
     *Graham Rogers*
 
-* Add Krystal to list of companies using ViewComponent.
-
-     *Matt Bearman*
-
-* Add Mon Ami to list of companies using ViewComponent.
-
-    *Ethan Lee-Tyson*
-
 ## 3.0.0.rc1
 
 1,000+ days and 100+ releases later, the 200+ contributors to ViewComponent are proud to ship v3.0.0!
@@ -1434,10 +1506,6 @@ Run into an issue with this release? [Let us know](https://github.com/ViewCompon
 
     *Hans Lemuet*
 
-* Add Startup Jobs to list of companies using ViewComponent.
-
-    *Marc Köhlbrugge*
-
 * Run PVC's accessibility tests in a single process to avoid resource contention in CI.
 
     *Cameron Dutro*
@@ -1478,10 +1546,6 @@ Run into an issue with this release? [Let us know](https://github.com/ViewCompon
 
 ## 2.74.0
 
-* Add Avo to list of companies using ViewComponent.
-
-    *Adrian Marin*
-
 * Promote experimental `_output_postamble` method to public API as `output_postamble`.
 
     *Joel Hawksley*
@@ -1508,10 +1572,6 @@ Run into an issue with this release? [Let us know](https://github.com/ViewCompon
 
     *Erinna Chen*
 
-* Add PrintReleaf to list of companies using ViewComponent.
-
-    *Ry Kulp*
-
 * Simplify CI configuration to a single build per Ruby/Rails version.
 
     *Joel Hawksley*
@@ -1520,10 +1580,6 @@ Run into an issue with this release? [Let us know](https://github.com/ViewCompon
 
     *Ruben Smit*
 
-* Add Yobbers to list of companies using ViewComponent.
-
-    *Anton Prins*
-
 ## 2.72.0
 
 * Deprecate support for Ruby < 2.7 for removal in v3.0.0.
@@ -1538,10 +1594,6 @@ Run into an issue with this release? [Let us know](https://github.com/ViewCompon
 
     *Joel Hawksley.
 
-* Add Aluuno to list of companies using ViewComponent.
-
-    *Daniel Naves de Carvalho*
-
 * Add `source_code_uri` to gemspec.
 
     *Yoshiyuki Hirano*
@@ -1576,22 +1628,10 @@ Run into an issue with this release? [Let us know](https://github.com/ViewCompon
 
     *Joel Hawksley*
 
-* Add Arrows to list of companies using ViewComponent.
-
-    *Matt Swanson*
-
-* Add WIP to list of companies using ViewComponent.
-
-    *Marc Köhlbrugge*
-
 * Update slots documentation to include how to reference slots.
 
     *Brittany Ellich*
 
-* Add Clio to list of companies using ViewComponent.
-
-    *Mike Buckley*
-
 ## 2.69.0
 
 * Add missing `require` to fix `pvc` build.
@@ -1709,10 +1749,6 @@ Run into an issue with this release? [Let us know](https://github.com/ViewCompon
 
     *Vikram Dighe*
 
-* Add HappyCo to list of companies using ViewComponent.
-
-    *Josh Clayton*
-
 * Add predicate method support to polymorphic slots.
 
     *Graham Rogers*
@@ -1823,10 +1859,6 @@ Run into an issue with this release? [Let us know](https://github.com/ViewCompon
 
     *Thomas Hutterer*
 
-* Add FreeAgent to list of companies using ViewComponent.
-
-    *Simon Fish*
-
 * Include polymorphic slots in `ViewComponent::Base` by default.
 
     *Cameron Dutro*
@@ -1882,18 +1914,6 @@ Run into an issue with this release? [Let us know](https://github.com/ViewCompon
 
     *Joel Hawksley*
 
-* Add G2 to list of companies that use ViewComponent.
-
-    *Jack Shuff*
-
-* Add Within3 to list of companies that use ViewComponent.
-
-    *Drew Bragg*
-
-* Add Mission Met to list of companies that use ViewComponent.
-
-    *Nick Smith*
-
 * Fix `#with_request_url` test helper not parsing nested query parameters into nested hashes.
 
     *Richard Marbach*
@@ -1933,10 +1953,6 @@ Run into an issue with this release? [Let us know](https://github.com/ViewCompon
 
     *Blake Williams*
 
-* Add QuickNode to list of companies that use ViewComponent.
-
-    *Luc Castera*
-
 * Include the `Translatable` module by default.
 
     *Elia Schito*
@@ -1967,10 +1983,6 @@ Run into an issue with this release? [Let us know](https://github.com/ViewCompon
 
     *Jason Swett*
 
-* Add Bearer to list of companies that use ViewComponent.
-
-    *Yaroslav Shmarov*
-
 * Add articles to resources page.
 
     *Joel Hawksley*
@@ -2000,10 +2012,6 @@ Run into an issue with this release? [Let us know](https://github.com/ViewCompon
 
     *Hans Lemuet*
 
-* Alphabetize companies using ViewComponent and add Brightline to the list.
-
-    *Jack Schuss*
-
 * Add CMYK value for ViewComponent Red color on logo page.
 
     *Dylan Smith*

data/lib/view_component/base.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "action_view"
-require "active_support/configurable"
+require "action_view/base"
 require "view_component/collection"
 require "view_component/compile_cache"
 require "view_component/compiler"
@@ -47,7 +47,7 @@ module ViewComponent
     end
 
     include ActionView::Helpers
-    include Rails.application.routes.url_helpers if defined?(Rails) && Rails.application
+    include Rails.application.routes.url_helpers if defined?(Rails.application.routes)
     include ERB::Escape
     include ActiveSupport::CoreExt::ERBUtil
 
@@ -132,6 +132,7 @@ module ViewComponent
 
       @__vc_content_evaluated = false
       @__vc_render_in_block = block
+      @view_context.instance_variable_set(:@virtual_path, virtual_path)
 
       before_render
 
@@ -139,8 +140,6 @@ module ViewComponent
         value = nil
 
         @output_buffer.with_buffer do
-          @view_context.instance_variable_set(:@virtual_path, virtual_path)
-
           rendered_template =
             around_render do
               render_template_for(@__vc_requested_details).to_s
@@ -161,7 +160,7 @@ module ViewComponent
 
         value
       else
-        ""
+        "".html_safe
       end
     ensure
       view_context.instance_variable_set(:@virtual_path, @old_virtual_path)
@@ -261,6 +260,9 @@ module ViewComponent
         @view_context.render(options, args, &block)
       elsif block
         __vc_original_view_context.render(options, args) do
+          # capture the block output in the view context of the component
+          output = capture(&block)
+
           # Partials are rendered to their own buffer and do not append to the
           # original @output_buffer we retain a reference to in #render_in. This
           # is a problem since the block passed to us here in the #render method
@@ -268,7 +270,7 @@ module ViewComponent
           # appends to the original @output_buffer. To avoid this, we evaluate the
           # block in the view context instead, which will append to the output buffer
           # created for the partial.
-          __vc_original_view_context.instance_exec(&block)
+          __vc_original_view_context.capture { output }
         end
       else
         __vc_original_view_context.render(options, args)
@@ -302,7 +304,7 @@ module ViewComponent
       @__vc_helpers ||= __vc_original_view_context || controller.view_context
     end
 
-    if ::Rails.env.development? || ::Rails.env.test?
+    if defined?(Rails.env) && (::Rails.env.development? || ::Rails.env.test?)
       # @private
       def method_missing(method_name, *args) # rubocop:disable Style/MissingRespondToMissing
         super
@@ -331,7 +333,7 @@ module ViewComponent
       []
     end
 
-    if Rails::VERSION::MAJOR == 7 && Rails::VERSION::MINOR == 1
+    if defined?(Rails::VERSION) && Rails::VERSION::MAJOR == 7 && Rails::VERSION::MINOR == 1
       # Rails expects us to define `format` on all renderables,
       # but we do not know the `format` of a ViewComponent until runtime.
       def format
@@ -362,7 +364,7 @@ module ViewComponent
 
       @__vc_content =
         if __vc_render_in_block_provided?
-          with_original_virtual_path do
+          with_captured_virtual_path(@old_virtual_path) do
             view_context.capture(self, &@__vc_render_in_block)
           end
         elsif __vc_content_set_by_with_content_defined?
@@ -378,11 +380,14 @@ module ViewComponent
     end
 
     # @private
-    def with_original_virtual_path
-      @view_context.instance_variable_set(:@virtual_path, @old_virtual_path)
+    # Temporarily sets the virtual path to the captured value, then restores it.
+    # This ensures translations and other path-dependent code execute with the correct scope.
+    def with_captured_virtual_path(captured_path)
+      old_virtual_path = @view_context.instance_variable_get(:@virtual_path)
+      @view_context.instance_variable_set(:@virtual_path, captured_path)
       yield
     ensure
-      @view_context.instance_variable_set(:@virtual_path, virtual_path)
+      @view_context.instance_variable_set(:@virtual_path, old_virtual_path)
     end
 
     private
@@ -573,7 +578,7 @@ module ViewComponent
         # eager loading is disabled and the parent component is rendered before the child. In
         # such a scenario, the parent will override ViewComponent::Base#render_template_for,
         # meaning it will not be called for any children and thus not compile their templates.
-        if !child.instance_methods(false).include?(:render_template_for) && !child.__vc_compiled?
+        if !child.method_defined?(:render_template_for, false) && !child.__vc_compiled?
           child.class_eval <<~RUBY, __FILE__, __LINE__ + 1
             def render_template_for(requested_details)
               # Force compilation here so the compiler always redefines render_template_for.
@@ -596,7 +601,7 @@ module ViewComponent
         # Set collection parameter to the extended component
         child.with_collection_parameter(__vc_provided_collection_parameter)
 
-        if instance_methods(false).include?(:render_template_for)
+        if method_defined?(:render_template_for, false)
           vc_ancestor_calls = defined?(@__vc_ancestor_calls) ? @__vc_ancestor_calls.dup : []
 
           vc_ancestor_calls.unshift(instance_method(:render_template_for))
@@ -611,6 +616,16 @@ module ViewComponent
         __vc_compiler.compiled?
       end
 
+      # Hook called by the compiler after a component is compiled.
+      #
+      # Extensions can override this class method to run logic after
+      # compilation (e.g., generate helpers, register metadata, etc.).
+      #
+      # By default, this is a no-op.
+      def after_compile
+        # no-op by default
+      end
+
       # @private
       def __vc_ensure_compiled
         __vc_compile unless __vc_compiled?

data/lib/view_component/collection.rb

@@ -20,7 +20,7 @@ module ViewComponent
       components.each(&block)
     end
 
-    if Rails::VERSION::MAJOR == 7 && Rails::VERSION::MINOR == 1
+    if defined?(Rails::VERSION) && Rails::VERSION::MAJOR == 7 && Rails::VERSION::MINOR == 1
       # Rails expects us to define `format` on all renderables,
       # but we do not know the `format` of a ViewComponent until runtime.
       def format

data/lib/view_component/compiler.rb

@@ -52,6 +52,8 @@ module ViewComponent
         @component.__vc_build_i18n_backend
 
         CompileCache.register(@component)
+
+        @component.after_compile
       end
     end
 
@@ -113,11 +115,11 @@ module ViewComponent
           .tally
           .select { |_, count| count > 1 }
           .each do |tally|
-          variant, this_format = tally.first
+            variant, this_format = tally.first
 
-          variant_string = " for variant `#{variant}`" if variant.present?
+            variant_string = " for variant `#{variant}`" if variant.present?
 
-          errors << "More than one #{this_format.upcase} template found#{variant_string} for #{@component}. "
+            errors << "More than one #{this_format.upcase} template found#{variant_string} for #{@component}. "
         end
 
         default_template_types = @templates.each_with_object(Set.new) do |template, memo|
@@ -188,11 +190,11 @@ module ViewComponent
           ).flat_map { |ancestor| ancestor.instance_methods(false).grep(/^call(_|$)/) }
             .uniq
             .each do |method_name|
-            templates << Template::InlineCall.new(
-              component: @component,
-              method_name: method_name,
-              defined_on_self: component_instance_methods_on_self.include?(method_name)
-            )
+              templates << Template::InlineCall.new(
+                component: @component,
+                method_name: method_name,
+                defined_on_self: component_instance_methods_on_self.include?(method_name)
+              )
           end
 
           templates

data/lib/view_component/config.rb

@@ -163,7 +163,7 @@ module ViewComponent
         options = ActiveSupport::OrderedOptions.new
         options.controller = "ViewComponentsController"
         options.route = "/rails/view_components"
-        options.enabled = Rails.env.development? || Rails.env.test?
+        options.enabled = defined?(Rails.env) && (Rails.env.development? || Rails.env.test?)
         options.default_layout = nil
         options.paths = default_preview_paths
         options

data/lib/view_component/configurable.rb

@@ -4,14 +4,30 @@ module ViewComponent
   module Configurable
     extend ActiveSupport::Concern
 
+    class_methods do
+      def config
+        @_config ||= if respond_to?(:superclass) && superclass.respond_to?(:config)
+          superclass.config.inheritable_copy
+        else
+          ActiveSupport::OrderedOptions.new
+        end
+      end
+
+      def configure
+        yield config
+      end
+    end
+
     included do
       next if respond_to?(:config) && config.respond_to?(:view_component) && config.respond_to_missing?(:instrumentation_enabled)
 
-      include ActiveSupport::Configurable
-
       configure do |config|
         config.view_component ||= ActiveSupport::InheritableOptions.new
       end
+
+      def config
+        self.class.config
+      end
     end
   end
 end

data/lib/view_component/engine.rb

@@ -50,11 +50,13 @@ module ViewComponent
       end
     end
 
-    config.after_initialize do |app|
+    config.after_routes_loaded do
       ActiveSupport.on_load(:view_component) do
         if defined?(Sprockets::Rails)
           include Sprockets::Rails::Helper
 
+          app = Rails.application
+
           # Copy relevant config to VC context
           # See: https://github.com/rails/sprockets-rails/blob/266ec49f3c7c96018dd75f9dc4f9b62fe3f7eecf/lib/sprockets/railtie.rb#L245
           self.debug_assets = app.config.assets.debug

data/lib/view_component/instrumentation.rb

@@ -11,15 +11,28 @@ module ViewComponent # :nodoc:
     def render_in(view_context, &block)
       return super if !Rails.application.config.view_component.instrumentation_enabled.present?
 
+      payload = {
+        name: self.class.name,
+        identifier: self.class.identifier,
+        view_identifier: nil
+      }
+
       ActiveSupport::Notifications.instrument(
         "render.view_component",
-        {
-          name: self.class.name,
-          identifier: self.class.identifier
-        }
+        payload
       ) do
-        super
+        result = super
+        payload[:view_identifier] = @__vc_instrumentation_view_identifier
+        result
       end
+    ensure
+      @__vc_instrumentation_view_identifier = nil
+    end
+
+    def around_render
+      result = super
+      @__vc_instrumentation_view_identifier = current_template&.path
+      result
     end
   end
 end

data/lib/view_component/preview.rb

@@ -95,7 +95,7 @@ module ViewComponent # :nodoc:
       # @private
       def __vc_load_previews
         Array(preview_paths).each do |preview_path|
-          Dir["#{preview_path}/**/*preview.rb"].sort.each { |file| require_dependency file }
+          Dir["#{preview_path}/**/*preview.rb"].sort.each { |file| require file }
         end
       end
 

data/lib/view_component/slot.rb

@@ -6,7 +6,7 @@ module ViewComponent
   class Slot
     include ViewComponent::WithContentHelper
 
-    attr_writer :__vc_component_instance, :__vc_content_block, :__vc_content
+    attr_writer :__vc_component_instance, :__vc_content_block, :__vc_content, :__vc_content_block_virtual_path
 
     def initialize(parent)
       @parent = parent
@@ -58,7 +58,7 @@ module ViewComponent
           if defined?(@__vc_content_block)
             # render_in is faster than `parent.render`
             @__vc_component_instance.render_in(view_context) do |*args|
-              @parent.with_original_virtual_path do
+              @parent.with_captured_virtual_path(@__vc_content_block_virtual_path) do
                 @__vc_content_block.call(*args)
               end
             end
@@ -68,7 +68,7 @@ module ViewComponent
         elsif defined?(@__vc_content)
           @__vc_content
         elsif defined?(@__vc_content_block)
-          @parent.with_original_virtual_path do
+          @parent.with_captured_virtual_path(@__vc_content_block_virtual_path) do
             view_context.capture(&@__vc_content_block)
           end
         elsif defined?(@__vc_content_set_by_with_content)

data/lib/view_component/slotable.rb

@@ -259,7 +259,7 @@ module ViewComponent
 
           setter_method_name = :"with_#{poly_slot_name}"
 
-          if instance_methods.include?(setter_method_name)
+          if method_defined?(setter_method_name)
             raise AlreadyDefinedPolymorphicSlotSetterError.new(setter_method_name, poly_slot_name)
           end
 
@@ -390,7 +390,12 @@ module ViewComponent
       # 2. Since we have to pass block content to components when calling
       # `render`, evaluating the block here would require us to call
       # `view_context.capture` twice, which is slower
-      slot.__vc_content_block = block if block
+      if block
+        slot.__vc_content_block = block
+        # Capture the virtual path at the time the block is defined, so that
+        # translations resolve relative to where the block was created, not where it's rendered
+        slot.__vc_content_block_virtual_path = view_context.instance_variable_get(:@virtual_path)
+      end
 
       # If class
       if slot_definition[:renderable]
@@ -408,7 +413,9 @@ module ViewComponent
         renderable_value =
           if block
             renderable_function.call(*args, **kwargs) do |*rargs|
-              view_context.capture(*rargs, &block)
+              with_captured_virtual_path(@old_virtual_path) do
+                view_context.capture(*rargs, &block)
+              end
             end
           else
             renderable_function.call(*args, **kwargs)

data/lib/view_component/template.rb

@@ -21,11 +21,32 @@ module ViewComponent
 
     class File < Template
       def initialize(component:, details:, path:)
+        @strip_annotation_line = false
+
+        # Rails 8.1 added a newline to compiled ERB output (rails/rails#53731).
+        # Use -1 to compensate for correct line numbers in stack traces.
+        # However, negative line numbers cause segfaults when Ruby's coverage
+        # is enabled (bugs.ruby-lang.org/issues/19363). In that case, strip the
+        # annotation line from compiled source instead.
+        lineno =
+          if Rails::VERSION::MAJOR >= 8 && Rails::VERSION::MINOR > 0 && details.handler == :erb
+            if coverage_running?
+              # Can't use negative lineno with coverage (causes segfault on Linux).
+              # Strip annotation line if enabled to preserve correct line numbers.
+              @strip_annotation_line = ActionView::Base.annotate_rendered_view_with_filenames
+              0
+            else
+              -1
+            end
+          else
+            0
+          end
+
         super(
           component: component,
           details: details,
           path: path,
-          lineno: 0
+          lineno: lineno
         )
       end
 
@@ -37,6 +58,16 @@ module ViewComponent
       def source
         ::File.read(@path)
       end
+
+      private
+
+      def compiled_source
+        result = super
+        # Strip the annotation line to maintain correct line numbers when coverage
+        # is running (avoids segfault from negative lineno)
+        result = result.partition(";").last if @strip_annotation_line
+        result
+      end
     end
 
     class Inline < Template
@@ -45,11 +76,22 @@ module ViewComponent
       def initialize(component:, inline_template:)
         details = ActionView::TemplateDetails.new(nil, inline_template.language.to_sym, nil, nil)
 
+        # Rails 8.1 added a newline to compiled ERB output (rails/rails#53731).
+        # Subtract 1 to compensate for correct line numbers in stack traces.
+        # Inline templates start at line 2+ (defined inside a class), so this
+        # won't result in negative line numbers that cause segfaults with coverage.
+        lineno =
+          if Rails::VERSION::MAJOR >= 8 && Rails::VERSION::MINOR > 0 && details.handler == :erb
+            inline_template.lineno - 1
+          else
+            inline_template.lineno
+          end
+
         super(
           component: component,
           details: details,
           path: inline_template.path,
-          lineno: inline_template.lineno,
+          lineno: lineno,
         )
 
         @source = inline_template.source.dup
@@ -108,6 +150,10 @@ module ViewComponent
       @component.define_method(safe_method_name, @component.instance_method(@call_method_name))
     end
 
+    def coverage_running?
+      defined?(Coverage) && Coverage.running?
+    end
+
     def safe_method_name_call
       m = safe_method_name
       proc { send(m) }

data/lib/view_component/test_helpers.rb

@@ -40,7 +40,7 @@ module ViewComponent
       @page = nil
       @rendered_content = vc_test_view_context.render(component, args, &block)
 
-      fragment = Nokogiri::HTML5.fragment(@rendered_content)
+      fragment = Nokogiri::HTML5.fragment(@rendered_content, context: "template")
       @vc_test_view_context = nil
       fragment
     end
@@ -196,10 +196,19 @@ module ViewComponent
     # end
     # ```
     #
+    # To specify a protocol, pass the protocol param:
+    #
+    # ```ruby
+    # with_request_url("/users/42", protocol: :https) do
+    #   render_inline(MyComponent.new)
+    # end
+    # ```
+    #
     # @param full_path [String] The path to set for the current request.
     # @param host [String] The host to set for the current request.
     # @param method [String] The request method to set for the current request.
-    def with_request_url(full_path, host: nil, method: nil)
+    # @param protocol [Symbol] The protocol to set for the current request (e.g., `:http` or `:https`).
+    def with_request_url(full_path, host: nil, method: nil, protocol: nil)
       old_request_host = vc_test_request.host
       old_request_method = vc_test_request.request_method
       old_request_path_info = vc_test_request.path_info
@@ -207,6 +216,7 @@ module ViewComponent
       old_request_query_parameters = vc_test_request.query_parameters
       old_request_query_string = vc_test_request.query_string
       old_request_format = vc_test_request.format.symbol
+      old_request_scheme = vc_test_request.scheme
       old_controller = defined?(@vc_test_controller) && @vc_test_controller
 
       path, query = full_path.split("?", 2)
@@ -214,6 +224,7 @@ module ViewComponent
       vc_test_request.instance_variable_set(:@original_fullpath, full_path)
       vc_test_request.host = host if host
       vc_test_request.request_method = method if method
+      vc_test_request.set_header(Rack::RACK_URL_SCHEME, protocol.to_s) if protocol
       vc_test_request.path_info = path
       vc_test_request.path_parameters = Rails.application.routes.recognize_path_with_request(vc_test_request, path, {})
       vc_test_request.set_header("action_dispatch.request.query_parameters",
@@ -223,6 +234,7 @@ module ViewComponent
     ensure
       vc_test_request.host = old_request_host
       vc_test_request.request_method = old_request_method
+      vc_test_request.set_header(Rack::RACK_URL_SCHEME, old_request_scheme)
       vc_test_request.path_info = old_request_path_info
       vc_test_request.path_parameters = old_request_path_parameters
       vc_test_request.set_header("action_dispatch.request.query_parameters", old_request_query_parameters)

data/lib/view_component/version.rb

@@ -3,7 +3,7 @@
 module ViewComponent
   module VERSION
     MAJOR = 4
-    MINOR = 1
+    MINOR = 6
     PATCH = 0
     PRE = nil
 

data/lib/view_component.rb

@@ -2,6 +2,7 @@
 
 require "action_view"
 require "active_support/dependencies/autoload"
+require "view_component/version"
 
 module ViewComponent
   extend ActiveSupport::Autoload
@@ -16,7 +17,7 @@ module ViewComponent
   autoload :Preview
   autoload :Translatable
 
-  if Rails.env.test?
+  if defined?(Rails.env) && Rails.env.test?
     autoload :TestHelpers
     autoload :SystemSpecHelpers
     autoload :SystemTestHelpers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: view_component
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.6.0
 platform: ruby
 authors:
 - ViewComponent Team
@@ -16,9 +16,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,9 +23,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.1.0
-    - - "<"
+- !ruby/object:Gem::Dependency
+  name: actionview
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '8.2'
+        version: 7.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.6
 specification_version: 4
 summary: A framework for building reusable, testable & encapsulated view components
   in Ruby on Rails.