simple_form 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 275599af691b7ba0bd40146940b8936b7b00bb65
-  data.tar.gz: bf12768bc9960272a7823e62276f8191a5b293d7
+  metadata.gz: e30c2408e03c6ec8e50e4c96eb6b6ed2496c2c17
+  data.tar.gz: 324665062b839154b5c7b2c2fd8d2a603466c854
 SHA512:
-  metadata.gz: f62bec40ad89719416a5010cd0ec3eab18a6322289cd817e732061d4b53dd01e6f749a3a1a89caabe2fa233749d9841dea374365572fa91f8dc70755382d6811
-  data.tar.gz: 82930fed0d675a74d7e226ebf39e78ebf86807ba583988959be4f633c50f76e3cbc2e2b924d243ce87e5423089610962dab3f1795eb242ce544d985d702c8f36
+  metadata.gz: 1b58ac3394c6237e862f81de9eae3c8511d72a27f3e65ec4c11929f6e30f52378ff325a5c7a336f18015d5707f8bce061e797c264b8fc4a15b95e653f1c8613c
+  data.tar.gz: 81e743325007ec095390aac7762bfe62c7ac5e0f1650a133db3834faa8303931b6e287acf5f4ed191241e3d50b9afa1d0aeba68dc43c6d0ae4229fdd27a1b94d

data/CHANGELOG.md

