simple_form 2.0.0 → 3.5.1

data/lib/simple_form/helpers/validators.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module SimpleForm
   module Helpers
     module Validators
@@ -24,7 +25,7 @@ module SimpleForm
       end
 
       def action_validator_match?(validator)
-        return true if !validator.options.include?(:on)
+        return true unless validator.options.include?(:on)
 
         case validator.options[:on]
         when :save
@@ -36,8 +37,8 @@ module SimpleForm
         end
       end
 
-      def find_validator(validator)
-        attribute_validators.find { |v| validator === v } if has_validators?
+      def find_validator(kind)
+        attribute_validators.find { |v| v.kind == kind } if has_validators?
       end
     end
   end

data/lib/simple_form/helpers.rb

@@ -1,12 +1,13 @@
+# frozen_string_literal: true
 module SimpleForm
   # Helpers are made of several helpers that cannot be turned on automatically.
   # For instance, disabled cannot be turned on automatically, it requires the
-  # user to explicitly pass the option :disabled => true so it may work.
+  # user to explicitly pass the option disabled: true so it may work.
   module Helpers
-    autoload :Autofocus,    'simple_form/helpers/autofocus'
-    autoload :Disabled,     'simple_form/helpers/disabled'
-    autoload :Readonly,     'simple_form/helpers/readonly'
-    autoload :Required,     'simple_form/helpers/required'
-    autoload :Validators,   'simple_form/helpers/validators'
+    autoload :Autofocus,  'simple_form/helpers/autofocus'
+    autoload :Disabled,   'simple_form/helpers/disabled'
+    autoload :Readonly,   'simple_form/helpers/readonly'
+    autoload :Required,   'simple_form/helpers/required'
+    autoload :Validators, 'simple_form/helpers/validators'
   end
 end

data/lib/simple_form/i18n_cache.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module SimpleForm
   # A lot of configuration values are retrived from I18n,
   # like boolean collection, required string. This module provides

data/lib/simple_form/inputs/base.rb

@@ -1,6 +1,14 @@
+# frozen_string_literal: true
+require 'simple_form/i18n_cache'
+require 'active_support/core_ext/string/output_safety'
+require 'action_view/helpers'
+
 module SimpleForm
   module Inputs
     class Base
+      include ERB::Util
+      include ActionView::Helpers::TranslationHelper
+
       extend I18nCache
 
       include SimpleForm::Helpers::Autofocus
@@ -14,6 +22,7 @@ module SimpleForm
       include SimpleForm::Components::HTML5
       include SimpleForm::Components::LabelInput
       include SimpleForm::Components::Maxlength
+      include SimpleForm::Components::Minlength
       include SimpleForm::Components::MinMax
       include SimpleForm::Components::Pattern
       include SimpleForm::Components::Placeholders
@@ -22,7 +31,7 @@ module SimpleForm
       attr_reader :attribute_name, :column, :input_type, :reflection,
                   :options, :input_html_options, :input_html_classes, :html_classes
 
-      delegate :template, :object, :object_name, :lookup_model_names, :lookup_action, :to => :@builder
+      delegate :template, :object, :object_name, :lookup_model_names, :lookup_action, to: :@builder
 
       class_attribute :default_options
       self.default_options = {}
@@ -43,27 +52,30 @@ module SimpleForm
       enable :hint
 
       # Usually disabled, needs to be enabled explicitly passing true as option.
-      disable :maxlength, :placeholder, :pattern, :min_max
+      disable :maxlength, :minlength, :placeholder, :pattern, :min_max
 
       def initialize(builder, attribute_name, column, input_type, options = {})
         super
 
-        @builder            = builder
-        @attribute_name     = attribute_name
-        @column             = column
-        @input_type         = input_type
-        @reflection         = options.delete(:reflection)
-        @options            = options.reverse_merge!(self.class.default_options)
-        @required           = calculate_required
+        options         = options.dup
+        @builder        = builder
+        @attribute_name = attribute_name
+        @column         = column
+        @input_type     = input_type
+        @reflection     = options.delete(:reflection)
+        @options        = options.reverse_merge!(self.class.default_options)
+        @required       = calculate_required
 
         # Notice that html_options_for receives a reference to input_html_classes.
         # This means that classes added dynamically to input_html_classes will
         # still propagate to input_html_options.
