simple_form 1.3.0 → 1.4.0

data/test/inputs_test.rb

@@ -62,6 +62,48 @@ class InputTest < ActionView::TestCase
     assert_select 'select.datetime:not([disabled])'
   end
 
+  test 'input should generate autofocus attribute based on the autofocus option' do
+    with_input_for @user, :name, :string, :autofocus => true
+    assert_select 'input.string[autofocus]'
+    with_input_for @user, :description, :text, :autofocus => true
+    assert_select 'textarea.text[autofocus]'
+    with_input_for @user, :age, :integer, :autofocus => true
+    assert_select 'input.integer[autofocus]'
+    with_input_for @user, :born_at, :date, :autofocus => true
+    assert_select 'select.date[autofocus]'
+    with_input_for @user, :created_at, :datetime, :autofocus => true
+    assert_select 'select.datetime[autofocus]'
+
+    with_input_for @user, :name, :string, :autofocus => false
+    assert_select 'input.string:not([autofocus])'
+    with_input_for @user, :description, :text, :autofocus => false
+    assert_select 'textarea.text:not([autofocus])'
+    with_input_for @user, :age, :integer, :autofocus => false
+    assert_select 'input.integer:not([autofocus])'
+    with_input_for @user, :born_at, :date, :autofocus => false
+    assert_select 'select.date:not([autofocus])'
+    with_input_for @user, :created_at, :datetime, :autofocus => false
+    assert_select 'select.datetime:not([autofocus])'
+
+    with_input_for @user, :name, :string
+    assert_select 'input.string:not([autofocus])'
+    with_input_for @user, :description, :text
+    assert_select 'textarea.text:not([autofocus])'
+    with_input_for @user, :age, :integer
+    assert_select 'input.integer:not([autofocus])'
+    with_input_for @user, :born_at, :date
+    assert_select 'select.date:not([autofocus])'
+    with_input_for @user, :created_at, :datetime
+    assert_select 'select.datetime:not([autofocus])'
+  end
+
+  test "when not using HTML5, it does not generate autofocus attribute" do
+    swap SimpleForm, :html5 => false do
+      with_input_for @user, :name, :string, :autofocus => true
+      assert_no_select 'input.string[autofocus]'
+    end
+  end
+
   test 'input should render components according to an optional :components option' do
     with_input_for @user, :name, :string, :components => [:input, :label]
     assert_select 'input + label'
@@ -91,7 +133,12 @@ class InputTest < ActionView::TestCase
   # StringInput
   test 'input should map text field to string attribute' do
     with_input_for @user, :name, :string
-    assert_select 'input[name=\'user[name]\'][id=user_name][value=New in Simple Form!][type=text]'
+    assert_select "input#user_name[type=text][name='user[name]'][value=New in Simple Form!]"
+  end
+
+  test 'input should generate 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 use default text size for decimal attributes' do
@@ -109,6 +156,23 @@ class InputTest < ActionView::TestCase
     assert_select 'input.string[size=50]'
   end
 
+  test 'input should use default text size for password attributes' do
+    with_input_for @user, :password, :password
+    assert_select 'input.password[type=password][size=50]'
+  end
+
+  test 'input should get maxlength from column definition for password attributes' do
+    with_input_for @user, :password, :password
+    assert_select 'input.password[type=password][maxlength=100]'
+  end
+
+  test 'when not using HTML5, does not show maxlength attribute' do
+    swap SimpleForm, :html5 => false do
+      with_input_for @user, :password, :password
+      assert_no_select 'input[type=password][maxlength]'
+    end
+  end
+
   test 'input should not generate placeholder by default' do
     with_input_for @user, :name, :string
     assert_no_select 'input[placeholder]'
@@ -119,6 +183,11 @@ class InputTest < ActionView::TestCase
     assert_select 'input.string[placeholder=Put in some text]'
   end
 
