simple_form 3.1.0.rc2 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88d85494e222c13d302bed66c947ebc999702a46
-  data.tar.gz: 6974cf74dc9cada33d515c0125c4506262aa4118
+  metadata.gz: 9a6c95d6f9a46246e380928d9f811d32400b46af
+  data.tar.gz: a1b26b221855af2b653a28da26fec66041b1bfc2
 SHA512:
-  metadata.gz: c2f1599b149fd691ccc0471af01e5f2f997465f55449bfea0924768c45f83510d36911342e54e8c42dfa75adf5da278261188f17c938b3571446b97c419e2011
-  data.tar.gz: 4c1677e4c36aa1381a378ef3a2c688db1881089d014cb97078f14dd2f5000a618fddc9671f78663fd693c86e4bc8524f3f2c9837aa5e8f7707c9b07b223cf114
+  metadata.gz: 381db066326564168e6c9242682b3a699397f8b4dbb3bd2f3662f4f817b51c5f65c6fb3d58e8e1a5e50bed6fa86d62ab024557cd67b221829d900ac81f52df56
+  data.tar.gz: 0340f0e2604165e8b266afe34423e1a1dcfc9e86daf08a84d690f9192624d482a846ac83685f198497e6da75317bd70a95c16a77f9d31c783b4ede1e23da211d

data/CHANGELOG.md

