actionview 7.0.8.7 → 7.1.5.1

data/lib/action_view/test_case.rb

@@ -9,6 +9,9 @@ require "rails-dom-testing"
 
 module ActionView
   # = Action View Test Case
+  #
+  # Read more about <tt>ActionView::TestCase</tt> in {Testing Rails Applications}[https://guides.rubyonrails.org/testing.html#testing-view-partials]
+  # in the guides.
   class TestCase < ActiveSupport::TestCase
     class TestController < ActionController::Base
       include ActionDispatch::TestProcess
@@ -60,6 +63,95 @@ module ActionView
       attr_accessor :controller, :request, :output_buffer, :rendered
 
       module ClassMethods
+        def inherited(descendant) # :nodoc:
+          super
+
+          descendant_content_class = content_class.dup
+
+          if descendant_content_class.respond_to?(:set_temporary_name)
+            descendant_content_class.set_temporary_name("rendered_content")
+          end
+
+          descendant.content_class = descendant_content_class
+        end
+
+        # Register a callable to parse rendered content for a given template
+        # format.
+        #
+        # Each registered parser will also define a +#rendered.[FORMAT]+ helper
+        # method, where +[FORMAT]+ corresponds to the value of the
+        # +format+ argument.
+        #
+        # By default, ActionView::TestCase defines parsers for:
+        #
+        # * +:html+ - returns an instance of +Nokogiri::XML::Node+
+        # * +:json+ - returns an instance of ActiveSupport::HashWithIndifferentAccess
+        #
+        # These pre-registered parsers also define corresponding helpers:
+        #
+        # * +:html+ - defines +rendered.html+
+        # * +:json+ - defines +rendered.json+
+        #
+        # ==== Parameters
+        #
+        # [+format+]
+        #   The name (as a +Symbol+) of the format used to render the content.
+        #
+        # [+callable+]
+        #   The parser. A callable object that accepts the rendered string as
+        #   its sole argument. Alternatively, the parser can be specified as a
+        #   block.
+        #
+        # ==== Examples
+        #
+        #   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
+        #
+        #   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
+        #
+        # To parse the rendered content into RSS, register a call to +RSS::Parser.parse+:
+        #
+        #   register_parser :rss, -> rendered { RSS::Parser.parse(rendered) }
+        #
+        #   test "renders RSS" do
+        #     article = Article.create!(title: "Hello, world")
+        #
+        #     render formats: :rss, partial: article
+        #
+        #     assert_equal "Hello, world", rendered.rss.items.last.title
+        #   end
+        #
+        # To parse the rendered content into a +Capybara::Simple::Node+,
+        # re-register an +:html+ parser with a call to +Capybara.string+:
+        #
+        #   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
+        #
+        def register_parser(format, callable = nil, &block)
+          parser = callable || block || :itself.to_proc
+          content_class.redefine_method(format) do
+            parser.call(to_s)
+          end
+        end
+
         def tests(helper_class)
           case helper_class
           when String, Symbol
@@ -105,15 +197,34 @@ module ActionView
         end
       end
 
+      included do
+        class_attribute :content_class, instance_accessor: false, default: RenderedViewContent
+
+        setup :setup_with_controller
+
+        register_parser :html, -> rendered { Rails::Dom::Testing.html_document.parse(rendered).root }
+        register_parser :json, -> rendered { JSON.parse(rendered, object_class: ActiveSupport::HashWithIndifferentAccess) }
+
+        ActiveSupport.run_load_hooks(:action_view_test_case, self)
+
+        helper do
+          def protect_against_forgery?
+            false
+          end
+
+          def _test_case
+            controller._test_case
+          end
+        end
+      end
+
       def setup_with_controller
         controller_class = Class.new(ActionView::TestCase::TestController)
         @controller = controller_class.new
         @request = @controller.request
         @view_flow = ActionView::OutputFlow.new
-        # empty string ensures buffer has UTF-8 encoding as
-        # new without arguments returns ASCII-8BIT encoded buffer like String#new
-        @output_buffer = ActiveSupport::SafeBuffer.new ""
-        @rendered = +""
+        @output_buffer = ActionView::OutputBuffer.new
+        @rendered = self.class.content_class.new(+"")
 
         test_case_instance = self
         controller_class.define_method(:_test_case) { test_case_instance }
@@ -133,10 +244,64 @@ module ActionView
         @_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
 
+      class RenderedViewContent < String # :nodoc:
+      end
+
       # Need to experiment if this priority is the best one: rendered => output_buffer
       class RenderedViewsCollection
         def initialize
@@ -163,25 +328,10 @@ module ActionView
         end
       end
 
-      included do
-        setup :setup_with_controller
-        ActiveSupport.run_load_hooks(:action_view_test_case, self)
-
-        helper do
-          def protect_against_forgery?
-            false
-          end
-
-          def _test_case
-            controller._test_case
-          end
-        end
-      end
-
     private
       # Need to experiment if this priority is the best one: rendered => output_buffer
       def document_root_element