+  test 'input should generate 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 use i18n to translate placeholder text' do
     store_translations(:en, :simple_form => { :placeholders => { :user => {
       :name => 'Name goes here'
@@ -132,6 +201,14 @@ class InputTest < ActionView::TestCase
     test "input should allow 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
+      swap SimpleForm, :html5 => false do
+        with_input_for @user, :name, type
+        assert_no_select "input[type=#{type}]"
+      end
     end
   end
 
@@ -169,6 +246,38 @@ class InputTest < ActionView::TestCase
     assert_select 'input[min=18]'
   end
 
+  test 'input should infer min value from integer attributes with greater than validation using symbol' do
+    with_input_for @validating_user, :amount, :float
+    assert_no_select 'input[min]'
+
+    with_input_for @validating_user, :amount, :integer
+    assert_select 'input[min=11]'
+  end
+
+  test 'input should infer min value from integer attributes with greater than or equal to validation using symbol' do
+    with_input_for @validating_user, :attempts, :float
+    assert_select 'input[min=1]'
+
+    with_input_for @validating_user, :attempts, :integer
+    assert_select 'input[min=1]'
+  end
+
+  test 'input should infer min value from integer attributes with greater than validation using proc' do
+    with_input_for @other_validating_user, :amount, :float
+    assert_no_select 'input[min]'
+
+    with_input_for @other_validating_user, :amount, :integer
+    assert_select 'input[min=20]'
+  end
+
+  test 'input should infer min value from integer attributes with greater than or equal to validation using proc' do
+    with_input_for @other_validating_user, :attempts, :float
+    assert_select 'input[min=19]'
+
+    with_input_for @other_validating_user, :attempts, :integer
+    assert_select 'input[min=19]'
+  end
+
   test 'input should infer max value from attributes with less than validation' do
     with_input_for @other_validating_user, :age, :float
     assert_no_select 'input[max]'
@@ -177,9 +286,41 @@ class InputTest < ActionView::TestCase
     assert_select 'input[max=99]'
   end
 
-  test 'input should infer step value only from integer attribute' do
+  test 'input should infer max value from attributes with less than validation using symbol' do
+    with_input_for @validating_user, :amount, :float
+    assert_no_select 'input[max]'
+
+    with_input_for @validating_user, :amount, :integer
+    assert_select 'input[max=99]'
+  end
+
+  test 'input should infer max value from attributes with less than or equal to validation using symbol' do
+    with_input_for @validating_user, :attempts, :float
+    assert_select 'input[max=100]'
+
+    with_input_for @validating_user, :attempts, :integer
+    assert_select 'input[max=100]'
+  end
+
+  test 'input should infer max value from attributes with less than validation using proc' do
+    with_input_for @other_validating_user, :amount, :float
+    assert_no_select 'input[max]'
+
+    with_input_for @other_validating_user, :amount, :integer
+    assert_select 'input[max=118]'
+  end
+
+  test 'input should infer max value from attributes with less than or equal to validation using proc' do
+    with_input_for @other_validating_user, :attempts, :float
+    assert_select 'input[max=119]'
+
+    with_input_for @other_validating_user, :attempts, :integer
+    assert_select 'input[max=119]'
+  end
+
+  test 'input should have step value of any except for integer attribute' do
     with_input_for @validating_user, :age, :float
-    assert_no_select 'input[step]'
+    assert_select 'input[step="any"]'
 
     with_input_for @validating_user, :age, :integer
     assert_select 'input[step=1]'
@@ -204,6 +345,24 @@ class InputTest < ActionView::TestCase
     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
+    swap SimpleForm, :html5 => false do
+      with_input_for @user, :age, :integer
+      assert_no_select "input[type=number]"
+      assert_no_select "input#user_age[text]"
+    end
+  end
+
+  test 'when not using HTML5 input should not use min or max or step attributes' do
+    swap SimpleForm, :html5 => false do
+      with_input_for @validating_user, :age, :integer
+      assert_no_select "input[min]"
+      assert_no_select "input[max]"
+      assert_no_select "input[step]"
+    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
@@ -234,22 +393,12 @@ class InputTest < ActionView::TestCase
     assert_select 'textarea.text[placeholder=Put in some text]'
   end
 
-  test 'input should generate a password field for password attributes' do
-    with_input_for @user, :password, :password
-    assert_select 'input[type=password].password#user_password'
-  end
-
-  test 'input should generate 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 generate a file field' do
     with_input_for @user, :name, :file
     assert_select 'input#user_name[type=file]'
   end
 
-  test "input should generate a file field that don't accept placeholder" do
+  test "input should generate a file field that doesn't accept placeholder" do
     with_input_for @user, :name, :file, :placeholder => 'Put in some text'
     assert_no_select 'input[placeholder]'
   end
@@ -321,6 +470,12 @@ class InputTest < ActionView::TestCase
     assert_no_select 'select option[value=]', /^$/
   end
 
+  test 'priority input should not generate invalid required html attribute' do
+    with_input_for @user, :country, :country
+    assert_select 'select.required'
+    assert_no_select 'select[required]'
+  end
+
   # DateTime input
   test 'input should generate a datetime select by default for datetime attributes' do
     with_input_for @user, :created_at, :datetime
@@ -395,6 +550,12 @@ class InputTest < ActionView::TestCase
     assert_select 'label[for=project_created_at_4i]'
   end
 
+  test 'date time input should not generate invalid required html attribute' do
+    with_input_for @user, :delivery_time, :time, :required => true
+    assert_select 'select.required'
+    assert_no_select 'select[required]'
+  end
+
   # CollectionInput
   test 'input should generate boolean radio buttons by default for radio types' do
     with_input_for @user, :active, :radio
@@ -416,6 +577,13 @@ class InputTest < ActionView::TestCase
     end
   end
 
+  test 'input should mark the checked value when using boolean and radios' do
+    @user.active = false
+    with_input_for @user, :active, :radio
+    assert_no_select 'input[type=radio][value=true][checked]'
+    assert_select 'input[type=radio][value=false][checked]'
+  end
+
   test 'input should generate a boolean select with options by default for select types' do
     with_input_for @user, :active, :select
     assert_select 'select.select#user_active'
@@ -450,6 +618,13 @@ class InputTest < ActionView::TestCase
     assert_select 'select option[selected=selected]', '18'
   end
 
+  test 'input should mark the selected value when using booleans and select' do
+    @user.active = false
+    with_input_for @user, :active, :select
+    assert_no_select 'select option[selected][value=true]', 'Yes'
+    assert_select 'select option[selected][value=false]', 'No'
+  end
+
   test 'input should set the correct value when using a collection that includes floats' do
     with_input_for @user, :age, :select, :collection => [2.0, 2.5, 3.0, 3.5, 4.0, 4.5]
     assert_select 'select option[value="2.0"]'
@@ -559,6 +734,31 @@ class InputTest < ActionView::TestCase
     assert_select 'label.collection_radio', 'CARLOS'
   end
 
+  test 'input should allow overriding label and value method using a lambda for collection selects' do
+    with_input_for @user, :name, :select,
+                          :collection => ['Jose' , 'Carlos'],
+                          :label_method => lambda { |i| i.upcase },
+                          :value_method => lambda { |i| i.downcase }
+    assert_select 'select option[value=jose]', "JOSE"
+    assert_select 'select option[value=carlos]', "CARLOS"
+  end
+
+  test 'input should allow overriding only label but not value method using a lambda for collection select' do
+    with_input_for @user, :name, :select,
+                          :collection => ['Jose' , 'Carlos'],
+                          :label_method => lambda { |i| i.upcase }
+    assert_select 'select option[value=Jose]', "JOSE"
+    assert_select 'select option[value=Carlos]', "CARLOS"
+  end
+
+  test 'input should allow overriding only value but not label method using a lambda for collection select' do
+    with_input_for @user, :name, :select,
+                          :collection => ['Jose' , 'Carlos'],
+                          :value_method => lambda { |i| i.downcase }
+    assert_select 'select option[value=jose]', "Jose"
+    assert_select 'select option[value=carlos]', "Carlos"
+  end
+
   test 'input should allow symbols for collections' do
     with_input_for @user, :name, :select, :collection => [:jose, :carlos]
     assert_select 'select.select#user_name'
@@ -566,6 +766,26 @@ class InputTest < ActionView::TestCase
     assert_select 'select option[value=carlos]', 'carlos'
   end
 
+  test 'collection input with radio type should generate required html attribute' do
+    with_input_for @user, :name, :radio, :collection => ['Jose' , 'Carlos']
+    assert_select 'input[type=radio].required'
+    assert_select 'input[type=radio][required]'
+  end
+
+  test 'when not using HTML5, collection input with radio type should not generate required html attribute' do
+    swap SimpleForm, :html5 => false do
+      with_input_for @user, :name, :radio, :collection => ['Jose' , 'Carlos']
+      assert_select 'input[type=radio].required'
+      assert_no_select 'input[type=radio][required]'
+    end
+  end
+
+  test 'collection input with select type should not generate invalid required html attribute' do
+    with_input_for @user, :name, :select, :collection => ['Jose' , 'Carlos']
+    assert_select 'select.required'
+    assert_no_select 'select[required]'
+  end
+
   # With no object
   test 'input should be generated properly when object is not present' do
     with_input_for :project, :name, :string

data/test/support/misc_helpers.rb

@@ -28,4 +28,30 @@ module MiscHelpers
   def with_concat_form_for(object, &block)
     concat simple_form_for(object, &block)
   end
+
+  def with_concat_custom_form_for(object, &block)
+    concat custom_form_for(object, &block)
+  end
+
+  def custom_form_for(object, *args, &block)
+    simple_form_for(object, *(args << { :builder => CustomFormBuilder }), &block)
+  end
+
+  def custom_mapping_form_for(object, *args, &block)
+    simple_form_for(object, *(args << { :builder => CustomMapTypeFormBuilder }), &block)
+  end
+
+  def with_concat_custom_mapping_form_for(object, &block)
+    concat custom_mapping_form_for(object, &block)
+  end
+end
+
+class CustomFormBuilder < SimpleForm::FormBuilder
+  def input(attribute_name, *args, &block)
+    super(attribute_name, *(args << { :input_html => { :class => 'custom' } }), &block)
+  end
+end
+
+class CustomMapTypeFormBuilder < SimpleForm::FormBuilder
+  map_type :custom_type, :to => SimpleForm::Inputs::StringInput
 end

data/test/support/models.rb

@@ -38,9 +38,11 @@ class User
   extend ActiveModel::Naming
   include ActiveModel::Conversion
 
-  attr_accessor :id, :name, :company, :company_id, :time_zone, :active, :description, :created_at, :updated_at,
-    :credit_limit, :age, :password, :delivery_time, :born_at, :special_company_id, :country, :url, :tag_ids,
-    :avatar, :email, :status, :residence_country, :phone_number, :post_count
+  attr_accessor :id, :name, :company, :company_id, :time_zone, :active, :age,
+    :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
 
   def initialize(options={})
     options.each do |key, value|
@@ -70,6 +72,10 @@ class User
       when :delivery_time then :time
       when :created_at    then :datetime
       when :updated_at    then :timestamp
+      when :lock_version  then :integer
+      when :home_picture  then :string
+      when :amount        then :integer
+      when :attempts      then :integer
     end
     Column.new(attribute, column_type, limit)
   end
@@ -122,6 +128,30 @@ class ValidatingUser < User
     :greater_than_or_equal_to => 18,
     :less_than_or_equal_to => 99,
     :only_integer => true
+  validates_numericality_of :amount,
+    :greater_than => :min_amount,
+    :less_than => :max_amount,
+    :only_integer => true
+  validates_numericality_of :attempts,
+    :greater_than_or_equal_to => :min_attempts,
+    :less_than_or_equal_to => :max_attempts,
+    :only_integer => true
+
+  def min_amount
+    10
+  end
+
+  def max_amount
+    100
+  end
+
+  def min_attempts
+    1
+  end
+
+  def max_attempts
+    100
+  end
 end
 
 class OtherValidatingUser < User
@@ -130,4 +160,12 @@ class OtherValidatingUser < User
     :greater_than => 17,
     :less_than => 100,
     :only_integer => true
+  validates_numericality_of :amount,
+    :greater_than => Proc.new { |user| user.age },
+    :less_than => Proc.new { |user| user.age + 100},
+    :only_integer => true
+  validates_numericality_of :attempts,
+    :greater_than_or_equal_to => Proc.new { |user| user.age },
+    :less_than_or_equal_to => Proc.new { |user| user.age + 100},
+    :only_integer => true
 end

data/test/test_helper.rb

@@ -1,7 +1,5 @@
 require 'rubygems'
-require 'bundler'
-
-Bundler.setup
+require 'bundler/setup'
 
 require 'test/unit'
 require 'mocha'
@@ -10,8 +8,17 @@ require 'active_model'
 require 'action_controller'
 require 'action_view'
 require 'action_view/template'
+
+# Rails 3.0.4 is missing this "deprecation" require.
+require 'active_support/core_ext/module/deprecation'
 require 'action_view/test_case'
 
+module Rails
+  def self.env
+    ActiveSupport::StringInquirer.new("test")
+  end
+end
+
 $:.unshift File.expand_path("../../lib", __FILE__)
 require 'simple_form'
 
@@ -57,7 +64,9 @@ class ActionView::TestCase
       :description => 'Hello!',
       :created_at => Time.now,
       :age => 19,
-      :company => 1
+      :amount => 15,
+      :attempts => 1,
+      :company => [1]
     }.merge(options))
 
     @other_validating_user = OtherValidatingUser.new({

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_form
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 1
-  - 3
+  - 4
   - 0
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -16,39 +16,34 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 -02:00
+date: 2011-05-18 00:00:00 -03:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  name: rails
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  requirement: *id001
+dependencies: []
+
 description: Forms made easy!
 email: contact@plataformatec.com.br
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- .gitmodules
+- .travis.yml
+- CHANGELOG.rdoc
+- Gemfile
+- Gemfile.lock
+- MIT-LICENSE
+- README.rdoc
+- Rakefile
 - init.rb
 - lib/generators/simple_form/USAGE
 - lib/generators/simple_form/install_generator.rb
 - lib/generators/simple_form/templates/_form.html.erb
 - lib/generators/simple_form/templates/_form.html.haml
+- lib/generators/simple_form/templates/_form.html.slim
 - lib/generators/simple_form/templates/en.yml
 - lib/generators/simple_form/templates/simple_form.rb
 - lib/simple_form.rb
@@ -78,13 +73,14 @@ files:
 - lib/simple_form/inputs/string_input.rb
 - lib/simple_form/map_type.rb
 - lib/simple_form/version.rb
-- README.rdoc
+- simple_form.gemspec
 - test/action_view_extensions/builder_test.rb
 - test/action_view_extensions/form_helper_test.rb
 - test/components/error_test.rb
 - test/components/hint_test.rb
 - test/components/label_test.rb
 - test/components/wrapper_test.rb
+- test/discovery_inputs.rb
 - test/error_notification_test.rb
 - test/form_builder_test.rb
 - test/inputs_test.rb
@@ -123,8 +119,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubyforge_project: simple_form
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Forms made easy!
@@ -135,6 +131,7 @@ test_files:
 - test/components/hint_test.rb
 - test/components/label_test.rb
 - test/components/wrapper_test.rb
+- test/discovery_inputs.rb
 - test/error_notification_test.rb
 - test/form_builder_test.rb
 - test/inputs_test.rb