simple_form 1.5.2 → 2.0.0.rc

data/test/inputs/string_input_test.rb

@@ -0,0 +1,140 @@
+# encoding: UTF-8
+require 'test_helper'
+
+class StringInputTest < ActionView::TestCase
+  test 'input should map 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 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 not use size attribute for decimal attributes' do
+    with_input_for @user, :credit_limit, :decimal
+    assert_no_select 'input.decimal[size]'
+  end
+
+  test 'input should get 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
+    with_input_for @user, :action, :string
+    assert_no_select 'input.string[maxlength]'
+  end
+
+  test 'input should get size from column definition for string attributes respecting maximum value' do
+    with_input_for @user, :name, :string
+    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 'input should infer 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
+    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
+    with_input_for @validating_user, :home_picture, :string
+    assert_select 'input.string[maxlength=12]'
+  end
+
+  test 'input should 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
+    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
+    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
+    with_input_for @other_validating_user, :country, :string
+    assert_no_select 'input[pattern="\w+"]'
+  end
+
+  test 'input should infer 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
+    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
+    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
+    with_input_for @other_validating_user, :country, :string, :input_html => { :pattern => "\\d+" }
+    assert_select 'input[pattern="\d+"]'
+  end
+
+  test 'input should use i18n to translate placeholder text' do
+    store_translations(:en, :simple_form => { :placeholders => { :user => {
+      :name => 'Name goes here'
+    } } }) do
+      with_input_for @user, :name, :string
+      assert_select 'input.string[placeholder=Name goes here]'
+    end
+  end
+
+  [:email, :url, :search, :tel].each do |type|
+    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_wrapper do
+        with_input_for @user, :name, type
+        assert_select "input[type=text]"
+        assert_no_select "input[type=#{type}]"
+      end
+    end
+  end
+
+  test 'input strips extra spaces from class html attribute with default classes' do
+    with_input_for @user, :name, :string
+    assert_select "input[class='string required']"
+    assert_no_select "input[class='string required ']"
+    assert_no_select "input[class=' string required']"
+  end
+
+  test 'input strips extra spaces from class html attribute when giving a custom class' do
+    with_input_for @user, :name, :string, :input_html => { :class => "my_input" }
+    assert_select "input[class='string required my_input']"
+    assert_no_select "input[class='string required my_input ']"
+    assert_no_select "input[class=' string required my_input']"
+  end
+end

data/test/inputs/text_input_test.rb

@@ -0,0 +1,24 @@
+# encoding: UTF-8
+require 'test_helper'
+
+class TextInputTest < ActionView::TestCase
+  test 'input should generate 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
+    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
+    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
+    with_input_for @validating_user, :description, :text
+    assert_select 'textarea.text[maxlength=50]'
+  end
+end

data/test/support/misc_helpers.rb

@@ -25,12 +25,34 @@ module MiscHelpers
     end
   end
 
-  def with_concat_form_for(object, &block)
-    concat simple_form_for(object, &block)
+  def swap_wrapper(name=:default, wrapper=self.custom_wrapper)
+    old = SimpleForm.wrappers[name]
+    SimpleForm.wrappers[name] = wrapper
+    yield
+  ensure
+    SimpleForm.wrappers[name] = old
+  end
+
+  def custom_wrapper
+    SimpleForm.build :tag => :section, :class => "custom_wrapper", :pattern => false do |b|
+      b.use :pattern
+      b.use :another, :class => "another_wrapper" do |ba|
+        ba.use :label
+        ba.use :input
+      end
+      b.use :error_wrapper, :tag => :div, :class => "error_wrapper" do |be|
+        be.use :error, :tag => :span, :class => "omg_error"
+      end
+      b.use :hint, :tag => :span, :class => "omg_hint"
+    end
   end
 
-  def with_concat_custom_form_for(object, &block)
-    concat custom_form_for(object, &block)
+  def custom_wrapper_without_top_level
+    SimpleForm.build :tag => false, :class => 'custom_wrapper_without_top_level' do |b|
+      b.use :label_input
+      b.use :hint,  :tag => :span, :class => :hint
+      b.use :error, :tag => :span, :class => :error
+    end
   end
 
   def custom_form_for(object, *args, &block)
