actionview 7.2.3.1 → 8.1.4.1

data/lib/action_view/structured_event_subscriber.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+require "active_support/structured_event_subscriber"
+
+module ActionView
+  class StructuredEventSubscriber < ActiveSupport::StructuredEventSubscriber # :nodoc:
+    VIEWS_PATTERN = /^app\/views\//
+
+    def initialize
+      @root = nil
+      super
+    end
+
+    def render_template(event)
+      emit_debug_event("action_view.render_template",
+        identifier: from_rails_root(event.payload[:identifier]),
+        layout: from_rails_root(event.payload[:layout]),
+        duration_ms: event.duration.round(2),
+        gc_ms: event.gc_time.round(2),
+      )
+    end
+    debug_only :render_template
+
+    def render_partial(event)
+      emit_debug_event("action_view.render_partial",
+        identifier: from_rails_root(event.payload[:identifier]),
+        layout: from_rails_root(event.payload[:layout]),
+        duration_ms: event.duration.round(2),
+        gc_ms: event.gc_time.round(2),
+        cache_hit: event.payload[:cache_hit],
+      )
+    end
+    debug_only :render_partial
+
+    def render_layout(event)
+      emit_event("action_view.render_layout",
+        identifier: from_rails_root(event.payload[:identifier]),
+        duration_ms: event.duration.round(2),
+        gc_ms: event.gc_time.round(2),
+      )
+    end
+    debug_only :render_layout
+
+    def render_collection(event)
+      emit_debug_event("action_view.render_collection",
+        identifier: from_rails_root(event.payload[:identifier] || "templates"),
+        layout: from_rails_root(event.payload[:layout]),
+        duration_ms: event.duration.round(2),
+        gc_ms: event.gc_time.round(2),
+        cache_hits: event.payload[:cache_hits],
+        count: event.payload[:count],
+      )
+    end
+    debug_only :render_collection
+
+    module Utils # :nodoc:
+      private
+        def from_rails_root(string)
+          return unless string
+
+          string = string.sub("#{rails_root}/", "")
+          string.sub!(VIEWS_PATTERN, "")
+          string
+        end
+
+        def rails_root # :doc:
+          @root ||= Rails.try(:root)
+        end
+    end
+
+    include Utils
+
+    class Start # :nodoc:
+      include Utils
+
+      def start(name, id, payload)
+        ActiveSupport.event_reporter.debug("action_view.render_start",
+          is_layout: name == "render_layout.action_view",
+          identifier: from_rails_root(payload[:identifier]),
+          layout: from_rails_root(payload[:layout]),
+        )
+      end
+
+      def finish(name, id, payload)
+      end
+    end
+
+    def self.attach_to(*)
+      ActiveSupport::Notifications.subscribe("render_template.action_view", Start.new)
+      ActiveSupport::Notifications.subscribe("render_layout.action_view", Start.new)
+
+      super
+    end
+  end
+end
+
+ActionView::StructuredEventSubscriber.attach_to :action_view

data/lib/action_view/template/error.rb

@@ -260,9 +260,13 @@ module ActionView
     end
 
     def message
-      <<~MESSAGE
-        Encountered a syntax error while rendering template: check #{@offending_code_string}
-      MESSAGE
+      if template.is_a?(Template::Inline)
+        <<~MESSAGE
+          Encountered a syntax error while rendering template: check #{@offending_code_string}
+        MESSAGE
+      else
+        "Encountered a syntax error while rendering template located at: #{template.short_identifier}"
+      end
     end
 
     def annotated_source_code

data/lib/action_view/template/handlers/erb/erubi.rb

@@ -18,7 +18,7 @@ module ActionView
             properties[:preamble]   ||= ""
             properties[:postamble]  ||= "#{properties[:bufvar]}"
 
-            # Tell Eruby that whether template will be compiled with `frozen_string_literal: true`
+            # Tell Erubi whether the template will be compiled with `frozen_string_literal: true`
             properties[:freeze_template_literals] = !Template.frozen_string_literal
 
             properties[:escapefunc] = ""

data/lib/action_view/template/handlers/erb.rb

@@ -40,17 +40,19 @@ module ActionView
 
         # Translate an error location returned by ErrorHighlight to the correct
         # source location inside the template.
-        def translate_location(spot, backtrace_location, source)
-          # Tokenize the source line
+        def translate_location(spot, _backtrace_location, source)
+          compiled = spot[:script_lines]
+          highlight = compiled[spot[:first_lineno] - 1]&.byteslice((spot[:first_column] - 1)...spot[:last_column])
+          return nil if highlight.blank?
+
           source_lines = source.lines
