simple_form 1.2.2 → 1.3.0

data/lib/simple_form/inputs/block_input.rb

@@ -1,8 +1,9 @@
 module SimpleForm
   module Inputs
     class BlockInput < Base
-      def initialize(builder, block)
-        @builder, @block = builder, block
+      def initialize(*args, &block)
+        super
+        @block = block
       end
 
       def input

data/lib/simple_form/inputs/collection_input.rb

@@ -13,10 +13,10 @@ module SimpleForm
       end
 
       def input
-        collection = (options[:collection] || self.class.boolean_collection).to_a
-        detect_collection_methods(collection, options)
-        @builder.send(:"collection_#{input_type}", attribute_name, collection, options[:value_method],
-                      options[:label_method], input_options, input_html_options)
+        label_method, value_method = detect_collection_methods
+
+        @builder.send(:"collection_#{input_type}", attribute_name, collection,
+                      value_method, label_method, input_options, input_html_options)
       end
 
       def input_options
@@ -27,6 +27,10 @@ module SimpleForm
 
     protected
 
+      def collection
+        @collection ||= (options.delete(:collection) || self.class.boolean_collection).to_a
+      end
+
       # Check if :include_blank must be included by default.
       def skip_include_blank?
         (options.keys & [:prompt, :include_blank, :default, :selected]).any? ||
@@ -38,21 +42,42 @@ module SimpleForm
       # on default label and value methods that can be configured through
       # SimpleForm.collection_label_methods and
       # SimpleForm.collection_value_methods.
-      def detect_collection_methods(collection, options)
-        sample = collection.first || collection.last
-
-        case sample
-        when Array
-          label, value = :first, :last
-        when Integer
-          label, value = :to_s, :to_i
-        when String, NilClass
-          label, value = :to_s, :to_s
+      def detect_collection_methods
+        label, value = options.delete(:label_method), options.delete(:value_method)
+
+        unless label && value
+          common_method_for = detect_common_display_methods
+          label ||= common_method_for[:label]
+          value ||= common_method_for[:value]
         end
 
-        options[:label_method] ||= label || SimpleForm.collection_label_methods.find { |m| sample.respond_to?(m) }
-        options[:value_method] ||= value || SimpleForm.collection_value_methods.find { |m| sample.respond_to?(m) }
+        [label, value]
+      end
+
+      def detect_common_display_methods
+        collection_classes = detect_collection_classes
+
+        if collection_classes.include?(Array)
+          { :label => :first, :value => :last }
+        elsif collection_includes_basic_objects?(collection_classes)
+          { :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) } }
+        end
+      end
+
+      def detect_collection_classes
+        collection.map { |e| e.class }.uniq
+      end
+
+      def collection_includes_basic_objects?(collection_classes)
+        (collection_classes & [
+          String, Integer, Fixnum, Bignum, Float, NilClass, Symbol, TrueClass, FalseClass
+        ]).any?
       end
     end
   end
-end
+end

data/lib/simple_form/inputs/date_time_input.rb

@@ -5,6 +5,8 @@ module SimpleForm
         @builder.send(:"#{input_type}_select", attribute_name, input_options, input_html_options)
       end
 
+    private
+
       def label_target
         case input_type
         when :date, :datetime
@@ -15,4 +17,4 @@ module SimpleForm
       end
     end
   end
-end
+end

data/lib/simple_form/inputs/hidden_input.rb

@@ -1,11 +1,20 @@
 module SimpleForm
   module Inputs
-    # Handles hidden input.
     class HiddenInput < Base
       def render
         @builder.hidden_field(attribute_name, input_html_options)
       end
       alias :input :render
+
+    protected
+
+      def attribute_required?
+        false
+      end
+
+      def required_class
+        nil
+      end
     end
   end
-end
+end

data/lib/simple_form/inputs/mapping_input.rb

@@ -12,10 +12,23 @@ module SimpleForm
         @builder.send(input_method, attribute_name, input_html_options)
       end
 