@@ -1,3 +1,36 @@
+## master
+
+## enhancements
+
+## bug fix
+
+## 3.1.1
+
+### enhancements
+  * Add the `disabled_class` to the label when the input is disabled. [@rhodrid](https://github.com/rhodrid)
+
+### bug fix
+  * Make it possible to override `required` value that was previously set in the wrapper. [@nashby](https://github.com/nashby)
+
+  * `date/time/datetime` inputs now correctly generate the label `for` attribute when
+  HTML5 compatibility is explicitly enabled. [@ericsullivan](https://github.com/ericsullivan)
+
+  * The datetime, date, and time inputs now have a nice format by default on bootstrap.
+  [ulissesalmeida](https://github.com/ulissesalmeida) [eltonchrls](https://github.com/eltonchrls)
+
+  * Now it is possible to set custom input mappings for collections.
+
+  Example:
+
+  ```ruby
+    # On configuration:
+    config.input_mappings = { /gender$/ => :check_boxes }
+
+    # On form:
+    f.input :gender, collection: [:male, :female]
+  ```
+  [strangeworks](https://github.com/strangeworks)
+
 ## 3.1.0
 
 ### enhancements

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2014 Plataformatec http://plataformatec.com.br/
+Copyright (c) 2009-2015 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

@@ -32,13 +32,6 @@ Run the generator:
 rails generate simple_form:install
 ```
 
-Also, if you want to use the country select, you will need the
-[country_select gem](https://rubygems.org/gems/country_select), add it to your Gemfile:
-
-```ruby
-gem 'country_select'
-```
-
 ### Bootstrap
 
 **Simple Form** can be easily integrated to the [Bootstrap](http://getbootstrap.com/).
@@ -70,6 +63,22 @@ You will need to provide your own CSS styles for hints.
 
 Please see the [instructions on how to install Foundation in a Rails app](http://foundation.zurb.com/docs/applications.html).
 
+### Country Select
+
+If you want to use the country select, you will need the
+[country_select gem](https://rubygems.org/gems/country_select), add it to your Gemfile:
+
+```ruby
+gem 'country_select'
+```
+
+If you don't want to use the gem you can easily override this behaviour by mapping the
+country inputs to something else, with a line like this in your `simple_form.rb` initializer:
+
+```ruby
+config.input_mappings = { /country/ => :string }
+```
+
 ## Usage
 
 **Simple Form** was designed to be customized as you need to. Basically it's a stack of components that
@@ -91,12 +100,12 @@ To start using **Simple Form** you just have to use the helper it provides:
 This will generate an entire form with labels for user name and password as well, and render errors
 by default when you render the form with invalid data (after submitting for example).
 
-You can overwrite the default label by passing it to the input method. You can also add a hint or
-even a placeholder. For boolean inputs, you can add an inline label as well:
+You can overwrite the default label by passing it to the input method. You can also add a hint,
+an error, or even a placeholder. For boolean inputs, you can add an inline label as well:
 
 ```erb
 <%= simple_form_for @user do |f| %>
-  <%= f.input :username, label: 'Your username please' %>
+  <%= f.input :username, label: 'Your username please', error: 'Username is mandatory, please specify one' %>
   <%= f.input :password, hint: 'No special characters.' %>
   <%= f.input :email, placeholder: 'user@domain.com' %>
   <%= f.input :remember_me, inline_label: 'Yes, remember me' %>
@@ -259,7 +268,6 @@ end
 ```
 
 For check boxes and radio buttons you can remove the label changing `boolean_style` from default value `:nested` to `:inline`.
-Also, `item_wrapper_tag` will not work when `boolean_style` is set to `:nested`.
 
 Example:
 
@@ -319,8 +327,9 @@ translation. All other options given are sent straight to the underlying helper.
 can give prompt as:
 
 ```ruby
-f.input :age, collection: 18..60, prompt: "Select your age"
+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).
 
 It is also possible to create grouped collection selects, that will use the html *optgroup* tags, like this:
 
@@ -404,7 +413,7 @@ The association helper just invokes `input` under the hood, so all options avail
 the collection by hand, all together with the prompt:
 
 ```ruby
-f.association :company, collection: Company.active.all(order: 'name'), prompt: "Choose a Company"
+f.association :company, collection: Company.active.order(:name), prompt: "Choose a Company"
 ```
 
 In case you want to declare different labels and values:
@@ -435,6 +444,16 @@ The button method also accepts optional parameters, that are delegated to the un
 <%= f.button :submit, "Custom Button Text", class: "my-button" %>
 ```
 
+To create a `<button>` element, use the following syntax:
+
+```erb
+<%= f.button :button, "Custom Button Text" %>
+
+<%= f.button :button do %>
+  Custom Button Text
+<% end %>
+```
+
 ### Wrapping Rails Form Helpers
 
 Say you wanted to use a rails form helper but still wrap it in **Simple Form** goodness? You can, by
@@ -789,6 +808,22 @@ object itself. Thus, similarly, if a form for an `Admin::User` object is defined
 `simple_form_for @admin_user, as: :some_user`, **Simple Form** will look for translations
 under `some_user` instead of `admin_user`.
 
+When translate `simple_fields_for` attributes be sure to use the same name you pass to it, e.g. `simple_fields_for :posts` should be placed under `posts` not `post`:
+
+```yaml
+en:
+  simple_form:
+    labels:
+      posts:
+        title: 'Post title'
+    hints:
+      posts:
+        title: 'A good title'
+    placeholders:
+      posts:
+        title: 'Once upon a time...'
+```
+
 ## Configuration
 
 **Simple Form** has several configuration options. You can read and change them in the initializer
@@ -1037,7 +1072,7 @@ https://github.com/plataformatec/simple_form/issues
 
 ## License
 
-MIT License. Copyright 2009-2014 Plataformatec. http://plataformatec.com.br
+MIT License. Copyright 2009-2015 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/generators/simple_form/templates/config/initializers/simple_form.rb

@@ -90,8 +90,7 @@ SimpleForm.setup do |config|
   # config.collection_wrapper_class = nil
 
   # You can wrap each item in a collection of radio/check boxes with a tag,
-  # defaulting to :span. Please note that when using :boolean_style = :nested,
-  # SimpleForm will force this option to be a label.
+  # defaulting to :span.
   # config.item_wrapper_tag = :span
 
   # You can define a class to use in all item wrappers. Defaulting to none.

data/lib/generators/simple_form/templates/config/initializers/simple_form_bootstrap.rb

@@ -87,7 +87,7 @@ SimpleForm.setup do |config|
 
     b.wrapper tag: 'div', class: 'col-sm-offset-3 col-sm-9' do |wr|
       wr.wrapper tag: 'div', class: 'checkbox' do |ba|
-        ba.use :label_input, class: 'col-sm-9'
+        ba.use :label_input
       end
 
       wr.use :error, wrap_with: { tag: 'span', class: 'help-block' }
@@ -122,6 +122,16 @@ SimpleForm.setup do |config|
     b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
   end
 
+  config.wrappers :multi_select, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.optional :readonly
+    b.use :label, class: 'control-label'
+    b.wrapper tag: 'div', class: 'form-inline' do |ba|
+      ba.use :input, class: 'form-control'
+      ba.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
   # Wrappers for forms and inputs using the Bootstrap toolkit.
   # Check the Bootstrap docs (http://getbootstrap.com)
   # to learn about the different styles for forms and inputs,
@@ -132,5 +142,8 @@ SimpleForm.setup do |config|
     radio_buttons: :vertical_radio_and_checkboxes,
     file: :vertical_file_input,
     boolean: :vertical_boolean,
+    datetime: :multi_select,
+    date: :multi_select,
+    time: :multi_select
   }
 end

data/lib/simple_form/components/html5.rb

@@ -7,10 +7,10 @@ module SimpleForm
 
       def html5(wrapper_options = nil)
         @html5 = true
-        if has_required?
-          input_html_options[:required] = true
-          input_html_options[:'aria-required'] = true
-        end
+
+        input_html_options[:required]        = has_required?
+        input_html_options[:'aria-required'] = has_required? || nil
+
         nil
       end
 

data/lib/simple_form/components/labels.rb

@@ -42,7 +42,7 @@ module SimpleForm
 
       def label_html_options
         label_html_classes = SimpleForm.additional_classes_for(:label) {
-          [input_type, required_class, SimpleForm.label_class].compact
+          [input_type, required_class, disabled_class, SimpleForm.label_class].compact
         }
 
         label_options = html_options_for(:label, label_html_classes)

data/lib/simple_form/form_builder.rb

@@ -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 ||= {}
@@ -206,8 +207,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
@@ -508,8 +509,8 @@ module SimpleForm
     # 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

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/version.rb

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

data/test/form_builder/error_test.rb

@@ -146,14 +146,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 +161,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 +196,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 +219,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 +228,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 +237,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
@@ -256,7 +267,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 +275,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 +364,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 +383,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
 

data/test/form_builder/input_field_test.rb

@@ -2,10 +2,15 @@ require 'test_helper'
 
 # Tests for f.input_field
 class InputFieldTest < ActionView::TestCase
-  test "builder input_field only renders the input tag, nothing else" do
-    with_concat_form_for(@user) do |f|
-      f.input_field :name
+  def with_input_field_for(object, *args)
+    with_concat_form_for(object) do |f|
+      f.input_field(*args)
     end
+  end
+
+  test "builder input_field only renders the input tag, nothing else" do
+    with_input_field_for @user, :name
+
     assert_select 'form > input.required.string'
     assert_no_select 'div.string'
     assert_no_select 'label'
@@ -13,45 +18,34 @@ class InputFieldTest < ActionView::TestCase
   end
 
   test 'builder input_field allows overriding default input type' do
-    with_concat_form_for(@user) do |f|
-      f.input_field :name, as: :text
-    end
+    with_input_field_for @user, :name, as: :text
 
     assert_no_select 'input#user_name'
     assert_select 'textarea#user_name.text'
   end
 
   test 'builder input_field generates input type based on column type' do
-    with_concat_form_for(@user) do |f|
-      f.input_field :age
-    end
+    with_input_field_for @user, :age
 
     assert_select 'input[type=number].integer#user_age'
   end
 
   test 'builder input_field is able to disable any component' do
-    with_concat_form_for(@user) do |f|
-      f.input_field :age, html5: false
-    end
+    with_input_field_for @user, :age, html5: false
 
     assert_no_select 'input[html5=false]#user_age'
     assert_select 'input[type=text].integer#user_age'
   end
 
   test 'builder input_field allows passing options to input tag' do
-    with_concat_form_for(@user) do |f|
-      f.input_field :name, id: 'name_input', class: 'name'
-    end
+    with_input_field_for @user, :name, id: 'name_input', class: 'name'
 
     assert_select 'input.string.name#name_input'
   end
 
   test 'builder input_field does not modify the options hash' do
     options = { id: 'name_input', class: 'name' }
-
-    with_concat_form_for(@user) do |f|
-      f.input_field :name, options
-    end
+    with_input_field_for @user, :name, options
 
     assert_select 'input.string.name#name_input'
     assert_equal({ id: 'name_input', class: 'name' }, options)
@@ -59,9 +53,7 @@ class InputFieldTest < ActionView::TestCase
 
 
   test 'builder input_field generates an input tag with a clean HTML' do
-    with_concat_form_for(@user) do |f|
-      f.input_field :name, as: :integer, class: 'name'
-    end
+    with_input_field_for @user, :name, as: :integer, class: 'name'
 
     assert_no_select 'input.integer[input_html]'
     assert_no_select 'input.integer[as]'
@@ -71,67 +63,51 @@ class InputFieldTest < ActionView::TestCase
     store_translations(:en, simple_form: { placeholders: { user: {
       name: 'Name goes here'
     } } }) do
-
-      with_concat_form_for(@user) do |f|
-        f.input_field :name
-      end
+      with_input_field_for @user, :name
 
       assert_select 'input.string[placeholder="Name goes here"]'
     end
   end
 
   test 'builder input_field uses min_max component' do
-    with_concat_form_for(@other_validating_user) do |f|
-      f.input_field :age, as: :integer
-    end
+    with_input_field_for @other_validating_user, :age, as: :integer
 
     assert_select 'input[min="18"]'
   end
 
   test 'builder input_field does not use pattern component by default' do
-    with_concat_form_for(@other_validating_user) do |f|
-      f.input_field :country, as: :string
-    end
+    with_input_field_for @other_validating_user, :country, as: :string
 
     assert_no_select 'input[pattern="\w+"]'
   end
 
   test 'builder input_field infers pattern from attributes' do
-    with_concat_form_for(@other_validating_user) do |f|
-      f.input_field :country, as: :string, pattern: true
-    end
+    with_input_field_for @other_validating_user, :country, as: :string, pattern: true
 
     assert_select 'input[pattern="\w+"]'
   end
 
   test 'builder input_field accepts custom patter' do
-    with_concat_form_for(@other_validating_user) do |f|
-      f.input_field :country, as: :string, pattern: '\d+'
-    end
+    with_input_field_for @other_validating_user, :country, as: :string, pattern: '\d+'
 
     assert_select 'input[pattern="\d+"]'
   end
 
   test 'builder input_field uses readonly component' do
-    with_concat_form_for(@other_validating_user) do |f|
-      f.input_field :age, as: :integer, readonly: true
-    end
+    with_input_field_for @other_validating_user, :age, as: :integer, readonly: true
 
     assert_select 'input.integer.readonly[readonly]'
   end
 
   test 'builder input_field uses maxlength component' do
-    with_concat_form_for(@validating_user) do |f|
-      f.input_field :name, as: :string
-    end
+    with_input_field_for @validating_user, :name, as: :string
 
     assert_select 'input.string[maxlength="25"]'
   end
 
   test 'builder collection input_field generates input tag with a clean HTML' do
-    with_concat_form_for(@user) do |f|
-      f.input_field :status, collection: ['Open', 'Closed'], class: 'status', label_method: :to_s, value_method: :to_s
-    end
+    with_input_field_for @user, :status, collection: ['Open', 'Closed'],
+      class: 'status', label_method: :to_s, value_method: :to_s
 
     assert_no_select 'select.status[input_html]'
     assert_no_select 'select.status[collection]'
@@ -140,48 +116,38 @@ class InputFieldTest < ActionView::TestCase
   end
 
   test 'build input_field does not treat "boolean_style" as a HTML attribute' do
-    with_concat_form_for(@user) do |f|
-      f.input_field :active, boolean_style: :nested
-    end
+    with_input_field_for @user, :active, boolean_style: :nested
 
     assert_no_select 'input.boolean[boolean_style]'
   end
 
   test 'build input_field without pattern component use the pattern string' do
-    swap_wrapper :default, self.custom_wrapper_with_html5_components do
-      with_concat_form_for(@user) do |f|
-        f.input_field :name, pattern: '\w+'
-      end
+    swap_wrapper :default, custom_wrapper_with_html5_components do
+      with_input_field_for @user, :name, pattern: '\w+'
 
       assert_select 'input[pattern="\w+"]'
     end
   end
 
   test 'build input_field without placeholder component use the placeholder string' do
-    swap_wrapper :default, self.custom_wrapper_with_html5_components do
-      with_concat_form_for(@user) do |f|
-        f.input_field :name, placeholder: 'Placeholder'
-      end
+    swap_wrapper :default, custom_wrapper_with_html5_components do
+      with_input_field_for @user, :name, placeholder: 'Placeholder'
 
       assert_select 'input[placeholder="Placeholder"]'
     end
   end
 
   test 'build input_field without maxlength component use the maxlength string' do
-    swap_wrapper :default, self.custom_wrapper_with_html5_components do
-      with_concat_form_for(@user) do |f|
-        f.input_field :name, maxlength: 5
-      end
+    swap_wrapper :default, custom_wrapper_with_html5_components do
+      with_input_field_for @user, :name, maxlength: 5
 
       assert_select 'input[maxlength="5"]'
     end
   end
 
   test 'build input_field without readonly component use the readonly string' do
-    swap_wrapper :default, self.custom_wrapper_with_html5_components do
-      with_concat_form_for(@user) do |f|
-        f.input_field :name, readonly: true
-      end
+    swap_wrapper :default, custom_wrapper_with_html5_components do
+      with_input_field_for @user, :name, readonly: true
 
       assert_select 'input[readonly="readonly"]'
     end

data/test/form_builder/label_test.rb

@@ -29,6 +29,16 @@ class LabelTest < ActionView::TestCase
     assert_select 'label.string.required[for=validating_user_name]', /Name/
   end
 
+  test 'builder adds a disabled class to label if the attribute is disabled' do
+    with_label_for @validating_user, :name, disabled: true
+    assert_select 'label.string.disabled[for=validating_user_name]', /Name/
+  end
+
+  test 'builder does not add a disabled class to label if the attribute is not disabled' do
+    with_label_for @validating_user, :name, disabled: false
+    assert_no_select 'label.string.disabled[for=validating_user_name]', /Name/
+  end
+
   test 'builder escapes label text' do
     with_label_for @user, :name, label: '<script>alert(1337)</script>', required: false
     assert_no_select 'label.string script'
@@ -80,7 +90,7 @@ class LabelTest < ActionView::TestCase
   end
 
   test 'configuration allow set label text for wrappers' do
-    swap_wrapper :default, self.custom_wrapper_with_label_text do
+    swap_wrapper :default, custom_wrapper_with_label_text do
       with_concat_form_for(@user) do |f|
         concat f.input :age
       end
@@ -89,7 +99,7 @@ class LabelTest < ActionView::TestCase
   end
 
   test 'configuration allow set rewrited label tag for wrappers' do
-    swap_wrapper :default, self.custom_wrapper_with_custom_label_component do
+    swap_wrapper :default, custom_wrapper_with_custom_label_component do
       with_concat_form_for(@user) do |f|
         concat f.input :age
       end

data/test/form_builder/wrapper_test.rb

@@ -129,7 +129,7 @@ class WrapperTest < ActionView::TestCase
   end
 
   test 'custom wrappers can have additional attributes' do
-    swap_wrapper :default, self.custom_wrapper_with_additional_attributes do
+    swap_wrapper :default, custom_wrapper_with_additional_attributes do
       with_form_for @user, :name
 
       assert_select "div.custom_wrapper[title='some title'][data-wrapper='test']"
@@ -137,7 +137,7 @@ class WrapperTest < ActionView::TestCase
   end
 
   test 'custom wrappers can have full error message on attributes' 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
       assert_select 'span.error', "Name cannot be blank"
     end
@@ -188,7 +188,7 @@ class WrapperTest < ActionView::TestCase
   end
 
   test 'does not duplicate label classes for different inputs' do
-    swap_wrapper :default, self.custom_wrapper_with_label_html_option do
+    swap_wrapper :default, custom_wrapper_with_label_html_option do
       with_concat_form_for(@user) do |f|
         concat f.input :name, required: false
         concat f.input :email, as: :email, required: true
@@ -243,7 +243,7 @@ class WrapperTest < ActionView::TestCase
   end
 
   test 'input accepts attributes in the DSL' do
-    swap_wrapper :default, self.custom_wrapper_with_input_class do
+    swap_wrapper :default, custom_wrapper_with_input_class do
       with_concat_form_for @user do |f|
         concat f.input :name
       end
@@ -253,7 +253,7 @@ class WrapperTest < ActionView::TestCase
   end
 
   test 'label accepts attributes in the DSL' do
-    swap_wrapper :default, self.custom_wrapper_with_label_class do
+    swap_wrapper :default, custom_wrapper_with_label_class do
       with_concat_form_for @user do |f|
         concat f.input :name
       end
@@ -263,7 +263,7 @@ class WrapperTest < ActionView::TestCase
   end
 
   test 'label_input accepts attributes in the DSL' do
-    swap_wrapper :default, self.custom_wrapper_with_label_input_class do
+    swap_wrapper :default, custom_wrapper_with_label_input_class do
       with_concat_form_for @user do |f|
         concat f.input :name
       end
@@ -274,7 +274,7 @@ class WrapperTest < ActionView::TestCase
   end
 
   test 'input accepts data attributes in the DSL' do
-    swap_wrapper :default, self.custom_wrapper_with_input_attributes do
+    swap_wrapper :default, custom_wrapper_with_input_attributes do
       with_concat_form_for @user do |f|
         concat f.input :name
       end
@@ -284,7 +284,7 @@ class WrapperTest < ActionView::TestCase
   end
 
   test 'inline wrapper displays when there is content' do
-    swap_wrapper :default, self.custom_wrapper_with_wrapped_optional_component do
+    swap_wrapper :default, custom_wrapper_with_wrapped_optional_component do
       with_form_for @user, :name, hint: "cannot be blank"
       assert_select 'section.custom_wrapper div.no_output_wrapper p.omg_hint', "cannot be blank"
       assert_select 'p.omg_hint'
@@ -292,7 +292,7 @@ class WrapperTest < ActionView::TestCase
   end
 
   test 'inline wrapper does not display when there is no content' do
-    swap_wrapper :default, self.custom_wrapper_with_wrapped_optional_component do
+    swap_wrapper :default, custom_wrapper_with_wrapped_optional_component do
       with_form_for @user, :name
       assert_select 'section.custom_wrapper div.no_output_wrapper'
       assert_no_select 'p.omg_hint'
@@ -300,7 +300,7 @@ class WrapperTest < ActionView::TestCase
   end
 
   test 'optional wrapper does not display when there is content' do
-    swap_wrapper :default, self.custom_wrapper_with_unless_blank do
+    swap_wrapper :default, custom_wrapper_with_unless_blank do
       with_form_for @user, :name, hint: "can't be blank"
       assert_select 'section.custom_wrapper div.no_output_wrapper'
       assert_select 'div.no_output_wrapper'
@@ -309,7 +309,7 @@ class WrapperTest < ActionView::TestCase
   end
 
   test 'optional wrapper does not display when there is no content' do
-    swap_wrapper :default, self.custom_wrapper_with_unless_blank do
+    swap_wrapper :default, custom_wrapper_with_unless_blank do
       with_form_for @user, :name
       assert_no_select 'section.custom_wrapper div.no_output_wrapper'
       assert_no_select 'div.no_output_wrapper'

data/test/inputs/datetime_input_test.rb

@@ -169,4 +169,9 @@ class DateTimeInputWithoutHtml5Test < ActionView::TestCase
     with_input_for :project, :created_at, :time, html5: false
     assert_select 'label[for=project_created_at_4i]'
   end
+
+  test 'label points to attribute name if HTML5 compatibility is explicitly enabled' do
+    with_input_for :project, :created_at, :date, html5: true
+    assert_select 'label[for=project_created_at]'
+  end
 end

data/test/inputs/required_test.rb

@@ -110,4 +110,16 @@ class RequiredTest < ActionView::TestCase
     assert_no_select 'input[required]'
     assert_select 'input.optional#validating_user_phone_number'
   end
+
+  test 'builder input does not generate required html attribute when option is set to false when it is set to true in wrapper' do
+    swap SimpleForm, browser_validations: true do
+      swap_wrapper :default, self.custom_wrapper_with_required_input do
+        with_concat_form_for(@user) do |f|
+          concat f.input :name, required: false
+        end
+        assert_no_select 'input[type=text][required]'
+        assert_no_select 'input[type=text][aria-required]'
+      end
+    end
+  end
 end

data/test/inputs/text_input_test.rb

@@ -12,6 +12,13 @@ class TextInputTest < ActionView::TestCase
     assert_select 'textarea.text[placeholder="Put in some text"]'
   end
 
+  test 'input generates a placeholder from the translations' do
+    store_translations(:en, simple_form: { placeholders: { user: { name: "placeholder from i18n en.simple_form.placeholders.user.name" } } }) do
+      with_input_for @user, :name, :text
+      assert_select 'textarea.text[placeholder="placeholder from i18n en.simple_form.placeholders.user.name"]'
+    end
+  end
+
   test 'input gets maxlength from column definition for text attributes' do
     with_input_for @user, :description, :text
     assert_select 'textarea.text[maxlength="200"]'

data/test/support/misc_helpers.rb

@@ -46,7 +46,7 @@ module MiscHelpers
     end
   end
 
-  def swap_wrapper(name = :default, wrapper = self.custom_wrapper)
+  def swap_wrapper(name = :default, wrapper = custom_wrapper)
     old = SimpleForm.wrappers[name.to_s]
     SimpleForm.wrappers[name.to_s] = wrapper
     yield
@@ -184,6 +184,13 @@ module MiscHelpers
     end
   end
 
+  def custom_wrapper_with_required_input
+    SimpleForm.build tag: :span, class: 'custom_wrapper' do |b|
+      b.use :html5
+      b.use :input, required: true
+    end
+  end
+
   def custom_form_for(object, *args, &block)
     simple_form_for(object, *args, { builder: CustomFormBuilder }, &block)
   end

data/test/test_helper.rb

@@ -36,6 +36,10 @@ else
   ActionDispatch::Assertions::NO_STRIP << "label"
 end
 
+if ActiveSupport::TestCase.respond_to?(:test_order=)
+  ActiveSupport::TestCase.test_order = :random
+end
+
 class ActionView::TestCase
   include MiscHelpers
   include SimpleForm::ActionViewExtensions::FormHelper

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - José Valim
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2015-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: simple_form
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Forms made easy!