-        @html_classes = SimpleForm.additional_classes_for(:input) {
-          [input_type, required_class, readonly_class, disabled_class].compact
-        }
+        @html_classes = SimpleForm.additional_classes_for(:input) { additional_classes }
 
         @input_html_classes = @html_classes.dup
+        if SimpleForm.input_class && !input_html_classes.empty?
+          input_html_classes << SimpleForm.input_class
+        end
+
         @input_html_options = html_options_for(:input, input_html_classes).tap do |o|
           o[:readonly]  = true if has_readonly?
           o[:disabled]  = true if has_disabled?
@@ -71,7 +83,7 @@ module SimpleForm
         end
       end
 
-      def input
+      def input(wrapper_options = nil)
         raise NotImplementedError
       end
 
@@ -79,14 +91,33 @@ module SimpleForm
         options
       end
 
-      private
+      def additional_classes
+        @additional_classes ||= [input_type, required_class, readonly_class, disabled_class].compact
+      end
 
-      def add_size!
-        input_html_options[:size] ||= [limit, SimpleForm.default_input_size].compact.min
+      def input_class
+        "#{lookup_model_names.join('_')}_#{reflection_or_attribute_name}"
       end
 
+      private
+
       def limit
-        column && column.limit
+        if column
+          decimal_or_float? ? decimal_limit : column_limit
+        end
+      end
+
+      def column_limit
+        column.limit
+      end
+
+      # Add one for decimal point
+      def decimal_limit
+        column_limit && (column_limit + 1)
+      end
+
+      def decimal_or_float?
+        column.type == :float || column.type == :decimal
       end
 
       def nested_boolean_style?
@@ -95,14 +126,15 @@ module SimpleForm
 
       # Find reflection name when available, otherwise use attribute
       def reflection_or_attribute_name
-        reflection ? reflection.name : attribute_name
+        @reflection_or_attribute_name ||= reflection ? reflection.name : attribute_name
       end
 
       # Retrieve options for the given namespace from the options hash
       def html_options_for(namespace, css_classes)
-        html_options = options[:"#{namespace}_html"] || {}
+        html_options = options[:"#{namespace}_html"]
+        html_options = html_options ? html_options.dup : {}
         css_classes << html_options[:class] if html_options.key?(:class)
-        html_options[:class] = css_classes
+        html_options[:class] = css_classes unless css_classes.empty?
         html_options
       end
 
@@ -139,7 +171,7 @@ module SimpleForm
       #            email: 'E-mail.'
       #
       #  Take a look at our locale example file.
-      def translate(namespace, default='')
+      def translate_from_namespace(namespace, default = '')
         model_names = lookup_model_names.dup
         lookups     = []
 
@@ -151,10 +183,31 @@ module SimpleForm
           lookups << :"#{joined_model_names}.#{reflection_or_attribute_name}"
         end
         lookups << :"defaults.#{lookup_action}.#{reflection_or_attribute_name}"
-        lookups << :"defaults.#{attribute_name}"
+        lookups << :"defaults.#{reflection_or_attribute_name}"
         lookups << default
 
-        I18n.t(lookups.shift, :scope => :"simple_form.#{namespace}", :default => lookups).presence
+        I18n.t(lookups.shift, scope: :"#{i18n_scope}.#{namespace}", default: lookups).presence
+      end
+
+      def merge_wrapper_options(options, wrapper_options)
+        if wrapper_options
+          wrapper_options.merge(options) do |key, oldval, newval|
+            case key.to_s
+            when "class"
+              Array(oldval) + Array(newval)
+            when "data", "aria"
+              oldval.merge(newval)
+            else
+              newval
+            end
+          end
+        else
+          options
+        end
+      end
+
+      def i18n_scope
+        SimpleForm.i18n_scope
       end
     end
   end

data/lib/simple_form/inputs/block_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module SimpleForm
   module Inputs
     class BlockInput < Base
@@ -6,9 +7,9 @@ module SimpleForm
         @block = block
       end
 
-      def input
+      def input(wrapper_options = nil)
         template.capture(&@block)
       end
     end
   end
-end
+end

data/lib/simple_form/inputs/boolean_input.rb

@@ -1,47 +1,58 @@
+# frozen_string_literal: true
 module SimpleForm
   module Inputs
     class BooleanInput < Base
