simple_form 3.1.0 → 3.5.0

data/lib/simple_form/form_builder.rb

@@ -12,7 +12,7 @@ module SimpleForm
       'update' => 'edit'
     }
 
-    ATTRIBUTE_COMPONENTS = [:html5, :min_max, :maxlength, :placeholder, :pattern, :readonly]
+    ATTRIBUTE_COMPONENTS = [:html5, :min_max, :maxlength, :minlength, :placeholder, :pattern, :readonly]
 
     extend MapType
     include SimpleForm::Inputs
@@ -30,6 +30,7 @@ module SimpleForm
     map_type :date, :time, :datetime,                     to: SimpleForm::Inputs::DateTimeInput
     map_type :country, :time_zone,                        to: SimpleForm::Inputs::PriorityInput
     map_type :boolean,                                    to: SimpleForm::Inputs::BooleanInput
+    map_type :hidden,                                     to: SimpleForm::Inputs::HiddenInput
 
     def self.discovery_cache
       @discovery_cache ||= {}
@@ -47,6 +48,11 @@ module SimpleForm
     # label + input + hint (when defined) + errors (when exists), and all can
     # be configured inside a wrapper html.
     #
+    # If a block is given, the contents of the block will replace the input
+    # field that would otherwise be generated automatically. The content will
+    # be given a label and wrapper div to make it consistent with the other
+    # elements in the form.
+    #
     # == Examples
     #
     #   # Imagine @user has error "can't be blank" on name
@@ -134,7 +140,7 @@ module SimpleForm
       components = (wrapper.components.map(&:namespace) & ATTRIBUTE_COMPONENTS)
 
       options = options.dup
-      options[:input_html] = options.except(:as, :boolean_style, :collection, :label_method, :value_method, *components)
+      options[:input_html] = options.except(:as, :boolean_style, :collection, :label_method, :value_method, :prompt, *components)
       options = @defaults.deep_dup.deep_merge(options) if @defaults
 
       input      = find_input(attribute_name, options)
@@ -206,8 +212,8 @@ module SimpleForm
       options = args.extract_options!.dup
       options[:class] = [SimpleForm.button_class, options[:class]].compact
       args << options
-      if respond_to?("#{type}_button")
-        send("#{type}_button", *args, &block)
+      if respond_to?(:"#{type}_button")
+        send(:"#{type}_button", *args, &block)
       else
         send(type, *args, &block)
       end
@@ -284,7 +290,7 @@ module SimpleForm
     #
     #    f.label :name                     # Do I18n lookup
     #    f.label :name, "Name"             # Same behavior as Rails, do not add required tag
-    #    f.label :name, label: "Name"   # Same as above, but adds required tag
+    #    f.label :name, label: "Name"      # Same as above, but adds required tag
     #
     #    f.label :name, required: false
     #    f.label :name, id: "cool_label"
@@ -293,7 +299,7 @@ module SimpleForm
       return super if args.first.is_a?(String) || block_given?
 
       options = args.extract_options!.dup
-      options[:label_html] = options.except(:label, :required, :as)
+      options[:label_html] = options.except(:label, :label_text, :required, :as)
 
       column      = find_attribute_column(attribute_name)
       input_type  = default_input_type(attribute_name, column, options)
@@ -504,12 +510,12 @@ module SimpleForm
     end
 
     # Attempt to guess the better input type given the defined options. By
-    # default alwayls fallback to the user :as option, or to a :select when a
+    # default always fallback to the user :as option, or to a :select when a
     # collection is given.
     def default_input_type(attribute_name, column, options)
       return options[:as].to_sym if options[:as]
-      return :select             if options[:collection]
       custom_type = find_custom_type(attribute_name.to_s) and return custom_type
+      return :select             if options[:collection]
 
       input_type = column.try(:type)
       case input_type
@@ -543,7 +549,9 @@ module SimpleForm
     end
 
     def find_attribute_column(attribute_name)
