simple_form 2.0.4 → 2.1.0

data/test/action_view_extensions/form_helper_test.rb

@@ -69,6 +69,11 @@ class FormHelperTest < ActionView::TestCase
     assert_select 'form.simple_form.edit_superuser'
   end
 
+  test 'SimpleForm should add last object name as css class to form when there is array of objects' do
+    with_concat_form_for([Company.new, @user])
+    assert_select 'form.simple_form.edit_user'
+  end
+
   test 'SimpleForm should not add object class to form if css_class is specified' do
     with_concat_form_for(:user, :html => {:class => nil})
     assert_no_select 'form.user'

data/test/components/label_test.rb

@@ -38,7 +38,7 @@ class IsolatedLabelTest < ActionView::TestCase
     @controller.action_name = "new"
     store_translations(:en, :simple_form => { :labels => { :user => {
       :new => { :description => 'Nova descrição' }
-    } } } ) do
+    } } }) do
       with_label_for @user, :description, :text
       assert_select 'label[for=user_description]', /Nova descrição/
     end
@@ -48,7 +48,7 @@ class IsolatedLabelTest < ActionView::TestCase
     @controller.action_name = "create"
     store_translations(:en, :simple_form => { :labels => { :user => {
       :new => { :description => 'Nova descrição' }
-    } } } ) do
+    } } }) do
       with_label_for @user, :description, :text
       assert_select 'label[for=user_description]', /Nova descrição/
     end
@@ -66,43 +66,53 @@ class IsolatedLabelTest < ActionView::TestCase
   test 'label should use i18n based on model and attribute to lookup translation' do
     store_translations(:en, :simple_form => { :labels => { :user => {
       :description => 'Descrição'
-    } } } ) do
+    } } }) do
       with_label_for @user, :description, :text
       assert_select 'label[for=user_description]', /Descrição/
     end
   end
 
-  test 'input should use i18n under defaults to lookup translation' do
-    store_translations(:en, :simple_form => { :labels => { :defaults => {:age => 'Idade'} } } ) do
+  test 'label should use i18n under defaults to lookup translation' do
+    store_translations(:en, :simple_form => { :labels => { :defaults => { :age => 'Idade' } } }) do
       with_label_for @user, :age, :integer
       assert_select 'label[for=user_age]', /Idade/
     end
   end
 
-  test 'input should not use i18n label if translate is false' do
+  test 'label should not use i18n label if translate is false' do
     swap SimpleForm, :translate_labels => false do
-      store_translations(:en, :simple_form => { :labels => { :defaults => {:age => 'Idade'} } } ) do
+      store_translations(:en, :simple_form => { :labels => { :defaults => { :age => 'Idade' } } }) do
         with_label_for @user, :age, :integer
         assert_select 'label[for=user_age]', /Age/
       end
     end
   end
 
-  test 'label should use i18n with lookup for association name' do
+  test 'label uses i18n with lookup for association name' do
     store_translations(:en, :simple_form => { :labels => {
       :user => { :company => 'My company!' }
-    } } ) do
+    } }) do
       with_label_for @user, :company_id, :string, :setup_association => true
       assert_select 'label[for=user_company_id]', /My company!/
     end
   end
 
