actionview 4.2.11.1 → 7.0.2.4

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,10 +1,12 @@
+# 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["value"] ||= format_date(value)
           options["min"] = format_date(datetime_value(options["min"]))
           options["max"] = format_date(datetime_value(options["max"]))
           @options = options
@@ -12,9 +14,8 @@ module ActionView
         end
 
         private
-
           def format_date(value)
-            value.try(:strftime, "%Y-%m-%dT%T.%L%z")
+            raise NotImplementedError
           end
 
           def datetime_value(value)

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,7 +1,25 @@
+# frozen_string_literal: true
+
 module ActionView
   module Helpers
     module Tags # :nodoc:
       class FileField < TextField # :nodoc:
+        def render
+          include_hidden = @options.delete(:include_hidden)
+          options = @options.stringify_keys
+          add_default_name_and_id(options)
+
+          if options["multiple"] && include_hidden
+            hidden_field_for_multiple_file(options) + super
+          else
+            super
+          end
+        end
+
+        private
+          def hidden_field_for_multiple_file(options)
+            tag("input", "name" => options["name"], "type" => "hidden", "value" => "", "autocomplete" => "off")
+          end
       end
     end
   end

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,7 +1,13 @@
+# frozen_string_literal: true
+
 module ActionView
   module Helpers
     module Tags # :nodoc:
       class HiddenField < TextField # :nodoc:
+        def render
+          @options[:autocomplete] = "off"
+          super
+        end
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionView
   module Helpers
     module Tags # :nodoc:
@@ -17,12 +19,16 @@ module ActionView
             method_and_value = @tag_value.present? ? "#{@method_name}.#{@tag_value}" : @method_name
 
             content ||= Translator
-              .new(object, @object_name, method_and_value, "helpers.label")
+              .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)
@@ -69,7 +75,6 @@ module ActionView
         end
 
         private
-
           def render_component(builder)
             builder.translation
           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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionView
   module Helpers
     module Tags # :nodoc:
@@ -10,7 +12,7 @@ module ActionView
             method_and_value = tag_value.is_a?(TrueClass) ? @method_name : "#{@method_name}.#{tag_value}"
 
             placeholder ||= Tags::Translator
-              .new(object, @object_name, method_and_value, "helpers.placeholder")
+              .new(object, @object_name, method_and_value, scope: "helpers.placeholder")
               .translate
             placeholder ||= @method_name.humanize
             @options[:placeholder] = placeholder

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

@@ -1,4 +1,6 @@
-require 'action_view/helpers/tags/checkable'
+# frozen_string_literal: true
+
+require "action_view/helpers/tags/checkable"
 
 module ActionView
   module Helpers
@@ -15,16 +17,15 @@ module ActionView
           options = @options.stringify_keys
           options["type"]     = "radio"
           options["value"]    = @tag_value
-          options["checked"] = "checked" if input_checked?(object, options)
+          options["checked"] = "checked" if input_checked?(options)
           add_default_name_and_id_for_value(@tag_value, options)
           tag("input", options)
         end
 
         private
-
-        def checked?(value)
-          value.to_s == @tag_value.to_s
-        end
+          def checked?(value)
+            value.to_s == @tag_value.to_s
+          end
       end
     end
   end

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

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

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

@@ -1,20 +1,25 @@
+# frozen_string_literal: true
+
 module ActionView
   module Helpers
     module Tags # :nodoc:
       class SearchField < TextField # :nodoc:
         def render
-          super do |options|
-            if options["autosave"]
-              if options["autosave"] == true
-                options["autosave"] = request.host.split(".").reverse.join(".")
-              end
-              options["results"] ||= 10
-            end
+          options = @options.stringify_keys
 
-            if options["onsearch"]
-              options["incremental"] = true unless options.has_key?("incremental")
+          if options["autosave"]
+            if options["autosave"] == true
+              options["autosave"] = request.host.split(".").reverse.join(".")
             end
+            options["results"] ||= 10
           end
+
+          if options["onsearch"]
+            options["incremental"] = true unless options.has_key?("incremental")
+          end
+
+          @options = options
+          super
         end
       end
     end

data/lib/action_view/helpers/tags/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.nil? ? "" : value },
+            disabled: @options[:disabled]
           }
 
           option_tags = if grouped_choices?
@@ -27,14 +29,13 @@ module ActionView
         end
 
         private
-
-        # Grouped choices look like this:
-        #
-        #   [nil, []]
-        #   { nil => [] }
-        def grouped_choices?
-          !@choices.empty? && @choices.first.respond_to?(:last) && Array === @choices.first.last
-        end
+          # Grouped choices look like this:
+          #
+          #   [nil, []]
+          #   { nil => [] }
+          def grouped_choices?
+            !@choices.blank? && @choices.first.respond_to?(:last) && Array === @choices.first.last
+          end
       end
     end
   end

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

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

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

