simple_form 1.5.2 → 2.0.0.rc

data/lib/simple_form/inputs/string_input.rb

@@ -1,20 +1,18 @@
 module SimpleForm
   module Inputs
     class StringInput < Base
-      enable :placeholder
+      enable :placeholder, :maxlength, :pattern
 
       def input
-        input_html_options[:type] ||= input_type if SimpleForm.html5 && !string?
-        add_maxlength!
-        add_pattern!
+        unless string?
+          input_html_classes.unshift("string")
+          input_html_options[:type] ||= input_type if html5?
+        end
+
         add_size!
         @builder.text_field(attribute_name, input_html_options)
       end
 
-      def input_html_classes
-        string? ? super : super.unshift("string")
-      end
-
       private
 
       def string?

data/lib/simple_form/inputs/text_input.rb

@@ -1,10 +1,9 @@
 module SimpleForm
   module Inputs
     class TextInput < Base
-      enable :placeholder
+      enable :placeholder, :maxlength
 
       def input
-        add_maxlength!
         @builder.text_area(attribute_name, input_html_options)
       end
     end

data/lib/simple_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "1.5.2".freeze
+  VERSION = "2.0.0.rc".freeze
 end

data/lib/simple_form/wrappers.rb

@@ -0,0 +1,8 @@
+module SimpleForm
+  module Wrappers
+    autoload :Builder, 'simple_form/wrappers/builder'
+    autoload :Many,    'simple_form/wrappers/many'
+    autoload :Root,    'simple_form/wrappers/root'
+    autoload :Single,  'simple_form/wrappers/single'
+  end
+end

data/lib/simple_form/wrappers/builder.rb

@@ -0,0 +1,75 @@
+module SimpleForm
+  module Wrappers
+    # Provides the builder syntax for components. The builder provides
+    # only one method (called `use`) and it allows the following invocations:
+    #
+    #     config.wrappers do |b|
+    #       # Use a single component
+    #       b.use :placeholder
+    #
+    #       # Use a component with specific wrapper options
+    #       b.use :error, :tag => "span", :class => "error"
+    #
+    #       # Use a set of components by wrapping them in a tag+class.
+    #       b.use :tag => "div", :class => "another" do |ba|
+    #         ba.use :label
+    #         ba.use :input
+    #       end
+    #
+    #       # Use a set of components by wrapping them in a tag+class.
+    #       # This wrapper is identified by :label_input, which means it can
+    #       # be turned off on demand with `f.input :name, :label_input => false`
+    #       b.use :label_input, :tag => "div", :class => "another" do |ba|
+    #         ba.use :label
+    #         ba.use :input
+    #       end
+    #     end
+    #
+    # The builder also accepts default options at the root level. This is usually
+    # used if you want a component to be disabled by default:
+    #
+    #     config.wrappers :hint => false do |b|
+    #       b.use :hint
+    #       b.use :label_input
+    #     end
+    #
+    # In the example above, hint defaults to false, which means it won't automatically
+    # do the lookup anymore. It will only be triggered when :hint is explicitly set.
+    class Builder
+      def initialize(options)
+        @options    = options
+        @components = []
+      end
+
+      def use(name, options=nil, &block)
+        add(name, options, &block)
+      end
+
+      def optional(name, options=nil, &block)
+        @options[name] = false
+        add(name, options, &block)
+      end
+
+      def to_a
+        @components
+      end
+
+      private
+
+      def add(name, options)
+        if block_given?
+          name, options = nil, name if name.is_a?(Hash)
+          builder = self.class.new(@options)
+          options ||= {}
+          options[:tag] = :div if options[:tag].nil?
+          yield builder
+          @components << Many.new(name, builder.to_a, options)
+        elsif options
+          @components << Single.new(name, options)
+        else
+          @components << name
+        end
+      end
+    end
+  end
+end

data/lib/simple_form/wrappers/many.rb