+  test 'label uses i18n under defaults namespace to lookup for association name' do
+    store_translations(:en, :simple_form => { :labels => {
+      :defaults => { :company => 'Plataformatec' }
+    } }) do
+      with_label_for @user, :company, :string, :setup_association => true
+
+      assert_select 'form label', /Plataformatec/
+    end
+  end
+
   test 'label should do correct i18n lookup for nested models with nested translation' do
     @user.company = Company.new(1, 'Empresa')
 
     store_translations(:en, :simple_form => { :labels => {
       :user => { :name => 'Usuario', :company => { :name => 'Nome da empresa' } }
-    } } ) do
+    } }) do
       with_concat_form_for @user do |f|
         concat f.input :name
         concat(f.simple_fields_for(:company) do |company_form|
@@ -121,7 +131,7 @@ class IsolatedLabelTest < ActionView::TestCase
     store_translations(:en, :simple_form => { :labels => {
       :user    => { :name => 'Usuario' },
       :company => { :name => 'Nome da empresa' }
-    } } ) do
+    } }) do
       with_concat_form_for @user do |f|
         concat f.input :name
         concat(f.simple_fields_for(:company) do |company_form|
@@ -140,7 +150,7 @@ class IsolatedLabelTest < ActionView::TestCase
     store_translations(:en, :simple_form => { :labels => {
       :user => { :name => 'Usuario' },
       :tags => { :name => 'Nome da empresa' }
-    } } ) do
+    } }) do
       with_concat_form_for @user do |f|
         concat f.input :name
         concat(f.simple_fields_for(:tags, :child_index => "new_index") do |tags_form|
@@ -232,21 +242,21 @@ class IsolatedLabelTest < ActionView::TestCase
   end
 
   test 'label should use i18n to find required text' do
-    store_translations(:en, :simple_form => { :required => { :text => 'campo requerido' }}) do
+    store_translations(:en, :simple_form => { :required => { :text => 'campo requerido' } }) do
       with_label_for @user, :name, :string
       assert_select 'form label abbr[title=campo requerido]', '*'
     end
   end
 
   test 'label should use i18n to find required mark' do
-    store_translations(:en, :simple_form => { :required => { :mark => '*-*' }}) do
+    store_translations(:en, :simple_form => { :required => { :mark => '*-*' } }) do
       with_label_for @user, :name, :string
       assert_select 'form label abbr', '*-*'
     end
   end
 
   test 'label should use i18n to find required string tag' do
-    store_translations(:en, :simple_form => { :required => { :html => '<span class="required" title="requerido">*</span>' }}) do
+    store_translations(:en, :simple_form => { :required => { :html => '<span class="required" title="requerido">*</span>' } }) do
       with_label_for @user, :name, :string
       assert_no_select 'form label abbr'
       assert_select 'form label span.required[title=requerido]', '*'
@@ -264,7 +274,7 @@ class IsolatedLabelTest < ActionView::TestCase
   end
 
   test 'label should allow overwriting of for attribute with input_html not containing id' do
-    with_label_for @user, :name, :string, :label_html => { :for => 'my_new_id' }, :input_html => {:class => 'foo'}
+    with_label_for @user, :name, :string, :label_html => { :for => 'my_new_id' }, :input_html => { :class => 'foo' }
     assert_select 'label[for=my_new_id]'
   end
 
@@ -286,7 +296,7 @@ class IsolatedLabelTest < ActionView::TestCase
   test 'label should use i18n properly when object is not present' do
     store_translations(:en, :simple_form => { :labels => {
       :project => { :name => 'Nome' }
-    } } ) do
+    } }) do
       with_label_for :project, :name, :string
       assert_select 'label[for=project_name]', /Nome/
     end

data/test/form_builder/association_test.rb

@@ -43,6 +43,7 @@ class AssociationTest < ActionView::TestCase
   test 'builder preloads collection association' do
     value = @user.tags = Object.new
     value.expects(:to_a).returns(value)
+
     with_association_for @user, :tags
     assert_select 'form select.select#user_tag_ids'
     assert_select 'form select option[value=1]', 'Tag 1'
@@ -51,19 +52,21 @@ class AssociationTest < ActionView::TestCase
   end
 
   test 'builder does not preload collection association if preload is false' do
-    value = @user.company = Object.new
+    value = @user.tags = Object.new
     value.expects(:to_a).never
-    with_association_for @user, :company, :preload => false
-    assert_select 'form select.select#user_company_id'
-    assert_select 'form select option[value=1]', 'Company 1'
-    assert_select 'form select option[value=2]', 'Company 2'
-    assert_select 'form select option[value=3]', 'Company 3'
+
+    with_association_for @user, :tags, :preload => false
+    assert_select 'form select.select#user_tag_ids'
+    assert_select 'form select option[value=1]', 'Tag 1'
+    assert_select 'form select option[value=2]', 'Tag 2'
+    assert_select 'form select option[value=3]', 'Tag 3'
   end
 
   test 'builder does not preload non-collection association' do
     value = @user.company = Object.new
     value.expects(:to_a).never
-    with_association_for @user, :company, :preload => false
+
+    with_association_for @user, :company
     assert_select 'form select.select#user_company_id'
     assert_select 'form select option[value=1]', 'Company 1'
     assert_select 'form select option[value=2]', 'Company 2'

data/test/form_builder/general_test.rb

@@ -237,6 +237,11 @@ class FormBuilderTest < ActionView::TestCase
     assert_no_select 'form label'
   end
 
+  test 'builder should be able to disable the label for an input and return a html safe string' do
+    with_form_for @user, :name, :label => false, :wrapper => custom_wrapper_with_wrapped_label_input
+    assert_select 'form input#user_name'
+  end
+
   test 'builder should use custom label' do
     with_form_for @user, :name, :label => 'Yay!'
     assert_select 'form label', /Yay!/
@@ -259,6 +264,8 @@ class FormBuilderTest < ActionView::TestCase
 
   test 'builder should be able to disable a hint even if it exists in i18n' do
     store_translations(:en, :simple_form => { :hints => { :name => 'Hint test' } }) do
+      SimpleForm::Inputs::Base.any_instance.expects(:hint).never
+
       with_form_for @user, :name, :hint => false
       assert_no_select 'span.hint'
     end
