actionview 6.0.0.rc1 → 6.0.3.rc1

data/lib/action_view/helpers/tags/check_box.rb

@@ -39,7 +39,6 @@ module ActionView
         end
 
         private
-
           def checked?(value)
             case value
             when TrueClass, FalseClass

data/lib/action_view/helpers/tags/collection_check_boxes.rb

@@ -22,7 +22,6 @@ module ActionView
         end
 
         private
-
           def render_component(builder)
             builder.check_box + builder.label
           end

data/lib/action_view/helpers/tags/collection_helpers.rb

@@ -37,7 +37,6 @@ module ActionView
         end
 
         private
-
           def instantiate_builder(builder_class, item, value, text, html_options)
             builder_class.new(@template_object, @object_name, @method_name, item,
                               sanitize_attribute_name(value), text, value, html_options)

data/lib/action_view/helpers/tags/collection_radio_buttons.rb

@@ -21,7 +21,6 @@ module ActionView
         end
 
         private
-
           def render_component(builder)
             builder.radio_button + builder.label
           end

data/lib/action_view/helpers/tags/color_field.rb

@@ -12,7 +12,6 @@ module ActionView
         end
 
         private
-
           def validate_color_string(string)
             regex = /#[0-9a-fA-F]{6}/
             if regex.match?(string)

data/lib/action_view/helpers/tags/date_field.rb

@@ -5,7 +5,6 @@ module ActionView
     module Tags # :nodoc:
       class DateField < DatetimeField # :nodoc:
         private
-
           def format_date(value)
             value.try(:strftime, "%Y-%m-%d")
           end

data/lib/action_view/helpers/tags/date_select.rb

@@ -23,7 +23,6 @@ module ActionView
         end
 
         private
-
           def select_type
             self.class.select_type
           end

data/lib/action_view/helpers/tags/datetime_field.rb

@@ -14,7 +14,6 @@ module ActionView
         end
 
         private
-
           def format_date(value)
             raise NotImplementedError
           end

data/lib/action_view/helpers/tags/datetime_local_field.rb

@@ -11,7 +11,6 @@ module ActionView
         end
 
         private
-
           def format_date(value)
             value.try(:strftime, "%Y-%m-%dT%T")
           end

data/lib/action_view/helpers/tags/label.rb

@@ -71,7 +71,6 @@ module ActionView
         end
 
         private
-
           def render_component(builder)
             builder.translation
           end

data/lib/action_view/helpers/tags/month_field.rb

@@ -5,7 +5,6 @@ module ActionView
     module Tags # :nodoc:
       class MonthField < DatetimeField # :nodoc:
         private
-
           def format_date(value)
             value.try(:strftime, "%Y-%m")
           end

data/lib/action_view/helpers/tags/radio_button.rb

@@ -23,7 +23,6 @@ module ActionView
         end
 
         private
-
           def checked?(value)
             value.to_s == @tag_value.to_s
           end

data/lib/action_view/helpers/tags/select.rb

@@ -29,7 +29,6 @@ module ActionView
         end
 
         private
-
           # Grouped choices look like this:
           #
           #   [nil, []]

data/lib/action_view/helpers/tags/text_field.rb

@@ -24,7 +24,6 @@ module ActionView
         end
 
         private
-
           def field_type
             self.class.field_type
           end

data/lib/action_view/helpers/tags/time_field.rb

@@ -5,7 +5,6 @@ module ActionView
     module Tags # :nodoc:
       class TimeField < DatetimeField # :nodoc:
         private
-
           def format_date(value)
             value.try(:strftime, "%T.%L")
           end

data/lib/action_view/helpers/tags/week_field.rb

@@ -5,7 +5,6 @@ module ActionView
     module Tags # :nodoc:
       class WeekField < DatetimeField # :nodoc:
         private
-
           def format_date(value)
             value.try(:strftime, "%Y-W%V")
           end

data/lib/action_view/helpers/text_helper.rb

@@ -426,7 +426,6 @@ module ActionView
         end
 
         private
-
           def next_index
             step_index(1)
           end

data/lib/action_view/helpers/translation_helper.rb

@@ -57,10 +57,9 @@ module ActionView
       # that include HTML tags so that you know what kind of output to expect
       # when you call translate in a template and translators know which keys
       # they can provide HTML values for.
-      def translate(key, options = {})
-        options = options.dup
+      def translate(key, **options)
         if options.has_key?(:default)
-          remaining_defaults = Array(options.delete(:default)).compact
+          remaining_defaults = Array.wrap(options.delete(:default)).compact
           options[:default] = remaining_defaults unless remaining_defaults.first.kind_of?(Symbol)
         end
 
@@ -82,18 +81,18 @@ module ActionView
               html_safe_options[name] = ERB::Util.html_escape(value.to_s)
             end
           end
-          translation = I18n.translate(scope_key_by_partial(key), html_safe_options.merge(raise: i18n_raise))
+          translation = I18n.translate(scope_key_by_partial(key), **html_safe_options.merge(raise: i18n_raise))
           if translation.respond_to?(:map)
             translation.map { |element| element.respond_to?(:html_safe) ? element.html_safe : element }
           else
             translation.respond_to?(:html_safe) ? translation.html_safe : translation
           end
         else
