ShadowBelmolve-formtastic 0.2.1 → 0.9.7

data/Rakefile

@@ -1,15 +1,44 @@
+# coding: utf-8
 require 'rake'
 require 'rake/rdoctask'
-require 'spec/rake/spectask'
 
 begin
-  GEM = "formtastic"
+  require 'spec/rake/spectask'
+rescue LoadError
+  begin
+    gem 'rspec-rails', '>= 1.0.0'
+    require 'spec/rake/spectask'
+  rescue LoadError
+    puts "[formtastic:] RSpec - or one of it's dependencies - is not available. Install it with: sudo gem install rspec-rails"
+  end
+end
+
+begin
+  GEM = "ShadowBelmolve-formtastic"
   AUTHOR = "Justin French"
   EMAIL = "justin@indent.com.au"
   SUMMARY = "A Rails form builder plugin/gem with semantically rich and accessible markup"
-  HOMEPAGE = "http://github.com/justinfrench/formtastic/tree/master"
+  HOMEPAGE = "http://github.com/ShadowBelmolve/formtastic/tree/master"
+  INSTALL_MESSAGE = %q{
+  ========================================================================
+  Thanks for installing Formtastic!
+  ------------------------------------------------------------------------
+  You can now (optionally) run the generator to copy some stylesheets and
+  a config initializer into your application:
+    ./script/generate formtastic
+
+  To generate some semantic form markup for your exisiting models, just run:
+    ./script/generate form MODEL_NAME
+
+  Find out more and get involved:
+    http://github.com/justinfrench/formtastic
+    http://groups.google.com.au/group/formtastic
+  ========================================================================
+  }
   
+  gem 'jeweler', '>= 1.0.0'
   require 'jeweler'
+  
   Jeweler::Tasks.new do |s|
     s.name = GEM
     s.summary = SUMMARY
@@ -17,30 +46,30 @@ begin
     s.homepage = HOMEPAGE
     s.description = SUMMARY
     s.author = AUTHOR
+    s.post_install_message = INSTALL_MESSAGE
     
     s.require_path = 'lib'
-    s.autorequire = GEM
     s.files = %w(MIT-LICENSE README.textile Rakefile) + Dir.glob("{rails,lib,generators,spec}/**/*")
+    
+    # Runtime dependencies: When installing Formtastic these will be checked if they are installed.
+    # Will be offered to install these if they are not already installed.
+    s.add_dependency 'activesupport', '>= 2.3.0'
+    s.add_dependency 'actionpack', '>= 2.3.0'
+    
+    # Development dependencies. Not installed by default.
+    # Install with: sudo gem install formtastic --development
+    s.add_development_dependency 'rspec-rails', '>= 1.2.6'
+    s.add_development_dependency 'rspec_tag_matchers', '>= 1.0.0'
   end
+  
+  Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "[formtastic:] Jeweler - or one of its dependencies - is not available. Install it with: sudo gem install jeweler -s http://gemcutter.org"
 end
 
 desc 'Default: run unit specs.'
 task :default => :spec
 
-desc 'Test the formtastic plugin.'
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ["-c"]
-end
-
-desc 'Test the formtastic plugin with specdoc formatting and colors'
-Spec::Rake::SpecTask.new('specdoc') do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ["--format specdoc", "-c"]
-end
-
 desc 'Generate documentation for the formtastic plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -50,9 +79,23 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-desc "Run all examples with RCov"
-Spec::Rake::SpecTask.new('examples_with_rcov') do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.rcov = true
-  t.rcov_opts = ['--exclude', 'spec,Library']
+if defined?(Spec)
+  desc 'Test the formtastic plugin.'
+  Spec::Rake::SpecTask.new('spec') do |t|
+    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.spec_opts = ["-c"]
+  end
+
+  desc 'Test the formtastic plugin with specdoc formatting and colors'
+  Spec::Rake::SpecTask.new('specdoc') do |t|
+    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.spec_opts = ["--format specdoc", "-c"]
+  end
+
+  desc "Run all examples with RCov"
+  Spec::Rake::SpecTask.new('examples_with_rcov') do |t|
+    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.rcov = true
+    t.rcov_opts = ['--exclude', 'spec,Library']
+  end
 end

data/generators/form/USAGE

@@ -0,0 +1,16 @@
+NAME
+  form - Formtastic form generator.
+  
+DESCRIPTION
+  Generates formtastic form code based on an existing model. By default the generated code will be printed out directly in the terminal, and also copied to clipboard. Can optionally be saved into partial directly.
+  
+  Required:
+    ExistingModelName - The name of an existing model for which the generator should generate form code.
+    
+  Options:
+    --haml              Generate HAML instead of ERB.
+    --partial           Generate a form partial in the model views path, i.e. "_form.html.erb" or _form.html.haml".
+    --controller PATH   Generate for custom controller/view path - in case model and controller namespace is different, i.e. "admin/posts".
+    
+EXAMPLE
+  ./script/generate form ExistingModelName [--haml] [--partial]

data/generators/form/form_generator.rb

@@ -0,0 +1,120 @@
+# coding: utf-8
+# Get current OS - needed for clipboard functionality
+case RUBY_PLATFORM
+when /darwin/ then
+  CURRENT_OS = :osx
+when /win32/
+  CURRENT_OS = :win
+  begin
+    require 'win32/clipboard'
+  rescue LoadError
+    # Do nothing
+  end
+else
+  CURRENT_OS = :x
+end
+
+class FormGenerator < Rails::Generator::NamedBase
+  
+  default_options :haml => false,
+                  :partial => false
+  
+  VIEWS_PATH = File.join('app', 'views').freeze
+  IGNORED_COLUMNS = [:updated_at, :created_at].freeze
+  
+  attr_reader   :controller_file_name,
+                :controller_class_path,
+                :controller_class_nesting,
+                :controller_class_nesting_depth,
+                :controller_class_name,
+                :template_type
+                
+  def initialize(runtime_args, runtime_options = {})
+    super
+    base_name, @controller_class_path = extract_modules(@name.pluralize)
+    controller_class_name_without_nesting, @controller_file_name = inflect_names(base_name)
+    @template_type = options[:haml] ? :haml : :erb
+  end
+  
+  def manifest
+    record do |m|
+      if options[:partial]
+        controller_and_view_path = options[:controller] || File.join(controller_class_path, controller_file_name)
+        # Ensure directory exists.
+        m.directory File.join(VIEWS_PATH, controller_and_view_path)
+        # Create a form partial for the model as "_form" in it's views path.
+        m.template "view__form.html.#{template_type}", File.join(VIEWS_PATH, controller_and_view_path, "_form.html.#{template_type}")
+      else
+        # Load template file, and render without saving to file
+        template = File.read(File.join(source_root, "view__form.html.#{template_type}"))
+        erb = ERB.new(template, nil, '-')
+        generated_code = erb.result(binding).strip rescue nil
+        
+        # Print the result, and copy to clipboard
+        puts "# ---------------------------------------------------------"
+        puts "#  GENERATED FORMTASTIC CODE"
+        puts "# ---------------------------------------------------------"
+        puts
+        puts generated_code || " Nothing could be generated - model exists?"
+        puts
+        puts "# ---------------------------------------------------------"
+        puts " Copied to clipboard - just paste it!" if save_to_clipboard(generated_code)
+      end
+    end
+  end
+  
+  protected
+    
+    # Save to lipboard with multiple OS support.
+    def save_to_clipboard(data)
+      return unless data
+      begin
+        case CURRENT_OS
+        when :osx
+          `echo "#{data}" | pbcopy`
+        when :win
+          ::Win32::Clipboard.data = data
+        else # :linux/:unix
+          `echo "#{data}" | xsel --clipboard` || `echo "#{data}" | xclip`
+        end
+      rescue
+        false
+      else
+        true
+      end
+    end
+    
+    # Add additional model attributes if specified in args - probably not that common scenario.
+    def attributes
+      # Get columns for the requested model.
+      existing_attributes = @class_name.constantize.content_columns.reject { |column| IGNORED_COLUMNS.include?(column.name.to_sym) }
+      @args = super + existing_attributes
+    end
+    
+    def add_options!(opt)
+      opt.separator ''
+      opt.separator 'Options:'
+      
+      # Allow option to generate HAML views instead of ERB.
+      opt.on('--haml',
+        "Generate HAML output instead of the default ERB.") do |v|
+        options[:haml] = v
+      end
+      
+      # Allow option to generate to partial in model's views path, instead of printing out in terminal.
+      opt.on('--partial',
+        "Save generated output directly to a form partial (app/views/{resource}/_form.html.*).") do |v|
+        options[:partial] = v
+      end
+      
+      opt.on('--controller CONTROLLER_PATH',
+        "Specify a non-standard controller for the specified model (e.g. admin/posts).") do |v|
+        options[:controller] = v if v.present?
+      end
+    end
+    
+    def banner
+      "Usage: #{$0} form ExistingModelName [--haml] [--partial]"
+    end
+    
+end

data/generators/form/templates/view__form.html.erb

@@ -0,0 +1,5 @@
+<%% form.inputs do %>
+<% attributes.each do |attribute| -%>
+  <%%= form.input :<%= attribute.name %>, :label => '<%= attribute.name.humanize %>' %>
+<% end -%>
+<%% end %>

data/generators/form/templates/view__form.html.haml

@@ -0,0 +1,4 @@
+- form.inputs do
+<% attributes.each do |attribute| -%>
+  = form.input :<%= attribute.name %>, :label => '<%= attribute.name.humanize %>'
+<% end -%>

data/generators/formtastic/formtastic_generator.rb