@@ -299,49 +306,65 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   # DEFAULT OPTIONS
-  test 'builder should receive a default argument and pass it to the inputs' do
-    with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class' } } do |f|
-      f.input :name
+  [:input, :input_field].each do |method|
+    test "builder should receive a default argument and pass it to the inputs when calling '#{method}'" do
+      with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class' } } do |f|
+        f.send(method, :name)
+      end
+      assert_select 'input.default_class'
+    end
+
+    test "builder should receive a default argument and pass it to the inputs without changing the defaults when calling '#{method}'" do
+      with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class', :id => 'default_id' } } do |f|
+        concat(f.send(method, :name))
+        concat(f.send(method, :credit_limit))
+      end
+
+      assert_select "input.string.default_class[name='user[name]']"
+      assert_no_select "input.string[name='user[credit_limit]']"
+    end
+
+    test "builder should receive a default argument and pass it to the inputs and nested form when calling '#{method}'" do
+      @user.company = Company.new(1, 'Empresa')
+
+      with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class' } } do |f|
+        concat(f.send(method, :name))
+        concat(f.simple_fields_for(:company) do |company_form|
+          concat(company_form.send(method, :name))
+        end)
+      end
+
+      assert_select "input.string.default_class[name='user[name]']"
+      assert_select "input.string.default_class[name='user[company_attributes][name]']"
     end
-    assert_select 'input.default_class'
   end
 
-  test 'builder should receive a default argument and pass it to the inputs, respecting the specific options' do
+  test "builder should receive a default argument and pass it to the inputs when calling 'input', respecting the specific options" do
     with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class' } } do |f|
       f.input :name, :input_html => { :id => 'specific_id' }
     end
     assert_select 'input.default_class#specific_id'
   end
 
-  test 'builder should receive a default argument and pass it to the inputs, overwriting the defaults with specific options' do
-    with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class', :id => 'default_id' } } do |f|
-      f.input :name, :input_html => { :id => 'specific_id' }
+  test "builder should receive a default argument and pass it to the inputs when calling 'input_field', respecting the specific options" do
+    with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class' } } do |f|
+      f.input_field :name, :id => 'specific_id'
     end
     assert_select 'input.default_class#specific_id'
   end
 
-  test 'builder should receive a default argument and pass it to the inputs without changing the defaults' do
+  test "builder should receive a default argument and pass it to the inputs when calling 'input', overwriting the defaults with specific options" do
     with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class', :id => 'default_id' } } do |f|
-      concat(f.input :name)
-      concat(f.input :credit_limit)
+      f.input :name, :input_html => { :id => 'specific_id' }
     end
-
-    assert_select "input.string.default_class[name='user[name]']"
-    assert_no_select "input.string[name='user[credit_limit]']"
+    assert_select 'input.default_class#specific_id'
   end
 
-  test 'builder should receive a default argument and pass it to the inputs and nested form' do
-    @user.company = Company.new(1, 'Empresa')
-
-    with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class' } } do |f|
-      concat(f.input :name)
-      concat(f.simple_fields_for(:company) do |company_form|
-        concat(company_form.input :name)
-      end)
+  test "builder should receive a default argument and pass it to the inputs when calling 'input_field', overwriting the defaults with specific options" do
+    with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class', :id => 'default_id' } } do |f|
+      f.input_field :name, :id => 'specific_id'
     end
-
-    assert_select "input.string.default_class[name='user[name]']"
-    assert_select "input.string.default_class[name='user[company_attributes][name]']"
+    assert_select 'input.default_class#specific_id'
   end
 
   # WITHOUT OBJECT

data/test/form_builder/input_field_test.rb

@@ -50,6 +50,51 @@ class InputFieldTest < ActionView::TestCase
     assert_no_select 'input.integer[as]'
   end
 
+  test 'builder input_field should use i18n to translate placeholder text' do
+    store_translations(:en, :simple_form => { :placeholders => { :user => {
+      :name => 'Name goes here'
+    } } }) do
+
+      with_concat_form_for(@user) do |f|
+        f.input_field :name
+      end
+
+      assert_select 'input.string[placeholder=Name goes here]'
+    end
+  end
+
+  test 'builder input_field should use min_max component' do
+    with_concat_form_for(@other_validating_user) do |f|
+      f.input_field :age, :as => :integer
+    end
+
+    assert_select 'input[min=18]'
+  end
+
+  test 'builder input_field should use pattern component' do
+    with_concat_form_for(@other_validating_user) do |f|
+      f.input_field :country, :as => :string
+    end
+
+    assert_select 'input[pattern="\w+"]'
+  end
+
+  test 'builder input_field should use readonly component' do
+    with_concat_form_for(@other_validating_user) do |f|
+      f.input_field :age, :as => :integer, :readonly => true
+    end
+
+    assert_select 'input.integer.readonly[readonly]'
+  end
+
+  test 'builder input_field should use maxlength component' do
+    with_concat_form_for(@validating_user) do |f|
+      f.input_field :name, :as => :string
+    end
+
+    assert_select 'input.string[maxlength=25]'
+  end
+
   test 'builder collection input_field should generate input tag with a clean HTML' do
     with_concat_form_for(@user) do |f|
       f.input_field :status, :collection => ['Open', 'Closed'], :class => 'status', :label_method => :to_s, :value_method => :to_s