-        Nokogiri::HTML::Document.parse(@rendered.blank? ? @output_buffer : @rendered).root
+        Rails::Dom::Testing.html_document.parse(@rendered.blank? ? @output_buffer.to_str : @rendered).root
       end
 
       module Locals
@@ -227,6 +377,10 @@ module ActionView
         :@_result,
         :@_routes,
         :@controller,
+        :@_controller,
+        :@_request,
+        :@_config,
+        :@_default_form_builder,
         :@_layouts,
         :@_files,
         :@_rendered_views,
@@ -245,7 +399,7 @@ module ActionView
         :@view_context_class,
         :@view_flow,
         :@_subscribers,
-        :@html_document
+        :@html_document,
       ]
 
       def _user_defined_ivars
@@ -277,6 +431,7 @@ module ActionView
           super
         end
       end
+      ruby2_keywords(:method_missing)
 
       def respond_to_missing?(name, include_private = false)
         begin

data/lib/action_view/unbound_template.rb

@@ -18,21 +18,31 @@ module ActionView
     end
 
     def bind_locals(locals)
-      if template = @templates[locals]
-        template
-      else
+      unless template = @templates[locals]
         @write_lock.synchronize do
           normalized_locals = normalize_locals(locals)
 
           # We need ||=, both to dedup on the normalized locals and to check
           # while holding the lock.
-          @templates[normalized_locals] ||= build_template(normalized_locals)
+          template = (@templates[normalized_locals] ||= build_template(normalized_locals))
 
-          # This may have already been assigned, but we've already de-dup'd so
-          # reassignment is fine.
-          @templates[locals.dup] = @templates[normalized_locals]
+          if template.strict_locals?
+            # Under strict locals, we only need one template.
+            # This replaces the @templates Concurrent::Map with a hash which
+            # returns this template for every key.
+            @templates = Hash.new(template).freeze
+          else
+            # This may have already been assigned, but we've already de-dup'd so
+            # reassignment is fine.
+            @templates[locals.dup] = template
+          end
         end
       end
+      template
+    end
+
+    def built_templates # :nodoc:
+      @templates.values
     end
 
     private

data/lib/action_view/version.rb

@@ -3,7 +3,7 @@
 require_relative "gem_version"
 
 module ActionView
-  # Returns the currently loaded version of Action View as a <tt>Gem::Version</tt>.
+  # Returns the currently loaded version of Action View as a +Gem::Version+.
   def self.version
     gem_version
   end

data/lib/action_view/view_paths.rb

@@ -5,7 +5,7 @@ module ActionView
     extend ActiveSupport::Concern
 
     included do
-      ViewPaths.set_view_paths(self, ActionView::PathSet.new.freeze)
+      ActionView::PathRegistry.set_view_paths(self, ActionView::PathSet.new.freeze)
     end
 
     delegate :template_exists?, :any_templates?, :view_paths, :formats, :formats=,
@@ -13,11 +13,11 @@ module ActionView
 
     module ClassMethods
       def _view_paths
-        ViewPaths.get_view_paths(self)
+        ActionView::PathRegistry.get_view_paths(self)
       end
 
       def _view_paths=(paths)
-        ViewPaths.set_view_paths(self, paths)
+        ActionView::PathRegistry.set_view_paths(self, paths)
       end
 
       def _prefixes # :nodoc:
@@ -28,6 +28,13 @@ module ActionView
         end
       end
 
+      def _build_view_paths(paths) # :nodoc:
+        return paths if ActionView::PathSet === paths
+
+        paths = ActionView::PathRegistry.cast_file_system_resolvers(paths)
+        ActionView::PathSet.new(paths)
+      end
+
       # Append a path to the list of view paths for this controller.
       #
       # ==== Parameters
@@ -35,7 +42,7 @@ module ActionView
       #   the default view path. You may also provide a custom view path
       #   (see ActionView::PathSet for more information)
       def append_view_path(path)
-        self._view_paths = view_paths + Array(path)
+        self._view_paths = view_paths + _build_view_paths(path)
       end
 
       # Prepend a path to the list of view paths for this controller.
@@ -45,7 +52,7 @@ module ActionView
       #   the default view path. You may also provide a custom view path
       #   (see ActionView::PathSet for more information)
       def prepend_view_path(path)
-        self._view_paths = ActionView::PathSet.new(Array(path) + view_paths)
+        self._view_paths = _build_view_paths(path) + view_paths
       end
 
       # A list of all of the default view paths for this controller.
@@ -59,7 +66,7 @@ module ActionView
       # * <tt>paths</tt> - If a PathSet is provided, use that;
       #   otherwise, process the parameter into a PathSet.
       def view_paths=(paths)
-        self._view_paths = ActionView::PathSet.new(Array(paths))
+        self._view_paths = _build_view_paths(paths)
       end
 
       private
@@ -70,22 +77,6 @@ module ActionView
         end
     end
 