@@ -0,0 +1,68 @@
+module SimpleForm
+  module Wrappers
+    # A wrapper is an object that holds several components and render them.
+    # A component may either be a symbol or any object that responds to `render`.
+    # This API allows inputs/components to be easily wrapped, removing the
+    # need to modify the code only to wrap input in an extra tag.
+    #
+    # `Many` represents a wrapper around several components at the same time.
+    # It may optionally receive a namespace, allowing it to be configured
+    # on demand on input generation.
+    class Many
+      attr_reader :namespace, :defaults, :components
+      alias :to_sym :namespace
+
+      def initialize(namespace, components, defaults={})
+        @namespace  = namespace
+        @components = components
+        @defaults   = defaults
+        @defaults[:class] = Array.wrap(@defaults[:class])
+      end
+
+      def render(input)
+        content = "".html_safe
+        options = input.options
+
+        components.each do |component|
+          next if options[component] == false
+          rendered = component.respond_to?(:render) ? component.render(input) : input.send(component)
+          content.safe_concat rendered.to_s if rendered
+        end
+
+        wrap(input, options, content)
+      end
+
+      def find(name)
+        return self if namespace == name
+
+        @components.each do |c|
+          if c.is_a?(Symbol)
+            return nil if c == namespace
+          elsif value = c.find(name)
+            return value
+          end
+        end
+
+        nil
+      end
+
+      private
+
+      def wrap(input, options, content)
+        return content if options[namespace] == false
+
+        tag = (namespace && options[:"#{namespace}_tag"]) || @defaults[:tag]
+        return content unless tag
+
+        klass = html_classes(input, options)
+        opts  = options[:"#{namespace}_html"] || {}
+        opts[:class] = (klass << opts[:class]).join(' ').strip unless klass.empty?
+        input.template.content_tag(tag, content, opts)
+      end
+
+      def html_classes(input, options)
+        @defaults[:class].dup
+      end
+    end
+  end
+end

data/lib/simple_form/wrappers/root.rb

@@ -0,0 +1,34 @@
+module SimpleForm
+  module Wrappers
+    # `Root` is the root wrapper for all components. It is special cased to
+    # always have a namespace and to add special html classes.
+    class Root < Many
+      attr_reader :options
+
+      def initialize(*args)
+        super(:wrapper, *args)
+        @options = @defaults.except(:tag, :class, :error_class, :hint_class)
+      end
+
+      def render(input)
+        input.options.reverse_merge!(@options)
+        super
+      end
+
+      # Provide a fallback if name cannot be found.
+      def find(name)
+        super || SimpleForm::Wrappers::Many.new(name, [name])
+      end
+
+      private
+
+      def html_classes(input, options)
+        css = options[:wrapper_class] ? Array.wrap(options[:wrapper_class]) : @defaults[:class]
+        css += input.html_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
+      end
+    end
+  end
+end

data/lib/simple_form/wrappers/single.rb

@@ -0,0 +1,18 @@
+module SimpleForm
+  module Wrappers
+    # `Single` is an optimization for a wrapper that has only one component.
+    class Single < Many
+      def initialize(name, options={})
+        super(name, [name], options)
+      end
+
+      def render(input)
+        options = input.options
+        if options[namespace] != false
+          content = input.send(namespace)
+          wrap(input, options, content) if content
+        end
+      end
+    end
+  end
+end

data/test/action_view_extensions/builder_test.rb

@@ -8,48 +8,48 @@ class BuilderTest < ActionView::TestCase
     end
   end
 
-  def with_collection_radio(object, attribute, collection, value_method, text_method, options={}, html_options={})
+  def with_collection_radio_buttons(object, attribute, collection, value_method, text_method, options={}, html_options={}, &block)
     with_concat_form_for(object) do |f|
-      f.collection_radio attribute, collection, value_method, text_method, options, html_options
+      f.collection_radio_buttons attribute, collection, value_method, text_method, options, html_options, &block
     end
   end
 
-  def with_collection_check_boxes(object, attribute, collection, value_method, text_method, options={}, html_options={})
+  def with_collection_check_boxes(object, attribute, collection, value_method, text_method, options={}, html_options={}, &block)
     with_concat_form_for(object) do |f|
-      f.collection_check_boxes attribute, collection, value_method, text_method, options, html_options
+      f.collection_check_boxes attribute, collection, value_method, text_method, options, html_options, &block
     end
   end
 
   # COLLECTION RADIO
   test 'collection radio accepts a collection and generate inputs from value method' do
-    with_collection_radio @user, :active, [true, false], :to_s, :to_s
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s
 
     assert_select 'form input[type=radio][value=true]#user_active_true'
     assert_select 'form input[type=radio][value=false]#user_active_false'
   end
 
   test 'collection radio accepts a collection and generate inputs from label method' do
-    with_collection_radio @user, :active, [true, false], :to_s, :to_s
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s
 
-    assert_select 'form label.collection_radio[for=user_active_true]', 'true'
-    assert_select 'form label.collection_radio[for=user_active_false]', 'false'
+    assert_select 'form label.collection_radio_buttons[for=user_active_true]', 'true'
+    assert_select 'form label.collection_radio_buttons[for=user_active_false]', 'false'
   end
 
   test 'collection radio handles camelized collection values for labels correctly' do
