simple_form 1.4.2 → 1.5.0

data/test/action_view_extensions/form_helper_test.rb

@@ -47,6 +47,16 @@ class FormHelperTest < ActionView::TestCase
     assert_select 'form.simple_form.user'
   end
 
+  test 'simple form should not add object class to form if css_class is specified' do
+    concat(simple_form_for(:user, :html => {:class => nil}) do |f| end)
+    assert_no_select 'form.user'
+  end
+
+  test 'simple form should add custom class to form if css_class is specified' do
+    concat(simple_form_for(:user, :html => {:class => 'my_class'}) do |f| end)
+    assert_select 'form.my_class'
+  end
+
   test 'pass options to simple form' do
     concat(simple_form_for(:user, :url => '/account', :html => { :id => 'my_form' }) do |f| end)
     assert_select 'form#my_form'
@@ -58,4 +68,15 @@ class FormHelperTest < ActionView::TestCase
       assert f.instance_of?(SimpleForm::FormBuilder)
     end)
   end
+
+  test 'fields for with a hash like model yeilds an instance of FormBuilder' do
+    @hash_backed_author = HashBackedAuthor.new
+
+    concat(simple_fields_for(:author, @hash_backed_author) do |f|
+      assert f.instance_of?(SimpleForm::FormBuilder)
+      f.input :name
+    end)
+
+    assert_select "input[name='author[name]'][value='hash backed author']"
+  end
 end

data/test/discovery_inputs.rb

@@ -14,8 +14,8 @@ class CustomizedInput < SimpleForm::Inputs::StringInput
   def input
     "<section>#{super}</section>".html_safe
   end
-  
+
   def input_method
     :text_field
   end
-end
+end

data/test/form_builder_test.rb

@@ -338,6 +338,8 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'input.optional#user_name'
   end
 
+  # VALIDATORS :if :unless
+
   test 'builder input should not be required when ActiveModel::Validations is included and if option is present' do
     with_form_for @validating_user, :age
     assert_no_select 'input.required'
@@ -352,7 +354,53 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'input.optional#validating_user_amount'
   end
 
+  # VALIDATORS :on
+
+  test 'builder input should be required when validation is on create and is not persisted' do
+    @validating_user.new_record!
+    with_form_for @validating_user, :action
+    assert_select 'input.required'
+    assert_select 'input[required]'
+    assert_select 'input.required[required]#validating_user_action'
+  end
+
+  test 'builder input should not be required when validation is on create and is persisted' do
+    with_form_for @validating_user, :action
+    assert_no_select 'input.required'
+    assert_no_select 'input[required]'
+    assert_select 'input.optional#validating_user_action'
+  end
+
+  test 'builder input should be required when validation is on save' do
+    with_form_for @validating_user, :credit_limit
+    assert_select 'input.required'
+    assert_select 'input[required]'
+    assert_select 'input.required[required]#validating_user_credit_limit'
+
+    @validating_user.new_record!
+    with_form_for @validating_user, :credit_limit
+    assert_select 'input.required'
+    assert_select 'input[required]'
+    assert_select 'input.required[required]#validating_user_credit_limit'
+  end
+
+  test 'builder input should be required when validation is on update and is persisted' do
+    with_form_for @validating_user, :phone_number
+    assert_select 'input.required'
+    assert_select 'input[required]'
+    assert_select 'input.required[required]#validating_user_phone_number'
+  end
+
+  test 'builder input should not be required when validation is on update and is not persisted' do
+    @validating_user.new_record!
+    with_form_for @validating_user, :phone_number
+    assert_no_select 'input.required'
+    assert_no_select 'input[required]'
+    assert_select 'input.optional#validating_user_phone_number'
+  end
+
   # WRAPPERS
+
   test 'builder support wrapping around an specific tag' do
     swap SimpleForm, :wrapper_tag => :p do
       with_form_for @user, :name
@@ -361,6 +409,12 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
+  test 'builder support no wrapping when wrapper is false' do
+    with_form_for @user, :name, :wrapper => false
+    assert_select 'form > label[for=user_name]'
+    assert_select 'form > input#user_name.string'
+  end
+
   test 'builder wrapping tag adds default css classes' do
     swap SimpleForm, :wrapper_tag => :p do
       with_form_for @user, :name

data/test/inputs_test.rb

@@ -141,9 +141,9 @@ class InputTest < ActionView::TestCase
     assert_select "input#user_password.password[type=password][name='user[password]']"
   end
 
-  test 'input should use default text size for decimal attributes' do
+  test 'input should not use size attribute for decimal attributes' do
     with_input_for @user, :credit_limit, :decimal
