simple_form 2.1.3 → 3.0.0.beta1

data/lib/simple_form/helpers.rb

@@ -1,7 +1,7 @@
 module SimpleForm
   # Helpers are made of several helpers that cannot be turned on automatically.
   # For instance, disabled cannot be turned on automatically, it requires the
-  # user to explicitly pass the option :disabled => true so it may work.
+  # user to explicitly pass the option disabled: true so it may work.
   module Helpers
     autoload :Autofocus,    'simple_form/helpers/autofocus'
     autoload :Disabled,     'simple_form/helpers/disabled'

data/lib/simple_form/inputs/base.rb

@@ -1,11 +1,8 @@
 require 'simple_form/i18n_cache'
-require 'active_support/core_ext/string/output_safety'
 
 module SimpleForm
   module Inputs
     class Base
-      include ERB::Util
-
       extend I18nCache
 
       include SimpleForm::Helpers::Autofocus
@@ -27,7 +24,7 @@ module SimpleForm
       attr_reader :attribute_name, :column, :input_type, :reflection,
                   :options, :input_html_options, :input_html_classes, :html_classes
 
-      delegate :template, :object, :object_name, :lookup_model_names, :lookup_action, :to => :@builder
+      delegate :template, :object, :object_name, :lookup_model_names, :lookup_action, to: :@builder
 
       class_attribute :default_options
       self.default_options = {}
@@ -45,7 +42,7 @@ module SimpleForm
       end
 
       # Always enabled.
-      enable :hint, :error
+      enable :hint
 
       # Usually disabled, needs to be enabled explicitly passing true as option.
       disable :maxlength, :placeholder, :pattern, :min_max
@@ -93,10 +90,6 @@ module SimpleForm
 
       private
 
-      def add_size!
-        input_html_options[:size] ||= [limit, SimpleForm.default_input_size].compact.min
-      end
-
       def limit
         if column
           decimal_or_float? ? decimal_limit : column_limit
@@ -182,7 +175,7 @@ module SimpleForm
         lookups << :"defaults.#{reflection_or_attribute_name}"
         lookups << default
 
-        I18n.t(lookups.shift, :scope => :"simple_form.#{namespace}", :default => lookups).presence
+        I18n.t(lookups.shift, scope: :"simple_form.#{namespace}", default: lookups).presence
       end
     end
   end

data/lib/simple_form/inputs/block_input.rb

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

data/lib/simple_form/inputs/boolean_input.rb

@@ -4,7 +4,7 @@ module SimpleForm
       def input
         if nested_boolean_style?
           build_hidden_field_for_checkbox +