-    with_collection_radio @user, :active, ['Yes', 'No'], :to_s, :to_s
+    with_collection_radio_buttons @user, :active, ['Yes', 'No'], :to_s, :to_s
 
-    assert_select 'form label.collection_radio[for=user_active_yes]', 'Yes'
-    assert_select 'form label.collection_radio[for=user_active_no]', 'No'
+    assert_select 'form label.collection_radio_buttons[for=user_active_yes]', 'Yes'
+    assert_select 'form label.collection_radio_buttons[for=user_active_no]', 'No'
   end
 
   test 'colection radio should sanitize collection values for labels correctly' do
-    with_collection_radio @user, :name, ['$0.99', '$1.99'], :to_s, :to_s
-    assert_select 'label.collection_radio[for=user_name_099]', '$0.99'
-    assert_select 'label.collection_radio[for=user_name_199]', '$1.99'
+    with_collection_radio_buttons @user, :name, ['$0.99', '$1.99'], :to_s, :to_s
+    assert_select 'label.collection_radio_buttons[for=user_name_099]', '$0.99'
+    assert_select 'label.collection_radio_buttons[for=user_name_199]', '$1.99'
   end
 
   test 'collection radio accepts checked item' do
-    with_collection_radio @user, :active, [[1, true], [0, false]], :last, :first, :checked => true
+    with_collection_radio_buttons @user, :active, [[1, true], [0, false]], :last, :first, :checked => true
 
     assert_select 'form input[type=radio][value=true][checked=checked]'
     assert_no_select 'form input[type=radio][value=false][checked=checked]'
@@ -57,7 +57,7 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection radio accepts multiple disabled items' do
     collection = [[1, true], [0, false], [2, 'other']]
-    with_collection_radio @user, :active, collection, :last, :first, :disabled => [true, false]
+    with_collection_radio_buttons @user, :active, collection, :last, :first, :disabled => [true, false]
 
     assert_select 'form input[type=radio][value=true][disabled=disabled]'
     assert_select 'form input[type=radio][value=false][disabled=disabled]'
@@ -66,7 +66,7 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection radio accepts single disable item' do
     collection = [[1, true], [0, false]]
-    with_collection_radio @user, :active, collection, :last, :first, :disabled => true
+    with_collection_radio_buttons @user, :active, collection, :last, :first, :disabled => true
 
     assert_select 'form input[type=radio][value=true][disabled=disabled]'
     assert_no_select 'form input[type=radio][value=false][disabled=disabled]'
@@ -74,105 +74,143 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection radio accepts html options as input' do
     collection = [[1, true], [0, false]]
-    with_collection_radio @user, :active, collection, :last, :first, {}, :class => 'radio'
+    with_collection_radio_buttons @user, :active, collection, :last, :first, {}, :class => 'special-radio'
 
-    assert_select 'form input[type=radio][value=true].radio#user_active_true'
-    assert_select 'form input[type=radio][value=false].radio#user_active_false'
+    assert_select 'form input[type=radio][value=true].special-radio#user_active_true'
+    assert_select 'form input[type=radio][value=false].special-radio#user_active_false'
   end
 
-  test 'collection radio wraps the collection in the configured collection wrapper tag' do
-    swap SimpleForm, :collection_wrapper_tag => :ul do
-      with_collection_radio @user, :active, [true, false], :to_s, :to_s
+  test 'collection radio wraps the collection in the given collection wrapper tag' do
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => :ul
 
-      assert_select 'form ul input[type=radio][value=true]#user_active_true'
-      assert_select 'form ul input[type=radio][value=false]#user_active_false'
-    end
+    assert_select 'form ul input[type=radio]', :count => 2
   end
 
-  test 'collection radio wraps the collection in the given collection wrapper tag' do
-    with_collection_radio @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => :ul
+  test 'collection radio does not render any wrapper tag by default' do
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s
 
-    assert_select 'form ul input[type=radio][value=true]#user_active_true'
-    assert_select 'form ul input[type=radio][value=false]#user_active_false'
+    assert_select 'form input[type=radio]', :count => 2
+    assert_no_select 'form ul'
   end
 
-  test 'collection radio does not wrap the collection in the explicitly false collection wrapper tag' do
-    swap SimpleForm, :collection_wrapper_tag => :ul do
-      with_collection_radio @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => false
+  test 'collection radio does not wrap the collection when given falsy values' do
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => false
 
