simple_form 1.5.2 → 2.0.0.rc

data/lib/generators/simple_form/install_generator.rb

@@ -3,7 +3,15 @@ module SimpleForm
     class InstallGenerator < Rails::Generators::Base
       desc "Copy SimpleForm default files"
       source_root File.expand_path('../templates', __FILE__)
-      class_option :template_engine
+      class_option :template_engine, :desc => 'Template engine to be invoked (erb, haml or slim).'
+      class_option :bootstrap, :type => :boolean, :desc => 'Add the Twitter Bootstrap wrappers to the SimpleForm initializer.'
+
+      def info_bootstrap
+        return if options.bootstrap?
+        puts "Simple Form 2 supports Twitter bootstrap. In case you want to " \
+          "generate bootstrap configuration, please re-run this " \
+          "generator passing --bootstrap as option."
+      end
 
       def copy_config
         directory 'config'
@@ -13,6 +21,12 @@ module SimpleForm
         engine = options[:template_engine]
         copy_file "_form.html.#{engine}", "lib/templates/#{engine}/scaffold/_form.html.#{engine}"
       end
+
+      def show_readme
+        if behavior == :invoke && options.bootstrap?
+          readme "README"
+        end
+      end
     end
   end
 end

data/lib/generators/simple_form/templates/README

@@ -0,0 +1,12 @@
+===============================================================================
+
+  Be sure to have a copy of the Bootstrap stylesheet available on your
+  application, you can get it on http://twitter.github.com/bootstrap.
+
+  Inside your views, use the 'simple_form_for' with one of the Bootstrap form
+  classes, '.form-horizontal', '.form-inline', '.form-search' or
+  '.form-vertical', as the following:
+
+    = simple_form_for(@user, :html => {:class => 'form-horizontal' }) do |form|
+
+===============================================================================

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

