simple_form 1.3.0 → 1.3.1

data/.gitignore

@@ -0,0 +1,2 @@
+.bundle/
+pkg/

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "test/support/country_select"]
+	path = test/support/country_select
+	url = git://github.com/rails/country_select

data/CHANGELOG.rdoc

@@ -0,0 +1,85 @@
+* enhancements
+  * Add :autofocus HTML5 attribute support (by github.com/jpzwarte)
+  * Add possibility to specify custom builder and inherit mappings (by github.com/rejeep)
+  * Make custom mappings work with all attributes types (by github.com/rafaelfranca)
+  * Add support for procs/lambdas in text/value methods for collection_select
+
+* deprecation
+  * removed the deprecated :remote_form_for
+
+* bug fix
+  * Only add the "required" HTML 5 attribute for valid inputs, disable in selects (not allowed)
+  * Fix error when using hints without an attribute (by github.com/butsjoh and github.com/rafaelfranca)
+  * Fix messy html output for hint, error and label components (by github.com/butsjoh and github.com/rafaelfranca)
+  * Allow direct setting of for attribute on label (by github.com/Bertg)
+
+== 1.3.0
+
+* enhancements
+  * Allow collection input to accept a collection of symbols
+  * Add default css class to button
+  * Allow forms for objects that don't respond to the "errors" method
+  * collection_check_boxes and collection_radio now wrap the input in the label
+  * Automatic add min/max values for numeric attributes based on validations and step for integers - HTML5 (by github.com/dasch)
+  * Add :placeholder option for string inputs, allowing customization through I18n - HTML5 (by github.com/jonathan)
+  * Add :search and :tel input types, with :tel mapping automatically from attributes matching "phone" - HTML5
+  * Add :required html attribute for required inputs - HTML5
+  * Add optional :components option to input to control component rendering (by github.com/khoan)
+  * Add SimpleForm.translate as an easy way to turn off SimpleForm internal translations
+  * Add :disabled option for all inputs (by github.com/fabiob)
+  * Add collection wrapper tag and item wrapper tag to wrap elements in collection helpers - radio / check boxes
+  * Add SimpleForm.input_mappings to allow configuring custom mappings for inputs (by github.com/TMaYaD)
+
+* bug fix
+  * Search for validations on both association and attribute
+  * Use controller.action_name to lookup action only when available, to fix issue with Rspec views tests (by github.com/rafaelfranca)
+
+== 1.2.2
+
+* enhancements
+  * Compatibility with Rails 3 RC
+
+== 1.2.1
+
+* enhancements
+  * Added haml generator support (by github.com/grimen)
+  * Added error_notification message to form builder
+  * Added required by default as configuration option
+  * Added label_input as component, allowing boolean to change its order (input appearing first than label)
+  * Added error_method to tidy up how errors are exhibited
+  * Added error class on wrappers (by github.com/jduff)
+  * Changed numeric types to have type=number for HTML5
+
+== 1.2.0
+
+* deprecation
+  * Changed simple_form_install generator to simple_form:install
+
+* enhancements
+  * Added support to presence validation to check if attribute is required or not (by github.com/gcirne)
+  * Added .input as class to wrapper tag
+  * Added config options for hint and error tags (by github.com/tjogin)
+
+== 1.1.3
+
+* deprecation
+  * removed :conditions, :order, :joins and :include support in f.association
+
+== 1.1.2
+
+* bug fix
+  * Ensure type is set to "text" and not "string"
+
+== 1.1.1
+
+* bug fix
+  * Fix some escaping issues
+
+== 1.1.0
+
+* enhancements
+  * Rails 3 support with generators, templates and HTML 5
+
+== 1.0
+
+* First release

data/Gemfile

@@ -0,0 +1,13 @@
+source "http://rubygems.org"
+
+gem "rails", "~> 3.0.0"
+
+group :test do
+  gem "mocha", :require => false
+
+  if RUBY_VERSION < "1.9"
+    gem "ruby-debug", :require => false
+  else
+    gem "test-unit", :require => false
+  end
+end

data/Gemfile.lock