@@ -41,8 +63,28 @@ module MiscHelpers
     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)
+  def with_concat_form_for(*args, &block)
+    concat simple_form_for(*args, &block)
+  end
+
+  def with_concat_custom_form_for(*args, &block)
+    concat custom_form_for(*args, &block)
+  end
+
+  def with_concat_custom_mapping_form_for(*args, &block)
+    concat custom_mapping_form_for(*args, &block)
+  end
+
+  def with_form_for(object, *args, &block)
+    with_concat_form_for(object) do |f|
+      f.input(*args, &block)
+    end
+  end
+
+  def with_input_for(object, attribute_name, type, options={})
+    with_concat_form_for(object) do |f|
+      f.input(attribute_name, options.merge(:as => type))
+    end
   end
 end
 

data/test/support/mock_controller.rb

@@ -1,12 +1,12 @@
 class MockController
-  attr_accessor :action_name
+  attr_writer :action_name
 
   def _routes
     self
   end
 
   def action_name
-    @action_name || "edit"
+    defined?(@action_name) ? @action_name : "edit"
   end
 
   def url_for(*args)

data/test/support/models.rb

@@ -26,14 +26,14 @@ class Company < Struct.new(:id, :name)
 end
 
 class Tag < Company
-  extend ActiveModel::Naming
-  include ActiveModel::Conversion
-
   def self.all(options={})
     (1..3).map{|i| Tag.new(i, "Tag #{i}")}
   end
 end
 
+class TagGroup < Struct.new(:id, :name, :tags)
+end
+
 class User
   extend ActiveModel::Naming
   include ActiveModel::Conversion
@@ -42,9 +42,10 @@ class User
     :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, :action
+    :post_count, :lock_version, :amount, :attempts, :action, :credit_card, :gender
 
   def initialize(options={})
+    @new_record = false
     options.each do |key, value|
       send("#{key}=", value)
     end if options
@@ -55,7 +56,7 @@ class User
   end
 
   def persisted?
-    !(@new_record || false)
+    !@new_record
   end
 
   def company_attributes=(*)
@@ -80,6 +81,7 @@ class User
       when :amount        then :integer
       when :attempts      then :integer
       when :action        then :string
+      when :credit_card   then :string
     end
     Column.new(attribute, column_type, limit)
   end
@@ -122,6 +124,10 @@ class User
       )
     end
   end
+
+  def self.readonly_attributes
+    [:credit_card]
+  end
 end
 
 class ValidatingUser < User
@@ -149,6 +155,8 @@ class ValidatingUser < User
     :only_integer => true
   validates_length_of :name, :maximum => 25
   validates_length_of :description, :maximum => 50
+  validates_length_of :action, :maximum => 10, :tokenizer => lambda { |str| str.scan(/\w+/) }
+  validates_length_of :home_picture, :is => 12
 
   def min_amount
     10
@@ -183,6 +191,13 @@ class OtherValidatingUser < User
     :only_integer => true
 
   validates_format_of :country, :with => /\w+/
+
+  # TODO: Remove this check when we drop Rails 3.0 support
+  if ActiveModel::VERSION::MAJOR == 3 && ActiveModel::VERSION::MINOR >= 1
+    validates_format_of :name, :with => Proc.new { /\w+/ }
+  else
+    validates_format_of :name, :with => /\w+/
+  end
 end
 
 class HashBackedAuthor < Hash

data/test/test_helper.rb

@@ -22,17 +22,13 @@ end
 $:.unshift File.expand_path("../../lib", __FILE__)
 require 'simple_form'
 
+require "rails/generators/test_case"
+require 'generators/simple_form/install_generator'
+
 Dir["#{File.dirname(__FILE__)}/support/*.rb"].each { |f| require f }
 I18n.default_locale = :en
 
