simple_form 2.1.3 → 3.0.0.beta1

data/lib/simple_form/action_view_extensions/builder.rb.orig

@@ -0,0 +1,247 @@
+module SimpleForm
+  module ActionViewExtensions
+    # A collection of methods required by simple_form but added to rails default form.
+    # This means that you can use such methods outside simple_form context.
+    module Builder
+
+      # Wrapper for using SimpleForm inside a default rails form.
+      # Example:
+      #
+      #   form_for @user do |f|
+      #     f.simple_fields_for :posts do |posts_form|
+      #       # Here you have all simple_form methods available
+      #       posts_form.input :title
+      #     end
+      #   end
+      def simple_fields_for(*args, &block)
+        options = args.extract_options!
+        options[:wrapper] = self.options[:wrapper] if options[:wrapper].nil?
+        options[:defaults] ||= self.options[:defaults]
+
+        if self.class < ActionView::Helpers::FormBuilder
+          options[:builder] ||= self.class
+        else
+          options[:builder] ||= SimpleForm::FormBuilder
+        end
+        fields_for(*(args << options), &block)
+      end
+    end
+  end
+end
+
+module SimpleForm
+  module Tags
+    module CollectionExtensions
+      private
+
+      def render_collection
+        item_wrapper_tag   = @options.fetch(:item_wrapper_tag, :span)
+        item_wrapper_class = @options[:item_wrapper_class]
+
+        @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)
+
+          rendered_item = yield item, value, text, default_html_options
+
+          item_wrapper_tag ? @template_object.content_tag(item_wrapper_tag, rendered_item, :class => item_wrapper_class) : rendered_item
+        end.join.html_safe
+      end
+
+      def wrap_rendered_collection(collection)
+        wrapper_tag = @options[:collection_wrapper_tag]
+
+        if wrapper_tag
+          wrapper_class = @options[:collection_wrapper_class]
+          @template_object.content_tag(wrapper_tag, collection, :class => wrapper_class)
+        else
+          collection
+        end
+      end
+    end
+
+    class CollectionRadioButtons < ActionView::Helpers::Tags::CollectionRadioButtons
+      include CollectionExtensions
+
+      def render
+        wrap_rendered_collection(super)
+      end
+
+      private
+
+      def render_component(builder)
+        builder.radio_button + builder.label(:class => "collection_radio_buttons")
+      end
+    end
+
+    class CollectionCheckBoxes < ActionView::Helpers::Tags::CollectionCheckBoxes
+      include CollectionExtensions
+
+      def render
+        wrap_rendered_collection(super)
+      end
+
+      private
+
+      def render_component(builder)
+        builder.check_box + builder.label(:class => "collection_check_boxes")
+      end
+    end
+  end
+end
+
+module ActionView::Helpers
+  class FormBuilder
+    include SimpleForm::ActionViewExtensions::Builder
+  end
+
+<<<<<<< HEAD
+    # Create a collection of radio inputs for the attribute. Basically this
+    # helper will create a radio input associated with a label for each
+    # text/value option in the collection, using value_method and text_method
+    # to convert these text/value. You can give a symbol or a proc to both
+    # value_method and text_method, that will be evaluated for each item in
+    # the collection.
+    #
+    # == Examples
+    #
+    #   form_for @user do |f|
+    #     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_buttons" for="user_options_true">Yes</label>
+    #   <input id="user_options_false" name="user[options]" type="radio" value="false" />
+    #   <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 |b|
+    #       b.label { b.radio_button + b.text }
+    #     end
+    #   end
+    #
+    # == Options
+    #
+    # Collection radio accepts some extra options:
+    #
+    #   * checked  => the value that should be checked initially.
+    #
+    #   * 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_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 + radio or any other component.
+    def collection_radio_buttons(method, collection, value_method, text_method, options = {}, html_options = {}, &block)
+      SimpleForm::Tags::CollectionRadioButtons.new(@object_name, method, @template, collection, value_method, text_method, objectify_options(options), @default_options.merge(html_options)).render(&block)
+=======
+  module FormOptionsHelper
+    # Override Rails options_from_collection_for_select 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.
+    # FIXME: remove when support only Rails 4.0 forward
+    #        https://github.com/rails/rails/commit/9035324367526af0300477a58b6d3efc15d1a5a8
+    alias :original_options_from_collection_for_select :options_from_collection_for_select
+    def options_from_collection_for_select(collection, value_method, text_method, selected = nil)
+      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)
+
+          [value, text]
+        end
+
+        value_method, text_method = :first, :last
+        selected = extract_selected_and_disabled_and_call_procs selected, collection
+      end
+
+      original_options_from_collection_for_select collection, value_method, text_method, selected
+    end
+
+    private
+
+    def extract_selected_and_disabled_and_call_procs(selected, collection)
+      selected, disabled = extract_selected_and_disabled selected
+      selected_disabled = { :selected => selected, :disabled => disabled }
+
+      selected_disabled.each do |key, check|
+        if check.is_a? Proc
+          values = collection.map { |option| option.first if check.call(option.first) }
+          selected_disabled[key] = values
+        end
+      end
+    end
+
+    def value_for_collection(item, value) #:nodoc:
+      value.respond_to?(:call) ? value.call(item) : item.send(value)
+>>>>>>> master
+    end
+
+    # Creates a collection of check boxes for each item in the collection,
+    # associated with a clickable label. Use value_method and text_method to
+    # convert items in the collection for use as text/value in check boxes.
+    # You can give a symbol or a proc to both value_method and text_method,
+    # that will be evaluated for each item in the collection.
+    #
+    # == Examples
+    #
+    #   form_for @user do |f|
+    #     f.collection_check_boxes :options, [[true, 'Yes'] ,[false, 'No']], :first, :last
+    #   end
+    #
+    #   <input name="user[options][]" type="hidden" value="" />
+    #   <input id="user_options_true" name="user[options][]" type="checkbox" value="true" />
+    #   <label class="collection_check_boxes" for="user_options_true">Yes</label>
+    #   <input name="user[options][]" type="hidden" value="" />
+    #   <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 |b|
+    #       b.label { b.check_box + b.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. 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_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.
+    #
+    #   * 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(method, collection, value_method, text_method, options = {}, html_options = {}, &block)
+      SimpleForm::Tags::CollectionCheckBoxes.new(@object_name, method, @template, collection, value_method, text_method, objectify_options(options), @default_options.merge(html_options)).render(&block)
+    end
+  end
+end