-          I18n.translate(scope_key_by_partial(key), options.merge(raise: i18n_raise))
+          I18n.translate(scope_key_by_partial(key), **options.merge(raise: i18n_raise))
         end
       rescue I18n::MissingTranslationData => e
         if remaining_defaults.present?
-          translate remaining_defaults.shift, options.merge(default: remaining_defaults)
+          translate remaining_defaults.shift, **options.merge(default: remaining_defaults)
         else
           raise e if raise_error
 
@@ -116,8 +115,8 @@ module ActionView
       #
       # See https://www.rubydoc.info/github/svenfuchs/i18n/master/I18n/Backend/Base:localize
       # for more information.
-      def localize(*args)
-        I18n.localize(*args)
+      def localize(object, **options)
+        I18n.localize(object, **options)
       end
       alias :l :localize
 

data/lib/action_view/helpers/url_helper.rb

@@ -253,7 +253,7 @@ module ActionView
       #   #      <input value="New" type="submit" />
       #   #    </form>"
       #
-      #   <%= button_to "New", new_articles_path %>
+      #   <%= button_to "New", new_article_path %>
       #   # => "<form method="post" action="/articles/new" class="button_to">
       #   #      <input value="New" type="submit" />
       #   #    </form>"

data/lib/action_view/layouts.rb

@@ -224,7 +224,6 @@ module ActionView
       # that if no layout conditions are used, this method is not used
       module LayoutConditions # :nodoc:
         private
-
           # Determines whether the current action has a layout definition by
           # checking the action name against the :only and :except conditions
           # set by the <tt>layout</tt> method.
@@ -334,7 +333,6 @@ module ActionView
       end
 
       private
-
         # If no layout is supplied, look for a template named the return
         # value of this method.
         #
@@ -372,7 +370,6 @@ module ActionView
     end
 
   private
-
     def _conditional_layout?
       true
     end

data/lib/action_view/log_subscriber.rb

@@ -54,7 +54,6 @@ module ActionView
     end
 
   private
-
     EMPTY = ""
     def from_rails_root(string) # :doc:
       string = string.sub(rails_root, EMPTY)

data/lib/action_view/lookup_context.rb

@@ -61,6 +61,7 @@ module ActionView
 
       @details_keys = Concurrent::Map.new
       @digest_cache = Concurrent::Map.new
+      @view_context_mutex = Mutex.new
 
       def self.digest_cache(details)
         @digest_cache[details_cache_key(details)] ||= Concurrent::Map.new
@@ -89,7 +90,9 @@ module ActionView
       end
 
       def self.view_context_class(klass)
-        @view_context_class ||= klass.with_empty_template_cache
+        @view_context_mutex.synchronize do
+          @view_context_class ||= klass.with_empty_template_cache
+        end
       end
     end
 
@@ -112,7 +115,6 @@ module ActionView
       end
 
     private
-
       def _set_detail(key, value) # :doc:
         @details = @details.dup if @digest_cache || @details_key
         @digest_cache = nil
@@ -171,7 +173,6 @@ module ActionView
       end
 
     private
-
       # Whenever setting view paths, makes a copy so that we can manipulate them in
       # instance objects as we wish.
       def build_view_paths(paths)

data/lib/action_view/path_set.rb

@@ -69,7 +69,6 @@ module ActionView #:nodoc:
     end
 
     private
-
       def _find_all(path, prefixes, args)
         prefixes = [prefixes] if String === prefixes
         prefixes.each do |prefix|

data/lib/action_view/record_identifier.rb

@@ -95,7 +95,6 @@ module ActionView
     end
 
   private
-
     # Returns a string representation of the key attribute(s) that is suitable for use in an HTML DOM id.
     # This can be overwritten to customize the default generated string representation if desired.
     # If you need to read back a key from a dom_id in order to query for the underlying database record,

data/lib/action_view/renderer/abstract_renderer.rb

@@ -75,7 +75,6 @@ module ActionView
     end
 
     private
-
       def extract_details(options) # :doc:
         @lookup_context.registered_details.each_with_object({}) do |key, details|
           value = options[key]

data/lib/action_view/renderer/partial_renderer.rb

@@ -105,9 +105,6 @@ module ActionView
   #
   #   <%= render(partial: "ad", collection: @advertisements) || "There's no ad to be displayed" %>
   #
-  # NOTE: Due to backwards compatibility concerns, the collection can't be one of hashes. Normally you'd also
-  # just keep domain objects, like Active Records, in there.
-  #
   # == \Rendering shared partials
   #
   # Two controllers can share a set of partials and render them like this:
@@ -322,7 +319,6 @@ module ActionView
     end
 
     private
-
       def render_collection(view, template)
         identifier = (template && template.identifier) || @path
         instrument(:collection, identifier: identifier, count: @collection.size) do |payload|

data/lib/action_view/renderer/partial_renderer/collection_caching.rb

@@ -12,7 +12,7 @@ module ActionView
 
     private
       def cache_collection_render(instrumentation_payload, view, template)