-country_select = "#{File.dirname(__FILE__)}/support/country_select/lib"
-
-if File.exists?(country_select)
-  $:.unshift country_select
-  require 'country_select'
-else
-  raise "Could not find country_select plugin in test/support. Please execute git submodule update --init."
-end
+require 'country_select'
 
 class ActionView::TestCase
   include MiscHelpers
@@ -62,6 +58,7 @@ class ActionView::TestCase
       :id => 1,
       :name => 'New in Simple Form!',
       :description => 'Hello!',
+      :home_picture => 'Home picture',
       :created_at => Time.now,
       :age => 19,
       :amount => 15,

metadata

@@ -1,104 +1,90 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: simple_form
-version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
-  segments: 
-  - 1
-  - 5
-  - 2
-  version: 1.5.2
+version: !ruby/object:Gem::Version
+  version: 2.0.0.rc
+  prerelease: 6
 platform: ruby
-authors: 
-- "Jos\xC3\xA9 Valim"
-- "Carlos Ant\xC3\xB4nio"
+authors:
+- José Valim
+- Carlos Antônio
+- Rafael França
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-23 00:00:00 -03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activemodel
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70282593994180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: actionpack
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70282593994180
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: &70282593992720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *70282593992720
 description: Forms made easy!
 email: contact@plataformatec.com.br
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .gitmodules
-- .travis.yml
-- CHANGELOG.rdoc
-- Gemfile
+files:
+- CHANGELOG.md
 - MIT-LICENSE
-- README.rdoc
-- Rakefile
-- lib/generators/simple_form/USAGE
+- README.md
 - 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/config/initializers/simple_form.rb
+- lib/generators/simple_form/templates/config/initializers/simple_form.rb.tt
 - lib/generators/simple_form/templates/config/locales/simple_form.en.yml
-- lib/simple_form.rb
+- lib/generators/simple_form/templates/README
+- lib/generators/simple_form/USAGE
 - lib/simple_form/action_view_extensions/builder.rb
 - lib/simple_form/action_view_extensions/form_helper.rb
-- lib/simple_form/components.rb
 - lib/simple_form/components/errors.rb
 - lib/simple_form/components/hints.rb
+- lib/simple_form/components/html5.rb
 - lib/simple_form/components/label_input.rb
 - lib/simple_form/components/labels.rb
+- lib/simple_form/components/maxlength.rb
+- lib/simple_form/components/min_max.rb
+- lib/simple_form/components/pattern.rb
 - lib/simple_form/components/placeholders.rb
-- lib/simple_form/components/wrapper.rb
+- lib/simple_form/components/readonly.rb
+- lib/simple_form/components.rb
+- lib/simple_form/core_ext/hash.rb
 - lib/simple_form/error_notification.rb
 - lib/simple_form/form_builder.rb
-- lib/simple_form/helpers.rb
-- lib/simple_form/helpers/has_errors.rb
-- lib/simple_form/helpers/maxlength.rb
-- lib/simple_form/helpers/pattern.rb
+- lib/simple_form/helpers/autofocus.rb
+- lib/simple_form/helpers/disabled.rb
+- lib/simple_form/helpers/readonly.rb
 - lib/simple_form/helpers/required.rb
 - lib/simple_form/helpers/validators.rb
+- lib/simple_form/helpers.rb
 - lib/simple_form/i18n_cache.rb
-- lib/simple_form/inputs.rb
 - lib/simple_form/inputs/base.rb
 - lib/simple_form/inputs/block_input.rb
 - lib/simple_form/inputs/boolean_input.rb
+- lib/simple_form/inputs/collection_check_boxes_input.rb
 - lib/simple_form/inputs/collection_input.rb
+- lib/simple_form/inputs/collection_radio_buttons_input.rb
+- lib/simple_form/inputs/collection_select_input.rb
 - lib/simple_form/inputs/date_time_input.rb
 - lib/simple_form/inputs/file_input.rb
+- lib/simple_form/inputs/grouped_collection_select_input.rb
 - lib/simple_form/inputs/hidden_input.rb
 - lib/simple_form/inputs/numeric_input.rb
 - lib/simple_form/inputs/password_input.rb