data/test/form_builder/wrapper_test.rb

@@ -11,6 +11,27 @@ class WrapperTest < ActionView::TestCase
     assert_no_select 'div.field_with_errors'
   end
 
+  test 'wrapper should add the attribute name class' do
+    with_form_for @user, :name
+    assert_select 'div.user_name'
+  end
+
+  test 'wrapper should add the attribute name class for nested forms' do
+    @user.company = Company.new(1, 'Empresa')
+    with_concat_form_for @user do |f|
+      concat(f.simple_fields_for(:company) do |company_form|
+        concat(company_form.input :name)
+      end)
+    end
+
+    assert_select 'div.user_company_name'
+  end
+
+  test 'wrapper should add the association name class' do
+    with_form_for @user, :company
+    assert_select 'div.user_company'
+  end
+
   test 'wrapper should add error class for attribute with errors' do
     with_form_for @user, :name
     assert_select 'div.field_with_errors'
@@ -72,6 +93,7 @@ class WrapperTest < ActionView::TestCase
       assert_select 'form div.wrapper'
       assert_no_select 'div.required'
       assert_no_select 'div.string'
+      assert_no_select 'div.user_name'
     end
   end
 

data/test/generators/simple_form_generator_test.rb

@@ -25,6 +25,14 @@ class SimpleFormGeneratorTest < Rails::Generators::TestCase
       /config\.default_wrapper = :bootstrap/
   end
 
+  test 'generates the simple_form initializer with the foundation wrappers' do
+    run_generator %w(--foundation)
+    assert_file 'config/initializers/simple_form.rb',
+      /config\.default_wrapper = :default/, /config\.boolean_style = :nested/
+    assert_file 'config/initializers/simple_form_foundation.rb', /config\.wrappers :foundation/,
+      /config\.default_wrapper = :foundation/
+  end
+
   %W(erb haml slim).each do |engine|
     test "generates the scaffold template when using #{engine}" do
       run_generator ['-e', engine]

data/test/inputs/datetime_input_test.rb

@@ -91,9 +91,9 @@ class DateTimeInputTest < ActionView::TestCase
     assert_select 'label[for=project_created_at_4i]'
   end
 
-  test 'date time input should not generate invalid required html attribute' do
+  test 'date time input should generate required html attribute' do
     with_input_for @user, :delivery_time, :time, :required => true
     assert_select 'select.required'
-    assert_no_select 'select[required]'
+    assert_select 'select[required]'
   end
 end

data/test/inputs/grouped_collection_select_input_test.rb

@@ -94,6 +94,21 @@ class GroupedCollectionSelectInputTest < ActionView::TestCase
     end
   end
 
+  test 'grouped collection should allow overriding label and value methods using a lambda' do
+    with_input_for @user, :tag_ids, :grouped_select,
+      :collection => { 'Authors' => ['Jose', 'Carlos'] },
+      :group_method => :last,
+      :label_method => lambda { |i| i.upcase },
+      :value_method => lambda { |i| i.downcase }
+
+    assert_select 'select.grouped_select#user_tag_ids' do
+      assert_select 'optgroup[label=Authors]' do
+        assert_select 'option[value=jose]', 'JOSE'
+        assert_select 'option[value=carlos]', 'CARLOS'
+      end
+    end
+  end
+
   test 'grouped collection with associations' do
     tag_groups = [
       TagGroup.new(1, "Group of Tags", [Tag.new(1, "Tag 1"), Tag.new(2, "Tag 2")]),

data/test/support/misc_helpers.rb

@@ -84,6 +84,12 @@ module MiscHelpers
     end
   end
 
+  def custom_wrapper_with_wrapped_label_input
+    SimpleForm.build :tag => :section, :class => "custom_wrapper", :pattern => false do |b|
+      b.use :label_input, :wrap_with => { :tag => :div, :class => :field }
+    end
+  end
+
   def custom_form_for(object, *args, &block)
     simple_form_for(object, *(args << { :builder => CustomFormBuilder }), &block)
   end