actionview 5.2.7.1 → 6.1.4.6

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

@@ -34,7 +34,6 @@ module ActionView
         end
 
         private
-
           def value
             if @allow_method_names_outside_object
               object.public_send @method_name if object && object.respond_to?(@method_name)
@@ -106,19 +105,19 @@ module ActionView
           end
 
           def tag_name(multiple = false, index = nil)
-            # a little duplication to construct less strings
+            # a little duplication to construct fewer strings
             case
             when @object_name.empty?
-              "#{sanitized_method_name}#{"[]" if multiple}"
+              "#{sanitized_method_name}#{multiple ? "[]" : ""}"
             when index
-              "#{@object_name}[#{index}][#{sanitized_method_name}]#{"[]" if multiple}"
+              "#{@object_name}[#{index}][#{sanitized_method_name}]#{multiple ? "[]" : ""}"
             else
-              "#{@object_name}[#{sanitized_method_name}]#{"[]" if multiple}"
+              "#{@object_name}[#{sanitized_method_name}]#{multiple ? "[]" : ""}"
             end
           end
 
           def tag_id(index = nil)
-            # a little duplication to construct less strings
+            # a little duplication to construct fewer strings
             case
             when @object_name.empty?
               sanitized_method_name.dup
@@ -130,15 +129,15 @@ module ActionView
           end
 
           def sanitized_object_name
-            @sanitized_object_name ||= @object_name.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
+            @sanitized_object_name ||= @object_name.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").delete_suffix("_")
           end
 
           def sanitized_method_name
-            @sanitized_method_name ||= @method_name.sub(/\?$/, "")
+            @sanitized_method_name ||= @method_name.delete_suffix("?")
           end
 
           def sanitized_value(value)
-            value.to_s.gsub(/\s/, "_").gsub(/[^-[[:word:]]]/, "").mb_chars.downcase.to_s
+            value.to_s.gsub(/[\s\.]/, "_").gsub(/[^-[[:word:]]]/, "").downcase
           end
 
           def select_content_tag(option_tags, options, html_options)
@@ -167,11 +166,19 @@ module ActionView
 
           def add_options(option_tags, options, value = nil)
             if options[:include_blank]
-              option_tags = tag_builder.content_tag_string("option", options[:include_blank].kind_of?(String) ? options[:include_blank] : nil, value: "") + "\n" + option_tags
+              content = (options[:include_blank] if options[:include_blank].is_a?(String))
+              label = (" " unless content)
+              option_tags = tag_builder.content_tag_string("option", content, value: "", label: label) + "\n" + option_tags
             end
+
             if value.blank? && options[:prompt]
-              option_tags = tag_builder.content_tag_string("option", prompt_text(options[:prompt]), value: "") + "\n" + option_tags
+              tag_options = { value: "" }.tap do |prompt_opts|
+                prompt_opts[:disabled] = true if options[:disabled] == ""
+                prompt_opts[:selected] = true if options[:selected] == ""
+              end
+              option_tags = tag_builder.content_tag_string("option", prompt_text(options[:prompt]), tag_options) + "\n" + option_tags
             end
+
             option_tags
           end
 

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,10 +12,9 @@ module ActionView
         end
 
         private
-
           def validate_color_string(string)
             regex = /#[0-9a-fA-F]{6}/
-            if regex.match(string)
+            if regex.match?(string)
               string.downcase
             else
               "#000000"

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

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

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

@@ -13,7 +13,7 @@ module ActionView
         end
 
         def render
-          error_wrapping(datetime_selector(@options, @html_options).send("select_#{select_type}").html_safe)
+          error_wrapping(datetime_selector(@options, @html_options).public_send("select_#{select_type}").html_safe)
         end
 
         class << self
@@ -23,7 +23,6 @@ module ActionView
         end
 
         private
-
           def select_type
             self.class.select_type
           end
@@ -59,7 +58,7 @@ module ActionView
               time = Time.current
 
               [:year, :month, :day, :hour, :min, :sec].each do |key|