-      assert_no_select 'form ul'
-      assert_no_select 'form ul'
-    end
+    assert_select 'form input[type=radio]', :count => 2
+    assert_no_select 'form ul'
   end
 
-  test 'collection radio does not wrap the collection in the explicitly nil collection wrapper tag' do
-    swap SimpleForm, :collection_wrapper_tag => :ul do
-      with_collection_radio @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => nil
+  test 'collection radio uses the given class for collection wrapper tag' do
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s,
+      :collection_wrapper_tag => :ul, :collection_wrapper_class => "items-list"
 
-      assert_no_select 'form ul'
-      assert_no_select 'form ul'
-    end
+    assert_select 'form ul.items-list input[type=radio]', :count => 2
   end
 
-  test 'collection radio does not wrap the collection by default' do
-    with_collection_radio @user, :active, [true, false], :to_s, :to_s
+  test 'collection radio uses no class for collection wrapper tag when no wrapper tag is given' do
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s,
+      :collection_wrapper_class => "items-list"
 
+    assert_select 'form input[type=radio]', :count => 2
     assert_no_select 'form ul'
+    assert_no_select '.items-list'
   end
 
-  test 'collection radio wraps each label/radio in the configured item wrapper tag' do
-    swap SimpleForm, :item_wrapper_tag => :li do
-      with_collection_radio @user, :active, [true, false], :to_s, :to_s
+  test 'collection radio uses no class for collection wrapper tag by default' do
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => :ul
 
-      assert_select 'form li input[type=radio][value=true]#user_active_true'
-      assert_select 'form li input[type=radio][value=false]#user_active_false'
-    end
+    assert_select 'form ul'
+    assert_no_select 'form ul[class]'
   end
 
-  test 'collection radio wraps each label/radio in the given item wrapper tag' do
-    with_collection_radio @user, :active, [true, false], :to_s, :to_s, :item_wrapper_tag => :li
+  test 'collection radio wrap items in a span tag by default' do
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s
 
-    assert_select 'form li input[type=radio][value=true]#user_active_true'
-    assert_select 'form li input[type=radio][value=false]#user_active_false'
+    assert_select 'form span input[type=radio][value=true]#user_active_true + label'
+    assert_select 'form span input[type=radio][value=false]#user_active_false + label'
   end
 
-  test 'collection radio does not wrap each label/radio in the explicitly false item wrapper tag' do
-    with_collection_radio @user, :active, [true, false], :to_s, :to_s, :item_wrapper_tag => false
+  test 'collection radio wraps each item in the given item wrapper tag' do
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, :item_wrapper_tag => :li
 
-    assert_no_select 'form span input[type=radio][value=true]#user_active_true'
-    assert_no_select 'form span input[type=radio][value=false]#user_active_false'
+    assert_select 'form li input[type=radio]', :count => 2
   end
 
-  test 'collection radio does not wrap each label/radio in the explicitly nil item wrapper tag' do
-    with_collection_radio @user, :active, [true, false], :to_s, :to_s, :item_wrapper_tag => nil
+  test 'collection radio does not wrap each item when given explicitly falsy value' do
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, :item_wrapper_tag => false
 
-    assert_no_select 'form span input[type=radio][value=true]#user_active_true'
-    assert_no_select 'form span input[type=radio][value=false]#user_active_false'
+    assert_select 'form input[type=radio]'
+    assert_no_select 'form span input[type=radio]'
   end
 
-  test 'collection radio wrap items in a span tag by default' do
-    with_collection_radio @user, :active, [true, false], :to_s, :to_s
+  test 'collection radio uses the given class for item wrapper tag' do
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s,
+      :item_wrapper_tag => :li, :item_wrapper_class => "inline"
 
-    assert_select 'form span input[type=radio][value=true]#user_active_true + label'
-    assert_select 'form span input[type=radio][value=false]#user_active_false + label'
+    assert_select "form li.inline input[type=radio]", :count => 2
+  end
+
+  test 'collection radio uses no class for item wrapper tag when no wrapper tag is given' do
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s,
+      :item_wrapper_tag => nil, :item_wrapper_class => "inline"
+
+    assert_select 'form input[type=radio]', :count => 2
+    assert_no_select 'form li'
+    assert_no_select '.inline'
+  end
+
+  test 'collection radio uses no class for item wrapper tag by default' do
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s,
+      :item_wrapper_tag => :li
+
+    assert_select "form li", :count => 2
+    assert_no_select "form li[class]"
   end
 
   test 'collection radio does not wrap input inside the label' do
