actionview 4.1.13 → 6.1.3.1

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

@@ -1,4 +1,6 @@
-require 'action_view/helpers/tags/collection_helpers'
+# frozen_string_literal: true
+
+require "action_view/helpers/tags/collection_helpers"
 
 module ActionView
   module Helpers
@@ -7,26 +9,18 @@ module ActionView
         include CollectionHelpers
 
         class RadioButtonBuilder < Builder # :nodoc:
-          def radio_button(extra_html_options={})
+          def radio_button(extra_html_options = {})
             html_options = extra_html_options.merge(@input_html_options)
+            html_options[:skip_default_ids] = false
             @template_object.radio_button(@object_name, @method_name, @value, html_options)
           end
         end
 
         def render(&block)
-          render_collection do |item, value, text, default_html_options|
-            builder = instantiate_builder(RadioButtonBuilder, item, value, text, default_html_options)
-
-            if block_given?
-              @template_object.capture(builder, &block)
-            else
-              render_component(builder)
-            end
-          end
+          render_collection_for(RadioButtonBuilder, &block)
         end
 
         private
-
           def render_component(builder)
             builder.radio_button + builder.label
           end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionView
   module Helpers
     module Tags # :nodoc:
@@ -13,8 +15,8 @@ module ActionView
 
         def render
           option_tags_options = {
-            :selected => @options.fetch(:selected) { value(@object) },
-            :disabled => @options[:disabled]
+            selected: @options.fetch(:selected) { value },
+            disabled: @options[:disabled]
           }
 
           select_content_tag(

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

@@ -1,19 +1,20 @@
+# frozen_string_literal: true
+
 module ActionView
   module Helpers
     module Tags # :nodoc:
       class ColorField < TextField # :nodoc:
         def render
           options = @options.stringify_keys
-          options["value"] ||= validate_color_string(value(object))
+          options["value"] ||= validate_color_string(value)
           @options = options
           super
         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

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
 module ActionView
   module Helpers
     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

@@ -1,4 +1,6 @@
-require 'active_support/core_ext/time/calculations'
+# frozen_string_literal: true
+
+require "active_support/core_ext/time/calculations"
 
 module ActionView
   module Helpers
@@ -11,61 +13,60 @@ 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
           def select_type
-            @select_type ||= self.name.split("::").last.sub("Select", "").downcase
+            @select_type ||= name.split("::").last.sub("Select", "").downcase
           end
         end
 
         private
+          def select_type
+            self.class.select_type
+          end
 
-        def select_type
-          self.class.select_type
-        end
+          def datetime_selector(options, html_options)
+            datetime = options.fetch(:selected) { value || default_datetime(options) }
+            @auto_index ||= nil
 
-        def datetime_selector(options, html_options)
-          datetime = options.fetch(:selected) { value(object) || default_datetime(options) }
-          @auto_index ||= nil
+            options = options.dup
+            options[:field_name]           = @method_name
+            options[:include_position]     = true
+            options[:prefix]             ||= @object_name
+            options[:index]                = @auto_index if @auto_index && !options.has_key?(:index)
 
-          options = options.dup
-          options[:field_name]           = @method_name
-          options[:include_position]     = true
-          options[:prefix]             ||= @object_name
-          options[:index]                = @auto_index if @auto_index && !options.has_key?(:index)
+            DateTimeSelector.new(datetime, options, html_options)
+          end
 
-          DateTimeSelector.new(datetime, options, html_options)
-        end
+          def default_datetime(options)
+            return if options[:include_blank] || options[:prompt]
 
-        def default_datetime(options)
-          return if options[:include_blank] || options[:prompt]
+            case options[:default]
+            when nil
+              Time.current
+            when Date, Time
+              options[:default]
+            else
+              default = options[:default].dup
 
-          case options[:default]
-          when nil
-            Time.current
-          when Date, Time
-            options[:default]
-          else
-            default = options[:default].dup
+              # Rename :minute and :second to :min and :sec
+              default[:min] ||= default[:minute]
+              default[:sec] ||= default[:second]
 
-            # Rename :minute and :second to :min and :sec
-            default[:min] ||= default[:minute]
-            default[:sec] ||= default[:second]
+              time = Time.current
 
-            time = Time.current
+              [:year, :month, :day, :hour, :min, :sec].each do |key|
+                default[key] ||= time.public_send(key)
+              end
 
-            [:year, :month, :day, :hour, :min, :sec].each do |key|
-              default[key] ||= time.send(key)
+              Time.utc(
+                default[:year], default[:month], default[:day],
+                default[:hour], default[:min], default[:sec]
+              )
             end
-
-            Time.utc(
-              default[:year], default[:month], default[:day],
-              default[:hour], default[:min], default[:sec]
-            )
           end
-        end
       end
     end
   end

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

@@ -1,20 +1,29 @@
+# frozen_string_literal: true
+
 module ActionView
   module Helpers
     module Tags # :nodoc:
       class DatetimeField < TextField # :nodoc:
         def render
           options = @options.stringify_keys
-          options["value"] ||= format_date(value(object))
-          options["min"] = format_date(options["min"])
-          options["max"] = format_date(options["max"])
+          options["value"] ||= format_date(value)
+          options["min"] = format_date(datetime_value(options["min"]))
+          options["max"] = format_date(datetime_value(options["max"]))
           @options = options
           super
         end
 
         private
-
           def format_date(value)
-            value.try(:strftime, "%Y-%m-%dT%T.%L%z")
+            raise NotImplementedError
+          end
+
+          def datetime_value(value)
+            if value.is_a? String
+              DateTime.parse(value) rescue nil
+            else
+              value
+            end
           end
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionView
   module Helpers
     module Tags # :nodoc:
@@ -9,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/datetime_select.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionView
   module Helpers
     module Tags # :nodoc:

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionView
   module Helpers
     module Tags # :nodoc:

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionView
   module Helpers
     module Tags # :nodoc:

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionView
   module Helpers
     module Tags # :nodoc:
@@ -15,8 +17,8 @@ module ActionView
 
         def render
           option_tags_options = {
-            :selected => @options.fetch(:selected) { value(@object) },
-            :disabled => @options[:disabled]
+            selected: @options.fetch(:selected) { value },
+            disabled: @options[:disabled]
           }
 
           select_content_tag(

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionView
   module Helpers
     module Tags # :nodoc:

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

@@ -1,7 +1,36 @@
+# frozen_string_literal: true
+
 module ActionView
   module Helpers
     module Tags # :nodoc:
       class Label < Base # :nodoc:
+        class LabelBuilder # :nodoc:
+          attr_reader :object
+
+          def initialize(template_object, object_name, method_name, object, tag_value)
+            @template_object = template_object
+            @object_name = object_name
+            @method_name = method_name
+            @object = object
+            @tag_value = tag_value
+          end
+
+          def translation
+            method_and_value = @tag_value.present? ? "#{@method_name}.#{@tag_value}" : @method_name
+
+            content ||= Translator
+              .new(object, @object_name, method_and_value, scope: "helpers.label")
+              .translate
+            content ||= @method_name.humanize
+
+            content
+          end
+
+          def to_s
+            translation
+          end
+        end
+
         def initialize(object_name, method_name, template_object, content_or_options = nil, options = nil)
           options ||= {}
 
@@ -32,33 +61,23 @@ module ActionView
           options.delete("namespace")
           options["for"] = name_and_id["id"] unless options.key?("for")
 
-          if block_given?
-            content = @template_object.capture(&block)
-          else
-            content = if @content.blank?
-                        @object_name.gsub!(/\[(.*)_attributes\]\[\d+\]/, '.\1')
-                        method_and_value = tag_value.present? ? "#{@method_name}.#{tag_value}" : @method_name
-
-                        if object.respond_to?(:to_model)
-                          key = object.class.model_name.i18n_key
-                          i18n_default = ["#{key}.#{method_and_value}".to_sym, ""]
-                        end
-
-                        i18n_default ||= ""
-                        I18n.t("#{@object_name}.#{method_and_value}", :default => i18n_default, :scope => "helpers.label").presence
-                      else
-                        @content.to_s
-                      end
+          builder = LabelBuilder.new(@template_object, @object_name, @method_name, @object, tag_value)
 
-            content ||= if object && object.class.respond_to?(:human_attribute_name)
-                          object.class.human_attribute_name(@method_name)
-                        end
-
-            content ||= @method_name.humanize
+          content = if block_given?
+            @template_object.capture(builder, &block)
+          elsif @content.present?
+            @content.to_s
+          else
+            render_component(builder)
           end
 
           label_tag(name_and_id["id"], content, options)
         end
+
+        private
+          def render_component(builder)
+            builder.translation
+          end
       end
     end
   end

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

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
 module ActionView
   module Helpers
     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/number_field.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionView
   module Helpers
     module Tags # :nodoc:

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module ActionView
   module Helpers
     module Tags # :nodoc:
       class PasswordField < TextField # :nodoc:
         def render
-          @options = {:value => nil}.merge!(@options)
+          @options = { value: nil }.merge!(@options)
           super
         end
       end

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module ActionView
+  module Helpers
+    module Tags # :nodoc:
+      module Placeholderable # :nodoc:
+        def initialize(*)
+          super
+
+          if tag_value = @options[:placeholder]
+            placeholder = tag_value if tag_value.is_a?(String)
+            method_and_value = tag_value.is_a?(TrueClass) ? @method_name : "#{@method_name}.#{tag_value}"
+
+            placeholder ||= Tags::Translator
+              .new(object, @object_name, method_and_value, scope: "helpers.placeholder")
+              .translate
+            placeholder ||= @method_name.humanize
+            @options[:placeholder] = placeholder
+          end
+        end
+      end
+    end
+  end
+end