-    assert_select 'input.decimal[size=50]'
+    assert_no_select 'input.decimal[size]'
   end
 
   test 'input should get maxlength from column definition for string attributes' do
@@ -151,6 +151,11 @@ class InputTest < ActionView::TestCase
     assert_select 'input.string[maxlength=100]'
   end
 
+  test 'input should not get maxlength from column without size definition for string attributes' do
+    with_input_for @user, :action, :string
+    assert_no_select 'input.string[maxlength]'
+  end
+
   test 'input should get size from column definition for string attributes respecting maximum value' do
     with_input_for @user, :name, :string
     assert_select 'input.string[size=50]'
@@ -166,6 +171,11 @@ class InputTest < ActionView::TestCase
     assert_select 'input.password[type=password][maxlength=100]'
   end
 
+  test 'input should infer maxlength column definition from validation when present' do
+    with_input_for @validating_user, :name, :string
+    assert_select 'input.string[maxlength=25]'
+  end
+
   test 'when not using HTML5, does not show maxlength attribute' do
     swap SimpleForm, :html5 => false do
       with_input_for @user, :password, :password
@@ -173,6 +183,13 @@ class InputTest < ActionView::TestCase
     end
   end
 
+  test 'when not using HTML5, does not show maxlength attribute with validating lenght attribute' do
+    swap SimpleForm, :html5 => false do
+      with_input_for @validating_user, :name, :string
+      assert_no_select 'input.string[maxlength]'
+    end
+  end
+
   test 'input should not generate placeholder by default' do
     with_input_for @user, :name, :string
     assert_no_select 'input[placeholder]'
@@ -212,6 +229,22 @@ class InputTest < ActionView::TestCase
     end
   end
 
+  test 'input should infer pattern from attributes when pattern is true' do
+    with_input_for @other_validating_user, :country, :string, :pattern => true
+    assert_select 'input[pattern="\w+"]'
+  end
+
+  test 'input should use given pattern from attributes' do
+    with_input_for @other_validating_user, :country, :string, :pattern => "\\d+"
+    assert_select 'input[pattern="\d+"]'
+  end
+
+  test 'input should fail if pattern is true but no pattern exists' do
+    assert_raise RuntimeError do
+      with_input_for @other_validating_user, :name, :string, :pattern => true
+    end
+  end
+
   # NumericInput
   test 'input should generate an integer text field for integer attributes ' do
     with_input_for @user, :age, :integer
@@ -345,16 +378,28 @@ class InputTest < ActionView::TestCase
     end
   end
 
+  [:integer, :float, :decimal].each do |type|
+    test "#{type} input should infer min value from attributes with greater than or equal validation" do
+      with_input_for @validating_user, :age, type
+      assert_select 'input[min=18]'
+    end
+
+    test "#{type} input should infer the max value from attributes with less than or equal to validation" do
+      with_input_for @validating_user, :age, type
+      assert_select 'input[max=99]'
+    end
+  end
+
   # Numeric input but HTML5 disabled
-  test ' when not using HTML5 input should not generate field with type number and use text instead' do
+  test 'when not using HTML5 input should not generate field with type number and use text instead' do
     swap SimpleForm, :html5 => false do
       with_input_for @user, :age, :integer
       assert_no_select "input[type=number]"
-      assert_no_select "input#user_age[text]"
+      assert_select "input#user_age[type=text]"
     end
   end
 
-  test 'when not using HTML5 input should not use min or max or step attributes' do
+  test 'when not using HTML5 input should not use min or max or step attributes for numeric type' do
     swap SimpleForm, :html5 => false do
       with_input_for @validating_user, :age, :integer
       assert_no_select "input[min]"
@@ -363,15 +408,63 @@ class InputTest < ActionView::TestCase
     end
   end
 