-        return yield unless @options[:cached]
+        return yield unless @options[:cached] && view.controller.respond_to?(:perform_caching) && view.controller.perform_caching
 
         # Result is a hash with the key represents the
         # key used for cache lookup and the value is the item

data/lib/action_view/renderer/streaming_template_renderer.rb

@@ -27,7 +27,6 @@ module ActionView
       end
 
       private
-
         # This is the same logging logic as in ShowExceptions middleware.
         def log_error(exception)
           logger = ActionView::Base.logger
@@ -55,7 +54,6 @@ module ActionView
     end
 
     private
-
       def delayed_render(buffer, template, layout, view, locals)
         # Wrap the given buffer in the StreamingBuffer and pass it to the
         # underlying template handler. Now, every time something is concatenated

data/lib/action_view/renderer/template_renderer.rb

@@ -14,7 +14,6 @@ module ActionView
     end
 
     private
-
       # Determine the template to be rendered using the given options.
       def determine_template(options)
         keys = options.has_key?(:locals) ? options[:locals].keys : []
@@ -96,7 +95,7 @@ module ActionView
             end
           rescue ActionView::MissingTemplate
             all_details = @details.merge(formats: @lookup_context.default_formats)
-            raise unless template_exists?(layout, nil, false, [], all_details)
+            raise unless template_exists?(layout, nil, false, [], **all_details)
           end
         when Proc
           resolve_layout(layout.call(@lookup_context, formats), keys, formats)

data/lib/action_view/rendering.rb

@@ -104,7 +104,6 @@ module ActionView
     end
 
     private
-
       # Find and render a template based on the options given.
       def _render_template(options)
         variant = options.delete(:variant)

data/lib/action_view/template.rb

@@ -264,7 +264,6 @@ module ActionView
     end
 
     private
-
       # Compile a template. This method ensures a template is compiled
       # just once and removes the source after it is compiled.
       def compile!(view)

data/lib/action_view/template/error.rb

@@ -81,19 +81,19 @@ module ActionView
         end
       end
 
-      def source_extract(indentation = 0, output = :console)
-        return unless num = line_number
+      def source_extract(indentation = 0)
+        return [] unless num = line_number
         num = num.to_i
 
-        source_code = @template.source.split("\n")
+        source_code = @template.encode!.split("\n")
 
         start_on_line = [ num - SOURCE_CODE_RADIUS - 1, 0 ].max
         end_on_line   = [ num + SOURCE_CODE_RADIUS - 1, source_code.length].min
 
         indent = end_on_line.to_s.size + indentation
-        return unless source_code = source_code[start_on_line..end_on_line]
+        return [] unless source_code = source_code[start_on_line..end_on_line]
 
-        formatted_code_for(source_code, start_on_line, indent, output)
+        formatted_code_for(source_code, start_on_line, indent)
       end
 
       def sub_template_of(template_path)
@@ -114,7 +114,6 @@ module ActionView
       end
 
       private
-
         def source_location
           if line_number
             "on line ##{line_number} of "
@@ -123,15 +122,11 @@ module ActionView
           end + file_name
         end
 
-        def formatted_code_for(source_code, line_counter, indent, output)
-          start_value = (output == :html) ? {} : []
-          source_code.inject(start_value) do |result, line|
+        def formatted_code_for(source_code, line_counter, indent)
+          indent_template = "%#{indent}s: %s"
+          source_code.map do |line|
             line_counter += 1
-            if output == :html
-              result.update(line_counter.to_s => "%#{indent}s %s\n" % ["", line])
-            else
-              result << "%#{indent}s: %s" % [line_counter, line]
-            end
+            indent_template % [line_counter, line]
           end
         end
     end

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

@@ -63,7 +63,6 @@ module ActionView
         end
 
       private
-
         def valid_encoding(string, encoding)
           # If a magic encoding comment was found, tag the
           # String with this encoding. This is for a case

data/lib/action_view/template/resolver.rb

@@ -93,7 +93,6 @@ module ActionView
       end
 
       private
-
         def canonical_no_templates(templates)
           templates.empty? ? NO_TEMPLATES : templates
         end
@@ -130,7 +129,6 @@ module ActionView
     end
 
   private
-
     def _find_all(name, prefix, partial, details, key, locals)
       find_templates(name, prefix, partial, details, locals)
     end
@@ -183,7 +181,6 @@ module ActionView
     end
 
     private
-
       def _find_all(name, prefix, partial, details, key, locals)
         path = Path.build(name, prefix, partial)
         query(path, details, details[:formats], locals, cache: !!key)
@@ -323,7 +320,6 @@ module ActionView
     end
 
     private
-
       def find_template_paths_from_details(path, details)
         # Instead of checking for every possible path, as our other globs would
         # do, scan the directory for files with the right prefix.
@@ -358,7 +354,7 @@ module ActionView
       end
 
       def build_regex(path, details)
-        query = escape_entry(File.join(@path, path))
+        query = Regexp.escape(File.join(@path, path))
         exts = EXTENSIONS.map do |ext, prefix|
           match =
             if ext == :variants && details[ext] == :any