-            template.label_tag(nil, :class => "checkbox") {
+            template.label_tag(nil, class: "checkbox") {
               build_check_box_without_hidden_field + inline_label
             }
         else
@@ -17,7 +17,6 @@ module SimpleForm
           input
         elsif nested_boolean_style?
           html_options = label_html_options.dup
-          html_options[:class] ||= []
           html_options[:class].push(:checkbox)
 
           build_hidden_field_for_checkbox +
@@ -35,7 +34,7 @@ module SimpleForm
       # reuse the method for nested boolean style, but with no unchecked value,
       # which won't generate the hidden checkbox. This is the default functionality
       # in Rails > 3.2.1, and is backported in SimpleForm AV helpers.
-      def build_check_box(unchecked_value = unchecked_value())
+      def build_check_box(unchecked_value = unchecked_value)
         @builder.check_box(attribute_name, input_html_options, checked_value, unchecked_value)
       end
 
@@ -50,9 +49,10 @@ module SimpleForm
       # we need the hidden field to be *outside* the label (otherwise it
       # generates invalid html - html5 only).
       def build_hidden_field_for_checkbox
-        @builder.hidden_field(attribute_name, :value => unchecked_value, :id => nil,
-                              :disabled => input_html_options[:disabled],
-                              :name => input_html_options[:name])
+        options = { value: unchecked_value, id: nil, disabled: input_html_options[:disabled] }
+        options[:name] = input_html_options[:name] if input_html_options.has_key?(:name)
+
+        @builder.hidden_field(attribute_name, options)
       end
 
       def inline_label

data/lib/simple_form/inputs/collection_input.rb

@@ -7,8 +7,8 @@ module SimpleForm
       # "simple_form.no" keys. See the example locale file.
       def self.boolean_collection
         i18n_cache :boolean_collection do
-          [ [I18n.t(:"simple_form.yes", :default => 'Yes'), true],
-            [I18n.t(:"simple_form.no", :default => 'No'), false] ]
+          [ [I18n.t(:"simple_form.yes", default: 'Yes'), true],
+            [I18n.t(:"simple_form.no", default: 'No'), false] ]
         end
       end
 
@@ -33,7 +33,7 @@ module SimpleForm
       end
 
       def has_required?
-        super && (input_options[:include_blank] || input_options[:prompt] || multiple?)
+        super && (input_options[:include_blank] || multiple?)
       end
 
       # Check if :include_blank must be included by default.
@@ -66,14 +66,14 @@ module SimpleForm
         collection_translated = translate_collection if collection_classes == [Symbol]
 
         if collection_translated || collection_classes.include?(Array)
-          { :label => :first, :value => :last }
+          { label: :first, value: :last }
         elsif collection_includes_basic_objects?(collection_classes)
-          { :label => :to_s, :value => :to_s }
+          { label: :to_s, value: :to_s }
         else
           sample = collection.first || collection.last
 
-          { :label => SimpleForm.collection_label_methods.find { |m| sample.respond_to?(m) },
-            :value => SimpleForm.collection_value_methods.find { |m| sample.respond_to?(m) } }
+          { label: SimpleForm.collection_label_methods.find { |m| sample.respond_to?(m) },
+            value: SimpleForm.collection_value_methods.find { |m| sample.respond_to?(m) } }
         end
       end
 

data/lib/simple_form/inputs/numeric_input.rb

@@ -4,7 +4,6 @@ module SimpleForm
       enable :placeholder, :min_max
 
       def input
-        add_size!
         input_html_classes.unshift("numeric")
         if html5?
           input_html_options[:type] ||= "number"
@@ -14,11 +13,6 @@ module SimpleForm
       end
 
       private
-
-      # Rails adds the size attr by default, if the :size key does not exist.
-      def add_size!
-        input_html_options[:size] ||= nil
-      end
     end
   end
 end

data/lib/simple_form/inputs/password_input.rb

@@ -4,7 +4,6 @@ module SimpleForm
       enable :placeholder, :maxlength
 
       def input
-        add_size!
         @builder.password_field(attribute_name, input_html_options)
       end
     end

data/lib/simple_form/inputs/string_input.rb

@@ -9,7 +9,6 @@ module SimpleForm
           input_html_options[:type] ||= input_type if html5?
         end
 
-        add_size!
         @builder.text_field(attribute_name, input_html_options)
       end
 

data/lib/simple_form/railtie.rb

@@ -0,0 +1,7 @@
+require 'rails/railtie'
+
+module SimpleForm
+  class Railtie < Rails::Railtie
+    config.eager_load_namespaces << SimpleForm
+  end
+end

data/lib/simple_form/tags.rb

@@ -0,0 +1,61 @@
+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

data/lib/simple_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "2.1.3".freeze
+  VERSION = "3.0.0.beta1".freeze
 end

data/lib/simple_form/version.rb.orig

@@ -0,0 +1,7 @@
+module SimpleForm
+<<<<<<< HEAD
+  VERSION = "2.0.4".freeze
+=======
+  VERSION = "2.1.0.dev".freeze
+>>>>>>> issue-720
+end

data/lib/simple_form/wrappers.rb

@@ -5,4 +5,4 @@ module SimpleForm
     autoload :Root,    'simple_form/wrappers/root'
     autoload :Single,  'simple_form/wrappers/single'
   end
-end
+end

data/lib/simple_form/wrappers/builder.rb

@@ -12,18 +12,18 @@ module SimpleForm
     #       b.optional :placeholder
     #
     #       # Use a component with specific wrapper options
-    #       b.use :error, :wrap_with => { :tag => "span", :class => "error" }
+    #       b.use :error, wrap_with: { tag: "span", class: "error" }
     #
     #       # Use a set of components by wrapping them in a tag+class.
-    #       b.wrapper :tag => "div", :class => "another" do |ba|
+    #       b.wrapper 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.wrapper :label_input, :tag => "div", :class => "another" do |ba|
+    #       # be turned off on demand with `f.input :name, label_input: false`
+    #       b.wrapper :label_input, tag: "div", class: "another" do |ba|
     #         ba.use :label
     #         ba.use :input
     #       end
@@ -32,7 +32,7 @@ module SimpleForm
     # 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|
+    #     config.wrappers hint: false do |b|
     #       b.use :hint
     #       b.use :label_input
     #     end
@@ -46,18 +46,6 @@ module SimpleForm
       end
 
       def use(name, options=nil, &block)
-        if block_given?
-          ActiveSupport::Deprecation.warn "Passing a block to use is deprecated. " \
-            "Please use wrapper instead of use."
-          return wrapper(name, options, &block)
-        end
-
-        if options && options.keys != [:wrap_with]
-          ActiveSupport::Deprecation.warn "Passing :tag, :class and others to use is deprecated. " \
-            "Please invoke b.use #{name.inspect}, :wrap_with => #{options.inspect} instead."
-          options = { :wrap_with => options }
-        end
-
         if options && wrapper = options[:wrap_with]
           @components << Single.new(name, wrapper)
         else
@@ -66,18 +54,6 @@ module SimpleForm
       end
 
       def optional(name, options=nil, &block)
-        if block_given?
-          ActiveSupport::Deprecation.warn "Passing a block to optional is deprecated. " \
-            "Please use wrapper instead of optional."
-          return wrapper(name, options, &block)
-        end
-
-        if options && options.keys != [:wrap_with]
-          ActiveSupport::Deprecation.warn "Passing :tag, :class and others to optional is deprecated. " \
-            "Please invoke b.optional #{name.inspect}, :wrap_with => #{options.inspect} instead."
-          options = { :wrap_with => options }
-        end
-
         @options[name] = false
         use(name, options, &block)
       end

data/lib/simple_form/wrappers/many.rb

@@ -17,7 +17,7 @@ module SimpleForm
         @components = components
         @defaults   = defaults
         @defaults[:tag]   = :div unless @defaults.key?(:tag)
-        @defaults[:class] = Array.wrap(@defaults[:class])
+        @defaults[:class] = Array(@defaults[:class])
       end
 
       def render(input)

data/lib/simple_form/wrappers/root.rb

@@ -23,7 +23,7 @@ module SimpleForm
       private
 
       def html_classes(input, options)
-        css = options[:wrapper_class] ? Array.wrap(options[:wrapper_class]) : @defaults[:class]
+        css = options[:wrapper_class] ? Array(options[:wrapper_class]) : @defaults[:class]
         css += SimpleForm.additional_classes_for(:wrapper) do
           input.additional_classes + [input.input_class]
         end

data/test/action_view_extensions/builder_test.rb

@@ -58,21 +58,21 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection radio accepts checked item" do
-    with_collection_radio_buttons @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]'
   end
 
   test "collection radio accepts checked item which has a value of false" do
