view_component 4.23.0 → 4.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d782aede72b310a730951e5b9357dcf8b02184f4d459d0ef0c7106671bfa80a1
-  data.tar.gz: 6edb2094b07d7245782cb1d1292dbd7983e70ce5d1872165a4bae99bde537275
+  metadata.gz: 3c6a2ef3282bf3383716c47d113e3a9ed1dccc6aee4f643080aedece5961445a
+  data.tar.gz: ad941d4a4ca2b8e155dff3bd2ed52a0213d6bfc808c65abc67e5d2e069d300e7
 SHA512:
-  metadata.gz: f9fbe9cd4bfdb862d5a6d2bda711380d43abbf744af542b09158f57adf0c5de0b32002fcd7710859743cc3abe80fce416f4280c638a0b436dd5495beff4c0269
-  data.tar.gz: '09cf2dd6d5b054283943b02feecd1037bc41cfcac37553ef1bc4823d32ab4e34ac2bb469105579d6144ec76972944c7ac5ace6bd4c711e5bdff1cc4e1b1227b7'
+  metadata.gz: ed286a2767cb14109d867255023c4feb6945288cc2dd4351c64ffa03203a89702a8ca75b7a79cd68c64ebc7b9e96a1a2e81e7445f61fc975ce06311c4a47d872
+  data.tar.gz: 9893da43af8559c0aee6226b4d0dd2fa96f32ec41b1fc60b14106e0d689666a5a1833af99da1cf72d568ef8a85b79854a3bbe4ef198128d9dde35c0f86cea24a

data/docs/CHANGELOG.md

@@ -10,6 +10,40 @@ nav_order: 6
 
 ## main
 
+## 4.24.0
+
+* Harden GitHub Actions workflows and dependency updates to address code-scanning alerts.
+
+    *Joel Hawksley*
+
+* Check component templates for changes from the Rails reloader instead of every executor run, avoiding filesystem scans for Action Cable broadcasts and other executor-only work.
+
+    *Joel Hawksley*
+
+* Avoid missing-template digest errors for namespaced component renders when using Rails' regex ERB dependency tracker.
+
+    *Joel Hawksley*
+
+* Raise `NoMethodError` on the slot instead of on `nil` when calling an undefined method on a slot without a component, including methods only `nil` defines such as `to_a` or `=~`, which used to return `nil`'s result.
+
+    *Clément Joubert*
+
+* Update both Rails main builds to the same Rails commit through a weekly automated pull request.
+
+    *Joel Hawksley*
+
+* Update Nokogiri to 1.19.5 for compatibility with Rails main.
+
+    *Joel Hawksley*
+
+* Fix missing-template errors and request URL restoration with Rails main.
+
+    *Joel Hawksley*
+
+* Keep compensating ERB line numbers for the annotation newline on future major Rails versions. The version check required a minor version above 0, so it would have stopped compensating on the next major's `.0` release.
+
+    *Clément Joubert*
+
 ## 4.23.0
 
 * Restore request-dependent URL generation when using `render_preview` inside `with_request_url`.

data/lib/view_component/cache_digest/dependency_tracking.rb

@@ -35,8 +35,24 @@ module ViewComponent
 
           next dependencies unless CacheDigest.template_dependencies?(source, template.handler)
 
+          # ERB's regex tracker guesses different paths than the Ruby parser,
+          # especially for namespaced components. Ask the registered tracker
+          # about isolated render calls without reentering this extension.
+          if template.handler.is_a?(ActionView::Template::Handlers::ERB)
+            tracker = lambda do |calls|
+              isolated = ActionView::Template.new(
+                calls.map { |call| "<% #{call} %>" }.join("\n"),
+                template.identifier,
+                template.handler,
+                locals: [],
+                virtual_path: name
+              )
+              super(name, isolated, view_paths)
+            end
+          end
+
           component_paths, inferred_partials =
-            CacheDigest.template_renders_in(CacheDigest.compiled_source(template), name, view_paths: view_paths)
+            CacheDigest.template_renders_in(CacheDigest.compiled_source(template), name, view_paths: view_paths, &tracker)
           # Older ERB trackers omit the underscore on unqualified partial paths.
           inferred_partials |= inferred_partials.map { |path| path.delete_prefix("_") }
           declared = source.scan(CacheDigest::EXPLICIT_DEPENDENCY).flatten

data/lib/view_component/cache_digest.rb

@@ -178,14 +178,16 @@ module ViewComponent
       # @param source [String] Ruby source
       # @param name [String] virtual path the source is being digested under
       # @param view_paths [ActionView::PathSet, nil] paths to check dynamic partial guesses against
+      # @yieldparam calls [Array<String>] Ruby render calls to track with the template's tracker
+      # @yieldreturn [Array<String>] partial paths inferred by that tracker
       # @return [Array(Array<String>, Array<String>)] synthetic virtual paths of
       #   components and inferred partial virtual paths
-      def template_renders_in(source, name, view_paths: nil)
+      def template_renders_in(source, name, view_paths: nil, &tracker)
         components, component_calls, other_calls = partition_render_calls(Prism.parse(source).value)
 
         [
           component_paths(components),
-          (partials_rendered_by(component_calls, name) - partials_rendered_by(other_calls, name)) |
+          (partials_rendered_by(component_calls, name, &tracker) - partials_rendered_by(other_calls, name, &tracker)) |
             unresolved_partials_rendered_by(other_calls, name, view_paths)
         ]
       end
@@ -439,15 +441,14 @@ module ViewComponent
         renderable if renderable.is_a?(Class) && renderable < ViewComponent::Base
       end
 
-      # Partials Action View's render parser finds in the given calls,
-      # normalized to the form its trackers report. The calls are parsed
-      # together, so the parser runs once rather than once per call. Blocks are
-      # left out, as any renders inside them are calls of their own.
+      # Partials the given tracker, or Action View's render parser, finds in
+      # the given calls. Calls are tracked together rather than once per call.
+      # Blocks are left out, as any renders inside them are calls of their own.
       def partials_rendered_by(calls, name)
         return [] if calls.empty?
 
-        source = calls.map { |call| "#{call.name}(#{call.arguments&.slice})" }.join("\n")
-        partial_paths_in(source, name)
+        sources = calls.map { |call| "#{call.name}(#{call.arguments&.slice})" }
+        block_given? ? yield(sources) : partial_paths_in(sources.join("\n"), name)
       end
 
       def partial_paths_in(source, name)

data/lib/view_component/compiler.rb

@@ -141,7 +141,7 @@ module ViewComponent
           case @current_template
           #{calls}
           else
-            raise ViewComponent::MissingTemplateError.new(self.class.name, details)
+            raise ViewComponent::MissingTemplateError.new(self.class.name, @lookup_context)
           end
         RUBY
       end

data/lib/view_component/engine.rb

@@ -152,7 +152,9 @@ module ViewComponent
 
         template_watcher = CompileCache.template_watcher(app.config.file_watcher)
 
-        app.executor.to_run :before do
+        app.reloaders << template_watcher
+        app.reloader.to_run do
+          require_unload_lock!
           template_watcher.execute_if_updated
         end
       end

data/lib/view_component/slot.rb

@@ -108,7 +108,12 @@ module ViewComponent
     #     end
     #   end
     # end
+    #
+    # A slot that doesn't wrap a component raises `NoMethodError` for
+    # undefined methods, like any other object.
     def method_missing(symbol, *args, **kwargs, &block)
+      return super unless __vc_component_instance?
+
       @__vc_component_instance.public_send(symbol, *args, **kwargs, &block)
     end
 

data/lib/view_component/template.rb

@@ -5,6 +5,10 @@ module ViewComponent
     DEFAULT_FORMAT = :html
     private_constant :DEFAULT_FORMAT
 
+    # Rails 8.1 added a newline to compiled ERB output (rails/rails#53731).
+    ERB_NEWLINE_RAILS_VERSION = Gem::Version.new("8.1.0.alpha")
+    private_constant :ERB_NEWLINE_RAILS_VERSION
+
     DataWithSource = Struct.new(:format, :identifier, :short_identifier, :type)
 
     attr_reader :details, :path
@@ -209,7 +213,7 @@ module ViewComponent
     attr_reader :lineno
 
     def erb_newline_compensation_needed?
-      Rails::VERSION::MAJOR >= 8 && Rails::VERSION::MINOR > 0 &&
+      Rails.gem_version >= ERB_NEWLINE_RAILS_VERSION &&
         details.handler == :erb &&
         annotated?
     end

data/lib/view_component/test_helpers.rb

@@ -251,7 +251,7 @@ module ViewComponent
       old_controller&.instance_variable_set(:@_url_options, nil)
       yield
     ensure
-      vc_test_request.set_header("HTTP_HOST", old_request_host)
+      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.instance_variable_set(:@protocol, old_request_protocol)

data/lib/view_component/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: view_component
 version: !ruby/object:Gem::Version
-  version: 4.23.0
+  version: 4.24.0
 platform: ruby
 authors:
 - ViewComponent Team