+    private
+
       def input_method
-        method = self.class.mappings[input_type]
-        raise "Could not find method for #{input_type.inspect}" unless method
-        method
+        self.class.mappings[input_type] or
+          raise("Could not find method for #{input_type.inspect}")
+      end
+
+      def has_placeholder?
+        (text? || password?) && placeholder_present?
+      end
+
+      def password?
+        input_type == :password
+      end
+
+      def text?
+        input_type == :text
       end
     end
   end

data/lib/simple_form/inputs/numeric_input.rb

@@ -2,19 +2,56 @@ module SimpleForm
   module Inputs
     class NumericInput < Base
       def input
+        input_html_options[:type] ||= "number"
+        input_html_options[:size] ||= SimpleForm.default_input_size
+        input_html_options[:step] ||= 1 if integer?
+        infer_attributes_from_validations!
         @builder.text_field(attribute_name, input_html_options)
       end
 
-      def input_html_options
-        input_options = super
-        input_options[:type] ||= "number"
-        input_options[:size] ||= SimpleForm.default_input_size
-        input_options
-      end
-
       def input_html_classes
         super.unshift("numeric")
       end
+
+    protected
+
+      def has_placeholder?
+        placeholder_present?
+      end
+
+      def infer_attributes_from_validations!
+        return unless has_validators?
+
+        numeric_validator = find_numericality_validator or return
+        validator_options = numeric_validator.options
+
+        input_html_options[:min] ||= minimum_value(validator_options)
+        input_html_options[:max] ||= maximum_value(validator_options)
+      end
+
+      def integer?
+        input_type == :integer
+      end
+
+      def minimum_value(validator_options)
+        if integer? && validator_options.key?(:greater_than)
+          validator_options[:greater_than] + 1
+        else
+          validator_options[:greater_than_or_equal_to]
+        end
+      end
+
+      def maximum_value(validator_options)
+        if integer? && validator_options.key?(:less_than)
+          validator_options[:less_than] - 1
+        else
+          validator_options[:less_than_or_equal_to]
+        end
+      end
+
+      def find_numericality_validator
+        attribute_validators.find { |v| ActiveModel::Validations::NumericalityValidator === v }
+      end
     end
   end
-end
+end

data/lib/simple_form/inputs/string_input.rb

@@ -2,19 +2,15 @@ module SimpleForm
   module Inputs
     class StringInput < Base
       def input
-        @builder.text_field(attribute_name, input_html_options)
-      end
+        input_html_options[:size]      ||= [limit, SimpleForm.default_input_size].compact.min
+        input_html_options[:maxlength] ||= limit if limit
+        input_html_options[:type]      ||= input_type unless string?
 
-      def input_html_options
-        input_options = super
-        input_options[:size]      ||= [limit, SimpleForm.default_input_size].compact.min
-        input_options[:maxlength] ||= limit if limit
-        input_options[:type]      ||= input_type unless input_type == :string
-        input_options
+        @builder.text_field(attribute_name, input_html_options)
       end
 
       def input_html_classes
-        input_type == :string ? super : super.unshift("string")
+        string? ? super : super.unshift("string")
       end
 
     protected
@@ -22,6 +18,14 @@ module SimpleForm
       def limit
         column && column.limit
       end
+
+      def has_placeholder?
+        placeholder_present?
+      end
+
+      def string?
+        input_type == :string
+      end
     end
   end
 end

data/lib/simple_form/map_type.rb

@@ -5,9 +5,9 @@ module SimpleForm
     end
 
     def map_type(*types)
-      options = types.extract_options!
-      raise ArgumentError, "You need to give :to as option to map_type" unless options[:to]
-      types.each { |t| mappings[t] = options[:to] }
+      map_to = types.extract_options![:to]
+      raise ArgumentError, "You need to give :to as option to map_type" unless map_to
+      types.each { |t| mappings[t] = map_to }
     end
   end
-end
+end

