simple_form 2.0.0 → 2.1.0

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,16 @@ 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
+
+  test 'wrapper should not generate empty css class' do
+    swap SimpleForm, :generate_additional_classes_for => [:input, :label] do
+      swap_wrapper :default, custom_wrapper_without_class do
+        with_form_for @user, :name
+        assert_no_select 'div#custom_wrapper_without_class[class]'
+      end
     end
   end
 
@@ -99,16 +130,16 @@ class WrapperTest < ActionView::TestCase
 
   test 'custom wrappers on a form basis' do
     swap_wrapper :another do
-      concat simple_form_for(@user) { |f|
+      with_concat_form_for(@user) do |f|
         f.input :name
-      }
+      end
 
       assert_no_select "section.custom_wrapper div.another_wrapper label"
       assert_no_select "section.custom_wrapper div.another_wrapper input.string"
 
-      concat simple_form_for(@user, :wrapper => :another) { |f|
+      with_concat_form_for(@user, :wrapper => :another) do |f|
         f.input :name
-      }
+      end
 
       assert_select "section.custom_wrapper div.another_wrapper label"
       assert_select "section.custom_wrapper div.another_wrapper input.string"
@@ -141,9 +172,32 @@ class WrapperTest < ActionView::TestCase
     end
   end
 
+  test 'do not duplicate label classes for different inputs' do
+    swap_wrapper :default, self.custom_wrapper_with_label_html_option do
+      with_concat_form_for(@user) do |f|
+        concat f.input :name, :required => false
+        concat f.input :email, :as => :email, :required => true
+      end
+
+      assert_select "label.string.optional.extra-label-class[for='user_name']"
+      assert_select "label.email.required.extra-label-class[for='user_email']"
+      assert_no_select "label.string.optional.extra-label-class[for='user_email']"
+    end
+  end
+
   test 'raise error when wrapper not found' do
     assert_raise SimpleForm::WrapperNotFound do
       with_form_for @user, :name, :wrapper => :not_found
     end
   end
+
+  test 'use wrapper for specified in config mapping' do
+    swap_wrapper :another do
+      swap SimpleForm, :wrapper_mappings => { :string => :another } do
+        with_form_for @user, :name
+        assert_select "section.custom_wrapper div.another_wrapper label"
+        assert_select "section.custom_wrapper div.another_wrapper input.string"
+      end
+    end
+  end
 end

data/test/generators/simple_form_generator_test.rb

@@ -19,10 +19,20 @@ class SimpleFormGeneratorTest < Rails::Generators::TestCase
 
   test 'generates the simple_form initializer with the bootstrap wrappers' do
     run_generator %w(--bootstrap)
-    assert_file 'config/initializers/simple_form.rb', /config\.wrappers :bootstrap/,
+    assert_file 'config/initializers/simple_form.rb',
+      /config\.default_wrapper = :default/, /config\.boolean_style = :nested/
+    assert_file 'config/initializers/simple_form_bootstrap.rb', /config\.wrappers :bootstrap/,
       /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/boolean_input_test.rb

@@ -14,6 +14,24 @@ class BooleanInputTest < ActionView::TestCase
     assert_no_select 'label'
   end
 
+  test 'input uses custom checked value' do
+    @user.action = 'on'
+    with_input_for @user, :action, :boolean, :checked_value => 'on', :unchecked_value => 'off'
+    assert_select 'input[type=checkbox][value=on][checked=checked]'
+  end
+
+  test 'input uses custom unchecked value' do
+    @user.action = 'off'
+    with_input_for @user, :action, :boolean, :checked_value => 'on', :unchecked_value => 'off'
+    assert_select 'input[type=checkbox][value=on]'
+    assert_no_select 'input[checked=checked][value=on]'
+  end
+
+  test 'input generates hidden input with custom unchecked value' do
+    with_input_for @user, :action, :boolean, :checked_value => 'on', :unchecked_value => 'off'
+    assert_select 'input[type=hidden][value=off]'
+  end
+
   test 'input uses inline boolean style by default' do
     with_input_for @user, :active, :boolean
     assert_select 'input.boolean + label.boolean.optional'
@@ -29,6 +47,20 @@ class BooleanInputTest < ActionView::TestCase
     end
   end
 
+  test 'input boolean with nested allows :inline_label' do
+    swap SimpleForm, :boolean_style => :nested do
+      with_input_for @user, :active, :boolean, :label => false, :inline_label => 'I am so inline.'
+      assert_select 'label.checkbox', :text => 'I am so inline.'
+    end
+  end
+
+  test 'input boolean with nested style creates an inline label using the default label text when inline_label option set to true' do
+    swap SimpleForm, :boolean_style => :nested do
+      with_input_for @user, :active, :boolean, :label => false, :inline_label => true
+      assert_select 'label.checkbox', :text => 'Active'
+    end
+  end
+
   test 'input boolean with nested generates a manual hidden field for checkbox outside the label, to recreate Rails functionality with valid html5' do
     swap SimpleForm, :boolean_style => :nested do
       with_input_for @user, :active, :boolean
@@ -70,6 +102,13 @@ class BooleanInputTest < ActionView::TestCase
     end
   end
 
+  test 'input with nested style allows customizing input_html' do
+    swap SimpleForm, :boolean_style => :nested do
+      with_input_for @user, :active, :boolean, :input_html => { :name => 'active_user' }
+      assert_select "input[type=hidden][name=active_user] + label.boolean > input.boolean[name=active_user]"
+    end
+  end
+
   test 'input boolean works using :input only in wrapper config (no label_input)' do
     swap_wrapper do
       with_input_for @user, :active, :boolean

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/disabled_test.rb

@@ -1,38 +1,78 @@
 require 'test_helper'
 
 class DisabledTest < ActionView::TestCase
-  test 'input should generate disabled elements based on the disabled option' do
+  test 'string input should be disabled when disabled option is true' do
     with_input_for @user, :name, :string, :disabled => true
     assert_select 'input.string.disabled[disabled]'
+  end
+
+  test 'text input should be disabled when disabled option is true' do
     with_input_for @user, :description, :text, :disabled => true
     assert_select 'textarea.text.disabled[disabled]'
+  end
+
+  test 'numeric input should be disabled when disabled option is true' do
     with_input_for @user, :age, :integer, :disabled => true
     assert_select 'input.integer.disabled[disabled]'
+  end
+
+  test 'date input should be disabled when disabled option is true' do
     with_input_for @user, :born_at, :date, :disabled => true
     assert_select 'select.date.disabled[disabled]'
+  end
+
+  test 'datetime input should be disabled when disabled option is true' do
     with_input_for @user, :created_at, :datetime, :disabled => true
     assert_select 'select.datetime.disabled[disabled]'
+  end
 
+  test 'string input should not be disabled when disabled option is false' do
     with_input_for @user, :name, :string, :disabled => false
-    assert_select 'input.string:not(.disabled[disabled])'
+    assert_no_select 'input.string.disabled[disabled]'
+  end
+
+  test 'text input should not be disabled when disabled option is false' do
     with_input_for @user, :description, :text, :disabled => false
-    assert_select 'textarea.text:not(.disabled[disabled])'
+    assert_no_select 'textarea.text.disabled[disabled]'
+  end
+
+  test 'numeric input should not be disabled when disabled option is false' do
     with_input_for @user, :age, :integer, :disabled => false
-    assert_select 'input.integer:not(.disabled[disabled])'
+    assert_no_select 'input.integer.disabled[disabled]'
+  end
+
+  test 'date input should not be disabled when disabled option is false' do
     with_input_for @user, :born_at, :date, :disabled => false
-    assert_select 'select.date:not(.disabled[disabled])'
+    assert_no_select 'select.date.disabled[disabled]'
+  end
+
+  test 'datetime input should not be disabled when disabled option is false' do
     with_input_for @user, :created_at, :datetime, :disabled => false
-    assert_select 'select.datetime:not(.disabled[disabled])'
+    assert_no_select 'select.datetime.disabled[disabled]'
+  end
 
+  test 'string input should not be disabled when disabled option is not present' do
     with_input_for @user, :name, :string
-    assert_select 'input.string:not(.disabled[disabled])'
+    assert_no_select 'input.string.disabled[disabled]'
+  end
+
+  test 'text input should not be disabled when disabled option is not present' do
     with_input_for @user, :description, :text
-    assert_select 'textarea.text:not(.disabled[disabled])'
+    assert_no_select 'textarea.text.disabled[disabled]'
+  end
+
+  test 'numeric input should not be disabled when disabled option is not present' do
     with_input_for @user, :age, :integer
-    assert_select 'input.integer:not(.disabled[disabled])'
+    assert_no_select 'input.integer.disabled[disabled]'
+  end
+
+  test 'date input should not be disabled when disabled option is not present' do
     with_input_for @user, :born_at, :date
-    assert_select 'select.date:not(.disabled[disabled])'
+    assert_no_select 'select.date.disabled[disabled]'
+  end
+
+  test 'datetime input should not be disabled when disabled option is not present' do
     with_input_for @user, :created_at, :datetime
-    assert_select 'select.datetime:not(.disabled[disabled])'
+    assert_no_select 'select.datetime.disabled[disabled]'
   end
 end

data/test/inputs/discovery_test.rb

@@ -12,6 +12,7 @@ class DiscoveryTest < ActionView::TestCase
         Object.send :remove_const, :StringInput
         Object.send :remove_const, :NumericInput
         Object.send :remove_const, :CustomizedInput
+        Object.send :remove_const, :CollectionSelectInput
       end
     end
   end
@@ -58,4 +59,11 @@ class DiscoveryTest < ActionView::TestCase
       assert_select 'form section input#user_age.numeric.integer'
     end
   end
-end
+
+  test 'new inputs can override the input_html_options' do
+    discovery do
+      with_form_for @user, :active, :as => :select
+      assert_select 'form select#user_active.select.chosen'
+    end
+  end
+end

data/test/inputs/general_test.rb

@@ -15,39 +15,79 @@ class InputTest < ActionView::TestCase
     assert_select 'select.datetime'
   end
 
-  test 'input should generate autofocus attribute based on the autofocus option' do
+  test 'string input should generate autofocus attribute when autofocus option is true' do
     with_input_for @user, :name, :string, :autofocus => true
     assert_select 'input.string[autofocus]'
+  end
+
+  test 'text input should generate autofocus attribute when autofocus option is true' do
     with_input_for @user, :description, :text, :autofocus => true
     assert_select 'textarea.text[autofocus]'
+  end
+
+  test 'numeric input should generate autofocus attribute when autofocus option is true' do
     with_input_for @user, :age, :integer, :autofocus => true
     assert_select 'input.integer[autofocus]'
+  end
+
+  test 'date input should generate autofocus attribute when autofocus option is true' do
     with_input_for @user, :born_at, :date, :autofocus => true
     assert_select 'select.date[autofocus]'
+  end
+
+  test 'datetime input should generate autofocus attribute when autofocus option is true' do
     with_input_for @user, :created_at, :datetime, :autofocus => true
     assert_select 'select.datetime[autofocus]'
+  end
 
+  test 'string input should generate autofocus attribute when autofocus option is false' do
     with_input_for @user, :name, :string, :autofocus => false
-    assert_select 'input.string:not([autofocus])'
+    assert_no_select 'input.string[autofocus]'
+  end
+
+  test 'text input should generate autofocus attribute when autofocus option is false' do
     with_input_for @user, :description, :text, :autofocus => false
-    assert_select 'textarea.text:not([autofocus])'
+    assert_no_select 'textarea.text[autofocus]'
+  end
+
+  test 'numeric input should generate autofocus attribute when autofocus option is false' do
     with_input_for @user, :age, :integer, :autofocus => false
-    assert_select 'input.integer:not([autofocus])'
+    assert_no_select 'input.integer[autofocus]'
+  end
+
+  test 'date input should generate autofocus attribute when autofocus option is false' do
     with_input_for @user, :born_at, :date, :autofocus => false
-    assert_select 'select.date:not([autofocus])'
+    assert_no_select 'select.date[autofocus]'
+  end
+
+  test 'datetime input should generate autofocus attribute when autofocus option is false' do
     with_input_for @user, :created_at, :datetime, :autofocus => false
-    assert_select 'select.datetime:not([autofocus])'
+    assert_no_select 'select.datetime[autofocus]'
+  end
 
+  test 'string input should generate autofocus attribute when autofocus option is not present' do
     with_input_for @user, :name, :string
-    assert_select 'input.string:not([autofocus])'
+    assert_no_select 'input.string[autofocus]'
+  end
+
+  test 'text input should generate autofocus attribute when autofocus option is not present' do
     with_input_for @user, :description, :text
-    assert_select 'textarea.text:not([autofocus])'
+    assert_no_select 'textarea.text[autofocus]'
+  end
+
+  test 'numeric input should generate autofocus attribute when autofocus option is not present' do
     with_input_for @user, :age, :integer
-    assert_select 'input.integer:not([autofocus])'
+    assert_no_select 'input.integer[autofocus]'
+  end
+
+  test 'date input should generate autofocus attribute when autofocus option is not present' do
     with_input_for @user, :born_at, :date
-    assert_select 'select.date:not([autofocus])'
+    assert_no_select 'select.date[autofocus]'
+  end
+
+  test 'datetime input should generate autofocus attribute when autofocus option is not present' do
     with_input_for @user, :created_at, :datetime
-    assert_select 'select.datetime:not([autofocus])'
+    assert_no_select 'select.datetime[autofocus]'
   end
 
   # With no object
@@ -66,4 +106,11 @@ class InputTest < ActionView::TestCase
     with_input_for :project, :name, :select, :collection => ['Jose', 'Carlos']
     assert_select 'select.select#project_name'
   end
+
+  test 'input should not generate empty css class' do
+    swap SimpleForm, :generate_additional_classes_for => [:wrapper, :label] do
+      with_input_for :project, :name, :string
+      assert_no_select 'input#project_name[class]'
+    end
+  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/inputs/numeric_input_test.rb

@@ -164,4 +164,10 @@ class NumericInputTest < ActionView::TestCase
       assert_select 'input[max=99]'
     end
   end
+
+  test 'min_max should not emit max value as bare string' do
+    with_input_for @other_validating_user, :age, :integer
+    assert_select 'input[max]'
+    assert_no_select 'div', %r{^99}
+  end
 end

data/test/inputs/readonly_test.rb

@@ -1,39 +1,79 @@
 require 'test_helper'
 
 class ReadonlyTest < ActionView::TestCase
-  test 'input should generate readonly elements based on the readonly option' do
+  test 'string input should generate readonly elements when readonly option is true' do
     with_input_for @user, :name, :string, :readonly => true
     assert_select 'input.string.readonly[readonly]'
+  end
+
+  test 'text input should generate readonly elements when readonly option is true' do
     with_input_for @user, :description, :text, :readonly => true
     assert_select 'textarea.text.readonly[readonly]'
+  end
+
+  test 'numeric input should generate readonly elements when readonly option is true' do
     with_input_for @user, :age, :integer, :readonly => true
     assert_select 'input.integer.readonly[readonly]'
+  end
+
+  test 'date input should generate readonly elements when readonly option is true' do
     with_input_for @user, :born_at, :date, :readonly => true
     assert_select 'select.date.readonly[readonly]'
+  end
+
+  test 'datetime input should generate readonly elements when readonly option is true' do
     with_input_for @user, :created_at, :datetime, :readonly => true
     assert_select 'select.datetime.readonly[readonly]'
+  end
 
+  test 'string input should generate readonly elements when readonly option is false' do
     with_input_for @user, :name, :string, :readonly => false
-    assert_select 'input.string:not(.readonly[readonly])'
+    assert_no_select 'input.string.readonly[readonly]'
+  end
+
+  test 'text input should generate readonly elements when readonly option is false' do
     with_input_for @user, :description, :text, :readonly => false
-    assert_select 'textarea.text:not(.readonly[readonly])'
+    assert_no_select 'textarea.text.readonly[readonly]'
+  end
+
+  test 'numeric input should generate readonly elements when readonly option is false' do
     with_input_for @user, :age, :integer, :readonly => false
-    assert_select 'input.integer:not(.readonly[readonly])'
+    assert_no_select 'input.integer.readonly[readonly]'
+  end
+
+  test 'date input should generate readonly elements when readonly option is false' do
     with_input_for @user, :born_at, :date, :readonly => false
-    assert_select 'select.date:not(.readonly[readonly])'
+    assert_no_select 'select.date.readonly[readonly]'
+  end
+
+  test 'datetime input should generate readonly elements when readonly option is false' do
     with_input_for @user, :created_at, :datetime, :readonly => false
-    assert_select 'select.datetime:not(.readonly[readonly])'
+    assert_no_select 'select.datetime.readonly[readonly]'
+  end
 
+  test 'string input should generate readonly elements when readonly option is not present' do
     with_input_for @user, :name, :string
-    assert_select 'input.string:not(.readonly[readonly])'
+    assert_no_select 'input.string.readonly[readonly]'
+  end
+
+  test 'text input should generate readonly elements when readonly option is not present' do
     with_input_for @user, :description, :text
-    assert_select 'textarea.text:not(.readonly[readonly])'
+    assert_no_select 'textarea.text.readonly[readonly]'
+  end
+
+  test 'numeric input should generate readonly elements when readonly option is not present' do
     with_input_for @user, :age, :integer
-    assert_select 'input.integer:not(.readonly[readonly])'
+    assert_no_select 'input.integer.readonly[readonly]'
+  end
+
+  test 'date input should generate readonly elements when readonly option is not present' do
     with_input_for @user, :born_at, :date
-    assert_select 'select.date:not(.readonly[readonly])'
+    assert_no_select 'select.date.readonly[readonly]'
+  end
+
+  test 'datetime input should generate readonly elements when readonly option is not present' do
     with_input_for @user, :created_at, :datetime
-    assert_select 'select.datetime:not(.readonly[readonly])'
+    assert_no_select 'select.datetime.readonly[readonly]'
   end
 
   test 'input should generate readonly attribute when the field is readonly and the object is persisted' do

data/test/inputs/string_input_test.rb

@@ -57,6 +57,12 @@ class StringInputTest < ActionView::TestCase
     assert_select 'input.string[maxlength=12]'
   end
 
+  test 'input size and maxlength should be the column limit plus one to make room for decimal point' do
+    with_input_for @user, :credit_limit, :string
+
+    assert_select "input.string[maxlength=16][size=16]"
+  end
+
   test 'input should not generate placeholder by default' do
     with_input_for @user, :name, :string
     assert_no_select 'input[placeholder]'

data/test/support/discovery_inputs.rb

@@ -19,3 +19,9 @@ class CustomizedInput < SimpleForm::Inputs::StringInput
     :text_field
   end
 end
+
+class CollectionSelectInput < SimpleForm::Inputs::CollectionSelectInput
+  def input_html_classes
+    super.push('chosen')
+  end
+end

data/test/support/misc_helpers.rb

@@ -46,6 +46,24 @@ module MiscHelpers
     end
   end
 
+  def custom_wrapper_with_wrapped_input
+    SimpleForm.build :tag => :div, :class => "custom_wrapper" do |b|
+      b.wrapper :tag => :div, :class => 'elem' do |component|
+        component.use :label
+        component.use :input, :wrap_with => { :tag => :div, :class => 'input' }
+      end
+    end
+  end
+
+  def custom_wrapper_with_wrapped_label
+    SimpleForm.build :tag => :div, :class => "custom_wrapper" do |b|
+      b.wrapper :tag => :div, :class => 'elem' do |component|
+        component.use :label, :wrap_with => { :tag => :div, :class => 'label' }
+        component.use :input
+      end
+    end
+  end
+
   def custom_wrapper_without_top_level
     SimpleForm.build :tag => false, :class => 'custom_wrapper_without_top_level' do |b|
       b.use :label_input
@@ -54,6 +72,24 @@ module MiscHelpers
     end
   end
 
+  def custom_wrapper_without_class
+    SimpleForm.build :tag => :div, :wrapper_html => { :id => 'custom_wrapper_without_class' } do |b|
+      b.use :label_input
+    end
+  end
+
+  def custom_wrapper_with_label_html_option
+    SimpleForm.build :tag => :div, :class => "custom_wrapper", :label_html => { :class => 'extra-label-class' } do |b|
+      b.use :label_input
+    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
@@ -63,7 +99,11 @@ module MiscHelpers
   end
 
   def with_concat_form_for(*args, &block)
-    concat simple_form_for(*args, &block)
+    concat simple_form_for(*args, &(block || proc {}))
+  end
+
+  def with_concat_fields_for(*args, &block)
+    concat simple_fields_for(*args, &block)
   end
 
   def with_concat_custom_form_for(*args, &block)

data/test/support/models.rb

@@ -1,8 +1,12 @@
-require 'ostruct'
-
-Column = Struct.new(:name, :type, :limit)
 Association = Struct.new(:klass, :name, :macro, :options)
 
+class Column < Struct.new(:name, :type, :limit)
+  # Returns +true+ if the column is either of type integer, float or decimal.
+  def number?
+    type == :integer || type == :float || type == :decimal
+  end
+end
+
 class Company < Struct.new(:id, :name)
   extend ActiveModel::Naming
   include ActiveModel::Conversion
@@ -126,7 +130,7 @@ class User
   end
 
   def self.readonly_attributes
-    [:credit_card]
+    ["credit_card"]
   end
 end