@@ -0,0 +1,173 @@
+# Use this setup block to configure all options available in SimpleForm.
+SimpleForm.setup do |config|
+  # Wrappers are used by the form builder to generate a
+  # complete input. You can remove any component from the
+  # wrapper, change the order or even add your own to the
+  # stack. The options given below are used to wrap the
+  # whole input.
+  config.wrappers :default, :class => :input,
+    :hint_class => :field_with_hint, :error_class => :field_with_errors do |b|
+    ## Extensions enabled by default
+    # Any of these extensions can be disabled for a
+    # given input by passing: `f.input EXTENSION_NAME => false`.
+    # You can make any of these extensions optional by
+    # renaming `b.use` to `b.optional`.
+
+    # Determines whether to use HTML5 (:email, :url, ...)
+    # and required attributes
+    b.use :html5
+
+    # Calculates placeholders automatically from I18n
+    # You can also pass a string as f.input :placeholder => "Placeholder"
+    b.use :placeholder
+
+    ## Optional extensions
+    # They are disabled unless you pass `f.input EXTENSION_NAME => :lookup`
+    # to the input. If so, they will retrieve the values from the model
+    # if any exists. If you want to enable the lookup for any of those
+    # extensions by default, you can change `b.optional` to `b.use`.
+
+    # Calculates maxlength from length validations for string inputs
+    b.optional :maxlength
+
+    # Calculates pattern from format validations for string inputs
+    b.optional :pattern
+
+    # Calculates min and max from length validations for numeric inputs
+    b.optional :min_max
+
+    # Calculates readonly automatically from readonly attributes
+    b.optional :readonly
+
+    ## Inputs
+    b.use :label_input
+    b.use :hint,  :tag => :span, :class => :hint
+    b.use :error, :tag => :span, :class => :error
+  end
+<% if options.bootstrap? %>
+  config.wrappers :bootstrap, :tag => 'div', :class => 'control-group', :error_class => 'error' do |b|
+    b.use :placeholder
+    b.use :label, :class => 'control-label'
+    b.use :tag => 'div', :class => 'controls' do |ba|
+      ba.use :input
+      ba.use :error, :tag => 'span', :class => 'help-inline'
+      ba.use :hint,  :tag => 'p', :class => 'help-block'
+    end
+  end
+
+  config.wrappers :prepend, :tag => 'div', :class => "control-group", :error_class => 'error' do |b|
+    b.use :placeholder
+    b.use :label, :class => 'control-label'
+    b.use :hint,  :tag => 'span', :class => 'help-block'
+    b.use :tag => 'div', :class => 'controls' do |input|
+      input.use :tag => 'div', :class => 'input-prepend' do |prepend|
+        prepend.use :input
+      end
+      input.use :error, :tag => 'span', :class => 'help-inline'
+    end
+  end
+
+  config.wrappers :append, :tag => 'div', :class => "control-group", :error_class => 'error' do |b|
+    b.use :placeholder
+    b.use :label, :class => 'control-label'
+    b.use :hint,  :tag => 'span', :class => 'help-block'
+    b.use :tag => 'div', :class => 'controls' do |input|
+      input.use :tag => 'div', :class => 'input-append' do |append|
+        append.use :input
+      end
+      input.use :error, :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
+  #   :nested => label > input
+  config.boolean_style = :nested
+
+  # Default class for buttons
+  config.button_class = 'btn'
+
+  # Method used to tidy up errors.
+  # config.error_method = :first
+
+  # Default tag used for error notification helper.
+  # config.error_notification_tag = :p
+
+  # CSS class to add for error notification helper.
+  # config.error_notification_class = :error_notification
+
+  # ID to add for error notification helper.
+  # config.error_notification_id = nil
+
+  # Series of attempts to detect a default label method for collection.
+  # config.collection_label_methods = [ :to_label, :name, :title, :to_s ]
+
+  # Series of attempts to detect a default value method for collection.
+  # config.collection_value_methods = [ :id, :to_s ]
+
+  # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none.
+  # config.collection_wrapper_tag = nil
+
+  # You can define the class to use on all collection wrappers. Defaulting to none.
+  # 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.
+  # config.item_wrapper_tag = :span
+
+  # You can define a class to use in all item wrappers. Defaulting to none.
+  # config.item_wrapper_class = nil
+
+  # How the label text should be generated altogether with the required text.
+  # config.label_text = lambda { |label, required| "#{required} #{label}" }
+
+  # 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
+
+  # Whether attributes are required by default (or not). Default is true.
+  # config.required_by_default = true
+
+  # Tell browsers whether to use default HTML5 validations (novalidate option).
+  # Default is enabled.
+  config.browser_validations = false
+
+  # Collection of methods to detect if a file type was given.
+  # config.file_methods = [ :mounted_as, :file?, :public_filename ]
+
+  # Custom mappings for input types. This should be a hash containing a regexp
+  # to match as key, and the input type that will be used when the field name
+  # matches the regexp as value.
+  # config.input_mappings = { /count/ => :integer }
+
+  # Default priority for time_zone inputs.
+  # config.time_zone_priority = nil
+
+  # Default priority for country inputs.
+  # config.country_priority = nil
+
+  # Default size for text inputs.
+  # config.default_input_size = 50
+
+  # When false, do not use translations for labels.
+  # config.translate_labels = true
+
+  # Automatically discover new inputs in Rails' autoload path.
+  # config.inputs_discovery = true
+
+  # Cache simple form inputs discovery
+  # config.cache_discovery = !Rails.env.development?
+end

data/lib/simple_form.rb

@@ -1,6 +1,9 @@
 require 'action_view'
 require 'simple_form/action_view_extensions/form_helper'
 require 'simple_form/action_view_extensions/builder'
+require 'active_support/core_ext/hash/slice'
+require 'active_support/core_ext/hash/except'
+require 'active_support/core_ext/hash/reverse_merge'
 
 module SimpleForm
   autoload :Components,        'simple_form/components'
@@ -10,22 +13,9 @@ module SimpleForm
   autoload :I18nCache,         'simple_form/i18n_cache'
   autoload :Inputs,            'simple_form/inputs'
   autoload :MapType,           'simple_form/map_type'
+  autoload :Wrappers,          'simple_form/wrappers'
 