-      def input
+      def input(wrapper_options = nil)
+        merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
+
         if nested_boolean_style?
           build_hidden_field_for_checkbox +
-            template.label_tag(nil, :class => "checkbox") {
-              build_check_box_without_hidden_field
+            template.label_tag(nil, class: boolean_label_class) {
+              build_check_box_without_hidden_field(merged_input_options) +
+                inline_label
             }
         else
-          build_check_box
+          build_check_box(unchecked_value, merged_input_options)
         end
       end
 
-      def label_input
-        if options[:label] == false
-          input
+      def label_input(wrapper_options = nil)
+        if options[:label] == false || inline_label?
+          input(wrapper_options)
         elsif nested_boolean_style?
           html_options = label_html_options.dup
-          html_options[:class].push(:checkbox)
+          html_options[:class] ||= []
+          html_options[:class].push(boolean_label_class) if boolean_label_class
+
+          merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
 
           build_hidden_field_for_checkbox +
             @builder.label(label_target, html_options) {
-              build_check_box_without_hidden_field + label_text
+              build_check_box_without_hidden_field(merged_input_options) + label_text
             }
         else
-          input + label
+          input(wrapper_options) + label(wrapper_options)
         end
       end
 
       private
 
+      def boolean_label_class
+        options[:boolean_label_class] || SimpleForm.boolean_label_class
+      end
+
       # Build a checkbox tag using default unchecked value. This allows us to
       # reuse the method for nested boolean style, but with no unchecked value,
       # which won't generate the hidden checkbox. This is the default functionality
       # in Rails > 3.2.1, and is backported in SimpleForm AV helpers.
-      def build_check_box(unchecked_value='0')
-        @builder.check_box(attribute_name, input_html_options, '1', unchecked_value)
+      def build_check_box(unchecked_value, options)
+        @builder.check_box(attribute_name, options, checked_value, unchecked_value)
       end
 
       # Build a checkbox without generating the hidden field. See
       # #build_hidden_field_for_checkbox for more info.
-      def build_check_box_without_hidden_field
-        build_check_box(nil)
+      def build_check_box_without_hidden_field(options)
+        build_check_box(nil, options)
       end
 
       # Create a hidden field for the current checkbox, so we can simulate Rails
@@ -49,8 +60,24 @@ module SimpleForm
       # we need the hidden field to be *outside* the label (otherwise it
       # generates invalid html - html5 only).
       def build_hidden_field_for_checkbox
-        @builder.hidden_field(attribute_name, :value => '0', :id => nil,
-                              :disabled => input_html_options[:disabled])
+        return "" if !include_hidden? || !unchecked_value
+        options = { value: unchecked_value, id: nil, disabled: input_html_options[:disabled] }
+        options[:name] = input_html_options[:name] if input_html_options.key?(:name)
+
+        @builder.hidden_field(attribute_name, options)
+      end
+
+      def inline_label?
+        nested_boolean_style? && options[:inline_label]
+      end
+
+      def inline_label
+        inline_option = options[:inline_label]
+
+        if inline_option
+          label = inline_option == true ? label_text : html_escape(inline_option)
+          " #{label}".html_safe
+        end
       end
 
       # Booleans are not required by default because in most of the cases
@@ -59,6 +86,18 @@ module SimpleForm
       def required_by_default?
         false
       end
+
+      def include_hidden?
+        options.fetch(:include_hidden, true)
+      end
+
+      def checked_value
+        options.fetch(:checked_value, '1')
+      end
+
+      def unchecked_value
+        options.fetch(:unchecked_value, '0')
+      end
     end
   end
 end

data/lib/simple_form/inputs/collection_check_boxes_input.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module SimpleForm
   module Inputs
     class CollectionCheckBoxesInput < CollectionRadioButtonsInput
@@ -10,7 +11,7 @@ module SimpleForm
       end
 
       def build_nested_boolean_style_item_tag(collection_builder)
-        collection_builder.check_box + collection_builder.text
+        collection_builder.check_box + collection_builder.text.to_s
       end
 
       def item_wrapper_class

data/lib/simple_form/inputs/collection_input.rb

@@ -1,25 +1,33 @@
+# frozen_string_literal: true
 module SimpleForm
   module Inputs
     class CollectionInput < Base
+      BASIC_OBJECT_CLASSES = [String, Integer, Float, NilClass, Symbol, TrueClass, FalseClass]
+      BASIC_OBJECT_CLASSES.push(Fixnum, Bignum) unless 1.class == Integer
+
       # Default boolean collection for use with selects/radios when no
       # collection is given. Always fallback to this boolean collection.
       # Texts can be translated using i18n in "simple_form.yes" and
       # "simple_form.no" keys. See the example locale file.
       def self.boolean_collection
         i18n_cache :boolean_collection do
-          [ [I18n.t(:"simple_form.yes", :default => 'Yes'), true],
-            [I18n.t(:"simple_form.no", :default => 'No'), false] ]
+          [ [I18n.t(:"simple_form.yes", default: 'Yes'), true],
+            [I18n.t(:"simple_form.no", default: 'No'), false] ]
         end
       end
 
-      def input
+      def input(wrapper_options = nil)
         raise NotImplementedError,
           "input should be implemented by classes inheriting from CollectionInput"
       end
 
       def input_options
         options = super
+
         options[:include_blank] = true unless skip_include_blank?
+        translate_option options, :prompt
+        translate_option options, :include_blank
+
         options
       end
 
@@ -33,12 +41,12 @@ module SimpleForm
       end
 
       def has_required?
-        super && (input_options[:include_blank] || multiple?)
+        super && (input_options[:include_blank] || input_options[:prompt] || multiple?)
       end
 
       # Check if :include_blank must be included by default.
       def skip_include_blank?
-        (options.keys & [:prompt, :include_blank, :default, :selected]).any? || multiple?
+        (options.keys & %i[prompt include_blank default selected]).any? || multiple?
       end
 
       def multiple?
@@ -66,36 +74,51 @@ module SimpleForm
         collection_translated = translate_collection if collection_classes == [Symbol]
 
         if collection_translated || collection_classes.include?(Array)
-          { :label => :first, :value => :last }
+          { label: :first, value: :second }
         elsif collection_includes_basic_objects?(collection_classes)
-          { :label => :to_s, :value => :to_s }
+          { label: :to_s, value: :to_s }
         else
-          sample = collection.first || collection.last
-
-          { :label => SimpleForm.collection_label_methods.find { |m| sample.respond_to?(m) },
-            :value => SimpleForm.collection_value_methods.find { |m| sample.respond_to?(m) } }
+          detect_method_from_class(collection_classes)
         end
       end
 
+      def detect_method_from_class(collection_classes)
+        sample = collection.first || collection.last
+
+        { label: SimpleForm.collection_label_methods.find { |m| sample.respond_to?(m) },
+          value: SimpleForm.collection_value_methods.find { |m| sample.respond_to?(m) } }
+      end
+
       def detect_collection_classes(some_collection = collection)
-        some_collection.map { |e| e.class }.uniq
+        some_collection.map(&:class).uniq
       end
 
       def collection_includes_basic_objects?(collection_classes)
-        (collection_classes & [
-          String, Integer, Fixnum, Bignum, Float, NilClass, Symbol, TrueClass, FalseClass
-        ]).any?
+        (collection_classes & BASIC_OBJECT_CLASSES).any?
       end
 
       def translate_collection
-        if translated_collection = translate(:options)
+        if translated_collection = translate_from_namespace(:options)
           @collection = collection.map do |key|
-            [translated_collection[key] || key, key]
+            html_key = "#{key}_html".to_sym
+
+            if translated_collection[html_key]
+              [translated_collection[html_key].html_safe || key, key.to_s]
+            else
+              [translated_collection[key] || key, key.to_s]
+            end
           end
           true
         end
       end
+
+      def translate_option(options, key)
+        if options[key] == :translate
+          namespace = key.to_s.pluralize
+
+          options[key] = translate_from_namespace(namespace, true)
+        end
+      end
     end
   end
 end
-

data/lib/simple_form/inputs/collection_radio_buttons_input.rb

@@ -1,47 +1,39 @@
+# frozen_string_literal: true
 module SimpleForm
   module Inputs
     class CollectionRadioButtonsInput < CollectionInput
-      def input
+      def input(wrapper_options = nil)
         label_method, value_method = detect_collection_methods
 
-        @builder.send("collection_#{input_type}",
+        merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
+
+        @builder.send(:"collection_#{input_type}",
           attribute_name, collection, value_method, label_method,
-          input_options, input_html_options, &collection_block_for_nested_boolean_style
+          input_options, merged_input_options,
+          &collection_block_for_nested_boolean_style
         )
       end
 
       def input_options
         options = super
         apply_default_collection_options!(options)
-        apply_nested_boolean_collection_options!(options) if nested_boolean_style?
         options
       end
 
       protected
 
       def apply_default_collection_options!(options)
-        unless options.key?(:item_wrapper_tag)
-          options[:item_wrapper_tag] = SimpleForm.item_wrapper_tag
-        end
+        options[:item_wrapper_tag] ||= options.fetch(:item_wrapper_tag, SimpleForm.item_wrapper_tag)
         options[:item_wrapper_class] = [
           item_wrapper_class, options[:item_wrapper_class], SimpleForm.item_wrapper_class
-        ].compact.presence
+        ].compact.presence if SimpleForm.include_default_input_wrapper_class
 
-        unless options.key?(:collection_wrapper_tag)
-          options[:collection_wrapper_tag] = SimpleForm.collection_wrapper_tag
-        end
+        options[:collection_wrapper_tag] ||= options.fetch(:collection_wrapper_tag, SimpleForm.collection_wrapper_tag)
         options[:collection_wrapper_class] = [
           options[:collection_wrapper_class], SimpleForm.collection_wrapper_class
         ].compact.presence
       end
 
-      # Force item wrapper to be a label when using nested boolean, to support
-      # configuring classes through :item_wrapper_class, and to maintain
-      # compatibility with :inline style and default :item_wrapper_tag.
-      def apply_nested_boolean_collection_options!(options)
-        options[:item_wrapper_tag] = :label
-      end
-
       def collection_block_for_nested_boolean_style
         return unless nested_boolean_style?
 
@@ -49,7 +41,7 @@ module SimpleForm
       end
 
       def build_nested_boolean_style_item_tag(collection_builder)
-        collection_builder.radio_button + collection_builder.text
+        collection_builder.radio_button + collection_builder.text.to_s
       end
 
       def item_wrapper_class

data/lib/simple_form/inputs/collection_select_input.rb

@@ -1,12 +1,15 @@
+# frozen_string_literal: true
 module SimpleForm
   module Inputs
     class CollectionSelectInput < CollectionInput
-      def input
+      def input(wrapper_options = nil)
         label_method, value_method = detect_collection_methods
 
+        merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
+
         @builder.collection_select(
           attribute_name, collection, value_method, label_method,
-          input_options, input_html_options
+          input_options, merged_input_options
         )
       end
     end

data/lib/simple_form/inputs/date_time_input.rb

@@ -1,27 +1,38 @@
+# frozen_string_literal: true
 module SimpleForm
   module Inputs
     class DateTimeInput < Base
-      def input
-        @builder.send(:"#{input_type}_select", attribute_name, input_options, input_html_options)
-      end
+      def input(wrapper_options = nil)
+        merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
 
-      def has_required?
-        false
+        if use_html5_inputs?
+          @builder.send(:"#{input_type}_field", attribute_name, merged_input_options)
+        else
+          @builder.send(:"#{input_type}_select", attribute_name, input_options, merged_input_options)
+        end
       end
 
       private
 
       def label_target
-        position = case input_type
-        when :date, :datetime
-          date_order = input_options[:order] || I18n.t('date.order')
-          date_order.first
+        if use_html5_inputs?
+          attribute_name
         else
-          :hour
+          position = case input_type
+          when :date, :datetime
+            date_order = input_options[:order] || I18n.t('date.order')
+            date_order.first.to_sym
+          else
+            :hour
+          end
+
+          position = ActionView::Helpers::DateTimeSelector::POSITION[position]
+          "#{attribute_name}_#{position}i"
         end
+      end
 
-        position = ActionView::Helpers::DateTimeSelector::POSITION[position]
-        "#{attribute_name}_#{position}i"
+      def use_html5_inputs?
+        input_options[:html5]
       end
     end
   end

data/lib/simple_form/inputs/file_input.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
 module SimpleForm
   module Inputs
     class FileInput < Base
-      def input
-        @builder.file_field(attribute_name, input_html_options)
+      def input(wrapper_options = nil)
+        merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
+
+        @builder.file_field(attribute_name, merged_input_options)
       end
     end
   end