-    with_collection_radio_buttons @user, :active, [[1, true], [0, false]], :last, :first, :checked => false
+    with_collection_radio_buttons @user, :active, [[1, true], [0, false]], :last, :first, checked: false
     assert_no_select 'form input[type=radio][value=true][checked=checked]'
     assert_select 'form input[type=radio][value=false][checked=checked]'
   end
 
   test "collection radio accepts multiple disabled items" do
     collection = [[1, true], [0, false], [2, 'other']]
-    with_collection_radio_buttons @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]'
@@ -81,7 +81,7 @@ class BuilderTest < ActionView::TestCase
 
   test "collection radio accepts single disable item" do
     collection = [[1, true], [0, false]]
-    with_collection_radio_buttons @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]'
@@ -89,50 +89,50 @@ class BuilderTest < ActionView::TestCase
 
   test "collection radio accepts html options as input" do
     collection = [[1, true], [0, false]]
-    with_collection_radio_buttons @user, :active, collection, :last, :first, {}, :class => 'special-radio'
+    with_collection_radio_buttons @user, :active, collection, :last, :first, {}, class: 'special-radio'
 
     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 given collection wrapper tag" do
-    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => :ul
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, collection_wrapper_tag: :ul
 
-    assert_select 'form ul input[type=radio]', :count => 2
+    assert_select 'form ul input[type=radio]', count: 2
   end
 
   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 input[type=radio]', :count => 2