-      if @object.respond_to?(:column_for_attribute) && @object.has_attribute?(attribute_name)
+      if @object.respond_to?(:type_for_attribute) && @object.has_attribute?(attribute_name)
+        @object.type_for_attribute(attribute_name.to_s)
+      elsif @object.respond_to?(:column_for_attribute) && @object.has_attribute?(attribute_name)
         @object.column_for_attribute(attribute_name)
       end
     end

data/lib/simple_form/inputs/base.rb

@@ -21,6 +21,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
@@ -50,7 +51,7 @@ 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
@@ -115,7 +116,7 @@ module SimpleForm
       end
 
       def decimal_or_float?
-        column.number? && column.type != :integer
+        column.type == :float || column.type == :decimal
       end
 
       def nested_boolean_style?
@@ -178,24 +179,25 @@ module SimpleForm
           model_names.shift
 
           lookups << :"#{joined_model_names}.#{lookup_action}.#{reflection_or_attribute_name}"
-          lookups << :"#{joined_model_names}.#{lookup_action}.#{reflection_or_attribute_name}_html"
           lookups << :"#{joined_model_names}.#{reflection_or_attribute_name}"
-          lookups << :"#{joined_model_names}.#{reflection_or_attribute_name}_html"
         end
         lookups << :"defaults.#{lookup_action}.#{reflection_or_attribute_name}"
-        lookups << :"defaults.#{lookup_action}.#{reflection_or_attribute_name}_html"
         lookups << :"defaults.#{reflection_or_attribute_name}"
-        lookups << :"defaults.#{reflection_or_attribute_name}_html"
         lookups << default
 