-  # Default tag used on hints.
-  mattr_accessor :hint_tag
-  @@hint_tag = :span
-
-  # CSS class to add to all hint tags.
-  mattr_accessor :hint_class
-  @@hint_class = :hint
-
-  # Default tag used on errors.
-  mattr_accessor :error_tag
-  @@error_tag = :span
-
-  # CSS class to add to all error tags.
-  mattr_accessor :error_class
-  @@error_class = :error
+  ## CONFIGURATION OPTIONS
 
   # Method used to tidy up errors.
   mattr_accessor :error_method
@@ -43,10 +33,6 @@ module SimpleForm
   mattr_accessor :error_notification_id
   @@error_notification_id = nil
 
-  # Components used by the form builder.
-  mattr_accessor :components
-  @@components = [ :placeholder, :label_input, :hint, :error ]
-
   # Series of attemps to detect a default label method for collection.
   mattr_accessor :collection_label_methods
   @@collection_label_methods = [ :to_label, :name, :title, :to_s ]
@@ -59,21 +45,19 @@ module SimpleForm
   mattr_accessor :collection_wrapper_tag
   @@collection_wrapper_tag = nil
 
-  # You can wrap each item in a collection of radio/check boxes with a tag, defaulting to none.
+  # You can define the class to use on all collection wrappers, defaulting to none.
+  mattr_accessor :collection_wrapper_class
+  @@collection_wrapper_class = nil
+
+  # You can wrap each item in a collection of radio/check boxes with a tag,
+  # defaulting to none. Please note that when using :boolean_style = :nested,
+  # SimpleForm will force this option to be a :label.
   mattr_accessor :item_wrapper_tag
   @@item_wrapper_tag = :span
 
-  # You can wrap all inputs in a pre-defined tag. Default is a div.
-  mattr_accessor :wrapper_tag
-  @@wrapper_tag = :div
-
-  # You can define the class to use on all wrappers. Default is input.
-  mattr_accessor :wrapper_class
-  @@wrapper_class = :input
-
-  # You can define the class to add to the wrapper when the field has errors. Default is field_with_errors.
-  mattr_accessor :wrapper_error_class
-  @@wrapper_error_class = :field_with_errors
+  # You can define the class to use on all item wrappers, defaulting to none.
+  mattr_accessor :item_wrapper_class
+  @@item_wrapper_class = nil
 
   # How the label text should be generated altogether with the required text.
   mattr_accessor :label_text
@@ -83,6 +67,12 @@ module SimpleForm
   mattr_accessor :label_class
   @@label_class = nil
 
+  # Define the way to render check boxes / radio buttons with labels.
+  #   :inline => input + label (default)
+  #   :nested => label > input
+  mattr_accessor :boolean_style
+  @@boolean_style = :inline
+
   # You can define the class to use on all forms. Default is simple_form.
   mattr_accessor :form_class
   @@form_class = :simple_form
@@ -95,13 +85,6 @@ module SimpleForm
   mattr_accessor :browser_validations
   @@browser_validations = true
 
-  # Determines whether HTML5 types (:email, :url, :search, :tel) and attributes
-  # (e.g. required) are used or not. True by default.
-  # Having this on in non-HTML5 compliant sites can cause odd behavior in
-  # HTML5-aware browsers such as Chrome.
-  mattr_accessor :html5
-  @@html5 = true
-
   # Collection of methods to detect if a file type was given.
   mattr_accessor :file_methods
   @@file_methods = [ :mounted_as, :file?, :public_filename ]
@@ -124,10 +107,10 @@ module SimpleForm
   mattr_accessor :default_input_size
   @@default_input_size = 50
 
-  # When off, do not use translations in hint, labels and placeholders.
-  # It is a small performance improvement if you are not using such features.
-  mattr_accessor :translate
-  @@translate = true
+  # When off, do not use translations in labels. Disabling translation in
+  # hints and placeholders can be done manually in the wrapper API.
+  mattr_accessor :translate_labels
+  @@translate_labels = true
 
   # Automatically discover new inputs in Rails' autoload path.
   mattr_accessor :inputs_discovery