@@ -0,0 +1,82 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+    activesupport (3.0.3)
+    arel (2.0.6)
+    builder (2.1.2)
+    columnize (0.3.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.5.0)
+    linecache (0.43)
+    mail (2.2.12)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    mocha (0.9.10)
+      rake
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.6)
+      rack (>= 1.0)
+    rails (3.0.3)
+      actionmailer (= 3.0.3)
+      actionpack (= 3.0.3)
+      activerecord (= 3.0.3)
+      activeresource (= 3.0.3)
+      activesupport (= 3.0.3)
+      bundler (~> 1.0)
+      railties (= 3.0.3)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.8.7)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.23)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mocha
+  rails (~> 3.0.0)
+  ruby-debug

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2010 PlataformaTec http://blog.plataformatec.com.br/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -370,9 +370,23 @@ SimpleForm has several configuration values. You can read and change them in the
 
   rails generate simple_form:install
 
-== TODO
+== Custom form builder
 
-Please refer to TODO file.
+You can create a custom form builder that uses SimpleForm.
+
+Create a helper method that calls simple_form_for with a custom builder:
+
+  def custom_form_for(object, *args, &block)
+    simple_form_for(object, *(args << { :builder => CustomFormBuilder }), &block)
+  end
+
+Create a form builder class that inherits from SimpleForm::FormBuilder.
+
+  class CustomFormBuilder < SimpleForm::FormBuilder
+    def input(attribute_name, *args, &block)
+      super(attribute_name, *(args << { :input_html => { :class => 'custom' } }), &block)
+    end
+  end
 
 == Maintainers
 

data/Rakefile

@@ -0,0 +1,27 @@
+# encoding: UTF-8
+
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the simple_form plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Generate documentation for the simple_form plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'SimpleForm'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/lib/generators/simple_form/templates/_form.html.haml

@@ -6,8 +6,8 @@
         prohibited this <%= singular_name %> from being saved:
 
       %ul
-      - @<%= singular_name %>.errors.full_messages.each do |msg|
-        %li= msg
+        - @<%= singular_name %>.errors.full_messages.each do |msg|
+          %li= msg
 
   .inputs
   <%- attributes.each do |attribute| -%>

data/lib/simple_form/action_view_extensions/builder.rb

@@ -7,7 +7,9 @@ module SimpleForm
       # Create a collection of radio inputs for the attribute. Basically this
       # helper will create a radio input associated with a label for each
       # text/value option in the collection, using value_method and text_method
-      # to convert these text/value. Based on collection_select.
+      # to convert these text/value. You can give a symbol or a proc to both
+      # value_method and text_method, that will be evaluated for each item in
+      # the collection.
       #
       # == Examples
       #
@@ -42,9 +44,11 @@ module SimpleForm
         end
       end
 
-      # Creates a collection of check boxes for each item in the collection, associated
-      # with a clickable label. Use value_method and text_method to convert items in
-      # the collection for use as text/value in check boxes.
+      # Creates a collection of check boxes for each item in the collection,
+      # associated with a clickable label. Use value_method and text_method to
+      # convert items in the collection for use as text/value in check boxes.
+      # You can give a symbol or a proc to both value_method and text_method,
+      # that will be evaluated for each item in the collection.
       #
       # == Examples
       #
@@ -154,4 +158,25 @@ module SimpleForm
   end
 end
 
-ActionView::Helpers::FormBuilder.send :include, SimpleForm::ActionViewExtensions::Builder
+class ActionView::Helpers::FormBuilder
+  include SimpleForm::ActionViewExtensions::Builder
+
+  # Override default Rails collection_select helper to handle lambdas/procs in
+  # text and value methods, so it works the same way as collection_radio and
+  # collection_check_boxes in SimpleForm. If none of text/value methods is a
+  # callable object, then it just delegates back to original collection select.
+  #
+  alias :original_collection_select :collection_select
+  def collection_select(attribute, collection, value_method, text_method, options={}, html_options={})
+    if value_method.respond_to?(:call) || text_method.respond_to?(:call)
+      collection = collection.map do |item|
+        value = value_for_collection(item, value_method)
+        text  = value_for_collection(item, text_method)
+        [value, text]
+      end
+      value_method, text_method = :first, :last
+    end
+
+    original_collection_select(attribute, collection, value_method, text_method, options, html_options)
+  end
+end

data/lib/simple_form/action_view_extensions/form_helper.rb

@@ -1,7 +1,6 @@
 module SimpleForm
   module ActionViewExtensions
-    # This modules create simple form wrappers around default form_for,
-    # fields_for and remote_form_for.
+    # This module creates simple form wrappers around default form_for and fields_for.
     #
     # Example:
     #