-                default[key] ||= time.send(key)
+                default[key] ||= time.public_send(key)
               end
 
               Time.utc(

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,9 +11,8 @@ module ActionView
         end
 
         private
-
           def format_date(value)
-            value.try(:strftime, "%Y-%m-%dT%T")
+            value&.strftime("%Y-%m-%dT%T")
           end
       end
     end

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

@@ -25,6 +25,10 @@ module ActionView
 
             content
           end
+
+          def to_s
+            translation
+          end
         end
 
         def initialize(object_name, method_name, template_object, content_or_options = nil, options = nil)
@@ -71,7 +75,6 @@ module ActionView
         end
 
         private
-
           def render_component(builder)
             builder.translation
           end

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

@@ -5,9 +5,8 @@ module ActionView
     module Tags # :nodoc:
       class MonthField < DatetimeField # :nodoc:
         private
-
           def format_date(value)
-            value.try(:strftime, "%Y-%m")
+            value&.strftime("%Y-%m")
           end
       end
     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

@@ -15,7 +15,7 @@ module ActionView
 
         def render
           option_tags_options = {
-            selected: @options.fetch(:selected) { value },
+            selected: @options.fetch(:selected) { value.nil? ? "" : value },
             disabled: @options[:disabled]
           }
 
@@ -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,9 +5,8 @@ module ActionView
     module Tags # :nodoc:
       class TimeField < DatetimeField # :nodoc:
         private
-
           def format_date(value)
-            value.try(:strftime, "%T.%L")
+            value&.strftime("%T.%L")
           end
       end
     end

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

@@ -16,13 +16,8 @@ module ActionView
           translated_attribute || human_attribute_name
         end
 
-        # TODO Change this to private once we've dropped Ruby 2.2 support.
-        # Workaround for Ruby 2.2 "private attribute?" warning.
-        protected
-
-          attr_reader :object_name, :method_and_value, :scope, :model
-
         private
+          attr_reader :object_name, :method_and_value, :scope, :model
 
           def i18n_default
             if model

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

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

data/lib/action_view/helpers/text_helper.rb

@@ -105,7 +105,7 @@ module ActionView
       # Highlights one or more +phrases+ everywhere in +text+ by inserting it into
       # a <tt>:highlighter</tt> string. The highlighter can be specialized by passing <tt>:highlighter</tt>
       # as a single-quoted string with <tt>\1</tt> where the phrase is to be inserted (defaults to
-      # '<mark>\1</mark>') or passing a block that receives each matched term. By default +text+
+      # <tt><mark>\1</mark></tt>) or passing a block that receives each matched term. By default +text+
       # is sanitized to prevent possible XSS attacks. If the input is trustworthy, passing false
       # for <tt>:sanitize</tt> will turn sanitizing off.
       #
@@ -188,7 +188,7 @@ module ActionView
 
         unless separator.empty?
           text.split(separator).each do |value|
-            if value.match(regex)
+            if value.match?(regex)
               phrase = value
               break
             end
@@ -228,7 +228,7 @@ module ActionView
       #   pluralize(2, 'Person', locale: :de)
       #   # => 2 Personen
       def pluralize(count, singular, plural_arg = nil, plural: plural_arg, locale: I18n.locale)
-        word = if (count == 1 || count.to_s =~ /^1(\.0+)?$/)
+        word = if count == 1 || count.to_s.match?(/^1(\.0+)?$/)
           singular
         else
           plural || singular.pluralize(locale)
@@ -259,7 +259,7 @@ module ActionView
       #   # => Once\r\nupon\r\na\r\ntime
       def word_wrap(text, line_width: 80, break_sequence: "\n")
         text.split("\n").collect! do |line|
-          line.length > line_width ? line.gsub(/(.{1,#{line_width}})(\s+|$)/, "\\1#{break_sequence}").strip : line
+          line.length > line_width ? line.gsub(/(.{1,#{line_width}})(\s+|$)/, "\\1#{break_sequence}").rstrip : line
         end * break_sequence
       end
 
@@ -426,7 +426,6 @@ module ActionView
         end
 
         private
-
           def next_index
             step_index(1)
           end

data/lib/action_view/helpers/translation_helper.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 require "action_view/helpers/tag_helper"
-require "active_support/core_ext/string/access"
-require "i18n/exceptions"
+require "active_support/core_ext/symbol/starts_ends_with"
 
 module ActionView
   # = Action View Translation Helpers
@@ -57,74 +56,67 @@ 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
-        has_default = options.has_key?(:default)
-        remaining_defaults = Array(options.delete(:default)).compact
-
-        if has_default && !remaining_defaults.first.kind_of?(Symbol)
-          options[:default] = remaining_defaults
-        end
+      #
+      # To access the translated text along with the fully resolved
+      # translation key, <tt>translate</tt> accepts a block:
+      #
+      #     <%= translate(".relative_key") do |translation, resolved_key| %>
+      #       <span title="<%= resolved_key %>"><%= translation %></span>
+      #     <% end %>
+      #
+      # This enables annotate translated text to be aware of the scope it was
+      # resolved against.
+      #
+      def translate(key, **options)
+        return key.map { |k| translate(k, **options) } if key.is_a?(Array)
+        key = key&.to_s unless key.is_a?(Symbol)
 
-        # If the user has explicitly decided to NOT raise errors, pass that option to I18n.
-        # Otherwise, tell I18n to raise an exception, which we rescue further in this method.
-        # Note: `raise_error` refers to us re-raising the error in this method. I18n is forced to raise by default.
-        if options[:raise] == false
-          raise_error = false
-          i18n_raise = false
-        else
-          raise_error = options[:raise] || ActionView::Base.raise_on_missing_translations
-          i18n_raise = true
+        alternatives = if options.key?(:default)
+          options[:default].is_a?(Array) ? options.delete(:default).compact : [options.delete(:default)]
         end
 
-        if html_safe_translation_key?(key)
-          html_safe_options = options.dup
+        options[:raise] = true if options[:raise].nil? && ActionView::Base.raise_on_missing_translations
+        default = MISSING_TRANSLATION
 
-          options.except(*I18n::RESERVED_KEYS).each do |name, value|
-            unless name == :count && value.is_a?(Numeric)
-              html_safe_options[name] = ERB::Util.html_escape(value.to_s)
-            end
+        translation = while key || alternatives.present?
+          if alternatives.blank? && !options[:raise].nil?
+            default = NO_DEFAULT # let I18n handle missing translation
           end
 
-          html_safe_options[:default] = MISSING_TRANSLATION unless html_safe_options[:default].blank?
-
-          translation = I18n.translate(scope_key_by_partial(key), html_safe_options.merge(raise: i18n_raise))
+          key = scope_key_by_partial(key)
 
-          if translation.equal?(MISSING_TRANSLATION)
-            options[:default].first
+          if html_safe_translation_key?(key)
+            html_safe_options ||= html_escape_translation_options(options)
+            translated = I18n.translate(key, **html_safe_options, default: default)
+            break html_safe_translation(translated) unless translated.equal?(MISSING_TRANSLATION)
           else
-            translation.respond_to?(:html_safe) ? translation.html_safe : translation
+            translated = I18n.translate(key, **options, default: default)
+            break translated unless translated.equal?(MISSING_TRANSLATION)
           end
-        else
-          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)
-        else
-          raise e if raise_error
-
-          keys = I18n.normalize_keys(e.locale, e.key, e.options[:scope])
-          title = "translation missing: #{keys.join('.')}".dup
-
-          interpolations = options.except(:default, :scope)
-          if interpolations.any?
-            title << ", " << interpolations.map { |k, v| "#{k}: #{ERB::Util.html_escape(v)}" }.join(", ")
+
+          if alternatives.present? && !alternatives.first.is_a?(Symbol)
+            break alternatives.first && I18n.translate(**options, default: alternatives)
           end
 
-          return title unless ActionView::Base.debug_missing_translation
+          first_key ||= key
+          key = alternatives&.shift
+        end
 
-          content_tag("span", keys.last.to_s.titleize, class: "translation_missing", title: title)
+        if key.nil? && !first_key.nil?
+          translation = missing_translation(first_key, options)
+          key = first_key
         end
+
+        block_given? ? yield(translation, key) : translation
       end
       alias :t :translate
 
       # Delegates to <tt>I18n.localize</tt> with no additional functionality.
       #
-      # See http://rubydoc.info/github/svenfuchs/i18n/master/I18n/Backend/Base:localize
+      # 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
 
@@ -132,10 +124,19 @@ module ActionView
         MISSING_TRANSLATION = Object.new
         private_constant :MISSING_TRANSLATION
 
+        NO_DEFAULT = [].freeze
+        private_constant :NO_DEFAULT
+
+        def self.i18n_option?(name)
+          (@i18n_option_names ||= I18n::RESERVED_KEYS.to_set).include?(name)
+        end
+
         def scope_key_by_partial(key)
-          if key.to_s.first == "."
+          if key&.start_with?(".")
             if @virtual_path
-              @virtual_path.gsub(%r{/_?}, ".") + key.to_s
+              @_scope_key_by_partial_cache ||= {}
+              @_scope_key_by_partial_cache[@virtual_path] ||= @virtual_path.gsub(%r{/_?}, ".")
+              "#{@_scope_key_by_partial_cache[@virtual_path]}#{key}"
             else
               raise "Cannot use t(#{key.inspect}) shortcut because path is not available"
             end
@@ -144,8 +145,47 @@ module ActionView
           end
         end
 
+        def html_escape_translation_options(options)
+          return options if options.empty?
+          html_safe_options = options.dup
+
+          options.each do |name, value|
+            unless TranslationHelper.i18n_option?(name) || (name == :count && value.is_a?(Numeric))
+              html_safe_options[name] = ERB::Util.html_escape(value.to_s)
+            end
+          end
+
+          html_safe_options
+        end
+
         def html_safe_translation_key?(key)
-          /(\b|_|\.)html$/.match?(key.to_s)
+          /(?:_|\b)html\z/.match?(key)
+        end
+
+        def html_safe_translation(translation)
+          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
+        end
+
+        def missing_translation(key, options)
+          keys = I18n.normalize_keys(options[:locale] || I18n.locale, key, options[:scope])
+
+          title = +"translation missing: #{keys.join(".")}"
+
+          options.each do |name, value|
+            unless name == :scope
+              title << ", " << name.to_s << ": " << ERB::Util.html_escape(value)
+            end
+          end
+
+          if ActionView::Base.debug_missing_translation
+            content_tag("span", keys.last.to_s.titleize, class: "translation_missing", title: title)
+          else
+            title
+          end
         end
     end
   end