-    with_collection_radio @user, :active, [true, false], :to_s, :to_s
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s
 
+    assert_select 'form input[type=radio] + label'
     assert_no_select 'form label input'
   end
 
+  test 'collection radio accepts a block to render the radio and label as required' do
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s do |label_for, text, value, html_options|
+      label(:user, label_for, text) { radio_button(:user, :active, value, html_options) }
+    end
+
+    assert_select 'form label[for=user_active_true] > input#user_active_true[type=radio]'
+    assert_select 'form label[for=user_active_false] > input#user_active_false[type=radio]'
+  end
+
+  test 'collection_radio helper is deprecated in favor of collection_radio_buttons' do
+    assert_deprecated "[SIMPLE_FORM] The `collection_radio` helper is deprecated, " \
+      "please use `collection_radio_buttons` instead" do
+      with_concat_form_for(@user) do |f|
+        f.collection_radio :active, [true, false], :to_s, :to_s
+      end
+    end
+
+    assert_select 'input[type=radio][value=true]'
+    assert_select 'input[type=radio][value=false]'
+  end
+
   # COLLECTION CHECK BOX
   test 'collection check box accepts a collection and generate a serie of checkboxes for value method' do
     collection = [Tag.new(1, 'Tag 1'), Tag.new(2, 'Tag 2')]
     with_collection_check_boxes @user, :tag_ids, collection, :id, :name
 
-    assert_select "form input[type=hidden][name='user[tag_ids][]'][value=]"
     assert_select 'form input#user_tag_ids_1[type=checkbox][value=1]'
     assert_select 'form input#user_tag_ids_2[type=checkbox][value=2]'
   end
 
+  test 'collection check box generates only one hidden field for the entire collection, to ensure something will be sent back to the server when posting an empty collection' do
+    collection = [Tag.new(1, 'Tag 1'), Tag.new(2, 'Tag 2')]
+    with_collection_check_boxes @user, :tag_ids, collection, :id, :name
+
+    assert_select "form input[type=hidden][name='user[tag_ids][]'][value=]", :count => 1
+  end
+
   test 'collection check box accepts a collection and generate a serie of checkboxes with labels for label method' do
     collection = [Tag.new(1, 'Tag 1'), Tag.new(2, 'Tag 2')]
     with_collection_check_boxes @user, :tag_ids, collection, :id, :name
@@ -212,6 +250,16 @@ 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 and override the model values' do
+    collection = (1..3).map{|i| [i, "Tag #{i}"] }
+    @user.tag_ids = [2]
+    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, :checked => [1, 3]
+
+    assert_select 'form input[type=checkbox][value=1][checked=checked]'
+    assert_select 'form input[type=checkbox][value=3][checked=checked]'
+    assert_no_select 'form input[type=checkbox][value=2][checked=checked]'
+  end
+
   test 'collection check box accepts multiple disabled items' do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
     with_collection_check_boxes @user, :tag_ids, collection, :first, :last, :disabled => [1, 3]
@@ -262,71 +310,108 @@ class BuilderTest < ActionView::TestCase
     assert_select 'form label.collection_check_boxes[for=user_post_tag_ids_2]', 'Tag 2'
   end
 
-  test 'collection check box wraps the collection in the configured collection wrapper tag' do
-    swap SimpleForm, :collection_wrapper_tag => :ul do
-      with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s
+  test 'collection check boxes wraps the collection in the given collection wrapper tag' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => :ul
 
-      assert_select 'form ul input[type=checkbox][value=true]#user_active_true'
-      assert_select 'form ul input[type=checkbox][value=false]#user_active_false'
-    end
+    assert_select 'form ul input[type=checkbox]', :count => 2
   end
 
-  test 'collection check box wraps the collection in the given collection wrapper tag' do
-    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => :ul
+  test 'collection check boxes does not render any wrapper tag by default' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s
 
-    assert_select 'form ul input[type=checkbox][value=true]#user_active_true'
-    assert_select 'form ul input[type=checkbox][value=false]#user_active_false'
+    assert_select 'form input[type=checkbox]', :count => 2
+    assert_no_select 'form ul'
   end
 
-  test 'collection check box does not wrap the collection in the explicitly false collection wrapper tag' do
-    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => false, :item_wrapper_tag => false
+  test 'collection check boxes does not wrap the collection when given falsy values' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => false
 