@@ -30,11 +29,11 @@ module SimpleForm
         result
       end
 
-      [:form_for, :fields_for, :remote_form_for].each do |helper|
+      [:form_for, :fields_for].each do |helper|
         class_eval <<-METHOD, __FILE__, __LINE__
           def simple_#{helper}(record_or_name_or_array, *args, &block)
             options = args.extract_options!
-            options[:builder] = SimpleForm::FormBuilder
+            options[:builder] ||= SimpleForm::FormBuilder
             css_class = case record_or_name_or_array
               when String, Symbol then record_or_name_or_array.to_s
               when Array then dom_class(record_or_name_or_array.last)

data/lib/simple_form/components/labels.rb

@@ -37,7 +37,7 @@ module SimpleForm
 
       def label_html_options
         label_options = html_options_for(:label, [input_type, required_class])
-        label_options[:for] = options[:input_html][:id] if options.key?(:input_html)
+        label_options[:for] = options[:input_html][:id] if options.key?(:input_html) && options[:input_html].key?(:id)
         label_options
       end
 

data/lib/simple_form/form_builder.rb

@@ -175,7 +175,7 @@ module SimpleForm
     #    f.error :name, :id => "cool_error"
     #
     def error(attribute_name, options={})
-      options[:error_html] = options
+      options[:error_html] = options.dup
       column      = find_attribute_column(attribute_name)
       input_type  = default_input_type(attribute_name, column, options)
       SimpleForm::Inputs::Base.new(self, attribute_name, column, input_type, options).error
@@ -192,7 +192,7 @@ module SimpleForm
     #    f.hint "Don't forget to accept this"
     #
     def hint(attribute_name, options={})
-      options[:hint_html] = options
+      options[:hint_html] = options.dup
       if attribute_name.is_a?(String)
         options[:hint] = attribute_name
         attribute_name, column, input_type = nil, nil, nil
@@ -219,8 +219,8 @@ module SimpleForm
     def label(attribute_name, *args)
       return super if args.first.is_a?(String)
       options = args.extract_options!
+      options[:label_html] = options.dup
       options[:label]      = options.delete(:label)
-      options[:label_html] = options
       options[:required]   = options.delete(:required)
       column      = find_attribute_column(attribute_name)
       input_type  = default_input_type(attribute_name, column, options)
@@ -250,9 +250,9 @@ module SimpleForm
     def default_input_type(attribute_name, column, options) #:nodoc:
       return options[:as].to_sym if options[:as]
       return :select             if options[:collection]
+      custom_type = find_custom_type(attribute_name.to_s) and return custom_type
 
       input_type = column.try(:type)
-
       case input_type
         when :timestamp
           :datetime
@@ -264,10 +264,6 @@ module SimpleForm
             when /email/     then :email
             when /phone/     then :tel
             when /url/       then :url
-            else
-              SimpleForm.input_mappings.find { |match, type|
-                attribute_name.to_s =~ match
-              }.try(:last) if SimpleForm.input_mappings
           end
 
           match || input_type || file_method?(attribute_name) || :string
@@ -276,21 +272,30 @@ module SimpleForm
       end
     end
 
+    def find_custom_type(attribute_name)
+      SimpleForm.input_mappings.find { |match, type|
+        attribute_name =~ match
+      }.try(:last) if SimpleForm.input_mappings
+    end
+
     # Checks if attribute is a file_method.
     def file_method?(attribute_name) #:nodoc:
       file = @object.send(attribute_name) if @object.respond_to?(attribute_name)
       :file if file && SimpleForm.file_methods.any? { |m| file.respond_to?(m) }
     end
 
-    # Finds the database column for the given attribute
+    # Finds the database column for the given attribute.
     def find_attribute_column(attribute_name) #:nodoc:
-      @object.column_for_attribute(attribute_name) if @object.respond_to?(:column_for_attribute)
+      if @object.respond_to?(:column_for_attribute)
+        @object.column_for_attribute(attribute_name)
+      end
     end
 
-    # Find reflection related to association
+    # Find reflection related to association.
     def find_association_reflection(association) #:nodoc:
-      @object.class.reflect_on_association(association) if @object.class.respond_to?(:reflect_on_association)
+      if @object.class.respond_to?(:reflect_on_association)
+        @object.class.reflect_on_association(association)
+      end
     end
-
   end
 end