-        t(lookups.shift, scope: :"#{i18n_scope}.#{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
-          options.merge(wrapper_options) do |_, oldval, newval|
-            if Array === oldval
-              oldval + Array(newval)
+          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

data/lib/simple_form/inputs/boolean_input.rb

@@ -6,7 +6,7 @@ module SimpleForm
 
         if nested_boolean_style?
           build_hidden_field_for_checkbox +
-            template.label_tag(nil, class: SimpleForm.boolean_label_class) {
+            template.label_tag(nil, class: boolean_label_class) {
               build_check_box_without_hidden_field(merged_input_options) +
                 inline_label
             }
@@ -21,7 +21,7 @@ module SimpleForm
         elsif nested_boolean_style?
           html_options = label_html_options.dup
           html_options[:class] ||= []
-          html_options[:class].push(SimpleForm.boolean_label_class) if SimpleForm.boolean_label_class
+          html_options[:class].push(boolean_label_class) if boolean_label_class
 
           merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
 
@@ -36,6 +36,10 @@ module SimpleForm
 
       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
@@ -55,6 +59,7 @@ 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
+        return "" unless include_hidden?
         options = { value: unchecked_value, id: nil, disabled: input_html_options[:disabled] }
         options[:name] = input_html_options[:name] if input_html_options.has_key?(:name)
 
@@ -81,6 +86,10 @@ module SimpleForm
         false
       end
 
+      def include_hidden?
+        options.fetch(:include_hidden, true)
+      end
+
       def checked_value
         options.fetch(:checked_value, '1')
       end

data/lib/simple_form/inputs/collection_input.rb

@@ -1,6 +1,9 @@
 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
@@ -90,9 +93,7 @@ module SimpleForm
       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

data/lib/simple_form/inputs/collection_radio_buttons_input.rb

@@ -6,7 +6,7 @@ module SimpleForm
 
         merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
 
-        @builder.send("collection_#{input_type}",
+        @builder.send(:"collection_#{input_type}",
           attribute_name, collection, value_method, label_method,
           input_options, merged_input_options,
           &collection_block_for_nested_boolean_style

data/lib/simple_form/inputs/date_time_input.rb

@@ -14,16 +14,20 @@ module SimpleForm
       private
 
       def label_target
-        position = case input_type
-        when :date, :datetime
-          date_order = input_options[:order] || I18n.t('date.order')
-          date_order.first.to_sym
+        if use_html5_inputs?
+          attribute_name
         else
-          :hour
-        end
+          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"
+          position = ActionView::Helpers::DateTimeSelector::POSITION[position]
+          "#{attribute_name}_#{position}i"
+        end
       end
 
       def use_html5_inputs?

data/lib/simple_form/inputs/password_input.rb

@@ -1,7 +1,7 @@
 module SimpleForm
   module Inputs
     class PasswordInput < Base
-      enable :placeholder, :maxlength
+      enable :placeholder, :maxlength, :minlength
 
       def input(wrapper_options = nil)
         merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)

data/lib/simple_form/inputs/string_input.rb

@@ -1,7 +1,7 @@
 module SimpleForm
   module Inputs
     class StringInput < Base
-      enable :placeholder, :maxlength, :pattern
+      enable :placeholder, :maxlength, :minlength, :pattern
 
       def input(wrapper_options = nil)
         unless string?

data/lib/simple_form/inputs/text_input.rb

@@ -1,7 +1,7 @@
 module SimpleForm
   module Inputs
     class TextInput < Base
-      enable :placeholder, :maxlength
+      enable :placeholder, :maxlength, :minlength
 
       def input(wrapper_options = nil)
         merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)

data/lib/simple_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "3.1.0".freeze
+  VERSION = "3.5.0".freeze
 end

data/lib/simple_form.rb

@@ -152,10 +152,6 @@ See https://github.com/plataformatec/simple_form/pull/997 for more information.
   mattr_accessor :country_priority
   @@country_priority = nil
 
-  # DEPRECATED: Maximum size allowed for inputs.
-  mattr_accessor :default_input_size
-  @@default_input_size = nil
-
   # When off, do not use translations in labels. Disabling translation in
   # hints and placeholders can be done manually in the wrapper API.
   mattr_accessor :translate_labels
@@ -236,6 +232,7 @@ See https://github.com/plataformatec/simple_form/pull/997 for more information.
 
     b.use :min_max
     b.use :maxlength
+    b.use :minlength
     b.use :placeholder
     b.optional :pattern
     b.optional :readonly

data/test/form_builder/error_test.rb

@@ -94,13 +94,36 @@ class ErrorTest < ActionView::TestCase
     assert_no_select 'span.error b', 'markup'
   end
 
-
   test 'error generates an error message with raw HTML tags' do
     with_error_for @user, :name, error_prefix: '<b>Name</b>'.html_safe
     assert_select 'span.error', "Name cannot be blank"
     assert_select 'span.error b', "Name"
   end
 
+  test 'error adds aria-invalid attribute to inputs' do
+    with_form_for @user, :name, error: true
+    assert_select "input#user_name[name='user[name]'][aria-invalid='true']"
+
+    with_form_for @user, :name, as: :text, error: true
+    assert_select "textarea#user_name[name='user[name]'][aria-invalid='true']"
+
+    @user.errors.add(:active, 'must select one')
+    with_form_for @user, :active, as: :radio_buttons
+    assert_select "input#user_active_true[type=radio][name='user[active]'][aria-invalid='true']"
+    assert_select "input#user_active_false[type=radio][name='user[active]'][aria-invalid='true']"
+
+    with_form_for @user, :active, as: :check_boxes
+    assert_select "input#user_active_true[type=checkbox][aria-invalid='true']"
+    assert_select "input#user_active_false[type=checkbox][aria-invalid='true']"
+
+    with_form_for @user, :company_id, as: :select, error: true
+    assert_select "select#user_company_id[aria-invalid='true']"
+
+    @user.errors.add(:password, 'must not be blank')
+    with_form_for @user, :password
+    assert_select "input#user_password[type=password][aria-invalid='true']"
+  end
+
   # FULL ERRORS
 
   test 'full error generates a full error tag for the attribute' do
@@ -146,14 +169,14 @@ class ErrorTest < ActionView::TestCase
   # FULL_ERROR_WRAPPER
 
   test 'full error finds errors on association' do
-    swap_wrapper :default, self.custom_wrapper_with_full_error do
+    swap_wrapper :default, custom_wrapper_with_full_error do
       with_form_for @user, :company_id, as: :select
       assert_select 'span.error', 'Company must be valid'
     end
   end
 
   test 'full error finds errors on association with reflection' do
-    swap_wrapper :default, self.custom_wrapper_with_full_error do
+    swap_wrapper :default, custom_wrapper_with_full_error do
       with_form_for @user, :company_id, as: :select,
         reflection: Association.new(Company, :company, {})
       assert_select 'span.error', 'Company must be valid'
@@ -161,14 +184,14 @@ class ErrorTest < ActionView::TestCase
   end
 
   test 'full error can be disabled' do
-    swap_wrapper :default, self.custom_wrapper_with_full_error do
+    swap_wrapper :default, custom_wrapper_with_full_error do
       with_form_for @user, :company_id, as: :select, full_error: false
       assert_no_select 'span.error'
     end
   end
 
   test 'full error can be disabled setting error to false' do
-    swap_wrapper :default, self.custom_wrapper_with_full_error do
+    swap_wrapper :default, custom_wrapper_with_full_error do
       with_form_for @user, :company_id, as: :select, error: false
       assert_no_select 'span.error'
     end
@@ -196,7 +219,7 @@ class ErrorTest < ActionView::TestCase
   end
 
   test 'input with custom error works when using full_error component' do
-    swap_wrapper :default, self.custom_wrapper_with_full_error do
+    swap_wrapper :default, custom_wrapper_with_full_error do
       error_text = "Super User Name! cannot be blank"
       with_form_for @user, :name, error: error_text
 
@@ -219,7 +242,7 @@ class ErrorTest < ActionView::TestCase
   end
 
   test 'input with custom error escapes the error text using full_error component' do
-    swap_wrapper :default, self.custom_wrapper_with_full_error do
+    swap_wrapper :default, custom_wrapper_with_full_error do
       with_form_for @user, :name, error: 'error must not contain <b>markup</b>'
 
       assert_select 'span.error'
@@ -228,7 +251,7 @@ class ErrorTest < ActionView::TestCase
   end
 
   test 'input with custom error does not escape the error text if it is safe using full_error component' do
-    swap_wrapper :default, self.custom_wrapper_with_full_error do
+    swap_wrapper :default, custom_wrapper_with_full_error do
       with_form_for @user, :name, error: 'error must contain <b>markup</b>'.html_safe
 
       assert_select 'span.error'
@@ -237,7 +260,7 @@ class ErrorTest < ActionView::TestCase
   end
 
   test 'input with custom error when using full_error component does not generate the error if there is no error on the attribute' do
-    swap_wrapper :default, self.custom_wrapper_with_full_error do
+    swap_wrapper :default, custom_wrapper_with_full_error do
       with_form_for @user, :active, error: "Super User Active! can't be blank"
 
       assert_no_select 'span.error'

data/test/form_builder/general_test.rb

@@ -46,6 +46,17 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
+  test 'builder does not override custom input mappings for custom collection' do
+    swap SimpleForm, input_mappings: { /gender$/ => :check_boxes } do
+      with_concat_form_for @user do |f|
+        f.input :gender, collection: [:male, :female]
+      end
+
+      assert_no_select 'select option', 'Male'
+      assert_select 'input[type=checkbox][value=male]'
+    end
+  end
+
   test 'builder allows to skip input_type class' do
     swap SimpleForm, generate_additional_classes_for: [:label, :wrapper] do
       with_form_for @user, :post_count
@@ -108,9 +119,22 @@ class FormBuilderTest < ActionView::TestCase
 
   test 'builder generates text areas for text columns' do
     with_form_for @user, :description
+    assert_no_select 'form input#user_description.string'
     assert_select 'form textarea#user_description.text'
   end
 
+  test 'builder generates text areas for text columns when hinted' do
+    with_form_for @user, :description, as: :text
+    assert_no_select 'form input#user_description.string'
+    assert_select 'form textarea#user_description.text'
+  end
+
+  test 'builder generates text field for text columns when hinted' do
+    with_form_for @user, :description, as: :string
+    assert_no_select 'form textarea#user_description.text'
+    assert_select 'form input#user_description.string'
+  end
+
   test 'builder generates a checkbox for boolean columns' do
     with_form_for @user, :active
     assert_select 'form input[type=checkbox]#user_active.boolean'
@@ -128,7 +152,11 @@ class FormBuilderTest < ActionView::TestCase
 
   test 'builder generates uuid fields for uuid columns' do
     with_form_for @user, :uuid
-    assert_select 'form input#user_uuid.string.uuid'
+    if defined? ActiveModel::Type
+      assert_select 'form input#user_uuid.string.string'
+    else
+      assert_select 'form input#user_uuid.string.uuid'
+    end
   end
 
   test 'builder generates password fields for columns that matches password' do
@@ -206,11 +234,15 @@ class FormBuilderTest < ActionView::TestCase
     with_form_for @user, :name, as: :text
     assert_no_select 'form input#user_name'
     assert_select 'form textarea#user_name.text'
+  end
 
+  test 'builder allows overriding default input type for radio_buttons' do
     with_form_for @user, :active, as: :radio_buttons
     assert_no_select 'form input[type=checkbox]'
     assert_select 'form input.radio_buttons[type=radio]', count: 2
+  end
 
+  test 'builder allows overriding default input type for string' do
     with_form_for @user, :born_at, as: :string
     assert_no_select 'form select'
     assert_select 'form input#user_born_at.string'
@@ -256,7 +288,7 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder does not propagate input options to wrapper with custom wrapper' do
-    swap_wrapper :default, self.custom_wrapper_with_wrapped_input do
+    swap_wrapper :default, custom_wrapper_with_wrapped_input do
       with_form_for @user, :name, input_html: { class: 'my_input' }
       assert_no_select 'form div.input.my_input'
       assert_select 'form input.my_input.string'
@@ -264,7 +296,7 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder does not propagate label options to wrapper with custom wrapper' do
-    swap_wrapper :default, self.custom_wrapper_with_wrapped_label do
+    swap_wrapper :default, custom_wrapper_with_wrapped_label do
       with_form_for @user, :name, label_html: { class: 'my_label' }
       assert_no_select 'form div.label.my_label'
       assert_select 'form label.my_label.string'
@@ -353,15 +385,15 @@ class FormBuilderTest < ActionView::TestCase
   [:input, :input_field].each do |method|
     test "builder receives a default argument and pass it to the inputs when calling '#{method}'" do
       with_concat_form_for @user, defaults: { input_html: { class: 'default_class' } } do |f|
-        f.send(method, :name)
+        f.public_send(method, :name)
       end
       assert_select 'input.default_class'
     end
 
     test "builder receives a default argument and pass it to the inputs without changing the defaults when calling '#{method}'" do
       with_concat_form_for @user, defaults: { input_html: { class: 'default_class', id: 'default_id' } } do |f|
-        concat(f.send(method, :name))
-        concat(f.send(method, :credit_limit))
+        concat(f.public_send(method, :name))
+        concat(f.public_send(method, :credit_limit))
       end
 
       assert_select "input.string.default_class[name='user[name]']"
@@ -372,9 +404,9 @@ class FormBuilderTest < ActionView::TestCase
       @user.company = Company.new(1, 'Empresa')
 
       with_concat_form_for @user, defaults: { input_html: { class: 'default_class' } } do |f|
-        concat(f.send(method, :name))
+        concat(f.public_send(method, :name))
         concat(f.simple_fields_for(:company) do |company_form|
-          concat(company_form.send(method, :name))
+          concat(company_form.public_send(method, :name))
         end)
       end