view_component 4.2.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79d1337f1589a6e9ec7617c7d07917825c4f90b2e6093e6e925ef9fad3e06937
-  data.tar.gz: aaa0ddcd3a30c628409a4001efdd99c702ff5b97ff7873a3f3e092e05b54c3f6
+  metadata.gz: 7cc3bb1d940451beebb05d7424ae9fe3124ddbfd2acc21e407c0b3c4964c7570
+  data.tar.gz: 2db13b63611d87477814e3567e2aca332879a50e1a500ecc560b8a9d0537c411
 SHA512:
-  metadata.gz: 98381938a50a979a6ee135dff98c4e3b13a4a1b5ac8ee2f19c7e5f9b1bdc04470b355c55696d2724c733fab29a9379fe59c0a8e4273374e9db5210202be2dc06
-  data.tar.gz: 0b5276ff41b7b7ff493f935c75e8c3e8cc604decc42a950c97f1da3becccfba3446b40178c35b9b54578a47f3718bfa53ba2c6e91ec7b929a6adc7f26f41f782
+  metadata.gz: 8dd9367ebb7c528a5a89d0a76d1294a0fa0276eed80b8c819d338c82d86c131386851903fb3fe0c1be43416980ebf9cb4ca405599f4e58f73084b1d5aee8fa8d
+  data.tar.gz: 4cca85cd44103692aed7039a7c0b044d78adbff6bbc0e5d99be0fe72590dae160047cf34ce731ec079141cf2ed22485d32898ce5917ec225e637951151c9d544

data/docs/CHANGELOG.md

@@ -10,6 +10,24 @@ nav_order: 6
 
 ## main
 
+## 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.

data/lib/view_component/base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "action_view"
+require "action_view/base"
 require "view_component/collection"
 require "view_component/compile_cache"
 require "view_component/compiler"
@@ -577,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.
@@ -600,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))

data/lib/view_component/compiler.rb

@@ -115,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|
@@ -190,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/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
 

data/lib/view_component/template.rb

@@ -21,11 +21,21 @@ module ViewComponent
 
     class File < Template
       def initialize(component:, details:, path:)
-        # Rails 8.1 added a newline to the compiled ERB output in
-        # https://github.com/rails/rails/pull/53731
+        @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
-            - 1
+            if coverage_running? && ActionView::Base.annotate_rendered_view_with_filenames
+              @strip_annotation_line = true
+              0
+            else
+              -1
+            end
           else
             0
           end
@@ -46,6 +56,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.sub(/\A[^\n]*\n/, "") if @strip_annotation_line
+        result
+      end
     end
 
     class Inline < Template
@@ -54,8 +74,10 @@ 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 the compiled ERB output in
-        # https://github.com/rails/rails/pull/53731
+        # 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
@@ -126,6 +148,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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: view_component
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.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: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A framework for building reusable, testable & encapsulated view components
   in Ruby on Rails.