Rename *CollectionInput to *CollectionSelectInput

lib/simple_form/form_builder.rb

@@ -21,8 +21,8 @@ module SimpleForm
     map_type :range,                               :to => SimpleForm::Inputs::RangeInput
     map_type :check_boxes,                         :to => SimpleForm::Inputs::CollectionCheckBoxesInput
     map_type :radio,                               :to => SimpleForm::Inputs::CollectionRadioInput
-    map_type :select,                              :to => SimpleForm::Inputs::CollectionInput
-    map_type :grouped_select,                      :to => SimpleForm::Inputs::GroupedCollectionInput
+    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

lib/simple_form/inputs.rb

@@ -1,20 +1,20 @@
 module SimpleForm
   module Inputs
-    autoload :Base,                      'simple_form/inputs/base'
-    autoload :BlockInput,                'simple_form/inputs/block_input'
-    autoload :BooleanInput,              'simple_form/inputs/boolean_input'
-    autoload :CollectionInput,           'simple_form/inputs/collection_input'
-    autoload :CollectionRadioInput,      'simple_form/inputs/collection_radio_input'
-    autoload :CollectionCheckBoxesInput, 'simple_form/inputs/collection_check_boxes_input'
-    autoload :GroupedCollectionInput,    'simple_form/inputs/grouped_collection_input'
-    autoload :DateTimeInput,             'simple_form/inputs/date_time_input'
-    autoload :FileInput,                 'simple_form/inputs/file_input'
-    autoload :HiddenInput,               'simple_form/inputs/hidden_input'
-    autoload :NumericInput,              'simple_form/inputs/numeric_input'
-    autoload :PasswordInput,             'simple_form/inputs/password_input'
-    autoload :PriorityInput,             'simple_form/inputs/priority_input'
-    autoload :RangeInput,                'simple_form/inputs/range_input'
-    autoload :StringInput,               'simple_form/inputs/string_input'
-    autoload :TextInput,                 'simple_form/inputs/text_input'
+    autoload :Base,                         'simple_form/inputs/base'
+    autoload :BlockInput,                   'simple_form/inputs/block_input'
+    autoload :BooleanInput,                 'simple_form/inputs/boolean_input'
+    autoload :CollectionCheckBoxesInput,    'simple_form/inputs/collection_check_boxes_input'
+    autoload :CollectionRadioInput,         'simple_form/inputs/collection_radio_input'
+    autoload :CollectionSelectInput,        'simple_form/inputs/collection_select_input'
+    autoload :DateTimeInput,                'simple_form/inputs/date_time_input'
+    autoload :FileInput,                    'simple_form/inputs/file_input'
+    autoload :GroupedCollectionSelectInput, 'simple_form/inputs/grouped_collection_select_input'
+    autoload :HiddenInput,                  'simple_form/inputs/hidden_input'
+    autoload :NumericInput,                 'simple_form/inputs/numeric_input'
+    autoload :PasswordInput,                'simple_form/inputs/password_input'
+    autoload :PriorityInput,                'simple_form/inputs/priority_input'
+    autoload :RangeInput,                   'simple_form/inputs/range_input'
+    autoload :StringInput,                  'simple_form/inputs/string_input'
+    autoload :TextInput,                    'simple_form/inputs/text_input'
   end
 end

lib/simple_form/inputs/collection_check_boxes_input.rb

@@ -1,6 +1,6 @@
 module SimpleForm
   module Inputs
-    class CollectionCheckBoxesInput < CollectionInput
+    class CollectionCheckBoxesInput < CollectionSelectInput
       def input
         label_method, value_method = detect_collection_methods
 

lib/simple_form/inputs/collection_radio_input.rb

@@ -1,6 +1,6 @@
 module SimpleForm
   module Inputs
-    class CollectionRadioInput < CollectionInput
+    class CollectionRadioInput < CollectionSelectInput
       def input
         label_method, value_method = detect_collection_methods
 

lib/simple_form/inputs/collection_select_input.rb

@@ -1,6 +1,6 @@
 module SimpleForm
   module Inputs
-    class CollectionInput < Base
+    class CollectionSelectInput < Base
       # Default boolean collection for use with selects/radios when no
       # collection is given. Always fallback to this boolean collection.
       # Texts can be translated using i18n in "simple_form.yes" and

lib/simple_form/inputs/grouped_collection_select_input.rb

@@ -1,6 +1,6 @@
 module SimpleForm
   module Inputs
-    class GroupedCollectionInput < CollectionInput
+    class GroupedCollectionSelectInput < CollectionSelectInput
       def input
         label_method, value_method = detect_collection_methods
         @builder.grouped_collection_select(attribute_name, grouped_collection,

lib/simple_form/inputs/priority_input.rb

@@ -1,6 +1,6 @@
 module SimpleForm
   module Inputs
-    class PriorityInput < CollectionInput
+    class PriorityInput < CollectionSelectInput
       def input
         @builder.send(:"#{input_type}_select", attribute_name, input_priority,
                       input_options, input_html_options)
@@ -10,12 +10,12 @@ module SimpleForm
         options[:priority] || SimpleForm.send(:"#{input_type}_priority")
       end
 
+    protected
+
       def has_required?
         false
       end
 
-    protected
-
       def skip_include_blank?
         super || input_priority.present?
       end

test/inputs/collection_select_input_test.rb

@@ -1,9 +1,9 @@
 # encoding: UTF-8
 require 'test_helper'
 
-class CollectionInputTest < ActionView::TestCase
+class CollectionSelectInputTest < ActionView::TestCase
   setup do
-    SimpleForm::Inputs::CollectionInput.reset_i18n_cache :boolean_collection
+    SimpleForm::Inputs::CollectionSelectInput.reset_i18n_cache :boolean_collection
   end
 
   test 'input should generate boolean radio buttons by default for radio types' do

test/inputs/grouped_collection_select_input_test.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 require 'test_helper'
 
-class GroupedCollectionInputTest < ActionView::TestCase
+class GroupedCollectionSelectInputTest < ActionView::TestCase
   test 'grouped collection accepts array collection form' do
     with_input_for @user, :tag_ids, :grouped_select,
       :collection => [['Authors', ['Jose', 'Carlos']], ['General', ['Bob', 'John']]],