simple_form 3.1.0.rc1 → 3.1.0.rc2

data/test/inputs/string_input_test.rb

@@ -2,100 +2,100 @@
 require 'test_helper'
 
 class StringInputTest < ActionView::TestCase
-  test 'input should map text field to string attribute' do
+  test 'input maps text field to string attribute' do
     with_input_for @user, :name, :string
     assert_select "input#user_name[type=text][name='user[name]'][value=New in SimpleForm!]"
   end
 
-  test 'input should generate a password field for password attributes' do
+  test 'input generates a password field for password attributes' do
     with_input_for @user, :password, :password
     assert_select "input#user_password.password[type=password][name='user[password]']"
   end
 
-  test 'input should get maxlength from column definition for string attributes' do
+  test 'input gets maxlength from column definition for string attributes' do
     with_input_for @user, :name, :string
     assert_select 'input.string[maxlength=100]'
   end
 
-  test 'input should not get maxlength from column without size definition for string attributes' do
+  test 'input does 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 maxlength from column definition for password attributes' do
+  test 'input gets maxlength from column definition for password attributes' do
     with_input_for @user, :password, :password
     assert_select 'input.password[type=password][maxlength=100]'
   end
 
-  test 'input should infer maxlength column definition from validation when present' do
+  test 'input infers maxlength column definition from validation when present' do
     with_input_for @validating_user, :name, :string
     assert_select 'input.string[maxlength=25]'
   end
 
-  test 'input should not get maxlength from validation when tokenizer present' do
+  test 'input does not get maxlength from validation when tokenizer present' do
     with_input_for @validating_user, :action, :string
     assert_no_select 'input.string[maxlength]'
   end
 
-  test 'input should get maxlength from validation when :is option present' do
+  test 'input gets maxlength from validation when :is option present' do
     with_input_for @validating_user, :home_picture, :string
     assert_select 'input.string[maxlength=12]'
   end
 
-  test 'input maxlength should be the column limit plus one to make room for decimal point' do
+  test 'input maxlength is 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]"
   end
 
-  test 'input should not generate placeholder by default' do
+  test 'input does not generate placeholder by default' do
     with_input_for @user, :name, :string
     assert_no_select 'input[placeholder]'
   end
 
-  test 'input should accept the placeholder option' do
+  test 'input accepts the placeholder option' do
     with_input_for @user, :name, :string, placeholder: 'Put in some text'
     assert_select 'input.string[placeholder=Put in some text]'
   end
 
-  test 'input should generate a password field for password attributes that accept placeholder' do
+  test 'input generates a password field for password attributes that accept placeholder' do
     with_input_for @user, :password, :password, placeholder: 'Password Confirmation'
     assert_select 'input[type=password].password[placeholder=Password Confirmation]#user_password'
   end
 
-  test 'input should not infer pattern from attributes by default' do
+  test 'input does not infer pattern from attributes by default' do
     with_input_for @other_validating_user, :country, :string
     assert_no_select 'input[pattern="\w+"]'
   end
 
-  test 'input should infer pattern from attributes' do
+  test 'input infers pattern from attributes' do
     with_input_for @other_validating_user, :country, :string, pattern: true
     assert_select 'input[pattern="\w+"]'
   end
 
-  test 'input should infer pattern from attributes using proc' do
+  test 'input infers pattern from attributes using proc' do
     with_input_for @other_validating_user, :name, :string, pattern: true
     assert_select 'input[pattern="\w+"]'
   end
 
-  test 'input should not infer pattern from attributes if root default is false' do
+  test 'input does not infer pattern from attributes if root default is false' do
     swap_wrapper do
       with_input_for @other_validating_user, :country, :string
       assert_no_select 'input[pattern="\w+"]'
     end
   end
 
-  test 'input should use given pattern from attributes' do
+  test 'input uses given pattern from attributes' do
     with_input_for @other_validating_user, :country, :string, input_html: { pattern: "\\d+" }
     assert_select 'input[pattern="\d+"]'
   end
 
-  test 'input should not use pattern if model has :without validation option' do
+  test 'input does not use pattern if model has :without validation option' do
     with_input_for @other_validating_user, :description, :string, pattern: true
     assert_no_select 'input[pattern="\d+"]'
   end
 
-  test 'input should use i18n to translate placeholder text' do
+  test 'input uses i18n to translate placeholder text' do
     store_translations(:en, simple_form: { placeholders: { user: {
       name: 'Name goes here'
     } } }) do
@@ -104,7 +104,7 @@ class StringInputTest < ActionView::TestCase
     end
   end
 
-  test 'input should use custom i18n scope to translate placeholder text' do
+  test 'input uses custom i18n scope to translate placeholder text' do
     store_translations(:en, my_scope: { placeholders: { user: {
       name: 'Name goes here'
     } } }) do
