simple_form 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a6c95d6f9a46246e380928d9f811d32400b46af
-  data.tar.gz: a1b26b221855af2b653a28da26fec66041b1bfc2
+  metadata.gz: c12e271b03625f2cca73aaf99d1229e212d549b5
+  data.tar.gz: baa9c72a065dda6000b52852edaafc5f60e38a30
 SHA512:
-  metadata.gz: 381db066326564168e6c9242682b3a699397f8b4dbb3bd2f3662f4f817b51c5f65c6fb3d58e8e1a5e50bed6fa86d62ab024557cd67b221829d900ac81f52df56
-  data.tar.gz: 0340f0e2604165e8b266afe34423e1a1dcfc9e86daf08a84d690f9192624d482a846ac83685f198497e6da75317bd70a95c16a77f9d31c783b4ede1e23da211d
+  metadata.gz: 625bb4d60627789d65f73dcc2d5aafc7159cb9b66c12a911b6e0ef832075cf3b330d2636b97aa17f8f93037ef2d917b03cf2926ead2b6091a389fd6e3ed22b43
+  data.tar.gz: 139633282c1518a82841c62cedf6451a983a5058ed6d865f6a295874dac8e9156932b95490e4d3dada97d85c685c9c687a7a25bb926bcd75f3aef00252e33f4b

data/CHANGELOG.md