@@ -135,11 +118,94 @@ module SimpleForm
 
   # Cache simple form inputs discovery
   mattr_accessor :cache_discovery
-  @@cache_discovery = !Rails.env.development?
+  @@cache_discovery = defined?(Rails) && !Rails.env.development?
+
+  # Adds a class to each generated button, mostly for compatiblity
+  mattr_accessor :button_class
+  @@button_class = 'button'
+
+  ## WRAPPER CONFIGURATION
+  # The default wrapper to be used by the FormBuilder.
+  mattr_accessor :default_wrapper
+  @@default_wrapper = :default
+  @@wrappers = {}
+
+  # Retrieves a given wrapper
+  def self.wrapper(name)
+    @@wrappers[name.to_sym] or raise WrapperNotFound, "Couldn't find wrapper with name #{name}"
+  end
+
+  # Raised when fails to find a given wrapper name
+  class WrapperNotFound < StandardError
+  end
+
+  # Define a new wrapper using SimpleForm::Wrappers::Builder
+  # and store it in the given name.
+  def self.wrappers(*args, &block)
+    if block_given?
+      options                 = args.extract_options!
+      name                    = args.first || :default
+      @@wrappers[name.to_sym] = build(options, &block)
+    else
+      @@wrappers
+    end
+  end
+
+  # Builds a new wrapper using SimpleForm::Wrappers::Builder.
+  def self.build(options={})
+    options[:tag] = :div if options[:tag].nil?
+    builder = SimpleForm::Wrappers::Builder.new(options)
+    yield builder
+    SimpleForm::Wrappers::Root.new(builder.to_a, options)
+  end
+
+  wrappers :class => :input, :hint_class => :field_with_hint, :error_class => :field_with_errors do |b|
+    b.use :html5
+
+    b.use :min_max
+    b.use :maxlength
+    b.use :placeholder
+    b.optional :pattern
+    b.optional :readonly
+
+    b.use :label_input
+    b.use :hint,  :tag => :span, :class => :hint
+    b.use :error, :tag => :span, :class => :error
+  end
+
+  ## SETUP
+
+  DEPRECATED = %w(hint_tag hint_class error_tag error_class wrapper_tag wrapper_class wrapper_error_class components html5)
+  @@deprecated = []
+
+  DEPRECATED.each do |method|
+    class_eval "def self.#{method}=(*); @@deprecated << :#{method}=; end"
+    class_eval "def self.#{method}; deprecation_warn 'SimpleForm.#{method} is deprecated and has no effect'; end"
+  end
+
+  def self.translate=(value)
+    deprecation_warn "SimpleForm.translate= is disabled in favor of translate_labels="
+    self.translate_labels = value
+  end
+
+  def self.translate
+    deprecation_warn "SimpleForm.translate is disabled in favor of translate_labels"
+    self.translate_labels
+  end
+
+  def self.deprecation_warn(message)
+    ActiveSupport::Deprecation.warn "[SIMPLE_FORM] #{message}", caller
+  end
 
   # Default way to setup SimpleForm. Run rails generate simple_form:install
   # to create a fresh initializer with all configuration values.
   def self.setup
     yield self
+
+    unless @@deprecated.empty?
+      raise "[SIMPLE FORM] Your simple form initializer file is using the following methods: #{@@deprecated.to_sentence}. " <<
+        "Those methods are part of the outdated configuration API. Updating to the new API is easy and fast. " <<
+        "Check for more info here: https://github.com/plataformatec/simple_form/wiki/Upgrading-to-Simple-Form-2.0"
+    end
   end
 end

data/lib/simple_form/action_view_extensions/builder.rb

@@ -14,13 +14,24 @@ module SimpleForm
       # == Examples
       #
       #   form_for @user do |f|
-      #     f.collection_radio :options, [[true, 'Yes'] ,[false, 'No']], :first, :last
+      #     f.collection_radio_buttons :options, [[true, 'Yes'] ,[false, 'No']], :first, :last
       #   end
       #
       #   <input id="user_options_true" name="user[options]" type="radio" value="true" />