@@ -1,4 +1,6 @@
-require 'action_view/helpers/tags/placeholderable'
+# frozen_string_literal: true
+
+require "action_view/helpers/tags/placeholderable"
 
 module ActionView
   module Helpers
@@ -14,7 +16,7 @@ module ActionView
             options["cols"], options["rows"] = size.split("x") if size.respond_to?(:split)
           end
 
-          content_tag("textarea", options.delete("value") { value_before_type_cast(object) }, options)
+          content_tag("textarea", options.delete("value") { value_before_type_cast }, options)
         end
       end
     end

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

@@ -1,4 +1,6 @@
-require 'action_view/helpers/tags/placeholderable'
+# frozen_string_literal: true
+
+require "action_view/helpers/tags/placeholderable"
 
 module ActionView
   module Helpers
@@ -10,23 +12,21 @@ module ActionView
           options = @options.stringify_keys
           options["size"] = options["maxlength"] unless options.key?("size")
           options["type"] ||= field_type
-          options["value"] = options.fetch("value") { value_before_type_cast(object) } unless field_type == "file"
-          yield options if block_given?
+          options["value"] = options.fetch("value") { value_before_type_cast } unless field_type == "file"
           add_default_name_and_id(options)
           tag("input", options)
         end
 
         class << self
           def field_type
-            @field_type ||= self.name.split("::").last.sub("Field", "").downcase
+            @field_type ||= name.split("::").last.sub("Field", "").downcase
           end
         end
 
         private
-
-        def field_type
-          self.class.field_type
-        end
+          def field_type
+            self.class.field_type
+          end
       end
     end
   end

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

@@ -1,11 +1,21 @@
+# frozen_string_literal: true
+
 module ActionView
   module Helpers
     module Tags # :nodoc:
       class TimeField < DatetimeField # :nodoc:
-        private
+        def initialize(object_name, method_name, template_object, options = {})
+          @include_seconds = options.delete(:include_seconds) { true }
+          super
+        end
 
+        private
           def format_date(value)
-            value.try(:strftime, "%T.%L")
+            if @include_seconds
+              value&.strftime("%T.%L")
+            else
+              value&.strftime("%H:%M")
+            end
           end
       end
     end

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionView
   module Helpers
     module Tags # :nodoc:
@@ -11,7 +13,7 @@ module ActionView
 
         def render
           select_content_tag(
-            time_zone_options_for_select(value(@object) || @options[:default], @priority_zones, @options[:model] || ActiveSupport::TimeZone), @options, @html_options
+            time_zone_options_for_select(value || @options[:default], @priority_zones, @options[:model] || ActiveSupport::TimeZone), @options, @html_options
           )
         end
       end

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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module ActionView
   module Helpers
     module Tags # :nodoc:
       class Translator # :nodoc:
-        def initialize(object, object_name, method_and_value, scope)
+        def initialize(object, object_name, method_and_value, scope:)
           @object_name = object_name.gsub(/\[(.*)_attributes\]\[\d+\]/, '.\1')
           @method_and_value = method_and_value
           @scope = scope
@@ -14,26 +16,23 @@ module ActionView
           translated_attribute || human_attribute_name
         end
 
-        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
-            key = model.model_name.i18n_key
-            ["#{key}.#{method_and_value}".to_sym, ""]
-          else
-            ""
+          def i18n_default
+            if model
+              key = model.model_name.i18n_key
+              ["#{key}.#{method_and_value}".to_sym, ""]
+            else
+              ""
+            end
           end
-        end
 
-        def human_attribute_name
-          if model && model.class.respond_to?(:human_attribute_name)
-            model.class.human_attribute_name(method_and_value)
+          def human_attribute_name
+            if model && model.class.respond_to?(:human_attribute_name)
+              model.class.human_attribute_name(method_and_value)
+            end
           end
-        end
       end
     end
   end

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

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

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

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module ActionView
+  module Helpers
+    module Tags # :nodoc:
+      class WeekdaySelect < Base # :nodoc:
+        def initialize(object_name, method_name, template_object, options, html_options)
+          @html_options = html_options
+
+          super(object_name, method_name, template_object, options)
+        end
+
+        def render
+          select_content_tag(
+            weekday_options_for_select(
+              value || @options[:selected],
+              index_as_value: @options.fetch(:index_as_value, false),
+              day_format: @options.fetch(:day_format, :day_names),
+              beginning_of_week: @options.fetch(:beginning_of_week, Date.beginning_of_week)
+            ),
+            @options,
+            @html_options
+          )
+        end
+      end
+    end
+  end
+end

data/lib/action_view/helpers/tags.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module ActionView
-  module Helpers
-    module Tags #:nodoc:
+  module Helpers # :nodoc:
+    module Tags # :nodoc:
       extend ActiveSupport::Autoload
 
       eager_autoload do
@@ -36,6 +38,7 @@ module ActionView
         autoload :TimeZoneSelect
         autoload :UrlField
         autoload :WeekField
+        autoload :WeekdaySelect
       end
     end
   end