data/lib/simple_form/inputs/base.rb

@@ -28,8 +28,9 @@ module SimpleForm
         @reflection         = options.delete(:reflection)
         @options            = options
         @input_html_options = html_options_for(:input, input_html_classes).tap do |o|
-          o[:required] = true if attribute_required?
-          o[:disabled] = true if disabled?
+          o[:required]  = true if has_required?
+          o[:disabled]  = true if disabled?
+          o[:autofocus] = true if has_autofocus?
         end
       end
 
@@ -71,8 +72,17 @@ module SimpleForm
         end
       end
 
+      # Whether this input is valid for HTML 5 required attribute.
+      def has_required?
+        attribute_required?
+      end
+
+      def has_autofocus?
+        options[:autofocus]
+      end
+
       def has_validators?
-        object.class.respond_to?(:validators_on)
+        attribute_name && object.class.respond_to?(:validators_on)
       end
 
       def attribute_validators

data/lib/simple_form/inputs/collection_input.rb

@@ -31,6 +31,11 @@ module SimpleForm
         @collection ||= (options.delete(:collection) || self.class.boolean_collection).to_a
       end
 
+      # Select components does not allow the required html tag.
+      def has_required?
+        super && input_type != :select
+      end
+
       # Check if :include_blank must be included by default.
       def skip_include_blank?
         (options.keys & [:prompt, :include_blank, :default, :selected]).any? ||

data/lib/simple_form/inputs/date_time_input.rb

@@ -7,6 +7,10 @@ module SimpleForm
 
     private
 
+      def has_required?
+        false
+      end
+
       def label_target
         case input_type
         when :date, :datetime

data/lib/simple_form/inputs/priority_input.rb

@@ -12,9 +12,13 @@ module SimpleForm
 
     protected
 
+      def has_required?
+        false
+      end
+
       def skip_include_blank?
         super || input_priority.present?
       end
     end
   end
-end
+end

data/lib/simple_form/map_type.rb

@@ -1,7 +1,10 @@
+require 'active_support/core_ext/class/attribute'
+
 module SimpleForm
   module MapType
-    def mappings
-      @mappings ||= {}
+    def self.extended(base)
+      base.class_attribute :mappings
+      base.mappings = {}
     end
 
     def map_type(*types)

data/lib/simple_form/version.rb

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

data/simple_form.gemspec