-          return nil if source_lines.size < backtrace_location.lineno
-          tokens = ::ERB::Util.tokenize(source_lines[backtrace_location.lineno - 1])
-          new_first_column = find_offset(spot[:snippet], tokens, spot[:first_column])
-          lineno_delta = spot[:first_lineno] - backtrace_location.lineno
+          lineno_delta = find_lineno_offset(compiled, source_lines, highlight, spot[:first_lineno])
+
+          tokens = ::ERB::Util.tokenize(source_lines[spot[:first_lineno] - lineno_delta - 1])
+          column_delta = find_offset(spot[:snippet], tokens, spot[:first_column])
+
           spot[:first_lineno] -= lineno_delta
           spot[:last_lineno] -= lineno_delta
-
-          column_delta = spot[:first_column] - new_first_column
           spot[:first_column] -= column_delta
           spot[:last_column] -= column_delta
           spot[:script_lines] = source_lines
@@ -84,7 +86,7 @@ module ActionView
           }
 
           if ActionView::Base.annotate_rendered_view_with_filenames && template.format == :html
-            options[:preamble] = "@output_buffer.safe_append='<!-- BEGIN #{template.short_identifier} -->';"
+            options[:preamble] = "@output_buffer.safe_append='<!-- BEGIN #{template.short_identifier}\n-->';"
             options[:postamble] = "@output_buffer.safe_append='<!-- END #{template.short_identifier} -->';@output_buffer"
           end
 
@@ -107,6 +109,28 @@ module ActionView
           raise WrongEncodingError.new(string, string.encoding)
         end
 
+        # Return the offset between the error lineno and the source lineno.
+        # Searches in reverse from the backtrace lineno so we have a better
+        # chance of finding the correct line
+        #
+        # The compiled template is likely to be longer than the source.
+        # Use the difference between the compiled and source sizes to
+        # determine the earliest line that could contain the highlight.
+        def find_lineno_offset(compiled, source_lines, highlight, error_lineno)
+          first_index = error_lineno - 1 - compiled.size + source_lines.size
+          first_index = 0 if first_index < 0
+
+          last_index = error_lineno - 1
+          last_index = source_lines.size - 1 if last_index >= source_lines.size
+
+          last_index.downto(first_index) do |line_index|
+            next unless source_lines[line_index].include?(highlight)
+            return error_lineno - 1 - line_index
+          end
+
+          raise LocationParsingError, "Couldn't find code snippet"
+        end
+
         # Find which token in the source template spans the byte range that
         # contains the error_column, then return the offset compared to the
         # original source template.
@@ -137,7 +161,7 @@ module ActionView
                 matched_str = true
 
                 if name == :CODE && compiled.pos <= error_column && compiled.pos + str.bytesize >= error_column
-                  return error_column - compiled.pos + offset
+                  return compiled.pos - offset
                 end
 
                 compiled.pos += str.bytesize
@@ -152,8 +176,9 @@ module ActionView
 
         def offset_source_tokens(source_tokens)
           source_offset = 0
-          with_offset = source_tokens.filter_map do |(name, str)|
-            result = [name, str, source_offset] if name == :CODE || name == :TEXT
+          with_offset = source_tokens.filter_map do |name, str|
+            result = [:CODE, str, source_offset] if name == :CODE || name == :PLAIN
+            result = [:TEXT, str, source_offset] if name == :TEXT
             source_offset += str.bytesize
             result
           end

data/lib/action_view/template/raw_file.rb

@@ -20,6 +20,10 @@ module ActionView # :nodoc:
       def render(*args)
         ::File.read(@filename)
       end
+
+      def supports_streaming?
+        false
+      end
     end
   end
 end

data/lib/action_view/template/resolver.rb

@@ -4,7 +4,6 @@ require "pathname"
 require "active_support/core_ext/class"
 require "active_support/core_ext/module/attribute_accessors"
 require "action_view/template"
-require "thread"
 require "concurrent/map"
 
 module ActionView

data/lib/action_view/template.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "thread"
 require "delegate"
 
 module ActionView
@@ -8,7 +7,7 @@ module ActionView
   class Template
     extend ActiveSupport::Autoload
 
-    STRICT_LOCALS_REGEX = /\#\s+locals:\s+\((.*)\)/
+    STRICT_LOCALS_REGEX = /\#\s+locals:\s+\((.*?)\)(?=\s*-?%>|\s*$)/m
 
     # === Encodings in ActionView::Template
     #
@@ -357,7 +356,7 @@ module ActionView
 
     # This method is responsible for marking a template as having strict locals
     # which means the template can only accept the locals defined in a magic
-    # comment. For example, if your template acceps the locals +title+ and
+    # comment. For example, if your template accepts the locals +title+ and
     # +comment_count+, add the following to your template file:
     #
     #   <%# locals: (title: "Default title", comment_count: 0) %>