-  [:integer, :float, :decimal].each do |type|
-    test "#{type} input should infer min value from attributes with greater than or equal validation" do
-      with_input_for @validating_user, :age, type
-      assert_select 'input[min=18]'
+  # RangeInput
+  test 'range input generates a input type range, based on numeric input' do
+    with_input_for @user, :age, :range
+    assert_select "input#user_age.range[type=range]"
+  end
+
+  test 'range input does not generate placeholder' do
+    with_input_for @user, :age, :range, :placeholder => "Select your age"
+    assert_select "input[type=range]"
+    assert_no_select "input[placeholder]"
+  end
+
+  test 'range input allows givin min and max attributes' do
+    with_input_for @user, :age, :range, :input_html => { :min => 10, :max => 50 }
+    assert_select "input[type=range][min=10][max=50]"
+  end
+
+  test 'range input infers min and max attributes from validations' do
+    with_input_for @validating_user, :age, :range
+    assert_select "input[type=range][min=18][max=99]"
+  end
+
+  test 'range input add default step attribute' do
+    with_input_for @validating_user, :age, :range
+    assert_select "input[type=range][step=1]"
+  end
+
+  test 'range input allows givin a step through input html options' do
+    with_input_for @validating_user, :age, :range, :input_html => { :step => 2 }
+    assert_select "input[type=range][step=2]"
+  end
+
+  test 'range input should not generate min attribute by default' do
+    with_input_for @user, :age, :range
+    assert_no_select 'input[min]'
+  end
+
+  test 'range input should not generate max attribute by default' do
+    with_input_for @user, :age, :range
+    assert_no_select 'input[max]'
+  end
+
+  # RangeInput iwth HTML5 disabled
+  test 'when not using HTML5, range input does not generate field with range type, and use text instead' do
+    swap SimpleForm, :html5 => false do
+      with_input_for @user, :age, :range
+      assert_no_select "input[type=number]"
+      assert_select "input[type=text]"
     end
+  end
 
-    test "#{type} input should infer the max value from attributes with less than or equal to validation" do
-      with_input_for @validating_user, :age, type
-      assert_select 'input[max=99]'
+  test 'when not using HTML5, range input should not use min or max or step attributes' do
+    swap SimpleForm, :html5 => false do
+      with_input_for @validating_user, :age, :range
+      assert_no_select "input[min]"
+      assert_no_select "input[max]"
+      assert_no_select "input[step]"
     end
   end
 
@@ -393,6 +486,30 @@ class InputTest < ActionView::TestCase
     assert_select 'textarea.text[placeholder=Put in some text]'
   end
 
+  test 'input should get maxlength from column definition for text attributes' do
+    with_input_for @user, :description, :text
+    assert_select 'textarea.text[maxlength=200]'
+  end
+
+  test 'input should infer maxlength column definition from validation when present for text attributes' do
+    with_input_for @validating_user, :description, :text
+    assert_select 'textarea.text[maxlength=50]'
+  end
+
+  test 'when not using HTML5, does not show maxlength attribute for text attributes' do
+    swap SimpleForm, :html5 => false do
+      with_input_for @user, :description, :text
+      assert_no_select 'textarea.text[maxlength]'
+    end
+  end
+
+  test 'when not using HTML5, does not show maxlength attribute with validating lenght text attribute' do
+    swap SimpleForm, :html5 => false do
+      with_input_for @validating_user, :name, :string
+      assert_no_select 'input.string[maxlength]'
+    end
+  end
+
   test 'input should generate a file field' do
     with_input_for @user, :name, :file
     assert_select 'input#user_name[type=file]'
@@ -403,14 +520,6 @@ class InputTest < ActionView::TestCase
     assert_no_select 'input[placeholder]'
   end
 
-  test 'mapping input should generate an error if type is not found' do
-    with_concat_form_for(@user) do |f|
-      assert_raise(RuntimeError, "Could not find method for nil") do
-        SimpleForm::Inputs::MappingInput.new(f, "unknown", nil, nil, {}).input
-      end
-    end
-  end
-
   # HiddenInput
   test 'input should generate a hidden field' do
     with_input_for @user, :name, :hidden
@@ -674,6 +783,62 @@ class InputTest < ActionView::TestCase
     assert_select 'select option[value=2]', 'Carlos'
   end
 