+    assert_select 'form input[type=radio]', count: 2
     assert_no_select 'form ul'
   end
 
   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
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, collection_wrapper_tag: false
 
-    assert_select 'form input[type=radio]', :count => 2
+    assert_select 'form input[type=radio]', count: 2
     assert_no_select 'form ul'
   end
 
   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"
+      collection_wrapper_tag: :ul, collection_wrapper_class: "items-list"
 
-    assert_select 'form ul.items-list input[type=radio]', :count => 2
+    assert_select 'form ul.items-list input[type=radio]', count: 2
   end
 
   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"
+      collection_wrapper_class: "items-list"
 
-    assert_select 'form input[type=radio]', :count => 2
+    assert_select 'form input[type=radio]', count: 2
     assert_no_select 'form ul'
     assert_no_select '.items-list'
   end
 
   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
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, collection_wrapper_tag: :ul
 
     assert_select 'form ul'
     assert_no_select 'form ul[class]'
@@ -146,13 +146,13 @@ class BuilderTest < ActionView::TestCase
   end
 
   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
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, item_wrapper_tag: :li
 
-    assert_select 'form li input[type=radio]', :count => 2
+    assert_select 'form li input[type=radio]', count: 2
   end
 
   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
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, item_wrapper_tag: false
 
     assert_select 'form input[type=radio]'
     assert_no_select 'form span input[type=radio]'
@@ -160,25 +160,25 @@ class BuilderTest < ActionView::TestCase
 
   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"
+      item_wrapper_tag: :li, item_wrapper_class: "inline"
 
-    assert_select "form li.inline input[type=radio]", :count => 2
+    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"
+      item_wrapper_tag: nil, item_wrapper_class: "inline"
 
-    assert_select 'form input[type=radio]', :count => 2
+    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
+      item_wrapper_tag: :li
 
-    assert_select "form li", :count => 2
+    assert_select "form li", count: 2
     assert_no_select "form li[class]"
   end
 
@@ -209,7 +209,7 @@ class BuilderTest < ActionView::TestCase
 
   test "collection radio with block helpers accept extra html options" do
     with_collection_radio_buttons :user, :active, [true, false], :to_s, :to_s do |b|
-      b.label(:class => "radio_button") + b.radio_button(:class => "radio_button")
+      b.label(class: "radio_button") + b.radio_button(class: "radio_button")
     end
 
     assert_select 'label.radio_button[for=user_active_true] + input#user_active_true.radio_button[type=radio]'
@@ -231,7 +231,7 @@ class BuilderTest < ActionView::TestCase
 
   test "collection radio with block helpers allows access to the current object item in the collection to access extra properties" do
     with_collection_radio_buttons :user, :active, [true, false], :to_s, :to_s do |b|
-      b.label(:class => b.object) { b.radio_button + b.text }
+      b.label(class: b.object) { b.radio_button + b.text }
     end
 
     assert_select 'label.true[for=user_active_true]', 'true' do
@@ -245,33 +245,20 @@ class BuilderTest < ActionView::TestCase
   test "collection radio with block helpers does not leak the template" do
     with_concat_form_for(@user) do |f|
       collection_input =  f.collection_radio_buttons :active, [true, false], :to_s, :to_s do |b|
-        b.label(:class => b.object) { b.radio_button + b.text }
+        b.label(class: b.object) { b.radio_button + b.text }
       end
       concat collection_input
 
       concat f.hidden_field :name
     end
 
-    assert_select 'label.true[for=user_active_true]', :text => 'true', :count => 1 do
+    assert_select 'label.true[for=user_active_true]', text: 'true', count: 1 do
       assert_select 'input#user_active_true[type=radio]'
     end
-    assert_select 'label.false[for=user_active_false]', :text => 'false', :count => 1 do
+    assert_select 'label.false[for=user_active_false]', text: 'false', count: 1 do
       assert_select 'input#user_active_false[type=radio]'
     end
   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')]
@@ -285,14 +272,7 @@ class BuilderTest < ActionView::TestCase
     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 generates a hidden field using the given :name in :input_html" do
-    collection = [Tag.new(1, 'Tag 1'), Tag.new(2, 'Tag 2')]
-    with_collection_check_boxes @user, :tag_ids, collection, :id, :name, {}, {:name => "user[other_tag_ids][]"}
-
-    assert_select "form input[type=hidden][name='user[other_tag_ids][]'][value=]", :count => 1
+    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
@@ -329,7 +309,7 @@ class BuilderTest < ActionView::TestCase
 
   test "collection check box accepts selected values as :checked option" do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, :checked => [1, 3]