@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "simple_form/version"
+
+Gem::Specification.new do |s|
+  s.name        = "simple_form"
+  s.version     = SimpleForm::VERSION.dup
+  s.platform    = Gem::Platform::RUBY
+  s.summary     = "Forms made easy!"
+  s.email       = "contact@plataformatec.com.br"
+  s.homepage    = "http://github.com/plataformatec/simple_form"
+  s.description = "Forms made easy!"
+  s.authors     = ['José Valim', 'Carlos Antônio']
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.test_files   -= Dir["test/support/country_select/**/*"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.rubyforge_project = "simple_form"
+end

data/test/components/label_test.rb

@@ -170,6 +170,16 @@ class LabelTest < ActionView::TestCase
     assert_select 'label[for=my_new_id]'
   end
 
+  test 'label should allow overwriting of for attribute' do
+    with_label_for @user, :name, :string, :label_html => { :for => 'my_new_id' }
+    assert_select 'label[for=my_new_id]'
+  end
+
+  test 'label should allow overwriting of for attribute with input_html not containing id' do
+    with_label_for @user, :name, :string, :label_html => { :for => 'my_new_id' }, :input_html => {:class => 'foo'}
+    assert_select 'label[for=my_new_id]'
+  end
+
   test 'label should use default input id when it was not overridden' do
     with_label_for @user, :name, :string, :input_html => { :class => 'my_new_id' }
     assert_select 'label[for=user_name]'

data/test/form_builder_test.rb

@@ -9,6 +9,12 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
+  def with_custom_form_for(object, *args, &block)
+    with_concat_custom_form_for(object) do |f|
+      f.input(*args, &block)
+    end
+  end
+
   def with_button_for(object, *args)
     with_concat_form_for(object) do |f|
       f.button(*args)
@@ -70,6 +76,14 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
+  test 'builder should allow adding custom input mappings for integer input types' do
+    swap SimpleForm, :input_mappings => { /lock_version/ => :hidden } do
+      with_form_for @user, :lock_version
+      assert_no_select 'form input#user_lock_version.integer'
+      assert_select 'form input#user_lock_version.hidden'
+    end
+  end
+
   test 'builder uses the first matching custom input map when more than one match' do
     swap SimpleForm, :input_mappings => { /count$/ => :integer, /^post_/ => :password } do
       with_form_for @user, :post_count
@@ -78,6 +92,14 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
+  test 'builder uses the custom map only for matched attributes' do
+    swap SimpleForm, :input_mappings => { /lock_version/ => :hidden } do
+      with_form_for @user, :post_count
+      assert_no_select 'form input#user_post_count.hidden'
+      assert_select 'form input#user_post_count.string'
+    end
+  end
+
   # INPUT TYPES
   test 'builder should generate text fields for string columns' do
     with_form_for @user, :name
@@ -371,6 +393,11 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'span.error', "can't be blank"
   end
 
+  test 'builder should generate an error tag with a clean HTML' do
+    with_error_for @user, :name
+    assert_no_select 'span.error[error_html]'
+  end
+
   test 'builder should allow passing options to error tag' do
     with_error_for @user, :name, :id => 'name_error'
     assert_select 'span.error#name_error', "can't be blank"
@@ -384,11 +411,22 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
+  test 'builder should generate a hint component tag for the given text for a model with ActiveModel::Validations' do
+    with_hint_for @validating_user, 'Hello World!'
+    assert_select 'span.hint', 'Hello World!'
+  end
+
   test 'builder should generate a hint component tag for the given text' do
     with_hint_for @user, 'Hello World!'
     assert_select 'span.hint', 'Hello World!'
   end
 
+  test 'builder should generate a hint componet tag with a clean HTML' do
+    with_hint_for @validating_user, 'Hello World!'
+    assert_no_select 'span.hint[hint]'
+    assert_no_select 'span.hint[hint_html]'
+  end
+
   test 'builder should allow passing options to hint tag' do
     with_hint_for @user, :name, :hint => 'Hello World!', :id => 'name_hint'
     assert_select 'span.hint#name_hint', 'Hello World!'
@@ -400,6 +438,11 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'label.string[for=user_name]', /Name/
   end
 
+  test 'builder should generate a label componet tag with a clean HTML' do
+    with_label_for @user, :name
+    assert_no_select 'label.string[label_html]'
+  end
+
   test 'builder should add a required class to label if the attribute is required' do
     with_label_for @validating_user, :name
     assert_select 'label.string.required[for=validating_user_name]', /Name/
@@ -562,4 +605,10 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'form ul', :count => 1
     assert_select 'form ul li', :count => 3
   end
+
+  # CUSTOM FORM BUILDER
+  test 'custom builder should inherit mappings' do
+    with_custom_form_for @user, :email
+    assert_select 'form input[type=email]#user_email.custom'
+  end
 end

data/test/inputs_test.rb

@@ -62,6 +62,41 @@ 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 'input should render components according to an optional :components option' do
     with_input_for @user, :name, :string, :components => [:input, :label]
     assert_select 'input + label'
@@ -321,6 +356,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 +436,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
@@ -559,6 +606,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 +638,18 @@ 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 '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,18 @@ 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
+end
+
+class CustomFormBuilder < SimpleForm::FormBuilder
+  def input(attribute_name, *args, &block)
+    super(attribute_name, *(args << { :input_html => { :class => 'custom' } }), &block)
+  end
 end

data/test/support/models.rb

@@ -40,7 +40,7 @@ class User
 
   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
+    :avatar, :email, :status, :residence_country, :phone_number, :post_count, :lock_version
 
   def initialize(options={})
     options.each do |key, value|
@@ -70,6 +70,7 @@ class User
       when :delivery_time then :time
       when :created_at    then :datetime
       when :updated_at    then :timestamp
+      when :lock_version  then :integer
     end
     Column.new(attribute, column_type, limit)
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_form
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -16,34 +16,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 -02:00
+date: 2011-02-06 00:00:00 -02: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
+- CHANGELOG.rdoc
+- Gemfile
+- Gemfile.lock
+- MIT-LICENSE
+- README.rdoc
+- Rakefile
 - init.rb
 - lib/generators/simple_form/USAGE
 - lib/generators/simple_form/install_generator.rb
@@ -78,7 +71,7 @@ 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
@@ -123,8 +116,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.5.0
 signing_key: 
 specification_version: 3
 summary: Forms made easy!