data/lib/simple_form/action_view_extensions/form_helper.rb

@@ -5,7 +5,7 @@ module SimpleForm
     # Example:
     #
     #   simple_form_for @user do |f|
-    #     f.input :name, :hint => 'My hint'
+    #     f.input :name, hint: 'My hint'
     #   end
     #
     module FormHelper

data/lib/simple_form/components.rb

@@ -2,7 +2,7 @@ module SimpleForm
   # Components are a special type of helpers that can work on their own.
   # For example, by using a component, it will automatically change the
   # output under given circumstances without user input. For example,
-  # the disabled helper always need a :disabled => true option given
+  # the disabled helper always need a disabled: true option given
   # to the input in order to be enabled. On the other hand, things like
   # hints can generate output automatically by doing I18n lookups.
   module Components

data/lib/simple_form/components/errors.rb

@@ -12,9 +12,7 @@ module SimpleForm
       protected
 
       def error_text
-        text = has_error_in_options? ? options[:error] : errors.send(error_method)
-
-        "#{html_escape(options[:error_prefix])} #{html_escape(text)}".lstrip.html_safe
+        "#{options[:error_prefix]} #{errors.send(error_method)}".lstrip.html_safe
       end
 
       def error_method
@@ -32,10 +30,6 @@ module SimpleForm
       def errors_on_association
         reflection ? object.errors[reflection.name] : []
       end
-
-      def has_error_in_options?
-        options[:error] && !options[:error].nil?
-      end
     end
   end
 end