@@ -1,6 +1,43 @@
-## 3.1.0.rc2
+## 3.2.1
+
+* Updated gem dependency to support Rails 5.0.x.
+
+## 3.2.0
+
+### bug fix
+  * Improve performance of input generation by disabling support for `_html` translations. This reverts the feature introduced on the 3.1.0 branch
+
+## 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
+  * Update foundation generator to version 5. [@jorge-d](https://github.com/jorge-d)
   * Add mapping to `uuid` columns.
   * Add custom namespaces for custom inputs feature. [@vala](https://github.com/vala)
   * Add `:unless_blank` option to the wrapper API. [@IanVaughan](https://github.com/IanVaughan)
@@ -27,8 +64,11 @@
   * Add I18n support to `:include_blank` and `:prompt` when `:translate` is used as value. [@haines](https://github.com/plataformatec/simple_form/pull/616)
   * Add support to define custom error messages for the attributes.
   * Add support to change the I18n scope to be used in Simple Form. [@nielsbuus](https://github.com/nielsbuus)
+  * The default form class can now be overridden with `html: { :class }`. [@rmm5t](https://github.com/rmm5t)
 
 ### bug fix
+  * Fix `full_error` when the attribute is an association. [@mvdamme](https://github.com/jorge-d)
+  * Fix suppport to `:namespace` and `:index` options for nested check boxes and radio buttons when the attribute is an association.
   * Collection input that uses automatic collection translation properly sets checked values.
   Closes [#971](https://github.com/plataformatec/simple_form/issues/971) [@nashby](https://github.com/nashby)
   * Collection input generates `required` attribute if it has `prompt` option. [@nashby](https://github.com/nashby)
@@ -37,5 +77,9 @@
 ## deprecation
   * Methods on custom inputs now accept a required argument with the wrapper options.
   See https://github.com/plataformatec/simple_form/pull/997 for more information.
+  * SimpleForm.form_class is deprecated in favor of SimpleForm.default_form_class.
+  Future versions of Simple Form will not generate `simple_form` class for the form
+  element.
+  See https://github.com/plataformatec/simple_form/pull/1109 for more information.
 
 Please check [v3.0](https://github.com/plataformatec/simple_form/blob/v3.0/CHANGELOG.md) for previous changes.

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/).
@@ -55,9 +48,9 @@ For more information see the generator output, our
 [example application code](https://github.com/rafaelfranca/simple_form-bootstrap) and
 [the live example app](http://simple-form-bootstrap.plataformatec.com.br/).
 
-### Zurb Foundation 3
+### Zurb Foundation 5
 
-To generate wrappers that are compatible with [Zurb Foundation 3](http://foundation.zurb.com/), pass
+To generate wrappers that are compatible with [Zurb Foundation 5](http://foundation.zurb.com/), pass
 the `foundation` option to the generator, like this:
 
 ```console
@@ -68,7 +61,23 @@ Please note that the Foundation wrapper does not support the `:hint` option by d
 enable hints, please uncomment the appropriate line in `config/initializers/simple_form_foundation.rb`.
 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/old-docs/f3/rails.php).
+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
 
@@ -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:
@@ -429,6 +438,22 @@ All web forms need buttons, right? **Simple Form** wraps them in the DSL, acting
 
 The above will simply call submit. You choose to use it or not, it's just a question of taste.
 
+The button method also accepts optional parameters, that are delegated to the underlying submit call:
+
+```erb
+<%= 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
@@ -455,7 +480,7 @@ Rails helper, but change the builder to use the `SimpleForm::FormBuilder`.
 
 ```ruby
 form_for @user do |f|
-  simple_fields_for :posts do |posts_form|
+  f.simple_fields_for :posts do |posts_form|
     # Here you have all simple_form methods available
     posts_form.input :title
   end
@@ -547,7 +572,9 @@ that extends the string one, you just need to add this file:
 # app/inputs/currency_input.rb
 class CurrencyInput < SimpleForm::Inputs::Base
   def input(wrapper_options)
-    "$ #{@builder.text_field(attribute_name, input_html_options)}".html_safe
+    merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
+
+    "$ #{@builder.text_field(attribute_name, merged_input_options)}".html_safe
   end
 end
 ```
@@ -781,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
@@ -977,11 +1020,20 @@ You can also add `novalidate` to a specific form by setting the option on the fo
 <%= simple_form_for(resource, html: { novalidate: true }) do |form| %>
 ```
 
-Please notice that any of the configurations above will not disable the `placeholder` component,
-which is an HTML 5 feature. We believe most of the newest browsers are handling this attribute fine,
-and if they aren't, any plugin you use would take of using the placeholder attribute to do it.
-However, you can disable it if you want, by removing the placeholder component from the components
-list in **Simple Form** configuration file.
+Please notice that none of the configurations above will disable the `placeholder` component,
+which is an HTML 5 feature. We believe most of the newest browsers are handling this attribute
+just fine, and if they aren't, any plugin you use would take care of applying the placeholder.
+In any case, you can disable it if you really want to, by removing the placeholder component
+from the components list in the **Simple Form** configuration file.
+
+HTML 5 date / time inputs are not generated by **Simple Form** by default, so using `date`,
+`time` or `datetime` will all generate select boxes using normal Rails helpers. We believe
+browsers are not totally ready for these yet, but you can easily opt-in on a per-input basis
+by passing the html5 option:
+
+```erb
+<%= f.input :expires_at, as: :date, html5: true %>
+```
 
 ## Information
 
@@ -1020,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/install_generator.rb

@@ -5,11 +5,11 @@ module SimpleForm
       source_root File.expand_path('../templates', __FILE__)
       class_option :template_engine, desc: 'Template engine to be invoked (erb, haml or slim).'
       class_option :bootstrap, type: :boolean, desc: 'Add the Bootstrap wrappers to the SimpleForm initializer.'
-      class_option :foundation, type: :boolean, desc: 'Add the Zurb Foundation 3 wrappers to the SimpleForm initializer.'
+      class_option :foundation, type: :boolean, desc: 'Add the Zurb Foundation 5 wrappers to the SimpleForm initializer.'
 
       def info_bootstrap
         return if options.bootstrap? || options.foundation?
-        puts "SimpleForm 2 supports Bootstrap and Zurb Foundation 3. If you want "\
+        puts "SimpleForm 3 supports Bootstrap and Zurb Foundation 5. If you want "\
           "a configuration that is compatible with one of these frameworks, then please " \
           "re-run this generator with --bootstrap or --foundation as an option."
       end

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.
@@ -103,8 +102,9 @@ SimpleForm.setup do |config|
   # You can define the class to use on all labels. Default is nil.
   # config.label_class = nil
 
-  # You can define the class to use on all forms. Default is simple_form.
-  # config.form_class = :simple_form
+  # You can define the default class to be used on forms. Can be overriden
+  # with `html: { :class }`. Defaulting to none.
+  # config.default_form_class = nil
 
   # You can define which elements should obtain additional classes
   # config.generate_additional_classes_for = [:wrapper, :label, :input]

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

@@ -45,7 +45,8 @@ SimpleForm.setup do |config|
   config.wrappers :vertical_radio_and_checkboxes, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
     b.use :html5
     b.optional :readonly
-    b.use :label_input
+    b.use :label, class: 'control-label'
+    b.use :input
     b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
     b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
   end
@@ -86,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' }
@@ -121,9 +122,28 @@ 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,
   # buttons and other elements.
   config.default_wrapper = :vertical_form
+  config.wrapper_mappings = {
+    check_boxes: :vertical_radio_and_checkboxes,
+    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/generators/simple_form/templates/config/initializers/simple_form_foundation.rb

@@ -1,6 +1,13 @@
 # Use this setup block to configure all options available in SimpleForm.
 SimpleForm.setup do |config|
-  config.wrappers :foundation, class: :input, hint_class: :field_with_hint, error_class: :error do |b|
+  # Don't forget to edit this file to adapt it to your needs (specially
+  # all the grid-related classes)
+  #
+  # Please note that hints are commented out by default since Foundation
+  # does't provide styles for hints. You will need to provide your own CSS styles for hints.
+  # Uncomment them to enable hints.
+
+  config.wrappers :vertical_form, class: :input, hint_class: :field_with_hint, error_class: :error do |b|
     b.use :html5
     b.use :placeholder
     b.optional :maxlength
@@ -10,17 +17,91 @@ SimpleForm.setup do |config|
     b.use :label_input
     b.use :error, wrap_with: { tag: :small, class: :error }
 
-    # Uncomment the following line to enable hints. The line is commented out by default since Foundation
-    # does't provide styles for hints. You will need to provide your own CSS styles for hints.
+    # b.use :hint,  wrap_with: { tag: :span, class: :hint }
+  end
+
+  config.wrappers :horizontal_form, tag: 'div', class: 'row', hint_class: :field_with_hint, error_class: :error do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+
+    b.wrapper :label_wrapper, tag: :div, class: 'small-3 columns' do |ba|
+      ba.use :label, class: 'right inline'
+    end
+
+    b.wrapper :right_input_wrapper, tag: :div, class: 'small-9 columns' do |ba|
+      ba.use :input
+      ba.use :error, wrap_with: { tag: :small, class: :error }
+      # ba.use :hint,  wrap_with: { tag: :span, class: :hint }
+    end
+  end
+
+  config.wrappers :horizontal_radio_and_checkboxes, tag: 'div', class: 'row' do |b|
+    b.use :html5
+    b.optional :readonly
+
+    b.wrapper :container_wrapper, tag: 'div', class: 'small-offset-3 small-9 columns' do |ba|
+      ba.wrapper :tag => 'label', :class => 'checkbox' do |bb|
+        bb.use :input
+        bb.use :label_text
+      end
+
+      ba.use :error, wrap_with: { tag: :small, class: :error }
+      # ba.use :hint,  wrap_with: { tag: :span, class: :hint }
+    end
+  end
+
+  # Foundation does not provide a way to handle inline forms
+  # This wrapper can be used to create an inline form
+  # by hiding that labels on every screen sizes ('hidden-for-small-up').
+  #
+  # Note that you need to adapt this wrapper to your needs. If you need a 4
+  # columns form then change the wrapper class to 'small-3', if you need
+  # only two use 'small-6' and so on.
+  config.wrappers :inline_form, tag: 'div', class: 'column small-4', hint_class: :field_with_hint, error_class: :error do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+
+    b.use :label, class: 'hidden-for-small-up'
+    b.use :input
+
+    b.use :error, wrap_with: { tag: :small, class: :error }
+    # b.use :hint,  wrap_with: { tag: :span, class: :hint }
+  end
+
+  # Examples of use:
+  # - wrapper_html: {class: 'row'}, custom_wrapper_html: {class: 'column small-12'}
+  # - custom_wrapper_html: {class: 'column small-3 end'}
+  config.wrappers :customizable_wrapper, tag: 'div', error_class: :error do |b|
+    b.use :html5
+    b.optional :readonly
+
+    b.wrapper :custom_wrapper, tag: :div do |ba|
+      ba.use :label_input
+    end
+
+    b.use :error, wrap_with: { tag: :small, class: :error }
     # b.use :hint,  wrap_with: { tag: :span, class: :hint }
   end
 
   # CSS class for buttons
   config.button_class = 'button'
 
+  # Set this to div to make the checkbox and radio properly work
+  # otherwise simple_form adds a label tag instead of a div arround
+  # the nested label
+  config.item_wrapper_tag = :div
+
   # CSS class to add for error notification helper.
   config.error_notification_class = 'alert-box alert'
 
   # The default wrapper to be used by the FormBuilder.
-  config.default_wrapper = :foundation
+  config.default_wrapper = :vertical_form
 end

data/lib/simple_form/action_view_extensions/builder.rb

@@ -17,6 +17,7 @@ module SimpleForm
         options = args.extract_options!
         options[:wrapper] = self.options[:wrapper] if options[:wrapper].nil?
         options[:defaults] ||= self.options[:defaults]
+        options[:wrapper_mappings] ||= self.options[:wrapper_mappings]
 
         if self.class < ActionView::Helpers::FormBuilder
           options[:builder] ||= self.class

data/lib/simple_form/action_view_extensions/form_helper.rb

@@ -16,7 +16,11 @@ module SimpleForm
         unless options[:html].key?(:novalidate)
           options[:html][:novalidate] = !SimpleForm.browser_validations
         end
-        options[:html][:class] = [SimpleForm.form_class, simple_form_css_class(record, options)].compact.join(" ")
+        if options[:html].key?(:class)
+          options[:html][:class] = [SimpleForm.form_class, options[:html][:class]].compact
+        else
+          options[:html][:class] = [SimpleForm.form_class, SimpleForm.default_form_class, simple_form_css_class(record, options)].compact
+        end
 
         with_simple_form_field_error_proc do
           form_for(record, options, &block)

data/lib/simple_form/components/errors.rb

@@ -18,13 +18,11 @@ module SimpleForm
       def error_text
         text = has_custom_error? ? options[:error] : errors.send(error_method)
 
-        "#{html_escape(options[:error_prefix])} #{text}".lstrip.html_safe
+        "#{html_escape(options[:error_prefix])} #{html_escape(text)}".lstrip.html_safe
       end
 
       def full_error_text
-        text = has_custom_error? ? options[:error] : full_errors.send(error_method)
-
-        text.html_safe
+        has_custom_error? ? options[:error] : full_errors.send(error_method)
       end
 
       def error_method
@@ -52,7 +50,7 @@ module SimpleForm
       end
 
       def full_errors_on_association
-        reflection ? object.full_messages_for(reflection.name) : []
+        reflection ? object.errors.full_messages_for(reflection.name) : []
       end
 
       def has_custom_error?

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 ||= {}
@@ -131,14 +132,15 @@ module SimpleForm
     #        name="user[name]" type="text" value="Carlos" />
     #
     def input_field(attribute_name, options = {})
+      components = (wrapper.components.map(&:namespace) & ATTRIBUTE_COMPONENTS)
+
       options = options.dup
-      options[:input_html] = options.except(:as, :boolean_style, :collection, :label_method, :value_method, *ATTRIBUTE_COMPONENTS)
+      options[:input_html] = options.except(:as, :boolean_style, :collection, :label_method, :value_method, *components)
       options = @defaults.deep_dup.deep_merge(options) if @defaults
 
       input      = find_input(attribute_name, options)
       wrapper    = find_wrapper(input.input_type, options)
-      components = (wrapper.components.map(&:namespace) & ATTRIBUTE_COMPONENTS) + [:input]
-      components = components.map { |component| SimpleForm::Wrappers::Leaf.new(component) }
+      components = components.concat([:input]).map { |component| SimpleForm::Wrappers::Leaf.new(component) }
 
       SimpleForm::Wrappers::Root.new(components, wrapper.options.merge(wrapper: false)).render input
     end
@@ -205,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
@@ -507,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
@@ -542,7 +544,7 @@ module SimpleForm
     end
 
     def find_attribute_column(attribute_name)
-      if @object.respond_to?(:column_for_attribute)
+      if @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

@@ -178,17 +178,13 @@ 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)

data/lib/simple_form/inputs/boolean_input.rb

@@ -41,7 +41,7 @@ module SimpleForm
       # 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, options)
-        @builder.check_box(attribute_name, input_html_options, checked_value, unchecked_value)
+        @builder.check_box(attribute_name, options, checked_value, unchecked_value)
       end
 
       # Build a checkbox without generating the hidden field. See

data/lib/simple_form/inputs/collection_input.rb

@@ -21,10 +21,8 @@ module SimpleForm
         options = super
 
         options[:include_blank] = true unless skip_include_blank?
-
-        [:prompt, :include_blank].each do |key|
-          translate_option options, key
-        end
+        translate_option options, :prompt
+        translate_option options, :include_blank
 
         options
       end

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