@@ -367,10 +366,16 @@ module ActionView
     def strict_locals!
       if @strict_locals == NONE
         self.source.sub!(STRICT_LOCALS_REGEX, "")
-        @strict_locals = $1
+        @strict_locals = $1&.rstrip
 
         return if @strict_locals.nil? # Magic comment not found
 
+        # Tag with the assumed encoding before encode! runs, same as
+        # encode! does for the source itself (see above).
+        if @strict_locals.encoding == Encoding::BINARY
+          @strict_locals.force_encoding(Encoding.default_external)
+        end
+
         @strict_locals = "**nil" if @strict_locals.blank?
       end
 
@@ -465,8 +470,9 @@ module ActionView
           end
         end_src
 
-        # Make sure the source is in the encoding of the returned code
-        source.force_encoding(code.encoding)
+        # Make sure the source is in the encoding of the returned code.
+        # ASCII-only code has no encoding worth propagating.
+        source.force_encoding(code.encoding) unless code.ascii_only?
 
         # In case we get back a String from a handler that is not in
         # BINARY or the default_internal, encode it to the default_internal

data/lib/action_view/test_case.rb

@@ -60,7 +60,56 @@ module ActionView
       include ActiveSupport::Testing::ConstantLookup
 
       delegate :lookup_context, to: :controller
-      attr_accessor :controller, :request, :output_buffer, :rendered
+      attr_accessor :controller, :request, :output_buffer
+
+      # Returns the content rendered by the last +render+ call.
+      #
+      # The returned object behaves like a string but also exposes a number of methods
+      # that allows you to parse the content string in formats registered using
+      # <tt>.register_parser</tt>.
+      #
+      # By default includes the following parsers:
+      #
+      # +.html+
+      #
+      # Parse the <tt>rendered</tt> content String into HTML. By default, this means
+      # a <tt>Nokogiri::XML::Node</tt>.
+      #
+      #   test "renders HTML" do
+      #     article = Article.create!(title: "Hello, world")
+      #
+      #     render partial: "articles/article", locals: { article: article }
+      #
+      #     assert_pattern { rendered.html.at("main h1") => { content: "Hello, world" } }
+      #   end
+      #
+      # To parse the rendered content into a <tt>Capybara::Simple::Node</tt>,
+      # re-register an <tt>:html</tt> parser with a call to
+      # <tt>Capybara.string</tt>:
+      #
+      #   register_parser :html, -> rendered { Capybara.string(rendered) }
+      #
+      #   test "renders HTML" do
+      #     article = Article.create!(title: "Hello, world")
+      #
+      #     render partial: article
+      #
+      #     rendered.html.assert_css "h1", text: "Hello, world"
+      #   end
+      #
+      # +.json+
+      #
+      # Parse the <tt>rendered</tt> content String into JSON. By default, this means
+      # a <tt>ActiveSupport::HashWithIndifferentAccess</tt>.
+      #
+      #   test "renders JSON" do
+      #     article = Article.create!(title: "Hello, world")
+      #
+      #     render formats: :json, partial: "articles/article", locals: { article: article }
+      #
+      #     assert_pattern { rendered.json => { title: "Hello, world" } }
+      #   end
+      attr_accessor :rendered
 
       module ClassMethods
         def inherited(descendant) # :nodoc:
@@ -223,7 +272,7 @@ module ActionView
         @request = @controller.request
         @view_flow = ActionView::OutputFlow.new
         @output_buffer = ActionView::OutputBuffer.new
-        @rendered = self.class.content_class.new(+"")
+        _reset_rendered
 
         test_case_instance = self
         controller_class.define_method(:_test_case) { test_case_instance }
@@ -235,65 +284,24 @@ module ActionView
 
       def render(options = {}, local_assigns = {}, &block)
         view.assign(view_assigns)
-        @rendered << output = view.render(options, local_assigns, &block)
-        output
+
+        if @_rendering
+          view.render(options, local_assigns, &block)
+        else
+          _reset_rendered
+          @_rendering = true
+          output = view.render(options, local_assigns, &block)
+          @rendered << output
+          output
+        end
+      ensure
+        @_rendering = false unless @_rendering.nil?
       end
 
       def rendered_views
         @_rendered_views ||= RenderedViewsCollection.new
       end
 