+  test 'input should disable the anothers components when the option is a object' do
+    with_input_for @user, :description, :select, :collection => ["Jose", "Carlos"], :disabled => true
+    assert_no_select 'select option[value=Jose][disabled=disabled]', 'Jose'
+    assert_no_select 'select option[value=Carlos][disabled=disabled]', 'Carlos'
+    assert_select 'select[disabled=disabled]'
+    assert_select 'div.disabled'
+  end
+
+  test 'input should not disable the anothers components when the option is a object' do
+    with_input_for @user, :description, :select, :collection => ["Jose", "Carlos"], :disabled => 'Jose'
+    assert_select 'select option[value=Jose][disabled=disabled]', 'Jose'
+    assert_no_select 'select option[value=Carlos][disabled=disabled]', 'Carlos'
+    assert_no_select 'select[disabled=disabled]'
+    assert_no_select 'div.disabled'
+  end
+
+  test 'input should allow disabled options with a lambda for collection select' do
+    with_input_for @user, :name, :select, :collection => ["Carlos", "Antonio"],
+      :disabled => lambda { |x| x == "Carlos" }
+    assert_select 'select option[value=Carlos][disabled=disabled]', 'Carlos'
+    assert_select 'select option[value=Antonio]', 'Antonio'
+    assert_no_select 'select option[value=Antonio][disabled]'
+  end
+
+  test 'input should allow disabled and label method with lambdas for collection select' do
+    with_input_for @user, :name, :select, :collection => ["Carlos", "Antonio"],
+      :disabled => lambda { |x| x == "Carlos" }, :label_method => lambda { |x| x.upcase }
+    assert_select 'select option[value=Carlos][disabled=disabled]', 'CARLOS'
+    assert_select 'select option[value=Antonio]', 'ANTONIO'
+    assert_no_select 'select option[value=Antonio][disabled]'
+  end
+
+  test 'input should allow a non lambda disabled option with lambda label method for collections' do
+    with_input_for @user, :name, :select, :collection => ["Carlos", "Antonio"],
+      :disabled => "Carlos", :label_method => lambda { |x| x.upcase }
+    assert_select 'select option[value=Carlos][disabled=disabled]', 'CARLOS'
+    assert_select 'select option[value=Antonio]', 'ANTONIO'
+    assert_no_select 'select option[value=Antonio][disabled]'
+  end
+
+  test 'input should allow selected and label method with lambdas for collection select' do
+    with_input_for @user, :name, :select, :collection => ["Carlos", "Antonio"],
+      :selected => lambda { |x| x == "Carlos" }, :label_method => lambda { |x| x.upcase }
+    assert_select 'select option[value=Carlos][selected=selected]', 'CARLOS'
+    assert_select 'select option[value=Antonio]', 'ANTONIO'
+    assert_no_select 'select option[value=Antonio][selected]'
+  end
+
+  test 'input should allow a non lambda selected option with lambda label method for collection select' do
+    with_input_for @user, :name, :select, :collection => ["Carlos", "Antonio"],
+      :selected => "Carlos", :label_method => lambda { |x| x.upcase }
+    assert_select 'select option[value=Carlos][selected=selected]', 'CARLOS'
+    assert_select 'select option[value=Antonio]', 'ANTONIO'
+    assert_no_select 'select option[value=Antonio][selected]'
+  end
+
   test 'input should allow overriding collection for radio types' do
     with_input_for @user, :name, :radio, :collection => ['Jose', 'Carlos']
     assert_select 'input[type=radio][value=Jose]'

data/test/support/models.rb

@@ -42,7 +42,7 @@ class User
     :description, :created_at, :updated_at, :credit_limit, :password, :url,
     :delivery_time, :born_at, :special_company_id, :country, :tags, :tag_ids,
     :avatar, :home_picture, :email, :status, :residence_country, :phone_number,
-    :post_count, :lock_version, :amount, :attempts
+    :post_count, :lock_version, :amount, :attempts, :action
 
   def initialize(options={})
     options.each do |key, value|
@@ -67,7 +67,7 @@ class User
   def column_for_attribute(attribute)
     column_type, limit = case attribute.to_sym
       when :name, :status, :password then [:string, 100]
-      when :description   then :text
+      when :description   then [:text, 200]
       when :age           then :integer
       when :credit_limit  then [:decimal, 15]
       when :active        then :boolean
@@ -79,6 +79,7 @@ class User
       when :home_picture  then :string
       when :amount        then :integer
       when :attempts      then :integer
+      when :action        then :string
     end
     Column.new(attribute, column_type, limit)
   end
@@ -129,6 +130,11 @@ class ValidatingUser < User
   validates :company, :presence => true
   validates :age, :presence => true, :if => Proc.new { |user| user.name }
   validates :amount, :presence => true, :unless => Proc.new { |user| user.age }
+
+  validates :action,            :presence => true, :on => :create
+  validates :credit_limit,      :presence => true, :on => :save
+  validates :phone_number,      :presence => true, :on => :update
+
   validates_numericality_of :age,
     :greater_than_or_equal_to => 18,
     :less_than_or_equal_to => 99,
@@ -141,6 +147,8 @@ class ValidatingUser < User
     :greater_than_or_equal_to => :min_attempts,
     :less_than_or_equal_to => :max_attempts,
     :only_integer => true
+  validates_length_of :name, :maximum => 25
+  validates_length_of :description, :maximum => 50
 
   def min_amount
     10
@@ -173,4 +181,17 @@ class OtherValidatingUser < User
     :greater_than_or_equal_to => Proc.new { |user| user.age },
     :less_than_or_equal_to => Proc.new { |user| user.age + 100},
     :only_integer => true
+
+  validates_format_of :country, :with => /\w+/
+end
+
+class HashBackedAuthor < Hash
+  extend ActiveModel::Naming
+  include ActiveModel::Conversion
+
+  def persisted?; false; end
+
+  def name
+    'hash backed author'
+  end
 end