@@ -1,6 +1,20 @@
+## Unreleased
+
+## 3.3.0
+
+### enhancements
+  * Add the `aria-invalid` attribute on inputs with errors.
+  * Added support for the new `ActiveModel::Type` API over Active Record's
+    column objects.
+
+### bug fix
+  * Fix `merge_wrapper_options` to correctly merge options with duplicated keys. [@herminiotorres](https://github.com/herminiotorres)
+  Closes [#1278](https://github.com/plataformatec/simple_form/issues/1278).
+
 ## 3.2.1
 
-* Updated gem dependency to support Rails 5.0.x.
+### enhancements
+  * Updated gem dependency to support Rails 5.0.x.
 
 ## 3.2.0
 

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2015 Plataformatec http://plataformatec.com.br/
+Copyright (c) 2009-2016 Plataformatec http://plataformatec.com.br/
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -164,8 +164,9 @@ any html attribute to that wrapper as well using the `:wrapper_html` option, lik
 
 Required fields are marked with an * prepended to their labels.
 
-By default all inputs are required. When the form object has `presence` validations attached to its
-fields, **Simple Form** tells required and optional fields apart. For performance reasons, this
+By default all inputs are required. When the form object includes `ActiveModel::Validations` 
+(which, for example, happens with Active Record models), fields are required only when there is `presence` validation.
+Otherwise, **Simple Form** will mark fields as optional. For performance reasons, this
 detection is skipped on validations that make use of conditional options, such as `:if` and `:unless`.
 
 And of course, the `required` property of any input can be overwritten as needed:
@@ -323,14 +324,17 @@ Collection inputs accept two other options beside collections:
 
 Those methods are useful to manipulate the given collection. Both of these options also accept
 lambda/procs in case you want to calculate the value or label in a special way eg. custom
-translation. All other options given are sent straight to the underlying helper. For example, you
-can give prompt as:
+translation. You can also define a `to_label` method on your model as **Simple Form** will search for
+and use `:to_label` as a `:label_method` first if it is found. All other options given are sent
+straight to the underlying helper. For example, you can give prompt as:
 
 ```ruby
 f.input :age, collection: 18..60, prompt: "Select your age", selected: 21
 ```
 Extra options are passed into helper [`collection_select`](http://api.rubyonrails.org/classes/ActionView/Helpers/FormOptionsHelper.html#method-i-collection_select).
 
+You may also find it useful to explicitly pass a value to the optional `:selected`, especially if passing a collection of nested objects.
+
 It is also possible to create grouped collection selects, that will use the html *optgroup* tags, like this:
 
 ```ruby
@@ -679,7 +683,7 @@ en:
         age: 'Rather not say'
     prompts:
       user:
-        gender: 'Select your gender'
+        role: 'Select your role'
 ```
 
 And your forms will use this information to render the components for you.
@@ -734,16 +738,16 @@ For `:prompt` and `:include_blank` the I18n lookup is optional and to enable it
 `:translate` as value.
 
 ```ruby
-f.input :gender, prompt: :translate
+f.input :role, prompt: :translate
 ```
 
 **Simple Form** also has support for translating options in collection helpers. For instance, given a
-User with a `:gender` attribute, you might want to create a select box showing translated labels
-that would post either `male` or `female` as value. With **Simple Form** you could create an input
+User with a `:role` attribute, you might want to create a select box showing translated labels
+that would post either `:admin` or `:editor` as value. With **Simple Form** you could create an input
 like this:
 
 ```ruby
-f.input :gender, collection: [:male, :female]
+f.input :role, collection: [:admin, :editor]
 ```
 
 And **Simple Form** will try a lookup like this in your locale file, to find the right labels to show:
@@ -753,9 +757,9 @@ en:
   simple_form:
     options:
       user:
-        gender:
-          male: 'Male'
-          female: 'Female'
+        role:
+          admin: 'Administrator'
+          editor: 'Editor'
 ```
 
 You can also use the `defaults` key as you would do with labels, hints and placeholders. It is
@@ -982,8 +986,8 @@ required attribute to force a value into an input and will prevent form submissi
 Depending on the design of the application this may or may not be desired. In many cases it can
 break existing UI's.
 
-It is possible to disable all HTML 5 extensions in **Simple Form** removing the `html5` component
-from the wrapper used to render the inputs.
+It is possible to disable all HTML 5 extensions in **Simple Form** by removing the `html5`
+component from the wrapper used to render the inputs.
 
 For example, change:
 
@@ -1072,7 +1076,7 @@ https://github.com/plataformatec/simple_form/issues
 
 ## License
 
-MIT License. Copyright 2009-2015 Plataformatec. http://plataformatec.com.br
+MIT License. Copyright 2009-2016 Plataformatec. http://plataformatec.com.br
 
 You are not granted rights or licenses to the trademarks of the Plataformatec, including without
 limitation the Simple Form name or logo.

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

data/lib/simple_form/action_view_extensions/form_helper.rb

@@ -66,4 +66,6 @@ module SimpleForm
   end
 end
 
-ActionView::Base.send :include, SimpleForm::ActionViewExtensions::FormHelper
+ActiveSupport.on_load(:action_view) do
+  include SimpleForm::ActionViewExtensions::FormHelper
+end

data/lib/simple_form/components/html5.rb

@@ -8,8 +8,10 @@ module SimpleForm
       def html5(wrapper_options = nil)
         @html5 = true
 
-        input_html_options[:required]        = has_required?
-        input_html_options[:'aria-required'] = has_required? || nil
+        input_html_options[:required]        = input_html_required_option
+        input_html_options[:'aria-required'] = input_html_aria_required_option
+
+        input_html_options[:'aria-invalid']  = has_errors? || nil
 
         nil
       end
@@ -18,6 +20,14 @@ module SimpleForm
         @html5
       end
 
+      def input_html_required_option
+        !options[:required].nil? ? required_field? : has_required?
+      end
+
+      def input_html_aria_required_option
+        !options[:required].nil? ? (required_field? || nil) : (has_required? || nil)
+      end
+
       def has_required?
         # We need to check browser_validations because
         # some browsers are still checking required even

data/lib/simple_form/components/maxlength.rb

@@ -15,10 +15,7 @@ module SimpleForm
           maxlength
         else
           length_validator = find_length_validator
-
-          if length_validator && !has_tokenizer?(length_validator)
-            length_validator.options[:is] || length_validator.options[:maximum]
-          end
+          maximum_length_value_from(length_validator)
         end
       end
 
@@ -29,6 +26,22 @@ module SimpleForm
       def has_tokenizer?(length_validator)
         length_validator.options[:tokenizer]
       end
+
+      # Use validation with tokenizer if version of Rails is less than 5,
+      # if not validate without the tokenizer, if version is greater than Rails 4.
+      if ActionPack::VERSION::STRING < '5'
+        def maximum_length_value_from(length_validator)
+          if length_validator && !has_tokenizer?(length_validator)
+            length_validator.options[:is] || length_validator.options[:maximum]
+          end
+        end
+      elsif ActionPack::VERSION::STRING >= '5'
+        def maximum_length_value_from(length_validator)
+          if length_validator
+            length_validator.options[:is] || length_validator.options[:maximum]
+          end
+        end
+      end
     end
   end
 end

data/lib/simple_form/form_builder.rb

@@ -48,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
@@ -135,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)
@@ -285,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"
@@ -294,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)
@@ -505,7 +510,7 @@ 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]
@@ -544,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)
+      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

@@ -115,7 +115,7 @@ module SimpleForm
       end
 
       def decimal_or_float?
-        column.number? && column.type != :integer
+        column.type == :float || column.type == :decimal
       end
 
       def nested_boolean_style?
@@ -189,9 +189,14 @@ module SimpleForm
 
       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

@@ -55,6 +55,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 +82,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/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "3.2.1".freeze
+  VERSION = "3.3.0".freeze
 end

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

data/test/form_builder/general_test.rb

@@ -139,7 +139,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

data/test/form_builder/input_field_test.rb

@@ -121,6 +121,12 @@ class InputFieldTest < ActionView::TestCase
     assert_no_select 'input.boolean[boolean_style]'
   end
 
+  test 'build input_field does not treat "prompt" as a HTML attribute' do
+    with_input_field_for @user, :attempts, collection: [1,2,3,4,5], prompt: :translate
+
+    assert_no_select 'select[prompt]'
+  end
+
   test 'build input_field without pattern component use the pattern string' do
     swap_wrapper :default, custom_wrapper_with_html5_components do
       with_input_field_for @user, :name, pattern: '\w+'

data/test/form_builder/label_test.rb

@@ -120,4 +120,11 @@ class LabelTest < ActionView::TestCase
       assert_select 'label[for=user_time_zone]', 'Time Zone:'
     end
   end
+
+  test 'builder allows label specific `label_text` option' do
+    with_label_for @user, :time_zone, label_text: lambda { |l, _, _| "#{l.titleize}:" }
+
+    assert_no_select 'label[label_text]'
+    assert_select 'label[for=user_time_zone]', 'Time Zone:'
+  end
 end

data/test/form_builder/wrapper_test.rb

@@ -242,6 +242,38 @@ class WrapperTest < ActionView::TestCase
     assert_select "section.custom_wrapper div.another_wrapper input.string"
   end
 
+  test "input attributes class will merge with wrapper_options' classes" do
+    swap_wrapper :default, custom_wrapper_with_input_class do
+      with_concat_form_for @user do |f|
+        concat f.input :name, input_html: { class: 'another-class' }
+      end
+    end
+
+    assert_select "div.custom_wrapper input.string.inline-class.another-class"
+  end
+
+  test "input with data attributes will merge with wrapper_options' data" do
+    swap_wrapper :default, custom_wrapper_with_input_data_modal do
+      with_concat_form_for @user do |f|
+        concat f.input :name, input_html: { data: { modal: 'another-data', target: 'merge-data' } }
+      end
+    end
+
+    assert_select "input[data-wrapper='data-wrapper'][data-modal='another-data'][data-target='merge-data']"
+  end
+
+  test "input with aria attributes will merge with wrapper_options' aria" do
+    skip unless ActionPack::VERSION::MAJOR == '4' && ActionPack::VERSION::MINOR >= '2'
+
+    swap_wrapper :default, custom_wrapper_with_input_aria_modal do
+      with_concat_form_for @user do |f|
+        concat f.input :name, input_html: { aria: { modal: 'another-aria', target: 'merge-aria' } }
+      end
+    end
+
+    assert_select "input[aria-wrapper='aria-wrapper'][aria-modal='another-aria'][aria-target='merge-aria']"
+  end
+
   test 'input accepts attributes in the DSL' do
     swap_wrapper :default, custom_wrapper_with_input_class do
       with_concat_form_for @user do |f|

data/test/inputs/boolean_input_test.rb

@@ -137,6 +137,14 @@ class BooleanInputTest < ActionView::TestCase
     end
   end
 
+  test 'input with nested style allows disabling hidden field' do
+    swap SimpleForm, boolean_style: :nested do
+      with_input_for @user, :active, :boolean, include_hidden: false
+      assert_select "label.boolean > input.boolean"
+      assert_no_select "input[type=hidden] + label.boolean"
+    end
+  end
+
   test 'input boolean works using :input only in wrapper config (no label_input)' do
     swap_wrapper do
       with_input_for @user, :active, :boolean

data/test/inputs/datetime_input_test.rb

@@ -6,7 +6,11 @@ class DateTimeInputWithHtml5Test < ActionView::TestCase
   test 'input generates a datetime input for datetime attributes if HTML5 compatibility is explicitly enbled' do
     with_input_for @user, :created_at, :datetime, html5: true
 
-    assert_select 'input[type="datetime"]'
+    if ActionPack::VERSION::STRING >= '5'
+      assert_select 'input[type="datetime-local"]'
+    elsif ActionPack::VERSION::STRING < '5'
+      assert_select 'input[type="datetime"]'
+    end
   end
 
   test 'input generates a datetime select for datetime attributes' do
@@ -76,7 +80,11 @@ class DateTimeInputWithoutHtml5Test < ActionView::TestCase
     swap_wrapper do
       with_input_for @user, :created_at, :datetime, html5: true
 
-      assert_select 'input[type="datetime"]'
+      if ActionPack::VERSION::STRING >= '5'
+        assert_select 'input[type="datetime-local"]'
+      elsif ActionPack::VERSION::STRING < '5'
+        assert_select 'input[type="datetime"]'
+      end
     end
   end
 

data/test/inputs/discovery_test.rb

@@ -14,6 +14,7 @@ class DiscoveryTest < ActionView::TestCase
         Object.send :remove_const, :CustomizedInput
         Object.send :remove_const, :DeprecatedInput
         Object.send :remove_const, :CollectionSelectInput
+        CustomInputs.send :remove_const, :CustomizedInput
         CustomInputs.send :remove_const, :PasswordInput
         CustomInputs.send :remove_const, :NumericInput
       end

data/test/inputs/numeric_input_test.rb

@@ -113,6 +113,9 @@ class NumericInputTest < ActionView::TestCase
 
     with_input_for @validating_user, :age, :integer
     assert_select 'input[step="1"]'
+
+    with_input_for @validating_user, :age, :integer, as: :decimal, input_html: { step: 0.5 }
+    assert_select 'input[step="0.5"]'
   end
 
   test 'numeric input does not generate placeholder by default' do

data/test/inputs/priority_input_test.rb

@@ -5,14 +5,22 @@ class PriorityInputTest < ActionView::TestCase
   test 'input generates a country select field' do
     with_input_for @user, :country, :country
     assert_select 'select#user_country'
-    assert_select 'select option[value=Brazil]', 'Brazil'
+    if ActionPack::VERSION::STRING >= '5'
+      assert_select 'select option[value=BR]', 'Brazil'
+    elsif ActionPack::VERSION::STRING < '5'
+      assert_select 'select option[value=Brazil]', 'Brazil'
+    end
     assert_no_select 'select option[value=""][disabled=disabled]'
   end
 
   test 'input generates a country select with SimpleForm default' do
     swap SimpleForm, country_priority: [ 'Brazil' ] do
       with_input_for @user, :country, :country
-      assert_select 'select option[value=""][disabled=disabled]'
+      if ActionPack::VERSION::STRING >= '5'
+        assert_select 'select option[value="---------------"][disabled=disabled]'
+      elsif ActionPack::VERSION::STRING < '5'
+        assert_select 'select option[value=""][disabled=disabled]'
+      end
     end
   end
 

data/test/inputs/required_test.rb

@@ -34,6 +34,38 @@ class RequiredTest < ActionView::TestCase
       with_input_for @user, :name, :string
       assert_select 'input[type=text].required'
       assert_no_select 'input[type=text][required]'
+      assert_no_select 'input[type=text][aria-required]'
+    end
+  end
+
+  test 'when not using browser validations, when required option is set to false, input does not generate required html attribute' do
+    swap SimpleForm, browser_validations: false do
+      with_input_for @user, :name, :string, required: false
+      assert_no_select 'input[type=text].required'
+      assert_no_select 'input[type=text][required]'
+      assert_no_select 'input[type=text][aria-required]'
+    end
+  end
+
+  test 'when not using browser validations, when required option is set to true, input generates required html attribute' do
+    swap SimpleForm, browser_validations: false do
+      with_input_for @user, :name, :string, required: true
+      assert_select 'input[type=text].required'
+      assert_select 'input[type=text][required]'
+      assert_select 'input[type=text][aria-required]'
+    end
+  end
+
+  test 'when not using browser validations, when required option is true in the wrapper, input does not generate required html attribute' do
+    swap SimpleForm, browser_validations: false do
+      swap_wrapper :default, self.custom_wrapper_with_required_input do
+        with_concat_form_for(@user) do |f|
+          concat f.input :name
+        end
+        assert_select 'input[type=text].required'
+        assert_no_select 'input[type=text][required]'
+        assert_no_select 'input[type=text][aria-required]'
+      end
     end
   end
 

data/test/inputs/string_input_test.rb

@@ -32,9 +32,11 @@ class StringInputTest < ActionView::TestCase
     assert_select 'input.string[maxlength="25"]'
   end
 
-  test 'input does not get maxlength from validation when tokenizer present' do
-    with_input_for @validating_user, :action, :string
-    assert_no_select 'input.string[maxlength]'
+  if ActionPack::VERSION::STRING < '5'
+    test 'input does not get maxlength from validation when tokenizer present' do
+      with_input_for @validating_user, :action, :string
+      assert_no_select 'input.string[maxlength]'
+    end
   end
 
   test 'input gets maxlength from validation when :is option present' do

data/test/support/misc_helpers.rb

@@ -91,6 +91,20 @@ module MiscHelpers
     end
   end
 
+  def custom_wrapper_with_input_data_modal
+    SimpleForm.build tag: :div, class: "custom_wrapper" do |b|
+      b.use :label
+      b.use :input, data: { modal: 'data-modal', wrapper: 'data-wrapper' }
+    end
+  end
+
+  def custom_wrapper_with_input_aria_modal
+    SimpleForm.build tag: :div, class: "custom_wrapper" do |b|
+      b.use :label
+      b.use :input, aria: { modal: 'aria-modal', wrapper: 'aria-wrapper' }
+    end
+  end
+
   def custom_wrapper_with_label_class
     SimpleForm.build tag: :div, class: "custom_wrapper" do |b|
       b.use :label, class: 'inline-class'

data/test/support/models.rb

@@ -1,10 +1,6 @@
 Association = Struct.new(:klass, :name, :macro, :scope, :options)
 
 Column = Struct.new(:name, :type, :limit) do
-  # Returns +true+ if the column is either of type integer, float or decimal.
-  def number?
-    type == :integer || type == :float || type == :decimal
-  end
 end
 
 Relation = Struct.new(:records) do
@@ -130,6 +126,33 @@ class User
     Column.new(attribute, column_type, limit)
   end
 
+  begin
+    require 'active_model/type'
+    def type_for_attribute(attribute)
+      column_type, limit = case attribute.to_sym
+        when :name, :status, :password then [:string, 100]
+        when :description   then [:text, 200]
+        when :age           then :integer
+        when :credit_limit  then [:decimal, 15]
+        when :active        then :boolean
+        when :born_at       then :date
+        when :delivery_time then :time
+        when :created_at    then :datetime
+        when :updated_at    then :datetime
+        when :lock_version  then :integer
+        when :home_picture  then :string
+        when :amount        then :integer
+        when :attempts      then :integer
+        when :action        then :string
+        when :credit_card   then :string
+        when :uuid          then :string
+      end
+
+      ActiveModel::Type.lookup(column_type, limit: limit)
+    end
+  rescue LoadError
+  end
+
   def has_attribute?(attribute)
     case attribute.to_sym
       when :name, :status, :password, :description, :age,
@@ -215,7 +238,9 @@ class ValidatingUser < User
     only_integer: true
   validates_length_of :name, maximum: 25
   validates_length_of :description, maximum: 50
-  validates_length_of :action, maximum: 10, tokenizer: lambda { |str| str.scan(/\w+/) }
+  if ActionPack::VERSION::STRING < '5'
+    validates_length_of :action, maximum: 10, tokenizer: lambda { |str| str.scan(/\w+/) }
+  end
   validates_length_of :home_picture, is: 12
 
   def min_amount

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - José Valim
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-20 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -178,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: simple_form
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Forms made easy!