-      ##
-      # :method: rendered
-      #
-      # Returns the content rendered by the last +render+ call.
-      #
-      # The returned object behaves like a string but also exposes a number of methods
-      # that allows you to parse the content string in formats registered using
-      # <tt>.register_parser</tt>.
-      #
-      # By default includes the following parsers:
-      #
-      # +.html+
-      #
-      # Parse the <tt>rendered</tt> content String into HTML. By default, this means
-      # a <tt>Nokogiri::XML::Node</tt>.
-      #
-      #   test "renders HTML" do
-      #     article = Article.create!(title: "Hello, world")
-      #
-      #     render partial: "articles/article", locals: { article: article }
-      #
-      #     assert_pattern { rendered.html.at("main h1") => { content: "Hello, world" } }
-      #   end
-      #
-      # To parse the rendered content into a <tt>Capybara::Simple::Node</tt>,
-      # re-register an <tt>:html</tt> parser with a call to
-      # <tt>Capybara.string</tt>:
-      #
-      #   register_parser :html, -> rendered { Capybara.string(rendered) }
-      #
-      #   test "renders HTML" do
-      #     article = Article.create!(title: "Hello, world")
-      #
-      #     render partial: article
-      #
-      #     rendered.html.assert_css "h1", text: "Hello, world"
-      #   end
-      #
-      # +.json+
-      #
-      # Parse the <tt>rendered</tt> content String into JSON. By default, this means
-      # a <tt>ActiveSupport::HashWithIndifferentAccess</tt>.
-      #
-      #   test "renders JSON" do
-      #     article = Article.create!(title: "Hello, world")
-      #
-      #     render formats: :json, partial: "articles/article", locals: { article: article }
-      #
-      #     assert_pattern { rendered.json => { title: "Hello, world" } }
-      #   end
-
       def _routes
         @controller._routes if @controller.respond_to?(:_routes)
       end
@@ -385,6 +393,7 @@ module ActionView
         :@method_name,
         :@output_buffer,
         :@_partials,
+        :@_rendering,
         :@passed,
         :@rendered,
         :@request,
@@ -414,6 +423,10 @@ module ActionView
         end]
       end
 
+      def _reset_rendered
+        @rendered = self.class.content_class.new(+"")
+      end
+
       def method_missing(selector, ...)
         begin
           routes = @controller.respond_to?(:_routes) && @controller._routes

data/lib/action_view.rb

@@ -37,6 +37,7 @@ module ActionView
   eager_autoload do
     autoload :Base
     autoload :Context
+    autoload :DependencyTracker
     autoload :Digestor
     autoload :Helpers
     autoload :LookupContext
@@ -91,6 +92,21 @@ module ActionView
   autoload :CacheExpiry
   autoload :TestCase
 
+  singleton_class.attr_reader :render_tracker
+
+  def self.render_tracker=(value)
+    @render_tracker = value
+    case value
+    when :ruby
+      DependencyTracker.register_tracker :erb, DependencyTracker::RubyTracker
+    else
+      DependencyTracker.register_tracker :erb, DependencyTracker::ERBTracker
+    end
+    value
+  end
+
+  self.render_tracker = :regex
+
   def self.eager_load!
     super
     ActionView::Helpers.eager_load!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actionview
 version: !ruby/object:Gem::Version
-  version: 7.2.3.1
+  version: 8.1.4.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -15,28 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.3.1
+        version: 8.1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.3.1
-- !ruby/object:Gem::Dependency
-  name: cgi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 8.1.4.1
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +58,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -79,6 +68,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: rails-dom-testing
   requirement: !ruby/object:Gem::Requirement
@@ -99,28 +91,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.3.1
+        version: 8.1.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.3.1
+        version: 8.1.4.1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.3.1
+        version: 8.1.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.2.3.1
+        version: 8.1.4.1
 description: Simple, battle-tested conventions and helpers for building web pages.
 email: david@loudthinking.com
 executables: []
@@ -140,6 +132,7 @@ files:
 - lib/action_view/dependency_tracker.rb
 - lib/action_view/dependency_tracker/erb_tracker.rb
 - lib/action_view/dependency_tracker/ruby_tracker.rb
+- lib/action_view/dependency_tracker/wildcard_resolver.rb
 - lib/action_view/deprecator.rb
 - lib/action_view/digestor.rb
 - lib/action_view/flows.rb
@@ -229,6 +222,7 @@ files:
 - lib/action_view/renderer/template_renderer.rb
 - lib/action_view/rendering.rb
 - lib/action_view/routing_url_for.rb
+- lib/action_view/structured_event_subscriber.rb
 - lib/action_view/tasks/cache_digests.rake
 - lib/action_view/template.rb
 - lib/action_view/template/error.rb
@@ -259,10 +253,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.2.3.1/actionview/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.2.3.1/
+  changelog_uri: https://github.com/rails/rails/blob/v8.1.4.1/actionview/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v8.1.4.1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.2.3.1/actionview
+  source_code_uri: https://github.com/rails/rails/tree/v8.1.4.1/actionview
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
@@ -271,7 +265,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -279,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 4.0.6
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Rendering framework putting the V in MVC (part of Rails).
 test_files: []