data/lib/simple_form/components/hints.rb

@@ -5,13 +5,8 @@ module SimpleForm
       def hint
         @hint ||= begin
           hint = options[:hint]
-
-          if hint.is_a?(String)
-            html_escape(hint)
-          else
-            content = translate(:hints)
-            content.html_safe if content
-          end
+          hint_content = hint.is_a?(String) ? hint : translate(:hints)
+          hint_content.html_safe if hint_content
         end
       end
 

data/lib/simple_form/components/html5.rb

@@ -23,4 +23,4 @@ module SimpleForm
       end
     end
   end
-end
+end

data/lib/simple_form/components/labels.rb

@@ -6,18 +6,18 @@ module SimpleForm
       module ClassMethods #:nodoc:
         def translate_required_html
           i18n_cache :translate_required_html do
-            I18n.t(:"simple_form.required.html", :default =>
+            I18n.t(:"simple_form.required.html", default:
               %[<abbr title="#{translate_required_text}">#{translate_required_mark}</abbr>]
             )
           end
         end
 
         def translate_required_text
-          I18n.t(:"simple_form.required.text", :default => 'required')
+          I18n.t(:"simple_form.required.text", default: 'required')
         end
 
         def translate_required_mark
-          I18n.t(:"simple_form.required.mark", :default => '*')
+          I18n.t(:"simple_form.required.mark", default: '*')
         end
       end
 
@@ -30,7 +30,7 @@ module SimpleForm
       end
 
       def label_text
-        SimpleForm.label_text.call(html_escape(raw_label_text), required_label_text).strip.html_safe
+        SimpleForm.label_text.call(raw_label_text, required_label_text).strip.html_safe
       end
 
       def label_target

data/lib/simple_form/components/maxlength.rb

@@ -27,14 +27,7 @@ module SimpleForm
       end
 
       def has_tokenizer?(length_validator)
-        tokenizer = length_validator.options[:tokenizer]
-
-        # TODO: Remove this check when we drop Rails 3.0 support
-        if ActiveModel::Validations::LengthValidator.const_defined?(:DEFAULT_TOKENIZER)
-          tokenizer && tokenizer != ActiveModel::Validations::LengthValidator::DEFAULT_TOKENIZER
-        else
-          tokenizer
-        end
+        length_validator.options[:tokenizer]
       end
     end
   end

data/lib/simple_form/error_notification.rb

@@ -1,6 +1,6 @@
 module SimpleForm
   class ErrorNotification
-    delegate :object, :object_name, :template, :to => :@builder
+    delegate :object, :object_name, :template, to: :@builder
 
     def initialize(builder, options)
       @builder = builder
@@ -42,7 +42,7 @@ module SimpleForm
       lookups << :"#{object_name}"
       lookups << :default_message
       lookups << "Please review the problems below:"
-      I18n.t(lookups.shift, :scope => :"simple_form.error_notification", :default => lookups)
+      I18n.t(lookups.shift, scope: :"simple_form.error_notification", default: lookups)
     end
   end
 end

data/lib/simple_form/form_builder.rb

@@ -1,5 +1,6 @@
-require 'simple_form/core_ext/hash'
+require 'active_support/core_ext/object/deep_dup'
 require 'simple_form/map_type'
+require 'simple_form/tags'
 
 module SimpleForm
   class FormBuilder < ActionView::Helpers::FormBuilder
@@ -7,26 +8,26 @@ module SimpleForm
 
     # When action is create or update, we still should use new and edit
     ACTIONS = {
-      :create => :new,
-      :update => :edit
+      create: :new,
+      update: :edit
     }
 
     extend MapType
     include SimpleForm::Inputs
 
-    map_type :text,                                :to => SimpleForm::Inputs::TextInput
-    map_type :file,                                :to => SimpleForm::Inputs::FileInput
-    map_type :string, :email, :search, :tel, :url, :to => SimpleForm::Inputs::StringInput
-    map_type :password,                            :to => SimpleForm::Inputs::PasswordInput
-    map_type :integer, :decimal, :float,           :to => SimpleForm::Inputs::NumericInput
-    map_type :range,                               :to => SimpleForm::Inputs::RangeInput
-    map_type :check_boxes,                         :to => SimpleForm::Inputs::CollectionCheckBoxesInput
-    map_type :radio_buttons,                       :to => SimpleForm::Inputs::CollectionRadioButtonsInput
-    map_type :select,                              :to => SimpleForm::Inputs::CollectionSelectInput
-    map_type :grouped_select,                      :to => SimpleForm::Inputs::GroupedCollectionSelectInput
-    map_type :date, :time, :datetime,              :to => SimpleForm::Inputs::DateTimeInput
-    map_type :country, :time_zone,                 :to => SimpleForm::Inputs::PriorityInput
-    map_type :boolean,                             :to => SimpleForm::Inputs::BooleanInput
+    map_type :text,                                to: SimpleForm::Inputs::TextInput
+    map_type :file,                                to: SimpleForm::Inputs::FileInput
+    map_type :string, :email, :search, :tel, :url, to: SimpleForm::Inputs::StringInput
+    map_type :password,                            to: SimpleForm::Inputs::PasswordInput
+    map_type :integer, :decimal, :float,           to: SimpleForm::Inputs::NumericInput
+    map_type :range,                               to: SimpleForm::Inputs::RangeInput
+    map_type :check_boxes,                         to: SimpleForm::Inputs::CollectionCheckBoxesInput
+    map_type :radio_buttons,                       to: SimpleForm::Inputs::CollectionRadioButtonsInput
+    map_type :select,                              to: SimpleForm::Inputs::CollectionSelectInput
+    map_type :grouped_select,                      to: SimpleForm::Inputs::GroupedCollectionSelectInput
+    map_type :date, :time, :datetime,              to: SimpleForm::Inputs::DateTimeInput
+    map_type :country, :time_zone,                 to: SimpleForm::Inputs::PriorityInput
+    map_type :boolean,                             to: SimpleForm::Inputs::BooleanInput
 
     def self.discovery_cache
       @discovery_cache ||= {}
@@ -48,7 +49,7 @@ module SimpleForm
     #
     #   # Imagine @user has error "can't be blank" on name
     #   simple_form_for @user do |f|
-    #     f.input :name, :hint => 'My hint'
+    #     f.input :name, hint: 'My hint'
     #   end
     #
     # This is the output html (only the input portion, not the form):
@@ -57,7 +58,7 @@ module SimpleForm
     #       <abbr title="required">*</abbr> Super User Name!
     #     </label>
     #     <input class="string required" id="user_name" maxlength="100"
-    #        name="user[name]" size="100" type="text" value="Carlos" />
+    #        name="user[name]" type="text" value="Carlos" />
     #     <span class="hint">My hint</span>
     #     <span class="error">can't be blank</span>
     #
@@ -66,15 +67,15 @@ module SimpleForm
     #
     # You have some options for the input to enable/disable some functions:
     #
-    #   :as => allows you to define the input type you want, for instance you
+    #   as: allows you to define the input type you want, for instance you
     #          can use it to generate a text field for a date column.
     #
-    #   :required => defines whether this attribute is required or not. True
+    #   required: defines whether this attribute is required or not. True
     #               by default.
     #
     # The fact SimpleForm is built in components allow the interface to be unified.
     # So, for instance, if you need to disable :hint for a given input, you can pass
-    # :hint => false. The same works for :error, :label and :wrapper.
+    # hint: false. The same works for :error, :label and :wrapper.
     #
     # Besides the html for any component can be changed. So, if you want to change
     # the label html you just need to give a hash to :label_html. To configure the
@@ -85,18 +86,18 @@ module SimpleForm
     # Some inputs, as datetime, time and select allow you to give extra options, like
     # prompt and/or include blank. Such options are given in plainly:
     #
-    #    f.input :created_at, :include_blank => true
+    #    f.input :created_at, include_blank: true
     #
     # == Collection
     #
     # When playing with collections (:radio_buttons, :check_boxes and :select
     # inputs), you have three extra options:
     #
-    #   :collection => use to determine the collection to generate the radio or select
+    #   collection: use to determine the collection to generate the radio or select
     #
-    #   :label_method => the method to apply on the array collection to get the label
+    #   label_method: the method to apply on the array collection to get the label
     #
-    #   :value_method => the method to apply on the array collection to get the value
+    #   value_method: the method to apply on the array collection to get the value
     #
     # == Priority
     #
@@ -130,14 +131,14 @@ module SimpleForm
     # This is the output html (only the input portion, not the form):
     #
     #     <input class="string required" id="user_name" maxlength="100"
-    #        name="user[name]" size="100" type="text" value="Carlos" />
+    #        name="user[name]" type="text" value="Carlos" />
     #
     def input_field(attribute_name, options={})
       options = options.dup
       options[:input_html] = options.except(:as, :collection, :label_method, :value_method)
       options = @defaults.deep_dup.deep_merge(options) if @defaults
 
-      SimpleForm::Wrappers::Root.new([:min_max, :maxlength, :placeholder, :pattern, :readonly, :input], :wrapper => false).render find_input(attribute_name, options)
+      SimpleForm::Wrappers::Root.new([:min_max, :maxlength, :placeholder, :pattern, :readonly, :input], wrapper: false).render find_input(attribute_name, options)
     end
 
     # Helper for dealing with association selects/radios, generating the
@@ -151,7 +152,7 @@ module SimpleForm
     #     f.association :company          # Company.all
     #   end
     #
-    #   f.association :company, :collection => Company.all(:order => 'name')
+    #   f.association :company, collection: Company.all(order: 'name')
     #   # Same as using :order option, but overriding collection
     #
     # == Block
@@ -190,7 +191,6 @@ module SimpleForm
         else
           if options[:as] == :select
             html_options = options[:input_html] ||= {}
-            html_options[:size]   ||= 5
             html_options[:multiple] = true unless html_options.key?(:multiple)
           end
 
@@ -203,7 +203,7 @@ module SimpleForm
           :"#{reflection.name.to_s.singularize}_ids"
       end
 
-      input(attribute, options.merge(:reflection => reflection))
+      input(attribute, options.merge(reflection: reflection))
     end
 
     # Creates a button:
@@ -216,8 +216,7 @@ module SimpleForm
     # button implementation (3.2 forward (to delegate to the original when
     # calling `f.button :button`.
     #
-    # TODO: remove if condition when supporting only Rails 3.2 forward.
-    alias_method :button_button, :button if method_defined?(:button)
+    alias_method :button_button, :button
     def button(type, *args, &block)
       options = args.extract_options!.dup
       options[:class] = [SimpleForm.button_class, options[:class]].compact
@@ -235,7 +234,7 @@ module SimpleForm
     # == Examples
     #
     #    f.error :name
-    #    f.error :name, :id => "cool_error"
+    #    f.error :name, id: "cool_error"
     #
     def error(attribute_name, options={})
       options = options.dup
@@ -273,7 +272,7 @@ module SimpleForm
     # == Examples
     #
     #    f.hint :name # Do I18n lookup
-    #    f.hint :name, :id => "cool_hint"
+    #    f.hint :name, id: "cool_hint"
     #    f.hint "Don't forget to accept this"
     #
     def hint(attribute_name, options={})
@@ -300,10 +299,10 @@ module SimpleForm
     #
     #    f.label :name                     # Do I18n lookup
     #    f.label :name, "Name"             # Same behavior as Rails, do not add required tag
-    #    f.label :name, :label => "Name"   # Same as above, but adds required tag
+    #    f.label :name, label: "Name"   # Same as above, but adds required tag
     #
-    #    f.label :name, :required => false
-    #    f.label :name, :id => "cool_label"
+    #    f.label :name, required: false
+    #    f.label :name, id: "cool_label"
     #
     def label(attribute_name, *args)
       return super if args.first.is_a?(String) || block_given?
@@ -324,13 +323,118 @@ module SimpleForm
     # == Examples
     #
     #    f.error_notification
-    #    f.error_notification :message => 'Something went wrong'
-    #    f.error_notification :id => 'user_error_message', :class => 'form_error'
+    #    f.error_notification message: 'Something went wrong'
+    #    f.error_notification id: 'user_error_message', class: 'form_error'
     #
     def error_notification(options={})
       SimpleForm::ErrorNotification.new(self, options).render
     end
 
+    # Create a collection of radio inputs for the attribute. Basically this
+    # helper will create a radio input associated with a label for each
+    # text/value option in the collection, using value_method and text_method
+    # to convert these text/value. You can give a symbol or a proc to both
+    # value_method and text_method, that will be evaluated for each item in
+    # the collection.
+    #
+    # == Examples
+    #
+    #   form_for @user do |f|
+    #     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_buttons" for="user_options_true">Yes</label>
+    #   <input id="user_options_false" name="user[options]" type="radio" value="false" />
+    #   <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 |b|
+    #       b.label { b.radio_button + b.text }
+    #     end
+    #   end
+    #
+    # == Options
+    #
+    # Collection radio accepts some extra options:
+    #
+    #   * checked  => the value that should be checked initially.
+    #
+    #   * 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_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 + radio or any other component.
+    def collection_radio_buttons(method, collection, value_method, text_method, options = {}, html_options = {}, &block)
+      SimpleForm::Tags::CollectionRadioButtons.new(@object_name, method, @template, collection, value_method, text_method, objectify_options(options), @default_options.merge(html_options)).render(&block)
+    end
+
+    # Creates a collection of check boxes for each item in the collection,
+    # associated with a clickable label. Use value_method and text_method to
+    # convert items in the collection for use as text/value in check boxes.
+    # You can give a symbol or a proc to both value_method and text_method,
+    # that will be evaluated for each item in the collection.
+    #
+    # == Examples
+    #
+    #   form_for @user do |f|
+    #     f.collection_check_boxes :options, [[true, 'Yes'] ,[false, 'No']], :first, :last
+    #   end
+    #
+    #   <input name="user[options][]" type="hidden" value="" />
+    #   <input id="user_options_true" name="user[options][]" type="checkbox" value="true" />
+    #   <label class="collection_check_boxes" for="user_options_true">Yes</label>
+    #   <input name="user[options][]" type="hidden" value="" />
+    #   <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 |b|
+    #       b.label { b.check_box + b.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. 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_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.
+    #
+    #   * 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(method, collection, value_method, text_method, options = {}, html_options = {}, &block)
+      SimpleForm::Tags::CollectionCheckBoxes.new(@object_name, method, @template, collection, value_method, text_method, objectify_options(options), @default_options.merge(html_options)).render(&block)
+    end
+
     # Extract the model names from the object_name mess, ignoring numeric and
     # explicit child indexes.
     #
@@ -342,7 +446,7 @@ module SimpleForm
     def lookup_model_names
       @lookup_model_names ||= begin
         child_index = options[:child_index]
-        names = object_name.to_s.scan(/(?!\d)\w+/).flatten
+        names = object_name.to_s.scan(/([a-zA-Z_]+)/).flatten
         names.delete(child_index) if child_index
         names.each { |name| name.gsub!('_attributes', '') }
         names.freeze
@@ -366,12 +470,6 @@ module SimpleForm
       column     = find_attribute_column(attribute_name)
       input_type = default_input_type(attribute_name, column, options)
 
-      if input_type == :radio
-        SimpleForm.deprecation_warn "Using `:as => :radio` as input type is " \
-          "deprecated, please change it to `:as => :radio_buttons`."
-        input_type = :radio_buttons
-      end
-
       if block_given?
         SimpleForm::Inputs::BlockInput.new(self, attribute_name, column, input_type, options, &block)
       else