@@ -106,73 +92,112 @@ files:
 - lib/simple_form/inputs/range_input.rb
 - lib/simple_form/inputs/string_input.rb
 - lib/simple_form/inputs/text_input.rb
+- lib/simple_form/inputs.rb
 - lib/simple_form/map_type.rb
 - lib/simple_form/version.rb
-- simple_form.gemspec
+- lib/simple_form/wrappers/builder.rb
+- lib/simple_form/wrappers/many.rb
+- lib/simple_form/wrappers/root.rb
+- lib/simple_form/wrappers/single.rb
+- lib/simple_form/wrappers.rb
+- lib/simple_form.rb
 - 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/custom_components.rb
-- test/discovery_inputs.rb
-- test/error_notification_test.rb
-- test/form_builder_test.rb
-- test/inputs_test.rb
+- test/form_builder/association_test.rb
+- test/form_builder/button_test.rb
+- test/form_builder/error_notification_test.rb
+- test/form_builder/error_test.rb
+- test/form_builder/general_test.rb
+- test/form_builder/hint_test.rb
+- test/form_builder/input_field_test.rb
+- test/form_builder/label_test.rb
+- test/form_builder/wrapper_test.rb
+- test/generators/simple_form_generator_test.rb
+- test/inputs/boolean_input_test.rb
+- test/inputs/collection_check_boxes_input_test.rb
+- test/inputs/collection_radio_buttons_input_test.rb
+- test/inputs/collection_select_input_test.rb
+- test/inputs/datetime_input_test.rb
+- test/inputs/disabled_test.rb
+- test/inputs/discovery_test.rb
+- test/inputs/file_input_test.rb
+- test/inputs/general_test.rb
+- test/inputs/grouped_collection_select_input_test.rb
+- test/inputs/hidden_input_test.rb
+- test/inputs/numeric_input_test.rb
+- test/inputs/priority_input_test.rb
+- test/inputs/readonly_test.rb
+- test/inputs/required_test.rb
+- test/inputs/string_input_test.rb
+- test/inputs/text_input_test.rb
 - test/simple_form_test.rb
+- test/support/discovery_inputs.rb
 - test/support/misc_helpers.rb
 - test/support/mock_controller.rb
 - test/support/mock_response.rb
 - test/support/models.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/plataformatec/simple_form
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4387068606574862378
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: simple_form
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Forms made easy!
-test_files: 
+test_files:
 - 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/custom_components.rb
-- test/discovery_inputs.rb
-- test/error_notification_test.rb
-- test/form_builder_test.rb
-- test/inputs_test.rb
+- test/form_builder/association_test.rb
+- test/form_builder/button_test.rb
+- test/form_builder/error_notification_test.rb
+- test/form_builder/error_test.rb
+- test/form_builder/general_test.rb
+- test/form_builder/hint_test.rb
+- test/form_builder/input_field_test.rb
+- test/form_builder/label_test.rb
+- test/form_builder/wrapper_test.rb
+- test/generators/simple_form_generator_test.rb
+- test/inputs/boolean_input_test.rb
+- test/inputs/collection_check_boxes_input_test.rb
+- test/inputs/collection_radio_buttons_input_test.rb
+- test/inputs/collection_select_input_test.rb
+- test/inputs/datetime_input_test.rb
+- test/inputs/disabled_test.rb
+- test/inputs/discovery_test.rb
+- test/inputs/file_input_test.rb
+- test/inputs/general_test.rb
+- test/inputs/grouped_collection_select_input_test.rb
+- test/inputs/hidden_input_test.rb
+- test/inputs/numeric_input_test.rb
+- test/inputs/priority_input_test.rb
+- test/inputs/readonly_test.rb
+- test/inputs/required_test.rb
+- test/inputs/string_input_test.rb
+- test/inputs/text_input_test.rb
 - test/simple_form_test.rb
+- test/support/discovery_inputs.rb
 - test/support/misc_helpers.rb
 - test/support/mock_controller.rb
 - test/support/mock_response.rb