-    # :stopdoc:
-    @all_view_paths = {}
-
-    def self.get_view_paths(klass)
-      @all_view_paths[klass] || get_view_paths(klass.superclass)
-    end
-
-    def self.set_view_paths(klass, paths)
-      @all_view_paths[klass] = paths
-    end
-
-    def self.all_view_paths
-      @all_view_paths.values.uniq
-    end
-    # :startdoc:
-
     # The prefixes used in render "foo" shortcuts.
     def _prefixes # :nodoc:
       self.class._prefixes
@@ -110,7 +101,7 @@ module ActionView
     #   the default view path. You may also provide a custom view path
     #   (see ActionView::PathSet for more information)
     def append_view_path(path)
-      lookup_context.view_paths.push(*path)
+      lookup_context.append_view_paths(self.class._build_view_paths(path))
     end
 
     # Prepend a path to the list of view paths for the current LookupContext.
@@ -120,7 +111,7 @@ module ActionView
     #   the default view path. You may also provide a custom view path
     #   (see ActionView::PathSet for more information)
     def prepend_view_path(path)
-      lookup_context.view_paths.unshift(*path)
+      lookup_context.prepend_view_paths(self.class._build_view_paths(path))
     end
   end
 end

data/lib/action_view.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #--
-# Copyright (c) 2004-2022 David Heinemeier Hansson
+# Copyright (c) David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -26,7 +26,9 @@
 require "active_support"
 require "active_support/rails"
 require "action_view/version"
+require "action_view/deprecator"
 
+# :include: ../README.rdoc
 module ActionView
   extend ActiveSupport::Autoload
 
@@ -39,6 +41,7 @@ module ActionView
     autoload :Helpers
     autoload :LookupContext
     autoload :Layouts
+    autoload :PathRegistry
     autoload :PathSet
     autoload :RecordIdentifier
     autoload :Rendering

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actionview
 version: !ruby/object:Gem::Version
-  version: 7.0.8.7
+  version: 7.1.5.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.7
+        version: 7.1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.7
+        version: 7.1.5.1
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -44,76 +44,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rails-html-sanitizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rails-dom-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.7
+        version: 7.1.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.7
+        version: 7.1.5.1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.7
+        version: 7.1.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.7
+        version: 7.1.5.1
 description: Simple, battle-tested conventions and helpers for building web pages.
 email: david@loudthinking.com
 executables: []
@@ -123,6 +117,8 @@ files:
 - CHANGELOG.md
 - MIT-LICENSE
 - README.rdoc
+- app/assets/javascripts/rails-ujs.esm.js
+- app/assets/javascripts/rails-ujs.js
 - lib/action_view.rb
 - lib/action_view/base.rb
 - lib/action_view/buffers.rb
@@ -131,6 +127,7 @@ files:
 - lib/action_view/dependency_tracker.rb
 - lib/action_view/dependency_tracker/erb_tracker.rb
 - lib/action_view/dependency_tracker/ripper_tracker.rb
+- lib/action_view/deprecator.rb
 - lib/action_view/digestor.rb
 - lib/action_view/flows.rb
 - lib/action_view/gem_version.rb
@@ -141,6 +138,7 @@ files:
 - lib/action_view/helpers/atom_feed_helper.rb
 - lib/action_view/helpers/cache_helper.rb
 - lib/action_view/helpers/capture_helper.rb
+- lib/action_view/helpers/content_exfiltration_prevention_helper.rb
 - lib/action_view/helpers/controller_helper.rb
 - lib/action_view/helpers/csp_helper.rb
 - lib/action_view/helpers/csrf_helper.rb
@@ -182,6 +180,7 @@ files:
 - lib/action_view/helpers/tags/range_field.rb
 - lib/action_view/helpers/tags/search_field.rb
 - lib/action_view/helpers/tags/select.rb
+- lib/action_view/helpers/tags/select_renderer.rb
 - lib/action_view/helpers/tags/tel_field.rb
 - lib/action_view/helpers/tags/text_area.rb
 - lib/action_view/helpers/tags/text_field.rb
@@ -200,6 +199,7 @@ files:
 - lib/action_view/log_subscriber.rb
 - lib/action_view/lookup_context.rb
 - lib/action_view/model_naming.rb
+- lib/action_view/path_registry.rb
 - lib/action_view/path_set.rb
 - lib/action_view/railtie.rb
 - lib/action_view/record_identifier.rb
@@ -240,16 +240,15 @@ files:
 - lib/action_view/unbound_template.rb
 - lib/action_view/version.rb
 - lib/action_view/view_paths.rb
-- lib/assets/compiled/rails-ujs.js
 homepage: https://rubyonrails.org
 licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.0.8.7/actionview/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.0.8.7/
+  changelog_uri: https://github.com/rails/rails/blob/v7.1.5.1/actionview/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.1.5.1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.0.8.7/actionview
+  source_code_uri: https://github.com/rails/rails/tree/v7.1.5.1/actionview
   rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []