simple_form 1.3.1 → 1.4.0

data/lib/simple_form/inputs/string_input.rb

@@ -1,12 +1,19 @@
 module SimpleForm
   module Inputs
     class StringInput < Base
+      extend MapType
+
+      map_type :string, :email, :search, :tel, :url,  :to => :text_field
+      map_type :password,                             :to => :password_field
+
       def input
         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?
+        input_html_options[:maxlength] ||= limit if limit && SimpleForm.html5
+        if password? || SimpleForm.html5
+          input_html_options[:type]    ||= input_type unless string?
+        end
 
-        @builder.text_field(attribute_name, input_html_options)
+        @builder.send(input_method, attribute_name, input_html_options)
       end
 
       def input_html_classes
@@ -26,6 +33,10 @@ module SimpleForm
       def string?
         input_type == :string
       end
+
+      def password?
+        input_type == :password
+      end
     end
   end
 end

data/lib/simple_form/map_type.rb

@@ -10,7 +10,7 @@ module SimpleForm
     def map_type(*types)
       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 }
+      self.mappings = mappings.merge types.each_with_object({}) { |t, m| m[t] = map_to }
     end
   end
 end

data/lib/simple_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleForm
-  VERSION = "1.3.1".freeze
+  VERSION = "1.4.0".freeze
 end

data/test/action_view_extensions/builder_test.rb

@@ -1,9 +1,11 @@
 require 'test_helper'
 
 class BuilderTest < ActionView::TestCase
-
-  def with_concat_form_for(object, &block)
-    concat form_for(object, &block)
+  def with_custom_form_for(object, *args, &block)
+    with_concat_custom_form_for(object) do |f|
+      assert f.instance_of?(CustomFormBuilder)
+      yield f
+    end
   end
 
   def with_collection_radio(object, attribute, collection, value_method, text_method, options={}, html_options={})
@@ -116,10 +118,17 @@ class BuilderTest < ActionView::TestCase
     assert_select 'form li input[type=radio][value=false]#user_active_false'
   end
 
-  test 'collection radio does not wrap items by default' do
+  test 'collection radio wrap items in a span tag by default' do
     with_collection_radio @user, :active, [true, false], :to_s, :to_s
 
-    assert_no_select 'form li'
+    assert_select 'form span input[type=radio][value=true]#user_active_true + label'
+    assert_select 'form span input[type=radio][value=false]#user_active_false + label'
+  end
+
+  test 'collection radio does not wrap input inside the label' do
+    with_collection_radio @user, :active, [true, false], :to_s, :to_s
+
+    assert_no_select 'form label input'
   end
 
   # COLLECTION CHECK BOX
@@ -259,10 +268,17 @@ class BuilderTest < ActionView::TestCase
     assert_select 'form li input[type=checkbox][value=false]#user_active_false'
   end
 
-  test 'collection check box does not wrap items by default' do
+  test 'collection check box 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][value=true]#user_active_true + label'
+    assert_select 'form span input[type=checkbox][value=false]#user_active_false + label'
+  end
+
+  test 'collection check box does not wrap input inside the label' do
     with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s
 
-    assert_no_select 'form li'
+    assert_no_select 'form label input'
   end
 
   # SIMPLE FIELDS
@@ -273,4 +289,20 @@ class BuilderTest < ActionView::TestCase
       end
     end
   end
+
+  test 'fields for yields an instance of CustomBuilder if main builder is a CustomBuilder' do
+    with_custom_form_for(:user) do |f|
+      f.simple_fields_for(:company) do |company|
+        assert company.instance_of?(CustomFormBuilder)
+      end
+    end
+  end
+
+  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|
+        assert company.instance_of?(SimpleForm::FormBuilder)
+      end
+    end
+  end
 end

data/test/action_view_extensions/form_helper_test.rb

@@ -13,6 +13,18 @@ class FormHelperTest < ActionView::TestCase
     assert_select 'form.simple_form'
   end
 
+  test 'simple form should use default browser validations by default' do
+    concat(simple_form_for(:user) do |f| end)
+    assert_no_select 'form[novalidate]'
+  end
+
+  test 'simple form should not use default browser validations if specified in the configuration options' do
+    swap SimpleForm, :browser_validations => false do
+      concat(simple_form_for(:user) do |f| end)
+      assert_select 'form[novalidate="novalidate"]'
+    end
+  end
+
   test 'simple form should add object name as css class to form when object is not present' do
     concat(simple_form_for(:user) do |f| end)
     assert_select 'form.simple_form.user'

data/test/components/label_test.rb

@@ -96,6 +96,43 @@ class LabelTest < ActionView::TestCase
     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
+      with_concat_form_for @user do |f|
+        concat f.input :name
+        concat(f.simple_fields_for(:company) do |company_form|
+          concat(company_form.input :name)
+        end)
+      end
+
+      assert_select 'label[for=user_name]', /Usuario/
+      assert_select 'label[for=user_company_attributes_name]', /Nome da empresa/
+    end
+  end
+
+  test 'label should do correct i18n lookup for nested models with no nested translation' do
+    @user.company = Company.new(1, 'Empresa')
+
+    store_translations(:en, :simple_form => { :labels => {
+      :user    => { :name => 'Usuario' },
+      :company => { :name => 'Nome da empresa' }
+    } } ) do
+      with_concat_form_for @user do |f|
+        concat f.input :name
+        concat(f.simple_fields_for(:company) do |company_form|
+          concat(company_form.input :name)
+        end)
+      end
+
+      assert_select 'label[for=user_name]', /Usuario/
+      assert_select 'label[for=user_company_attributes_name]', /Nome da empresa/
+    end
+  end
+
   test 'label should have css class from type' do
     with_label_for @user, :name, :string
     assert_select 'label.string'
@@ -205,4 +242,11 @@ class LabelTest < ActionView::TestCase
     with_label_for :project, :description, :string, :required => false
     assert_no_select 'label.required[for=project_description]'
   end
+
+  test 'label should add chosen label class' do
+    swap SimpleForm, :label_class => :my_custom_class do
+      with_label_for @user, :name, :string
+      assert_select 'label.my_custom_class'
+    end
+  end
 end

data/test/discovery_inputs.rb

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

data/test/form_builder_test.rb

@@ -27,6 +27,12 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
+  def with_full_error_for(object, *args)
+    with_concat_form_for(object) do |f|
+      f.full_error(*args)
+    end
+  end
+
   def with_hint_for(object, *args)
     with_concat_form_for(object) do |f|
       f.hint(*args)
@@ -186,6 +192,14 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'form input#user_avatar.file'
   end
 
+  test 'builder should generate file for attributes that are real db columns but have file methods' do
+    @user.home_picture = mock("file")
+    @user.home_picture.expects(:respond_to?).with(:mounted_as).returns(true)
+
+    with_form_for @user, :home_picture
+    assert_select 'form input#user_home_picture.file'
+  end
+
   test 'build should generate select if a collection is given' do
     with_form_for @user, :age, :collection => 1..60
     assert_select 'form select#user_age.select'
@@ -206,6 +220,13 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   # COMMON OPTIONS
+  test 'builder should add chosen form class' do
+    swap SimpleForm, :form_class => :my_custom_class do
+      with_form_for @user, :name
+      assert_select 'form.my_custom_class'
+    end
+  end
+
   test 'builder should allow passing options to input' do
     with_form_for @user, :name, :input_html => { :class => 'my_input', :id => 'my_input' }
     assert_select 'form input#my_input.my_input.string'
@@ -362,6 +383,43 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'form div.input.required.string.field_with_errors'
   end
 
+  # ONLY THE INPUT TAG
+  test "builder input_field should only render the input tag, nothing else" do
+    with_concat_form_for(@user) do |f|
+      f.input_field :name
+    end
+    assert_select 'form > input.required.string'
+    assert_no_select 'div.string'
+    assert_no_select 'label'
+    assert_no_select '.hint'
+  end
+
+  test 'builder input_field should allow overriding default input type' do
+    with_concat_form_for(@user) do |f|
+      f.input_field :name, :as => :text
+    end
+
+    assert_no_select 'input#user_name'
+    assert_select 'textarea#user_name.text'
+  end
+
+  test 'builder input_field should allow passing options to input tag' do
+    with_concat_form_for(@user) do |f|
+      f.input_field :name, :id => 'name_input', :class => 'name'
+    end
+
+    assert_select 'input.string.name#name_input'
+  end
+
+  test 'builder input_field should generate an input tag with a clean HTML' do
+    with_concat_form_for(@user) do |f|
+      f.input_field :name, :as => :integer, :class => 'name'
+    end
+
+    assert_no_select 'input.integer[input_html]'
+    assert_no_select 'input.integer[as]'
+  end
+
   # WITHOUT OBJECT
   test 'builder should generate properly when object is not present' do
     with_form_for :project, :name
@@ -403,6 +461,22 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'span.error#name_error', "can't be blank"
   end
 
+  # FULL ERRORS
+  test 'builder should generate an full error tag for the attribute' do
+    with_full_error_for @user, :name
+    assert_select 'span.error', "Super User Name! can't be blank"
+  end
+
+  test 'builder should generate an full  error tag with a clean HTML' do
+    with_full_error_for @user, :name
+    assert_no_select 'span.error[error_html]'
+  end
+
+  test 'builder should allow passing options to full error tag' do
+    with_full_error_for @user, :name, :id => 'name_error', :error_prefix => "Your name"
+    assert_select 'span.error#name_error', "Your name can't be blank"
+  end
+
   # HINTS
   test 'builder should generate a hint tag for the attribute' do
     store_translations(:en, :simple_form => { :hints => { :user => { :name => "Add your name" }}}) do
@@ -511,6 +585,36 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
+  test 'builder preloads collection association' do
+    value = @user.tags
+    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'
+    assert_select 'form select option[value=2]', 'Tag 2'
+    assert_select 'form select option[value=3]', 'Tag 3'
+  end
+
+  test 'builder does not preload collection association if preload false' do
+    value = @user.company
+    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'
+  end
+
+  test 'builder does not preload non collection association' do
+    value = @user.company
+    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'
+  end
+
   # ASSOCIATIONS - BELONGS TO
   test 'builder creates a select for belongs_to associations' do
     with_association_for @user, :company
@@ -611,4 +715,81 @@ class FormBuilderTest < ActionView::TestCase
     with_custom_form_for @user, :email
     assert_select 'form input[type=email]#user_email.custom'
   end
+
+  test 'form with CustomMapTypeFormBuilder should use custom map type builder' do
+    with_concat_custom_mapping_form_for(:user) do |user|
+      assert user.instance_of?(CustomMapTypeFormBuilder)
+    end
+  end
+
+  test 'form with CustomMapTypeFormBuilder should use custom mapping' do
+    with_concat_custom_mapping_form_for(:user) do |user|
+      assert_equal SimpleForm::Inputs::StringInput, user.class.mappings[:custom_type]
+    end
+  end
+
+  test 'form without CustomMapTypeFormBuilder should not use custom mapping' do
+    with_concat_form_for(:user) do |user|
+      assert_nil user.class.mappings[:custom_type]
+    end
+  end
+
+  # DISCOVERY
+  # Setup new inputs and remove them after the test.
+  def discovery(value=false)
+    swap SimpleForm, :cache_discovery => value do
+      begin
+        load "discovery_inputs.rb"
+        yield
+      ensure
+        SimpleForm::FormBuilder.discovery_cache.clear
+        Object.send :remove_const, :StringInput
+        Object.send :remove_const, :NumericInput
+        Object.send :remove_const, :CustomizedInput
+      end
+    end
+  end
+
+  test 'builder should not discover new inputs if cached' do
+    with_form_for @user, :name
+    assert_select 'form input#user_name.string'
+
+    discovery(true) do
+      with_form_for @user, :name
+      assert_no_select 'form section input#user_name.string'
+    end
+  end
+
+  test 'builder should discover new inputs' do
+    discovery do
+      with_form_for @user, :name, :as => :customized
+      assert_select 'form section input#user_name.string'
+    end
+  end
+
+  test 'builder should not discover new inputs if discovery is off' do
+    with_form_for @user, :name
+    assert_select 'form input#user_name.string'
+
+    swap SimpleForm, :inputs_discovery => false do
+      discovery do
+        with_form_for @user, :name
+        assert_no_select 'form section input#user_name.string'
+      end
+    end
+  end
+
+  test 'builder should discover new inputs from mappings if not cached' do
+    discovery do
+      with_form_for @user, :name
+      assert_select 'form section input#user_name.string'
+    end
+  end
+
+  test 'builder should discover new inputs from internal fallbacks if not cached' do
+    discovery do
+      with_form_for @user, :age
+      assert_select 'form section input#user_age.numeric.integer'
+    end
+  end
 end