simple_form 2.0.2 → 2.0.3

data/CHANGELOG.md

@@ -1,3 +1,36 @@
+## 2.0.3
+
+### enhancements
+  * Allow to specify custom wrappers for input types.
+  ([@nashby](https://github.com/nashby))
+  Closes [#636](https://github.com/plataformatec/simple_form/issues/636)
+  * Use separate config file to do bootstrap specific configuration.
+  ([@nashby](https://github.com/nashby))
+
+### bug fix
+  * Allow to specify checked and uncked values for boolean input
+  ([@nashby](https://github.com/nashby)).
+  Closes [#643](https://github.com/plataformatec/simple_form/issues/643)
+  * Allow to add additional classes only for wrapper.
+  ([@nashby](https://github.com/nashby)).
+  Closes [#629](https://github.com/plataformatec/simple_form/issues/629)
+  * Boolean hidden field now respects `:name` attribute when nested.
+  ([@amiel](https://github.com/amiel)).
+  Closes [#619](https://github.com/plataformatec/simple_form/issues/619)
+  * Prevent generation of `class=""`. ([@pkmiec](https://github.com/pkmiec))
+  * Fix namespace html propagation to single wrapper of `label` and `input`
+  * Association creates blank select if `:collection` is `nil`.
+  ([@nashby](https://github.com/nashby)).
+  Closes [#595](https://github.com/plataformatec/simple_form/issues/595)
+  * Fix readonly attribute check. ([@retoo](https://github.com/retoo))
+  * Fix error when `collection_check_boxes` used with `form_for` instead of `simple_form_for`.
+  ([@RohanM](https://github.com/RohanM))
+  * Ensure ActionView::Base.field_error_proc is preserved when exceptions occur within
+  `with_simple_form_field_error_proc`.
+  ([@jim](https://github.com/jim))
+  * Handle array of strings in `:checked` option.
+  ([@nashby](https://github.com/nashby))
+
 ## 2.0.2
 
 ### enhancements

data/README.md

@@ -53,7 +53,7 @@ For more information see the generator output, our
 are invoked to create a complete html input for you, which by default contains label, hints, errors
 and the input itself. It does not aim to create a lot of different logic from the default Rails
 form helpers, as they do a great work by themselves. Instead, **SimpleForm** acts as a DSL and just
-maps your input type (retrieved from the column definition in the database) to an specific helper method.
+maps your input type (retrieved from the column definition in the database) to a specific helper method.
 
 To start using **SimpleForm** you just have to use the helper it provides:
 
@@ -69,13 +69,14 @@ This will generate an entire form with labels for user name and password as well
 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:
+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 :password, :hint => 'No special characters.' %>
   <%= f.input :email, :placeholder => 'user@domain.com' %>
+  <%= f.input :remember_me, :inline_label => 'Yes, remember me' %>
   <%= f.button :submit %>
 <% end %>
 ```
@@ -129,8 +130,11 @@ any html attribute to that wrapper as well using the `:wrapper_html` option, lik
 <% end %>
 ```
 
-By default all inputs are required, which means an * is prepended to the label, but you can disable
-it in any input you want:
+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, **SimpleForm** tells required and optional fields apart. 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:
 
 ```erb
 <%= simple_form_for @user do |f| %>
@@ -314,6 +318,12 @@ the collection by hand, all together with the prompt:
 f.association :company, :collection => Company.active.all(:order => 'name'), :prompt => "Choose a Company"
 ```
 
+In case you want to declare different labels and values:
+
+```ruby
+f.association :company, :label_method => :company_name, :value_method => :id, :include_blank => false
+```
+
 ### Buttons
 
 All web forms need buttons, right? **SimpleForm** wraps them in the DSL, acting like a proxy:
@@ -463,7 +473,7 @@ instance, if you want to wrap date/time/datetime in a div, you can do:
 # app/inputs/date_time_input.rb
 class DateTimeInput < SimpleForm::Inputs::DateTimeInput
   def input
-    "<div>#{super}</div>".html_safe
+    template.content_tag(:div, super)
   end
 end
 ```
@@ -567,7 +577,7 @@ en:
 ```
 
 **SimpleForm** will always look for a default attribute translation under the "defaults" key if no
-specific is found inside the model key.Note that this syntax is different from 1.x. To migrate to
+specific is found inside the model key. Note that this syntax is different from 1.x. To migrate to
 the new syntax, just move "labels.#{attribute}" to "labels.defaults.#{attribute}".
 
 In addition, **SimpleForm** will fallback to default human_attribute_name from Rails when no other
@@ -592,7 +602,7 @@ en:
       user:
         gender:
           male: 'Male'
-          female: "Female'
+          female: 'Female'
 ```
 
 You can also use the `defaults` key as you would do with labels, hints and placeholders. It is
@@ -614,6 +624,37 @@ There are other options that can be configured through I18n API, such as require
 Be sure to check our locale file or the one copied to your application after you run
 `rails generate simple_form:install`.
 
+It should be noted that translations for labels, hints and placeholders for a namespaced model, e.g.
+`Admin::User`, should be placed under `admin_user`, not under `admin/user`. This is different from
+how translations for namespaced model and attribute names are defined:
+
+```yaml
+en:
+  activerecord:
+    models:
+        admin/user: User
+    attributes:
+        admin/user:
+            name: Name
+```
+
+They should be placed under `admin/user`. Form labels, hints and placeholders for those attributes,
+though, should be placed under `admin_user`:
+
+```yaml
+en:
+  simple_form:
+    labels:
+        admin_user:
+            name: Name
+```
+
+This difference exists because **SimpleForm** relies on `object_name` provided by Rails'
+FormBuilder to determine the translation path for a given object instead of `i18n_key` from the
+object itself. Thus, similarly, if a form for an `Admin::User` object is defined by calling
+`simple_form_for @admin_user, :as => :some_user`, **SimpleForm** will look for translations
+under `some_user` instead of `admin_user`.
+
 ## Configuration
 
 **SimpleForm** has several configuration options. You can read and change them in the initializer
@@ -812,6 +853,7 @@ https://github.com/plataformatec/simple_form/issues
 * José Valim (https://github.com/josevalim)
 * Carlos Antonio da Silva (https://github.com/carlosantoniodasilva)
 * Rafael Mendonça França (https://github.com/rafaelfranca)
+* Vasiliy Ermolovich (https://github.com/nashby)
 
 ## License
 

data/lib/generators/simple_form/install_generator.rb

@@ -14,7 +14,13 @@ module SimpleForm
       end
 
       def copy_config
-        directory 'config'
+        template "config/initializers/simple_form.rb"
+
+        if options[:bootstrap]
+          template "config/initializers/simple_form_bootstrap.rb"
+        end
+
+        directory 'config/locales'
       end
 
       def copy_scaffold_template

data/lib/generators/simple_form/templates/config/initializers/{simple_form.rb.tt → simple_form.rb}

@@ -44,53 +44,10 @@ SimpleForm.setup do |config|
     b.use :hint,  :wrap_with => { :tag => :span, :class => :hint }
     b.use :error, :wrap_with => { :tag => :span, :class => :error }
   end
-<% if options.bootstrap? %>
-  config.wrappers :bootstrap, :tag => 'div', :class => 'control-group', :error_class => 'error' do |b|
-    b.use :html5
-    b.use :placeholder
-    b.use :label
-    b.wrapper :tag => 'div', :class => 'controls' do |ba|
-      ba.use :input
-      ba.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
-      ba.use :hint,  :wrap_with => { :tag => 'p', :class => 'help-block' }
-    end
-  end
-
-  config.wrappers :prepend, :tag => 'div', :class => "control-group", :error_class => 'error' do |b|
-    b.use :html5
-    b.use :placeholder
-    b.use :label
-    b.wrapper :tag => 'div', :class => 'controls' do |input|
-      input.wrapper :tag => 'div', :class => 'input-prepend' do |prepend|
-        prepend.use :input
-      end
-      input.use :hint,  :wrap_with => { :tag => 'span', :class => 'help-block' }
-      input.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
-    end
-  end
 
-  config.wrappers :append, :tag => 'div', :class => "control-group", :error_class => 'error' do |b|
-    b.use :html5
-    b.use :placeholder
-    b.use :label
-    b.wrapper :tag => 'div', :class => 'controls' do |input|
-      input.wrapper :tag => 'div', :class => 'input-append' do |append|
-        append.use :input
-      end
-      input.use :hint,  :wrap_with => { :tag => 'span', :class => 'help-block' }
-      input.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
-    end
-  end
-
-  # Wrappers for forms and inputs using the Twitter Bootstrap toolkit.
-  # Check the Bootstrap docs (http://twitter.github.com/bootstrap)
-  # to learn about the different styles for forms and inputs,
-  # buttons and other elements.
-  config.default_wrapper = :bootstrap
-<% else %>
   # The default wrapper to be used by the FormBuilder.
   config.default_wrapper = :default
-<% end %>
+
   # Define the way to render check boxes / radio buttons with labels.
   # Defaults to :nested for bootstrap config.
   #   :inline => input + label
@@ -161,6 +118,10 @@ SimpleForm.setup do |config|
   # matches the regexp as value.
   # config.input_mappings = { /count/ => :integer }
 
+  # Custom wrappers for input types. This should be a hash containing an input
+  # type as key and the wrapper that will be used for all inputs with specified type.
+  # config.wrapper_mappings = { :string => :prepend }
+
   # Default priority for time_zone inputs.
   # config.time_zone_priority = nil
 

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

@@ -0,0 +1,45 @@
+# Use this setup block to configure all options available in SimpleForm.
+SimpleForm.setup do |config|
+  config.wrappers :bootstrap, :tag => 'div', :class => 'control-group', :error_class => 'error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.use :label
+    b.wrapper :tag => 'div', :class => 'controls' do |ba|
+      ba.use :input
+      ba.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
+      ba.use :hint,  :wrap_with => { :tag => 'p', :class => 'help-block' }
+    end
+  end
+
+  config.wrappers :prepend, :tag => 'div', :class => "control-group", :error_class => 'error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.use :label
+    b.wrapper :tag => 'div', :class => 'controls' do |input|
+      input.wrapper :tag => 'div', :class => 'input-prepend' do |prepend|
+        prepend.use :input
+      end
+      input.use :hint,  :wrap_with => { :tag => 'span', :class => 'help-block' }
+      input.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
+    end
+  end
+
+  config.wrappers :append, :tag => 'div', :class => "control-group", :error_class => 'error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.use :label
+    b.wrapper :tag => 'div', :class => 'controls' do |input|
+      input.wrapper :tag => 'div', :class => 'input-append' do |append|
+        append.use :input
+      end
+      input.use :hint,  :wrap_with => { :tag => 'span', :class => 'help-block' }
+      input.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
+    end
+  end
+
+  # Wrappers for forms and inputs using the Twitter Bootstrap toolkit.
+  # Check the Bootstrap docs (http://twitter.github.com/bootstrap)
+  # to learn about the different styles for forms and inputs,
+  # buttons and other elements.
+  config.default_wrapper = :bootstrap
+end

data/lib/simple_form.rb

@@ -95,6 +95,12 @@ module SimpleForm
   mattr_accessor :input_mappings
   @@input_mappings = nil
 
+  # Custom wrappers for input types. This should be a hash containing an input
+  # type as key and the wrapper that will be used for all inputs with specified type.
+  # e.g { :string => :string_wrapper, :boolean => :boolean_wrapper }
+  mattr_accessor :wrapper_mappings
+  @@wrapper_mappings = nil
+
   # Default priority for time_zone inputs.
   mattr_accessor :time_zone_priority
   @@time_zone_priority = nil

data/lib/simple_form/action_view_extensions/builder.rb

@@ -153,7 +153,8 @@ module SimpleForm
       #
       #   * collection_wrapper_tag   => the tag to wrap the entire collection.
       #
-      #   * collection_wrapper_class => the CSS class to use for collection_wrapper_tag
+      #   * collection_wrapper_class => the CSS class to use for collection_wrapper_tag. This option
+      #                                 is ignored if the :collection_wrapper_tag option is blank.
       #
       #   * item_wrapper_tag         => the tag to wrap each item in the collection.
       #
@@ -177,7 +178,7 @@ module SimpleForm
 
         # Append a hidden field to make sure something will be sent back to the
         # server if all checkboxes are unchecked.
-        hidden = template.hidden_field_tag("#{object_name}[#{attribute}][]", "", :id => nil)
+        hidden = @template.hidden_field_tag("#{object_name}[#{attribute}][]", "", :id => nil)
 
         wrap_rendered_collection(rendered_collection + hidden, options)
       end
@@ -223,7 +224,7 @@ module SimpleForm
           accept = if current_option.respond_to?(:call)
             current_option.call(item)
           else
-            Array(current_option).include?(value)
+            Array(current_option).map(&:to_s).include?(value.to_s)
           end
 
           if accept

data/lib/simple_form/action_view_extensions/form_helper.rb

@@ -9,10 +9,6 @@ module SimpleForm
     #   end
     #
     module FormHelper
-      # based on what is done in formtastic
-      # http://github.com/justinfrench/formtastic/blob/master/lib/formtastic.rb#L1706
-      @@default_field_error_proc = nil
-
       # Override the default ActiveRecordHelper behaviour of wrapping the input.
       # This gets taken care of semantically by adding an error class to the wrapper tag
       # containing the input.
@@ -46,11 +42,13 @@ module SimpleForm
       private
 
       def with_simple_form_field_error_proc
-        @@default_field_error_proc = ::ActionView::Base.field_error_proc
-        ::ActionView::Base.field_error_proc = FIELD_ERROR_PROC
-        result = yield
-        ::ActionView::Base.field_error_proc = @@default_field_error_proc
-        result
+        default_field_error_proc = ::ActionView::Base.field_error_proc
+        begin
+          ::ActionView::Base.field_error_proc = FIELD_ERROR_PROC
+          yield
+        ensure
+          ::ActionView::Base.field_error_proc = default_field_error_proc
+        end
       end
 
       def simple_form_css_class(record, options)

data/lib/simple_form/components/readonly.rb

@@ -15,7 +15,7 @@ module SimpleForm
       def readonly_attribute?
         object.class.respond_to?(:readonly_attributes) &&
           object.persisted? &&
-          object.class.readonly_attributes.include?(attribute_name)
+          object.class.readonly_attributes.include?(attribute_name.to_s)
       end
     end
   end

data/lib/simple_form/form_builder.rb

@@ -104,15 +104,16 @@ module SimpleForm
     #
     def input(attribute_name, options={}, &block)
       options = @defaults.deep_dup.deep_merge(options) if @defaults
+      input = find_input(attribute_name, options, &block)
 
       chosen =
-        if name = options[:wrapper]
+        if name = options[:wrapper] || find_wrapper_mapping(input.input_type)
           name.respond_to?(:render) ? name : SimpleForm.wrapper(name)
         else
           wrapper
         end
 
-      chosen.render find_input(attribute_name, options, &block)
+      chosen.render input
     end
     alias :attribute :input
 
@@ -174,13 +175,15 @@ module SimpleForm
       raise "Association #{association.inspect} not found" unless reflection
 
       options[:as] ||= :select
-      options[:collection] ||= reflection.klass.all(reflection.options.slice(:conditions, :order))
+      options[:collection] ||= options.fetch(:collection) {
+        reflection.klass.all(reflection.options.slice(:conditions, :order))
+      }
 
       attribute = case reflection.macro
         when :belongs_to
           (reflection.respond_to?(:options) && reflection.options[:foreign_key]) || :"#{reflection.name}_id"
         when :has_one
-          raise ":has_one associations are not supported by f.association"
+          raise ArgumentError, ":has_one associations are not supported by f.association"
         else
           if options[:as] == :select
             html_options = options[:input_html] ||= {}
@@ -442,6 +445,10 @@ module SimpleForm
         end
     end
 
+    def find_wrapper_mapping(input_type)
+      SimpleForm.wrapper_mappings && SimpleForm.wrapper_mappings[input_type]
+    end
+
     # If cache_discovery is enabled, use the class level cache that persists
     # between requests, otherwise use the instance one.
     def discovery_cache #:nodoc:

data/lib/simple_form/inputs/base.rb

@@ -60,9 +60,7 @@ module SimpleForm
         # Notice that html_options_for receives a reference to input_html_classes.
         # This means that classes added dynamically to input_html_classes will
         # still propagate to input_html_options.
-        @html_classes = SimpleForm.additional_classes_for(:input) {
-          [input_type, required_class, readonly_class, disabled_class].compact
-        }
+        @html_classes = SimpleForm.additional_classes_for(:input) { additional_classes }
 
         @input_html_classes = @html_classes.dup
         @input_html_options = html_options_for(:input, input_html_classes).tap do |o|
@@ -80,6 +78,10 @@ module SimpleForm
         options
       end
 
+      def additional_classes
+        @additional_classes ||= [input_type, required_class, readonly_class, disabled_class].compact
+      end
+
       private
 
       def add_size!
@@ -119,7 +121,7 @@ module SimpleForm
         html_options = options[:"#{namespace}_html"]
         html_options = html_options ? html_options.dup : {}
         css_classes << html_options[:class] if html_options.key?(:class)
-        html_options[:class] = css_classes
+        html_options[:class] = css_classes unless css_classes.empty?
         html_options
       end
 

data/lib/simple_form/inputs/boolean_input.rb

@@ -34,8 +34,8 @@ module SimpleForm
       # reuse the method for nested boolean style, but with no unchecked value,
       # which won't generate the hidden checkbox. This is the default functionality
       # in Rails > 3.2.1, and is backported in SimpleForm AV helpers.
-      def build_check_box(unchecked_value='0')
-        @builder.check_box(attribute_name, input_html_options, '1', unchecked_value)
+      def build_check_box(unchecked_value = unchecked_value)
+        @builder.check_box(attribute_name, input_html_options, checked_value, unchecked_value)
       end
 
       # Build a checkbox without generating the hidden field. See
@@ -49,8 +49,9 @@ module SimpleForm
       # we need the hidden field to be *outside* the label (otherwise it
       # generates invalid html - html5 only).
       def build_hidden_field_for_checkbox
-        @builder.hidden_field(attribute_name, :value => '0', :id => nil,
-                              :disabled => input_html_options[:disabled])
+        @builder.hidden_field(attribute_name, :value => unchecked_value, :id => nil,
+                              :disabled => input_html_options[:disabled],
+                              :name => input_html_options[:name])
       end
 
       def inline_label
@@ -64,6 +65,14 @@ module SimpleForm
       def required_by_default?
         false
       end
+
+      def checked_value
+        options.fetch(:checked_value, '1')
+      end
+
+      def unchecked_value
+        options.fetch(:unchecked_value, '0')
+      end
     end
   end
 end

data/lib/simple_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "2.0.2".freeze
+  VERSION = "2.0.3".freeze
 end

data/lib/simple_form/wrappers/many.rb

@@ -56,11 +56,15 @@ module SimpleForm
         return content unless tag
 
         klass = html_classes(input, options)
-        opts  = options[:"#{namespace}_html"] || {}
+        opts  = html_options(options)
         opts[:class] = (klass << opts[:class]).join(' ').strip unless klass.empty?
         input.template.content_tag(tag, content, opts)
       end
 
+      def html_options(options)
+        options[:"#{namespace}_html"] || {}
+      end
+
       def html_classes(input, options)
         @defaults[:class].dup
       end

data/lib/simple_form/wrappers/root.rb

@@ -24,10 +24,10 @@ module SimpleForm
 
       def html_classes(input, options)
         css = options[:wrapper_class] ? Array.wrap(options[:wrapper_class]) : @defaults[:class]
-        css += SimpleForm.additional_classes_for(:wrapper) { input.html_classes }
+        css += SimpleForm.additional_classes_for(:wrapper) { input.additional_classes }
         css << (options[:wrapper_error_class] || @defaults[:error_class]) if input.has_errors?
         css << (options[:wrapper_hint_class] || @defaults[:hint_class]) if input.has_hint?
-        css
+        css.compact
       end
     end
   end

data/lib/simple_form/wrappers/single.rb

@@ -13,6 +13,12 @@ module SimpleForm
           wrap(input, options, content) if content
         end
       end
+
+      private
+
+      def html_options(options)
+        [:label, :input].include?(namespace) ? {} : super
+      end
     end
   end
 end

data/test/action_view_extensions/builder_test.rb

@@ -63,7 +63,7 @@ class BuilderTest < ActionView::TestCase
     assert_select 'form input[type=radio][value=true][checked=checked]'
     assert_no_select 'form input[type=radio][value=false][checked=checked]'
   end
- 
+
   test 'collection radio accepts checked item which has a value of false' do
     with_collection_radio_buttons @user, :active, [[1, true], [0, false]], :last, :first, :checked => false
     assert_no_select 'form input[type=radio][value=true][checked=checked]'
@@ -302,7 +302,6 @@ class BuilderTest < ActionView::TestCase
     assert_no_select 'form input[type=checkbox][value=2][checked=checked]'
   end
 
-
   test 'collection check box accepts selected values as :checked option' do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
     with_collection_check_boxes @user, :tag_ids, collection, :first, :last, :checked => [1, 3]
@@ -312,6 +311,15 @@ class BuilderTest < ActionView::TestCase
     assert_no_select 'form input[type=checkbox][value=2][checked=checked]'
   end
 
+  test 'collection check boxes accepts selected string values as :checked option' do
+    collection = (1..3).map{|i| [i, "Category #{i}"] }
+    with_collection_check_boxes :user, :category_ids, collection, :first, :last, :checked => ['1', '3']
+
+    assert_select 'input[type=checkbox][value=1][checked=checked]'
+    assert_select 'input[type=checkbox][value=3][checked=checked]'
+    assert_no_select 'input[type=checkbox][value=2][checked=checked]'
+  end
+
   test 'collection check box accepts a single checked value' do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
     with_collection_check_boxes @user, :tag_ids, collection, :first, :last, :checked => 3
@@ -537,10 +545,8 @@ class BuilderTest < ActionView::TestCase
   end
 
   test 'fields for with a hash like model yeilds an instance of FormBuilder' do
-    @hash_backed_author = HashBackedAuthor.new
-
     with_concat_form_for(:user) do |f|
-      f.simple_fields_for(:author, @hash_backed_author) do |author|
+      f.simple_fields_for(:author, HashBackedAuthor.new) do |author|
         assert author.instance_of?(SimpleForm::FormBuilder)
         author.input :name
       end

data/test/action_view_extensions/form_helper_test.rb

@@ -92,13 +92,47 @@ class FormHelperTest < ActionView::TestCase
   end
 
   test 'fields for with a hash like model yeilds an instance of FormBuilder' do
-    @hash_backed_author = HashBackedAuthor.new
-
-    with_concat_fields_for(:author, @hash_backed_author) do |f|
+    with_concat_fields_for(:author, HashBackedAuthor.new) do |f|
       assert f.instance_of?(SimpleForm::FormBuilder)
       f.input :name
     end
 
     assert_select "input[name='author[name]'][value='hash backed author']"
   end
+
+  test 'custom error proc is not destructive' do
+    swap_field_error_proc do
+      result = nil
+      simple_form_for :user do |f|
+        result = simple_fields_for 'address' do
+          'hello'
+        end
+      end
+
+      assert_equal 'hello', result
+    end
+  end
+
+  test 'custom error proc survives an exception' do
+    swap_field_error_proc do
+      begin
+        simple_form_for :user do |f|
+          simple_fields_for 'address' do
+            raise 'an exception'
+          end
+        end
+      rescue StandardError
+      end
+    end
+  end
+
+  private
+
+  def swap_field_error_proc(expected_error_proc = lambda {})
+    swap ActionView::Base, :field_error_proc => expected_error_proc do
+      yield
+
+      assert_equal expected_error_proc, ActionView::Base.field_error_proc
+    end
+  end
 end

data/test/components/label_test.rb

@@ -181,6 +181,13 @@ class IsolatedLabelTest < ActionView::TestCase
     end
   end
 
+  test 'label should not generate empty css class' do
+    swap SimpleForm, :generate_additional_classes_for => [:wrapper, :input] do
+      with_label_for @user, :name, :string
+      assert_no_select 'label[class]'
+    end
+  end
+
   test 'label should obtain required from ActiveModel::Validations when it is included' do
     with_label_for @validating_user, :name, :string
     assert_select 'label.required'

data/test/form_builder/association_test.rb

@@ -79,6 +79,12 @@ class AssociationTest < ActionView::TestCase
     assert_select 'form select option[value=3]', 'Company 3'
   end
 
+  test 'builder creates blank select if collection is nil' do
+    with_association_for @user, :company, :collection => nil
+    assert_select 'form select.select#user_company_id'
+    assert_no_select 'form select option[value=1]', 'Company 1'
+  end
+
   test 'builder allows collection radio for belongs_to associations' do
     with_association_for @user, :company, :as => :radio_buttons
     assert_select 'form input.radio_buttons#user_company_id_1'
@@ -114,7 +120,7 @@ class AssociationTest < ActionView::TestCase
 
   # ASSOCIATIONS - has_*
   test 'builder does not allow has_one associations' do
-    assert_raise RuntimeError do
+    assert_raise ArgumentError do
       with_association_for @user, :first_company, :as => :radio_buttons
     end
   end

data/test/form_builder/general_test.rb

@@ -46,6 +46,15 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
+  test 'builder should allow to add additional classes only for wrapper' do
+    swap SimpleForm, :generate_additional_classes_for => [:wrapper] do
+      with_form_for @user, :post_count
+      assert_no_select "form input#user_post_count.string"
+      assert_no_select "form label#user_post_count.string"
+      assert_select "form div.input.string"
+    end
+  end
+
   test 'builder should allow adding custom input mappings for integer input types' do
     swap SimpleForm, :input_mappings => { /lock_version/ => :hidden } do
       with_form_for @user, :lock_version
@@ -202,6 +211,22 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'form input#my_input.my_input.string'
   end
 
+  test 'builder should not propagate input options to wrapper with custom wrapper' do
+    swap_wrapper :default, self.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'
+    end
+  end
+
+  test 'builder should not propagate label options to wrapper with custom wrapper' do
+    swap_wrapper :default, self.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'
+    end
+  end
+
   test 'builder should generate a input with label' do
     with_form_for @user, :name
     assert_select 'form label.string[for=user_name]', /Name/

data/test/form_builder/hint_test.rb

@@ -41,12 +41,11 @@ class HintTest < ActionView::TestCase
     with_hint_for @user, :name, :hint => 'Yay!', :id => 'hint', :class => 'yay'
     assert_select 'span#hint.hint.yay'
   end
-  
+
   test 'hint should be output as html_safe' do
     with_hint_for @user, :name, :hint => '<b>Bold</b> and not...'
-    assert_select 'span.hint', 'Bold and not...'  
+    assert_select 'span.hint', 'Bold and not...'
   end
-  
 
   # Without attribute name
 
@@ -110,7 +109,7 @@ class HintTest < ActionView::TestCase
       assert_select 'span.hint', /My company!/
     end
   end
-  
+
   test 'hint should output translations as html_safe' do
     store_translations(:en, :simple_form => { :hints => { :user => {
       :edit => { :name => '<b>This is bold</b> and this is not...' }
@@ -119,7 +118,7 @@ class HintTest < ActionView::TestCase
       assert_select 'span.hint', 'This is bold and this is not...'
     end
   end
-  
+
 
   # No object
 

data/test/form_builder/wrapper_test.rb

@@ -75,6 +75,15 @@ class WrapperTest < ActionView::TestCase
     end
   end
 
+  test 'wrapper should not generate empty css class' do
+    swap SimpleForm, :generate_additional_classes_for => [:input, :label] do
+      swap_wrapper :default, custom_wrapper_without_class do
+        with_form_for @user, :name
+        assert_no_select 'div#custom_wrapper_without_class[class]'
+      end
+    end
+  end
+
   # Custom wrapper test
 
   test 'custom wrappers works' do
@@ -159,4 +168,14 @@ class WrapperTest < ActionView::TestCase
       with_form_for @user, :name, :wrapper => :not_found
     end
   end
+
+  test 'use wrapper for specified in config mapping' do
+    swap_wrapper :another do
+      swap SimpleForm, :wrapper_mappings => { :string => :another } do
+        with_form_for @user, :name
+        assert_select "section.custom_wrapper div.another_wrapper label"
+        assert_select "section.custom_wrapper div.another_wrapper input.string"
+      end
+    end
+  end
 end

data/test/generators/simple_form_generator_test.rb

@@ -19,7 +19,9 @@ class SimpleFormGeneratorTest < Rails::Generators::TestCase
 
   test 'generates the simple_form initializer with the bootstrap wrappers' do
     run_generator %w(--bootstrap)
-    assert_file 'config/initializers/simple_form.rb', /config\.wrappers :bootstrap/,
+    assert_file 'config/initializers/simple_form.rb',
+      /config\.default_wrapper = :default/, /config\.boolean_style = :nested/
+    assert_file 'config/initializers/simple_form_bootstrap.rb', /config\.wrappers :bootstrap/,
       /config\.default_wrapper = :bootstrap/
   end
 

data/test/inputs/boolean_input_test.rb

@@ -14,6 +14,24 @@ class BooleanInputTest < ActionView::TestCase
     assert_no_select 'label'
   end
 
+  test 'input uses custom checked value' do
+    @user.action = 'on'
+    with_input_for @user, :action, :boolean, :checked_value => 'on', :unchecked_value => 'off'
+    assert_select 'input[type=checkbox][value=on][checked=checked]'
+  end
+
+  test 'input uses custom unchecked value' do
+    @user.action = 'off'
+    with_input_for @user, :action, :boolean, :checked_value => 'on', :unchecked_value => 'off'
+    assert_select 'input[type=checkbox][value=on]'
+    assert_no_select 'input[checked=checked][value=on]'
+  end
+
+  test 'input generates hidden input with custom unchecked value' do
+    with_input_for @user, :action, :boolean, :checked_value => 'on', :unchecked_value => 'off'
+    assert_select 'input[type=hidden][value=off]'
+  end
+
   test 'input uses inline boolean style by default' do
     with_input_for @user, :active, :boolean
     assert_select 'input.boolean + label.boolean.optional'
@@ -84,6 +102,13 @@ class BooleanInputTest < ActionView::TestCase
     end
   end
 
+  test 'input with nested style allows customizing input_html' do
+    swap SimpleForm, :boolean_style => :nested do
+      with_input_for @user, :active, :boolean, :input_html => { :name => 'active_user' }
+      assert_select "input[type=hidden][name=active_user] + label.boolean > input.boolean[name=active_user]"
+    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/disabled_test.rb

@@ -1,38 +1,78 @@
 require 'test_helper'
 
 class DisabledTest < ActionView::TestCase
-  test 'input should generate disabled elements based on the disabled option' do
+  test 'string input should be disabled when disabled option is true' do
     with_input_for @user, :name, :string, :disabled => true
     assert_select 'input.string.disabled[disabled]'
+  end
+
+  test 'text input should be disabled when disabled option is true' do
     with_input_for @user, :description, :text, :disabled => true
     assert_select 'textarea.text.disabled[disabled]'
+  end
+
+  test 'numeric input should be disabled when disabled option is true' do
     with_input_for @user, :age, :integer, :disabled => true
     assert_select 'input.integer.disabled[disabled]'
+  end
+
+  test 'date input should be disabled when disabled option is true' do
     with_input_for @user, :born_at, :date, :disabled => true
     assert_select 'select.date.disabled[disabled]'
+  end
+
+  test 'datetime input should be disabled when disabled option is true' do
     with_input_for @user, :created_at, :datetime, :disabled => true
     assert_select 'select.datetime.disabled[disabled]'
+  end
 
+  test 'string input should not be disabled when disabled option is false' do
     with_input_for @user, :name, :string, :disabled => false
-    assert_select 'input.string:not(.disabled[disabled])'
+    assert_no_select 'input.string.disabled[disabled]'
+  end
+
+  test 'text input should not be disabled when disabled option is false' do
     with_input_for @user, :description, :text, :disabled => false
-    assert_select 'textarea.text:not(.disabled[disabled])'
+    assert_no_select 'textarea.text.disabled[disabled]'
+  end
+
+  test 'numeric input should not be disabled when disabled option is false' do
     with_input_for @user, :age, :integer, :disabled => false
-    assert_select 'input.integer:not(.disabled[disabled])'
+    assert_no_select 'input.integer.disabled[disabled]'
+  end
+
+  test 'date input should not be disabled when disabled option is false' do
     with_input_for @user, :born_at, :date, :disabled => false
-    assert_select 'select.date:not(.disabled[disabled])'
+    assert_no_select 'select.date.disabled[disabled]'
+  end
+
+  test 'datetime input should not be disabled when disabled option is false' do
     with_input_for @user, :created_at, :datetime, :disabled => false
-    assert_select 'select.datetime:not(.disabled[disabled])'
+    assert_no_select 'select.datetime.disabled[disabled]'
+  end
 
+  test 'string input should not be disabled when disabled option is not present' do
     with_input_for @user, :name, :string
-    assert_select 'input.string:not(.disabled[disabled])'
+    assert_no_select 'input.string.disabled[disabled]'
+  end
+
+  test 'text input should not be disabled when disabled option is not present' do
     with_input_for @user, :description, :text
-    assert_select 'textarea.text:not(.disabled[disabled])'
+    assert_no_select 'textarea.text.disabled[disabled]'
+  end
+
+  test 'numeric input should not be disabled when disabled option is not present' do
     with_input_for @user, :age, :integer
-    assert_select 'input.integer:not(.disabled[disabled])'
+    assert_no_select 'input.integer.disabled[disabled]'
+  end
+
+  test 'date input should not be disabled when disabled option is not present' do
     with_input_for @user, :born_at, :date
-    assert_select 'select.date:not(.disabled[disabled])'
+    assert_no_select 'select.date.disabled[disabled]'
+  end
+
+  test 'datetime input should not be disabled when disabled option is not present' do
     with_input_for @user, :created_at, :datetime
-    assert_select 'select.datetime:not(.disabled[disabled])'
+    assert_no_select 'select.datetime.disabled[disabled]'
   end
 end

data/test/inputs/general_test.rb

@@ -15,39 +15,79 @@ class InputTest < ActionView::TestCase
     assert_select 'select.datetime'
   end
 
-  test 'input should generate autofocus attribute based on the autofocus option' do
+  test 'string input should generate autofocus attribute when autofocus option is true' do
     with_input_for @user, :name, :string, :autofocus => true
     assert_select 'input.string[autofocus]'
+  end
+
+  test 'text input should generate autofocus attribute when autofocus option is true' do
     with_input_for @user, :description, :text, :autofocus => true
     assert_select 'textarea.text[autofocus]'
+  end
+
+  test 'numeric input should generate autofocus attribute when autofocus option is true' do
     with_input_for @user, :age, :integer, :autofocus => true
     assert_select 'input.integer[autofocus]'
+  end
+
+  test 'date input should generate autofocus attribute when autofocus option is true' do
     with_input_for @user, :born_at, :date, :autofocus => true
     assert_select 'select.date[autofocus]'
+  end
+
+  test 'datetime input should generate autofocus attribute when autofocus option is true' do
     with_input_for @user, :created_at, :datetime, :autofocus => true
     assert_select 'select.datetime[autofocus]'
+  end
 
+  test 'string input should generate autofocus attribute when autofocus option is false' do
     with_input_for @user, :name, :string, :autofocus => false
-    assert_select 'input.string:not([autofocus])'
+    assert_no_select 'input.string[autofocus]'
+  end
+
+  test 'text input should generate autofocus attribute when autofocus option is false' do
     with_input_for @user, :description, :text, :autofocus => false
-    assert_select 'textarea.text:not([autofocus])'
+    assert_no_select 'textarea.text[autofocus]'
+  end
+
+  test 'numeric input should generate autofocus attribute when autofocus option is false' do
     with_input_for @user, :age, :integer, :autofocus => false
-    assert_select 'input.integer:not([autofocus])'
+    assert_no_select 'input.integer[autofocus]'
+  end
+
+  test 'date input should generate autofocus attribute when autofocus option is false' do
     with_input_for @user, :born_at, :date, :autofocus => false
-    assert_select 'select.date:not([autofocus])'
+    assert_no_select 'select.date[autofocus]'
+  end
+
+  test 'datetime input should generate autofocus attribute when autofocus option is false' do
     with_input_for @user, :created_at, :datetime, :autofocus => false
-    assert_select 'select.datetime:not([autofocus])'
+    assert_no_select 'select.datetime[autofocus]'
+  end
 
+  test 'string input should generate autofocus attribute when autofocus option is not present' do
     with_input_for @user, :name, :string
-    assert_select 'input.string:not([autofocus])'
+    assert_no_select 'input.string[autofocus]'
+  end
+
+  test 'text input should generate autofocus attribute when autofocus option is not present' do
     with_input_for @user, :description, :text
-    assert_select 'textarea.text:not([autofocus])'
+    assert_no_select 'textarea.text[autofocus]'
+  end
+
+  test 'numeric input should generate autofocus attribute when autofocus option is not present' do
     with_input_for @user, :age, :integer
-    assert_select 'input.integer:not([autofocus])'
+    assert_no_select 'input.integer[autofocus]'
+  end
+
+  test 'date input should generate autofocus attribute when autofocus option is not present' do
     with_input_for @user, :born_at, :date
-    assert_select 'select.date:not([autofocus])'
+    assert_no_select 'select.date[autofocus]'
+  end
+
+  test 'datetime input should generate autofocus attribute when autofocus option is not present' do
     with_input_for @user, :created_at, :datetime
-    assert_select 'select.datetime:not([autofocus])'
+    assert_no_select 'select.datetime[autofocus]'
   end
 
   # With no object
@@ -66,4 +106,11 @@ class InputTest < ActionView::TestCase
     with_input_for :project, :name, :select, :collection => ['Jose', 'Carlos']
     assert_select 'select.select#project_name'
   end
+
+  test 'input should not generate empty css class' do
+    swap SimpleForm, :generate_additional_classes_for => [:wrapper, :label] do
+      with_input_for :project, :name, :string
+      assert_no_select 'input#project_name[class]'
+    end
+  end
 end

data/test/inputs/readonly_test.rb

@@ -1,39 +1,79 @@
 require 'test_helper'
 
 class ReadonlyTest < ActionView::TestCase
-  test 'input should generate readonly elements based on the readonly option' do
+  test 'string input should generate readonly elements when readonly option is true' do
     with_input_for @user, :name, :string, :readonly => true
     assert_select 'input.string.readonly[readonly]'
+  end
+
+  test 'text input should generate readonly elements when readonly option is true' do
     with_input_for @user, :description, :text, :readonly => true
     assert_select 'textarea.text.readonly[readonly]'
+  end
+
+  test 'numeric input should generate readonly elements when readonly option is true' do
     with_input_for @user, :age, :integer, :readonly => true
     assert_select 'input.integer.readonly[readonly]'
+  end
+
+  test 'date input should generate readonly elements when readonly option is true' do
     with_input_for @user, :born_at, :date, :readonly => true
     assert_select 'select.date.readonly[readonly]'
+  end
+
+  test 'datetime input should generate readonly elements when readonly option is true' do
     with_input_for @user, :created_at, :datetime, :readonly => true
     assert_select 'select.datetime.readonly[readonly]'
+  end
 
+  test 'string input should generate readonly elements when readonly option is false' do
     with_input_for @user, :name, :string, :readonly => false
-    assert_select 'input.string:not(.readonly[readonly])'
+    assert_no_select 'input.string.readonly[readonly]'
+  end
+
+  test 'text input should generate readonly elements when readonly option is false' do
     with_input_for @user, :description, :text, :readonly => false
-    assert_select 'textarea.text:not(.readonly[readonly])'
+    assert_no_select 'textarea.text.readonly[readonly]'
+  end
+
+  test 'numeric input should generate readonly elements when readonly option is false' do
     with_input_for @user, :age, :integer, :readonly => false
-    assert_select 'input.integer:not(.readonly[readonly])'
+    assert_no_select 'input.integer.readonly[readonly]'
+  end
+
+  test 'date input should generate readonly elements when readonly option is false' do
     with_input_for @user, :born_at, :date, :readonly => false
-    assert_select 'select.date:not(.readonly[readonly])'
+    assert_no_select 'select.date.readonly[readonly]'
+  end
+
+  test 'datetime input should generate readonly elements when readonly option is false' do
     with_input_for @user, :created_at, :datetime, :readonly => false
-    assert_select 'select.datetime:not(.readonly[readonly])'
+    assert_no_select 'select.datetime.readonly[readonly]'
+  end
 
+  test 'string input should generate readonly elements when readonly option is not present' do
     with_input_for @user, :name, :string
-    assert_select 'input.string:not(.readonly[readonly])'
+    assert_no_select 'input.string.readonly[readonly]'
+  end
+
+  test 'text input should generate readonly elements when readonly option is not present' do
     with_input_for @user, :description, :text
-    assert_select 'textarea.text:not(.readonly[readonly])'
+    assert_no_select 'textarea.text.readonly[readonly]'
+  end
+
+  test 'numeric input should generate readonly elements when readonly option is not present' do
     with_input_for @user, :age, :integer
-    assert_select 'input.integer:not(.readonly[readonly])'
+    assert_no_select 'input.integer.readonly[readonly]'
+  end
+
+  test 'date input should generate readonly elements when readonly option is not present' do
     with_input_for @user, :born_at, :date
-    assert_select 'select.date:not(.readonly[readonly])'
+    assert_no_select 'select.date.readonly[readonly]'
+  end
+
+  test 'datetime input should generate readonly elements when readonly option is not present' do
     with_input_for @user, :created_at, :datetime
-    assert_select 'select.datetime:not(.readonly[readonly])'
+    assert_no_select 'select.datetime.readonly[readonly]'
   end
 
   test 'input should generate readonly attribute when the field is readonly and the object is persisted' do

data/test/support/misc_helpers.rb

@@ -46,6 +46,24 @@ module MiscHelpers
     end
   end
 
+  def custom_wrapper_with_wrapped_input
+    SimpleForm.build :tag => :div, :class => "custom_wrapper" do |b|
+      b.wrapper :tag => :div, :class => 'elem' do |component|
+        component.use :label
+        component.use :input, :wrap_with => { :tag => :div, :class => 'input' }
+      end
+    end
+  end
+
+  def custom_wrapper_with_wrapped_label
+    SimpleForm.build :tag => :div, :class => "custom_wrapper" do |b|
+      b.wrapper :tag => :div, :class => 'elem' do |component|
+        component.use :label, :wrap_with => { :tag => :div, :class => 'label' }
+        component.use :input
+      end
+    end
+  end
+
   def custom_wrapper_without_top_level
     SimpleForm.build :tag => false, :class => 'custom_wrapper_without_top_level' do |b|
       b.use :label_input
@@ -54,6 +72,12 @@ module MiscHelpers
     end
   end
 
+  def custom_wrapper_without_class
+    SimpleForm.build :tag => :div, :wrapper_html => { :id => 'custom_wrapper_without_class' } do |b|
+      b.use :label_input
+    end
+  end
+
   def custom_wrapper_with_label_html_option
     SimpleForm.build :tag => :div, :class => "custom_wrapper", :label_html => { :class => 'extra-label-class' } do |b|
       b.use :label_input

data/test/support/models.rb

@@ -130,7 +130,7 @@ class User
   end
 
   def self.readonly_attributes
-    [:credit_card]
+    ["credit_card"]
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2012-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -58,7 +58,8 @@ files:
 - lib/generators/simple_form/templates/_form.html.erb
 - lib/generators/simple_form/templates/_form.html.haml
 - lib/generators/simple_form/templates/_form.html.slim
-- lib/generators/simple_form/templates/config/initializers/simple_form.rb.tt
+- lib/generators/simple_form/templates/config/initializers/simple_form.rb
+- lib/generators/simple_form/templates/config/initializers/simple_form_bootstrap.rb
 - lib/generators/simple_form/templates/config/locales/simple_form.en.yml
 - lib/generators/simple_form/templates/README
 - lib/generators/simple_form/USAGE