+    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]'
@@ -338,7 +318,7 @@ class BuilderTest < ActionView::TestCase
 
   test "collection check boxes accepts selected string values as :checked option" do
     collection = (1..3).map{|i| [i, "Category #{i}"] }
-    with_collection_check_boxes :user, :category_ids, collection, :first, :last, :checked => ['1', '3']
+    with_collection_check_boxes :user, :category_ids, collection, :first, :last, checked: ['1', '3']
 
     assert_select 'input[type=checkbox][value=1][checked=checked]'
     assert_select 'input[type=checkbox][value=3][checked=checked]'
@@ -347,7 +327,7 @@ class BuilderTest < ActionView::TestCase
 
   test "collection check box accepts a single checked value" do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, :checked => 3
+    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, checked: 3
 
     assert_select 'form input[type=checkbox][value=3][checked=checked]'
     assert_no_select 'form input[type=checkbox][value=1][checked=checked]'
@@ -357,7 +337,7 @@ class BuilderTest < ActionView::TestCase
   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]
+    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]'
@@ -366,7 +346,7 @@ class BuilderTest < ActionView::TestCase
 
   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]
+    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, disabled: [1, 3]
 
     assert_select 'form input[type=checkbox][value=1][disabled=disabled]'
     assert_select 'form input[type=checkbox][value=3][disabled=disabled]'
@@ -375,7 +355,7 @@ class BuilderTest < ActionView::TestCase
 
   test "collection check box accepts single disable item" do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, :disabled => 1
+    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, disabled: 1
 
     assert_select 'form input[type=checkbox][value=1][disabled=disabled]'
     assert_no_select 'form input[type=checkbox][value=3][disabled=disabled]'
@@ -384,7 +364,7 @@ class BuilderTest < ActionView::TestCase
 
   test "collection check box accepts a proc to disabled items" do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, :disabled => proc { |i| i.first == 1 }
+    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, disabled: proc { |i| i.first == 1 }
 
     assert_select 'form input[type=checkbox][value=1][disabled=disabled]'
     assert_no_select 'form input[type=checkbox][value=3][disabled=disabled]'
@@ -393,7 +373,7 @@ class BuilderTest < ActionView::TestCase
 
   test "collection check box accepts html options" do
     collection = [[1, 'Tag 1'], [2, 'Tag 2']]
-    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, {}, :class => 'check'
+    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, {}, class: 'check'
 
     assert_select 'form input.check[type=checkbox][value=1]'
     assert_select 'form input.check[type=checkbox][value=2]'
@@ -415,43 +395,43 @@ class BuilderTest < ActionView::TestCase
   end
 
   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
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, collection_wrapper_tag: :ul
 
-    assert_select 'form ul input[type=checkbox]', :count => 2
+    assert_select 'form ul input[type=checkbox]', count: 2
   end
 
   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 input[type=checkbox]', :count => 2
+    assert_select 'form input[type=checkbox]', count: 2
     assert_no_select 'form ul'
   end
 
   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
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, collection_wrapper_tag: false
 
-    assert_select 'form input[type=checkbox]', :count => 2
+    assert_select 'form input[type=checkbox]', count: 2
     assert_no_select 'form ul'
   end
 
   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"
+      collection_wrapper_tag: :ul, collection_wrapper_class: "items-list"
 
-    assert_select 'form ul.items-list input[type=checkbox]', :count => 2
+    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"
+      collection_wrapper_class: "items-list"
 
-    assert_select 'form input[type=checkbox]', :count => 2
+    assert_select 'form input[type=checkbox]', count: 2
     assert_no_select 'form ul'
     assert_no_select '.items-list'
   end
 
   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
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, collection_wrapper_tag: :ul
 
     assert_select 'form ul'
     assert_no_select 'form ul[class]'
@@ -460,17 +440,17 @@ class BuilderTest < ActionView::TestCase
   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
+    assert_select 'form span input[type=checkbox]', count: 2
   end
 
   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
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, item_wrapper_tag: :li
 