-      #   <label class="collection_radio" for="user_options_true">Yes</label>
+      #   <label class="collection_radio_buttons" for="user_options_true">Yes</label>
       #   <input id="user_options_false" name="user[options]" type="radio" value="false" />
-      #   <label class="collection_radio" for="user_options_false">No</label>
+      #   <label class="collection_radio_buttons" for="user_options_false">No</label>
+      #
+      # It is also possible to give a block that should generate the radio +
+      # label. To wrap the radio with the label, for instance:
+      #
+      #   form_for @user do |f|
+      #     f.collection_radio_buttons(
+      #       :options, [[true, 'Yes'] ,[false, 'No']], :first, :last
+      #     ) do |label_for, text, value, html_options|
+      #       f.label(label_for) { f.radio_button(attribute, value, html_options) + text }
+      #     end
+      #   end
       #
       # == Options
       #
@@ -31,17 +42,36 @@ module SimpleForm
       #   * disabled => the value or values that should be disabled. Accepts a single
       #                 item or an array of items.
       #
-      #   * collection_wrapper_tag => the tag to wrap the entire collection.
+      #   * collection_wrapper_tag   => the tag to wrap the entire collection.
+      #
+      #   * collection_wrapper_class => the CSS class to use for collection_wrapper_tag
       #
-      #   * item_wrapper_tag       => the tag to wrap each item in the collection.
+      #   * item_wrapper_tag         => the tag to wrap each item in the collection.
       #
