view_component 4.9.0 → 4.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd12f6e6a2acbb991781956cb7677076cc652b7f90519649d6d5503073feb364
-  data.tar.gz: bd5b8a5ef52c8f88c718c534f75626a208cba7a77f2bbced2cf22fcde70a226d
+  metadata.gz: 13c7279c5aed2ac93503d70cfddae8b183b91c8a4ca0770a237d0b5aa081036c
+  data.tar.gz: 5fd930eb6b28a01da1152fd7d4a09e8019de0902f0508e4ea6aa0f23d6c584bd
 SHA512:
-  metadata.gz: d580739f741633eb2db4f16a45a21ad0b23118021383395fb4435ff63a381b2fb08b800a1acb2b997f7d6e7f6d28f654e55d6a14cd261944b8820787b988751c
-  data.tar.gz: 40592ea9f341b2cd8c11971028825e6456bf5092799f69d7cfc753443c5c6672208c102522c3ec47cfbbdf282049251800f14a8dfc6a7895c3c4e8a4b275be75
+  metadata.gz: d691402cf227340f287c804e6a0ce639928ca2d409dd745701eae63dba20abdae2d3b876fb6d2c81d8b63f3a4ba9b0af7aa4268da5faf37c2fff5f3f7aa9b7ee
+  data.tar.gz: f9a554a6d53d75875c9863a1dedba3e6a51efd134e35dd43f5eb2883e446d5cab2ecba06f9a1fddd7e81d8e046aa5d0383585d9563f12897b4530606e225906c

data/app/controllers/view_components_system_test_controller.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "view_component/errors"
+
 class ViewComponentsSystemTestController < ActionController::Base # :nodoc:
   if Rails.env.test?
     before_action :validate_file_path

data/docs/CHANGELOG.md

@@ -10,6 +10,26 @@ nav_order: 6
 
 ## main
 