data/lib/simple_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "1.2.2".freeze
+  VERSION = "1.3.0".freeze
 end

data/test/action_view_extensions/builder_test.rb

@@ -1,29 +1,53 @@
 require 'test_helper'
 
 class BuilderTest < ActionView::TestCase
+
+  def with_concat_form_for(object, &block)
+    concat form_for(object, &block)
+  end
+
+  def with_collection_radio(object, attribute, collection, value_method, text_method, options={}, html_options={})
+    with_concat_form_for(object) do |f|
+      f.collection_radio attribute, collection, value_method, text_method, options, html_options
+    end
+  end
+
+  def with_collection_check_boxes(object, attribute, collection, value_method, text_method, options={}, html_options={})
+    with_concat_form_for(object) do |f|
+      f.collection_check_boxes attribute, collection, value_method, text_method, options, html_options
+    end
+  end
+
   # COLLECTION RADIO
   test 'collection radio accepts a collection and generate inputs from value method' do
-    concat(form_for(@user) do |f|
-      concat f.collection_radio :active, [true, false], :to_s, :to_s
-    end)
+    with_collection_radio @user, :active, [true, false], :to_s, :to_s
 
     assert_select 'form input[type=radio][value=true]#user_active_true'
     assert_select 'form input[type=radio][value=false]#user_active_false'
   end
 
   test 'collection radio accepts a collection and generate inputs from label method' do
-    concat(form_for(@user) do |f|
-      concat f.collection_radio :active, [true, false], :to_s, :to_s
-    end)
+    with_collection_radio @user, :active, [true, false], :to_s, :to_s
 
     assert_select 'form label.collection_radio[for=user_active_true]', 'true'
     assert_select 'form label.collection_radio[for=user_active_false]', 'false'
   end
 
+  test 'collection radio handles camelized collection values for labels correctly' do
+    with_collection_radio @user, :active, ['Yes', 'No'], :to_s, :to_s
+
+    assert_select 'form label.collection_radio[for=user_active_yes]', 'Yes'
+    assert_select 'form label.collection_radio[for=user_active_no]', 'No'
+  end
+
+  test 'colection radio should sanitize collection values for labels correctly' do
+    with_collection_radio @user, :name, ['$0.99', '$1.99'], :to_s, :to_s
+    assert_select 'label.collection_radio[for=user_name_099]', '$0.99'
+    assert_select 'label.collection_radio[for=user_name_199]', '$1.99'
+  end
+
   test 'collection radio accepts checked item' do
-    concat(form_for(@user) do |f|
-      concat f.collection_radio :active, [[1, true], [0, false]], :last, :first, :checked => true
-    end)
+    with_collection_radio @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]'
@@ -31,9 +55,7 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection radio accepts multiple disabled items' do
     collection = [[1, true], [0, false], [2, 'other']]
-    concat(form_for(@user) do |f|
-      concat f.collection_radio :active, collection, :last, :first, :disabled => [true, false]
-    end)
+    with_collection_radio @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]'
@@ -42,29 +64,68 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection radio accepts single disable item' do
     collection = [[1, true], [0, false]]
-    concat(form_for(@user) do |f|
-      concat f.collection_radio :active, collection, :last, :first, :disabled => true
-    end)
+    with_collection_radio @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]'
   end
 
   test 'collection radio accepts html options as input' do
-    concat(form_for(@user) do |f|
-      concat f.collection_radio :active, [[1, true], [0, false]], :last, :first, {}, :class => 'radio'
-    end)
+    collection = [[1, true], [0, false]]
+    with_collection_radio @user, :active, collection, :last, :first, {}, :class => 'radio'
 
     assert_select 'form input[type=radio][value=true].radio#user_active_true'
     assert_select 'form input[type=radio][value=false].radio#user_active_false'
   end
 