@@ -0,0 +1,24 @@
+class FormtasticGenerator < Rails::Generator::Base
+  
+  def initialize(*runtime_args)
+    super
+  end
+  
+  def manifest
+    record do |m|
+      m.directory File.join('config', 'initializers')
+      m.template 'formtastic.rb',   File.join('config', 'initializers', 'formtastic.rb')
+
+      m.directory File.join('public', 'stylesheets')
+      m.template 'formtastic.css',   File.join('public', 'stylesheets', 'formtastic.css')
+      m.template 'formtastic_changes.css',   File.join('public', 'stylesheets', 'formtastic_changes.css')
+    end
+  end
+    
+  protected
+  
+  def banner
+    %{Usage: #{$0} #{spec.name}\nCopies formtastic.css and formtastic_changes.css to public/stylesheets/ and a config initializer to config/initializers/formtastic.rb}
+  end
+  
+end

data/generators/{formtastic_stylesheets → formtastic}/templates/formtastic.css

@@ -64,6 +64,7 @@ form.formtastic fieldset ol li li label input { line-height:100%; vertical-align
 form.formtastic fieldset ol li fieldset { position:relative; }
 form.formtastic fieldset ol li fieldset legend { position:absolute; width:25%; padding-top:0.1em; }
 form.formtastic fieldset ol li fieldset legend span { position:absolute; }
+form.formtastic fieldset ol li fieldset legend.label label { position:absolute; }
 form.formtastic fieldset ol li fieldset ol { float:left; width:74%; margin:0; padding:0 0 0 25%; }
 form.formtastic fieldset ol li fieldset ol li { padding:0; border:0; }
 
@@ -83,6 +84,7 @@ form.formtastic fieldset ol li ul.errors li { padding:0; border:none; display:li
 /* STRING & NUMERIC OVERRIDES
 --------------------------------------------------------------------------------------------------*/
 form.formtastic fieldset ol li.string input { width:74%; }
+form.formtastic fieldset ol li.password input { width:74%; }
 form.formtastic fieldset ol li.numeric input { width:74%; }
 
 

data/generators/formtastic/templates/formtastic.rb

@@ -0,0 +1,51 @@
+# Set the default text field size when input is a string. Default is 50.
+# Formtastic::SemanticFormBuilder.default_text_field_size = 50
+
+# Should all fields be considered "required" by default?
+# Defaults to true, see ValidationReflection notes below.
+# Formtastic::SemanticFormBuilder.all_fields_required_by_default = true
+
+# Should select fields have a blank option/prompt by default?
+# Defaults to true.
+# Formtastic::SemanticFormBuilder.include_blank_for_select_by_default = true
+
+# Set the string that will be appended to the labels/fieldsets which are required
+# It accepts string or procs and the default is a localized version of
+# '<abbr title="required">*</abbr>'. In other words, if you configure formtastic.required
+# in your locale, it will replace the abbr title properly. But if you don't want to use
+# abbr tag, you can simply give a string as below
+# Formtastic::SemanticFormBuilder.required_string = "(required)"
+
+# Set the string that will be appended to the labels/fieldsets which are optional
+# Defaults to an empty string ("") and also accepts procs (see required_string above)
+# Formtastic::SemanticFormBuilder.optional_string = "(optional)"
+
+# Set the way inline errors will be displayed.
+# Defaults to :sentence, valid options are :sentence, :list and :none
+# Formtastic::SemanticFormBuilder.inline_errors = :sentence
+
+# Set the method to call on label text to transform or format it for human-friendly
+# reading when formtastic is user without object. Defaults to :humanize.
+# Formtastic::SemanticFormBuilder.label_str_method = :humanize
+
+# Set the array of methods to try calling on parent objects in :select and :radio inputs
+# for the text inside each @<option>@ tag or alongside each radio @<input>@. The first method
+# that is found on the object will be used.
+# Defaults to ["to_label", "display_name", "full_name", "name", "title", "username", "login", "value", "to_s"]
+# Formtastic::SemanticFormBuilder.collection_label_methods = [
+#   "to_label", "display_name", "full_name", "name", "title", "username", "login", "value", "to_s"]
+
+# Formtastic by default renders inside li tags the input, hints and then
+# errors messages. Sometimes you want the hints to be rendered first than
+# the input, in the following order: hints, input and errors. You can
+# customize it doing just as below:
+# Formtastic::SemanticFormBuilder.inline_order = [:input, :hints, :errors]
+
+# Specifies if labels/hints for input fields automatically be looked up using I18n.
+# Default value: false. Overridden for specific fields by setting value to true,
+# i.e. :label => true, or :hint => true (or opposite depending on initialized value)
+# Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
+
+# You can add custom inputs or override parts of Formtastic by subclassing SemanticFormBuilder and
+# specifying that class here.  Defaults to SemanticFormBuilder.
+# Formtastic::SemanticFormHelper.builder = MyCustomBuilder

data/generators/formtastic_stylesheets/formtastic_stylesheets_generator.rb

@@ -1,21 +1,16 @@
 class FormtasticStylesheetsGenerator < Rails::Generator::Base
   
   def initialize(*runtime_args)
-    super
+    puts %q{
+===================================================
+Please run `./script/generate formtastic` instead.
+===================================================
+  }
   end
   
   def manifest
     record do |m|
-      m.directory File.join('public', 'stylesheets')
-      m.template 'formtastic.css',   File.join('public', 'stylesheets', 'formtastic.css')
-      m.template 'formtastic_changes.css',   File.join('public', 'stylesheets', 'formtastic_changes.css')
     end
   end
   
-  protected
-  
-  def banner
-    %{Usage: #{$0} #{spec.name}\nCopies formtastic.css and formtastic_changes.css to public/}
-  end
-  
 end

data/lib/formtastic.rb

@@ -1,9 +1,5 @@
-# Override the default ActiveRecordHelper behaviour of wrapping the input.
-# This gets taken care of semantically by adding an error class to the LI tag
-# containing the input.
-ActionView::Base.field_error_proc = proc do |html_tag, instance_tag|
-  html_tag
-end
+# coding: utf-8
+require File.join(File.dirname(__FILE__), *%w[formtastic i18n])
 
 module Formtastic #:nodoc:
 
@@ -11,7 +7,8 @@ module Formtastic #:nodoc:
 
     @@default_text_field_size = 50
     @@all_fields_required_by_default = true
-    @@required_string = proc { %{<abbr title="#{I18n.t 'formtastic.required', :default => 'required'}">*</abbr>} }
+    @@include_blank_for_select_by_default = true
+    @@required_string = proc { %{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>} }
     @@optional_string = ''
     @@inline_errors = :sentence
     @@label_str_method = :humanize
@@ -20,24 +17,15 @@ module Formtastic #:nodoc:
     @@file_methods = [ :file?, :public_filename ]
     @@priority_countries = ["Australia", "Canada", "United Kingdom", "United States"]
     @@i18n_lookups_by_default = false
+    @@default_commit_button_accesskey = nil 
 
-    cattr_accessor :default_text_field_size, :all_fields_required_by_default, :required_string,
-                   :optional_string, :inline_errors, :label_str_method, :collection_label_methods,
-                   :inline_order, :file_methods, :priority_countries, :i18n_lookups_by_default
+    cattr_accessor :default_text_field_size, :all_fields_required_by_default, :include_blank_for_select_by_default,
+                   :required_string, :optional_string, :inline_errors, :label_str_method, :collection_label_methods,
+                   :inline_order, :file_methods, :priority_countries, :i18n_lookups_by_default, :default_commit_button_accesskey 
 
-    I18N_SCOPES = [ '{{model}}.{{action}}.{{attribute}}',
-                    '{{model}}.{{attribute}}',
-                    '{{attribute}}']
+    RESERVED_COLUMNS = [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
 
-    # Keeps simple mappings in a hash
-    INPUT_MAPPINGS = {
-      :string   => :text_field,
-      :password => :password_field,
-      :numeric  => :text_field,
-      :text     => :text_area,
-      :file     => :file_field
-    }
-    STRING_MAPPINGS = [ :string, :password, :numeric ]
+    INLINE_ERROR_TYPES = [:sentence, :list, :first]
 
     attr_accessor :template
 
@@ -78,7 +66,8 @@ module Formtastic #:nodoc:
     #
     #   <% semantic_form_for @employee do |form| %>
     #     <% form.inputs do -%>
-    #       <%= form.input :name, :label => "Full Name"%>
+    #       <%= form.input :secret, :value => "Hello" %>
+    #       <%= form.input :name, :label => "Full Name" %>
     #       <%= form.input :manager_id, :as => :radio %>
     #       <%= form.input :hired_at, :as => :date, :label => "Date Hired" %>
     #       <%= form.input :phone, :required => false, :hint => "Eg: +1 555 1234" %>
@@ -87,25 +76,24 @@ module Formtastic #:nodoc:
     #
     def input(method, options = {})
       options[:required] = method_required?(method) unless options.key?(:required)
-      options[:as]     ||= default_input_type(method)
+      options[:as]     ||= default_input_type(method, options)
 
       html_class = [ options[:as], (options[:required] ? :required : :optional) ]
-      html_class << 'error' if @object && @object.respond_to?(:errors) && @object.errors[method.to_sym]
+      html_class << 'error' if @object && @object.respond_to?(:errors) && !@object.errors[method.to_sym].blank?
 
       wrapper_html = options.delete(:wrapper_html) || {}
       wrapper_html[:id]  ||= generate_html_id(method)
       wrapper_html[:class] = (html_class << wrapper_html[:class]).flatten.compact.join(' ')
 
-      if [:boolean_select, :boolean_radio].include?(options[:as])
-        ::ActiveSupport::Deprecation.warn(":as => :#{options[:as]} is deprecated, use :as => :#{options[:as].to_s[8..-1]} instead", caller[3..-1])
-      end
-
       if options[:input_html] && options[:input_html][:id]
         options[:label_html] ||= {}
         options[:label_html][:for] ||= options[:input_html][:id]
       end
 
-      list_item_content = @@inline_order.map do |type|
+      input_parts = @@inline_order.dup
+      input_parts.delete(:errors) if options[:as] == :hidden
+
+      list_item_content = input_parts.map do |type|
         send(:"inline_#{type}_for", method, options)
       end.compact.join("\n")
 
@@ -150,11 +138,16 @@ module Formtastic #:nodoc:
     #     <%= form.inputs %>
     #   <% end %>
     #
+    #   With a few arguments:
+    #   <% semantic_form_for @post do |form| %>
+    #     <%= form.inputs "Post details", :title, :body %>
+    #   <% end %>
+    #
     # === Options
     #
-    # All options (with the exception of :name) are passed down to the fieldset as HTML
-    # attributes (id, class, style, etc).  If provided, the :name option is passed into a
-    # legend tag inside the fieldset (otherwise a legend is not generated).
+    # All options (with the exception of :name/:title) are passed down to the fieldset as HTML
+    # attributes (id, class, style, etc).  If provided, the :name/:title option is passed into a
+    # legend tag inside the fieldset.
     #
     #   # With a block:
     #   <% semantic_form_for @post do |form| %>
@@ -168,6 +161,11 @@ module Formtastic #:nodoc:
     #     <%= form.inputs :title, :body, :name => "Create a new post", :style => "border:1px;" %>
     #   <% end %>
     #
+    #   # ...or the equivalent:
+    #   <% semantic_form_for @post do |form| %>
+    #     <%= form.inputs "Create a new post", :title, :body, :style => "border:1px;" %>
+    #   <% end %>
+    #
     # === It's basically a fieldset!
     #
     # Instead of hard-coding fieldsets & legends into your form to logically group related fields,
@@ -182,6 +180,9 @@ module Formtastic #:nodoc:
     #       <%= f.input :created_at %>
     #       <%= f.input :user_id, :label => "Author" %>
     #     <% end %>
+    #     <% f.inputs "Extra" do %>
+    #       <%= f.input :update_at %>
+    #     <% end %>
     #   <% end %>
     #
     #   # Output:
@@ -199,6 +200,12 @@ module Formtastic #:nodoc:
     #         <li class="select">...</li>
     #       </ol>
     #     </fieldset>
+    #     <fieldset class="inputs">
+    #       <legend><span>Extra</span></legend>
+    #       <ol>
+    #         <li class="datetime">...</li>
+    #       </ol>
+    #     </fieldset>
     #   </form>
     #
     # === Nested attributes
@@ -240,23 +247,27 @@ module Formtastic #:nodoc:
     # instead (just as you would do with Rails' form builder).
     #
     def inputs(*args, &block)
+      title = field_set_title_from_args(*args)
       html_options = args.extract_options!
       html_options[:class] ||= "inputs"
-
-      if html_options[:for]
-        inputs_for_nested_attributes(args, html_options, &block)
+      html_options[:name] = title
+      
+      if html_options[:for] # Nested form
+        inputs_for_nested_attributes(*(args << html_options), &block)
       elsif block_given?
-        field_set_and_list_wrapping(html_options, &block)
+        field_set_and_list_wrapping(*(args << html_options), &block)
       else
         if @object && args.empty?
-          args  = @object.class.reflections.map { |n,_| n if _.macro == :belongs_to }
-          args += @object.class.content_columns.map(&:name)
-          args -= %w[created_at updated_at created_on updated_on lock_version]
+          args  = self.association_columns(:belongs_to)
+          args += self.content_columns
+          args -= RESERVED_COLUMNS
           args.compact!
         end
-        contents = args.map { |method| input(method.to_sym) }
-
-        field_set_and_list_wrapping(html_options, contents)
+        legend = args.shift if args.first.is_a?(::String)
+        contents = args.collect { |method| input(method.to_sym) }
+        args.unshift(legend) if legend.present?
+        
+        field_set_and_list_wrapping(*((args << html_options) << contents))
       end
     end
     alias :input_field_set :inputs
@@ -287,18 +298,35 @@ module Formtastic #:nodoc:
     #
     # The value of the button text can be overridden:
     #
-    #  <%= form.commit_button "Go" %> => <input name="commit" type="submit" value="Go" />
+    #  <%= form.commit_button "Go" %> => <input name="commit" type="submit" value="Go" class="{create|update|submit}" />
+    #  <%= form.commit_button :label => "Go" %> => <input name="commit" type="submit" value="Go" class="{create|update|submit}" />
     #
     # And you can pass html atributes down to the input, with or without the button text:
     #
-    #  <%= form.commit_button "Go" %> => <input name="commit" type="submit" value="Go" />
-    #  <%= form.commit_button :class => "pretty" %> => <input name="commit" type="submit" value="Save Post" class="pretty" />
-    
+    #  <%= form.commit_button "Go" %> => <input name="commit" type="submit" value="Go" class="{create|update|submit}" />
+    #  <%= form.commit_button :class => "pretty" %> => <input name="commit" type="submit" value="Save Post" class="pretty {create|update|submit}" />
+    #
     def commit_button(*args)
-      value = args.first.is_a?(String) ? args.shift : save_or_create_button_text
-      options = args.shift || {}
+      options = args.extract_options!
+      text = options.delete(:label) || args.shift
+
+      if @object
+        key = @object.new_record? ? :create : :update
+        object_name = @object.class.human_name
+      else
+        key = :submit
+        object_name = @object_name.to_s.send(@@label_str_method)
+      end
+
+      text = (self.localized_string(key, text, :action, :model => object_name) ||
+              ::Formtastic::I18n.t(key, :model => object_name)) unless text.is_a?(::String)
+
       button_html = options.delete(:button_html) || {}
-      template.content_tag(:li, self.submit(value, button_html), :class => "commit")
+      button_html.merge!(:class => [button_html[:class], key].compact.join(' '))
+      element_class = ['commit', options.delete(:class)].compact.join(' ') # TODO: Add class reflecting on form action.
+      accesskey = (options.delete(:accesskey) || @@default_commit_button_accesskey) unless button_html.has_key?(:accesskey)
+      button_html = button_html.merge(:accesskey => accesskey) if accesskey  
+      template.content_tag(:li, self.submit(text, button_html), :class => element_class)
     end
 
     # A thin wrapper around #fields_for to set :builder => Formtastic::SemanticFormBuilder
@@ -322,72 +350,11 @@ module Formtastic #:nodoc:
     #
     def semantic_fields_for(record_or_name_or_array, *args, &block)
       opts = args.extract_options!
-      opts.merge!(:builder => Formtastic::SemanticFormBuilder)
+      opts[:builder] ||= Formtastic::SemanticFormHelper.builder
       args.push(opts)
       fields_for(record_or_name_or_array, *args, &block)
     end
 
-    # Generates the label for the input. It also accepts the same arguments as
-    # Rails label method. It has three options that are not supported by Rails
-    # label method:
-    #
-    # * :required - Appends an abbr tag if :required is true
-    # * :label - An alternative form to give the label content. Whenever label
-    #            is false, a blank string is returned.
-    # * :as_span - When true returns a span tag with class label instead of a label element
-    # * :input_name - Gives the input to match for. This is needed when you want to
-    #                 to call f.label :authors but it should match :author_ids.
-    #
-    # == Examples
-    #
-    #  f.label :title # like in rails, except that it searches the label on I18n API too
-    #
-    #  f.label :title, "Your post title"
-    #  f.label :title, :label => "Your post title" # Added for formtastic API
-    #
-    #  f.label :title, :required => true # Returns <label>Title<abbr title="required">*</abbr></label>
-    #
-    def label(method, options_or_text=nil, options=nil)
-      if options_or_text.is_a?(Hash)
-        return "" if options_or_text[:label] == false
-        options = options_or_text
-        text = options.delete(:label)
-      else
-        text = options_or_text
-        options ||= {}
-      end
-
-      text = localized_attribute_string(method, text, :label) || humanized_attribute_name(method)
-      text += required_or_optional_string(options.delete(:required))
-
-      input_name = options.delete(:input_name) || method
-      if options.delete(:as_span)
-        options[:class] ||= 'label'
-        template.content_tag(:span, text, options)
-      else
-        super(input_name, text, options)
-      end
-    end
-
-    # Generates error messages for the given method. Errors can be shown as list
-    # or as sentence. If :none is set, no error is shown.
-    #
-    # This method is also aliased as errors_on, so you can call on your custom
-    # inputs as well:
-    #
-    #   semantic_form_for :post do |f|
-    #     f.text_field(:body)
-    #     f.errors_on(:body)
-    #   end
-    #
-    def inline_errors_for(method, options=nil) #:nodoc:
-      return nil unless @object && @object.respond_to?(:errors) && [:sentence, :list].include?(@@inline_errors)
-
-      errors = @object.errors[method.to_sym]
-      send("error_#{@@inline_errors}", Array(errors)) unless errors.blank?
-    end
-    alias :errors_on :inline_errors_for
-
     #
     #
     #  Stolen from Attribute_fu (http://github.com/giraffesoft/attribute_fu)
@@ -395,8 +362,7 @@ module Formtastic #:nodoc:
     #
     #  Dinamically add and remove nested forms for a has_many relation.
     #
-
-    # Add a link to remove the associated partial
+    #  Add a link to remove the associated partial
     #    # Example:
     #    <% semantic_form_for @post do |post| %>
     #      <%= post.input :title %>
@@ -412,7 +378,7 @@ module Formtastic #:nodoc:
     #      <%= f.remove_link "Remove" %>
     #    </div>
     #
-    #    # Output:
+    #   # Output:
     #   <form ...>
     #     <li class="string"><input type='text' name='post[author][name]' id='post_author_name' /></li>
     #     <fieldset class="inputs" id="authors"><legend><span>Authors</span></legend><ol>
@@ -425,8 +391,9 @@ module Formtastic #:nodoc:
     #      </div>
     #     </ol></fieldset>
     #   </form>
-    # 
-    #   * Opts
+    #
+    #  Opts:
+    #
     #   * :selector, id of element that will disappear(.hide()), if no id as give, will use css class
     #       association.class.name last word in downcase #=> '.author'
     #     f.remove_link "Remove", :selector => '#my_own_element_id'
@@ -437,7 +404,6 @@ module Formtastic #:nodoc:
     #
     #   NOTE: remove_link must be put in the partial, not in main template
     #
-    
     def remove_link(name, *args)
       options = args.extract_options!
       css_selector = options.delete(:selector) || ".#{@object.class.name.split("::").last.underscore}"
@@ -486,7 +452,7 @@ module Formtastic #:nodoc:
       before_function = opts.delete(:before_function) || ''
       after_function  = opts.delete(:after_function)  || ''
 
-      form = self.render_associated_form(object, :partial => partial)
+      form = render_associated_form(object, :partial => partial)
       form.gsub!(/attributes_(\d+)/, '__idx__')
       form.gsub!(/\[(\d+)\]/, '__idxx__')
 
@@ -498,7 +464,9 @@ module Formtastic #:nodoc:
     end
 
     # Render associated form
-    #    # Example:
+    #
+    # Example:
+    #
     #    <% semantic_form_for @post do |post| %>
     #      <%= post.input :title %>
     #      <% post.inputs :name => 'Authors', :id => 'authors' do %>
@@ -507,10 +475,12 @@ module Formtastic #:nodoc:
     #      <% end %>
     #    <% end %>
     #
-    #    # app/views/authors/_add_author.html.erb
+    # Partial: app/views/authors/_add_author.html.erb
+    #
     #    <% f.input :name %>
     #
-    #    # Output:
+    # Output:
+    #
     #   <form ...>
     #     <li class="string"><input type='text' name='post[author][name]' id='post_author_name' /></li>
     #     <fieldset class="inputs" id="authors"><legend><span>Authors</span></legend><ol>
@@ -520,37 +490,43 @@ module Formtastic #:nodoc:
     #     </ol></fieldset>
     #   </form>
     #
-    #   Opts
-    #   * :partial, render a partial, if not partial is given, try to find a partial with association
-    #        name in the controller folder.
+    # Opts:
+    #   * :partial => Render a given partial, if no one is given, try to find a partial
+    #                 with association name in the controller folder.
+    #
     #   post.render_associated_form :authors, :partial => 'author'
     #   ^ try to render app/views/posts/_author.html.erb
+    #
     #   post.render_associated_form :authors, :partial => 'authors/author'
     #   ^ try to render app/views/authors/_author.html.erb
-    #   NOTE: Partial need to use 'f' as formtastic reference
-    #     Example:
+    #
+    # NOTE: Partial need to use 'f' as formtastic reference. Example:
+    #
     #       <%= f.input :name %> #=> render author name association
     #
-    #   * :new make X empty partials if is a new record
-    #   Examples:
+    #   * :new    => make N empty partials if it is a new record. Example:
+    #
     #   post.render_associated_form :authors, :new => 2
     #   ^ make 2 empty authors partials
     #
-    #   * :edit show only X partial if is editing a record
+    #   * :edit   => show only X partial if is editing a record. Example:
+    #
     #   post.render_associated_form :authors, :edit => 3
     #   ^ if record have 1 author, make 2 new empty partials
     #   NOTE: :edit not conflicts with :new; :new is for new records only
     #
-    #   * :new_in_edit show X new partial if is editing a record
+    #   * :new_in_edit  => show X new partial if is editing a record. Example:
+    #
     #   post.render_associated_form :authors, :new_in_edit => 2
     #   ^ make more 2 new partial for record
     #   NOTE: this option is ignored if :edit is seted
-    #     Example:
-    #     post.render_associated_form :authors, :edit => 2, :new_in_edit => 100
-    #     ^ if record have 1 author, make more one partial
     #
+    #   Example:
     #
-   def render_associated_form(associated, opts = {})
+    #   post.render_associated_form :authors, :edit => 2, :new_in_edit => 100
+    #   ^ if record have 1 author, make more one partial
+    #
+    def render_associated_form(associated, opts = {})
       associated = @object.send(associated.to_s) if associated.is_a? Symbol
       associated = associated.is_a?(Array) ? associated : [associated] # preserve association proxy if this is one
 
@@ -562,7 +538,6 @@ module Formtastic #:nodoc:
         opts[:new_in_edit].times { associated.build }
       end
 
-
       unless associated.empty?
         name = extract_option_or_class_name(opts, :name, associated.first)
         partial = opts[:partial] || name
@@ -577,8 +552,6 @@ module Formtastic #:nodoc:
       end
     end
 
-    protected
-
     def association_name(class_name)
       @object.respond_to?("#{class_name}_attributes=") ? class_name : class_name.pluralize
     end
@@ -587,849 +560,1205 @@ module Formtastic #:nodoc:
       (hash.delete(option) || object.class.name.split('::').last.underscore)
     end
 
-    # Prepare options to be sent to label
+    # Generates the label for the input. It also accepts the same arguments as
+    # Rails label method. It has three options that are not supported by Rails
+    # label method:
     #
-    def options_for_label(options)
-      options.slice(:label, :required).merge!(options.fetch(:label_html, {}))
-    end
-
-    # Deals with :for option when it's supplied to inputs methods. Additional
-    # options to be passed down to :for should be supplied using :for_options
-    # key.
+    # * :required - Appends an abbr tag if :required is true
+    # * :label - An alternative form to give the label content. Whenever label
+    #            is false, a blank string is returned.
+    # * :input_name - Gives the input to match for. This is needed when you want to
+    #                 to call f.label :authors but it should match :author_ids.
     #
-    # It should raise an error if a block with arity zero is given.
+    # == Examples
     #
-    def inputs_for_nested_attributes(args, options, &block)
-      args << options.merge!(:parent => { :builder => self, :for => options[:for] })
-
-      fields_for_block = if block_given?
-        raise ArgumentError, 'You gave :for option with a block to inputs method, ' <<
-                             'but the block does not accept any argument.' if block.arity <= 0
-
-        proc { |f| f.inputs(*args){ block.call(f) } }
-      else
-        proc { |f| f.inputs(*args) }
-      end
-
-      fields_for_args = [options.delete(:for), options.delete(:for_options) || {}].flatten
-      semantic_fields_for(*fields_for_args, &fields_for_block)
-    end
-
-    # Remove any Formtastic-specific options before passing the down options.
+    #  f.label :title # like in rails, except that it searches the label on I18n API too
     #
-    def set_options(options)
-      options.except(:value_method, :label_method, :collection, :required, :label,
-                     :as, :hint, :input_html, :label_html, :value_as_class)
-    end
-
-    # Create a default button text. If the form is working with a object, it
-    # defaults to "Create model" or "Save model" depending if we are working
-    # with a new_record or not.
+    #  f.label :title, "Your post title"
+    #  f.label :title, :label => "Your post title" # Added for formtastic API
     #
-    # When not working with models, it defaults to "Submit object".
+    #  f.label :title, :required => true # Returns <label>Title<abbr title="required">*</abbr></label>
     #
-    def save_or_create_button_text(prefix='Submit') #:nodoc:
-      if @object
-        prefix      = @object.new_record? ? 'Create' : 'Save'
-        object_name = @object.class.human_name
+    def label(method, options_or_text=nil, options=nil)
+      if options_or_text.is_a?(Hash)
+        return "" if options_or_text[:label] == false
+        options = options_or_text
+        text = options.delete(:label)
       else
-        object_name = @object_name.to_s.send(@@label_str_method)
+        text = options_or_text
+        options ||= {}
       end
+      text = localized_string(method, text, :label) || humanized_attribute_name(method)
+      text += required_or_optional_string(options.delete(:required))
+
+      # special case for boolean (checkbox) labels, which have a nested input
+      text = (options.delete(:label_prefix_for_nested_input) || "") + text
 
-      I18n.t(prefix.downcase, :default => prefix, :scope => [:formtastic]) << ' ' << object_name
+      input_name = options.delete(:input_name) || method
+      super(input_name, text, options)
     end
 
-    # Determins if the attribute (eg :title) should be considered required or not.
-    #
-    # * if the :required option was provided in the options hash, the true/false value will be
-    #   returned immediately, allowing the view to override any guesswork that follows:
+    # Generates error messages for the given method. Errors can be shown as list,
+    # as sentence or just the first error can be displayed. If :none is set, no error is shown.
     #
-    # * if the :required option isn't provided in the options hash, and the ValidationReflection
-    #   plugin is installed (http://github.com/redinger/validation_reflection), true is returned
-    #   if the validates_presence_of macro has been used in the class for this attribute, or false
-    #   otherwise.
+    # This method is also aliased as errors_on, so you can call on your custom
+    # inputs as well:
     #
-    # * if the :required option isn't provided, and the plugin isn't available, the value of the
-    #   configuration option @@all_fields_required_by_default is used.
+    #   semantic_form_for :post do |f|
+    #     f.text_field(:body)
+    #     f.errors_on(:body)
+    #   end
     #
-    def method_required?(attribute) #:nodoc:
-      if @object && @object.class.respond_to?(:reflect_on_all_validations)
-        attribute_sym = attribute.to_s.sub(/_id$/, '').to_sym
-
-        @object.class.reflect_on_all_validations.any? do |validation|
-          validation.macro == :validates_presence_of && validation.name == attribute_sym
-        end
+    def inline_errors_for(method, options = nil) #:nodoc:
+      if render_inline_errors?
+        errors = @object.errors[method.to_sym]
+        send(:"error_#{@@inline_errors}", [*errors]) if errors.present?
       else
-        @@all_fields_required_by_default
+        nil
       end
     end
+    alias :errors_on :inline_errors_for
 
-    # A method that deals with most of inputs (:string, :password, :file,
-    # :textarea and :numeric). :select, :radio, :boolean and :datetime inputs
-    # are not handled by this method, since they need more detailed approach.
-    #
-    # If input_html is given as option, it's passed down to the input.
-    #
-    def input_simple(type, method, options)
-      html_options = options.delete(:input_html) || {}
-      html_options = default_string_options(method, type).merge(html_options) if STRING_MAPPINGS.include?(type)
-
-      self.label(method, options_for_label(options)) +
-      self.send(INPUT_MAPPINGS[type], method, html_options)
-    end
+    protected
 
-    # Outputs a hidden field inside the wrapper, which should be hidden with CSS.
-    # Additionals options can be given and will be sent straight to hidden input
-    # element.
-    #
-    def hidden_input(method, options)
-      self.hidden_field(method, set_options(options))
-    end
+      def render_inline_errors?
+        @object && @object.respond_to?(:errors) && INLINE_ERROR_TYPES.include?(@@inline_errors)
+      end
 
+      # Collects content columns (non-relation columns) for the current form object class.
+      #
+      def content_columns #:nodoc:
+        self.model_name.constantize.content_columns.collect { |c| c.name.to_sym }.compact rescue []
+      end
 
-    # Outputs a label and a select box containing options from the parent
-    # (belongs_to, has_many, has_and_belongs_to_many) association. If an association
-    # is has_many or has_and_belongs_to_many the select box will be set as multi-select
-    # and size = 5
-    #
-    # Example (belongs_to):
-    #
-    #   f.input :author
-    #
-    #   <label for="book_author_id">Author</label>
-    #   <select id="book_author_id" name="book[author_id]">
-    #     <option value=""></option>
-    #     <option value="1">Justin French</option>
-    #     <option value="2">Jane Doe</option>
-    #   </select>
-    #
-    # Example (has_many):
-    #
-    #   f.input :chapters
-    #
-    #   <label for="book_chapter_ids">Chapters</label>
-    #   <select id="book_chapter_ids" name="book[chapter_ids]">
-    #     <option value=""></option>
-    #     <option value="1">Chapter 1</option>
-    #     <option value="2">Chapter 2</option>
-    #   </select>
-    #
-    # Example (has_and_belongs_to_many):
-    #
-    #   f.input :authors
-    #
-    #   <label for="book_author_ids">Authors</label>
-    #   <select id="book_author_ids" name="book[author_ids]">
-    #     <option value=""></option>
-    #     <option value="1">Justin French</option>
-    #     <option value="2">Jane Doe</option>
-    #   </select>
-    #
-    #
-    # You can customize the options available in the select by passing in a collection (an Array or 
-    # Hash) through the :collection option.  If not provided, the choices are found by inferring the 
-    # parent's class name from the method name and simply calling find(:all) on it 
-    # (VehicleOwner.find(:all) in the example above).
-    #
-    # Examples:
-    #
-    #   f.input :author, :collection => @authors
-    #   f.input :author, :collection => Author.find(:all)
-    #   f.input :author, :collection => [@justin, @kate]
-    #   f.input :author, :collection => {@justin.name => @justin.id, @kate.name => @kate.id}
-    #   f.input :author, :collection => ["Justin", "Kate", "Amelia", "Gus", "Meg"]
-    #
-    # Note: This input looks for a label method in the parent association.
-    #
-    # You can customize the text label inside each option tag, by naming the correct method
-    # (:full_name, :display_name, :account_number, etc) to call on each object in the collection
-    # by passing in the :label_method option.  By default the :label_method is whichever element of
-    # Formtastic::SemanticFormBuilder.collection_label_methods is found first.
-    #
-    # Examples:
-    #
-    #   f.input :author, :label_method => :full_name
-    #   f.input :author, :label_method => :display_name
-    #   f.input :author, :label_method => :to_s
-    #   f.input :author, :label_method => :label
-    #
-    # You can also customize the value inside each option tag, by passing in the :value_method option.
-    # Usage is the same as the :label_method option
-    #
-    # Examples:
-    #
-    #   f.input :author, :value_method => :full_name
-    #   f.input :author, :value_method => :display_name
-    #   f.input :author, :value_method => :to_s
-    #   f.input :author, :value_method => :value
-    #
-    # You can pass html_options to the select tag using :input_html => {}
-    #
-    # Examples:
-    #
-    #   f.input :authors, :input_html => {:size => 20, :multiple => true}
-    #
-    # By default, all select inputs will have a blank option at the top of the list. You can add
-    # a prompt with the :prompt option, or disable the blank option with :include_blank => false.
-    #
-    def select_input(method, options)
-      collection = find_collection_for_column(method, options)
-      html_options = options.delete(:input_html) || {}
+      # Collects association columns (relation columns) for the current form object class.
+      #
+      def association_columns(*by_associations) #:nodoc:
+        if @object.present?
+          @object.class.reflections.collect do |name, _|
+            if by_associations.present?
+              name if by_associations.include?(_.macro)
+            else
+              name
+            end
+          end.compact
+        else
+          []
+        end
+      end
 
-      unless options.key?(:include_blank) || options.key?(:prompt)
-        options[:include_blank] = true
+      # Prepare options to be sent to label
+      #
+      def options_for_label(options) #:nodoc:
+        options.slice(:label, :required).merge!(options.fetch(:label_html, {}))
       end
 
-      reflection = find_reflection(method)
-      if reflection && [ :has_many, :has_and_belongs_to_many ].include?(reflection.macro)
-        options[:include_blank]   = false
-        html_options[:multiple] ||= true
-        html_options[:size]     ||= 5
-       end
+      # Deals with :for option when it's supplied to inputs methods. Additional
+      # options to be passed down to :for should be supplied using :for_options
+      # key.
+      #
+      # It should raise an error if a block with arity zero is given.
+      #
+      def inputs_for_nested_attributes(*args, &block) #:nodoc:
+        options = args.extract_options!
+        args << options.merge!(:parent => { :builder => self, :for => options[:for] })
+
+        fields_for_block = if block_given?
+          raise ArgumentError, 'You gave :for option with a block to inputs method, ' <<
+                               'but the block does not accept any argument.' if block.arity <= 0
+
+          proc { |f| f.inputs(*args){ block.call(f) } }
+        else
+          proc { |f| f.inputs(*args) }
+        end
 
-      input_name = generate_association_input_name(method)
-      self.label(method, options_for_label(options).merge(:input_name => input_name)) +
-      self.select(input_name, collection, set_options(options), html_options)
-    end
-    alias :boolean_select_input :select_input
+        fields_for_args = [options.delete(:for), options.delete(:for_options) || {}].flatten
+        semantic_fields_for(*fields_for_args, &fields_for_block)
+      end
 
-    # Outputs a timezone select input as Rails' time_zone_select helper. You
-    # can give priority zones as option.
-    #
-    # Examples:
-    #
-    #   f.input :time_zone, :as => :time_zone, :priority_zones => /Australia/
-    #
-    def time_zone_input(method, options)
-      html_options = options.delete(:input_html) || {}
+      # Remove any Formtastic-specific options before passing the down options.
+      #
+      def strip_formtastic_options(options) #:nodoc:
+        options.except(:value_method, :label_method, :collection, :required, :label,
+                       :as, :hint, :input_html, :label_html, :value_as_class)
+      end
 
-      self.label(method, options_for_label(options)) +
-      self.time_zone_select(method, options.delete(:priority_zones), set_options(options), html_options)
-    end
+      # Determins if the attribute (eg :title) should be considered required or not.
+      #
+      # * if the :required option was provided in the options hash, the true/false value will be
+      #   returned immediately, allowing the view to override any guesswork that follows:
+      #
+      # * if the :required option isn't provided in the options hash, and the ValidationReflection
+      #   plugin is installed (http://github.com/redinger/validation_reflection), true is returned
+      #   if the validates_presence_of macro has been used in the class for this attribute, or false
+      #   otherwise.
+      #
+      # * if the :required option isn't provided, and the plugin isn't available, the value of the
+      #   configuration option @@all_fields_required_by_default is used.
+      #
+      def method_required?(attribute) #:nodoc:
+        if @object && @object.class.respond_to?(:reflect_on_validations_for)
+          attribute_sym = attribute.to_s.sub(/_id$/, '').to_sym
+
+          @object.class.reflect_on_validations_for(attribute_sym).any? do |validation|
+            validation.macro == :validates_presence_of &&
+            validation.name == attribute_sym &&
+            (validation.options.present? ? options_require_validation?(validation.options) : true)
+          end
+        else
+          @@all_fields_required_by_default
+        end
+      end
 
-    # Outputs a fieldset containing a legend for the label text, and an ordered list (ol) of list
-    # items, one for each possible choice in the belongs_to association.  Each li contains a
-    # label and a radio input.
-    #
-    # Example:
-    #
-    #   f.input :author, :as => :radio
-    #
-    # Output:
-    #
-    #   <fieldset>
-    #     <legend><span>Author</span></legend>
-    #     <ol>
-    #       <li>
-    #         <label for="book_author_id_1"><input id="book_author_id_1" name="book[author_id]" type="radio" value="1" /> Justin French</label>
-    #       </li>
-    #       <li>
-    #         <label for="book_author_id_2"><input id="book_author_id_2" name="book[owner_id]" type="radio" value="2" /> Kate French</label>
-    #       </li>
-    #     </ol>
-    #   </fieldset>
-    #
-    # You can customize the options available in the select by passing in a collection (an Array or 
-    # Hash) through the :collection option.  If not provided, the choices are found by inferring the 
-    # parent's class name from the method name and simply calling find(:all) on it 
-    # (Author.find(:all) in the example above).
-    #
-    # Examples:
-    #
-    #   f.input :author, :as => :radio, :collection => @authors
-    #   f.input :author, :as => :radio, :collection => Author.find(:all)
-    #   f.input :author, :as => :radio, :collection => [@justin, @kate]
-    #   f.input :author, :collection => ["Justin", "Kate", "Amelia", "Gus", "Meg"]
-    #
-    # You can also customize the text label inside each option tag, by naming the correct method
-    # (:full_name, :display_name, :account_number, etc) to call on each object in the collection
-    # by passing in the :label_method option.  By default the :label_method is whichever element of
-    # Formtastic::SemanticFormBuilder.collection_label_methods is found first.
-    #
-    # Examples:
-    #
-    #   f.input :author, :as => :radio, :label_method => :full_name
-    #   f.input :author, :as => :radio, :label_method => :display_name
-    #   f.input :author, :as => :radio, :label_method => :to_s
-    #   f.input :author, :as => :radio, :label_method => :label
-    #
-    # Finally, you can set :value_as_class => true if you want that LI wrappers
-    # contains a class with the wrapped radio input value.
-    #
-    def radio_input(method, options)
-      collection   = find_collection_for_column(method, options)
-      html_options = set_options(options).merge(options.delete(:input_html) || {})
-
-      input_name = generate_association_input_name(method)
-      value_as_class = options.delete(:value_as_class)
-
-      list_item_content = collection.map do |c|
-        label = c.is_a?(Array) ? c.first : c
-        value = c.is_a?(Array) ? c.last  : c
-
-        li_content = template.content_tag(:label,
-          "#{self.radio_button(input_name, value, html_options)} #{label}",
-          :for => generate_html_id(input_name, value.to_s.downcase)
-        )
+      # Determines whether the given options evaluate to true
+      def options_require_validation?(options) #nodoc
+        if_condition = !options[:if].nil?
+        condition = if_condition ? options[:if] : options[:unless]
 
-        li_options = value_as_class ? { :class => value.to_s.downcase } : {}
-        template.content_tag(:li, li_content, li_options)
+        condition = if condition.respond_to?(:call)
+                      condition.call(@object)
+                    elsif condition.is_a?(::Symbol) && @object.respond_to?(condition)
+                      @object.send(condition)
+                    else
+                      condition
+                    end
+
+        if_condition ? !!condition : !condition
       end
 
-      field_set_and_list_wrapping_for_method(method, options, list_item_content)
-    end
-    alias :boolean_radio_input :radio_input
+      def basic_input_helper(form_helper_method, type, method, options) #:nodoc:
+        html_options = options.delete(:input_html) || {}
+        html_options = default_string_options(method, type).merge(html_options) if [:numeric, :string, :password].include?(type)
 
-    # Outputs a fieldset with a legend for the method label, and a ordered list (ol) of list
-    # items (li), one for each fragment for the date (year, month, day).  Each li contains a label
-    # (eg "Year") and a select box.  See date_or_datetime_input for a more detailed output example.
-    #
-    # Some of Rails' options for select_date are supported, but not everything yet.
-    def date_input(method, options)
-      date_or_datetime_input(method, options.merge(:discard_hour => true))
-    end
+        self.label(method, options_for_label(options)) <<
+        self.send(form_helper_method, method, html_options)
+      end
 
+      # Outputs a label and standard Rails text field inside the wrapper.
+      def string_input(method, options)
+        basic_input_helper(:text_field, :string, method, options)
+      end
 
-    # Outputs a fieldset with a legend for the method label, and a ordered list (ol) of list
-    # items (li), one for each fragment for the date (year, month, day, hour, min, sec).  Each li
-    # contains a label (eg "Year") and a select box.  See date_or_datetime_input for a more
-    # detailed output example.
-    #
-    # Some of Rails' options for select_date are supported, but not everything yet.
-    def datetime_input(method, options)
-      date_or_datetime_input(method, options)
-    end
+      # Outputs a label and standard Rails password field inside the wrapper.
+      def password_input(method, options)
+        basic_input_helper(:password_field, :password, method, options)
+      end
 
+      # Outputs a label and standard Rails text field inside the wrapper.
+      def numeric_input(method, options)
+        basic_input_helper(:text_field, :numeric, method, options)
+      end
 
-    # Outputs a fieldset with a legend for the method label, and a ordered list (ol) of list
-    # items (li), one for each fragment for the time (hour, minute, second).  Each li contains a label
-    # (eg "Hour") and a select box.  See date_or_datetime_input for a more detailed output example.
-    #
-    # Some of Rails' options for select_time are supported, but not everything yet.
-    def time_input(method, options)
-      date_or_datetime_input(method, options.merge(:discard_year => true, :discard_month => true, :discard_day => true))
-    end
+      # Ouputs a label and standard Rails text area inside the wrapper.
+      def text_input(method, options)
+        basic_input_helper(:text_area, :text, method, options)
+      end
 
+      # Outputs a label and a standard Rails file field inside the wrapper.
+      def file_input(method, options)
+        basic_input_helper(:file_field, :file, method, options)
+      end
 
-    # <fieldset>
-    #   <legend>Created At</legend>
-    #   <ol>
-    #     <li>
-    #       <label for="user_created_at_1i">Year</label>
-    #       <select id="user_created_at_1i" name="user[created_at(1i)]">
-    #         <option value="2003">2003</option>
-    #         ...
-    #         <option value="2013">2013</option>
-    #       </select>
-    #     </li>
-    #     <li>
-    #       <label for="user_created_at_2i">Month</label>
-    #       <select id="user_created_at_2i" name="user[created_at(2i)]">
-    #         <option value="1">January</option>
-    #         ...
-    #         <option value="12">December</option>
-    #       </select>
-    #     </li>
-    #     <li>
-    #       <label for="user_created_at_3i">Day</label>
-    #       <select id="user_created_at_3i" name="user[created_at(3i)]">
-    #         <option value="1">1</option>
-    #         ...
-    #         <option value="31">31</option>
-    #       </select>
-    #     </li>
-    #   </ol>
-    # </fieldset>
-    #
-    # This is an absolute abomination, but so is the official Rails select_date().
-    #
-    def date_or_datetime_input(method, options)
-      position = { :year => 1, :month => 2, :day => 3, :hour => 4, :minute => 5, :second => 6 }
-      inputs   = options.delete(:order) || I18n.translate(:'date.order') || [:year, :month, :day]
-
-      time_inputs = [:hour, :minute]
-      time_inputs << [:second] if options[:include_seconds]
-
-      list_items_capture = ""
-      hidden_fields_capture = ""
-
-      # Gets the datetime object. It can be a Fixnum, Date or Time, or nil.
-      datetime     = @object ? @object.send(method) : nil
-      html_options = options.delete(:input_html) || {}
-
-      (inputs + time_inputs).each do |input|
-        html_id    = generate_html_id(method, "#{position[input]}i")
-        field_name = "#{method}(#{position[input]}i)"
-        if options["discard_#{input}".intern]
-          break if time_inputs.include?(input)
-          
-          hidden_value = datetime.respond_to?(input) ? datetime.send(input) : datetime
-          hidden_fields_capture << template.hidden_field_tag("#{@object_name}[#{field_name}]", (hidden_value || 1), :id => html_id)
+      # Outputs a hidden field inside the wrapper, which should be hidden with CSS.
+      # Additionals options can be given and will be sent straight to hidden input
+      # element.
+      #
+      def hidden_input(method, options)
+        options ||= {}
+        if options[:input_html].present?
+          options[:value] = options[:input_html][:value] if options[:input_html][:value].present?
+        end
+        self.hidden_field(method, strip_formtastic_options(options))
+      end
+
+      # Outputs a label and a select box containing options from the parent
+      # (belongs_to, has_many, has_and_belongs_to_many) association. If an association
+      # is has_many or has_and_belongs_to_many the select box will be set as multi-select
+      # and size = 5
+      #
+      # Example (belongs_to):
+      #
+      #   f.input :author
+      #
+      #   <label for="book_author_id">Author</label>
+      #   <select id="book_author_id" name="book[author_id]">
+      #     <option value=""></option>
+      #     <option value="1">Justin French</option>
+      #     <option value="2">Jane Doe</option>
+      #   </select>
+      #
+      # Example (has_many):
+      #
+      #   f.input :chapters
+      #
+      #   <label for="book_chapter_ids">Chapters</label>
+      #   <select id="book_chapter_ids" name="book[chapter_ids]">
+      #     <option value=""></option>
+      #     <option value="1">Chapter 1</option>
+      #     <option value="2">Chapter 2</option>
+      #   </select>
+      #
+      # Example (has_and_belongs_to_many):
+      #
+      #   f.input :authors
+      #
+      #   <label for="book_author_ids">Authors</label>
+      #   <select id="book_author_ids" name="book[author_ids]">
+      #     <option value=""></option>
+      #     <option value="1">Justin French</option>
+      #     <option value="2">Jane Doe</option>
+      #   </select>
+      #
+      #
+      # You can customize the options available in the select by passing in a collection (an Array or 
+      # Hash) through the :collection option.  If not provided, the choices are found by inferring the 
+      # parent's class name from the method name and simply calling find(:all) on it 
+      # (VehicleOwner.find(:all) in the example above).
+      #
+      # Examples:
+      #
+      #   f.input :author, :collection => @authors
+      #   f.input :author, :collection => Author.find(:all)
+      #   f.input :author, :collection => [@justin, @kate]
+      #   f.input :author, :collection => {@justin.name => @justin.id, @kate.name => @kate.id}
+      #   f.input :author, :collection => ["Justin", "Kate", "Amelia", "Gus", "Meg"]
+      #
+      # The :label_method option allows you to customize the text label inside each option tag two ways:
+      #
+      # * by naming the correct method to call on each object in the collection as a symbol (:name, :login, etc)
+      # * by passing a Proc that will be called on each object in the collection, allowing you to use helpers or multiple model attributes together
+      #
+      # Examples:
+      #
+      #   f.input :author, :label_method => :full_name
+      #   f.input :author, :label_method => :login
+      #   f.input :author, :label_method => :full_name_with_post_count
+      #   f.input :author, :label_method => Proc.new { |a| "#{a.name} (#{pluralize("post", a.posts.count)})" }
+      #
+      # The :value_method option provides the same customization of the value attribute of each option tag.
+      #
+      # Examples:
+      #
+      #   f.input :author, :value_method => :full_name
+      #   f.input :author, :value_method => :login
+      #   f.input :author, :value_method => Proc.new { |a| "author_#{a.login}" }
+      #
+      # You can pre-select a specific option value by passing in the :selected option.
+      # 
+      # Examples:
+      #  
+      #   f.input :author, :selected => current_user.id
+      #   f.input :author, :value_method => :login, :selected => current_user.login
+      #   f.input :authors, :value_method => :login, :selected => Author.most_popular.collect(&:id)
+      #   f.input :authors, :value_method => :login, :selected => nil   # override any defaults: select none
+      #
+      # You can pass html_options to the select tag using :input_html => {}
+      #
+      # Examples:
+      #
+      #   f.input :authors, :input_html => {:size => 20, :multiple => true}
+      #
+      # By default, all select inputs will have a blank option at the top of the list. You can add
+      # a prompt with the :prompt option, or disable the blank option with :include_blank => false.
+      #
+      #
+      # You can group the options in optgroup elements by passing the :group_by option 
+      # (Note: only tested for belongs_to relations)
+      # 
+      # Examples:
+      #
+      #   f.input :author, :group_by => :continent
+      # 
+      # All the other options should work as expected. If you want to call a custom method on the 
+      # group item. You can include the option:group_label_method
+      # Examples:
+      #
+      #   f.input :author, :group_by => :continents, :group_label_method => :something_different
+      #
+      def select_input(method, options)
+        html_options = options.delete(:input_html) || {}
+        options = set_include_blank(options)
+        html_options[:multiple] = html_options[:multiple] || options.delete(:multiple)
+        html_options.delete(:multiple) if html_options[:multiple].nil?
+
+        reflection = self.reflection_for(method)
+        if reflection && [ :has_many, :has_and_belongs_to_many ].include?(reflection.macro)
+          options[:include_blank]   = false
+          html_options[:multiple] = true if html_options[:multiple].nil?
+          html_options[:size]     ||= 5
+        end
+        options[:selected] = options[:selected].first if options[:selected].present? && html_options[:multiple] == false
+        input_name = generate_association_input_name(method)
+
+        select_html = if options[:group_by]
+          # The grouped_options_select is a bit counter intuitive and not optimised (mostly due to ActiveRecord). 
+          # The formtastic user however shouldn't notice this too much.
+          raw_collection = find_raw_collection_for_column(method, options.reverse_merge(:find_options => { :include => options[:group_by] }))
+          label, value = detect_label_and_value_method!(raw_collection)
+          group_collection = raw_collection.map { |option| option.send(options[:group_by]) }.uniq
+          group_label_method = options[:group_label_method] || detect_label_method(group_collection)
+          group_collection = group_collection.sort_by { |group_item| group_item.send(group_label_method) }
+          group_association = options[:group_association] || detect_group_association(method, options[:group_by])
+
+          # Here comes the monster with 8 arguments
+          self.grouped_collection_select(input_name, group_collection,
+                                         group_association, group_label_method,
+                                         value, label, 
+                                         strip_formtastic_options(options), html_options)
         else
-          opts = set_options(options).merge(:prefix => @object_name, :field_name => field_name)
-          item_label_text = I18n.t(input.to_s, :default => input.to_s.humanize, :scope => [:datetime, :prompts])
+          collection = find_collection_for_column(method, options)
 
-          list_items_capture << template.content_tag(:li,
-            template.content_tag(:label, item_label_text, :for => html_id) +
-            template.send("select_#{input}".intern, datetime, opts, html_options.merge(:id => html_id))
-          )
+          self.select(input_name, collection, strip_formtastic_options(options), html_options)
         end
-      end
 
-      hidden_fields_capture + field_set_and_list_wrapping_for_method(method, options, list_items_capture)
-    end
+        self.label(method, options_for_label(options).merge(:input_name => input_name)) << select_html
+      end
+      alias :boolean_select_input :select_input
+
+      # Outputs a timezone select input as Rails' time_zone_select helper. You
+      # can give priority zones as option.
+      #
+      # Examples:
+      #
+      #   f.input :time_zone, :as => :time_zone, :priority_zones => /Australia/
+      #
+      # You can pre-select a specific option value by passing in the :selected option.
+      # Note: Right now only works if the form object attribute value is not set (nil),
+      # because of how the core helper is implemented.
+      # 
+      # Examples:
+      #  
+      #   f.input :my_favorite_time_zone, :as => :time_zone, :selected => 'Singapore'
+      #
+      def time_zone_input(method, options)
+        html_options = options.delete(:input_html) || {}
+        selected_value = options.delete(:selected)
+
+        self.label(method, options_for_label(options)) <<
+        self.time_zone_select(method, options.delete(:priority_zones),
+          strip_formtastic_options(options).merge(:default => selected_value), html_options)
+      end
 
+      # Outputs a fieldset containing a legend for the label text, and an ordered list (ol) of list
+      # items, one for each possible choice in the belongs_to association.  Each li contains a
+      # label and a radio input.
+      #
+      # Example:
+      #
+      #   f.input :author, :as => :radio
+      #
+      # Output:
+      #
+      #   <fieldset>
+      #     <legend><span>Author</span></legend>
+      #     <ol>
+      #       <li>
+      #         <label for="book_author_id_1"><input id="book_author_id_1" name="book[author_id]" type="radio" value="1" /> Justin French</label>
+      #       </li>
+      #       <li>
+      #         <label for="book_author_id_2"><input id="book_author_id_2" name="book[owner_id]" type="radio" value="2" /> Kate French</label>
+      #       </li>
+      #     </ol>
+      #   </fieldset>
+      #
+      # You can customize the choices available in the radio button set by passing in a collection (an Array or 
+      # Hash) through the :collection option.  If not provided, the choices are found by reflecting on the association
+      # (Author.find(:all) in the example above).
+      #
+      # Examples:
+      #
+      #   f.input :author, :as => :radio, :collection => @authors
+      #   f.input :author, :as => :radio, :collection => Author.find(:all)
+      #   f.input :author, :as => :radio, :collection => [@justin, @kate]
+      #   f.input :author, :collection => ["Justin", "Kate", "Amelia", "Gus", "Meg"]
+      #
+      # The :label_method option allows you to customize the label for each radio button two ways:
+      #
+      # * by naming the correct method to call on each object in the collection as a symbol (:name, :login, etc)
+      # * by passing a Proc that will be called on each object in the collection, allowing you to use helpers or multiple model attributes together
+      #
+      # Examples:
+      #
+      #   f.input :author, :as => :radio, :label_method => :full_name
+      #   f.input :author, :as => :radio, :label_method => :login
+      #   f.input :author, :as => :radio, :label_method => :full_name_with_post_count
+      #   f.input :author, :as => :radio, :label_method => Proc.new { |a| "#{a.name} (#{pluralize("post", a.posts.count)})" }
+      #
+      # The :value_method option provides the same customization of the value attribute of each option tag.
+      #
+      # Examples:
+      #
+      #   f.input :author, :as => :radio, :value_method => :full_name
+      #   f.input :author, :as => :radio, :value_method => :login
+      #   f.input :author, :as => :radio, :value_method => Proc.new { |a| "author_#{a.login}" }
+      # 
+      # You can force a particular radio button in the collection to be checked with the :selected option.
+      #
+      # Examples:
+      #
+      #   f.input :subscribe_to_newsletter, :as => :radio, :selected => true
+      #   f.input :subscribe_to_newsletter, :as => :radio, :collection => ["Yeah!", "Nope!"], :selected => "Nope!"
+      #
+      # Finally, you can set :value_as_class => true if you want the li wrapper around each radio 
+      # button / label combination to contain a class with the value of the radio button (useful for
+      # applying specific CSS or Javascript to a particular radio button).
+      #
+      def radio_input(method, options)
+        collection   = find_collection_for_column(method, options)
+        html_options = strip_formtastic_options(options).merge(options.delete(:input_html) || {})
+
+        input_name = generate_association_input_name(method)
+        value_as_class = options.delete(:value_as_class)
+        input_ids = []
+        selected_option_is_present = [:selected, :checked].any? { |k| options.key?(k) }
+        selected_value = (options.key?(:checked) ? options[:checked] : options[:selected]) if selected_option_is_present
+
+        list_item_content = collection.map do |c|
+          label = c.is_a?(Array) ? c.first : c
+          value = c.is_a?(Array) ? c.last  : c
+          input_id = generate_html_id(input_name, value.to_s.gsub(/\s/, '_').gsub(/\W/, '').downcase)
+          input_ids << input_id
+
+          html_options[:checked] = selected_value == value if selected_option_is_present
+
+          li_content = template.content_tag(:label,
+            "#{self.radio_button(input_name, value, html_options)} #{label}",
+            :for => input_id
+          )
 
-    # Outputs a fieldset containing a legend for the label text, and an ordered list (ol) of list
-    # items, one for each possible choice in the belongs_to association.  Each li contains a
-    # label and a check_box input.
-    #
-    # This is an alternative for has many and has and belongs to many associations.
-    #
-    # Example:
-    #
-    #   f.input :author, :as => :check_boxes
-    #
-    # Output:
-    #
-    #   <fieldset>
-    #     <legend><span>Authors</span></legend>
-    #     <ol>
-    #       <li>
-    #         <input type="hidden" name="book[author_id][1]" value="">
-    #         <label for="book_author_id_1"><input id="book_author_id_1" name="book[author_id][1]" type="checkbox" value="1" /> Justin French</label>
-    #       </li>
-    #       <li>
-    #         <input type="hidden" name="book[author_id][2]" value="">
-    #         <label for="book_author_id_2"><input id="book_author_id_2" name="book[owner_id][2]" type="checkbox" value="2" /> Kate French</label>
-    #       </li>
-    #     </ol>
-    #   </fieldset>
-    #
-    # Notice that the value of the checkbox is the same as the id and the hidden
-    # field has empty value. You can override the hidden field value using the
-    # unchecked_value option.
-    #
-    # You can customize the options available in the set by passing in a collection (Array) of
-    # ActiveRecord objects through the :collection option.  If not provided, the choices are found
-    # by inferring the parent's class name from the method name and simply calling find(:all) on
-    # it (Author.find(:all) in the example above).
-    #
-    # Examples:
-    #
-    #   f.input :author, :as => :check_boxes, :collection => @authors
-    #   f.input :author, :as => :check_boxes, :collection => Author.find(:all)
-    #   f.input :author, :as => :check_boxes, :collection => [@justin, @kate]
-    #
-    # You can also customize the text label inside each option tag, by naming the correct method
-    # (:full_name, :display_name, :account_number, etc) to call on each object in the collection
-    # by passing in the :label_method option.  By default the :label_method is whichever element of
-    # Formtastic::SemanticFormBuilder.collection_label_methods is found first.
-    #
-    # Examples:
-    #
-    #   f.input :author, :as => :check_boxes, :label_method => :full_name
-    #   f.input :author, :as => :check_boxes, :label_method => :display_name
-    #   f.input :author, :as => :check_boxes, :label_method => :to_s
-    #   f.input :author, :as => :check_boxes, :label_method => :label
-    #
-    # You can set :value_as_class => true if you want that LI wrappers contains
-    # a class with the wrapped checkbox input value.
-    #
-    def check_boxes_input(method, options)
-      collection = find_collection_for_column(method, options)
-      html_options = options.delete(:input_html) || {}
-
-      input_name      = generate_association_input_name(method)
-      value_as_class  = options.delete(:value_as_class)
-      unchecked_value = options.delete(:unchecked_value) || ''
-      html_options    = { :name => "#{@object_name}[#{input_name}][]" }.merge(html_options)
-
-      list_item_content = collection.map do |c|
-        label = c.is_a?(Array) ? c.first : c
-        value = c.is_a?(Array) ? c.last : c
-
-        html_options.merge!(:id => generate_html_id(input_name, value.to_s.downcase))
- 
-        li_content = template.content_tag(:label,
-          "#{self.check_box(input_name, html_options, value, unchecked_value)} #{label}",
-          :for => html_options[:id]
-        )
+          li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
+          template.content_tag(:li, li_content, li_options)
+        end
 
-        li_options = value_as_class ? { :class => value.to_s.downcase } : {}
-        template.content_tag(:li, li_content, li_options)
+        field_set_and_list_wrapping_for_method(method, options.merge(:label_for => input_ids.first), list_item_content)
+      end
+      alias :boolean_radio_input :radio_input
+
+      # Outputs a fieldset with a legend for the method label, and a ordered list (ol) of list
+      # items (li), one for each fragment for the date (year, month, day).  Each li contains a label
+      # (eg "Year") and a select box.  See date_or_datetime_input for a more detailed output example.
+      #
+      # You can pre-select a specific option value by passing in the :selected option.
+      # 
+      # Examples:
+      # 
+      #   f.input :created_at, :as => :date, :selected => 1.day.ago
+      #   f.input :created_at, :as => :date, :selected => nil   # override any defaults: select none
+      #
+      # Some of Rails' options for select_date are supported, but not everything yet.
+      #
+      def date_input(method, options)
+        options = set_include_blank(options)
+        date_or_datetime_input(method, options.merge(:discard_hour => true))
       end
 
-      field_set_and_list_wrapping_for_method(method, options, list_item_content)
-    end
-    
-    
-    # Outputs a country select input, wrapping around a regular country_select helper. 
-    # Rails doesn't come with a country_select helper by default any more, so you'll need to install
-    # the "official" plugin, or, if you wish, any other country_select plugin that behaves in the
-    # same way.
-    #
-    # The Rails plugin iso-3166-country-select plugin can be found "here":http://github.com/rails/iso-3166-country-select.
-    #
-    # By default, Formtastic includes a handfull of english-speaking countries as "priority counties", 
-    # which you can change to suit your market and user base (see README for more info on config).
-    #
-    # Examples:
-    #   f.input :location, :as => :country # use Formtastic::SemanticFormBuilder.priority_countries array for the priority countries
-    #   f.input :location, :as => :country, :priority_countries => /Australia/ # set your own
-    #
-    def country_input(method, options)
-      raise "To use the :country input, please install a country_select plugin, like this one: http://github.com/rails/iso-3166-country-select" unless self.respond_to?(:country_select)
-      
-      html_options = options.delete(:input_html) || {}
-      priority_countries = options.delete(:priority_countries) || @@priority_countries
+      # Outputs a fieldset with a legend for the method label, and a ordered list (ol) of list
+      # items (li), one for each fragment for the date (year, month, day, hour, min, sec).  Each li
+      # contains a label (eg "Year") and a select box.  See date_or_datetime_input for a more
+      # detailed output example.
+      #
+      # You can pre-select a specific option value by passing in the :selected option.
+      # 
+      # Examples:
+      # 
+      #   f.input :created_at, :as => :datetime, :selected => 1.day.ago
+      #   f.input :created_at, :as => :datetime, :selected => nil   # override any defaults: select none
+      #
+      # Some of Rails' options for select_date are supported, but not everything yet.
+      #
+      def datetime_input(method, options)
+        options = set_include_blank(options)
+        date_or_datetime_input(method, options)
+      end
 
-      self.label(method, options_for_label(options)) +
-      self.country_select(method, priority_countries, set_options(options), html_options)
-    end
-    
+      # Outputs a fieldset with a legend for the method label, and a ordered list (ol) of list
+      # items (li), one for each fragment for the time (hour, minute, second).  Each li contains a label
+      # (eg "Hour") and a select box.  See date_or_datetime_input for a more detailed output example.
+      #
+      # You can pre-select a specific option value by passing in the :selected option.
+      # 
+      # Examples:
+      # 
+      #   f.input :created_at, :as => :time, :selected => 1.hour.ago
+      #   f.input :created_at, :as => :time, :selected => nil   # override any defaults: select none
+      #
+      # Some of Rails' options for select_time are supported, but not everything yet.
+      #
+      def time_input(method, options)
+        options = set_include_blank(options)
+        date_or_datetime_input(method, options.merge(:discard_year => true, :discard_month => true, :discard_day => true))
+      end
 
-    # Outputs a label containing a checkbox and the label text. The label defaults
-    # to the column name (method name) and can be altered with the :label option.
-    # :checked_value and :unchecked_value options are also available.
-    #
-    def boolean_input(method, options)
-      html_options = options.delete(:input_html) || {}
+      # <fieldset>
+      #   <legend>Created At</legend>
+      #   <ol>
+      #     <li>
+      #       <label for="user_created_at_1i">Year</label>
+      #       <select id="user_created_at_1i" name="user[created_at(1i)]">
+      #         <option value="2003">2003</option>
+      #         ...
+      #         <option value="2013">2013</option>
+      #       </select>
+      #     </li>
+      #     <li>
+      #       <label for="user_created_at_2i">Month</label>
+      #       <select id="user_created_at_2i" name="user[created_at(2i)]">
+      #         <option value="1">January</option>
+      #         ...
+      #         <option value="12">December</option>
+      #       </select>
+      #     </li>
+      #     <li>
+      #       <label for="user_created_at_3i">Day</label>
+      #       <select id="user_created_at_3i" name="user[created_at(3i)]">
+      #         <option value="1">1</option>
+      #         ...
+      #         <option value="31">31</option>
+      #       </select>
+      #     </li>
+      #   </ol>
+      # </fieldset>
+      #
+      # This is an absolute abomination, but so is the official Rails select_date().
+      #
+      def date_or_datetime_input(method, options)
+        position = { :year => 1, :month => 2, :day => 3, :hour => 4, :minute => 5, :second => 6 }
+        i18n_date_order = ::I18n.t(:order, :scope => [:date])
+        i18n_date_order = nil unless i18n_date_order.is_a?(Array)
+        inputs   = options.delete(:order) || i18n_date_order || [:year, :month, :day]
+
+        time_inputs = [:hour, :minute]
+        time_inputs << [:second] if options[:include_seconds]
+
+        list_items_capture = ""
+        hidden_fields_capture = ""
+
+        default_time = ::Time.now
+
+        # Gets the datetime object. It can be a Fixnum, Date or Time, or nil.
+        datetime = options[:selected] || (@object ? @object.send(method) : default_time) || default_time
+        
+        html_options = options.delete(:input_html) || {}
+        input_ids    = []
+
+        (inputs + time_inputs).each do |input|
+          input_ids << input_id = generate_html_id(method, "#{position[input]}i")
+
+          field_name = "#{method}(#{position[input]}i)"
+          if options[:"discard_#{input}"]
+            break if time_inputs.include?(input)
+
+            hidden_value = datetime.respond_to?(input) ? datetime.send(input.to_sym) : datetime
+            hidden_fields_capture << template.hidden_field_tag("#{@object_name}[#{field_name}]", (hidden_value || 1), :id => input_id)
+          else
+            opts = strip_formtastic_options(options).merge(:prefix => @object_name, :field_name => field_name, :default => datetime)
+            item_label_text = ::I18n.t(input.to_s, :default => input.to_s.humanize, :scope => [:datetime, :prompts])
+
+            list_items_capture << template.content_tag(:li,
+              template.content_tag(:label, item_label_text, :for => input_id) <<
+              template.send(:"select_#{input}", datetime, opts, html_options.merge(:id => input_id))
+            )
+          end
+        end
 
-      input = self.check_box(method, set_options(options).merge(html_options),
-                             options.delete(:checked_value) || '1', options.delete(:unchecked_value) || '0')
+        hidden_fields_capture << field_set_and_list_wrapping_for_method(method, options.merge(:label_for => input_ids.first), list_items_capture)
+      end
 
-      label = options.delete(:label) || humanized_attribute_name(method)
-      self.label(method, input + label, options_for_label(options))
-    end
+      # Outputs a fieldset containing a legend for the label text, and an ordered list (ol) of list
+      # items, one for each possible choice in the belongs_to association.  Each li contains a
+      # label and a check_box input.
+      #
+      # This is an alternative for has many and has and belongs to many associations.
+      #
+      # Example:
+      #
+      #   f.input :author, :as => :check_boxes
+      #
+      # Output:
+      #
+      #   <fieldset>
+      #     <legend class="label"><label>Authors</label></legend>
+      #     <ol>
+      #       <li>
+      #         <input type="hidden" name="book[author_id][1]" value="">
+      #         <label for="book_author_id_1"><input id="book_author_id_1" name="book[author_id][1]" type="checkbox" value="1" /> Justin French</label>
+      #       </li>
+      #       <li>
+      #         <input type="hidden" name="book[author_id][2]" value="">
+      #         <label for="book_author_id_2"><input id="book_author_id_2" name="book[owner_id][2]" type="checkbox" value="2" /> Kate French</label>
+      #       </li>
+      #     </ol>
+      #   </fieldset>
+      #
+      # Notice that the value of the checkbox is the same as the id and the hidden
+      # field has empty value. You can override the hidden field value using the
+      # unchecked_value option.
+      #
+      # You can customize the options available in the set by passing in a collection (Array) of
+      # ActiveRecord objects through the :collection option.  If not provided, the choices are found
+      # by inferring the parent's class name from the method name and simply calling find(:all) on
+      # it (Author.find(:all) in the example above).
+      #
+      # Examples:
+      #
+      #   f.input :author, :as => :check_boxes, :collection => @authors
+      #   f.input :author, :as => :check_boxes, :collection => Author.find(:all)
+      #   f.input :author, :as => :check_boxes, :collection => [@justin, @kate]
+      #
+      # The :label_method option allows you to customize the label for each checkbox two ways:
+      #
+      # * by naming the correct method to call on each object in the collection as a symbol (:name, :login, etc)
+      # * by passing a Proc that will be called on each object in the collection, allowing you to use helpers or multiple model attributes together
+      #
+      # Examples:
+      #
+      #   f.input :author, :as => :check_boxes, :label_method => :full_name
+      #   f.input :author, :as => :check_boxes, :label_method => :login
+      #   f.input :author, :as => :check_boxes, :label_method => :full_name_with_post_count
+      #   f.input :author, :as => :check_boxes, :label_method => Proc.new { |a| "#{a.name} (#{pluralize("post", a.posts.count)})" }
+      #
+      # The :value_method option provides the same customization of the value attribute of each checkbox input tag.
+      #
+      # Examples:
+      #
+      #   f.input :author, :as => :check_boxes, :value_method => :full_name
+      #   f.input :author, :as => :check_boxes, :value_method => :login
+      #   f.input :author, :as => :check_boxes, :value_method => Proc.new { |a| "author_#{a.login}" }
+      #
+      # You can pre-select/check a specific checkbox value by passing in the :selected option (alias :checked works as well).
+      # 
+      # Examples:
+      #  
+      #   f.input :authors, :as => :check_boxes, :selected => @justin
+      #   f.input :authors, :as => :check_boxes, :selected => Author.most_popular.collect(&:id)
+      #   f.input :authors, :as => :check_boxes, :selected => nil   # override any defaults: select none
+      #
+      # Finally, you can set :value_as_class => true if you want the li wrapper around each checkbox / label 
+      # combination to contain a class with the value of the radio button (useful for applying specific 
+      # CSS or Javascript to a particular checkbox).
+      #
+      def check_boxes_input(method, options)
+        collection = find_collection_for_column(method, options)
+        html_options = options.delete(:input_html) || {}
+
+        input_name      = generate_association_input_name(method)
+        value_as_class  = options.delete(:value_as_class)
+        unchecked_value = options.delete(:unchecked_value) || ''
+        html_options    = { :name => "#{@object_name}[#{input_name}][]" }.merge(html_options)
+        input_ids       = []
+
+        selected_option_is_present = [:selected, :checked].any? { |k| options.key?(k) }
+        selected_values = (options.key?(:checked) ? options[:checked] : options[:selected]) if selected_option_is_present
+        selected_values  = [*selected_values].compact
+        
+        list_item_content = collection.map do |c|
+          label = c.is_a?(Array) ? c.first : c
+          value = c.is_a?(Array) ? c.last : c
+          input_id = generate_html_id(input_name, value.to_s.gsub(/\s/, '_').gsub(/\W/, '').downcase)
+          input_ids << input_id
+
+          html_options[:checked] = selected_values.include?(value) if selected_option_is_present
+          html_options[:id] = input_id
+
+          li_content = template.content_tag(:label,
+            "#{self.check_box(input_name, html_options, value, unchecked_value)} #{label}",
+            :for => input_id
+          )
 
-    # Generates an input for the given method using the type supplied with :as.
-    #
-    # If the input is included in INPUT_MAPPINGS, it uses input_simple
-    # implementation which maps most of the inputs. All others have specific
-    # code and then a proper handler should be called (like radio_input) for
-    # :radio types.
-    #
-    def inline_input_for(method, options)
-      input_type = options.delete(:as)
+          li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
+          template.content_tag(:li, li_content, li_options)
+        end
 
-      if INPUT_MAPPINGS.key?(input_type)
-        input_simple(input_type,  method, options)
-      else
-        send("#{input_type}_input", method, options)
+        field_set_and_list_wrapping_for_method(method, options.merge(:label_for => input_ids.first), list_item_content)
       end
-    end
 
-    # Generates hints for the given method using the text supplied in :hint.
-    #
-    def inline_hints_for(method, options) #:nodoc:
-      options[:hint] = localized_attribute_string(method, options[:hint], :hint)
-      return if options[:hint].blank?
-      template.content_tag(:p, options[:hint], :class => 'inline-hints')
-    end
+      # Outputs a country select input, wrapping around a regular country_select helper. 
+      # Rails doesn't come with a country_select helper by default any more, so you'll need to install
+      # the "official" plugin, or, if you wish, any other country_select plugin that behaves in the
+      # same way.
+      #
+      # The Rails plugin iso-3166-country-select plugin can be found "here":http://github.com/rails/iso-3166-country-select.
+      #
+      # By default, Formtastic includes a handfull of english-speaking countries as "priority counties", 
+      # which you can change to suit your market and user base (see README for more info on config).
+      #
+      # Examples:
+      #   f.input :location, :as => :country # use Formtastic::SemanticFormBuilder.priority_countries array for the priority countries
+      #   f.input :location, :as => :country, :priority_countries => /Australia/ # set your own
+      #
+      def country_input(method, options)
+        raise "To use the :country input, please install a country_select plugin, like this one: http://github.com/rails/iso-3166-country-select" unless self.respond_to?(:country_select)
+      
+        html_options = options.delete(:input_html) || {}
+        priority_countries = options.delete(:priority_countries) || @@priority_countries
 
-    # Creates an error sentence by calling to_sentence on the errors array.
-    #
-    def error_sentence(errors) #:nodoc:
-      template.content_tag(:p, errors.to_sentence.untaint, :class => 'inline-errors')
-    end
+        self.label(method, options_for_label(options)) <<
+        self.country_select(method, priority_countries, strip_formtastic_options(options), html_options)
+      end
 
-    # Creates an error li list.
-    #
-    def error_list(errors) #:nodoc:
-      list_elements = []
-      errors.each do |error|
-        list_elements <<  template.content_tag(:li, error.untaint)
+      # Outputs a label containing a checkbox and the label text. The label defaults
+      # to the column name (method name) and can be altered with the :label option.
+      # :checked_value and :unchecked_value options are also available.
+      #
+      # You can pre-select/check the boolean checkbox by passing in the :selected option (alias :checked works as well).
+      # 
+      # Examples:
+      #  
+      #   f.input :allow_comments, :as => :boolean, :selected => true   # override any default value: selected/checked
+      #
+      def boolean_input(method, options)
+        html_options = options.delete(:input_html) || {}
+        checked = options.key?(:checked) ? options[:checked] : options[:selected]
+        html_options[:checked] = checked == true if [:selected, :checked].any? { |k| options.key?(k) }
+
+        input = self.check_box(method, strip_formtastic_options(options).merge(html_options),
+                               options.delete(:checked_value) || '1', options.delete(:unchecked_value) || '0')
+        options = options_for_label(options)
+
+        # the label() method will insert this nested input into the label at the last minute
+        options[:label_prefix_for_nested_input] = input
+
+        self.label(method, options)
       end
-      template.content_tag(:ul, list_elements.join("\n"), :class => 'errors')
-    end
 
-    # Generates the required or optional string. If the value set is a proc,
-    # it evaluates the proc first.
-    #
-    def required_or_optional_string(required) #:nodoc:
-      string_or_proc = case required
-        when true
-          @@required_string
-        when false
-          @@optional_string
-        else
-          required
+      # Generates an input for the given method using the type supplied with :as.
+      def inline_input_for(method, options)
+        send(:"#{options.delete(:as)}_input", method, options)
       end
 
-      if string_or_proc.is_a?(Proc)
-        string_or_proc.call
-      else
-        string_or_proc.to_s
+      # Generates hints for the given method using the text supplied in :hint.
+      #
+      def inline_hints_for(method, options) #:nodoc:
+        options[:hint] = localized_string(method, options[:hint], :hint)
+        return if options[:hint].blank?
+        template.content_tag(:p, options[:hint], :class => 'inline-hints')
       end
-    end
 
-    # Generates a fieldset and wraps the content in an ordered list. When working
-    # with nested attributes (in Rails 2.3), it allows %i as interpolation option
-    # in :name. So you can do:
-    #
-    #   f.inputs :name => 'Task #%i', :for => :tasks
-    #
-    # And it will generate a fieldset for each task with legend 'Task #1', 'Task #2',
-    # 'Task #3' and so on.
-    #
-    def field_set_and_list_wrapping(html_options, contents='', &block) #:nodoc:
-      legend  = html_options.delete(:name).to_s
-      legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
-      legend  = template.content_tag(:legend, template.content_tag(:span, legend)) unless legend.blank?
+      # Creates an error sentence by calling to_sentence on the errors array.
+      #
+      def error_sentence(errors) #:nodoc:
+        template.content_tag(:p, errors.to_sentence.untaint, :class => 'inline-errors')
+      end
 
-      contents = template.capture(&block) if block_given?
+      # Creates an error li list.
+      #
+      def error_list(errors) #:nodoc:
+        list_elements = []
+        errors.each do |error|
+          list_elements <<  template.content_tag(:li, error.untaint)
+        end
+        template.content_tag(:ul, list_elements.join("\n"), :class => 'errors')
+      end
 
-      # Ruby 1.9: String#to_s behavior changed, need to make an explicit join.
-      contents = contents.join if contents.respond_to?(:join)
-      fieldset = template.content_tag(:fieldset,
-        legend + template.content_tag(:ol, contents),
-        html_options.except(:builder, :parent)
-      )
+      # Creates an error sentence containing only the first error
+      #
+      def error_first(errors) #:nodoc:
+        template.content_tag(:p, errors.first.untaint, :class => 'inline-errors')
+      end
 
-      template.concat(fieldset) if block_given?
-      fieldset
-    end
+      # Generates the required or optional string. If the value set is a proc,
+      # it evaluates the proc first.
+      #
+      def required_or_optional_string(required) #:nodoc:
+        string_or_proc = case required
+          when true
+            @@required_string
+          when false
+            @@optional_string
+          else
+            required
+        end
 
-    # Also generates a fieldset and an ordered list but with label based in
-    # method. This methods is currently used by radio and datetime inputs.
-    #
-    def field_set_and_list_wrapping_for_method(method, options, contents)
-      contents = contents.join if contents.respond_to?(:join)
+        if string_or_proc.is_a?(Proc)
+          string_or_proc.call
+        else
+          string_or_proc.to_s
+        end
+      end
 
-      template.content_tag(:fieldset,
-        %{<legend>#{self.label(method, options_for_label(options).merge!(:as_span => true))}</legend>} +
-        template.content_tag(:ol, contents)
-      )
-    end
+      # Generates a fieldset and wraps the content in an ordered list. When working
+      # with nested attributes (in Rails 2.3), it allows %i as interpolation option
+      # in :name. So you can do:
+      #
+      #   f.inputs :name => 'Task #%i', :for => :tasks
+      #
+      # or the shorter equivalent:
+      #
+      #   f.inputs 'Task #%i', :for => :tasks
+      #
+      # And it will generate a fieldset for each task with legend 'Task #1', 'Task #2',
+      # 'Task #3' and so on.
+      #
+      # Note: Special case for the inline inputs (non-block):
+      #   f.inputs "My little legend", :title, :body, :author   # Explicit legend string => "My little legend"
+      #   f.inputs :my_little_legend, :title, :body, :author    # Localized (118n) legend with I18n key => I18n.t(:my_little_legend, ...)
+      #   f.inputs :title, :body, :author                       # First argument is a column => (no legend)
+      #
+      def field_set_and_list_wrapping(*args, &block) #:nodoc:
+        contents = args.last.is_a?(::Hash) ? '' : args.pop.flatten
+        html_options = args.extract_options!
+
+        legend  = html_options.delete(:name).to_s
+        legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
+        legend  = template.content_tag(:legend, template.content_tag(:span, legend)) unless legend.blank?
+
+        if block_given?
+          contents = if template.respond_to?(:is_haml?) && template.is_haml?
+            template.capture_haml(&block)
+          else
+            template.capture(&block)
+          end
+        end
 
-    # For methods that have a database column, take a best guess as to what the input method
-    # should be.  In most cases, it will just return the column type (eg :string), but for special
-    # cases it will simplify (like the case of :integer, :float & :decimal to :numeric), or do
-    # something different (like :password and :select).
-    #
-    # If there is no column for the method (eg "virtual columns" with an attr_accessor), the
-    # default is a :string, a similar behaviour to Rails' scaffolding.
-    #
-    def default_input_type(method) #:nodoc:
-      column = @object.column_for_attribute(method) if @object.respond_to?(:column_for_attribute)
+        # Ruby 1.9: String#to_s behavior changed, need to make an explicit join.
+        contents = contents.join if contents.respond_to?(:join)
+        fieldset = template.content_tag(:fieldset,
+          legend << template.content_tag(:ol, contents),
+          html_options.except(:builder, :parent)
+        )
 
-      if column
-        # handle the special cases where the column type doesn't map to an input method
-        return :time_zone if column.type == :string && method.to_s =~ /time_zone/
-        return :select    if column.type == :integer && method.to_s =~ /_id$/
-        return :datetime  if column.type == :timestamp
-        return :numeric   if [:integer, :float, :decimal].include?(column.type)
-        return :password  if column.type == :string && method.to_s =~ /password/
-        return :country   if column.type == :string && method.to_s =~ /country/
+        template.concat(fieldset) if block_given?
+        fieldset
+      end
 
-        # otherwise assume the input name will be the same as the column type (eg string_input)
-        return column.type
-      else
-        if @object
-          return :select if find_reflection(method)
+      def field_set_title_from_args(*args) #:nodoc:
+        options = args.extract_options!
+        options[:name] ||= options.delete(:title)
+        title = options[:name]
 
-          file = @object.send(method) if @object.respond_to?(method)
-          return :file   if file && @@file_methods.any? { |m| file.respond_to?(m) }
+        if title.blank?
+          valid_name_classes = [::String, ::Symbol]
+          valid_name_classes.delete(::Symbol) if !block_given? && (args.first.is_a?(::Symbol) && self.content_columns.include?(args.first))
+          title = args.shift if valid_name_classes.any? { |valid_name_class| args.first.is_a?(valid_name_class) }
         end
+        title = localized_string(title, title, :title) if title.is_a?(::Symbol)
+        title
+      end
 
-        return :password if method.to_s =~ /password/
-        return :string
+      # Also generates a fieldset and an ordered list but with label based in
+      # method. This methods is currently used by radio and datetime inputs.
+      #
+      def field_set_and_list_wrapping_for_method(method, options, contents) #:nodoc:
+        contents = contents.join if contents.respond_to?(:join)
+
+        template.content_tag(:fieldset,
+            template.content_tag(:legend,
+                self.label(method, options_for_label(options).merge(:for => options.delete(:label_for))), :class => 'label'
+              ) <<
+            template.content_tag(:ol, contents)
+          )
       end
-    end
 
-    # Used by select and radio inputs. The collection can be retrieved by
-    # three ways:
-    #
-    # * Explicitly provided through :collection
-    # * Retrivied through an association
-    # * Or a boolean column, which will generate a localized { "Yes" => true, "No" => false } hash.
-    #
-    # If the collection is not a hash or an array of strings, fixnums or arrays,
-    # we use label_method and value_method to retreive an array with the
-    # appropriate label and value.
-    #
-    def find_collection_for_column(column, options)
-      reflection = find_reflection(column)
+      # For methods that have a database column, take a best guess as to what the input method
+      # should be.  In most cases, it will just return the column type (eg :string), but for special
+      # cases it will simplify (like the case of :integer, :float & :decimal to :numeric), or do
+      # something different (like :password and :select).
+      #
+      # If there is no column for the method (eg "virtual columns" with an attr_accessor), the
+      # default is a :string, a similar behaviour to Rails' scaffolding.
+      #
+      def default_input_type(method, options = {}) #:nodoc:
+        if column = self.column_for(method)
+          # Special cases where the column type doesn't map to an input method.
+          case column.type
+          when :string
+            return :password  if method.to_s =~ /password/
+            return :country   if method.to_s =~ /country/
+            return :time_zone if method.to_s =~ /time_zone/
+          when :integer
+            return :select    if method.to_s =~ /_id$/
+            return :numeric
+          when :float, :decimal
+            return :numeric
+          when :timestamp
+            return :datetime
+          end
+          
+          # Try look for hints in options hash. Quite common senario: Enum keys stored as string in the database.
+          return :select    if column.type == :string && options.key?(:collection)
+          # Try 3: Assume the input name will be the same as the column type (e.g. string_input).
+          return column.type
+        else
+          if @object
+            return :select  if self.reflection_for(method)
+
+            file = @object.send(method) if @object.respond_to?(method)
+            return :file    if file && @@file_methods.any? { |m| file.respond_to?(m) }
+          end
+
+          return :select    if options.key?(:collection)
+          return :password  if method.to_s =~ /password/
+          return :string
+        end
+      end
+
+      # Used by select and radio inputs. The collection can be retrieved by
+      # three ways:
+      #
+      # * Explicitly provided through :collection
+      # * Retrivied through an association
+      # * Or a boolean column, which will generate a localized { "Yes" => true, "No" => false } hash.
+      #
+      # If the collection is not a hash or an array of strings, fixnums or arrays,
+      # we use label_method and value_method to retreive an array with the
+      # appropriate label and value.
+      #
+      def find_collection_for_column(column, options) #:nodoc:
+        collection = find_raw_collection_for_column(column, options)
+
+        # Return if we have an Array of strings, fixnums or arrays
+        return collection if (collection.instance_of?(Array) || collection.instance_of?(Range)) &&
+                             [Array, Fixnum, String, Symbol].include?(collection.first.class)
+
+        label, value = detect_label_and_value_method!(collection, options)
+        collection.map { |o| [send_or_call(label, o), send_or_call(value, o)] }
+      end
 
-      collection = if options[:collection]
-        options.delete(:collection)
-      elsif reflection || column.to_s =~ /_id$/
-        parent_class = if reflection
-          reflection.klass
+      # As #find_collection_for_column but returns the collection without mapping the label and value
+      #
+      def find_raw_collection_for_column(column, options) #:nodoc:
+        collection = if options[:collection]
+          options.delete(:collection)
+        elsif reflection = self.reflection_for(column)
+          reflection.klass.find(:all, options[:find_options] || {})
         else
-          ::ActiveSupport::Deprecation.warn("The _id way of doing things is deprecated. Please use the association method (#{column.to_s.sub(/_id$/,'')})", caller[3..-1])
-          column.to_s.sub(/_id$/,'').camelize.constantize
+          create_boolean_collection(options)
         end
 
-        parent_class.find(:all)
-      else
-        create_boolean_collection(options)
+        collection = collection.to_a if collection.is_a?(Hash)
+        collection
+      end
+
+      # Detects the label and value methods from a collection values set in 
+      # @@collection_label_methods. It will use and delete
+      # the options :label_method and :value_methods when present
+      #
+      def detect_label_and_value_method!(collection_or_instance, options = {}) #:nodoc
+        label = options.delete(:label_method) || detect_label_method(collection_or_instance)
+        value = options.delete(:value_method) || :id
+        [label, value]
       end
 
-      collection = collection.to_a if collection.instance_of?(Hash)
+      # Detected the label collection method when none is supplied using the
+      # values set in @@collection_label_methods.
+      #
+      def detect_label_method(collection) #:nodoc:
+        @@collection_label_methods.detect { |m| collection.first.respond_to?(m) }
+      end
 
-      # Return if we have an Array of strings, fixnums or arrays
-      return collection if collection.instance_of?(Array) &&
-                           [Array, Fixnum, String, Symbol].include?(collection.first.class)
+      # Detects the method to call for fetching group members from the groups when grouping select options
+      #
+      def detect_group_association(method, group_by)
+        object_to_method_reflection = self.reflection_for(method)
+        method_class = object_to_method_reflection.klass
+        
+        method_to_group_association = method_class.reflect_on_association(group_by)
+        group_class = method_to_group_association.klass
+        
+        # This will return in the normal case
+        return method.to_s.pluralize.to_sym if group_class.reflect_on_association(method.to_s.pluralize)
+      
+        # This is for belongs_to associations named differently than their class
+        # form.input :parent, :group_by => :customer
+        # eg. 
+        # class Project
+        #   belongs_to :parent, :class_name => 'Project', :foreign_key => 'parent_id'
+        #   belongs_to :customer
+        # end
+        # class Customer
+        #   has_many :projects
+        # end
+        group_method = method_class.to_s.underscore.pluralize.to_sym
+        return group_method if group_class.reflect_on_association(group_method) # :projects
+        
+        # This is for has_many associations named differently than their class
+        # eg. 
+        # class Project
+        #   belongs_to :parent, :class_name => 'Project', :foreign_key => 'parent_id'
+        #   belongs_to :customer
+        # end
+        # class Customer
+        #   has_many :tasks, :class_name => 'Project', :foreign_key => 'customer_id'
+        # end
+        possible_associations =  group_class.reflect_on_all_associations(:has_many).find_all{|assoc| assoc.klass == object_class}
+        return possible_associations.first.name.to_sym if possible_associations.count == 1
+      
+        raise "Cannot infer group association for #{method} grouped by #{group_by}, there were #{possible_associations.empty? ? 'no' : possible_associations.size} possible associations. Please specify using :group_association"
+        
+      end
 
-      label = options.delete(:label_method) || detect_label_method(collection)
-      value = options.delete(:value_method) || :id
+      # Returns a hash to be used by radio and select inputs when a boolean field
+      # is provided.
+      #
+      def create_boolean_collection(options) #:nodoc:
+        options[:true] ||= ::Formtastic::I18n.t(:yes)
+        options[:false] ||= ::Formtastic::I18n.t(:no)
+        options[:value_as_class] = true unless options.key?(:value_as_class)
 
-      collection.map { |o| [o.send(label), o.send(value)] }
-    end
+        [ [ options.delete(:true), true], [ options.delete(:false), false ] ]
+      end
 
-    # Detected the label collection method when none is supplied using the
-    # values set in @@collection_label_methods.
-    #
-    def detect_label_method(collection) #:nodoc:
-      @@collection_label_methods.detect { |m| collection.first.respond_to?(m) }
-    end
+      # Used by association inputs (select, radio) to generate the name that should
+      # be used for the input
+      #
+      #   belongs_to :author; f.input :author; will generate 'author_id'
+      #   belongs_to :entity, :foreign_key = :owner_id; f.input :author; will generate 'owner_id'
+      #   has_many :authors; f.input :authors; will generate 'author_ids'
+      #   has_and_belongs_to_many will act like has_many
+      #
+      def generate_association_input_name(method) #:nodoc:
+        if reflection = self.reflection_for(method)
+          if [:has_and_belongs_to_many, :has_many].include?(reflection.macro)
+            "#{method.to_s.singularize}_ids"
+          else
+            reflection.options[:foreign_key] || "#{method}_id"
+          end
+        else
+          method
+        end.to_sym
+      end
 
-    # Returns a hash to be used by radio and select inputs when a boolean field
-    # is provided.
-    #
-    def create_boolean_collection(options)
-      options[:true] ||= I18n.t('yes', :default => 'Yes', :scope => [:formtastic])
-      options[:false] ||= I18n.t('no', :default => 'No', :scope => [:formtastic])
-      options[:value_as_class] = true unless options.key?(:value_as_class)
+      # If an association method is passed in (f.input :author) try to find the
+      # reflection object.
+      #
+      def reflection_for(method) #:nodoc:
+        @object.class.reflect_on_association(method) if @object.class.respond_to?(:reflect_on_association)
+      end
 
-      [ [ options.delete(:true), true], [ options.delete(:false), false ] ]
-    end
+      # Get a column object for a specified attribute method - if possible.
+      #
+      def column_for(method) #:nodoc:
+        @object.column_for_attribute(method) if @object.respond_to?(:column_for_attribute)
+      end
 
-    # Used by association inputs (select, radio) to generate the name that should
-    # be used for the input
-    #
-    #   belongs_to :author; f.input :author; will generate 'author_id'
-    #   belongs_to :entity, :foreign_key = :owner_id; f.input :author; will generate 'owner_id'
-    #   has_many :authors; f.input :authors; will generate 'author_ids'
-    #   has_and_belongs_to_many will act like has_many
-    #
-    def generate_association_input_name(method)
-      if reflection = find_reflection(method)
-        if [:has_and_belongs_to_many, :has_many].include?(reflection.macro)
-          "#{method.to_s.singularize}_ids"
+      # Generates default_string_options by retrieving column information from
+      # the database.
+      #
+      def default_string_options(method, type) #:nodoc:
+        column = self.column_for(method)
+
+        if type == :numeric || column.nil? || column.limit.nil?
+          { :size => @@default_text_field_size }
         else
-          reflection.options[:foreign_key] || "#{method}_id"
+          { :maxlength => column.limit, :size => [column.limit, @@default_text_field_size].min }
         end
-      else
-        method
       end
-    end
-
-    # If an association method is passed in (f.input :author) try to find the
-    # reflection object.
-    #
-    def find_reflection(method)
-      @object.class.reflect_on_association(method) if @object.class.respond_to?(:reflect_on_association)
-    end
 
-    # Generates default_string_options by retrieving column information from
-    # the database.
-    #
-    def default_string_options(method, type) #:nodoc:
-      column = @object.column_for_attribute(method) if @object.respond_to?(:column_for_attribute)
+      # Generate the html id for the li tag.
+      # It takes into account options[:index] and @auto_index to generate li
+      # elements with appropriate index scope. It also sanitizes the object
+      # and method names.
+      #
+      def generate_html_id(method_name, value='input') #:nodoc:
+        if options.has_key?(:index)
+          index = "_#{options[:index]}"
+        elsif defined?(@auto_index)
+          index = "_#{@auto_index}"
+        else
+          index = ""
+        end
+        sanitized_method_name = method_name.to_s.gsub(/[\?\/\-]$/, '')
 
-      if type == :numeric || column.nil? || column.limit.nil?
-        { :size => @@default_text_field_size }
-      else
-        { :maxlength => column.limit, :size => [column.limit, @@default_text_field_size].min }
+        "#{sanitized_object_name}#{index}_#{sanitized_method_name}_#{value}"
       end
-    end
 
-    # Generate the html id for the li tag.
-    # It takes into account options[:index] and @auto_index to generate li
-    # elements with appropriate index scope. It also sanitizes the object
-    # and method names.
-    #
-    def generate_html_id(method_name, value='input')
-      if options.has_key?(:index)
-        index = "_#{options[:index]}"
-      elsif defined?(@auto_index)
-        index = "_#{@auto_index}"
-      else
-        index = ""
+      # Gets the nested_child_index value from the parent builder. In Rails 2.3
+      # it always returns a fixnum. In next versions it returns a hash with each
+      # association that the parent builds.
+      #
+      def parent_child_index(parent) #:nodoc:
+        duck = parent[:builder].instance_variable_get('@nested_child_index')
+
+        if duck.is_a?(Hash)
+          child = parent[:for]
+          child = child.first if child.respond_to?(:first)
+          duck[child].to_i + 1
+        else
+          duck.to_i + 1
+        end
       end
-      sanitized_method_name = method_name.to_s.gsub(/[\?\/\-]$/, '')
-      
-      "#{sanitized_object_name}#{index}_#{sanitized_method_name}_#{value}"
-    end
 
-    # Gets the nested_child_index value from the parent builder. In Rails 2.3
-    # it always returns a fixnum. In next versions it returns a hash with each
-    # association that the parent builds.
-    #
-    def parent_child_index(parent)
-      duck = parent[:builder].instance_variable_get('@nested_child_index')
+      def sanitized_object_name #:nodoc:
+        @sanitized_object_name ||= @object_name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
+      end
 
-      if duck.is_a?(Hash)
-        child = parent[:for]
-        child = child.first if child.respond_to?(:first)
-        duck[child].to_i + 1
-      else
-        duck.to_i + 1
+      def humanized_attribute_name(method) #:nodoc:
+        if @object && @object.class.respond_to?(:human_attribute_name) && @@label_str_method == :humanize
+          @object.class.human_attribute_name(method.to_s)
+        else
+          method.to_s.send(@@label_str_method)
+        end
       end
-    end
 
-    def sanitized_object_name
-      @sanitized_object_name ||= @object_name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
-    end
+      # Internal generic method for looking up localized values within Formtastic
+      # using I18n, if no explicit value is set and I18n-lookups are enabled.
+      # 
+      # Enabled/Disable this by setting:
+      #
+      #   Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true/false
+      #
+      # Lookup priority:
+      #
+      #   'formtastic.{{type}}.{{model}}.{{action}}.{{attribute}}'
+      #   'formtastic.{{type}}.{{model}}.{{attribute}}'
+      #   'formtastic.{{type}}.{{attribute}}'
+      # 
+      # Example:
+      #   
+      #   'formtastic.labels.post.edit.title'
+      #   'formtastic.labels.post.title'
+      #   'formtastic.labels.title'
+      # 
+      # NOTE: Generic, but only used for form input titles/labels/hints/actions (titles = legends, actions = buttons).
+      #
+      def localized_string(key, value, type, options = {}) #:nodoc:
+        key = value if value.is_a?(::Symbol)
+
+        if value.is_a?(::String)
+          value
+        else
+          use_i18n = value.nil? ? @@i18n_lookups_by_default : (value != false)
+
+          if use_i18n
+            model_name  = self.model_name.underscore
+            action_name = template.params[:action].to_s rescue ''
+            attribute_name = key.to_s
+
+            defaults = ::Formtastic::I18n::SCOPES.collect do |i18n_scope|
+              i18n_path = i18n_scope.dup
+              i18n_path.gsub!('{{action}}', action_name)
+              i18n_path.gsub!('{{model}}', model_name)
+              i18n_path.gsub!('{{attribute}}', attribute_name)
+              i18n_path.gsub!('..', '.')
+              i18n_path.to_sym
+            end
+            defaults << ''
+
+            i18n_value = ::Formtastic::I18n.t(defaults.shift,
+              options.merge(:default => defaults, :scope => type.to_s.pluralize.to_sym))
+            i18n_value.blank? ? nil : i18n_value
+          end
+        end
+      end
 
-    def humanized_attribute_name(method)
-      if @object && @object.class.respond_to?(:human_attribute_name)
-        @object.class.human_attribute_name(method.to_s)
-      else
-        method.to_s.send(@@label_str_method)
+      def model_name
+        @object.present? ? @object.class.name : @object_name.to_s.classify
       end
-    end
 
-    # Internal generic method for looking up localized values within Formtastic
-    # using I18n, if no explicit value is set and I18n-lookups are enabled.
-    # 
-    # Enabled/Disable this by setting:
-    #
-    #   Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true/false
-    #
-    # Lookup priority:
-    #
-    #   'formtastic.{{type}}.{{model}}.{{action}}.{{attribute}}'
-    #   'formtastic.{{type}}.{{model}}.{{attribute}}'
-    #   'formtastic.{{type}}.{{attribute}}'
-    # 
-    # Example:
-    #   
-    #   'formtastic.labels.post.edit.title'
-    #   'formtastic.labels.post.title'
-    #   'formtastic.labels.title'
-    # 
-    # NOTE: Generic, but only used for form input labels/hints.
-    #
-    def localized_attribute_string(attr_name, attr_value, i18n_key)
-      if attr_value.is_a?(String)
-        attr_value
-      else
-        use_i18n = attr_value.nil? ? @@i18n_lookups_by_default : attr_value
-        if use_i18n
-          model_name = @object.class.name.underscore
-          action_name = template.params[:action].to_s rescue ''
-          attribute_name = attr_name.to_s
-
-          defaults = I18N_SCOPES.collect do |i18n_scope|
-            i18n_path = i18n_scope.dup
-            i18n_path.gsub!('{{action}}', action_name)
-            i18n_path.gsub!('{{model}}', model_name)
-            i18n_path.gsub!('{{attribute}}', attribute_name)
-            i18n_path.gsub!('..', '.')
-            i18n_path.to_sym
-          end
-          defaults << ''
+      def send_or_call(duck, object)
+        if duck.is_a?(Proc)
+          duck.call(object)
+        else
+          object.send(duck)
+        end
+      end
 
-          i18n_value = ::I18n.t(defaults.shift, :default => defaults,
-                                :scope => "formtastic.#{i18n_key.to_s.pluralize}")
-          i18n_value.blank? ? nil : i18n_value
+      def set_include_blank(options)
+        unless options.key?(:include_blank) || options.key?(:prompt)
+          options[:include_blank] = @@include_blank_for_select_by_default
         end
+        options
       end
-    end
 
   end
 
@@ -1455,8 +1784,8 @@ module Formtastic #:nodoc:
   #   <% end %>
   #
   # The above examples use a resource-oriented style of form_for() helper where only the @post
-  # object is given as an argument, but the generic style is also supported if you really want it,
-  # as is forms with inline objects (Post.new) rather than objects with instance variables (@post):
+  # object is given as an argument, but the generic style is also supported, as are forms with 
+  # inline objects (Post.new) rather than objects with instance variables (@post):
   #
   #   <% semantic_form_for :post, @post, :url => posts_path do |f| %>
   #     ...
@@ -1465,29 +1794,35 @@ module Formtastic #:nodoc:
   #   <% semantic_form_for :post, Post.new, :url => posts_path do |f| %>
   #     ...
   #   <% end %>
-  #
-  # The shorter, resource-oriented style is most definitely preferred, and has recieved the most
-  # testing to date.
-  #
-  # Please note: Although it's possible to call Rails' built-in form_for() helper without an
-  # object, all semantic forms *must* have an object (either Post.new or @post), as Formtastic
-  # has too many dependencies on an ActiveRecord object being present.
-  #
   module SemanticFormHelper
-    @@builder = Formtastic::SemanticFormBuilder
-
-    # cattr_accessor :builder
-    def self.builder=(val)
-      @@builder = val
+    @@builder = ::Formtastic::SemanticFormBuilder
+    mattr_accessor :builder
+    
+    @@default_field_error_proc = nil
+    
+    # Override the default ActiveRecordHelper behaviour of wrapping the input.
+    # This gets taken care of semantically by adding an error class to the LI tag
+    # containing the input.
+    #
+    FIELD_ERROR_PROC = proc do |html_tag, instance_tag|
+      html_tag
     end
-
-    [:form_for, :fields_for, :form_remote_for, :remote_form_for].each do |meth|
+    
+    def with_custom_field_error_proc(&block)
+      @@default_field_error_proc = ::ActionView::Base.field_error_proc
+      ::ActionView::Base.field_error_proc = FIELD_ERROR_PROC
+      result = yield
+      ::ActionView::Base.field_error_proc = @@default_field_error_proc
+      result
+    end
+    
+    [:form_for, :fields_for, :remote_form_for].each do |meth|
       src = <<-END_SRC
         def semantic_#{meth}(record_or_name_or_array, *args, &proc)
           options = args.extract_options!
-          options[:builder] = @@builder
+          options[:builder] ||= @@builder
           options[:html] ||= {}
-
+          
           class_names = options[:html][:class] ? options[:html][:class].split(" ") : []
           class_names << "formtastic"
           class_names << case record_or_name_or_array
@@ -1496,11 +1831,15 @@ module Formtastic #:nodoc:
             else record_or_name_or_array.class.to_s.underscore                  # @post => "post"
           end
           options[:html][:class] = class_names.join(" ")
-
-          #{meth}(record_or_name_or_array, *(args << options), &proc)
+          
+          with_custom_field_error_proc do
+            #{meth}(record_or_name_or_array, *(args << options), &proc)
+          end
         end
       END_SRC
       module_eval src, __FILE__, __LINE__
     end
+    alias :semantic_form_remote_for :semantic_remote_form_for
+    
   end
 end