+## 4.11.0
+
+* Update `render_in` signature to accept `**_` for compatibility with Rails [#50623](https://github.com/rails/rails/pull/50623).
+
+    *Joel Hawksley*
+
+* Fix translation scope resolution in nested lambda-backed slots. Relative `t(".key")` calls inside lambda-backed slots were resolving against an intermediate component's scope instead of the original partial's scope where the block was defined.
+
+    *Artin Boghosian*
+
+## 4.10.0
+
+* Fix `NameError: uninitialized constant ViewComponent::SystemTestControllerNefariousPathError` when booting in the test environment with `eager_load = true`.
+
+    *Joel Hawksley*
+
+* Fix yielded content rendered at wrong location when using form helpers.
+
+    *Joel Hawksley*, *Markus*
+
 ## 4.9.0
 
 * Fix path traversal vulnerability in `ViewComponentsSystemTestController` where sibling directories sharing a string prefix with the allowed temp directory could bypass the path containment check. The `start_with?` check has been replaced with a separator-aware prefix check, and nefarious path errors now return a 404 instead of an unhandled exception.

data/lib/view_component/base.rb

@@ -82,6 +82,7 @@ module ViewComponent
     # so helpers, etc work as expected.
     #
     # @param view_context [ActionView::Base] The original view context.
+    #
     # @return [void]
     def set_original_view_context(view_context)
       # noop
@@ -102,7 +103,7 @@ module ViewComponent
     # Returns HTML that has been escaped by the respective template handler.
     #
     # @return [String]
-    def render_in(view_context, &block)
+    def render_in(view_context, **_, &block)
       self.class.__vc_compile(raise_errors: true)
 
       @view_context = view_context
@@ -278,6 +279,22 @@ module ViewComponent
       end
     end
 
+    # Sync @output_buffer with the view context's current output buffer before
+    # capturing. Form helpers create builders with @template_object pointing to
+    # the component. When those builders later call capture inside a partial
+    # (whose _run allocated a fresh OutputBuffer on the view context), the
+    # component's stale @output_buffer would capture from the wrong buffer.
+    # Temporarily switching to the view context's buffer keeps both in sync.
+    #
+    # @private
+    def capture(...)
+      old_output_buffer = @output_buffer
+      @output_buffer = view_context.output_buffer if view_context
+      super
+    ensure
+      @output_buffer = old_output_buffer
+    end
+
     # The current controller. Use sparingly as doing so introduces coupling
     # that inhibits encapsulation & reuse, often making testing difficult.
     #

data/lib/view_component/collection.rb

@@ -10,7 +10,7 @@ module ViewComponent
 
     delegate :size, to: :@collection
 
-    def render_in(view_context, &block)
+    def render_in(view_context, **_, &block)
       components.map do |component|
         component.render_in(view_context, &block)
       end.join(rendered_spacer(view_context)).html_safe

data/lib/view_component/compiler.rb

@@ -58,6 +58,7 @@ module ViewComponent
     end
 
     # @param requested_details [ActionView::TemplateDetails::Requested] i.e. locales, formats, variants
+    #
     # @return all matching compiled templates, in priority order based on the requested details from LookupContext
     def find_templates_for(requested_details)
       filtered_templates = @templates.select do |template|

data/lib/view_component/config.rb

@@ -19,6 +19,7 @@ module ViewComponent
       end
 
       # @!attribute generate
+      #
       # @return [ActiveSupport::OrderedOptions]
       # The subset of configuration options relating to generators.
       #
@@ -95,6 +96,7 @@ module ViewComponent
       # in `spec/views/components/` rather than the default `spec/components/`.
 
       # @!attribute previews
+      #
       # @return [ActiveSupport::OrderedOptions]
       # The subset of configuration options relating to previews.
       #
@@ -124,6 +126,7 @@ module ViewComponent
       #
 
       # @!attribute instrumentation_enabled
+      #
       # @return [Boolean]
       # Whether ActiveSupport notifications are enabled.
       # Defaults to `false`.
@@ -171,6 +174,7 @@ module ViewComponent
     end
 
     # @!attribute current
+    #
     # @return [ViewComponent::Config]
     # Returns the current ViewComponent::Config. This is persisted against this
     # class so that config options remain accessible before the rest of

data/lib/view_component/instrumentation.rb

@@ -8,7 +8,7 @@ module ViewComponent # :nodoc:
       mod.prepend(self) unless self <= ViewComponent::Instrumentation
     end
 
-    def render_in(view_context, &block)
+    def render_in(view_context, **_, &block)
       return super if !Rails.application.config.view_component.instrumentation_enabled.present?
 
       payload = {

data/lib/view_component/slotable.rb

@@ -380,6 +380,7 @@ module ViewComponent
     def __vc_set_slot(slot_name, slot_definition = nil, *args, **kwargs, &block)
       slot_definition ||= self.class.registered_slots[slot_name]
       slot = Slot.new(self)
+      captured_block_virtual_path = nil
 
       # Passing the block to the sub-component wrapper like this has two
       # benefits:
@@ -394,7 +395,8 @@ module ViewComponent
         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)
+        captured_block_virtual_path = view_context.instance_variable_get(:@virtual_path)
+        slot.__vc_content_block_virtual_path = captured_block_virtual_path
       end
 
       # If class
@@ -413,7 +415,7 @@ module ViewComponent
         renderable_value =
           if block
             renderable_function.call(*args, **kwargs) do |*rargs|
-              with_captured_virtual_path(@old_virtual_path) do
+              with_captured_virtual_path(captured_block_virtual_path) do
                 view_context.capture(*rargs, &block)
               end
             end

data/lib/view_component/system_test_helpers.rb

@@ -7,6 +7,7 @@ module ViewComponent
     # Returns a block that can be used to visit the path of the inline rendered component.
     # @param fragment [Nokogiri::Fragment] The fragment returned from `render_inline`.
     # @param layout [String] The (optional) layout to use.
+    #
     # @return [Proc] A block that can be used to visit the path of the inline rendered component.
     def with_rendered_component_path(fragment, layout: false, &block)
       file = Tempfile.new(

data/lib/view_component/test_helpers.rb

@@ -35,6 +35,7 @@ module ViewComponent
     # ```
     #
     # @param component [ViewComponent::Base, ViewComponent::Collection] The instance of the component to be rendered.
+    #
     # @return [Nokogiri::HTML5]
     def render_inline(component, **args, &block)
       @page = nil
@@ -74,7 +75,9 @@ module ViewComponent
     # @param name [String] The name of the preview to be rendered.
     # @param from [ViewComponent::Preview] The class of the preview to be rendered.
     # @param params [Hash] Parameters to be passed to the preview.
+    #
     # @return [Nokogiri::HTML5]
+    #
     # @note `#rendered_preview` expects a preview to be defined with the same class
     #   name as the calling test, but with `Test` replaced with `Preview`:
     #

data/lib/view_component/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: view_component
 version: !ruby/object:Gem::Version
-  version: 4.9.0
+  version: 4.11.0
 platform: ruby
 authors:
 - ViewComponent Team
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.10
 specification_version: 4
 summary: A framework for building reusable, testable & encapsulated view components
   in Ruby on Rails.