+  test 'collection radio wraps the collection in the configured collection wrapper tag' do
+    swap SimpleForm, :collection_wrapper_tag => :ul do
+      with_collection_radio @user, :active, [true, false], :to_s, :to_s
+
+      assert_select 'form ul input[type=radio][value=true]#user_active_true'
+      assert_select 'form ul input[type=radio][value=false]#user_active_false'
+    end
+  end
+
+  test 'collection radio wraps the collection in the given collection wrapper tag' do
+    with_collection_radio @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => :ul
+
+    assert_select 'form ul input[type=radio][value=true]#user_active_true'
+    assert_select 'form ul input[type=radio][value=false]#user_active_false'
+  end
+
+  test 'collection radio does not wrap the collection by default' do
+    with_collection_radio @user, :active, [true, false], :to_s, :to_s
+
+    assert_no_select 'form ul'
+  end
+
+  test 'collection radio wraps each label/radio in the configured item wrapper tag' do
+    swap SimpleForm, :item_wrapper_tag => :li do
+      with_collection_radio @user, :active, [true, false], :to_s, :to_s
+
+      assert_select 'form li input[type=radio][value=true]#user_active_true'
+      assert_select 'form li input[type=radio][value=false]#user_active_false'
+    end
+  end
+
+  test 'collection radio wraps each label/radio in the given item wrapper tag' do
+    with_collection_radio @user, :active, [true, false], :to_s, :to_s, :item_wrapper_tag => :li
+
+    assert_select 'form li input[type=radio][value=true]#user_active_true'
+    assert_select 'form li input[type=radio][value=false]#user_active_false'
+  end
+
+  test 'collection radio does not wrap items by default' do
+    with_collection_radio @user, :active, [true, false], :to_s, :to_s
+
+    assert_no_select 'form li'
+  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')]
-    concat(form_for(@user) do |f|
-      concat f.collection_check_boxes :tag_ids, collection, :id, :name
-    end)
+    with_collection_check_boxes @user, :tag_ids, collection, :id, :name
 
     assert_select "form input[type=hidden][name='user[tag_ids][]'][value=]"
     assert_select 'form input#user_tag_ids_1[type=checkbox][value=1]'
@@ -73,19 +134,28 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box accepts a collection and generate a serie of checkboxes with labels for label method' do
     collection = [Tag.new(1, 'Tag 1'), Tag.new(2, 'Tag 2')]
-    concat(form_for(@user) do |f|
-      concat f.collection_check_boxes :tag_ids, collection, :id, :name
-    end)
+    with_collection_check_boxes @user, :tag_ids, collection, :id, :name
 
     assert_select 'form label.collection_check_boxes[for=user_tag_ids_1]', 'Tag 1'
     assert_select 'form label.collection_check_boxes[for=user_tag_ids_2]', 'Tag 2'
   end
 
+  test 'collection check box handles camelized collection values for labels correctly' do
+    with_collection_check_boxes @user, :active, ['Yes', 'No'], :to_s, :to_s
+
+    assert_select 'form label.collection_check_boxes[for=user_active_yes]', 'Yes'
+    assert_select 'form label.collection_check_boxes[for=user_active_no]', 'No'
+  end
+
+  test 'colection check box should sanitize collection values for labels correctly' do
+    with_collection_check_boxes @user, :name, ['$0.99', '$1.99'], :to_s, :to_s
+    assert_select 'label.collection_check_boxes[for=user_name_099]', '$0.99'
+    assert_select 'label.collection_check_boxes[for=user_name_199]', '$1.99'
+  end
+
   test 'collection check box accepts selected values as :checked option' do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    concat(form_for(@user) do |f|
-      concat f.collection_check_boxes :tag_ids, collection, :first, :last, :checked => [1, 3]
-    end)
+    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]'
@@ -94,9 +164,7 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box accepts a single checked value' do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    concat(form_for(@user) do |f|
-      concat f.collection_check_boxes :tag_ids, collection, :first, :last, :checked => 3
-    end)
+    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]'
@@ -105,9 +173,7 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box accepts multiple disabled items' do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    concat(form_for(@user) do |f|
-      concat f.collection_check_boxes :tag_ids, collection, :first, :last, :disabled => [1, 3]
-    end)
+    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]'
@@ -116,9 +182,7 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box accepts single disable item' do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    concat(form_for(@user) do |f|
-      concat f.collection_check_boxes :tag_ids, collection, :first, :last, :disabled => 1
-    end)
+    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]'
@@ -127,9 +191,7 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box accepts a proc to disabled items' do
     collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    concat(form_for(@user) do |f|
-      concat f.collection_check_boxes :tag_ids, collection, :first, :last, :disabled => proc { |i| i.first == 1 }
-    end)
+    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]'
@@ -138,9 +200,7 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box accepts html options' do
     collection = [[1, 'Tag 1'], [2, 'Tag 2']]