-      def collection_radio(attribute, collection, value_method, text_method, options={}, html_options={})
-        render_collection(
-          attribute, collection, value_method, text_method, options, html_options
+      #   * item_wrapper_class       => the CSS class to use for item_wrapper_tag
+      #
+      #   * a block                  => to generate the label + radio or any other component.
+      #
+      def collection_radio_buttons(attribute, collection, value_method, text_method, options={}, html_options={})
+        rendered_collection = render_collection(
+          collection, value_method, text_method, options, html_options
         ) do |value, text, default_html_options|
-          radio_button(attribute, value, default_html_options) +
-            label(sanitize_attribute_name(attribute, value), text, :class => "collection_radio")
+          if block_given?
+            yield sanitize_attribute_name(attribute, value), text, value, default_html_options
+          else
+            radio_button(attribute, value, default_html_options) +
+              label(sanitize_attribute_name(attribute, value), text, :class => "collection_radio_buttons")
+          end
         end
+
+        wrap_rendered_collection(rendered_collection, options)
+      end
+
+      # deprecated
+      def collection_radio(*args, &block)
+        SimpleForm.deprecation_warn "The `collection_radio` helper is deprecated, " \
+          "please use `collection_radio_buttons` instead."
+        collection_radio_buttons(*args, &block)
       end
 
       # Creates a collection of check boxes for each item in the collection,
@@ -63,29 +93,56 @@ module SimpleForm
       #   <input id="user_options_false" name="user[options][]" type="checkbox" value="false" />
       #   <label class="collection_check_boxes" for="user_options_false">No</label>
       #
+      # It is also possible to give a block that should generate the check box +
+      # label. To wrap the check box with the label, for instance:
+      #
+      #   form_for @user do |f|
+      #     f.collection_check_boxes(
+      #       :options, [[true, 'Yes'] ,[false, 'No']], :first, :last
+      #     ) do |label_for, text, value, html_options|
+      #       f.label(label_for) { f.check_box(attribute, html_options, value, '') + text }
+      #     end
+      #   end
+      #
       # == Options
       #
       # Collection check box accepts some extra options:
       #
       #   * checked  => the value or values that should be checked initially. Accepts
-      #                 a single item or an array of items.
+      #                 a single item or an array of items. It overrides existing associations.
       #
       #   * disabled => the value or values that should be disabled. Accepts a single
       #                 item or an array of items.
       #
-      #   * collection_wrapper_tag => the tag to wrap the entire collection.
+      #   * collection_wrapper_tag   => the tag to wrap the entire collection.
       #
-      #   * item_wrapper_tag       => the tag to wrap each item in the collection.
+      #   * collection_wrapper_class => the CSS class to use for collection_wrapper_tag
+      #
+      #   * item_wrapper_tag         => the tag to wrap each item in the collection.
+      #
+      #   * item_wrapper_class       => the CSS class to use for item_wrapper_tag
+      #
+      #   * a block                  => to generate the label + check box or any other component.
       #
       def collection_check_boxes(attribute, collection, value_method, text_method, options={}, html_options={})
-        render_collection(
-          attribute, collection, value_method, text_method, options, html_options
+        rendered_collection = render_collection(
+          collection, value_method, text_method, options, html_options
         ) do |value, text, default_html_options|
           default_html_options[:multiple] = true
 
-          check_box(attribute, default_html_options, value, '') +
-            label(sanitize_attribute_name(attribute, value), text, :class => "collection_check_boxes")
+          if block_given?
+            yield sanitize_attribute_name(attribute, value), text, value, default_html_options
+          else
+            check_box(attribute, default_html_options, value, nil) +
+              label(sanitize_attribute_name(attribute, value), text, :class => "collection_check_boxes")
+          end
         end
+
+        # 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)
+
+        wrap_rendered_collection(rendered_collection + hidden, options)
       end
 
       # Wrapper for using simple form inside a default rails form.
@@ -99,6 +156,8 @@ module SimpleForm
       #   end
       def simple_fields_for(*args, &block)
         options = args.extract_options!
+        options[:wrapper] ||= self.options[:wrapper]
+
         if self.class < ActionView::Helpers::FormBuilder
           options[:builder] ||= self.class
         else
@@ -107,7 +166,7 @@ module SimpleForm
         fields_for(*(args << options), &block)
       end
 
-    private
+      private
 
       # Generate default options for collection helpers, such as :checked and
       # :disabled.
@@ -117,75 +176,121 @@ module SimpleForm
         [:checked, :selected, :disabled].each do |option|
           next unless options[option]
 
+
           accept = if options[option].respond_to?(:call)
             options[option].call(item)
           else
             Array(options[option]).include?(value)
           end
 
-          html_options[option] = true if accept
+          if accept
+            html_options[option] = true
+          elsif option == :checked
+            html_options[option] = false
+          end
         end
 
         html_options
       end
 
-      def sanitize_attribute_name(attribute, value)
+      def sanitize_attribute_name(attribute, value) #:nodoc:
         "#{attribute}_#{value.to_s.gsub(/\s/, "_").gsub(/[^-\w]/, "").downcase}"
       end
 
-      def render_collection(attribute, collection, value_method, text_method, options={}, html_options={}) #:nodoc:
-        collection_wrapper_tag = options.has_key?(:collection_wrapper_tag) ? options[:collection_wrapper_tag] : SimpleForm.collection_wrapper_tag
-        item_wrapper_tag = options.has_key?(:item_wrapper_tag) ? options[:item_wrapper_tag] : SimpleForm.item_wrapper_tag
+      def render_collection(collection, value_method, text_method, options={}, html_options={}) #:nodoc:
+        item_wrapper_tag   = options.fetch(:item_wrapper_tag, :span)
+        item_wrapper_class = options[:item_wrapper_class]
 
-        rendered_collection = collection.map do |item|
+        collection.map do |item|
           value = value_for_collection(item, value_method)
           text  = value_for_collection(item, text_method)
           default_html_options = default_html_options_for_collection(item, value, options, html_options)
 
           rendered_item = yield value, text, default_html_options
 
-          item_wrapper_tag ? @template.content_tag(item_wrapper_tag, rendered_item) : rendered_item
+          item_wrapper_tag ? @template.content_tag(item_wrapper_tag, rendered_item, :class => item_wrapper_class) : rendered_item
         end.join.html_safe
-
-        collection_wrapper_tag ? @template.content_tag(collection_wrapper_tag, rendered_collection) : rendered_collection
       end
 
       def value_for_collection(item, value) #:nodoc:
         value.respond_to?(:call) ? value.call(item) : item.send(value)
       end
+
+      def wrap_rendered_collection(collection, options)
+        wrapper_tag = options[:collection_wrapper_tag]
+
+        if wrapper_tag
+          wrapper_class = options[:collection_wrapper_class]
+          @template.content_tag(wrapper_tag, collection, :class => wrapper_class)
+        else
+          collection
+        end
+      end
     end
   end
 end
 
-class ActionView::Helpers::FormBuilder
-  include SimpleForm::ActionViewExtensions::Builder
-
-  # Override default Rails collection_select helper to handle lambdas/procs in
-  # text and value methods, so it works the same way as collection_radio and
-  # collection_check_boxes in SimpleForm. If none of text/value methods is a
-  # callable object, then it just delegates back to original collection select.
-  #
-  alias :original_collection_select :collection_select
-  def collection_select(attribute, collection, value_method, text_method, options={}, html_options={})
-    if value_method.respond_to?(:call) || text_method.respond_to?(:call)
-      collection = collection.map do |item|
-        value = value_for_collection(item, value_method)
-        text  = value_for_collection(item, text_method)
-
-        default_html_options = default_html_options_for_collection(item, value, options, html_options)
-        disabled = value if default_html_options[:disabled]
-        selected = value if default_html_options[:selected]
-
-        [value, text, selected, disabled]
-      end
+module ActionView::Helpers
+  class FormBuilder
+    include SimpleForm::ActionViewExtensions::Builder
+
+    # Override default Rails collection_select helper to handle lambdas/procs in
+    # text and value methods, so it works the same way as collection_radio_buttons
+    # and collection_check_boxes in SimpleForm. If none of text/value methods is a
+    # callable object, then it just delegates back to original collection select.
+    #
+    alias :original_collection_select :collection_select
+    def collection_select(attribute, collection, value_method, text_method, options={}, html_options={})
+      if value_method.respond_to?(:call) || text_method.respond_to?(:call)
+        collection = collection.map do |item|
+          value = value_for_collection(item, value_method)
+          text  = value_for_collection(item, text_method)
+
+          default_html_options = default_html_options_for_collection(item, value, options, html_options)
+          disabled = value if default_html_options[:disabled]
+          selected = value if default_html_options[:selected]
+
+          [value, text, selected, disabled]
+        end
 
-      [:disabled, :selected].each do |option|
-        option_value    = collection.map(&:pop).compact
-        options[option] = option_value if option_value.present?
+        [:disabled, :selected].each do |option|
+          option_value    = collection.map(&:pop).compact
+          options[option] = option_value if option_value.present?
+        end
+        value_method, text_method = :first, :last
       end
-      value_method, text_method = :first, :last
+
+      original_collection_select(attribute, collection, value_method, text_method, options, html_options)
     end
+  end
 
-    original_collection_select(attribute, collection, value_method, text_method, options, html_options)
+  # Backport Rails fix to checkbox tag element, which does not generate the
+  # hidden input when given nil as unchecked value. This is to make SimpleForm
+  # collection check boxes helper to work fine with nested boolean style, when
+  # they are wrapped in labels. Without that, clicking in the label would
+  # actually change the hidden input, instead of the checkbox.
+  # FIXME: remove when support only Rails >= 3.2.2.
+  class InstanceTag
+    def to_check_box_tag(options = {}, checked_value = "1", unchecked_value = "0")
+      options = options.stringify_keys
+      options["type"]     = "checkbox"
+      options["value"]    = checked_value
+      if options.has_key?("checked")
+        cv = options.delete "checked"
+        checked = cv == true || cv == "checked"
+      else
+        checked = self.class.check_box_checked?(value(object), checked_value)
+      end
+      options["checked"] = "checked" if checked
+      if options["multiple"]
+        add_default_name_and_id_for_value(checked_value, options)
+        options.delete("multiple")
+      else
+        add_default_name_and_id(options)
+      end
+      hidden = unchecked_value ? tag("input", "name" => options["name"], "type" => "hidden", "value" => unchecked_value, "disabled" => options["disabled"]) : ""
+      checkbox = tag("input", options)
+      (hidden + checkbox).html_safe
+    end
   end
 end