-    assert_select 'form li input[type=checkbox]', :count => 2
+    assert_select 'form li input[type=checkbox]', count: 2
   end
 
   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
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, item_wrapper_tag: false
 
     assert_select 'form input[type=checkbox]'
     assert_no_select 'form span input[type=checkbox]'
@@ -478,25 +458,25 @@ class BuilderTest < ActionView::TestCase
 
   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"
+      item_wrapper_tag: :li, item_wrapper_class: "inline"
 
-    assert_select "form li.inline input[type=checkbox]", :count => 2
+    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"
+      item_wrapper_tag: nil, item_wrapper_class: "inline"
 
-    assert_select 'form input[type=checkbox]', :count => 2
+    assert_select 'form input[type=checkbox]', count: 2
     assert_no_select 'form li'
     assert_no_select '.inline'
   end
 
   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
+      item_wrapper_tag: :li
 
-    assert_select "form li", :count => 2
+    assert_select "form li", count: 2
     assert_no_select "form li[class]"
   end
 
@@ -527,7 +507,7 @@ class BuilderTest < ActionView::TestCase
 
   test "collection check boxes with block helpers accept extra html options" do
     with_collection_check_boxes :user, :active, [true, false], :to_s, :to_s do |b|
-      b.label(:class => "check_box") + b.check_box(:class => "check_box")
+      b.label(class: "check_box") + b.check_box(class: "check_box")
     end
 
     assert_select 'label.check_box[for=user_active_true] + input#user_active_true.check_box[type=checkbox]'
@@ -549,7 +529,7 @@ class BuilderTest < ActionView::TestCase
 
   test "collection check boxes with block helpers allows access to the current object item in the collection to access extra properties" do
     with_collection_check_boxes :user, :active, [true, false], :to_s, :to_s do |b|
-      b.label(:class => b.object) { b.check_box + b.text }
+      b.label(class: b.object) { b.check_box + b.text }
     end
 
     assert_select 'label.true[for=user_active_true]', 'true' do
@@ -563,17 +543,17 @@ class BuilderTest < ActionView::TestCase
   test "collection check boxes with block helpers does not leak the template" do
     with_concat_form_for(@user) do |f|
       collection_input =  f.collection_check_boxes :active, [true, false], :to_s, :to_s do |b|
-        b.label(:class => b.object) { b.check_box + b.text }
+        b.label(class: b.object) { b.check_box + b.text }
       end
       concat collection_input
 
       concat f.hidden_field :name
     end
 
-    assert_select 'label.true[for=user_active_true]', :text => 'true', :count => 1 do
+    assert_select 'label.true[for=user_active_true]', text: 'true', count: 1 do
       assert_select 'input#user_active_true[type=checkbox]'
     end
-    assert_select 'label.false[for=user_active_false]', :text => 'false', :count => 1 do
+    assert_select 'label.false[for=user_active_false]', text: 'false', count: 1 do
       assert_select 'input#user_active_false[type=checkbox]'
     end
   end
@@ -608,7 +588,7 @@ class BuilderTest < ActionView::TestCase
 
   test "fields for yields an instance of FormBuilder if it was set in options" do
     with_custom_form_for(:user) do |f|
-      f.simple_fields_for(:company, :builder => SimpleForm::FormBuilder) do |company|
+      f.simple_fields_for(:company, builder: SimpleForm::FormBuilder) do |company|
         assert company.instance_of?(SimpleForm::FormBuilder)
       end
     end
@@ -616,7 +596,7 @@ class BuilderTest < ActionView::TestCase
 
   test "fields inherites wrapper option from the parent form" do
     swap_wrapper :another do
-      simple_form_for(:user, :wrapper => :another) do |f|
+      simple_form_for(:user, wrapper: :another) do |f|
         f.simple_fields_for(:company) do |company|
           assert_equal :another, company.options[:wrapper]
         end
@@ -626,8 +606,8 @@ class BuilderTest < ActionView::TestCase
 
   test "fields overrides wrapper option from the parent form" do
     swap_wrapper :another do
-      simple_form_for(:user, :wrapper => :another) do |f|
-        f.simple_fields_for(:company, :wrapper => false) do |company|
+      simple_form_for(:user, wrapper: :another) do |f|
+        f.simple_fields_for(:company, wrapper: false) do |company|
           assert_equal false, company.options[:wrapper]
         end
       end