-    concat(form_for(@user) do |f|
-      concat f.collection_check_boxes :tag_ids, collection, :first, :last, {}, :class => 'check'
-    end)
+    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]'
@@ -148,11 +208,11 @@ class BuilderTest < ActionView::TestCase
 
   test 'collection check box with fields for' do
     collection = [Tag.new(1, 'Tag 1'), Tag.new(2, 'Tag 2')]
-    concat(form_for(@user) do |f|
-      concat(f.fields_for(:post) do |p|
-        concat p.collection_check_boxes :tag_ids, collection, :id, :name
-      end)
-    end)
+    with_concat_form_for(@user) do |f|
+      f.fields_for(:post) do |p|
+        p.collection_check_boxes :tag_ids, collection, :id, :name
+      end
+    end
 
     assert_select 'form input#user_post_tag_ids_1[type=checkbox][value=1]'
     assert_select 'form input#user_post_tag_ids_2[type=checkbox][value=2]'
@@ -161,12 +221,56 @@ class BuilderTest < ActionView::TestCase
     assert_select 'form label.collection_check_boxes[for=user_post_tag_ids_2]', 'Tag 2'
   end
 
+  test 'collection check box wraps the collection in the configured collection wrapper tag' do
+    swap SimpleForm, :collection_wrapper_tag => :ul do
+      with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s
+
+      assert_select 'form ul input[type=checkbox][value=true]#user_active_true'
+      assert_select 'form ul input[type=checkbox][value=false]#user_active_false'
+    end
+  end
+
+  test 'collection check box wraps the collection in the given collection wrapper tag' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => :ul
+
+    assert_select 'form ul input[type=checkbox][value=true]#user_active_true'
+    assert_select 'form ul input[type=checkbox][value=false]#user_active_false'
+  end
+
+  test 'collection check box does not wrap the collection by default' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s
+
+    assert_no_select 'form ul'
+  end
+
+  test 'collection check box wraps each label/radio in the configured item wrapper tag' do
+    swap SimpleForm, :item_wrapper_tag => :li do
+      with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s
+
+      assert_select 'form li input[type=checkbox][value=true]#user_active_true'
+      assert_select 'form li input[type=checkbox][value=false]#user_active_false'
+    end
+  end
+
+  test 'collection check box wraps each label/radio in the given item wrapper tag' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, :item_wrapper_tag => :li
+
+    assert_select 'form li input[type=checkbox][value=true]#user_active_true'
+    assert_select 'form li input[type=checkbox][value=false]#user_active_false'
+  end
+
+  test 'collection check box does not wrap items by default' do
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s
+
+    assert_no_select 'form li'
+  end
+
   # SIMPLE FIELDS
   test 'simple fields for is available and yields an instance of FormBuilder' do
-    concat(form_for(@user) do |f|
-      concat(f.simple_fields_for(:posts) do |posts_form|
+    with_concat_form_for(@user) do |f|
+      f.simple_fields_for(:posts) do |posts_form|
         assert posts_form.instance_of?(SimpleForm::FormBuilder)
-      end)
-    end)
+      end
+    end
   end
 end