-    assert_select 'form > input[type=checkbox][value=true]#user_active_true'
-    assert_select 'form > input[type=checkbox][value=false]#user_active_false'
+    assert_select 'form input[type=checkbox]', :count => 2
+    assert_no_select 'form ul'
   end
 
-  test 'collection check box does not wrap the collection by default' do
-    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s
+  test 'collection check boxes uses the given class for collection wrapper tag' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s,
+      :collection_wrapper_tag => :ul, :collection_wrapper_class => "items-list"
+
+    assert_select 'form ul.items-list input[type=checkbox]', :count => 2
+  end
 
+  test 'collection check boxes uses no class for collection wrapper tag when no wrapper tag is given' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s,
+      :collection_wrapper_class => "items-list"
+
+    assert_select 'form input[type=checkbox]', :count => 2
     assert_no_select 'form ul'
+    assert_no_select '.items-list'
   end
 
-  test 'collection check box wraps each label/radio in the configured item wrapper tag' do
-    swap SimpleForm, :item_wrapper_tag => :li do
-      with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s
+  test 'collection check boxes uses no class for collection wrapper tag by default' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => :ul
 
-      assert_select 'form li input[type=checkbox][value=true]#user_active_true'
-      assert_select 'form li input[type=checkbox][value=false]#user_active_false'
-    end
+    assert_select 'form ul'
+    assert_no_select 'form ul[class]'
+  end
+
+  test 'collection check boxes wrap items in a span tag by default' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s
+
+    assert_select 'form span input[type=checkbox]', :count => 2
   end
 
-  test 'collection check box wraps each label/radio in the given item wrapper tag' do
+  test 'collection check boxes wraps each item in the given item wrapper tag' do
     with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, :item_wrapper_tag => :li
 
-    assert_select 'form li input[type=checkbox][value=true]#user_active_true'
-    assert_select 'form li input[type=checkbox][value=false]#user_active_false'
+    assert_select 'form li input[type=checkbox]', :count => 2
   end
 
-  test 'collection check box does not wrapp each label/radio in the explicitly false item wrapper tag' do
+  test 'collection check boxes does not wrap each item when given explicitly falsy value' do
     with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, :item_wrapper_tag => false
 
-    assert_select 'form > input[type=checkbox][value=true]#user_active_true'
-    assert_select 'form > input[type=checkbox][value=false]#user_active_false'
+    assert_select 'form input[type=checkbox]'
+    assert_no_select 'form span input[type=checkbox]'
   end
 
-  test 'collection check box wrap items in a span tag by default' do
-    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s
+  test 'collection check boxes uses the given class for item wrapper tag' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s,
+      :item_wrapper_tag => :li, :item_wrapper_class => "inline"
+
+    assert_select "form li.inline input[type=checkbox]", :count => 2
+  end
+
+  test 'collection check boxes uses no class for item wrapper tag when no wrapper tag is given' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s,
+      :item_wrapper_tag => nil, :item_wrapper_class => "inline"
+
+    assert_select 'form input[type=checkbox]', :count => 2
+    assert_no_select 'form li'
+    assert_no_select '.inline'
+  end
 
-    assert_select 'form span input[type=checkbox][value=true]#user_active_true + label'
-    assert_select 'form span input[type=checkbox][value=false]#user_active_false + label'
+  test 'collection check boxes uses no class for item wrapper tag by default' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s,
+      :item_wrapper_tag => :li
+
+    assert_select "form li", :count => 2
+    assert_no_select "form li[class]"
   end
 
   test 'collection check box does not wrap input inside the label' do
     with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s
 
+    assert_select 'form input[type=checkbox] + label'
     assert_no_select 'form label input'
   end
 
+  test 'collection check box accepts a block to render the radio and label as required' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s do |label_for, text, value, html_options|
+      label(:user, label_for, text) { check_box(:user, :active, html_options, value) }
+    end
+
+    assert_select 'form label[for=user_active_true] > input#user_active_true[type=checkbox]'
+    assert_select 'form label[for=user_active_false] > input#user_active_false[type=checkbox]'
+  end
+
   # SIMPLE FIELDS
   test 'simple fields for is available and yields an instance of FormBuilder' do
     with_concat_form_for(@user) do |f|
@@ -364,4 +449,14 @@ class BuilderTest < ActionView::TestCase
       end
     end
   end
+
+  test 'fields inherites wrapper option from the parent form' do
+    swap_wrapper :another do
+      simple_form_for(:user, :wrapper => :another) do |f|
+        f.simple_fields_for(:company) do |company|
+          assert_equal :another, company.options[:wrapper]
+        end
+      end
+    end
+  end
 end