@@ -115,7 +115,7 @@ class StringInputTest < ActionView::TestCase
     end
   end
 
-  test 'input should translate a key prefixed with _html and return the html markup' do
+  test 'input translates a key prefixed with _html and return the html markup' do
     store_translations(:en, simple_form: { labels: { user: {
       name_html: '<b>Name</b>'
     } } }) do
@@ -125,13 +125,13 @@ class StringInputTest < ActionView::TestCase
   end
 
   [:email, :url, :search, :tel].each do |type|
-    test "input should allow type #{type}" do
+    test "input allows type #{type}" do
       with_input_for @user, :name, type
       assert_select "input.string.#{type}"
       assert_select "input[type=#{type}]"
     end
 
-    test "input should not allow type #{type} if HTML5 compatibility is disabled" do
+    test "input does not allow type #{type} if HTML5 compatibility is disabled" do
       swap_wrapper do
         with_input_for @user, :name, type
         assert_select "input[type=text]"

data/test/inputs/text_input_test.rb

@@ -2,22 +2,22 @@
 require 'test_helper'
 
 class TextInputTest < ActionView::TestCase
-  test 'input should generate a text area for text attributes' do
+  test 'input generates a text area for text attributes' do
     with_input_for @user, :description, :text
     assert_select 'textarea.text#user_description'
   end
 
-  test 'input should generate a text area for text attributes that accept placeholder' do
+  test 'input generates a text area for text attributes that accept placeholder' do
     with_input_for @user, :description, :text, placeholder: 'Put in some text'
     assert_select 'textarea.text[placeholder=Put in some text]'
   end
 
-  test 'input should get maxlength from column definition for text attributes' do
+  test 'input gets 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
+  test 'input infers 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

data/test/support/discovery_inputs.rb

@@ -35,3 +35,23 @@ class CollectionSelectInput < SimpleForm::Inputs::CollectionSelectInput
     super.push('chosen')
   end
 end
+
+module CustomInputs
+  class CustomizedInput < SimpleForm::Inputs::StringInput
+    def input_html_classes
+      super.push('customized-namespace-custom-input')
+    end
+  end
+
+  class PasswordInput < SimpleForm::Inputs::PasswordInput
+    def input_html_classes
+      super.push('password-custom-input')
+    end
+  end
+
+  class NumericInput < SimpleForm::Inputs::PasswordInput
+    def input_html_classes
+      super.push('numeric-custom-input')
+    end
+  end
+end

data/test/support/misc_helpers.rb

@@ -68,6 +68,22 @@ module MiscHelpers
     end
   end
 
+  def custom_wrapper_with_wrapped_optional_component
+    SimpleForm.build tag: :section, class: "custom_wrapper" do |b|
+      b.wrapper tag: :div, class: 'no_output_wrapper' do |ba|
+        ba.optional :hint, wrap_with: { tag: :p, class: 'omg_hint' }
+      end
+    end
+  end
+
+  def custom_wrapper_with_unless_blank
+    SimpleForm.build tag: :section, class: "custom_wrapper" do |b|
+      b.wrapper tag: :div, class: 'no_output_wrapper', unless_blank: true do |ba|
+        ba.optional :hint, wrap_with: { tag: :p, class: 'omg_hint' }
+      end
+    end
+  end
+
   def custom_wrapper_with_input_class
     SimpleForm.build tag: :div, class: "custom_wrapper" do |b|
       b.use :label
@@ -156,6 +172,12 @@ module MiscHelpers
     end
   end
 
+  def custom_wrapper_with_custom_label_component
+    SimpleForm.build tag: :span, class: 'custom_wrapper' do |b|
+      b.use :label_text
+    end
+  end
+
   def custom_form_for(object, *args, &block)
     simple_form_for(object, *args, { builder: CustomFormBuilder }, &block)
   end

data/test/support/models.rb

@@ -74,7 +74,7 @@ class User
     :avatar, :home_picture, :email, :status, :residence_country, :phone_number,
     :post_count, :lock_version, :amount, :attempts, :action, :credit_card, :gender,
     :extra_special_company_id, :pictures, :picture_ids, :special_pictures,
-    :special_picture_ids
+    :special_picture_ids, :uuid
 
   def self.build(extra_attributes = {})
     attributes = {
@@ -125,6 +125,7 @@ class User
       when :attempts      then :integer
       when :action        then :string
       when :credit_card   then :string
+      when :uuid          then :uuid
     end
     Column.new(attribute, column_type, limit)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form
 version: !ruby/object:Gem::Version
-  version: 3.1.0.rc1
+  version: 3.1.0.rc2
 platform: ruby
 authors:
 - José Valim
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel