From 2655d6bfa23a005eba255ccc045073161eb139e7 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Mon, 22 Mar 2010 03:34:31 +0800
Subject: [PATCH 001/992] Fix a coding issue with HAML + Rails 3 + Ruby 1.9.1

---
 lib/formtastic/layout_helper.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/formtastic/layout_helper.rb b/lib/formtastic/layout_helper.rb
index daea784bc..2da334176 100644
--- a/lib/formtastic/layout_helper.rb
+++ b/lib/formtastic/layout_helper.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 module Formtastic
   module LayoutHelper
     

From 6de8bf7489f8a1210a42afd7ce84394a02b5e8a5 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Mon, 22 Mar 2010 03:35:25 +0800
Subject: [PATCH 002/992] Fix another coding issue with HAML + Rails 3 + Ruby
 1.9.1

---
 lib/formtastic/i18n.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/formtastic/i18n.rb b/lib/formtastic/i18n.rb
index 97b05e4c2..c3536f2fa 100644
--- a/lib/formtastic/i18n.rb
+++ b/lib/formtastic/i18n.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 module Formtastic
   module I18n
     

From 62443aa2b44b5f87b30be0d1a2ea980eccfe9d9f Mon Sep 17 00:00:00 2001
From: Dallas Reedy <code@dallasreedy.com>
Date: Sat, 27 Feb 2010 07:26:56 +0800
Subject: [PATCH 003/992] added the :disabled option to #check_boxes_input

---
 lib/formtastic.rb                     |  6 ++-
 spec/inputs/check_boxes_input_spec.rb | 55 +++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index ee0b0c81f..367a27551 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1110,7 +1110,10 @@ def check_boxes_input(method, options)
         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
-        
+
+        disabled_option_is_present = options.key?(:disabled)
+        disabled_values = [*options[:disabled]] if disabled_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
@@ -1118,6 +1121,7 @@ def check_boxes_input(method, options)
           input_ids << input_id
 
           html_options[:checked] = selected_values.include?(value) if selected_option_is_present
+          html_options[:disabled] = disabled_values.include?(value) if disabled_option_is_present
           html_options[:id] = input_id
 
           li_content = template.content_tag(:label,
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index b0aaffd54..f0017bdf9 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -177,6 +177,61 @@
     end
     
 
+    describe 'when :disabled is set' do
+      before do
+        @output_buffer = ''
+      end
+
+      describe "no disabled items" do
+        before do
+          @new_post.stub!(:author_ids).and_return(nil)
+
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:authors, :as => :check_boxes, :disabled => nil))
+          end
+        end
+
+        it 'should not have any disabled item(s)' do
+          output_buffer.should_not have_tag("form li fieldset ol li label input[@disabled='disabled']")
+        end
+      end
+
+      describe "single disabled item" do
+        before do
+          @new_post.stub!(:author_ids).and_return(nil)
+
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:authors, :as => :check_boxes, :disabled => @fred.id))
+          end
+        end
+
+        it "should have one item disabled; the specified one" do
+          output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 1)
+          output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
+          output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@fred.id}']")
+        end
+      end
+
+      describe "multiple disabled items" do
+        before do
+          @new_post.stub!(:author_ids).and_return(nil)
+
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:authors, :as => :check_boxes, :disabled => [@bob.id, @fred.id]))
+          end
+        end
+
+        it "should have multiple items disabled; the specified ones" do
+          output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 2)
+          output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@bob.id}']", /bob/i)
+          output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@bob.id}']")
+          output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
+          output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@fred.id}']")
+        end
+      end
+
+    end
+
   end
   
   

From 8d17ca431c8a60a14399834623ab798dcf0f1b98 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Sun, 11 Apr 2010 11:04:36 +0200
Subject: [PATCH 004/992] Add railtie to perform initialization when running
 under rails3

---
 lib/formtastic.rb         |  1 +
 lib/formtastic/railtie.rb | 10 ++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 lib/formtastic/railtie.rb

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 367a27551..0b8b7c9c1 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1,5 +1,6 @@
 # coding: utf-8
 require File.join(File.dirname(__FILE__), *%w[formtastic i18n])
+require File.join(File.dirname(__FILE__), *%w[formtastic railtie]) if defined?(::Rails::Railtie)
 
 module Formtastic #:nodoc:
 
diff --git a/lib/formtastic/railtie.rb b/lib/formtastic/railtie.rb
new file mode 100644
index 000000000..799e6c4b2
--- /dev/null
+++ b/lib/formtastic/railtie.rb
@@ -0,0 +1,10 @@
+require 'formtastic'
+require 'rails'
+
+module Formtastic
+  class Railtie < Rails::Railtie
+    initializer :after_initialize do
+      ActionView::Base.send :include, Formtastic::SemanticFormHelper
+    end
+  end
+end
\ No newline at end of file

From 23fb5ce3f71e77ecce2d7b144cb7b1748cc30ea6 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Sun, 11 Apr 2010 12:49:24 +0200
Subject: [PATCH 005/992] html_safe for rails2

---
 lib/formtastic.rb           | 1 +
 lib/formtastic/html_safe.rb | 7 +++++++
 2 files changed, 8 insertions(+)
 create mode 100644 lib/formtastic/html_safe.rb

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 0b8b7c9c1..a0c55cb2c 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1,5 +1,6 @@
 # coding: utf-8
 require File.join(File.dirname(__FILE__), *%w[formtastic i18n])
+require File.join(File.dirname(__FILE__), *%w[formtastic html_safe])
 require File.join(File.dirname(__FILE__), *%w[formtastic railtie]) if defined?(::Rails::Railtie)
 
 module Formtastic #:nodoc:
diff --git a/lib/formtastic/html_safe.rb b/lib/formtastic/html_safe.rb
new file mode 100644
index 000000000..c0ce300c8
--- /dev/null
+++ b/lib/formtastic/html_safe.rb
@@ -0,0 +1,7 @@
+if !defined?(::Rails::VERSION) || Rails::VERSION::MAJOR == 2
+  class String
+    def html_safe
+      self
+    end
+  end
+end

From 4cce32776805f2b05a07749f831e1d4db46f8f27 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Sun, 11 Apr 2010 12:49:52 +0200
Subject: [PATCH 006/992] html safe outputs

---
 lib/formtastic.rb | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index a0c55cb2c..8a4a3026b 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -107,7 +107,7 @@ def input(method, options = {})
         send(:"inline_#{type}_for", method, options)
       end.compact.join("\n")
 
-      return template.content_tag(:li, list_item_content, wrapper_html)
+      return template.content_tag(:li, list_item_content.to_s.html_safe, wrapper_html)
     end
 
     # Creates an input fieldset and ol tag wrapping for use around a set of inputs.  It can be
@@ -344,7 +344,7 @@ def commit_button(*args)
       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)
+      template.content_tag(:li, self.submit(text, button_html).to_s.html_safe, :class => element_class)
     end
 
     # A thin wrapper around #fields_for to set :builder => Formtastic::SemanticFormBuilder
@@ -408,7 +408,7 @@ def label(method, options_or_text=nil, options=nil)
       text = (options.delete(:label_prefix_for_nested_input) || "") + text
 
       input_name = options.delete(:input_name) || method
-      super(input_name, text, options)
+      super(input_name, text.to_s.html_safe, options)
     end
 
     # Generates error messages for the given method. Errors can be shown as list,
@@ -454,7 +454,7 @@ def semantic_errors(*args)
       return nil if full_errors.blank?
       html_options[:class] ||= "errors"
       template.content_tag(:ul, html_options) do
-        full_errors.map { |error| template.content_tag(:li, error) }.join
+        full_errors.map { |error| template.content_tag(:li, error.to_s.html_safe) }.join.to_s.html_safe
       end
     end
 
@@ -861,12 +861,12 @@ def radio_input(method, options)
           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}",
+            "#{self.radio_button(input_name, value, html_options)} #{label}".to_s.html_safe,
             :for => input_id
           )
 
           li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
-          template.content_tag(:li, li_content, li_options)
+          template.content_tag(:li, li_content.to_s.html_safe, li_options)
         end
 
         field_set_and_list_wrapping_for_method(method, options, list_item_content)
@@ -1016,9 +1016,9 @@ def date_or_datetime_input(method, options)
             item_label_text = labels[input] || ::I18n.t(input.to_s, :default => input.to_s.humanize, :scope => [:datetime, :prompts])
 
             list_items_capture << template.content_tag(:li, [
-                !item_label_text.blank? ? template.content_tag(:label, item_label_text, :for => input_id) : "",
+                !item_label_text.blank? ? template.content_tag(:label, item_label_text.to_s.html_safe, :for => input_id) : "",
                 template.send(:"select_#{input}", datetime, opts, html_options.merge(:id => input_id))
-              ].join("")
+              ].join("").to_s.html_safe
             )
           end
         end
@@ -1127,12 +1127,12 @@ def check_boxes_input(method, options)
           html_options[:id] = input_id
 
           li_content = template.content_tag(:label,
-            "#{self.check_box(input_name, html_options, value, unchecked_value)} #{label}",
+            "#{self.check_box(input_name, html_options, value, unchecked_value)} #{label}".to_s.html_safe,
             :for => input_id
           )
 
           li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
-          template.content_tag(:li, li_content, li_options)
+          template.content_tag(:li, li_content.to_s.html_safe, li_options)
         end
 
         field_set_and_list_wrapping_for_method(method, options, list_item_content)
@@ -1197,13 +1197,13 @@ def inline_input_for(method, options)
       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')
+        template.content_tag(:p, options[:hint].to_s.html_safe, :class => 'inline-hints')
       end
 
       # 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')
+        template.content_tag(:p, errors.to_sentence.untaint.to_s.html_safe, :class => 'inline-errors')
       end
 
       # Creates an error li list.
@@ -1211,15 +1211,15 @@ def error_sentence(errors) #:nodoc:
       def error_list(errors) #:nodoc:
         list_elements = []
         errors.each do |error|
-          list_elements <<  template.content_tag(:li, error.untaint)
+          list_elements <<  template.content_tag(:li, error.untaint.to_s.html_safe)
         end
-        template.content_tag(:ul, list_elements.join("\n"), :class => 'errors')
+        template.content_tag(:ul, list_elements.join("\n").to_s.html_safe, :class => 'errors')
       end
 
       # Creates an error sentence containing only the first error
       #
       def error_first(errors) #:nodoc:
-        template.content_tag(:p, errors.first.untaint, :class => 'inline-errors')
+        template.content_tag(:p, errors.first.untaint.to_s.html_safe, :class => 'inline-errors')
       end
 
       # Generates the required or optional string. If the value set is a proc,
@@ -1266,7 +1266,7 @@ def field_set_and_list_wrapping(*args, &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?
+        legend  = template.content_tag(:legend, template.content_tag(:span, legend.to_s.html_safe)) unless legend.blank?
 
         if block_given?
           contents = if template.respond_to?(:is_haml?) && template.is_haml?
@@ -1279,7 +1279,7 @@ def field_set_and_list_wrapping(*args, &block) #:nodoc:
         # 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),
+          legend.to_s.html_safe << template.content_tag(:ol, contents.to_s.html_safe),
           html_options.except(:builder, :parent)
         )
 
@@ -1311,7 +1311,7 @@ def field_set_and_list_wrapping_for_method(method, options, contents) #:nodoc:
             template.content_tag(:legend,
                 self.label(method, options_for_label(options).merge(:for => options.delete(:label_for))), :class => 'label'
               ) <<
-            template.content_tag(:ol, contents)
+            template.content_tag(:ol, contents.to_s.html_safe)
           )
       end
 

From fcc5bae7a0efa853427722338576bb000a2c9ff2 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Sun, 11 Apr 2010 14:59:19 +0200
Subject: [PATCH 007/992] Helpers like form_for are expected to return a String
 with rails3

---
 lib/formtastic.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 8a4a3026b..7a8b0cd90 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1283,7 +1283,7 @@ def field_set_and_list_wrapping(*args, &block) #:nodoc:
           html_options.except(:builder, :parent)
         )
 
-        template.concat(fieldset) if block_given?
+        template.concat(fieldset) if block_given? && (!defined?(Rails::VERSION) || Rails::VERSION::MAJOR == 2)
         fieldset
       end
 

From 4053e09e7ede79fe3e273e4db117e84aee5ef66c Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sun, 7 Mar 2010 11:20:52 -0300
Subject: [PATCH 008/992] Move deprecated rails/init.rb to init.rb

---
 init.rb       | 6 ++++++
 rails/init.rb | 5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 init.rb
 delete mode 100644 rails/init.rb

diff --git a/init.rb b/init.rb
new file mode 100644
index 000000000..cc5fbb21a
--- /dev/null
+++ b/init.rb
@@ -0,0 +1,6 @@
+# coding: utf-8
+require 'formtastic'
+require 'formtastic/layout_helper'
+
+ActionView::Base.send(:include, Formtastic::SemanticFormHelper)
+ActionView::Base.send(:include, Formtastic::LayoutHelper)
diff --git a/rails/init.rb b/rails/init.rb
deleted file mode 100644
index 1db466496..000000000
--- a/rails/init.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# coding: utf-8
-require File.join(File.dirname(__FILE__), *%w[.. lib formtastic])
-require File.join(File.dirname(__FILE__), *%w[.. lib formtastic layout_helper])
-ActionView::Base.send :include, Formtastic::SemanticFormHelper
-ActionView::Base.send :include, Formtastic::LayoutHelper

From ab85b8deaaa710e135e2c74b2a19418eb94090b7 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sun, 7 Mar 2010 11:21:53 -0300
Subject: [PATCH 009/992] Create formtastic:form generator

---
 .../formtastic/form/form_generator.rb         | 85 +++++++++++++++++++
 .../formtastic/form/templates/_form.html.erb  |  5 ++
 .../formtastic/form/templates/_form.html.haml |  4 +
 3 files changed, 94 insertions(+)
 create mode 100644 lib/generators/formtastic/form/form_generator.rb
 create mode 100644 lib/generators/formtastic/form/templates/_form.html.erb
 create mode 100644 lib/generators/formtastic/form/templates/_form.html.haml

diff --git a/lib/generators/formtastic/form/form_generator.rb b/lib/generators/formtastic/form/form_generator.rb
new file mode 100644
index 000000000..3dc74719c
--- /dev/null
+++ b/lib/generators/formtastic/form/form_generator.rb
@@ -0,0 +1,85 @@
+# coding: utf-8
+module Formtastic
+  class FormGenerator < Rails::Generators::NamedBase
+    desc "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."
+
+    class_option :haml, :type => :boolean, :default => false, :group => :formtastic,
+                 :desc => "Generate HAML instead of ERB"
+
+    class_option :partial, :type => :boolean, :default => false, :group => :formtastic,
+                 :desc => 'Generate a form partial in the model views path, i.e. "_form.html.erb" or "_form.html.haml"'
+
+    class_option :controller, :type => :string, :default => false, :group => :formtastic,
+                 :desc => 'Generate for custom controller/view path - in case model and controller namespace is different, i.e. "admin/posts"'
+
+    def self.source_root
+      @source_root ||= File.expand_path("../templates", __FILE__)
+    end
+
+    def self.banner
+      "rails generate formtastic:form ExistingModelName [options]"
+    end
+
+    def create_or_show
+      if options[:partial]
+        empty_directory "app/views/#{controller_path}"
+        template "_form.html.#{template_type}", "app/views/#{controller_path}/_form.html.#{template_type}"
+      else
+        template = File.read("#{self.class.source_root}/_form.html.#{template_type}")
+        erb = ERB.new(template, nil, '-')
+        generated_code = erb.result(binding).strip rescue nil
+
+        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
+
+    protected
+
+    IGNORED_COLUMNS = [:updated_at, :created_at].freeze
+
+    def template_type
+      @template_type ||= options[:haml] ? :haml : :erb
+    end
+
+    def controller_path
+      @controller_path ||= if options[:controller]
+        options[:controller].underscore
+      else
+        name.underscore.pluralize
+      end
+    end
+
+    def columns
+      @columns ||= self.name.camelize.constantize.content_columns.reject { |column| IGNORED_COLUMNS.include?(column.name.to_sym) }
+    end
+
+    def save_to_clipboard(data)
+      return unless data
+
+      begin
+        case RUBY_PLATFORM
+        when /win32/
+          require 'win32/clipboard'
+          ::Win32::Clipboard.data = data
+        when /darwin/ # mac
+          `echo "#{data}" | pbcopy`
+        else # linux/unix
+          `echo "#{data}" | xsel --clipboard` || `echo "#{data}" | xclip`
+        end
+      rescue LoadError
+        false
+      else
+        true
+      end
+    end
+  end
+end
diff --git a/lib/generators/formtastic/form/templates/_form.html.erb b/lib/generators/formtastic/form/templates/_form.html.erb
new file mode 100644
index 000000000..5eb30bdc3
--- /dev/null
+++ b/lib/generators/formtastic/form/templates/_form.html.erb
@@ -0,0 +1,5 @@
+<%% f.inputs do %>
+<% columns.each do |column| -%>
+  <%%= f.input :<%= column.name %>, :label => '<%= column.name.humanize %>' %>
+<% end -%>
+<%% end %>
\ No newline at end of file
diff --git a/lib/generators/formtastic/form/templates/_form.html.haml b/lib/generators/formtastic/form/templates/_form.html.haml
new file mode 100644
index 000000000..85566ef97
--- /dev/null
+++ b/lib/generators/formtastic/form/templates/_form.html.haml
@@ -0,0 +1,4 @@
+- f.inputs do
+<% columns.each do |column| -%>
+  = f.input :<%= column.name %>, :label => '<%= column.name.humanize %>'
+<% end -%>
\ No newline at end of file

From b99169fabf571d1deaeda48ef8dd742c5d64aa1c Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sun, 7 Mar 2010 11:30:56 -0300
Subject: [PATCH 010/992] Create formtastic:install generator

---
 .../formtastic/install/install_generator.rb   |  23 +++
 .../install/templates/formtastic.css          | 144 ++++++++++++++++++
 .../install/templates/formtastic.rb           |  58 +++++++
 .../install/templates/formtastic_changes.css  |  10 ++
 4 files changed, 235 insertions(+)
 create mode 100644 lib/generators/formtastic/install/install_generator.rb
 create mode 100644 lib/generators/formtastic/install/templates/formtastic.css
 create mode 100644 lib/generators/formtastic/install/templates/formtastic.rb
 create mode 100644 lib/generators/formtastic/install/templates/formtastic_changes.css

diff --git a/lib/generators/formtastic/install/install_generator.rb b/lib/generators/formtastic/install/install_generator.rb
new file mode 100644
index 000000000..c199753e8
--- /dev/null
+++ b/lib/generators/formtastic/install/install_generator.rb
@@ -0,0 +1,23 @@
+# coding: utf-8
+module Formtastic
+  class InstallGenerator < Rails::Generators::Base
+    desc "Copies formtastic.css and formtastic_changes.css to public/stylesheets/ and a config initializer to config/initializers/formtastic_config.rb"
+
+    def self.source_root
+      @source_root ||= File.expand_path("../templates", __FILE__)
+    end
+    
+    def self.banner
+      "rails generate formtastic:install [options]"
+    end
+
+    def copy_files
+      empty_directory 'config/initializers'
+      template        'formtastic.rb', 'config/initializers/formtastic.rb'
+
+      empty_directory 'public/stylesheets'
+      template        'formtastic.css',         'public/stylesheets/formtastic.css'
+      template        'formtastic_changes.css', 'public/stylesheets/formtastic_changes.css'
+    end
+  end
+end
diff --git a/lib/generators/formtastic/install/templates/formtastic.css b/lib/generators/formtastic/install/templates/formtastic.css
new file mode 100644
index 000000000..a33cb022d
--- /dev/null
+++ b/lib/generators/formtastic/install/templates/formtastic.css
@@ -0,0 +1,144 @@
+/* -------------------------------------------------------------------------------------------------
+
+It's *strongly* suggested that you don't modify this file.  Instead, load a new stylesheet after
+this one in your layouts (eg formtastic_changes.css) and override the styles to suit your needs.
+This will allow you to update formtastic.css with new releases without clobbering your own changes.
+
+This stylesheet forms part of the Formtastic Rails Plugin
+(c) 2008 Justin French
+
+--------------------------------------------------------------------------------------------------*/
+
+
+/* NORMALIZE AND RESET - obviously inspired by Yahoo's reset.css, but scoped to just form.formtastic
+--------------------------------------------------------------------------------------------------*/
+form.formtastic, form.formtastic ul, form.formtastic ol, form.formtastic li, form.formtastic fieldset, form.formtastic legend, form.formtastic input, form.formtastic textarea, form.formtastic select, form.formtastic p { margin:0; padding:0; }
+form.formtastic fieldset { border:0; }
+form.formtastic em, form.formtastic strong { font-style:normal; font-weight:normal; }
+form.formtastic ol, form.formtastic ul { list-style:none; }
+form.formtastic abbr, form.formtastic acronym { border:0; font-variant:normal; }
+form.formtastic input, form.formtastic textarea, form.formtastic select { font-family:inherit; font-size:inherit; font-weight:inherit; }
+form.formtastic input, form.formtastic textarea, form.formtastic select { font-size:100%; }
+form.formtastic legend { color:#000; }
+
+
+/* SEMANTIC ERRORS
+--------------------------------------------------------------------------------------------------*/
+form.formtastic ul.errors { color:#cc0000; margin:0.5em 0 1.5em 25%; list-style:square; }
+form.formtastic ul.errors li { padding:0; border:none; display:list-item; }
+
+
+/* FIELDSETS & LISTS
+--------------------------------------------------------------------------------------------------*/
+form.formtastic fieldset { }
+form.formtastic fieldset.inputs { }
+form.formtastic fieldset.buttons { padding-left:25%; }
+form.formtastic fieldset ol { }
+form.formtastic fieldset.buttons li { float:left; padding-right:0.5em; }
+
+/* clearfixing the fieldsets */
+form.formtastic fieldset { display: inline-block; }
+form.formtastic fieldset:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+html[xmlns] form.formtastic fieldset { display: block; }
+* html form.formtastic fieldset { height: 1%; }
+
+
+/* INPUT LIs
+--------------------------------------------------------------------------------------------------*/
+form.formtastic fieldset ol li { margin-bottom:1.5em; }
+
+/* clearfixing the li's */
+form.formtastic fieldset ol li { display: inline-block; }
+form.formtastic fieldset ol li:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+html[xmlns] form.formtastic fieldset ol li { display: block; }
+* html form.formtastic fieldset ol li { height: 1%; }
+
+form.formtastic fieldset ol li.required { }
+form.formtastic fieldset ol li.optional { }
+form.formtastic fieldset ol li.error { }
+  
+
+/* LABELS
+--------------------------------------------------------------------------------------------------*/
+form.formtastic fieldset ol li label { display:block; width:25%; float:left; padding-top:.2em; }
+form.formtastic fieldset ol li li label { line-height:100%; padding-top:0; }
+form.formtastic fieldset ol li li label input { line-height:100%; vertical-align:middle; margin-top:-0.1em;}
+
+
+/* NESTED FIELDSETS AND LEGENDS (radio, check boxes and date/time inputs use nested fieldsets)
+--------------------------------------------------------------------------------------------------*/
+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; }
+
+
+/* INLINE HINTS
+--------------------------------------------------------------------------------------------------*/
+form.formtastic fieldset ol li p.inline-hints { color:#666; margin:0.5em 0 0 25%; }
+
+
+/* INLINE ERRORS
+--------------------------------------------------------------------------------------------------*/
+form.formtastic fieldset ol li p.inline-errors { color:#cc0000; margin:0.5em 0 0 25%; }
+form.formtastic fieldset ol li ul.errors { color:#cc0000; margin:0.5em 0 0 25%; list-style:square; }
+form.formtastic fieldset ol li ul.errors li { padding:0; border:none; display:list-item; }
+
+
+/* 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%; }
+
+
+/* TEXTAREA OVERRIDES
+--------------------------------------------------------------------------------------------------*/
+form.formtastic fieldset ol li.text textarea { width:74%; }
+
+
+/* HIDDEN OVERRIDES
+--------------------------------------------------------------------------------------------------*/
+form.formtastic fieldset ol li.hidden { display:none; }
+
+
+/* BOOLEAN OVERRIDES
+--------------------------------------------------------------------------------------------------*/
+form.formtastic fieldset ol li.boolean label { padding-left:25%; width:auto; }
+form.formtastic fieldset ol li.boolean label input { margin:0 0.5em 0 0.2em; }
+
+
+/* RADIO OVERRIDES
+--------------------------------------------------------------------------------------------------*/
+form.formtastic fieldset ol li.radio { }
+form.formtastic fieldset ol li.radio fieldset ol { margin-bottom:-0.6em; }
+form.formtastic fieldset ol li.radio fieldset ol li { margin:0.1em 0 0.5em 0; }
+form.formtastic fieldset ol li.radio fieldset ol li label { float:none; width:100%; }
+form.formtastic fieldset ol li.radio fieldset ol li label input { margin-right:0.2em; }
+
+
+/* CHECK BOXES (COLLECTION) OVERRIDES
+--------------------------------------------------------------------------------------------------*/
+form.formtastic fieldset ol li.check_boxes { }
+form.formtastic fieldset ol li.check_boxes fieldset ol { margin-bottom:-0.6em; }
+form.formtastic fieldset ol li.check_boxes fieldset ol li { margin:0.1em 0 0.5em 0; }
+form.formtastic fieldset ol li.check_boxes fieldset ol li label { float:none; width:100%; }
+form.formtastic fieldset ol li.check_boxes fieldset ol li label input { margin-right:0.2em; }
+
+
+
+/* DATE & TIME OVERRIDES
+--------------------------------------------------------------------------------------------------*/
+form.formtastic fieldset ol li.date fieldset ol li,
+form.formtastic fieldset ol li.time fieldset ol li,
+form.formtastic fieldset ol li.datetime fieldset ol li { float:left; width:auto; margin:0 .3em 0 0; }
+
+form.formtastic fieldset ol li.date fieldset ol li label,
+form.formtastic fieldset ol li.time fieldset ol li label,
+form.formtastic fieldset ol li.datetime fieldset ol li label { display:none; }
+
+form.formtastic fieldset ol li.date fieldset ol li label input, 
+form.formtastic fieldset ol li.time fieldset ol li label input, 
+form.formtastic fieldset ol li.datetime fieldset ol li label input { display:inline; margin:0; padding:0;  }
diff --git a/lib/generators/formtastic/install/templates/formtastic.rb b/lib/generators/formtastic/install/templates/formtastic.rb
new file mode 100644
index 000000000..5136db263
--- /dev/null
+++ b/lib/generators/formtastic/install/templates/formtastic.rb
@@ -0,0 +1,58 @@
+# Set the default text field size when input is a string. Default is 50.
+# Formtastic::SemanticFormBuilder.default_text_field_size = 50
+
+# Set the default text area height when input is a text. Default is 20.
+# Formtastic::SemanticFormBuilder.default_text_area_height = 5
+
+# 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]
+
+# Formtastic by default renders inside li tags you can customize it to render
+# with div tags if required
+# Formtastic::SemanticFormBuilder.item_separator = :div
+
+# 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
diff --git a/lib/generators/formtastic/install/templates/formtastic_changes.css b/lib/generators/formtastic/install/templates/formtastic_changes.css
new file mode 100644
index 000000000..608d4282f
--- /dev/null
+++ b/lib/generators/formtastic/install/templates/formtastic_changes.css
@@ -0,0 +1,10 @@
+/* -------------------------------------------------------------------------------------------------
+
+Load this stylesheet after formtastic.css in your layouts to override the CSS to suit your needs.
+This will allow you to update formtastic.css with new releases without clobbering your own changes.
+
+For example, to make the inline hint paragraphs a little darker in color than the standard #666:
+
+form.formtastic fieldset ol li p.inline-hints { color:#333; }
+
+--------------------------------------------------------------------------------------------------*/

From 461c59b0afc7cab69276647f32d372d2aa7e9852 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 12 Apr 2010 10:22:16 +1000
Subject: [PATCH 011/992] Reverting class_name additions for belongs_to
 associations in f26248f and fe5db0d, as they seemed to optimise for a use
 case which isn't consistent with Rails' behaviour and most common use case.

See issue 236 for more information, patch welcome that caters to both scenarios adequately.

This reverts commit 6d6f08970f3f5599ee90071885a69d630 and 02a7f797378a2b7415c5ba82bc6007bfe.
Revert "spec for 'class_name' option on 'belongs_to' associations"
Revert "fix select input for 'has_many :foos, :class_name => 'FooBar'"
---
 lib/formtastic.rb                |  2 +-
 spec/inputs/select_input_spec.rb | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 367a27551..c8bb72707 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1475,7 +1475,7 @@ def generate_association_input_name(method) #:nodoc:
           if [:has_and_belongs_to_many, :has_many].include?(reflection.macro)
             "#{method.to_s.singularize}_ids"
           else
-            reflection.options[:foreign_key] || reflection.options[:class_name].try(:foreign_key) || "#{method}_id"
+            reflection.options[:foreign_key] || "#{method}_id"
           end
         else
           method
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 3be01f990..55a2ffa1b 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -149,20 +149,6 @@
 
       output_buffer.should have_tag('form li select#post_author_status_id')
     end
-
-    it 'should use the "class_name" option' do
-      @new_post.stub!(:status).and_return(@bob)
-      @new_post.stub!(:author_status_id).and_return(@bob.id)
-   
-      ::Post.stub!(:reflect_on_association).with(:status).and_return(
-        mock('reflection', :options => {:class_name => 'AuthorStatus'}, :klass => ::Author, :macro => :belongs_to))
-
-      semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:status, :as => :select))
-      end
-
-      output_buffer.should have_tag('form li select#post_author_status_id')
-    end
   end
   
   describe "for a belongs_to association with :group_by => :author" do

From 441b9d02c544ba30718ec23884c4b6d1388fcbad Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sat, 6 Mar 2010 23:17:44 +0800
Subject: [PATCH 012/992] Update spec dependencies and make fake models to be
 like ActiveRecord objects in Rails 3

---
 spec/spec_helper.rb | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index b2f9d8988..964729483 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,12 +1,14 @@
 # coding: utf-8
 require 'rubygems'
 
-gem 'activesupport', '2.3.5'
-gem 'actionpack', '2.3.5'
+gem 'activesupport', '3.0.0.beta'
+gem 'actionpack', '3.0.0.beta'
+gem 'activemodel', '3.0.0.beta'
 require 'active_support'
 require 'action_pack'
 require 'action_view'
 require 'action_controller'
+require 'active_model'
 
 gem 'rspec', '>= 1.2.6'
 gem 'rspec-rails', '>= 1.2.6'
@@ -26,13 +28,14 @@
 
 
 module FormtasticSpecHelper
+  include ActionView::Context
   include ActionView::Helpers::FormHelper
   include ActionView::Helpers::FormTagHelper
   include ActionView::Helpers::FormOptionsHelper
   include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::TextHelper
-  include ActionView::Helpers::ActiveRecordHelper
+  include ActionView::Helpers::ActiveModelHelper
   include ActionView::Helpers::RecordIdentificationHelper
   include ActionView::Helpers::DateHelper
   include ActionView::Helpers::CaptureHelper
@@ -54,20 +57,34 @@ def default_input_type(column_type, column_name = :generic_column_name)
   end
   
   class ::Post
+    extend ActiveModel::Naming
+    include ActiveModel::Conversion
+    
     def id
     end
   end
+  
   module ::Namespaced
     class Post
+      extend ActiveModel::Naming
+      include ActiveModel::Conversion
+      
       def id
       end
     end
   end
+  
   class ::Author
+    extend ActiveModel::Naming
+    include ActiveModel::Conversion
+    
     def to_label
     end
   end
+  
   class ::Continent
+    extend ActiveModel::Naming
+    include ActiveModel::Conversion    
   end
   
   def mock_everything

From cefa95989f1f4f56e4fe3c7a70595e0034f8b26c Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 13 Apr 2010 06:46:03 +1000
Subject: [PATCH 013/992] now using beta2 for specs, which actually run now
 (full of fails, of course)

---
 spec/spec_helper.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 964729483..42bbca451 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,9 +1,9 @@
 # coding: utf-8
 require 'rubygems'
 
-gem 'activesupport', '3.0.0.beta'
-gem 'actionpack', '3.0.0.beta'
-gem 'activemodel', '3.0.0.beta'
+gem 'activesupport', '3.0.0.beta2'
+gem 'actionpack', '3.0.0.beta2'
+gem 'activemodel', '3.0.0.beta2'
 require 'active_support'
 require 'action_pack'
 require 'action_view'

From b8df527ba331859a2462b2cc91550b82b631df76 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sat, 6 Mar 2010 12:20:23 -0300
Subject: [PATCH 014/992] Rails 3 use ActiveSupport::SafeBuffer in views
 instead of String (see more here:
 http://yehudakatz.com/2010/02/01/safebuffers-and-rails-3-0/)

---
 spec/buttons_spec.rb                  | 2 +-
 spec/custom_builder_spec.rb           | 2 +-
 spec/error_proc_spec.rb               | 2 +-
 spec/errors_spec.rb                   | 2 +-
 spec/form_helper_spec.rb              | 2 +-
 spec/i18n_spec.rb                     | 2 +-
 spec/include_blank_spec.rb            | 2 +-
 spec/input_spec.rb                    | 2 +-
 spec/inputs/boolean_input_spec.rb     | 4 ++--
 spec/inputs/check_boxes_input_spec.rb | 4 ++--
 spec/inputs/country_input_spec.rb     | 2 +-
 spec/inputs/date_input_spec.rb        | 2 +-
 spec/inputs/datetime_input_spec.rb    | 2 +-
 spec/inputs/file_input_spec.rb        | 2 +-
 spec/inputs/hidden_input_spec.rb      | 2 +-
 spec/inputs/numeric_input_spec.rb     | 2 +-
 spec/inputs/password_input_spec.rb    | 2 +-
 spec/inputs/radio_input_spec.rb       | 4 ++--
 spec/inputs/select_input_spec.rb      | 6 +++---
 spec/inputs/string_input_spec.rb      | 2 +-
 spec/inputs/text_input_spec.rb        | 2 +-
 spec/inputs/time_input_spec.rb        | 2 +-
 spec/inputs/time_zone_input_spec.rb   | 4 ++--
 spec/inputs_spec.rb                   | 2 +-
 spec/label_spec.rb                    | 2 +-
 spec/layout_helper_spec.rb            | 2 +-
 spec/semantic_errors_spec.rb          | 2 +-
 spec/semantic_fields_for_spec.rb      | 2 +-
 28 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/spec/buttons_spec.rb b/spec/buttons_spec.rb
index ba69fc407..8a7ea651e 100644
--- a/spec/buttons_spec.rb
+++ b/spec/buttons_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
   end
 
diff --git a/spec/custom_builder_spec.rb b/spec/custom_builder_spec.rb
index 5fd6a7256..ca4d30b07 100644
--- a/spec/custom_builder_spec.rb
+++ b/spec/custom_builder_spec.rb
@@ -12,7 +12,7 @@ def awesome_input(method, options)
   end
   
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
   end
   
diff --git a/spec/error_proc_spec.rb b/spec/error_proc_spec.rb
index 6225e786a..6af9d9655 100644
--- a/spec/error_proc_spec.rb
+++ b/spec/error_proc_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
   end
   
diff --git a/spec/errors_spec.rb b/spec/errors_spec.rb
index 5f1361c38..4fe580d23 100644
--- a/spec/errors_spec.rb
+++ b/spec/errors_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
     @title_errors = ['must not be blank', 'must be longer than 10 characters', 'must be awesome']
     @errors = mock('errors')
diff --git a/spec/form_helper_spec.rb b/spec/form_helper_spec.rb
index ef48e51b4..afe9e8382 100644
--- a/spec/form_helper_spec.rb
+++ b/spec/form_helper_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
   end
   
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index d4c480a39..093e145cd 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -85,7 +85,7 @@
     include FormtasticSpecHelper
     
     before do
-      @output_buffer = ''
+      @output_buffer = ActiveSupport::SafeBuffer.new
       mock_everything
       
       ::I18n.backend.store_translations :en, :formtastic => {
diff --git a/spec/include_blank_spec.rb b/spec/include_blank_spec.rb
index 29174eba2..f43a0a100 100644
--- a/spec/include_blank_spec.rb
+++ b/spec/include_blank_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
 
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
 
     @new_post.stub!(:author_id).and_return(nil)
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 07d986e77..6947c728f 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
   end
 
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index 138ee5d87..9a0957158 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
     
     semantic_form_for(@new_post) do |builder|
@@ -58,7 +58,7 @@
 
   describe 'when :selected is set' do
     before do
-      @output_buffer = ''
+      @output_buffer = ActiveSupport::SafeBuffer.new
     end
 
     describe "not selected" do
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index f0017bdf9..b6596a05b 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -7,7 +7,7 @@
   
   describe 'for a has_many association' do
     before do
-      @output_buffer = ''
+      @output_buffer = ActiveSupport::SafeBuffer.new
       mock_everything
       
       semantic_form_for(@fred) do |builder|
@@ -108,7 +108,7 @@
 
     describe 'when :selected is set' do
       before do
-        @output_buffer = ''
+        @output_buffer = ActiveSupport::SafeBuffer.new
       end
 
       describe "no selected items" do
diff --git a/spec/inputs/country_input_spec.rb b/spec/inputs/country_input_spec.rb
index fa9e9f6b8..b6a081288 100644
--- a/spec/inputs/country_input_spec.rb
+++ b/spec/inputs/country_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
   end
 
diff --git a/spec/inputs/date_input_spec.rb b/spec/inputs/date_input_spec.rb
index 584a54591..1c64b9985 100644
--- a/spec/inputs/date_input_spec.rb
+++ b/spec/inputs/date_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
   end
   
diff --git a/spec/inputs/datetime_input_spec.rb b/spec/inputs/datetime_input_spec.rb
index dcc982363..9e6f49b28 100644
--- a/spec/inputs/datetime_input_spec.rb
+++ b/spec/inputs/datetime_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
     
     @new_post.should_receive(:publish_at=).any_number_of_times
diff --git a/spec/inputs/file_input_spec.rb b/spec/inputs/file_input_spec.rb
index 035483595..94eccf34c 100644
--- a/spec/inputs/file_input_spec.rb
+++ b/spec/inputs/file_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
     
     semantic_form_for(@new_post) do |builder|
diff --git a/spec/inputs/hidden_input_spec.rb b/spec/inputs/hidden_input_spec.rb
index c1f3b603a..483728932 100644
--- a/spec/inputs/hidden_input_spec.rb
+++ b/spec/inputs/hidden_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
     
     semantic_form_for(@new_post) do |builder|
diff --git a/spec/inputs/numeric_input_spec.rb b/spec/inputs/numeric_input_spec.rb
index 9eb5b7af7..7da416737 100644
--- a/spec/inputs/numeric_input_spec.rb
+++ b/spec/inputs/numeric_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
     
     semantic_form_for(@new_post) do |builder|
diff --git a/spec/inputs/password_input_spec.rb b/spec/inputs/password_input_spec.rb
index cfc37d0ee..d6c28350a 100644
--- a/spec/inputs/password_input_spec.rb
+++ b/spec/inputs/password_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
     
     semantic_form_for(@new_post) do |builder|
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 8ba38e675..694b00c98 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
   end
 
@@ -114,7 +114,7 @@
 
   describe 'when :selected is set' do
     before do
-      @output_buffer = ''
+      @output_buffer = ActiveSupport::SafeBuffer.new
     end
 
     describe "no selected items" do
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 55a2ffa1b..bed7f5a03 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
 
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
   end
 
@@ -343,7 +343,7 @@
   
   describe 'when :selected is set' do
     before do
-      @output_buffer = ''
+      @output_buffer = ActiveSupport::SafeBuffer.new
     end
 
     describe "no selected items" do
@@ -424,7 +424,7 @@
   
   describe "enum" do
     before do
-      @output_buffer = ''
+      @output_buffer = ActiveSupport::SafeBuffer.new
       @some_meta_descriptions = ["One", "Two", "Three"]
       @new_post.stub!(:meta_description).any_number_of_times
     end
diff --git a/spec/inputs/string_input_spec.rb b/spec/inputs/string_input_spec.rb
index 5175e8e67..122836b1e 100644
--- a/spec/inputs/string_input_spec.rb
+++ b/spec/inputs/string_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
     
     semantic_form_for(@new_post) do |builder|
diff --git a/spec/inputs/text_input_spec.rb b/spec/inputs/text_input_spec.rb
index 55f107a48..970853080 100644
--- a/spec/inputs/text_input_spec.rb
+++ b/spec/inputs/text_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
     
     semantic_form_for(@new_post) do |builder|
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index 93104a80b..bc827c923 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
   end
   
diff --git a/spec/inputs/time_zone_input_spec.rb b/spec/inputs/time_zone_input_spec.rb
index 860455a5f..763905674 100644
--- a/spec/inputs/time_zone_input_spec.rb
+++ b/spec/inputs/time_zone_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
     
     semantic_form_for(@new_post) do |builder|
@@ -59,7 +59,7 @@
   
   describe 'when :selected is set' do
     before do
-      @output_buffer = ''
+      @output_buffer = ActiveSupport::SafeBuffer.new
     end
 
     # Note: Not possible to override default selected value for time_zone input
diff --git a/spec/inputs_spec.rb b/spec/inputs_spec.rb
index ef938e8f0..03b9721b2 100644
--- a/spec/inputs_spec.rb
+++ b/spec/inputs_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
   end
 
diff --git a/spec/label_spec.rb b/spec/label_spec.rb
index 55d639fb5..e7fdf24b8 100644
--- a/spec/label_spec.rb
+++ b/spec/label_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
   end
 
diff --git a/spec/layout_helper_spec.rb b/spec/layout_helper_spec.rb
index 832c651c6..2ddff7110 100644
--- a/spec/layout_helper_spec.rb
+++ b/spec/layout_helper_spec.rb
@@ -7,7 +7,7 @@
   include Formtastic::LayoutHelper
   
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
   end
   
   describe '#formtastic_stylesheet_link_tag' do
diff --git a/spec/semantic_errors_spec.rb b/spec/semantic_errors_spec.rb
index 992d926b3..9d6fa1fd8 100644
--- a/spec/semantic_errors_spec.rb
+++ b/spec/semantic_errors_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
 
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
     @title_errors = ['must not be blank', 'must be awesome']
     @base_errors = ['base error message', 'nasty error']
diff --git a/spec/semantic_fields_for_spec.rb b/spec/semantic_fields_for_spec.rb
index c2cff855b..1b8b171b1 100644
--- a/spec/semantic_fields_for_spec.rb
+++ b/spec/semantic_fields_for_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
     @new_post.stub!(:author).and_return(::Author.new)
   end

From 8a0b551242ffd43d864d5270d39b380b7856cf6f Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sat, 6 Mar 2010 13:36:37 -0300
Subject: [PATCH 015/992] Missing safe buffers

---
 spec/commit_button_spec.rb        | 15 +++++++++++++--
 spec/inputs/country_input_spec.rb |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index 8645dcf2d..f56a1c410 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
     mock_everything
   end
 
@@ -348,7 +348,18 @@
   describe 'when the model is two words' do
     before do
       output_buffer = ''
-      class ::UserPost; def id; end; def self.human_name; "Userpost"; end; end # Rails does crappy human_name
+
+      class ::UserPost
+        extend ActiveModel::Naming
+        
+        def id
+        end
+        
+        def self.human_name
+          "Userpost" # Rails does crappy human_name
+        end
+      end
+      
       @new_user_post = ::UserPost.new
       
       @new_user_post.stub!(:new_record?).and_return(true)
diff --git a/spec/inputs/country_input_spec.rb b/spec/inputs/country_input_spec.rb
index b6a081288..e97a8926a 100644
--- a/spec/inputs/country_input_spec.rb
+++ b/spec/inputs/country_input_spec.rb
@@ -26,7 +26,7 @@
     
     before do
       semantic_form_for(@new_post) do |builder|
-        builder.stub!(:country_select).and_return("<select><option>...</option></select>")
+        builder.stub!(:country_select).and_return(ActiveSupport::SafeBuffer.new("<select><option>...</option></select>"))
         concat(builder.input(:country, :as => :country))
       end
     end

From d08e36f8ac93e7ab8ef41a0ba404e821dad92f4f Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sat, 6 Mar 2010 13:37:31 -0300
Subject: [PATCH 016/992] @new_post should return itself when call to_model

---
 spec/spec_helper.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 42bbca451..44c59886e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -145,6 +145,7 @@ def new_author_path; "/authors/new"; end
     @new_post.stub!(:author).and_return(nil)
     @new_post.stub!(:main_post).and_return(nil)
     @new_post.stub!(:sub_posts).and_return([]) #TODO should be a mock with methods for adding sub posts
+    @new_post.stub!(:to_model).and_return(@new_post)
 
     @freds_post = mock('post')
     @freds_post.stub!(:class).and_return(::Post)

From 1cfcbf8141c37aaa084d2c63c113cbd8d44b2ed7 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sat, 6 Mar 2010 14:29:34 -0300
Subject: [PATCH 017/992] Update Rspec

---
 spec/spec_helper.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 44c59886e..284c2011a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -10,17 +10,18 @@
 require 'action_controller'
 require 'active_model'
 
-gem 'rspec', '>= 1.2.6'
-gem 'rspec-rails', '>= 1.2.6'
+gem 'rspec', '>= 2.0.0.beta.2'
+gem 'rspec-rails', '>= 2.0.0.beta.2'
 gem 'hpricot', '>= 0.6.1'
 gem 'rspec_tag_matchers', '>= 1.0.0'
 require 'rspec_tag_matchers'
 
 require 'custom_macros'
 
-Spec::Runner.configure do |config|
-  config.include(RspecTagMatchers)
-  config.include(CustomMacros)
+Rspec.configure do |config|
+  config.include RspecTagMatchers
+  config.include CustomMacros
+  config.mock_with :rspec
 end
 
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic'))

From ac2a390856d68ab81e1cd14272b3a6743f47cc1f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 13 Apr 2010 08:14:00 +1000
Subject: [PATCH 018/992] works with latest rspec 2 beta 6

---
 spec/spec_helper.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 284c2011a..16a489955 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -10,8 +10,9 @@
 require 'action_controller'
 require 'active_model'
 
-gem 'rspec', '>= 2.0.0.beta.2'
-gem 'rspec-rails', '>= 2.0.0.beta.2'
+gem 'rspec', '>= 2.0.0.beta.6'
+require 'rspec'
+gem 'rspec-rails', '>= 2.0.0.beta.6'
 gem 'hpricot', '>= 0.6.1'
 gem 'rspec_tag_matchers', '>= 1.0.0'
 require 'rspec_tag_matchers'

From 47c7768654ca0bb107d047a88f3a490a883ea661 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sat, 6 Mar 2010 14:32:09 -0300
Subject: [PATCH 019/992] Remove semantic_remote_form_for in favor of :remote
 => true option (maybe mantain depecrated?)

---
 lib/formtastic.rb        |  9 +--------
 spec/form_helper_spec.rb | 16 ----------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 6f05093b6..fc200b99e 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1639,15 +1639,11 @@ def set_include_blank(options)
   #
   # * semantic_form_for(@post)
   # * semantic_fields_for(@post)
-  # * semantic_form_remote_for(@post)
-  # * semantic_remote_form_for(@post)
   #
   # Each of which are the equivalent of:
   #
   # * form_for(@post, :builder => Formtastic::SemanticFormBuilder))
   # * fields_for(@post, :builder => Formtastic::SemanticFormBuilder))
-  # * form_remote_for(@post, :builder => Formtastic::SemanticFormBuilder))
-  # * remote_form_for(@post, :builder => Formtastic::SemanticFormBuilder))
   #
   # Example Usage:
   #
@@ -1688,8 +1684,7 @@ def with_custom_field_error_proc(&block)
       ::ActionView::Base.field_error_proc = @@default_field_error_proc
       result
     end
-    
-    [:form_for, :fields_for, :remote_form_for].each do |meth|
+    [:form_for, :fields_for].each do |meth|
       module_eval <<-END_SRC, __FILE__, __LINE__ + 1
         def semantic_#{meth}(record_or_name_or_array, *args, &proc)
           options = args.extract_options!
@@ -1711,7 +1706,5 @@ def semantic_#{meth}(record_or_name_or_array, *args, &proc)
         end
       END_SRC
     end
-    alias :semantic_form_remote_for :semantic_remote_form_for
-    
   end
 end
diff --git a/spec/form_helper_spec.rb b/spec/form_helper_spec.rb
index afe9e8382..bfec7887a 100644
--- a/spec/form_helper_spec.rb
+++ b/spec/form_helper_spec.rb
@@ -106,21 +106,5 @@ class MyAwesomeCustomBuilder < ::Formtastic::SemanticFormBuilder
     end
   end
 
-  describe '#semantic_form_remote_for' do
-    it 'yields an instance of SemanticFormBuilder' do
-      semantic_form_remote_for(:post, ::Post.new, :url => '/hello') do |builder|
-        builder.class.should == ::Formtastic::SemanticFormBuilder
-      end
-    end
-  end
-
-  describe '#semantic_form_for_remote' do
-    it 'yields an instance of SemanticFormBuilder' do
-      semantic_remote_form_for(:post, ::Post.new, :url => '/hello') do |builder|
-        builder.class.should == ::Formtastic::SemanticFormBuilder
-      end
-    end
-  end
-
 end
 

From 9eeb466ecc8fce8653e2abcdb6bef6ea901ff1c7 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sat, 6 Mar 2010 14:32:44 -0300
Subject: [PATCH 020/992] I guess this is a Rspec issue, but I will investigate
 it later

---
 spec/layout_helper_spec.rb | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/spec/layout_helper_spec.rb b/spec/layout_helper_spec.rb
index 2ddff7110..71f1e7176 100644
--- a/spec/layout_helper_spec.rb
+++ b/spec/layout_helper_spec.rb
@@ -25,5 +25,18 @@
     end
     
   end
+
+  # FIXME: Rspec issue?
+  def controller
+    mock('controller')
+  end
+
+  # FIXME: Rspec issue?
+  def config
+    returning mock('config') do |config|
+      config.stub!(:assets_dir).and_return('')
+    end
+  end
+
 end
 

From 8d8c50f5a563bc0505c6ae496eb32e80a6dd60c5 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 13 Apr 2010 08:19:41 +1000
Subject: [PATCH 021/992] move spec.opts to .rspec, as it's deprecated in rspec
 2

---
 spec/{spec.opts => .rspec} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename spec/{spec.opts => .rspec} (100%)

diff --git a/spec/spec.opts b/spec/.rspec
similarity index 100%
rename from spec/spec.opts
rename to spec/.rspec

From f9c1a8ad4279dd819235754ac6b53f606eba68dd Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Thu, 15 Apr 2010 11:39:31 +0200
Subject: [PATCH 022/992] Revert all the changes introduced in commits
 8d17ca4..8d8c50

Restarting the work on rails3 compatibility with a clean branch
makes live easier - in here were a lot of changes from different
sources touching different problems without resulting in a complete
solution.
---
 init.rb                                       |   6 -
 lib/formtastic.rb                             |  57 +++----
 lib/formtastic/html_safe.rb                   |   7 -
 lib/formtastic/i18n.rb                        |   1 -
 lib/formtastic/layout_helper.rb               |   1 -
 lib/formtastic/railtie.rb                     |  10 --
 .../formtastic/form/form_generator.rb         |  85 -----------
 .../formtastic/form/templates/_form.html.erb  |   5 -
 .../formtastic/form/templates/_form.html.haml |   4 -
 .../formtastic/install/install_generator.rb   |  23 ---
 .../install/templates/formtastic.css          | 144 ------------------
 .../install/templates/formtastic.rb           |  58 -------
 .../install/templates/formtastic_changes.css  |  10 --
 rails/init.rb                                 |   5 +
 spec/buttons_spec.rb                          |   2 +-
 spec/commit_button_spec.rb                    |  15 +-
 spec/custom_builder_spec.rb                   |   2 +-
 spec/error_proc_spec.rb                       |   2 +-
 spec/errors_spec.rb                           |   2 +-
 spec/form_helper_spec.rb                      |  18 ++-
 spec/i18n_spec.rb                             |   2 +-
 spec/include_blank_spec.rb                    |   2 +-
 spec/input_spec.rb                            |   2 +-
 spec/inputs/boolean_input_spec.rb             |   4 +-
 spec/inputs/check_boxes_input_spec.rb         |  59 +------
 spec/inputs/country_input_spec.rb             |   4 +-
 spec/inputs/date_input_spec.rb                |   2 +-
 spec/inputs/datetime_input_spec.rb            |   2 +-
 spec/inputs/file_input_spec.rb                |   2 +-
 spec/inputs/hidden_input_spec.rb              |   2 +-
 spec/inputs/numeric_input_spec.rb             |   2 +-
 spec/inputs/password_input_spec.rb            |   2 +-
 spec/inputs/radio_input_spec.rb               |   4 +-
 spec/inputs/select_input_spec.rb              |  20 ++-
 spec/inputs/string_input_spec.rb              |   2 +-
 spec/inputs/text_input_spec.rb                |   2 +-
 spec/inputs/time_input_spec.rb                |   2 +-
 spec/inputs/time_zone_input_spec.rb           |   4 +-
 spec/inputs_spec.rb                           |   2 +-
 spec/label_spec.rb                            |   2 +-
 spec/layout_helper_spec.rb                    |  15 +-
 spec/semantic_errors_spec.rb                  |   2 +-
 spec/semantic_fields_for_spec.rb              |   2 +-
 spec/{.rspec => spec.opts}                    |   0
 spec/spec_helper.rb                           |  36 +----
 45 files changed, 109 insertions(+), 526 deletions(-)
 delete mode 100644 init.rb
 delete mode 100644 lib/formtastic/html_safe.rb
 delete mode 100644 lib/formtastic/railtie.rb
 delete mode 100644 lib/generators/formtastic/form/form_generator.rb
 delete mode 100644 lib/generators/formtastic/form/templates/_form.html.erb
 delete mode 100644 lib/generators/formtastic/form/templates/_form.html.haml
 delete mode 100644 lib/generators/formtastic/install/install_generator.rb
 delete mode 100644 lib/generators/formtastic/install/templates/formtastic.css
 delete mode 100644 lib/generators/formtastic/install/templates/formtastic.rb
 delete mode 100644 lib/generators/formtastic/install/templates/formtastic_changes.css
 create mode 100644 rails/init.rb
 rename spec/{.rspec => spec.opts} (100%)

diff --git a/init.rb b/init.rb
deleted file mode 100644
index cc5fbb21a..000000000
--- a/init.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# coding: utf-8
-require 'formtastic'
-require 'formtastic/layout_helper'
-
-ActionView::Base.send(:include, Formtastic::SemanticFormHelper)
-ActionView::Base.send(:include, Formtastic::LayoutHelper)
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index fc200b99e..ee0b0c81f 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1,7 +1,5 @@
 # coding: utf-8
 require File.join(File.dirname(__FILE__), *%w[formtastic i18n])
-require File.join(File.dirname(__FILE__), *%w[formtastic html_safe])
-require File.join(File.dirname(__FILE__), *%w[formtastic railtie]) if defined?(::Rails::Railtie)
 
 module Formtastic #:nodoc:
 
@@ -107,7 +105,7 @@ def input(method, options = {})
         send(:"inline_#{type}_for", method, options)
       end.compact.join("\n")
 
-      return template.content_tag(:li, list_item_content.to_s.html_safe, wrapper_html)
+      return template.content_tag(:li, list_item_content, wrapper_html)
     end
 
     # Creates an input fieldset and ol tag wrapping for use around a set of inputs.  It can be
@@ -344,7 +342,7 @@ def commit_button(*args)
       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).to_s.html_safe, :class => element_class)
+      template.content_tag(:li, self.submit(text, button_html), :class => element_class)
     end
 
     # A thin wrapper around #fields_for to set :builder => Formtastic::SemanticFormBuilder
@@ -408,7 +406,7 @@ def label(method, options_or_text=nil, options=nil)
       text = (options.delete(:label_prefix_for_nested_input) || "") + text
 
       input_name = options.delete(:input_name) || method
-      super(input_name, text.to_s.html_safe, options)
+      super(input_name, text, options)
     end
 
     # Generates error messages for the given method. Errors can be shown as list,
@@ -454,7 +452,7 @@ def semantic_errors(*args)
       return nil if full_errors.blank?
       html_options[:class] ||= "errors"
       template.content_tag(:ul, html_options) do
-        full_errors.map { |error| template.content_tag(:li, error.to_s.html_safe) }.join.to_s.html_safe
+        full_errors.map { |error| template.content_tag(:li, error) }.join
       end
     end
 
@@ -861,12 +859,12 @@ def radio_input(method, options)
           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}".to_s.html_safe,
+            "#{self.radio_button(input_name, value, html_options)} #{label}",
             :for => input_id
           )
 
           li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
-          template.content_tag(:li, li_content.to_s.html_safe, li_options)
+          template.content_tag(:li, li_content, li_options)
         end
 
         field_set_and_list_wrapping_for_method(method, options, list_item_content)
@@ -1016,9 +1014,9 @@ def date_or_datetime_input(method, options)
             item_label_text = labels[input] || ::I18n.t(input.to_s, :default => input.to_s.humanize, :scope => [:datetime, :prompts])
 
             list_items_capture << template.content_tag(:li, [
-                !item_label_text.blank? ? template.content_tag(:label, item_label_text.to_s.html_safe, :for => input_id) : "",
+                !item_label_text.blank? ? template.content_tag(:label, item_label_text, :for => input_id) : "",
                 template.send(:"select_#{input}", datetime, opts, html_options.merge(:id => input_id))
-              ].join("").to_s.html_safe
+              ].join("")
             )
           end
         end
@@ -1112,10 +1110,7 @@ def check_boxes_input(method, options)
         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
-
-        disabled_option_is_present = options.key?(:disabled)
-        disabled_values = [*options[:disabled]] if disabled_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
@@ -1123,16 +1118,15 @@ def check_boxes_input(method, options)
           input_ids << input_id
 
           html_options[:checked] = selected_values.include?(value) if selected_option_is_present
-          html_options[:disabled] = disabled_values.include?(value) if disabled_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}".to_s.html_safe,
+            "#{self.check_box(input_name, html_options, value, unchecked_value)} #{label}",
             :for => input_id
           )
 
           li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
-          template.content_tag(:li, li_content.to_s.html_safe, li_options)
+          template.content_tag(:li, li_content, li_options)
         end
 
         field_set_and_list_wrapping_for_method(method, options, list_item_content)
@@ -1197,13 +1191,13 @@ def inline_input_for(method, options)
       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].to_s.html_safe, :class => 'inline-hints')
+        template.content_tag(:p, options[:hint], :class => 'inline-hints')
       end
 
       # 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.to_s.html_safe, :class => 'inline-errors')
+        template.content_tag(:p, errors.to_sentence.untaint, :class => 'inline-errors')
       end
 
       # Creates an error li list.
@@ -1211,15 +1205,15 @@ def error_sentence(errors) #:nodoc:
       def error_list(errors) #:nodoc:
         list_elements = []
         errors.each do |error|
-          list_elements <<  template.content_tag(:li, error.untaint.to_s.html_safe)
+          list_elements <<  template.content_tag(:li, error.untaint)
         end
-        template.content_tag(:ul, list_elements.join("\n").to_s.html_safe, :class => 'errors')
+        template.content_tag(:ul, list_elements.join("\n"), :class => 'errors')
       end
 
       # Creates an error sentence containing only the first error
       #
       def error_first(errors) #:nodoc:
-        template.content_tag(:p, errors.first.untaint.to_s.html_safe, :class => 'inline-errors')
+        template.content_tag(:p, errors.first.untaint, :class => 'inline-errors')
       end
 
       # Generates the required or optional string. If the value set is a proc,
@@ -1266,7 +1260,7 @@ def field_set_and_list_wrapping(*args, &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.to_s.html_safe)) unless legend.blank?
+        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?
@@ -1279,11 +1273,11 @@ def field_set_and_list_wrapping(*args, &block) #:nodoc:
         # 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.to_s.html_safe << template.content_tag(:ol, contents.to_s.html_safe),
+          legend << template.content_tag(:ol, contents),
           html_options.except(:builder, :parent)
         )
 
-        template.concat(fieldset) if block_given? && (!defined?(Rails::VERSION) || Rails::VERSION::MAJOR == 2)
+        template.concat(fieldset) if block_given?
         fieldset
       end
 
@@ -1311,7 +1305,7 @@ def field_set_and_list_wrapping_for_method(method, options, contents) #:nodoc:
             template.content_tag(:legend,
                 self.label(method, options_for_label(options).merge(:for => options.delete(:label_for))), :class => 'label'
               ) <<
-            template.content_tag(:ol, contents.to_s.html_safe)
+            template.content_tag(:ol, contents)
           )
       end
 
@@ -1477,7 +1471,7 @@ def generate_association_input_name(method) #:nodoc:
           if [:has_and_belongs_to_many, :has_many].include?(reflection.macro)
             "#{method.to_s.singularize}_ids"
           else
-            reflection.options[:foreign_key] || "#{method}_id"
+            reflection.options[:foreign_key] || reflection.options[:class_name].try(:foreign_key) || "#{method}_id"
           end
         else
           method
@@ -1639,11 +1633,15 @@ def set_include_blank(options)
   #
   # * semantic_form_for(@post)
   # * semantic_fields_for(@post)
+  # * semantic_form_remote_for(@post)
+  # * semantic_remote_form_for(@post)
   #
   # Each of which are the equivalent of:
   #
   # * form_for(@post, :builder => Formtastic::SemanticFormBuilder))
   # * fields_for(@post, :builder => Formtastic::SemanticFormBuilder))
+  # * form_remote_for(@post, :builder => Formtastic::SemanticFormBuilder))
+  # * remote_form_for(@post, :builder => Formtastic::SemanticFormBuilder))
   #
   # Example Usage:
   #
@@ -1684,7 +1682,8 @@ def with_custom_field_error_proc(&block)
       ::ActionView::Base.field_error_proc = @@default_field_error_proc
       result
     end
-    [:form_for, :fields_for].each do |meth|
+    
+    [:form_for, :fields_for, :remote_form_for].each do |meth|
       module_eval <<-END_SRC, __FILE__, __LINE__ + 1
         def semantic_#{meth}(record_or_name_or_array, *args, &proc)
           options = args.extract_options!
@@ -1706,5 +1705,7 @@ def semantic_#{meth}(record_or_name_or_array, *args, &proc)
         end
       END_SRC
     end
+    alias :semantic_form_remote_for :semantic_remote_form_for
+    
   end
 end
diff --git a/lib/formtastic/html_safe.rb b/lib/formtastic/html_safe.rb
deleted file mode 100644
index c0ce300c8..000000000
--- a/lib/formtastic/html_safe.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-if !defined?(::Rails::VERSION) || Rails::VERSION::MAJOR == 2
-  class String
-    def html_safe
-      self
-    end
-  end
-end
diff --git a/lib/formtastic/i18n.rb b/lib/formtastic/i18n.rb
index c3536f2fa..97b05e4c2 100644
--- a/lib/formtastic/i18n.rb
+++ b/lib/formtastic/i18n.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 module Formtastic
   module I18n
     
diff --git a/lib/formtastic/layout_helper.rb b/lib/formtastic/layout_helper.rb
index 2da334176..daea784bc 100644
--- a/lib/formtastic/layout_helper.rb
+++ b/lib/formtastic/layout_helper.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 module Formtastic
   module LayoutHelper
     
diff --git a/lib/formtastic/railtie.rb b/lib/formtastic/railtie.rb
deleted file mode 100644
index 799e6c4b2..000000000
--- a/lib/formtastic/railtie.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'formtastic'
-require 'rails'
-
-module Formtastic
-  class Railtie < Rails::Railtie
-    initializer :after_initialize do
-      ActionView::Base.send :include, Formtastic::SemanticFormHelper
-    end
-  end
-end
\ No newline at end of file
diff --git a/lib/generators/formtastic/form/form_generator.rb b/lib/generators/formtastic/form/form_generator.rb
deleted file mode 100644
index 3dc74719c..000000000
--- a/lib/generators/formtastic/form/form_generator.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-# coding: utf-8
-module Formtastic
-  class FormGenerator < Rails::Generators::NamedBase
-    desc "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."
-
-    class_option :haml, :type => :boolean, :default => false, :group => :formtastic,
-                 :desc => "Generate HAML instead of ERB"
-
-    class_option :partial, :type => :boolean, :default => false, :group => :formtastic,
-                 :desc => 'Generate a form partial in the model views path, i.e. "_form.html.erb" or "_form.html.haml"'
-
-    class_option :controller, :type => :string, :default => false, :group => :formtastic,
-                 :desc => 'Generate for custom controller/view path - in case model and controller namespace is different, i.e. "admin/posts"'
-
-    def self.source_root
-      @source_root ||= File.expand_path("../templates", __FILE__)
-    end
-
-    def self.banner
-      "rails generate formtastic:form ExistingModelName [options]"
-    end
-
-    def create_or_show
-      if options[:partial]
-        empty_directory "app/views/#{controller_path}"
-        template "_form.html.#{template_type}", "app/views/#{controller_path}/_form.html.#{template_type}"
-      else
-        template = File.read("#{self.class.source_root}/_form.html.#{template_type}")
-        erb = ERB.new(template, nil, '-')
-        generated_code = erb.result(binding).strip rescue nil
-
-        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
-
-    protected
-
-    IGNORED_COLUMNS = [:updated_at, :created_at].freeze
-
-    def template_type
-      @template_type ||= options[:haml] ? :haml : :erb
-    end
-
-    def controller_path
-      @controller_path ||= if options[:controller]
-        options[:controller].underscore
-      else
-        name.underscore.pluralize
-      end
-    end
-
-    def columns
-      @columns ||= self.name.camelize.constantize.content_columns.reject { |column| IGNORED_COLUMNS.include?(column.name.to_sym) }
-    end
-
-    def save_to_clipboard(data)
-      return unless data
-
-      begin
-        case RUBY_PLATFORM
-        when /win32/
-          require 'win32/clipboard'
-          ::Win32::Clipboard.data = data
-        when /darwin/ # mac
-          `echo "#{data}" | pbcopy`
-        else # linux/unix
-          `echo "#{data}" | xsel --clipboard` || `echo "#{data}" | xclip`
-        end
-      rescue LoadError
-        false
-      else
-        true
-      end
-    end
-  end
-end
diff --git a/lib/generators/formtastic/form/templates/_form.html.erb b/lib/generators/formtastic/form/templates/_form.html.erb
deleted file mode 100644
index 5eb30bdc3..000000000
--- a/lib/generators/formtastic/form/templates/_form.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<%% f.inputs do %>
-<% columns.each do |column| -%>
-  <%%= f.input :<%= column.name %>, :label => '<%= column.name.humanize %>' %>
-<% end -%>
-<%% end %>
\ No newline at end of file
diff --git a/lib/generators/formtastic/form/templates/_form.html.haml b/lib/generators/formtastic/form/templates/_form.html.haml
deleted file mode 100644
index 85566ef97..000000000
--- a/lib/generators/formtastic/form/templates/_form.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-- f.inputs do
-<% columns.each do |column| -%>
-  = f.input :<%= column.name %>, :label => '<%= column.name.humanize %>'
-<% end -%>
\ No newline at end of file
diff --git a/lib/generators/formtastic/install/install_generator.rb b/lib/generators/formtastic/install/install_generator.rb
deleted file mode 100644
index c199753e8..000000000
--- a/lib/generators/formtastic/install/install_generator.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# coding: utf-8
-module Formtastic
-  class InstallGenerator < Rails::Generators::Base
-    desc "Copies formtastic.css and formtastic_changes.css to public/stylesheets/ and a config initializer to config/initializers/formtastic_config.rb"
-
-    def self.source_root
-      @source_root ||= File.expand_path("../templates", __FILE__)
-    end
-    
-    def self.banner
-      "rails generate formtastic:install [options]"
-    end
-
-    def copy_files
-      empty_directory 'config/initializers'
-      template        'formtastic.rb', 'config/initializers/formtastic.rb'
-
-      empty_directory 'public/stylesheets'
-      template        'formtastic.css',         'public/stylesheets/formtastic.css'
-      template        'formtastic_changes.css', 'public/stylesheets/formtastic_changes.css'
-    end
-  end
-end
diff --git a/lib/generators/formtastic/install/templates/formtastic.css b/lib/generators/formtastic/install/templates/formtastic.css
deleted file mode 100644
index a33cb022d..000000000
--- a/lib/generators/formtastic/install/templates/formtastic.css
+++ /dev/null
@@ -1,144 +0,0 @@
-/* -------------------------------------------------------------------------------------------------
-
-It's *strongly* suggested that you don't modify this file.  Instead, load a new stylesheet after
-this one in your layouts (eg formtastic_changes.css) and override the styles to suit your needs.
-This will allow you to update formtastic.css with new releases without clobbering your own changes.
-
-This stylesheet forms part of the Formtastic Rails Plugin
-(c) 2008 Justin French
-
---------------------------------------------------------------------------------------------------*/
-
-
-/* NORMALIZE AND RESET - obviously inspired by Yahoo's reset.css, but scoped to just form.formtastic
---------------------------------------------------------------------------------------------------*/
-form.formtastic, form.formtastic ul, form.formtastic ol, form.formtastic li, form.formtastic fieldset, form.formtastic legend, form.formtastic input, form.formtastic textarea, form.formtastic select, form.formtastic p { margin:0; padding:0; }
-form.formtastic fieldset { border:0; }
-form.formtastic em, form.formtastic strong { font-style:normal; font-weight:normal; }
-form.formtastic ol, form.formtastic ul { list-style:none; }
-form.formtastic abbr, form.formtastic acronym { border:0; font-variant:normal; }
-form.formtastic input, form.formtastic textarea, form.formtastic select { font-family:inherit; font-size:inherit; font-weight:inherit; }
-form.formtastic input, form.formtastic textarea, form.formtastic select { font-size:100%; }
-form.formtastic legend { color:#000; }
-
-
-/* SEMANTIC ERRORS
---------------------------------------------------------------------------------------------------*/
-form.formtastic ul.errors { color:#cc0000; margin:0.5em 0 1.5em 25%; list-style:square; }
-form.formtastic ul.errors li { padding:0; border:none; display:list-item; }
-
-
-/* FIELDSETS & LISTS
---------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset { }
-form.formtastic fieldset.inputs { }
-form.formtastic fieldset.buttons { padding-left:25%; }
-form.formtastic fieldset ol { }
-form.formtastic fieldset.buttons li { float:left; padding-right:0.5em; }
-
-/* clearfixing the fieldsets */
-form.formtastic fieldset { display: inline-block; }
-form.formtastic fieldset:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
-html[xmlns] form.formtastic fieldset { display: block; }
-* html form.formtastic fieldset { height: 1%; }
-
-
-/* INPUT LIs
---------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset ol li { margin-bottom:1.5em; }
-
-/* clearfixing the li's */
-form.formtastic fieldset ol li { display: inline-block; }
-form.formtastic fieldset ol li:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
-html[xmlns] form.formtastic fieldset ol li { display: block; }
-* html form.formtastic fieldset ol li { height: 1%; }
-
-form.formtastic fieldset ol li.required { }
-form.formtastic fieldset ol li.optional { }
-form.formtastic fieldset ol li.error { }
-  
-
-/* LABELS
---------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset ol li label { display:block; width:25%; float:left; padding-top:.2em; }
-form.formtastic fieldset ol li li label { line-height:100%; padding-top:0; }
-form.formtastic fieldset ol li li label input { line-height:100%; vertical-align:middle; margin-top:-0.1em;}
-
-
-/* NESTED FIELDSETS AND LEGENDS (radio, check boxes and date/time inputs use nested fieldsets)
---------------------------------------------------------------------------------------------------*/
-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; }
-
-
-/* INLINE HINTS
---------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset ol li p.inline-hints { color:#666; margin:0.5em 0 0 25%; }
-
-
-/* INLINE ERRORS
---------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset ol li p.inline-errors { color:#cc0000; margin:0.5em 0 0 25%; }
-form.formtastic fieldset ol li ul.errors { color:#cc0000; margin:0.5em 0 0 25%; list-style:square; }
-form.formtastic fieldset ol li ul.errors li { padding:0; border:none; display:list-item; }
-
-
-/* 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%; }
-
-
-/* TEXTAREA OVERRIDES
---------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset ol li.text textarea { width:74%; }
-
-
-/* HIDDEN OVERRIDES
---------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset ol li.hidden { display:none; }
-
-
-/* BOOLEAN OVERRIDES
---------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset ol li.boolean label { padding-left:25%; width:auto; }
-form.formtastic fieldset ol li.boolean label input { margin:0 0.5em 0 0.2em; }
-
-
-/* RADIO OVERRIDES
---------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset ol li.radio { }
-form.formtastic fieldset ol li.radio fieldset ol { margin-bottom:-0.6em; }
-form.formtastic fieldset ol li.radio fieldset ol li { margin:0.1em 0 0.5em 0; }
-form.formtastic fieldset ol li.radio fieldset ol li label { float:none; width:100%; }
-form.formtastic fieldset ol li.radio fieldset ol li label input { margin-right:0.2em; }
-
-
-/* CHECK BOXES (COLLECTION) OVERRIDES
---------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset ol li.check_boxes { }
-form.formtastic fieldset ol li.check_boxes fieldset ol { margin-bottom:-0.6em; }
-form.formtastic fieldset ol li.check_boxes fieldset ol li { margin:0.1em 0 0.5em 0; }
-form.formtastic fieldset ol li.check_boxes fieldset ol li label { float:none; width:100%; }
-form.formtastic fieldset ol li.check_boxes fieldset ol li label input { margin-right:0.2em; }
-
-
-
-/* DATE & TIME OVERRIDES
---------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset ol li.date fieldset ol li,
-form.formtastic fieldset ol li.time fieldset ol li,
-form.formtastic fieldset ol li.datetime fieldset ol li { float:left; width:auto; margin:0 .3em 0 0; }
-
-form.formtastic fieldset ol li.date fieldset ol li label,
-form.formtastic fieldset ol li.time fieldset ol li label,
-form.formtastic fieldset ol li.datetime fieldset ol li label { display:none; }
-
-form.formtastic fieldset ol li.date fieldset ol li label input, 
-form.formtastic fieldset ol li.time fieldset ol li label input, 
-form.formtastic fieldset ol li.datetime fieldset ol li label input { display:inline; margin:0; padding:0;  }
diff --git a/lib/generators/formtastic/install/templates/formtastic.rb b/lib/generators/formtastic/install/templates/formtastic.rb
deleted file mode 100644
index 5136db263..000000000
--- a/lib/generators/formtastic/install/templates/formtastic.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-# Set the default text field size when input is a string. Default is 50.
-# Formtastic::SemanticFormBuilder.default_text_field_size = 50
-
-# Set the default text area height when input is a text. Default is 20.
-# Formtastic::SemanticFormBuilder.default_text_area_height = 5
-
-# 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]
-
-# Formtastic by default renders inside li tags you can customize it to render
-# with div tags if required
-# Formtastic::SemanticFormBuilder.item_separator = :div
-
-# 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
diff --git a/lib/generators/formtastic/install/templates/formtastic_changes.css b/lib/generators/formtastic/install/templates/formtastic_changes.css
deleted file mode 100644
index 608d4282f..000000000
--- a/lib/generators/formtastic/install/templates/formtastic_changes.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* -------------------------------------------------------------------------------------------------
-
-Load this stylesheet after formtastic.css in your layouts to override the CSS to suit your needs.
-This will allow you to update formtastic.css with new releases without clobbering your own changes.
-
-For example, to make the inline hint paragraphs a little darker in color than the standard #666:
-
-form.formtastic fieldset ol li p.inline-hints { color:#333; }
-
---------------------------------------------------------------------------------------------------*/
diff --git a/rails/init.rb b/rails/init.rb
new file mode 100644
index 000000000..1db466496
--- /dev/null
+++ b/rails/init.rb
@@ -0,0 +1,5 @@
+# coding: utf-8
+require File.join(File.dirname(__FILE__), *%w[.. lib formtastic])
+require File.join(File.dirname(__FILE__), *%w[.. lib formtastic layout_helper])
+ActionView::Base.send :include, Formtastic::SemanticFormHelper
+ActionView::Base.send :include, Formtastic::LayoutHelper
diff --git a/spec/buttons_spec.rb b/spec/buttons_spec.rb
index 8a7ea651e..ba69fc407 100644
--- a/spec/buttons_spec.rb
+++ b/spec/buttons_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
   end
 
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index f56a1c410..8645dcf2d 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
   end
 
@@ -348,18 +348,7 @@
   describe 'when the model is two words' do
     before do
       output_buffer = ''
-
-      class ::UserPost
-        extend ActiveModel::Naming
-        
-        def id
-        end
-        
-        def self.human_name
-          "Userpost" # Rails does crappy human_name
-        end
-      end
-      
+      class ::UserPost; def id; end; def self.human_name; "Userpost"; end; end # Rails does crappy human_name
       @new_user_post = ::UserPost.new
       
       @new_user_post.stub!(:new_record?).and_return(true)
diff --git a/spec/custom_builder_spec.rb b/spec/custom_builder_spec.rb
index ca4d30b07..5fd6a7256 100644
--- a/spec/custom_builder_spec.rb
+++ b/spec/custom_builder_spec.rb
@@ -12,7 +12,7 @@ def awesome_input(method, options)
   end
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
   end
   
diff --git a/spec/error_proc_spec.rb b/spec/error_proc_spec.rb
index 6af9d9655..6225e786a 100644
--- a/spec/error_proc_spec.rb
+++ b/spec/error_proc_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
   end
   
diff --git a/spec/errors_spec.rb b/spec/errors_spec.rb
index 4fe580d23..5f1361c38 100644
--- a/spec/errors_spec.rb
+++ b/spec/errors_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
     @title_errors = ['must not be blank', 'must be longer than 10 characters', 'must be awesome']
     @errors = mock('errors')
diff --git a/spec/form_helper_spec.rb b/spec/form_helper_spec.rb
index bfec7887a..ef48e51b4 100644
--- a/spec/form_helper_spec.rb
+++ b/spec/form_helper_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
   end
   
@@ -106,5 +106,21 @@ class MyAwesomeCustomBuilder < ::Formtastic::SemanticFormBuilder
     end
   end
 
+  describe '#semantic_form_remote_for' do
+    it 'yields an instance of SemanticFormBuilder' do
+      semantic_form_remote_for(:post, ::Post.new, :url => '/hello') do |builder|
+        builder.class.should == ::Formtastic::SemanticFormBuilder
+      end
+    end
+  end
+
+  describe '#semantic_form_for_remote' do
+    it 'yields an instance of SemanticFormBuilder' do
+      semantic_remote_form_for(:post, ::Post.new, :url => '/hello') do |builder|
+        builder.class.should == ::Formtastic::SemanticFormBuilder
+      end
+    end
+  end
+
 end
 
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index 093e145cd..d4c480a39 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -85,7 +85,7 @@
     include FormtasticSpecHelper
     
     before do
-      @output_buffer = ActiveSupport::SafeBuffer.new
+      @output_buffer = ''
       mock_everything
       
       ::I18n.backend.store_translations :en, :formtastic => {
diff --git a/spec/include_blank_spec.rb b/spec/include_blank_spec.rb
index f43a0a100..29174eba2 100644
--- a/spec/include_blank_spec.rb
+++ b/spec/include_blank_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
 
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
 
     @new_post.stub!(:author_id).and_return(nil)
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 6947c728f..07d986e77 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
   end
 
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index 9a0957158..138ee5d87 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
     
     semantic_form_for(@new_post) do |builder|
@@ -58,7 +58,7 @@
 
   describe 'when :selected is set' do
     before do
-      @output_buffer = ActiveSupport::SafeBuffer.new
+      @output_buffer = ''
     end
 
     describe "not selected" do
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index b6596a05b..b0aaffd54 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -7,7 +7,7 @@
   
   describe 'for a has_many association' do
     before do
-      @output_buffer = ActiveSupport::SafeBuffer.new
+      @output_buffer = ''
       mock_everything
       
       semantic_form_for(@fred) do |builder|
@@ -108,7 +108,7 @@
 
     describe 'when :selected is set' do
       before do
-        @output_buffer = ActiveSupport::SafeBuffer.new
+        @output_buffer = ''
       end
 
       describe "no selected items" do
@@ -177,61 +177,6 @@
     end
     
 
-    describe 'when :disabled is set' do
-      before do
-        @output_buffer = ''
-      end
-
-      describe "no disabled items" do
-        before do
-          @new_post.stub!(:author_ids).and_return(nil)
-
-          semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:authors, :as => :check_boxes, :disabled => nil))
-          end
-        end
-
-        it 'should not have any disabled item(s)' do
-          output_buffer.should_not have_tag("form li fieldset ol li label input[@disabled='disabled']")
-        end
-      end
-
-      describe "single disabled item" do
-        before do
-          @new_post.stub!(:author_ids).and_return(nil)
-
-          semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:authors, :as => :check_boxes, :disabled => @fred.id))
-          end
-        end
-
-        it "should have one item disabled; the specified one" do
-          output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 1)
-          output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
-          output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@fred.id}']")
-        end
-      end
-
-      describe "multiple disabled items" do
-        before do
-          @new_post.stub!(:author_ids).and_return(nil)
-
-          semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:authors, :as => :check_boxes, :disabled => [@bob.id, @fred.id]))
-          end
-        end
-
-        it "should have multiple items disabled; the specified ones" do
-          output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 2)
-          output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@bob.id}']", /bob/i)
-          output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@bob.id}']")
-          output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
-          output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@fred.id}']")
-        end
-      end
-
-    end
-
   end
   
   
diff --git a/spec/inputs/country_input_spec.rb b/spec/inputs/country_input_spec.rb
index e97a8926a..fa9e9f6b8 100644
--- a/spec/inputs/country_input_spec.rb
+++ b/spec/inputs/country_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
   end
 
@@ -26,7 +26,7 @@
     
     before do
       semantic_form_for(@new_post) do |builder|
-        builder.stub!(:country_select).and_return(ActiveSupport::SafeBuffer.new("<select><option>...</option></select>"))
+        builder.stub!(:country_select).and_return("<select><option>...</option></select>")
         concat(builder.input(:country, :as => :country))
       end
     end
diff --git a/spec/inputs/date_input_spec.rb b/spec/inputs/date_input_spec.rb
index 1c64b9985..584a54591 100644
--- a/spec/inputs/date_input_spec.rb
+++ b/spec/inputs/date_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
   end
   
diff --git a/spec/inputs/datetime_input_spec.rb b/spec/inputs/datetime_input_spec.rb
index 9e6f49b28..dcc982363 100644
--- a/spec/inputs/datetime_input_spec.rb
+++ b/spec/inputs/datetime_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
     
     @new_post.should_receive(:publish_at=).any_number_of_times
diff --git a/spec/inputs/file_input_spec.rb b/spec/inputs/file_input_spec.rb
index 94eccf34c..035483595 100644
--- a/spec/inputs/file_input_spec.rb
+++ b/spec/inputs/file_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
     
     semantic_form_for(@new_post) do |builder|
diff --git a/spec/inputs/hidden_input_spec.rb b/spec/inputs/hidden_input_spec.rb
index 483728932..c1f3b603a 100644
--- a/spec/inputs/hidden_input_spec.rb
+++ b/spec/inputs/hidden_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
     
     semantic_form_for(@new_post) do |builder|
diff --git a/spec/inputs/numeric_input_spec.rb b/spec/inputs/numeric_input_spec.rb
index 7da416737..9eb5b7af7 100644
--- a/spec/inputs/numeric_input_spec.rb
+++ b/spec/inputs/numeric_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
     
     semantic_form_for(@new_post) do |builder|
diff --git a/spec/inputs/password_input_spec.rb b/spec/inputs/password_input_spec.rb
index d6c28350a..cfc37d0ee 100644
--- a/spec/inputs/password_input_spec.rb
+++ b/spec/inputs/password_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
     
     semantic_form_for(@new_post) do |builder|
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 694b00c98..8ba38e675 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
   end
 
@@ -114,7 +114,7 @@
 
   describe 'when :selected is set' do
     before do
-      @output_buffer = ActiveSupport::SafeBuffer.new
+      @output_buffer = ''
     end
 
     describe "no selected items" do
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index bed7f5a03..3be01f990 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
 
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
   end
 
@@ -149,6 +149,20 @@
 
       output_buffer.should have_tag('form li select#post_author_status_id')
     end
+
+    it 'should use the "class_name" option' do
+      @new_post.stub!(:status).and_return(@bob)
+      @new_post.stub!(:author_status_id).and_return(@bob.id)
+   
+      ::Post.stub!(:reflect_on_association).with(:status).and_return(
+        mock('reflection', :options => {:class_name => 'AuthorStatus'}, :klass => ::Author, :macro => :belongs_to))
+
+      semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:status, :as => :select))
+      end
+
+      output_buffer.should have_tag('form li select#post_author_status_id')
+    end
   end
   
   describe "for a belongs_to association with :group_by => :author" do
@@ -343,7 +357,7 @@
   
   describe 'when :selected is set' do
     before do
-      @output_buffer = ActiveSupport::SafeBuffer.new
+      @output_buffer = ''
     end
 
     describe "no selected items" do
@@ -424,7 +438,7 @@
   
   describe "enum" do
     before do
-      @output_buffer = ActiveSupport::SafeBuffer.new
+      @output_buffer = ''
       @some_meta_descriptions = ["One", "Two", "Three"]
       @new_post.stub!(:meta_description).any_number_of_times
     end
diff --git a/spec/inputs/string_input_spec.rb b/spec/inputs/string_input_spec.rb
index 122836b1e..5175e8e67 100644
--- a/spec/inputs/string_input_spec.rb
+++ b/spec/inputs/string_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
     
     semantic_form_for(@new_post) do |builder|
diff --git a/spec/inputs/text_input_spec.rb b/spec/inputs/text_input_spec.rb
index 970853080..55f107a48 100644
--- a/spec/inputs/text_input_spec.rb
+++ b/spec/inputs/text_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
     
     semantic_form_for(@new_post) do |builder|
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index bc827c923..93104a80b 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
   end
   
diff --git a/spec/inputs/time_zone_input_spec.rb b/spec/inputs/time_zone_input_spec.rb
index 763905674..860455a5f 100644
--- a/spec/inputs/time_zone_input_spec.rb
+++ b/spec/inputs/time_zone_input_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
     
     semantic_form_for(@new_post) do |builder|
@@ -59,7 +59,7 @@
   
   describe 'when :selected is set' do
     before do
-      @output_buffer = ActiveSupport::SafeBuffer.new
+      @output_buffer = ''
     end
 
     # Note: Not possible to override default selected value for time_zone input
diff --git a/spec/inputs_spec.rb b/spec/inputs_spec.rb
index 03b9721b2..ef938e8f0 100644
--- a/spec/inputs_spec.rb
+++ b/spec/inputs_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
   end
 
diff --git a/spec/label_spec.rb b/spec/label_spec.rb
index e7fdf24b8..55d639fb5 100644
--- a/spec/label_spec.rb
+++ b/spec/label_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
   end
 
diff --git a/spec/layout_helper_spec.rb b/spec/layout_helper_spec.rb
index 71f1e7176..832c651c6 100644
--- a/spec/layout_helper_spec.rb
+++ b/spec/layout_helper_spec.rb
@@ -7,7 +7,7 @@
   include Formtastic::LayoutHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
   end
   
   describe '#formtastic_stylesheet_link_tag' do
@@ -25,18 +25,5 @@
     end
     
   end
-
-  # FIXME: Rspec issue?
-  def controller
-    mock('controller')
-  end
-
-  # FIXME: Rspec issue?
-  def config
-    returning mock('config') do |config|
-      config.stub!(:assets_dir).and_return('')
-    end
-  end
-
 end
 
diff --git a/spec/semantic_errors_spec.rb b/spec/semantic_errors_spec.rb
index 9d6fa1fd8..992d926b3 100644
--- a/spec/semantic_errors_spec.rb
+++ b/spec/semantic_errors_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
 
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
     @title_errors = ['must not be blank', 'must be awesome']
     @base_errors = ['base error message', 'nasty error']
diff --git a/spec/semantic_fields_for_spec.rb b/spec/semantic_fields_for_spec.rb
index 1b8b171b1..c2cff855b 100644
--- a/spec/semantic_fields_for_spec.rb
+++ b/spec/semantic_fields_for_spec.rb
@@ -6,7 +6,7 @@
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
     @new_post.stub!(:author).and_return(::Author.new)
   end
diff --git a/spec/.rspec b/spec/spec.opts
similarity index 100%
rename from spec/.rspec
rename to spec/spec.opts
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 16a489955..b2f9d8988 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,28 +1,24 @@
 # coding: utf-8
 require 'rubygems'
 
-gem 'activesupport', '3.0.0.beta2'
-gem 'actionpack', '3.0.0.beta2'
-gem 'activemodel', '3.0.0.beta2'
+gem 'activesupport', '2.3.5'
+gem 'actionpack', '2.3.5'
 require 'active_support'
 require 'action_pack'
 require 'action_view'
 require 'action_controller'
-require 'active_model'
 
-gem 'rspec', '>= 2.0.0.beta.6'
-require 'rspec'
-gem 'rspec-rails', '>= 2.0.0.beta.6'
+gem 'rspec', '>= 1.2.6'
+gem 'rspec-rails', '>= 1.2.6'
 gem 'hpricot', '>= 0.6.1'
 gem 'rspec_tag_matchers', '>= 1.0.0'
 require 'rspec_tag_matchers'
 
 require 'custom_macros'
 
-Rspec.configure do |config|
-  config.include RspecTagMatchers
-  config.include CustomMacros
-  config.mock_with :rspec
+Spec::Runner.configure do |config|
+  config.include(RspecTagMatchers)
+  config.include(CustomMacros)
 end
 
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic'))
@@ -30,14 +26,13 @@
 
 
 module FormtasticSpecHelper
-  include ActionView::Context
   include ActionView::Helpers::FormHelper
   include ActionView::Helpers::FormTagHelper
   include ActionView::Helpers::FormOptionsHelper
   include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::TextHelper
-  include ActionView::Helpers::ActiveModelHelper
+  include ActionView::Helpers::ActiveRecordHelper
   include ActionView::Helpers::RecordIdentificationHelper
   include ActionView::Helpers::DateHelper
   include ActionView::Helpers::CaptureHelper
@@ -59,34 +54,20 @@ def default_input_type(column_type, column_name = :generic_column_name)
   end
   
   class ::Post
-    extend ActiveModel::Naming
-    include ActiveModel::Conversion
-    
     def id
     end
   end
-  
   module ::Namespaced
     class Post
-      extend ActiveModel::Naming
-      include ActiveModel::Conversion
-      
       def id
       end
     end
   end
-  
   class ::Author
-    extend ActiveModel::Naming
-    include ActiveModel::Conversion
-    
     def to_label
     end
   end
-  
   class ::Continent
-    extend ActiveModel::Naming
-    include ActiveModel::Conversion    
   end
   
   def mock_everything
@@ -147,7 +128,6 @@ def new_author_path; "/authors/new"; end
     @new_post.stub!(:author).and_return(nil)
     @new_post.stub!(:main_post).and_return(nil)
     @new_post.stub!(:sub_posts).and_return([]) #TODO should be a mock with methods for adding sub posts
-    @new_post.stub!(:to_model).and_return(@new_post)
 
     @freds_post = mock('post')
     @freds_post.stub!(:class).and_return(::Post)

From f7ec01e16939cae0a250cab1b172c5902b02ee5e Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Thu, 15 Apr 2010 16:27:46 +0800
Subject: [PATCH 023/992] Add railtie to perform initialization when running
 under rails3

---
 CHANGELOG                 |  3 +++
 lib/formtastic.rb         |  1 +
 lib/formtastic/railtie.rb | 12 ++++++++++++
 3 files changed, 16 insertions(+)
 create mode 100644 lib/formtastic/railtie.rb

diff --git a/CHANGELOG b/CHANGELOG
index 631bb621e..253ed0979 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+(HEAD)
+* Added railtie to perform initialization tasks after the rails framework is available (rails3)
+
 0.9.8
 
 * Deprecated :selected/:checked options, see http://wiki.github.com/justinfrench/formtastic/deprecation-of-selected-option
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index ee0b0c81f..c6e753c13 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1,5 +1,6 @@
 # coding: utf-8
 require File.join(File.dirname(__FILE__), *%w[formtastic i18n])
+require File.join(File.dirname(__FILE__), *%w[formtastic railtie]) if defined?(::Rails::Railtie)
 
 module Formtastic #:nodoc:
 
diff --git a/lib/formtastic/railtie.rb b/lib/formtastic/railtie.rb
new file mode 100644
index 000000000..67c87ce8f
--- /dev/null
+++ b/lib/formtastic/railtie.rb
@@ -0,0 +1,12 @@
+require 'formtastic'
+require 'formtastic/layout_helper'
+require 'rails'
+
+module Formtastic
+  class Railtie < Rails::Railtie
+    initializer :after_initialize do
+      ActionView::Base.send :include, Formtastic::SemanticFormHelper
+      ActionView::Base.send(:include, Formtastic::LayoutHelper)
+    end
+  end
+end
\ No newline at end of file

From 2fa8cb81041f63ea036ccf66821bce571ab36bc0 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Thu, 15 Apr 2010 16:28:06 +0800
Subject: [PATCH 024/992] Make inputs_for_nested_attributes return strings

---
 CHANGELOG         | 3 ++-
 lib/formtastic.rb | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 253ed0979..a089f00ee 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 (HEAD)
-* Added railtie to perform initialization tasks after the rails framework is available (rails3)
+* Added railtie to perform initialization tasks after the rails git framework is available (rails3)
+* Fixed inputs_for_nested_attributes only appending to the output buffer
 
 0.9.8
 
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index c6e753c13..4269b24ec 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -505,9 +505,9 @@ def inputs_for_nested_attributes(*args, &block) #:nodoc:
           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) } }
+          proc { |f| return f.inputs(*args){ block.call(f) } }
         else
-          proc { |f| f.inputs(*args) }
+          proc { |f| return f.inputs(*args) }
         end
 
         fields_for_args = [options.delete(:for), options.delete(:for_options) || {}].flatten

From d52d82964841da0c4abbfa34900624c9159e54bb Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Thu, 15 Apr 2010 16:28:29 +0800
Subject: [PATCH 025/992] Mark formtastic outputs as html_safe

Formtastic::Util.html_safe() checks the available environment and marks a string as html_safe appropriately
---
 lib/formtastic.rb      | 41 +++++++++++++++++++++--------------------
 lib/formtastic/util.rb | 25 +++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 20 deletions(-)
 create mode 100644 lib/formtastic/util.rb

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 4269b24ec..2b00ddaab 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1,5 +1,6 @@
 # coding: utf-8
 require File.join(File.dirname(__FILE__), *%w[formtastic i18n])
+require File.join(File.dirname(__FILE__), *%w[formtastic util])
 require File.join(File.dirname(__FILE__), *%w[formtastic railtie]) if defined?(::Rails::Railtie)
 
 module Formtastic #:nodoc:
@@ -106,7 +107,7 @@ def input(method, options = {})
         send(:"inline_#{type}_for", method, options)
       end.compact.join("\n")
 
-      return template.content_tag(:li, list_item_content, wrapper_html)
+      return template.content_tag(:li, Formtastic::Util.html_safe(list_item_content), wrapper_html)
     end
 
     # Creates an input fieldset and ol tag wrapping for use around a set of inputs.  It can be
@@ -343,7 +344,7 @@ def commit_button(*args)
       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)
+      template.content_tag(:li, Formtastic::Util.html_safe(self.submit(text, button_html)), :class => element_class)
     end
 
     # A thin wrapper around #fields_for to set :builder => Formtastic::SemanticFormBuilder
@@ -407,7 +408,7 @@ def label(method, options_or_text=nil, options=nil)
       text = (options.delete(:label_prefix_for_nested_input) || "") + text
 
       input_name = options.delete(:input_name) || method
-      super(input_name, text, options)
+      super(input_name, Formtastic::Util.html_safe(text), options)
     end
 
     # Generates error messages for the given method. Errors can be shown as list,
@@ -453,7 +454,7 @@ def semantic_errors(*args)
       return nil if full_errors.blank?
       html_options[:class] ||= "errors"
       template.content_tag(:ul, html_options) do
-        full_errors.map { |error| template.content_tag(:li, error) }.join
+        Formtastic::Util.html_safe(full_errors.map { |error| template.content_tag(:li, Formtastic::Util.html_safe(error)) }.join)
       end
     end
 
@@ -860,12 +861,12 @@ def radio_input(method, options)
           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}",
+            Formtastic::Util.html_safe("#{self.radio_button(input_name, value, html_options)} #{label}"),
             :for => input_id
           )
 
           li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
-          template.content_tag(:li, li_content, li_options)
+          template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
         end
 
         field_set_and_list_wrapping_for_method(method, options, list_item_content)
@@ -1014,10 +1015,10 @@ def date_or_datetime_input(method, options)
             opts = strip_formtastic_options(options).merge(:prefix => @object_name, :field_name => field_name, :default => datetime)
             item_label_text = labels[input] || ::I18n.t(input.to_s, :default => input.to_s.humanize, :scope => [:datetime, :prompts])
 
-            list_items_capture << template.content_tag(:li, [
-                !item_label_text.blank? ? template.content_tag(:label, item_label_text, :for => input_id) : "",
+            list_items_capture << template.content_tag(:li, Formtastic::Util.html_safe([
+                !item_label_text.blank? ? template.content_tag(:label, Formtastic::Util.html_safe(item_label_text), :for => input_id) : "",
                 template.send(:"select_#{input}", datetime, opts, html_options.merge(:id => input_id))
-              ].join("")
+              ].join(""))
             )
           end
         end
@@ -1122,12 +1123,12 @@ def check_boxes_input(method, options)
           html_options[:id] = input_id
 
           li_content = template.content_tag(:label,
-            "#{self.check_box(input_name, html_options, value, unchecked_value)} #{label}",
+            Formtastic::Util.html_safe("#{self.check_box(input_name, html_options, value, unchecked_value)} #{label}"),
             :for => input_id
           )
 
           li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
-          template.content_tag(:li, li_content, li_options)
+          template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
         end
 
         field_set_and_list_wrapping_for_method(method, options, list_item_content)
@@ -1192,13 +1193,13 @@ def inline_input_for(method, options)
       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')
+        template.content_tag(:p, Formtastic::Util.html_safe(options[:hint]), :class => 'inline-hints')
       end
 
       # 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')
+        template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.untaint), :class => 'inline-errors')
       end
 
       # Creates an error li list.
@@ -1206,15 +1207,15 @@ def error_sentence(errors) #:nodoc:
       def error_list(errors) #:nodoc:
         list_elements = []
         errors.each do |error|
-          list_elements <<  template.content_tag(:li, error.untaint)
+          list_elements <<  template.content_tag(:li, Formtastic::Util.html_safe(error.untaint))
         end
-        template.content_tag(:ul, list_elements.join("\n"), :class => 'errors')
+        template.content_tag(:ul, Formtastic::Util.html_safe(list_elements.join("\n")), :class => 'errors')
       end
 
       # Creates an error sentence containing only the first error
       #
       def error_first(errors) #:nodoc:
-        template.content_tag(:p, errors.first.untaint, :class => 'inline-errors')
+        template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => 'inline-errors')
       end
 
       # Generates the required or optional string. If the value set is a proc,
@@ -1261,7 +1262,7 @@ def field_set_and_list_wrapping(*args, &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?
+        legend  = template.content_tag(:legend, template.content_tag(:span, Formtastic::Util.html_safe(legend))) unless legend.blank?
 
         if block_given?
           contents = if template.respond_to?(:is_haml?) && template.is_haml?
@@ -1274,11 +1275,11 @@ def field_set_and_list_wrapping(*args, &block) #:nodoc:
         # 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),
+          Formtastic::Util.html_safe(legend) << template.content_tag(:ol, Formtastic::Util.html_safe(contents)),
           html_options.except(:builder, :parent)
         )
 
-        template.concat(fieldset) if block_given?
+        template.concat(fieldset) if block_given? && (!defined?(Rails::VERSION) || Rails::VERSION::MAJOR == 2)
         fieldset
       end
 
@@ -1306,7 +1307,7 @@ def field_set_and_list_wrapping_for_method(method, options, contents) #:nodoc:
             template.content_tag(:legend,
                 self.label(method, options_for_label(options).merge(:for => options.delete(:label_for))), :class => 'label'
               ) <<
-            template.content_tag(:ol, contents)
+            template.content_tag(:ol, Formtastic::Util.html_safe(contents))
           )
       end
 
diff --git a/lib/formtastic/util.rb b/lib/formtastic/util.rb
new file mode 100644
index 000000000..822d93aa9
--- /dev/null
+++ b/lib/formtastic/util.rb
@@ -0,0 +1,25 @@
+# Adapted from the rails3 compatibility shim in Haml 2.2
+module Formtastic
+  module Util
+    extend self
+    ## Rails XSS Safety
+
+    # Returns the given text, marked as being HTML-safe.
+    # With older versions of the Rails XSS-safety mechanism,
+    # this destructively modifies the HTML-safety of `text`.
+    #
+    # @param text [String]
+    # @return [String] `text`, marked as HTML-safe
+    def html_safe(text)
+      return text if text.nil?
+      return text.html_safe if defined?(ActiveSupport::SafeBuffer)
+      return text.html_safe!
+    end
+
+    def rails_safe_buffer_class
+      return ActionView::SafeBuffer if defined?(ActionView::SafeBuffer)
+      ActiveSupport::SafeBuffer
+    end
+
+  end
+end

From e27dc9f0c687a0304e62b844e0fa198c8549b3aa Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Thu, 15 Apr 2010 16:28:49 +0800
Subject: [PATCH 026/992] Wrapped semantic_remote_form_for to allow for
 unobstrusive javascript in rails3

---
 CHANGELOG         |  2 ++
 lib/formtastic.rb | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index a089f00ee..058fec4cc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 (HEAD)
 * Added railtie to perform initialization tasks after the rails git framework is available (rails3)
 * Fixed inputs_for_nested_attributes only appending to the output buffer
+* Mark strings as HTML safe depending on environment, adapted from haml 2.2 solution (rails3)
+* Wrap semantic_remote_form_for to allow for unobstrusive javascript (rails3)
 
 0.9.8
 
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 2b00ddaab..ac2ecdc36 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1685,6 +1685,16 @@ def with_custom_field_error_proc(&block)
       result
     end
     
+    def semantic_remote_form_for_wrapper(record_or_name_or_array, *args, &proc)
+      options = args.extract_options!
+      if self.respond_to? :remote_form_for
+        semantic_remote_form_for_real(record_or_name_or_array, *(args << options), &proc)
+      else
+        options[:remote] = true
+        semantic_form_for(record_or_name_or_array, *(args << options), &proc)
+      end
+    end
+
     [:form_for, :fields_for, :remote_form_for].each do |meth|
       module_eval <<-END_SRC, __FILE__, __LINE__ + 1
         def semantic_#{meth}(record_or_name_or_array, *args, &proc)
@@ -1707,6 +1717,8 @@ def semantic_#{meth}(record_or_name_or_array, *args, &proc)
         end
       END_SRC
     end
+    alias :semantic_remote_form_for_real :semantic_remote_form_for
+    alias :semantic_remote_form_for :semantic_remote_form_for_wrapper    
     alias :semantic_form_remote_for :semantic_remote_form_for
     
   end

From b88bd5b095c51b81f603c65800488f2ae4f589a5 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Thu, 15 Apr 2010 16:32:15 +0800
Subject: [PATCH 027/992] Changed spec_helper to allow for Rails 3 / Rspec 2
 environment

---
 spec/spec_helper.rb | 80 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 66 insertions(+), 14 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index b2f9d8988..8a0c5dfde 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,13 +1,19 @@
 # coding: utf-8
 require 'rubygems'
 
-gem 'activesupport', '2.3.5'
-gem 'actionpack', '2.3.5'
+gem 'activesupport', '>= 2.3.5'
+gem 'actionpack', '>= 2.3.5'
 require 'active_support'
 require 'action_pack'
 require 'action_view'
 require 'action_controller'
 
+begin
+  gem 'activemodel', '>= 3.0.0.beta'
+  require 'active_model'
+rescue Exception
+end
+
 gem 'rspec', '>= 1.2.6'
 gem 'rspec-rails', '>= 1.2.6'
 gem 'hpricot', '>= 0.6.1'
@@ -16,23 +22,37 @@
 
 require 'custom_macros'
 
-Spec::Runner.configure do |config|
-  config.include(RspecTagMatchers)
-  config.include(CustomMacros)
+begin
+  Spec::Runner.configure do |config|
+    config.include(RspecTagMatchers)
+    config.include(CustomMacros)
+  end
+rescue
+  Rspec.configure do |config|
+    config.include RspecTagMatchers
+    config.include CustomMacros
+    config.mock_with :rspec
+  end
 end
 
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic'))
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic/layout_helper'))
 
+module ActionView
+  class OutputBuffer < Formtastic::Util.rails_safe_buffer_class
+  end
+end
 
 module FormtasticSpecHelper
+  include ActionView::Context if defined?(ActionView::Context)
   include ActionView::Helpers::FormHelper
   include ActionView::Helpers::FormTagHelper
   include ActionView::Helpers::FormOptionsHelper
   include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::TextHelper
-  include ActionView::Helpers::ActiveRecordHelper
+  include ActionView::Helpers::ActiveRecordHelper if defined?(ActionView::Helpers::ActiveRecordHelper)
+  include ActionView::Helpers::ActiveModelHelper if defined?(ActionView::Helpers::ActiveModelHelper)
   include ActionView::Helpers::RecordIdentificationHelper
   include ActionView::Helpers::DateHelper
   include ActionView::Helpers::CaptureHelper
@@ -54,20 +74,37 @@ def default_input_type(column_type, column_name = :generic_column_name)
   end
   
   class ::Post
+    extend ActiveModel::Naming if defined?(ActiveModel::Naming)
+    include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
+
     def id
     end
+
+    def persisted?
+    end
   end
   module ::Namespaced
     class Post
+      extend ActiveModel::Naming if defined?(ActiveModel::Naming)
+      include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
+
       def id
       end
+
+      def persisted?
+      end
     end
   end
   class ::Author
+    extend ActiveModel::Naming if defined?(ActiveModel::Naming)
+    include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
+
     def to_label
     end
   end
   class ::Continent
+    extend ActiveModel::Naming if defined?(ActiveModel::Naming)
+    include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
   end
   
   def mock_everything
@@ -89,6 +126,8 @@ def new_author_path; "/authors/new"; end
     @fred.stub!(:id).and_return(37)
     @fred.stub!(:new_record?).and_return(false)
     @fred.stub!(:errors).and_return(mock('errors', :[] => nil))
+    @fred.stub!(:to_key).and_return(nil)
+    @fred.stub!(:persisted?).and_return(nil)
 
     @bob = mock('user')
     @bob.stub!(:class).and_return(::Author)
@@ -100,16 +139,20 @@ def new_author_path; "/authors/new"; end
     @bob.stub!(:post_ids).and_return([])
     @bob.stub!(:new_record?).and_return(false)
     @bob.stub!(:errors).and_return(mock('errors', :[] => nil))
+    @bob.stub!(:to_key).and_return(nil)
+    @bob.stub!(:persisted?).and_return(nil)
     
     @james = mock('user')
-     @james.stub!(:class).and_return(::Author)
-     @james.stub!(:to_label).and_return('James Shock')
-     @james.stub!(:login).and_return('james')
-     @james.stub!(:id).and_return(75)
-     @james.stub!(:posts).and_return([])
-     @james.stub!(:post_ids).and_return([])
-     @james.stub!(:new_record?).and_return(false)
-     @james.stub!(:errors).and_return(mock('errors', :[] => nil))
+    @james.stub!(:class).and_return(::Author)
+    @james.stub!(:to_label).and_return('James Shock')
+    @james.stub!(:login).and_return('james')
+    @james.stub!(:id).and_return(75)
+    @james.stub!(:posts).and_return([])
+    @james.stub!(:post_ids).and_return([])
+    @james.stub!(:new_record?).and_return(false)
+    @james.stub!(:errors).and_return(mock('errors', :[] => nil))
+    @james.stub!(:to_key).and_return(nil)
+    @james.stub!(:persisted?).and_return(nil)
     
 
     ::Author.stub!(:find).and_return([@fred, @bob])
@@ -118,6 +161,8 @@ def new_author_path; "/authors/new"; end
     ::Author.stub!(:reflect_on_validations_for).and_return([])
     ::Author.stub!(:reflect_on_association).and_return { |column_name| mock('reflection', :options => {}, :klass => Post, :macro => :has_many) if column_name == :posts }
     ::Author.stub!(:content_columns).and_return([mock('column', :name => 'login'), mock('column', :name => 'created_at')])
+    ::Author.stub!(:to_key).and_return(nil)
+    ::Author.stub!(:persisted?).and_return(nil)
 
     # Sometimes we need a mock @post object and some Authors for belongs_to
     @new_post = mock('post')
@@ -128,6 +173,9 @@ def new_author_path; "/authors/new"; end
     @new_post.stub!(:author).and_return(nil)
     @new_post.stub!(:main_post).and_return(nil)
     @new_post.stub!(:sub_posts).and_return([]) #TODO should be a mock with methods for adding sub posts
+    @new_post.stub!(:to_key).and_return(nil)
+    @new_post.stub!(:to_model).and_return(@new_post)
+    @new_post.stub!(:persisted?).and_return(nil)
 
     @freds_post = mock('post')
     @freds_post.stub!(:class).and_return(::Post)
@@ -139,6 +187,8 @@ def new_author_path; "/authors/new"; end
     @freds_post.stub!(:author_ids).and_return([@fred.id])
     @freds_post.stub!(:new_record?).and_return(false)
     @freds_post.stub!(:errors).and_return(mock('errors', :[] => nil))
+    @freds_post.stub!(:to_key).and_return(nil)
+    @freds_post.stub!(:persisted?).and_return(nil)
     @fred.stub!(:posts).and_return([@freds_post])
     @fred.stub!(:post_ids).and_return([@freds_post.id])
 
@@ -163,6 +213,8 @@ def new_author_path; "/authors/new"; end
     end
     ::Post.stub!(:find).and_return([@freds_post])
     ::Post.stub!(:content_columns).and_return([mock('column', :name => 'title'), mock('column', :name => 'body'), mock('column', :name => 'created_at')])
+    ::Post.stub!(:to_key).and_return(nil)
+    ::Post.stub!(:persisted?).and_return(nil)
     
     @new_post.stub!(:title)
     @new_post.stub!(:body)

From b77e11ad5b06bc3c4558aaa63348b070024ed92c Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Thu, 15 Apr 2010 16:34:34 +0800
Subject: [PATCH 028/992] Make Rakefile compatible with rails2 & rails3

---
 Rakefile            | 27 +++++++++++++++++++++++++--
 spec/spec_helper.rb |  3 ++-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/Rakefile b/Rakefile
index 6a57cbc2a..54ca1b0fe 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,13 +1,17 @@
 # coding: utf-8
+require 'rubygems'
 require 'rake'
 require 'rake/rdoctask'
 
 begin
+  gem 'rspec', '>= 1.2.6'
+  gem 'rspec-rails', '>= 1.2.6'
+  require 'spec'
   require 'spec/rake/spectask'
 rescue LoadError
   begin
-    gem 'rspec-rails', '>= 1.0.0'
-    require 'spec/rake/spectask'
+    require 'rspec/core/rake_task.rb'
+    require 'rspec/core/version'
   rescue LoadError
     puts "[formtastic:] RSpec - or one of it's dependencies - is not available. Install it with: sudo gem install rspec-rails"
   end
@@ -99,3 +103,22 @@ if defined?(Spec)
     t.rcov_opts = ['--exclude', 'spec,Library']
   end
 end
+
+if defined?(Rspec)
+  desc 'Test the formtastic plugin.'
+  Rspec::Core::RakeTask.new('spec') do |t|
+    t.pattern = FileList['spec/**/*_spec.rb']
+  end
+
+  desc 'Test the formtastic plugin with specdoc formatting and colors'
+  Rspec::Core::RakeTask.new('specdoc') do |t|
+    t.pattern = FileList['spec/**/*_spec.rb']
+  end
+
+  desc "Run all examples with RCov"
+  Rspec::Core::RakeTask.new('examples_with_rcov') do |t|
+    t.pattern = FileList['spec/**/*_spec.rb']
+    t.rcov = true
+    t.rcov_opts = ['--exclude', 'spec,Library']
+  end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 8a0c5dfde..7797a73b4 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -28,7 +28,8 @@
     config.include(CustomMacros)
   end
 rescue
-  Rspec.configure do |config|
+  require 'rspec/core'
+  Rspec::Core.configure do |config|
     config.include RspecTagMatchers
     config.include CustomMacros
     config.mock_with :rspec

From 1aa01767054cbc529ff3c91ac64a3ba4d9b383cd Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Thu, 15 Apr 2010 16:37:46 +0800
Subject: [PATCH 029/992] Cleanup Changelog

---
 CHANGELOG | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 058fec4cc..63fa9afbb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,10 @@
 (HEAD)
-* Added railtie to perform initialization tasks after the rails git framework is available (rails3)
+* Changed semantic_remote_form_for to allow for unobstrusive javascript / :remote option (rails3)
+* Changed spec_helper to support Rails 2 with Rspec od Rails 3 with Rspec 3 environments
+* Changed Rakefile to initalize the correct testing framework for the enviroment
 * Fixed inputs_for_nested_attributes only appending to the output buffer
-* Mark strings as HTML safe depending on environment, adapted from haml 2.2 solution (rails3)
-* Wrap semantic_remote_form_for to allow for unobstrusive javascript (rails3)
+* Added railtie to perform initialization tasks after the rails git framework is available (rails3)
+* Added helper to mark strings as HTML safe depending on environment, adapted from haml 2.2 solution (rails3)
 
 0.9.8
 

From a5865bfc56d389b3d5a4c507d948cbf89e1c8867 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 12 Apr 2010 10:22:16 +1000
Subject: [PATCH 030/992] Reverting class_name additions for belongs_to
 associations in f26248f and fe5db0d, as they seemed to optimise for a use
 case which isn't consistent with Rails' behaviour and most common use case.

See issue 236 for more information, patch welcome that caters to both scenarios adequately.

This reverts commit 6d6f08970f3f5599ee90071885a69d630 and 02a7f797378a2b7415c5ba82bc6007bfe.
Revert "spec for 'class_name' option on 'belongs_to' associations"
Revert "fix select input for 'has_many :foos, :class_name => 'FooBar'"
---
 lib/formtastic.rb                |  2 +-
 spec/inputs/select_input_spec.rb | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index ac2ecdc36..d9f451a8a 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1473,7 +1473,7 @@ def generate_association_input_name(method) #:nodoc:
           if [:has_and_belongs_to_many, :has_many].include?(reflection.macro)
             "#{method.to_s.singularize}_ids"
           else
-            reflection.options[:foreign_key] || reflection.options[:class_name].try(:foreign_key) || "#{method}_id"
+            reflection.options[:foreign_key] || "#{method}_id"
           end
         else
           method
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 3be01f990..55a2ffa1b 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -149,20 +149,6 @@
 
       output_buffer.should have_tag('form li select#post_author_status_id')
     end
-
-    it 'should use the "class_name" option' do
-      @new_post.stub!(:status).and_return(@bob)
-      @new_post.stub!(:author_status_id).and_return(@bob.id)
-   
-      ::Post.stub!(:reflect_on_association).with(:status).and_return(
-        mock('reflection', :options => {:class_name => 'AuthorStatus'}, :klass => ::Author, :macro => :belongs_to))
-
-      semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:status, :as => :select))
-      end
-
-      output_buffer.should have_tag('form li select#post_author_status_id')
-    end
   end
   
   describe "for a belongs_to association with :group_by => :author" do

From 89dca89780d58b5198d85aea6a3c843ee3be3521 Mon Sep 17 00:00:00 2001
From: Dallas Reedy <code@dallasreedy.com>
Date: Sat, 27 Feb 2010 07:26:56 +0800
Subject: [PATCH 031/992] added the :disabled option to #check_boxes_input

---
 lib/formtastic.rb                     |  6 ++-
 spec/inputs/check_boxes_input_spec.rb | 55 +++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index d9f451a8a..0a7c31f78 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1112,7 +1112,10 @@ def check_boxes_input(method, options)
         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
-        
+
+        disabled_option_is_present = options.key?(:disabled)
+        disabled_values = [*options[:disabled]] if disabled_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
@@ -1120,6 +1123,7 @@ def check_boxes_input(method, options)
           input_ids << input_id
 
           html_options[:checked] = selected_values.include?(value) if selected_option_is_present
+          html_options[:disabled] = disabled_values.include?(value) if disabled_option_is_present
           html_options[:id] = input_id
 
           li_content = template.content_tag(:label,
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index b0aaffd54..f0017bdf9 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -177,6 +177,61 @@
     end
     
 
+    describe 'when :disabled is set' do
+      before do
+        @output_buffer = ''
+      end
+
+      describe "no disabled items" do
+        before do
+          @new_post.stub!(:author_ids).and_return(nil)
+
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:authors, :as => :check_boxes, :disabled => nil))
+          end
+        end
+
+        it 'should not have any disabled item(s)' do
+          output_buffer.should_not have_tag("form li fieldset ol li label input[@disabled='disabled']")
+        end
+      end
+
+      describe "single disabled item" do
+        before do
+          @new_post.stub!(:author_ids).and_return(nil)
+
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:authors, :as => :check_boxes, :disabled => @fred.id))
+          end
+        end
+
+        it "should have one item disabled; the specified one" do
+          output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 1)
+          output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
+          output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@fred.id}']")
+        end
+      end
+
+      describe "multiple disabled items" do
+        before do
+          @new_post.stub!(:author_ids).and_return(nil)
+
+          semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:authors, :as => :check_boxes, :disabled => [@bob.id, @fred.id]))
+          end
+        end
+
+        it "should have multiple items disabled; the specified ones" do
+          output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 2)
+          output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@bob.id}']", /bob/i)
+          output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@bob.id}']")
+          output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
+          output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@fred.id}']")
+        end
+      end
+
+    end
+
   end
   
   

From aea23c410836a35e60bc58c0b8f08279a2925a6f Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Thu, 15 Apr 2010 19:18:10 +0200
Subject: [PATCH 032/992] Refactored I18n handling in spec testsuite

* Make use of I18n.backend.reload! to clear/reinitialize translation strings
* Start with a minimal set of translation strings and add expected ones in the test
* Reinitialize the translation backend after each test to start with a known state
---
 CHANGELOG                      |  1 +
 spec/commit_button_spec.rb     | 75 ++++++++++++++++------------------
 spec/i18n_spec.rb              | 19 ++++-----
 spec/inputs/time_input_spec.rb |  1 +
 4 files changed, 46 insertions(+), 50 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 63fa9afbb..159a6fc3b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
 (HEAD)
+* Changed I18n handling in spec tests to use I18n.backend.reload! instead of assigning nil
 * Changed semantic_remote_form_for to allow for unobstrusive javascript / :remote option (rails3)
 * Changed spec_helper to support Rails 2 with Rspec od Rails 3 with Rspec 3 environments
 * Changed Rakefile to initalize the correct testing framework for the enviroment
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index 8645dcf2d..7b8819340 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -140,7 +140,7 @@
           end
           
           after do
-            ::I18n.backend.store_translations :en, :formtastic => {:submit => nil}
+            ::I18n.backend.reload!
           end
           
           it 'should render an input with default I18n-localized label (fallback)' do
@@ -157,33 +157,34 @@
              :formtastic => {
                  :actions => {
                    :submit => 'Custom Submit',
-                   :post => {
-                     :submit => 'Custom Submit {{model}}'
-                    }
                   }
                }
            ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
          end
 
-         it 'should render an input with localized label (I18n)' do
-           semantic_form_for(:post, :url => 'http://example.com') do |builder|
-             concat(builder.commit_button)
-           end
-           output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit Post"][@class~="submit"]})
+         after do
+           ::I18n.backend.reload!
          end
 
-         it 'should render an input with anoptional localized label (I18n) - if first is not set' do
+         it 'should render an input with localized label (I18n)' do
            ::I18n.backend.store_translations :en,
              :formtastic => {
                  :actions => {
                    :post => {
-                     :submit => nil
+                     :submit => 'Custom Submit {{model}}'
                     }
                   }
                }
            semantic_form_for(:post, :url => 'http://example.com') do |builder|
              concat(builder.commit_button)
            end
+           output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit Post"][@class~="submit"]})
+         end
+
+         it 'should render an input with anoptional localized label (I18n) - if first is not set' do
+           semantic_form_for(:post, :url => 'http://example.com') do |builder|
+             concat(builder.commit_button)
+           end
            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit"][@class~="submit"]})
          end
 
@@ -213,7 +214,7 @@
           end
 
           after do
-            ::I18n.backend.store_translations :en, :formtastic => {:create => nil}
+            ::I18n.backend.reload!
           end
 
           it 'should render an input with default I18n-localized label (fallback)' do
@@ -230,40 +231,35 @@
               :formtastic => {
                   :actions => {
                     :create => 'Custom Create',
-                    :post => {
-                      :create => 'Custom Create {{model}}'
-                     }
                    }
                 }
             ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
           end
           
           after do
-            ::I18n.backend.store_translations :en, :formtastic => nil
+            ::I18n.backend.reload!
           end
 
           it 'should render an input with localized label (I18n)' do
-            semantic_form_for(@new_post) do |builder|
-              concat(builder.commit_button)
-            end
-            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create Post"][@class~="create"]})
-          end
-
-          it 'should render an input with anoptional localized label (I18n) - if first is not set' do
             ::I18n.backend.store_translations :en,
               :formtastic => {
                   :actions => {
                     :post => {
-                      :create => nil
+                      :create => 'Custom Create {{model}}'
                      }
                    }
                 }
             semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create"][@class~="create"]})
-            ::I18n.backend.store_translations :en, :formtastic => nil
-            
+            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create Post"][@class~="create"]})
+          end
+
+          it 'should render an input with anoptional localized label (I18n) - if first is not set' do
+            semantic_form_for(@new_post) do |builder|
+              concat(builder.commit_button)
+            end
+            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create"][@class~="create"]})            
           end
 
         end
@@ -292,7 +288,7 @@
           end
           
           after do
-            ::I18n.backend.store_translations :en, :formtastic => {:update => nil}
+            ::I18n.backend.reload!
           end
 
           it 'should render an input with default I18n-localized label (fallback)' do
@@ -309,33 +305,34 @@
               :formtastic => {
                   :actions => {
                     :update => 'Custom Save',
-                    :post => {
-                      :update => 'Custom Save {{model}}'
-                     }
                    }
                 }
             ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
           end
 
-          it 'should render an input with localized label (I18n)' do
-            semantic_form_for(@new_post) do |builder|
-              concat(builder.commit_button)
-            end
-            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save Post"][@class~="update"]})
+          after do
+            ::I18n.backend.reload!
           end
-
-          it 'should render an input with anoptional localized label (I18n) - if first is not set' do
+          
+          it 'should render an input with localized label (I18n)' do
             ::I18n.backend.store_translations :en,
               :formtastic => {
                   :actions => {
                     :post => {
-                      :update => nil
+                      :update => 'Custom Save {{model}}'
                      }
                    }
                 }
             semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
+            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save Post"][@class~="update"]})
+          end
+
+          it 'should render an input with anoptional localized label (I18n) - if first is not set' do
+            semantic_form_for(@new_post) do |builder|
+              concat(builder.commit_button)
+            end
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save"][@class~="update"]})
             ::I18n.backend.store_translations :en, :formtastic => {}
           end
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index d4c480a39..10c3da907 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -24,7 +24,6 @@
     
     before do
       @formtastic_strings = {
-          :required       => 'Default Required',
           :yes            => 'Default Yes',
           :no             => 'Default No',
           :create         => 'Default Create {{model}}',
@@ -36,8 +35,13 @@
         }
       ::I18n.backend.store_translations :en, :formtastic => @formtastic_strings
     end
+
+    after do
+      ::I18n.backend.reload!
+    end
     
     it "should translate core strings correctly" do
+      ::I18n.backend.store_translations :en, {:formtastic => {:required => 'Default Required'}}
       ::Formtastic::I18n.t(:required).should  == "Default Required"
       ::Formtastic::I18n.t(:yes).should       == "Default Yes"
       ::Formtastic::I18n.t(:no).should        == "Default No"
@@ -54,7 +58,6 @@
     end
     
     it "should be possible to override default values" do
-      ::I18n.backend.store_translations :en, {:formtastic => {:required => nil}}
       ::Formtastic::I18n.t(:required, :default => 'Nothing found!').should == 'Nothing found!'
     end
     
@@ -63,15 +66,9 @@
   describe "when no I18n locales are available" do
     
     before do
-      ::I18n.backend.store_translations :en, :formtastic => {
-          :required => nil,
-          :yes => nil,
-          :no => nil,
-          :create => nil,
-          :update => nil
-        }
+      ::I18n.backend.reload!
     end
-    
+
     it "should use default strings" do
       (::Formtastic::I18n::DEFAULT_VALUES.keys).each do |key|
         ::Formtastic::I18n.t(key, :model => '{{model}}').should == ::Formtastic::I18n::DEFAULT_VALUES[key]
@@ -102,7 +99,7 @@
     end
     
     after do
-      ::I18n.backend.store_translations :en, :formtastic => nil
+      ::I18n.backend.reload!
       ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
     end
     
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index 93104a80b..5fd635a41 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -12,6 +12,7 @@
   
   describe "general" do
     before do
+      ::I18n.backend.reload!
       output_buffer.replace ''
     end
 

From 777d366befffb4734c998cd072485fbed31fd2f9 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Fri, 16 Apr 2010 09:07:51 -0300
Subject: [PATCH 033/992] Boolean inputs not properly html safe. Closes #241

---
 lib/formtastic.rb     | 2 +-
 spec/defaults_spec.rb | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 0a7c31f78..9bff5e510 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -11,7 +11,7 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
     @@default_text_area_height = 20
     @@all_fields_required_by_default = true
     @@include_blank_for_select_by_default = true
-    @@required_string = proc { %{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>} }
+    @@required_string = proc { Formtastic::Util.html_safe(%{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>}) }
     @@optional_string = ''
     @@inline_errors = :sentence
     @@label_str_method = :humanize
diff --git a/spec/defaults_spec.rb b/spec/defaults_spec.rb
index fab91f137..9be68390d 100644
--- a/spec/defaults_spec.rb
+++ b/spec/defaults_spec.rb
@@ -14,7 +14,13 @@
       required_string = required_string.is_a?(::Proc) ? required_string.call : required_string.to_s
       required_string.should == %{<abbr title="Haha!">*</abbr>}
     end
+
+    it "should render a html_safe string" do
+      required_string = Formtastic::SemanticFormBuilder.required_string
+      required_string = required_string.is_a?(::Proc) ? required_string.call : required_string.to_s
+      required_string.should be_html_safe
+    end
     
   end
   
-end
\ No newline at end of file
+end

From aa84f5ec821e75fb5c5cd7ba0b2a4d6438e250b2 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Fri, 16 Apr 2010 09:21:16 -0300
Subject: [PATCH 034/992] Revert "Boolean inputs not properly html safe. Closes
 #241"

This reverts commit 777d366befffb4734c998cd072485fbed31fd2f9.
---
 lib/formtastic.rb     | 2 +-
 spec/defaults_spec.rb | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 9bff5e510..0a7c31f78 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -11,7 +11,7 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
     @@default_text_area_height = 20
     @@all_fields_required_by_default = true
     @@include_blank_for_select_by_default = true
-    @@required_string = proc { Formtastic::Util.html_safe(%{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>}) }
+    @@required_string = proc { %{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>} }
     @@optional_string = ''
     @@inline_errors = :sentence
     @@label_str_method = :humanize
diff --git a/spec/defaults_spec.rb b/spec/defaults_spec.rb
index 9be68390d..fab91f137 100644
--- a/spec/defaults_spec.rb
+++ b/spec/defaults_spec.rb
@@ -14,13 +14,7 @@
       required_string = required_string.is_a?(::Proc) ? required_string.call : required_string.to_s
       required_string.should == %{<abbr title="Haha!">*</abbr>}
     end
-
-    it "should render a html_safe string" do
-      required_string = Formtastic::SemanticFormBuilder.required_string
-      required_string = required_string.is_a?(::Proc) ? required_string.call : required_string.to_s
-      required_string.should be_html_safe
-    end
     
   end
   
-end
+end
\ No newline at end of file

From 97711e869f6bfd9146bb94e7c3a7c4e26cd5e593 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Fri, 16 Apr 2010 09:54:38 -0300
Subject: [PATCH 035/992] Boolean inputs not properly html safe again. Closes
 #241

---
 lib/formtastic.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 0a7c31f78..d87897613 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -401,14 +401,18 @@ def label(method, options_or_text=nil, options=nil)
         text = options_or_text
         options ||= {}
       end
+
       text = localized_string(method, text, :label) || humanized_attribute_name(method)
       text += required_or_optional_string(options.delete(:required))
+      text = Formtastic::Util.html_safe(text)
 
       # special case for boolean (checkbox) labels, which have a nested input
-      text = (options.delete(:label_prefix_for_nested_input) || "") + text
+      if options.key?(:label_prefix_for_nested_input)
+        text = options.delete(:label_prefix_for_nested_input) + text
+      end
 
       input_name = options.delete(:input_name) || method
-      super(input_name, Formtastic::Util.html_safe(text), options)
+      super(input_name, text, options)
     end
 
     # Generates error messages for the given method. Errors can be shown as list,

From 8c461cdfa559195102be1f63391e71a0e8f991b1 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Fri, 16 Apr 2010 21:41:31 +0200
Subject: [PATCH 036/992] Create formtastic:install generator

---
 .../formtastic/install/install_generator.rb   | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 lib/generators/formtastic/install/install_generator.rb

diff --git a/lib/generators/formtastic/install/install_generator.rb b/lib/generators/formtastic/install/install_generator.rb
new file mode 100644
index 000000000..ddbb0bbe4
--- /dev/null
+++ b/lib/generators/formtastic/install/install_generator.rb
@@ -0,0 +1,24 @@
+# coding: utf-8
+module Formtastic
+  class InstallGenerator < Rails::Generators::Base
+    desc "Copies formtastic.css and formtastic_changes.css to public/stylesheets/ and a config initializer to config/initializers/formtastic_config.rb"
+
+    def self.source_root
+      # Set source directory for the templates to the rails2 generator template directory
+      @source_root ||= File.expand_path(File.join('..', '..', '..', '..', 'generators', 'formtastic', 'templates'), File.dirname(__FILE__))
+    end
+    
+    def self.banner
+      "rails generate formtastic:install [options]"
+    end
+
+    def copy_files
+      empty_directory 'config/initializers'
+      template        'formtastic.rb', 'config/initializers/formtastic.rb'
+
+      empty_directory 'public/stylesheets'
+      template        'formtastic.css',         'public/stylesheets/formtastic.css'
+      template        'formtastic_changes.css', 'public/stylesheets/formtastic_changes.css'
+    end
+  end
+end

From a334b0e96eee22dec256551e7fc9189841d9d1c0 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Fri, 16 Apr 2010 22:08:41 +0200
Subject: [PATCH 037/992] Create formtastic:form generator

---
 .../formtastic/form/form_generator.rb         | 86 +++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 lib/generators/formtastic/form/form_generator.rb

diff --git a/lib/generators/formtastic/form/form_generator.rb b/lib/generators/formtastic/form/form_generator.rb
new file mode 100644
index 000000000..8b64c0788
--- /dev/null
+++ b/lib/generators/formtastic/form/form_generator.rb
@@ -0,0 +1,86 @@
+# coding: utf-8
+module Formtastic
+  class FormGenerator < Rails::Generators::NamedBase
+    desc "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."
+
+    class_option :haml, :type => :boolean, :default => false, :group => :formtastic,
+                 :desc => "Generate HAML instead of ERB"
+
+    class_option :partial, :type => :boolean, :default => false, :group => :formtastic,
+                 :desc => 'Generate a form partial in the model views path, i.e. "_form.html.erb" or "_form.html.haml"'
+
+    class_option :controller, :type => :string, :default => false, :group => :formtastic,
+                 :desc => 'Generate for custom controller/view path - in case model and controller namespace is different, i.e. "admin/posts"'
+
+    def self.source_root
+     # Set source directory for the templates to the rails2 generator template directory
+     @source_root ||= File.expand_path(File.join('..', '..', '..', '..', 'generators', 'form', 'templates'), File.dirname(__FILE__))
+    end
+
+    def self.banner
+      "rails generate formtastic:form ExistingModelName [options]"
+    end
+
+    def create_or_show
+      if options[:partial]
+        empty_directory "app/views/#{controller_path}"
+        template "view__form.html.#{template_type}", "app/views/#{controller_path}/_form.html.#{template_type}"
+      else
+        template = File.read("#{self.class.source_root}/view__form.html.#{template_type}")
+        erb = ERB.new(template, nil, '-')
+        generated_code = erb.result(binding).strip rescue nil
+
+        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
+
+    protected
+
+    IGNORED_COLUMNS = [:updated_at, :created_at].freeze
+
+    def template_type
+      @template_type ||= options[:haml] ? :haml : :erb
+    end
+
+    def controller_path
+      @controller_path ||= if options[:controller]
+        options[:controller].underscore
+      else
+        name.underscore.pluralize
+      end
+    end
+
+    def columns
+      @columns ||= self.name.camelize.constantize.content_columns.reject { |column| IGNORED_COLUMNS.include?(column.name.to_sym) }
+    end
+
+    def save_to_clipboard(data)
+      return unless data
+
+      begin
+        case RUBY_PLATFORM
+        when /win32/
+          require 'win32/clipboard'
+          ::Win32::Clipboard.data = data
+        when /darwin/ # mac
+          `echo "#{data}" | pbcopy`
+        else # linux/unix
+          `echo "#{data}" | xsel --clipboard` || `echo "#{data}" | xclip`
+        end
+      rescue LoadError
+        false
+      else
+        true
+      end
+    end
+  end
+end

From aefd9c8681daf4ffcbd9dfe3a4761f7c1738bb53 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Fri, 16 Apr 2010 22:09:12 +0200
Subject: [PATCH 038/992] Updated Changelog

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 159a6fc3b..260328be2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@
 * Fixed inputs_for_nested_attributes only appending to the output buffer
 * Added railtie to perform initialization tasks after the rails git framework is available (rails3)
 * Added helper to mark strings as HTML safe depending on environment, adapted from haml 2.2 solution (rails3)
+* Added compatible install and form helpers (rails3)
 
 0.9.8
 

From d7a729d0b1a19ff42563ddc5d0372897963b49f6 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Tue, 13 Apr 2010 22:48:02 +0200
Subject: [PATCH 039/992] Capture returns from formtastic and append them to
 the output_buffer if running with rails3

This is an ugly hack that hopefully goes away once rspec 2.0 supports testing viewhelpers
---
 spec/buttons_spec.rb                  |  31 +++++--
 spec/commit_button_spec.rb            |  82 ++++++++++++-----
 spec/custom_macros.rb                 |  93 ++++++++++++++------
 spec/form_helper_spec.rb              |  20 +++--
 spec/i18n_spec.rb                     |   6 +-
 spec/include_blank_spec.rb            |  12 ++-
 spec/input_spec.rb                    | 117 ++++++++++++++++---------
 spec/inputs/boolean_input_spec.rb     |  19 ++--
 spec/inputs/check_boxes_input_spec.rb |  35 ++++++--
 spec/inputs/country_input_spec.rb     |   6 +-
 spec/inputs/date_input_spec.rb        |  28 ++++--
 spec/inputs/datetime_input_spec.rb    |  45 +++++++---
 spec/inputs/file_input_spec.rb        |   5 +-
 spec/inputs/hidden_input_spec.rb      |  11 ++-
 spec/inputs/numeric_input_spec.rb     |   4 +-
 spec/inputs/password_input_spec.rb    |   4 +-
 spec/inputs/radio_input_spec.rb       |  24 +++--
 spec/inputs/select_input_spec.rb      |  78 +++++++++++++----
 spec/inputs/string_input_spec.rb      |   4 +-
 spec/inputs/text_input_spec.rb        |   5 +-
 spec/inputs/time_input_spec.rb        |  30 +++++--
 spec/inputs/time_zone_input_spec.rb   |  14 ++-
 spec/inputs_spec.rb                   | 121 ++++++++++++++++++--------
 spec/layout_helper_spec.rb            |   6 +-
 spec/semantic_fields_for_spec.rb      |   7 +-
 25 files changed, 570 insertions(+), 237 deletions(-)

diff --git a/spec/buttons_spec.rb b/spec/buttons_spec.rb
index ba69fc407..76178fe3d 100644
--- a/spec/buttons_spec.rb
+++ b/spec/buttons_spec.rb
@@ -13,26 +13,31 @@
   describe 'with a block' do
     describe 'when no options are provided' do
       before do
-        semantic_form_for(@new_post) do |builder|
-          builder.buttons do
+        @form = semantic_form_for(@new_post) do |builder|
+          buttons = builder.buttons do
             concat('hello')
           end
+          concat(buttons)
         end
       end
 
       it 'should render a fieldset inside the form, with a class of "inputs"' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form fieldset.buttons")
       end
 
       it 'should render an ol inside the fieldset' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form fieldset.buttons ol")
       end
 
       it 'should render the contents of the block inside the ol' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form fieldset.buttons ol", /hello/)
       end
 
       it 'should not render a legend inside the fieldset' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should_not have_tag("form fieldset.buttons legend")
       end
     end
@@ -41,12 +46,13 @@
       before do
         @legend_text = "Advanced options"
 
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           builder.buttons :name => @legend_text do
           end
         end
       end
       it 'should render a fieldset inside the form' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form fieldset legend", /#{@legend_text}/)
       end
     end
@@ -56,12 +62,13 @@
         @id_option = 'advanced'
         @class_option = 'wide'
 
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           builder.buttons :id => @id_option, :class => @class_option do
           end
         end
       end
       it 'should pass the options into the fieldset tag as attributes' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form fieldset##{@id_option}")
         output_buffer.should have_tag("form fieldset.#{@class_option}")
       end
@@ -74,32 +81,38 @@
     describe 'with no args (default buttons)' do
 
       before do
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           concat(builder.buttons)
         end
       end
 
       it 'should render a form' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form')
       end
 
       it 'should render a buttons fieldset inside the form' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form fieldset.buttons')
       end
 
       it 'should not render a legend in the fieldset' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should_not have_tag('form fieldset.buttons legend')
       end
 
       it 'should render an ol in the fieldset' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form fieldset.buttons ol')
       end
 
       it 'should render a list item in the ol for each default button' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form fieldset.buttons ol li', :count => 1)
       end
 
       it 'should render a commit list item for the commit button' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form fieldset.buttons ol li.commit')
       end
 
@@ -108,12 +121,13 @@
     describe 'with button names as args' do
 
       before do
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           concat(builder.buttons(:commit))
         end
       end
 
       it 'should render a form with a fieldset containing a list item for each button arg' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form > fieldset.buttons > ol > li', :count => 1)
         output_buffer.should have_tag('form > fieldset.buttons > ol > li.commit')
       end
@@ -123,21 +137,24 @@
     describe 'with button names as args and an options hash' do
 
       before do
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           concat(builder.buttons(:commit, :name => "Now click a button", :id => "my-id"))
         end
       end
 
       it 'should render a form with a fieldset containing a list item for each button arg' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form > fieldset.buttons > ol > li', :count => 1)
         output_buffer.should have_tag('form > fieldset.buttons > ol > li.commit', :count => 1)
       end
 
       it 'should pass the options down to the fieldset' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form > fieldset#my-id.buttons')
       end
 
       it 'should use the special :name option as a text for the legend tag' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form > fieldset#my-id.buttons > legend', /Now click a button/)
       end
 
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index 7b8819340..d2071ed38 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -14,29 +14,33 @@
 
     before do
       @new_post.stub!(:new_record?).and_return(false)
-      semantic_form_for(@new_post) do |builder|
+      @form = semantic_form_for(@new_post) do |builder|
         concat(builder.commit_button)
       end
     end
 
     it 'should render a commit li' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('li.commit')
     end
 
     it 'should render an input with a type attribute of "submit"' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('li.commit input[@type="submit"]')
     end
 
     it 'should render an input with a name attribute of "commit"' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('li.commit input[@name="commit"]')
     end
 
     it 'should pass options given in :button_html to the button' do
       @new_post.stub!(:new_record?).and_return(false)
-      semantic_form_for(@new_post) do |builder|
+      form = semantic_form_for(@new_post) do |builder|
         concat(builder.commit_button('text', :button_html => {:class => 'my_class', :id => 'my_id'}))
       end
 
+      output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('li.commit input#my_id')
       output_buffer.should have_tag('li.commit input.my_class')
     end
@@ -54,9 +58,10 @@
     it 'should use the default if set' do
       with_config :default_commit_button_accesskey, 's' do
         @new_post.stub!(:new_record?).and_return(false)
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :button_html => {}))
         end
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('li.commit input[@accesskey="s"]')
       end
     end
@@ -64,9 +69,10 @@
     it 'should use the value set in options over the default' do
       with_config :default_commit_button_accesskey, 's' do
         @new_post.stub!(:new_record?).and_return(false)
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :accesskey => 'o'))
         end
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should_not have_tag('li.commit input[@accesskey="s"]')
         output_buffer.should have_tag('li.commit input[@accesskey="o"]')
       end
@@ -75,9 +81,10 @@
     it 'should use the value set in button_html over options' do
       with_config :default_commit_button_accesskey, 's' do
         @new_post.stub!(:new_record?).and_return(false)
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :accesskey => 'o', :button_html => {:accesskey => 't'}))
         end
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should_not have_tag('li.commit input[@accesskey="s"]')
         output_buffer.should_not have_tag('li.commit input[@accesskey="o"]')
         output_buffer.should have_tag('li.commit input[@accesskey="t"]')
@@ -90,16 +97,18 @@
     
     before do
       @new_post.stub!(:new_record?).and_return(false)
-      semantic_form_for(@new_post) do |builder|
+      @form = semantic_form_for(@new_post) do |builder|
         concat(builder.commit_button("a string", :button_html => { :class => "pretty"}))
       end
     end
     
     it "should render the string as the value of the button" do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('li input[@value="a string"]')
     end
     
     it "should deal with the options hash" do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('li input.pretty')
     end
     
@@ -109,12 +118,13 @@
 
     before do
       @new_post.stub!(:new_record?).and_return(false)
-      semantic_form_for(@new_post) do |builder|
+      @form = semantic_form_for(@new_post) do |builder|
         concat(builder.commit_button(:button_html => { :class => "pretty"}))
       end
     end
     
     it "should deal with the options hash" do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('li input.pretty')
     end
     
@@ -126,9 +136,10 @@
     describe 'when used without object' do
       describe 'when explicit label is provided' do
         it 'should render an input with the explicitly specified label' do
-          semantic_form_for(:post, :url => 'http://example.com') do |builder|
+          form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
             concat(builder.commit_button("Click!"))
           end
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag('li.commit input[@value="Click!"][@class~="submit"]')
         end
       end
@@ -144,9 +155,10 @@
           end
           
           it 'should render an input with default I18n-localized label (fallback)' do
-            semantic_form_for(:post, :url => 'http://example.com') do |builder|
+            form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
               concat(builder.commit_button)
             end
+            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
             output_buffer.should have_tag('li.commit input[@value="Submit Post"][@class~="submit"]')
           end
         end
@@ -175,16 +187,18 @@
                     }
                   }
                }
-           semantic_form_for(:post, :url => 'http://example.com') do |builder|
+           form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
              concat(builder.commit_button)
            end
+           output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit Post"][@class~="submit"]})
          end
 
          it 'should render an input with anoptional localized label (I18n) - if first is not set' do
-           semantic_form_for(:post, :url => 'http://example.com') do |builder|
+           form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
              concat(builder.commit_button)
            end
+           output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit"][@class~="submit"]})
          end
 
@@ -200,9 +214,10 @@
 
       describe 'when explicit label is provided' do
         it 'should render an input with the explicitly specified label' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.commit_button("Click!"))
           end
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag('li.commit input[@value="Click!"][@class~="create"]')
         end
       end
@@ -218,9 +233,10 @@
           end
 
           it 'should render an input with default I18n-localized label (fallback)' do
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
+            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
             output_buffer.should have_tag('li.commit input[@value="Create Post"][@class~="create"]')
           end
         end
@@ -249,17 +265,19 @@
                      }
                    }
                 }
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
+            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create Post"][@class~="create"]})
           end
 
           it 'should render an input with anoptional localized label (I18n) - if first is not set' do
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create"][@class~="create"]})            
+            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create"][@class~="create"]})
           end
 
         end
@@ -274,9 +292,10 @@
 
       describe 'when explicit label is provided' do
         it 'should render an input with the explicitly specified label' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.commit_button("Click!"))
           end
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag('li.commit input[@value="Click!"][@class~="update"]')
         end
       end
@@ -292,15 +311,17 @@
           end
 
           it 'should render an input with default I18n-localized label (fallback)' do
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
+            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
             output_buffer.should have_tag('li.commit input[@value="Save Post"][@class~="update"]')
           end
         end
 
         describe 'when I18n-localized label is provided' do
           before do
+            ::I18n.backend.reload!
             ::I18n.backend.store_translations :en,
               :formtastic => {
                   :actions => {
@@ -323,16 +344,18 @@
                      }
                    }
                 }
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
+            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save Post"][@class~="update"]})
           end
 
           it 'should render an input with anoptional localized label (I18n) - if first is not set' do
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
+            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save"][@class~="update"]})
             ::I18n.backend.store_translations :en, :formtastic => {}
           end
@@ -345,16 +368,31 @@
   describe 'when the model is two words' do
     before do
       output_buffer = ''
-      class ::UserPost; def id; end; def self.human_name; "Userpost"; end; end # Rails does crappy human_name
+      class ::UserPost
+        extend ActiveModel::Naming if defined?(ActiveModel::Naming)
+        include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
+
+        def id
+        end
+        
+        def persisted?
+        end
+        
+        # Rails does crappy human_name
+        def self.human_name
+          "User post"
+        end
+      end
       @new_user_post = ::UserPost.new
       
       @new_user_post.stub!(:new_record?).and_return(true)
-      semantic_form_for(@new_user_post, :url => '') do |builder|
+      @form = semantic_form_for(@new_user_post, :url => '') do |builder|
         concat(builder.commit_button())
       end
     end
     
     it "should render the string as the value of the button" do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('li input[@value="Create User post"]')
     end
     
diff --git a/spec/custom_macros.rb b/spec/custom_macros.rb
index 589753d6f..2b4702f21 100644
--- a/spec/custom_macros.rb
+++ b/spec/custom_macros.rb
@@ -8,66 +8,77 @@ module ClassMethods
     
     def it_should_have_input_wrapper_with_class(class_name)
       it "should have input wrapper with class '#{class_name}'" do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li.#{class_name}") 
       end
     end
     
     def it_should_have_input_wrapper_with_id(id_string)
       it "should have input wrapper with id '#{id_string}'" do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li##{id_string}") 
       end
     end
     
     def it_should_not_have_a_label
       it "should not have a label" do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should_not have_tag("form li label") 
       end
     end
     
     def it_should_have_a_nested_fieldset
       it "should have a nested_fieldset" do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li fieldset") 
       end
     end
     
     def it_should_have_label_with_text(string_or_regex)
       it "should have a label with text '#{string_or_regex}'" do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li label", string_or_regex) 
       end
     end
     
     def it_should_have_label_for(element_id)
       it "should have a label for ##{element_id}" do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li label[@for='#{element_id}']")
       end
     end
     
     def it_should_have_input_with_id(element_id)
       it "should have an input with id '#{element_id}'" do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li input##{element_id}")
       end
     end
     
     def it_should_have_input_with_type(input_type)
       it "should have a #{input_type} input" do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li input[@type=\"#{input_type}\"]")
       end
     end
     
     def it_should_have_input_with_name(name)
       it "should have an input named #{name}" do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li input[@name=\"#{name}\"]")
       end
     end
     
     def it_should_have_textarea_with_name(name)
       it "should have an input named #{name}" do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li textarea[@name=\"#{name}\"]")
       end
     end
     
     def it_should_have_textarea_with_id(element_id)
       it "should have an input with id '#{element_id}'" do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li textarea##{element_id}")
       end
     end
@@ -76,27 +87,30 @@ def it_should_use_default_text_field_size_when_method_has_no_database_column(as)
       it 'should use default_text_field_size when method has no database column' do
         @new_post.stub!(:column_for_attribute).and_return(nil) # Return a nil column
         
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as))
         end
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li input[@size='#{Formtastic::SemanticFormBuilder.default_text_field_size}']")
       end
     end
     
     def it_should_apply_custom_input_attributes_when_input_html_provided(as)
       it 'it should apply custom input attributes when input_html provided' do
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as, :input_html => { :class => 'myclass' }))
         end
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li input.myclass")
       end
     end
     
     def it_should_apply_custom_for_to_label_when_input_html_id_provided(as)
       it 'it should apply custom for to label when input_html :id provided' do
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as, :input_html => { :id => 'myid' }))
         end
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form li label[@for="myid"]')
       end
     end
@@ -104,6 +118,7 @@ def it_should_apply_custom_for_to_label_when_input_html_id_provided(as)
     def it_should_have_maxlength_matching_column_limit
       it 'should have a maxlength matching column limit' do
         @new_post.column_for_attribute(:title).limit.should == 50
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li input[@maxlength='50']")
       end
     end
@@ -113,10 +128,11 @@ def it_should_use_default_text_field_size_for_columns_longer_than_default_text_f
         default_size = Formtastic::SemanticFormBuilder.default_text_field_size
         @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => as, :limit => default_size * 2))
 
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as))
         end
 
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li input[@size='#{default_size}']")
       end
     end
@@ -126,10 +142,11 @@ def it_should_use_column_size_for_columns_shorter_than_default_text_field_size(a
         column_limit_shorted_than_default = 1
         @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => as, :limit => column_limit_shorted_than_default))
 
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as))
         end
 
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li input[@size='#{column_limit_shorted_than_default}']")
       end
     end
@@ -144,72 +161,82 @@ def it_should_apply_error_logic_for_input_type(type)
         end
 
         it 'should apply an errors class to the list item' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
           end
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag('form li.error')
         end
 
         it 'should not wrap the input with the Rails default error wrapping' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
           end
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should_not have_tag('div.fieldWithErrors')
         end
 
         it 'should render a paragraph for the errors' do
           ::Formtastic::SemanticFormBuilder.inline_errors = :sentence
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
           end
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag('form li.error p.inline-errors')
         end
 
         it 'should not display an error list' do
           ::Formtastic::SemanticFormBuilder.inline_errors = :list
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
           end
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag('form li.error ul.errors')
         end
       end
 
       describe 'when there are no errors on the object for this method' do
         before do
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
           end
         end
 
         it 'should not apply an errors class to the list item' do
+          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should_not have_tag('form li.error')
         end
 
         it 'should not render a paragraph for the errors' do
+          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should_not have_tag('form li.error p.inline-errors')
         end
 
         it 'should not display an error list' do
+          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should_not have_tag('form li.error ul.errors')
         end
       end
 
       describe 'when no object is provided' do
         before do
-          semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          @form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
             concat(builder.input(:title, :as => type))
           end
         end
 
         it 'should not apply an errors class to the list item' do
+          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should_not have_tag('form li.error')
         end
 
         it 'should not render a paragraph for the errors' do
+          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should_not have_tag('form li.error p.inline-errors')
         end
 
         it 'should not display an error list' do
+          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should_not have_tag('form li.error ul.errors')
         end
       end
@@ -218,7 +245,7 @@ def it_should_apply_error_logic_for_input_type(type)
     def it_should_call_find_on_association_class_when_no_collection_is_provided(as)
       it "should call find on the association class when no collection is provided" do
         ::Author.should_receive(:find)
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:author, :as => as))
         end
       end
@@ -240,9 +267,10 @@ def it_should_use_the_collection_when_provided(as, countable)
         end
 
         it 'should use the provided collection' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:author, :as => as, :collection => @authors))
           end
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag("form li.#{as} #{countable}", :count => @authors.size + (as == :select ? 1 : 0))
         end
 
@@ -252,9 +280,10 @@ def it_should_use_the_collection_when_provided(as, countable)
           end
 
           it "should use the string as the label text and value for each #{countable}" do
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
             end
+            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
 
             @categories.each do |value|
               output_buffer.should have_tag("form li.#{as}", /#{value}/)
@@ -265,11 +294,13 @@ def it_should_use_the_collection_when_provided(as, countable)
           if as == :radio
             it 'should generate a sanitized label for attribute' do
               @bob.stub!(:category_name).and_return(@categories)
-              semantic_form_for(@new_post) do |builder|
-                builder.semantic_fields_for(@bob) do |bob_builder|
+              form = semantic_form_for(@new_post) do |builder|
+                fields = builder.semantic_fields_for(@bob) do |bob_builder|
                   concat(bob_builder.input(:category_name, :as => as, :collection => @categories))
                 end
+                concat(fields)
               end
+              output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
               output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_general']")
               output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_design']")
               output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_development']")
@@ -284,9 +315,10 @@ def it_should_use_the_collection_when_provided(as, countable)
           end
 
           it "should use the key as the label text and the hash value as the value attribute for each #{countable}" do
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
             end
+            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
 
             @categories.each do |label, value|
               output_buffer.should have_tag("form li.#{as}", /#{label}/)
@@ -301,9 +333,10 @@ def it_should_use_the_collection_when_provided(as, countable)
           end
 
           it "should use the first value as the label text and the last value as the value attribute for #{countable}" do
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
             end
+            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
 
             @categories.each do |text, value|
               label = as == :select ? :option : :label
@@ -321,9 +354,10 @@ def it_should_use_the_collection_when_provided(as, countable)
             end
         
             it "should use the first value as the label text and the last value as the value attribute for #{countable}" do
-              semantic_form_for(@new_post) do |builder|
+              form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:category_name, :as => as, :collection => @choices))
               end
+              output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
               
               output_buffer.should have_tag("form li.#{as} #{countable}#post_category_name_true")
               output_buffer.should have_tag("form li.#{as} #{countable}#post_category_name_false")
@@ -337,9 +371,10 @@ def it_should_use_the_collection_when_provided(as, countable)
           end
 
           it "should use the symbol as the label text and value for each #{countable}" do
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
             end
+            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
 
             @categories.each do |value|
               label = as == :select ? :option : :label
@@ -355,9 +390,10 @@ def it_should_use_the_collection_when_provided(as, countable)
           end
 
           it "should use the key as the label text and the hash value as the value attribute for each #{countable}" do
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
             end
+            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
 
             @categories.each do |label, value|
               output_buffer.should have_tag("form li.#{as}", /#{label}/)
@@ -371,12 +407,13 @@ def it_should_use_the_collection_when_provided(as, countable)
           
           describe 'as a symbol' do
             before do
-              semantic_form_for(@new_post) do |builder|
+              @form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:author, :as => as, :label_method => :login))
               end
             end
 
             it 'should have options with text content from the specified method' do
+              output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
               ::Author.find(:all).each do |author|
                 output_buffer.should have_tag("form li.#{as}", /#{author.login}/)
               end
@@ -385,12 +422,13 @@ def it_should_use_the_collection_when_provided(as, countable)
           
           describe 'as a proc' do
             before do
-              semantic_form_for(@new_post) do |builder|
+              @form  = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:author, :as => as, :label_method => Proc.new {|a| a.login.reverse }))
               end
             end
             
             it 'should have options with the proc applied to each' do
+              output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
               ::Author.find(:all).each do |author|
                 output_buffer.should have_tag("form li.#{as}", /#{author.login.reverse}/)
               end
@@ -407,12 +445,13 @@ def it_should_use_the_collection_when_provided(as, countable)
                 @fred.stub!(:respond_to?).and_return { |m| m.to_s == label_method }
                 ::Author.find(:all).each { |a| a.stub!(label_method).and_return('The Label Text') }
 
-                semantic_form_for(@new_post) do |builder|
+                @form = semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:author, :as => as))
                 end
               end
 
               it "should render the options with #{label_method} as the label" do
+                output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
                 ::Author.find(:all).each do |author|
                   output_buffer.should have_tag("form li.#{as}", /The Label Text/)
                 end
@@ -426,12 +465,13 @@ def it_should_use_the_collection_when_provided(as, countable)
           
           describe 'as a symbol' do
             before do
-              semantic_form_for(@new_post) do |builder|
+              @form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:author, :as => as, :value_method => :login))
               end
             end
             
             it 'should have options with values from specified method' do
+              output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
               ::Author.find(:all).each do |author|
                 output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login}']")
               end
@@ -440,12 +480,13 @@ def it_should_use_the_collection_when_provided(as, countable)
           
           describe 'as a proc' do
             before do
-              semantic_form_for(@new_post) do |builder|
+              @form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:author, :as => as, :value_method => Proc.new {|a| a.login.reverse }))
               end
             end
 
             it 'should have options with the proc applied to each value' do
+              output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
               ::Author.find(:all).each do |author|
                 output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login.reverse}']")
               end
diff --git a/spec/form_helper_spec.rb b/spec/form_helper_spec.rb
index ef48e51b4..075585e46 100644
--- a/spec/form_helper_spec.rb
+++ b/spec/form_helper_spec.rb
@@ -19,48 +19,56 @@
     end
 
     it 'adds a class of "formtastic" to the generated form' do
-      semantic_form_for(:post, ::Post.new, :url => '/hello') do |builder|
+      form = semantic_form_for(:post, ::Post.new, :url => '/hello') do |builder|
       end
+      output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag("form.formtastic")
     end
 
     it 'adds class matching the object name to the generated form when a symbol is provided' do
-      semantic_form_for(:post, ::Post.new, :url => '/hello') do |builder|
+      form = semantic_form_for(:post, ::Post.new, :url => '/hello') do |builder|
       end
+      output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag("form.post")
 
-      semantic_form_for(:project, :url => '/hello') do |builder|
+      form = semantic_form_for(:project, :url => '/hello') do |builder|
       end
+      output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag("form.project")
     end
 
     it 'adds class matching the object\'s class to the generated form when an object is provided' do
-      semantic_form_for(@new_post) do |builder|
+      form = semantic_form_for(@new_post) do |builder|
       end
+      output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag("form.post")
     end
 
     it 'adds a namespaced class to the generated form' do
-      semantic_form_for(::Namespaced::Post.new, :url => '/hello') do |builder|
+      form = semantic_form_for(::Namespaced::Post.new, :url => '/hello') do |builder|
       end
+      output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag("form.namespaced_post")
     end
 
     describe 'allows :html options' do
       before(:each) do
-        semantic_form_for(:post, ::Post.new, :url => '/hello', :html => { :id => "something-special", :class => "something-extra", :multipart => true }) do |builder|
+         @form = semantic_form_for(:post, ::Post.new, :url => '/hello', :html => { :id => "something-special", :class => "something-extra", :multipart => true }) do |builder|
         end
       end
 
       it 'to add a id of "something-special" to generated form' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form#something-special")
       end
 
       it 'to add a class of "something-extra" to generated form' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form.something-extra")
       end
 
       it 'to add enctype="multipart/form-data"' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form[@enctype="multipart/form-data"]')
       end
     end
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index 10c3da907..e2a32e474 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -108,16 +108,18 @@
     end
     
     it "should be able to translate with namespaced object" do
-      semantic_form_for(@new_post) do |builder|
+      form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:title))
       end
+      output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag("form label", /Hello post!/)
     end
     
     it "should be able to translate without form-object" do
-      semantic_form_for(:project, :url => 'http://test.host') do |builder|
+      form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:title))
       end
+      output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag("form label", /Hello project!/)
     end
     
diff --git a/spec/include_blank_spec.rb b/spec/include_blank_spec.rb
index 29174eba2..dee68e524 100644
--- a/spec/include_blank_spec.rb
+++ b/spec/include_blank_spec.rb
@@ -24,9 +24,10 @@
     it 'blank value should be included if the default value specified in config is true' do
       ::Formtastic::SemanticFormBuilder.include_blank_for_select_by_default = true
       @select_input_types.each do |as, attribute|
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as))
         end
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li select option[@value='']", "")
       end
     end
@@ -34,9 +35,10 @@
     it 'blank value should not be included if the default value specified in config is false' do
       ::Formtastic::SemanticFormBuilder.include_blank_for_select_by_default = false
       @select_input_types.each do |as, attribute|
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as))
         end
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should_not have_tag("form li select option[@value='']", "")
       end
     end
@@ -49,9 +51,10 @@
   describe 'when :include_blank is set to false' do
     it 'should not have a blank option' do
       @select_input_types.each do |as, attribute|
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as, :include_blank => false))
         end
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should_not have_tag("form li select option[@value='']", "")
       end
     end
@@ -60,9 +63,10 @@
   describe 'when :include_blank => true is set' do
     it 'should have a blank select option' do
       @select_input_types.each do |as, attribute|
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as, :include_blank => true))
         end
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li select option[@value='']", "")
       end
     end
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 07d986e77..da224a0ed 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -38,7 +38,7 @@
 
     it 'should require the first argument (the method on form\'s object)' do
       lambda {
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           concat(builder.input()) # no args passed in at all
         end
       }.should raise_error(ArgumentError)
@@ -59,17 +59,19 @@
         end
 
         it 'should set a "required" class' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => true))
           end
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should_not have_tag('form li.optional')
           output_buffer.should have_tag('form li.required')
         end
 
         it 'should append the "required" string to the label' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => true))
           end
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag('form li.required label', /#{@new_string}$/)
         end
 
@@ -87,17 +89,19 @@
         end
 
         it 'should set an "optional" class' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => false))
           end
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should_not have_tag('form li.required')
           output_buffer.should have_tag('form li.optional')
         end
 
         it 'should append the "optional" string to the label' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => false))
           end
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag('form li.optional label', /#{@string}$/)
         end
 
@@ -111,9 +115,10 @@
             ::Formtastic::SemanticFormBuilder.all_fields_required_by_default.should == true
             ::Formtastic::SemanticFormBuilder.all_fields_required_by_default = false
 
-            semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+            form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
               concat(builder.input(:title))
             end
+            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
             output_buffer.should_not have_tag('form li.required')
             output_buffer.should have_tag('form li.optional')
 
@@ -139,10 +144,11 @@
                   mock('MacroReflection', :macro => :validates_presence_of, :name => :body, :options => {:if => true})
                 ])
 
-                semantic_form_for(@new_post) do |builder|
+                form = semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:title))
                   concat(builder.input(:body))
                 end
+                output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
                 output_buffer.should have_tag('form li.required')
                 output_buffer.should_not have_tag('form li.optional')
               end
@@ -194,9 +200,11 @@ def should_be_required(options)
                 mock('MacroReflection', :macro => :validates_presence_of, :name => :body, :options => options[:options])
               ])
               
-              semantic_form_for(@new_post) do |builder|
+              form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:body))
               end
+
+              output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
               
               if options[:required]
                 output_buffer.should_not have_tag('form li.optional')
@@ -213,9 +221,10 @@ def should_be_required(options)
               end
 
               it 'should not be required' do
-                semantic_form_for(@new_post) do |builder|
+                form = semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:title))
                 end
+                output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
                 output_buffer.should_not have_tag('form li.required')
                 output_buffer.should have_tag('form li.optional')
               end
@@ -229,9 +238,10 @@ def should_be_required(options)
               ::Formtastic::SemanticFormBuilder.all_fields_required_by_default.should == true
               ::Formtastic::SemanticFormBuilder.all_fields_required_by_default = false
 
-              semantic_form_for(@new_post) do |builder|
+              form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title))
               end
+              output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
               output_buffer.should_not have_tag('form li.required')
               output_buffer.should have_tag('form li.optional')
 
@@ -251,18 +261,20 @@ def should_be_required(options)
       describe 'when not provided' do
 
         it 'should default to a string for forms without objects unless column is password' do
-          semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
             concat(builder.input(:anything))
           end
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag('form li.string')
         end
 
         it 'should default to password for forms without objects if column is password' do
-          semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
             concat(builder.input(:password))
             concat(builder.input(:password_confirmation))
             concat(builder.input(:confirm_password))
           end
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag('form li.password', :count => 3)
         end
 
@@ -337,7 +349,8 @@ def should_be_required(options)
               column = mock('column')
 
               ::Formtastic::SemanticFormBuilder.file_methods.each do |test|
-                column.stub!(:respond_to?).with(test).and_return(method == test)
+                ### TODO: Check if this is ok
+                column.stub!(method).with(test).and_return(method == test)
               end
 
               @new_post.should_receive(method).and_return(column)
@@ -377,23 +390,27 @@ def should_be_required(options)
       
       describe 'when provided' do
         it 'should be passed down to the label tag' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :label => "Kustom"))
           end
+
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag("form li label", /Kustom/)
         end
 
         it 'should not generate a label if false' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :label => false))
           end
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should_not have_tag("form li label")
         end
 
         it 'should be dupped if frozen' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :label => "Kustom".freeze))
           end
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag("form li label", /Kustom/)
         end
       end
@@ -408,10 +425,11 @@ def should_be_required(options)
                   @new_post.stub!(:meta_description)
                   @new_post.class.should_receive(:human_attribute_name).with('meta_description').and_return(@localized_label_text)
                 
-                  semantic_form_for(@new_post) do |builder|
+                  form = semantic_form_for(@new_post) do |builder|
                     concat(builder.input(:meta_description))
                   end
                 
+                  output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
                   output_buffer.should have_tag('form li label', @localized_label_text)
                 end
               end
@@ -424,10 +442,11 @@ def should_be_required(options)
             it 'should default the humanized method name, passing it down to the label tag' do
               ::Formtastic::SemanticFormBuilder.label_str_method = :humanize
 
-              semantic_form_for(:project, :url => 'http://test.host') do |builder|
+              form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
                 concat(builder.input(:meta_description))
               end
 
+              output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
               output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
             end
           end
@@ -437,10 +456,11 @@ def should_be_required(options)
               @new_post.stub!(:meta_description) # a two word method name
               @new_post.class.should_receive(:human_attribute_name).with('meta_description').and_return('meta_description'.humanize)
 
-              semantic_form_for(@new_post) do |builder|
+              form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:meta_description))
               end
 
+              output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
               output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
             end
           end
@@ -450,10 +470,11 @@ def should_be_required(options)
               with_config :label_str_method, :capitalize do
                 @new_post.stub!(:meta_description)
             
-                semantic_form_for(@new_post) do |builder|
+                form = semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:meta_description))
                 end
             
+                output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
                 output_buffer.should have_tag("form li label", /#{'meta_description'.capitalize}/)
               end
             end
@@ -479,10 +500,11 @@ def should_be_required(options)
           end
 
           it 'should render a label with localized label (I18n)' do
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:title, :label => true))
               concat(builder.input(:published, :as => :boolean, :label => true))
             end
+            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
             output_buffer.should have_tag('form li label', @localized_label_text)
           end
 
@@ -496,10 +518,11 @@ def should_be_required(options)
                      }
                    }
                 }
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:title, :label => true))
               concat(builder.input(:published, :as => :boolean, :label => true))
             end
+            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
             output_buffer.should have_tag('form li label', @default_localized_label_text)
           end
         end
@@ -512,9 +535,10 @@ def should_be_required(options)
       describe 'when provided' do
         it 'should be passed down to the paragraph tag' do
           hint_text = "this is the title of the post"
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :hint => hint_text))
           end
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag("form li p.inline-hints", hint_text)
         end
       end
@@ -528,43 +552,47 @@ def should_be_required(options)
               :formtastic => {
                   :hints => {
                     :title => @default_localized_hint_text,
-                    :post => {
-                      :title => @localized_hint_text
-                     }
                    }
                 }
             ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
           end
-          
+
+          after do
+            ::I18n.backend.reload!
+          end
+
           describe 'when provided value (hint value) is set to TRUE' do
             it 'should render a hint paragraph containing a localized hint (I18n)' do
-              semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:title, :hint => true))
-              end
-              output_buffer.should have_tag('form li p.inline-hints', @localized_hint_text)
-            end
-            
-            it 'should render a hint paragraph containing an optional localized hint (I18n) if first is not set' do
               ::I18n.backend.store_translations :en,
               :formtastic => {
                   :hints => {
                     :post => {
-                      :title => nil
+                      :title => @localized_hint_text
                      }
                    }
                 }
-              semantic_form_for(@new_post) do |builder|
+              form = semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title, :hint => true))
+              end
+              output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+              output_buffer.should have_tag('form li p.inline-hints', @localized_hint_text)
+            end
+            
+            it 'should render a hint paragraph containing an optional localized hint (I18n) if first is not set' do
+              form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => true))
               end
+              output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
               output_buffer.should have_tag('form li p.inline-hints', @default_localized_hint_text)
             end
           end
           
           describe 'when provided value (label value) is set to FALSE' do
             it 'should not render a hint paragraph' do
-              semantic_form_for(@new_post) do |builder|
+              form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => false))
               end
+              output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
               output_buffer.should_not have_tag('form li p.inline-hints', @localized_hint_text)
             end
           end
@@ -572,9 +600,10 @@ def should_be_required(options)
         
         describe 'when localized hint (I18n) is not provided' do
           it 'should not render a hint paragraph' do
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:title))
             end
+            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
             output_buffer.should_not have_tag('form li p.inline-hints')
           end
         end
@@ -586,25 +615,28 @@ def should_be_required(options)
 
       describe 'when provided' do
         it 'should be passed down to the li tag' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :wrapper_html => {:id => :another_id}))
           end
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag("form li#another_id")
         end
 
         it 'should append given classes to li default classes' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :wrapper_html => {:class => :another_class}, :required => true))
           end
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag("form li.string")
           output_buffer.should have_tag("form li.required")
           output_buffer.should have_tag("form li.another_class")
         end
 
         it 'should allow classes to be an array' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :wrapper_html => {:class => [ :my_class, :another_class ]}))
           end
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag("form li.string")
           output_buffer.should have_tag("form li.my_class")
           output_buffer.should have_tag("form li.another_class")
@@ -613,9 +645,10 @@ def should_be_required(options)
 
       describe 'when not provided' do
         it 'should use default id and class' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title))
           end
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag("form li#post_title_input")
           output_buffer.should have_tag("form li.string")
         end
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index 138ee5d87..cd20f8561 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -9,16 +9,17 @@
     @output_buffer = ''
     mock_everything
     
-    semantic_form_for(@new_post) do |builder|
+    @form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean))
     end
   end
-    
+   
   it_should_have_input_wrapper_with_class("boolean")
   it_should_have_input_wrapper_with_id("post_allow_comments_input")
   it_should_apply_error_logic_for_input_type(:boolean)
 
   it 'should generate a label containing the input' do
+    output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
     output_buffer.should have_tag('form li label', :count => 1)
     output_buffer.should have_tag('form li label[@for="post_allow_comments"]')
     output_buffer.should have_tag('form li label', /Allow comments/)
@@ -26,6 +27,7 @@
   end
 
   it 'should generate a checkbox input' do
+    output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
     output_buffer.should have_tag('form li label input')
     output_buffer.should have_tag('form li label input#post_allow_comments')
     output_buffer.should have_tag('form li label input[@type="checkbox"]')
@@ -34,19 +36,22 @@
   end
 
   it 'should allow checked and unchecked values to be sent' do
-    semantic_form_for(@new_post) do |builder|
+    form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'checked', :unchecked_value => 'unchecked'))
     end
 
+    output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
     output_buffer.should have_tag('form li label input[@type="checkbox"][@value="checked"]')
     output_buffer.should have_tag('form li label input[@type="hidden"][@value="unchecked"]')
   end
 
   it 'should generate a label and a checkbox even if no object is given' do
-    semantic_form_for(:project, :url => 'http://test.host') do |builder|
+    form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
       concat(builder.input(:allow_comments, :as => :boolean))
     end
 
+    output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+
     output_buffer.should have_tag('form li label[@for="project_allow_comments"]')
     output_buffer.should have_tag('form li label', /Allow comments/)
     output_buffer.should have_tag('form li label input[@type="checkbox"]')
@@ -66,13 +71,14 @@
         @new_post.stub!(:allow_comments).and_return(true)
 
         with_deprecation_silenced do
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:allow_comments, :as => :boolean, :selected => false))
           end
         end
       end
 
       it 'should not be selected' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should_not have_tag("form li label input[@type='checkbox'][@checked='checked']")
       end
     end
@@ -82,13 +88,14 @@
         @new_post.stub!(:allow_comments).and_return(false)
         
         with_deprecation_silenced do
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:allow_comments, :as => :boolean, :selected => true))
           end
         end
       end
 
       it 'should be selected' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li label input[@type='checkbox'][@checked='checked']")
       end
     end
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index f0017bdf9..1e29ca3cf 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -10,7 +10,7 @@
       @output_buffer = ''
       mock_everything
       
-      semantic_form_for(@fred) do |builder|
+      @form = semantic_form_for(@fred) do |builder|
         concat(builder.input(:posts, :as => :check_boxes, :value_as_class => true))
       end
     end
@@ -23,31 +23,37 @@
     it_should_use_the_collection_when_provided(:check_boxes, 'input[@type="checkbox"]')
     
     it 'should generate a legend containing a label with text for the input' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li fieldset legend.label label')
       output_buffer.should have_tag('form li fieldset legend.label label', /Posts/)
     end
     
     it 'should not link the label within the legend to any input' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should_not have_tag('form li fieldset legend label[@for^="author_post_ids_"]')
     end
     
 
     it 'should generate an ordered list with a list item for each choice' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li fieldset ol')
       output_buffer.should have_tag('form li fieldset ol li', :count => ::Post.find(:all).size)
     end
 
     it 'should have one option with a "checked" attribute' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li input[@checked]', :count => 1)
     end
 
     it 'should generate hidden inputs with default value blank' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag("form li fieldset ol li label input[@type='hidden'][@value='']", :count => ::Post.find(:all).size)
     end
 
     describe "each choice" do
 
       it 'should contain a label for the radio input with a nested input and label text' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         ::Post.find(:all).each do |post|
           output_buffer.should have_tag('form li fieldset ol li label', /#{post.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='author_post_ids_#{post.id}']")
@@ -55,12 +61,14 @@
       end
 
       it 'should use values as li.class when value_as_class is true' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         ::Post.find(:all).each do |post|
           output_buffer.should have_tag("form li fieldset ol li.post_#{post.id} label")
         end
       end
 
       it 'should have a checkbox input for each post' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         ::Post.find(:all).each do |post|
           output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@name='author[post_ids][]']", :count => 2)
@@ -69,6 +77,7 @@
 
       it "should mark input as checked if it's the the existing choice" do
         ::Post.find(:all).include?(@fred.posts.first).should be_true
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
       end
     end
@@ -76,20 +85,23 @@
     describe 'and no object is given' do
       before(:each) do
         output_buffer.replace ''
-        semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        @form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:author_id, :as => :check_boxes, :collection => ::Author.find(:all)))
         end
       end
 
       it 'should generate a fieldset with legend' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form li fieldset legend', /Author/)
       end
 
       it 'shold generate an li tag for each item in the collection' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form li fieldset ol li', :count => ::Author.find(:all).size)
       end
 
       it 'should generate labels for each item' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         ::Author.find(:all).each do |author|
           output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='project_author_id_#{author.id}']")
@@ -97,6 +109,7 @@
       end
 
       it 'should generate inputs for each item' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         ::Author.find(:all).each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#project_author_id_#{author.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@type='checkbox']")
@@ -116,13 +129,14 @@
           @new_post.stub!(:author_ids).and_return(nil)
 
           with_deprecation_silenced do
-            semantic_form_for(@new_post) do |builder|
+            @form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:authors, :as => :check_boxes, :selected => nil))
             end
           end
         end
 
         it 'should not have any selected item(s)' do
+          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should_not have_tag("form li fieldset ol li label input[@checked='checked']")
         end
       end
@@ -132,13 +146,14 @@
           @new_post.stub!(:author_ids).and_return(nil)
 
           with_deprecation_silenced do
-            semantic_form_for(@new_post) do |builder|
+            @form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:authors, :as => :check_boxes, :selected => @fred.id))
             end
           end
         end
 
         it "should have one item selected; the specified one" do
+          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']", :count => 1)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
           output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked'][@value='#{@fred.id}']")
@@ -150,13 +165,14 @@
           @new_post.stub!(:author_ids).and_return(nil)
           
           with_deprecation_silenced do
-            semantic_form_for(@new_post) do |builder|
+            @form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:authors, :as => :check_boxes, :selected => [@bob.id, @fred.id]))
             end
           end
         end
 
         it "should have multiple items selected; the specified ones" do
+          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']", :count => 2)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@bob.id}']", /bob/i)
           output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked'][@value='#{@bob.id}']")
@@ -186,12 +202,13 @@
         before do
           @new_post.stub!(:author_ids).and_return(nil)
 
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:authors, :as => :check_boxes, :disabled => nil))
           end
         end
 
         it 'should not have any disabled item(s)' do
+          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should_not have_tag("form li fieldset ol li label input[@disabled='disabled']")
         end
       end
@@ -200,12 +217,13 @@
         before do
           @new_post.stub!(:author_ids).and_return(nil)
 
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:authors, :as => :check_boxes, :disabled => @fred.id))
           end
         end
 
         it "should have one item disabled; the specified one" do
+          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 1)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@fred.id}']")
@@ -216,12 +234,13 @@
         before do
           @new_post.stub!(:author_ids).and_return(nil)
 
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:authors, :as => :check_boxes, :disabled => [@bob.id, @fred.id]))
           end
         end
 
         it "should have multiple items disabled; the specified ones" do
+          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 2)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@bob.id}']", /bob/i)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@bob.id}']")
diff --git a/spec/inputs/country_input_spec.rb b/spec/inputs/country_input_spec.rb
index fa9e9f6b8..ba79bc9a4 100644
--- a/spec/inputs/country_input_spec.rb
+++ b/spec/inputs/country_input_spec.rb
@@ -25,8 +25,8 @@
   describe "when country_select is available as a helper (from a plugin)" do
     
     before do
-      semantic_form_for(@new_post) do |builder|
-        builder.stub!(:country_select).and_return("<select><option>...</option></select>")
+      @form = semantic_form_for(@new_post) do |builder|
+        builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         concat(builder.input(:country, :as => :country))
       end
     end
@@ -38,12 +38,14 @@
     #it_should_apply_error_logic_for_input_type(:country)
 
     it 'should generate a label for the input' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li label')
       output_buffer.should have_tag('form li label[@for="post_country"]')
       output_buffer.should have_tag('form li label', /Country/)
     end
 
     it "should generate a select" do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag("form li select")
     end
     
diff --git a/spec/inputs/date_input_spec.rb b/spec/inputs/date_input_spec.rb
index 584a54591..7cc2a60f2 100644
--- a/spec/inputs/date_input_spec.rb
+++ b/spec/inputs/date_input_spec.rb
@@ -14,7 +14,7 @@
     
     before do
       output_buffer.replace ''
-      semantic_form_for(@new_post) do |builder|
+      @form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:publish_at, :as => :date))
       end
     end
@@ -25,10 +25,12 @@
     it_should_apply_error_logic_for_input_type(:date)
     
     it 'should have a legend and label with the label text inside the fieldset' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li.date fieldset legend.label label', /Publish at/)
     end
     
     it 'should associate the legend label with the first select' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li.date fieldset legend.label')
       output_buffer.should have_tag('form li.date fieldset legend.label label')
       output_buffer.should have_tag('form li.date fieldset legend.label label[@for]')
@@ -36,11 +38,13 @@
     end
     
     it 'should have an ordered list of three items inside the fieldset' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li.date fieldset ol')
       output_buffer.should have_tag('form li.date fieldset ol li', :count => 3)
     end
     
     it 'should have three labels for year, month and day' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li.date fieldset ol li label', :count => 3)
       output_buffer.should have_tag('form li.date fieldset ol li label', /year/i)
       output_buffer.should have_tag('form li.date fieldset ol li label', /month/i)
@@ -48,6 +52,7 @@
     end
     
     it 'should have three selects for year, month and day' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li.date fieldset ol li select', :count => 3)
     end
   end
@@ -59,10 +64,11 @@
         output_buffer.replace ''
         @new_post.stub!(:created_at => Time.mktime(2012))
         with_deprecation_silenced do
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:created_at, :as => :date, :selected => Time.mktime(1999)))
           end
         end
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='2012'][@selected]", :count => 1)
       end
@@ -73,10 +79,11 @@
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
         with_deprecation_silenced do
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:created_at, :as => :date, :selected => Date.new(1999)))
           end
         end
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='1999'][@selected]", :count => 1)
       end
@@ -85,10 +92,11 @@
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
         with_deprecation_silenced do
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:created_at, :as => :date, :selected => Time.mktime(1999)))
           end
         end
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='1999'][@selected]", :count => 1)
       end
@@ -97,19 +105,21 @@
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
         with_deprecation_silenced do
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:created_at, :as => :date, :selected => nil))
           end
         end
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should_not have_tag("form li ol li select#post_created_at_1i option[@selected]")
       end
       
       it "should select Time.now if a :selected is not provided" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :date))
         end
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='#{Time.now.year}'][@selected]", :count => 1)
         
@@ -123,9 +133,10 @@
     fields.each do |field|
       it "should replace the #{field} label with the specified text if :labels[:#{field}] is set" do
         output_buffer.replace ''
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :date, :labels => { field => "another #{field} label" }))
         end
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form li.date fieldset ol li label', :count => fields.length)
         fields.each do |f|
           output_buffer.should have_tag('form li.date fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
@@ -134,9 +145,10 @@
 
       it "should not display the label for the #{field} field when :labels[:#{field}] is blank" do
         output_buffer.replace ''
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :date, :labels => { field => "" }))
         end
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form li.date fieldset ol li label', :count => fields.length-1)
         fields.each do |f|
           output_buffer.should have_tag('form li.date fieldset ol li label', /#{f}/i) unless field == f
diff --git a/spec/inputs/datetime_input_spec.rb b/spec/inputs/datetime_input_spec.rb
index dcc982363..c7aa1d5c5 100644
--- a/spec/inputs/datetime_input_spec.rb
+++ b/spec/inputs/datetime_input_spec.rb
@@ -19,7 +19,7 @@
     
     before do
       output_buffer.replace ''
-      semantic_form_for(@new_post) do |builder|
+      @form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:publish_at, :as => :datetime))
       end
     end
@@ -30,19 +30,23 @@
     it_should_apply_error_logic_for_input_type(:datetime)
     
     it 'should have a legend and label with the label text inside the fieldset' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li.datetime fieldset legend.label label', /Publish at/)
     end
     
     it 'should associate the legend label with the first select' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li.datetime fieldset legend.label label[@for="post_publish_at_1i"]')
     end
     
     it 'should have an ordered list of five items inside the fieldset' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li.datetime fieldset ol')
       output_buffer.should have_tag('form li.datetime fieldset ol li', :count => 5)
     end
     
     it 'should have five labels for year, month, day, hour and minute' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => 5)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /year/i)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /month/i)
@@ -52,15 +56,18 @@
     end
     
     it 'should have five selects for year, month, day, hour and minute' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li.datetime fieldset ol li select', :count => 5)
     end
     
     it 'should generate a sanitized label and matching ids for attribute' do
-      semantic_form_for(@new_post) do |builder|
-        builder.semantic_fields_for(@bob, :index => 10) do |bob_builder|
+      form = semantic_form_for(@new_post) do |builder|
+        fields = builder.semantic_fields_for(@bob, :index => 10) do |bob_builder|
           concat(bob_builder.input(:created_at, :as => :datetime))
         end
+        concat(fields)
       end
+      output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
     
       1.upto(5) do |i|
         output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_10_created_at_#{i}i']")
@@ -72,10 +79,11 @@
   describe 'when :discard_input => true is set' do
     it 'should use default attribute value when it is not nil' do
       @new_post.stub!(:publish_at).and_return(Date.new(2007,12,27))
-      semantic_form_for(@new_post) do |builder|
+      form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:publish_at, :as => :datetime, :discard_day => true))
       end
   
+      output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag("form li input[@type='hidden'][@value='27']")
     end
   end
@@ -121,7 +129,7 @@
         :hour => 'The Hour', :minute => 'The Minute'
       }}
       output_buffer.replace ''
-      semantic_form_for(@new_post) do |builder|
+      @form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:publish_at, :as => :datetime))
       end
     end
@@ -134,6 +142,7 @@
     end
   
     it 'should have translated labels for year, month, day, hour and minute' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Year/)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Month/)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Day/)
@@ -145,20 +154,23 @@
   describe 'when no object is given' do
     before(:each) do
       output_buffer.replace ''
-      semantic_form_for(:project, :url => 'http://test.host') do |builder|
+      @form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:publish_at, :as => :datetime))
       end
     end
   
     it 'should have fieldset with legend - classified as a label' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li.datetime fieldset legend.label', /Publish at/)
     end
   
     it 'should have labels for each input' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => 5)
     end
   
     it 'should have selects for each inputs' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li.datetime fieldset ol li select', :count => 5)
     end
   end
@@ -170,10 +182,11 @@
         output_buffer.replace ''
         @new_post.stub!(:created_at => Time.mktime(2012))
         with_deprecation_silenced do 
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:created_at, :as => :datetime, :selected => Time.mktime(1999)))
           end
         end
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='2012'][@selected]", :count => 1)
       end
@@ -184,10 +197,11 @@
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
         with_deprecation_silenced do
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:created_at, :as => :datetime, :selected => Date.new(1999)))
           end
         end
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='1999'][@selected]", :count => 1)
       end
@@ -196,10 +210,11 @@
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
         with_deprecation_silenced do
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:created_at, :as => :datetime, :selected => Time.mktime(1999)))
           end
         end
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='1999'][@selected]", :count => 1)
       end
@@ -208,19 +223,21 @@
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
         with_deprecation_silenced do
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:created_at, :as => :datetime, :selected => nil))
           end
         end
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should_not have_tag("form li ol li select#post_created_at_1i option[@selected]")
       end
       
       it "should select Time.now if a :selected is not provided" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :datetime))
         end
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='#{Time.now.year}'][@selected]", :count => 1)
         
@@ -243,9 +260,10 @@
     fields.each do |field|
       it "should replace the #{field} label with the specified text if :labels[:#{field}] is set" do
         output_buffer.replace ''
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :datetime, :labels => { field => "another #{field} label" }))
         end
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => fields.length)
         fields.each do |f|
           output_buffer.should have_tag('form li.datetime fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
@@ -254,9 +272,10 @@
   
       it "should not display the label for the #{field} field when :labels[:#{field}] is blank" do
         output_buffer.replace ''
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :datetime, :labels => { field => "" }))
         end
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => fields.length-1)
         fields.each do |f|
           output_buffer.should have_tag('form li.datetime fieldset ol li label', /#{f}/i) unless field == f
diff --git a/spec/inputs/file_input_spec.rb b/spec/inputs/file_input_spec.rb
index 035483595..0e7a8eb84 100644
--- a/spec/inputs/file_input_spec.rb
+++ b/spec/inputs/file_input_spec.rb
@@ -9,7 +9,7 @@
     @output_buffer = ''
     mock_everything
     
-    semantic_form_for(@new_post) do |builder|
+    @form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:body, :as => :file))
     end
   end
@@ -23,9 +23,10 @@
   it_should_apply_error_logic_for_input_type(:file)
 
   it 'should use input_html to style inputs' do
-    semantic_form_for(@new_post) do |builder|
+    form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :file, :input_html => { :class => 'myclass' }))
     end
+    output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
     output_buffer.should have_tag("form li input.myclass")
   end
 
diff --git a/spec/inputs/hidden_input_spec.rb b/spec/inputs/hidden_input_spec.rb
index c1f3b603a..1c16c5add 100644
--- a/spec/inputs/hidden_input_spec.rb
+++ b/spec/inputs/hidden_input_spec.rb
@@ -9,7 +9,7 @@
     @output_buffer = ''
     mock_everything
     
-    semantic_form_for(@new_post) do |builder|
+    @form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:secret, :as => :hidden))
       concat(builder.input(:author_id, :as => :hidden, :value => 99))
       concat(builder.input(:published, :as => :hidden, :input_html => {:value => true}))
@@ -21,17 +21,20 @@
   it_should_not_have_a_label
 
   it "should generate a input field" do
+    output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
     output_buffer.should have_tag("form li input#post_secret")
     output_buffer.should have_tag("form li input#post_secret[@type=\"hidden\"]")
     output_buffer.should have_tag("form li input#post_secret[@name=\"post[secret]\"]")
   end
   
   it "should pass any explicitly specified value - using :value" do
+    output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
     output_buffer.should have_tag("form li input#post_author_id[@type=\"hidden\"][@value=\"99\"]")
   end
   
   # Handle Formtastic :input_html options for consistency.
   it "should pass any explicitly specified value - using :input_html options" do
+    output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
     output_buffer.should have_tag("form li input#post_published[@type=\"hidden\"][@value=\"true\"]")
   end
   
@@ -40,19 +43,21 @@
     @errors.stub!(:[]).with(:secret).and_return(["foo", "bah"])
     @new_post.stub!(:errors).and_return(@errors)
     
-    semantic_form_for(@new_post) do |builder|
+    form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:secret, :as => :hidden))
     end
     
+    output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
     output_buffer.should_not have_tag("form li p.inline-errors")
     output_buffer.should_not have_tag("form li ul.errors")
   end
 
   it "should not render inline hints" do
-    semantic_form_for(@new_post) do |builder|
+    form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:secret, :as => :hidden, :hint => "all your base are belong to use"))
     end
 
+    output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
     output_buffer.should_not have_tag("form li p.inline-hints")
     output_buffer.should_not have_tag("form li ul.hints")
   end
diff --git a/spec/inputs/numeric_input_spec.rb b/spec/inputs/numeric_input_spec.rb
index 9eb5b7af7..d1e3ea56b 100644
--- a/spec/inputs/numeric_input_spec.rb
+++ b/spec/inputs/numeric_input_spec.rb
@@ -9,7 +9,7 @@
     @output_buffer = ''
     mock_everything
     
-    semantic_form_for(@new_post) do |builder|
+    @form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :numeric))
     end
   end
@@ -28,7 +28,7 @@
   
   describe "when no object is provided" do
     before do
-      semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+      @form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
         concat(builder.input(:title, :as => :numeric))
       end
     end
diff --git a/spec/inputs/password_input_spec.rb b/spec/inputs/password_input_spec.rb
index cfc37d0ee..dbd6a9961 100644
--- a/spec/inputs/password_input_spec.rb
+++ b/spec/inputs/password_input_spec.rb
@@ -9,7 +9,7 @@
     @output_buffer = ''
     mock_everything
     
-    semantic_form_for(@new_post) do |builder|
+    @form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :password))
     end
   end
@@ -31,7 +31,7 @@
   
   describe "when no object is provided" do
     before do
-      semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+      @form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
         concat(builder.input(:title, :as => :password))
       end
     end
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 8ba38e675..2f59a9867 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -12,7 +12,7 @@
 
   describe 'for belongs_to association' do
     before do
-      semantic_form_for(@new_post) do |builder|
+      @form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :radio, :value_as_class => true))
       end
     end
@@ -24,26 +24,31 @@
     it_should_use_the_collection_when_provided(:radio, 'input')
     
     it 'should generate a legend containing a label with text for the input' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li fieldset legend.label label')
       output_buffer.should have_tag('form li fieldset legend.label label', /Author/)
     end
     
     it 'should not link the label within the legend to any input' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should_not have_tag('form li fieldset legend label[@for^="post_author_id_"]')
     end
 
     it 'should generate an ordered list with a list item for each choice' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li fieldset ol')
       output_buffer.should have_tag('form li fieldset ol li', :count => ::Author.find(:all).size)
     end
 
     it 'should have one option with a "checked" attribute' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li input[@checked]', :count => 1)
     end
 
     describe "each choice" do
 
       it 'should contain a label for the radio input with a nested input and label text' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         ::Author.find(:all).each do |author|
           output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_id_#{author.id}']")
@@ -51,12 +56,14 @@
       end
 
       it 'should use values as li.class when value_as_class is true' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         ::Author.find(:all).each do |author|
           output_buffer.should have_tag("form li fieldset ol li.author_#{author.id} label")
         end
       end
 
       it "should have a radio input" do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         ::Author.find(:all).each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#post_author_id_#{author.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@type='radio']")
@@ -70,10 +77,11 @@
         @new_post.author.id.should == @bob.id
         @new_post.author.should == @bob
 
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:author, :as => :radio))
         end
 
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
       end
     end
@@ -81,20 +89,23 @@
     describe 'and no object is given' do
       before(:each) do
         output_buffer.replace ''
-        semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        @form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:author_id, :as => :radio, :collection => ::Author.find(:all)))
         end
       end
 
       it 'should generate a fieldset with legend' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form li fieldset legend', /Author/)
       end
 
       it 'should generate an li tag for each item in the collection' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form li fieldset ol li', :count => ::Author.find(:all).size)
       end
 
       it 'should generate labels for each item' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         ::Author.find(:all).each do |author|
           output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='project_author_id_#{author.id}']")
@@ -102,6 +113,7 @@
       end
 
       it 'should generate inputs for each item' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         ::Author.find(:all).each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#project_author_id_#{author.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@type='radio']")
@@ -122,13 +134,14 @@
         @new_post.stub!(:author_ids).and_return(nil)
         
         with_deprecation_silenced do
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:authors, :as => :radio, :selected => nil))
           end
         end
       end
 
       it 'should not have any selected item(s)' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should_not have_tag("form li fieldset ol li label input[@checked='checked']")
       end
     end
@@ -137,13 +150,14 @@
       before do
         @new_post.stub!(:author_ids).and_return(nil)
         with_deprecation_silenced do
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:authors, :as => :radio, :selected => @fred.id))
           end
         end
       end
 
       it "should have one item selected; the specified one" do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li fieldset ol li label input[@type='radio'][@checked='checked']", :count => 1)
         output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
         output_buffer.should have_tag("form li fieldset ol li label input[@type='radio'][@checked='checked'][@value='#{@fred.id}']")
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 55a2ffa1b..ddc08a099 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -15,13 +15,14 @@
       before do
         @array_with_values = ["Title A", "Title B", "Title C"]
         @array_with_keys_and_values = [["Title D", 1], ["Title E", 2], ["Title F", 3]]
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :select, :collection => @array_with_values))
           concat(builder.input(:title, :as => :select, :collection => @array_with_keys_and_values))
         end
       end
 
       it 'should have a option for each key and/or value' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         @array_with_values.each do |v|
           output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
         end
@@ -34,12 +35,13 @@
     describe 'using a range' do
       before do
         @range_with_values = 1..5
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :select, :collection => @range_with_values))
         end
       end
 
       it 'should have an option for each value' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         @range_with_values.each do |v|
           output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
         end
@@ -54,7 +56,7 @@
         ::I18n.load_path = [File.join(File.dirname(__FILE__), *%w[.. .. lib locale en.yml])]
         ::I18n.backend.send(:init_translations)
 
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:published, :as => :select))
         end
       end
@@ -64,6 +66,7 @@
       end
 
       it 'should render a select with at least options: true/false' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li select option[@value='true']", /^Yes$/)
         output_buffer.should have_tag("form li select option[@value='false']", /^No$/)
       end
@@ -74,7 +77,7 @@
         @boolean_select_labels = {:yes => 'Yep', :no => 'Nope'}
         ::I18n.backend.store_translations :en, :formtastic => @boolean_select_labels
 
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:published, :as => :select))
         end
       end
@@ -84,6 +87,7 @@
       end
 
       it 'should render a select with at least options: true/false' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li select option[@value='true']", /#{@boolean_select_labels[:yes]}/)
         output_buffer.should have_tag("form li select option[@value='false']", /#{@boolean_select_labels[:no]}/)
       end
@@ -92,7 +96,7 @@
 
   describe 'for a belongs_to association' do
     before do
-      semantic_form_for(@new_post) do |builder|
+      @form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select))
       end
     end
@@ -106,28 +110,34 @@
     it_should_use_the_collection_when_provided(:select, 'option')
 
     it 'should have a select inside the wrapper' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#post_author_id')
     end
 
     it 'should have a valid name' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag("form li select[@name='post[author_id]']")
       output_buffer.should_not have_tag("form li select[@name='post[author_id][]']")
     end
 
     it 'should not create a multi-select' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should_not have_tag('form li select[@multiple]')
     end
 
     it 'should create a select without size' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should_not have_tag('form li select[@size]')
     end
 
     it 'should have a blank option' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag("form li select option[@value='']")
     end
 
     it 'should have a select option for each Author' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li select option', :count => ::Author.find(:all).size + 1)
       ::Author.find(:all).each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
@@ -135,6 +145,7 @@
     end
 
     it 'should have one option with a "selected" attribute' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li select option[@selected]', :count => 1)
     end
 
@@ -143,10 +154,11 @@
       @new_post.stub!(:author_status_id).and_return(@bob.id)
       @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => :integer, :limit => 255))
 
-      semantic_form_for(@new_post) do |builder|
+      form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author_status, :as => :select))
       end
 
+      output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li select#post_author_status_id')
     end
   end
@@ -179,7 +191,7 @@
         continent.stub!(:authors).and_return([@authors[i]])
       end
       
-      semantic_form_for(@new_post) do |builder|
+      @form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select, :group_by => :continent ) )
         concat(builder.input(:author, :as => :select, :group_by => :continent, :group_label_method => :id ) )
       end
@@ -194,19 +206,23 @@
 
     0.upto(1) do |i|
       it 'should have all option groups and the right values' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li select optgroup[@label='#{@continent_names[i]}']", @authors[i].to_label)
       end
 
       it 'should have custom group labels' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li select optgroup[@label='#{@continents[i].id}']", @authors[i].to_label)
       end
     end
 
     it 'should have no duplicate groups' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li select optgroup', :count => 4)
     end
     
     it 'should sort the groups on the label method' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag("form li select optgroup[@label='Africa']")
       output_buffer.should have_tag("form li select optgroup[@label='99']")
     end
@@ -222,7 +238,7 @@
 
   describe 'for a has_many association' do
     before do
-      semantic_form_for(@fred) do |builder|
+      @form = semantic_form_for(@fred) do |builder|
         concat(builder.input(:posts, :as => :select))
       end
     end
@@ -236,15 +252,18 @@
     it_should_use_the_collection_when_provided(:select, 'option')
 
     it 'should have a select inside the wrapper' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#author_post_ids')
     end
 
     it 'should have a multi-select select' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li select[@multiple="multiple"]')
     end
 
     it 'should have a select option for each Post' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li select option', :count => ::Post.find(:all).size)
       ::Post.find(:all).each do |post|
         output_buffer.should have_tag("form li select option[@value='#{post.id}']", /#{post.to_label}/)
@@ -252,17 +271,19 @@
     end
     
     it 'should not have a blank option' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should_not have_tag("form li select option[@value='']")
     end
 
     it 'should have one option with a "selected" attribute' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li select option[@selected]', :count => 1)
     end
   end
 
   describe 'for a has_and_belongs_to_many association' do
     before do
-      semantic_form_for(@freds_post) do |builder|
+      @form = semantic_form_for(@freds_post) do |builder|
         concat(builder.input(:authors, :as => :select))
       end
     end
@@ -276,15 +297,18 @@
     it_should_use_the_collection_when_provided(:select, 'option')
     
     it 'should have a select inside the wrapper' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#post_author_ids')
     end
 
     it 'should have a multi-select select' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li select[@multiple="multiple"]')
     end
 
     it 'should have a select option for each Author' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li select option', :count => ::Author.find(:all).size)
       ::Author.find(:all).each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
@@ -292,10 +316,12 @@
     end
     
     it 'should not have a blank option' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should_not have_tag("form li select option[@value='']")
     end
 
     it 'should have one option with a "selected" attribute' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li select option[@selected]', :count => 1)
     end
   end
@@ -303,38 +329,43 @@
   describe 'when :prompt => "choose something" is set' do
     before do
       @new_post.stub!(:author_id).and_return(nil)
-      semantic_form_for(@new_post) do |builder|
+      @form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select, :prompt => "choose author"))
       end
     end
 
     it 'should have a select with prompt' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag("form li select option[@value='']", /choose author/)
     end
 
     it 'should not have a blank select option' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should_not have_tag("form li select option[@value='']", "")
     end
   end
 
   describe 'when no object is given' do
     before(:each) do
-      semantic_form_for(:project, :url => 'http://test.host') do |builder|
+      @form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:author, :as => :select, :collection => ::Author.find(:all)))
       end
     end
 
     it 'should generate label' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li label', /Author/)
       output_buffer.should have_tag("form li label[@for='project_author']")
     end
 
     it 'should generate select inputs' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li select#project_author')
       output_buffer.should have_tag('form li select option', :count => ::Author.find(:all).size + 1)
     end
 
     it 'should generate an option to each item' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       ::Author.find(:all).each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
       end
@@ -350,13 +381,14 @@
       before do
         @new_post.stub!(:author_id).and_return(nil)
         with_deprecation_silenced do
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:author, :as => :select, :selected => nil))
           end
         end
       end
       
       it 'should not have any selected item(s)' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should_not have_tag("form li select option[@selected='selected']")
       end
     end
@@ -365,13 +397,14 @@
       before do
         @new_post.stub!(:author_id).and_return(nil)
         with_deprecation_silenced do
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:author, :as => :select, :selected => @bob.id))
           end
         end
       end
 
       it 'should have a selected item; the specified one' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li select option[@selected='selected']", :count => 1)
         output_buffer.should have_tag("form li select option[@selected='selected']", /bob/i)
         output_buffer.should have_tag("form li select option[@selected='selected'][@value='#{@bob.id}']")
@@ -385,13 +418,14 @@
           @new_post.stub!(:author_ids).and_return(nil)
           
           with_deprecation_silenced do
-            semantic_form_for(@new_post) do |builder|
+            @form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:authors, :as => :select, :selected => [@bob.id, @fred.id], :multiple => false))
             end
           end
         end
 
         it "should only select the first value" do
+          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag("form li select option[@selected='selected']", :count => 1)
           output_buffer.should have_tag("form li select:not([@multiple]) option[@selected='selected']", /bob/i)
           output_buffer.should have_tag("form li select:not([@multiple]) option[@selected='selected'][@value='#{@bob.id}']")
@@ -403,13 +437,14 @@
           @new_post.stub!(:author_ids).and_return(nil)
 
           with_deprecation_silenced do
-            semantic_form_for(@new_post) do |builder|
+            @form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:authors, :as => :select, :selected => [@bob.id, @fred.id]))
             end
           end
         end
 
         it "should have multiple items selected; the specified ones" do
+          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag("form li select option[@selected='selected']", :count => 2)
           output_buffer.should have_tag("form li select[@multiple] option[@selected='selected']", /bob/i)
           output_buffer.should have_tag("form li select[@multiple] option[@selected='selected'][@value='#{@bob.id}']")
@@ -431,15 +466,18 @@
   
     describe ":as is not set" do
       before do
-        semantic_form_for(@new_post) do |builder|
+        @form_new_post = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:meta_description, :collection => @some_meta_descriptions))
         end
-        semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        @form_project = semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:meta_description, :collection => @some_meta_descriptions))
         end
+        
       end
   
       it "should render a select field" do
+        output_buffer.concat(@form_new_post) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form_project) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li select", :count => 2)
       end
     end
@@ -447,15 +485,17 @@
     describe ":as is set" do
       before do
         # Should not be a case, but just checking :as got highest priority in setting input type.
-        semantic_form_for(@new_post) do |builder|
+        @form_new_post = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:meta_description, :as => :string, :collection => @some_meta_descriptions))
         end
-        semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        @form_project = semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:meta_description, :as => :string, :collection => @some_meta_descriptions))
         end
       end
       
       it "should render a text field" do
+        output_buffer.concat(@form_new_post) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form_project) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li input[@type='text']", :count => 2)
       end
     end
diff --git a/spec/inputs/string_input_spec.rb b/spec/inputs/string_input_spec.rb
index 5175e8e67..acaa70d59 100644
--- a/spec/inputs/string_input_spec.rb
+++ b/spec/inputs/string_input_spec.rb
@@ -9,7 +9,7 @@
     @output_buffer = ''
     mock_everything
     
-    semantic_form_for(@new_post) do |builder|
+    @form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :string))
     end
   end
@@ -31,7 +31,7 @@
   
   describe "when no object is provided" do
     before do
-      semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+      @form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
         concat(builder.input(:title, :as => :string))
       end
     end
diff --git a/spec/inputs/text_input_spec.rb b/spec/inputs/text_input_spec.rb
index 55f107a48..6bec69052 100644
--- a/spec/inputs/text_input_spec.rb
+++ b/spec/inputs/text_input_spec.rb
@@ -9,7 +9,7 @@
     @output_buffer = ''
     mock_everything
     
-    semantic_form_for(@new_post) do |builder|
+    @form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:body, :as => :text))
     end
   end
@@ -23,9 +23,10 @@
   it_should_apply_error_logic_for_input_type(:numeric)
   
   it 'should use input_html to style inputs' do
-    semantic_form_for(@new_post) do |builder|
+    form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :class => 'myclass' }))
     end
+    output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
     output_buffer.should have_tag("form li textarea.myclass")
   end
     
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index 5fd635a41..412a7b51d 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -18,7 +18,7 @@
 
     describe "without seconds" do
       before do
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:publish_at, :as => :time))
         end
       end
@@ -29,37 +29,43 @@
       it_should_apply_error_logic_for_input_type(:time)
     
       it 'should have a legend and label with the label text inside the fieldset' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form li.time fieldset legend.label label', /Publish at/)
       end
     
       it 'should associate the legend label with the first select' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form li.time fieldset legend.label label[@for="post_publish_at_1i"]')
       end
     
       it 'should have an ordered list of two items inside the fieldset' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form li.time fieldset ol')
         output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
       end
 
       it 'should have five labels for hour and minute' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => 2)
         output_buffer.should have_tag('form li.time fieldset ol li label', /hour/i)
         output_buffer.should have_tag('form li.time fieldset ol li label', /minute/i)
       end
     
       it 'should have two selects for hour and minute' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
       end
     end
 
     describe "with seconds" do
       before do
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:publish_at, :as => :time, :include_seconds => true))
         end
       end
     
       it 'should have five labels for hour and minute' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => 3)
         output_buffer.should have_tag('form li.time fieldset ol li label', /hour/i)
         output_buffer.should have_tag('form li.time fieldset ol li label', /minute/i)
@@ -67,10 +73,12 @@
       end
 
       it 'should have three selects for hour, minute and seconds' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form li.time fieldset ol li', :count => 3)
       end
 
       it 'should generate a sanitized label and matching ids for attribute' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         4.upto(6) do |i|
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_publish_at_#{i}i']")
           output_buffer.should have_tag("form li fieldset ol li #post_publish_at_#{i}i")
@@ -86,10 +94,11 @@
         output_buffer.replace ''
         @new_post.stub!(:created_at => Time.mktime(2012, 11, 30, 21, 45))
         with_deprecation_silenced do 
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:created_at, :as => :time, :selected => Time.mktime(1999, 12, 31, 22, 59)))
           end
         end
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@value='21'][@selected]", :count => 1)
       end
@@ -100,10 +109,11 @@
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
         with_deprecation_silenced do
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:created_at, :as => :time, :selected => Time.mktime(1999, 12, 31, 22, 59)))
           end
         end
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@value='22'][@selected]", :count => 1)
       end
@@ -112,19 +122,21 @@
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
         with_deprecation_silenced do 
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:created_at, :as => :time, :selected => nil))
           end
         end
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should_not have_tag("form li ol li select#post_created_at_4i option[@selected]")
       end
       
       it "should select Time.now if a :selected is not provided" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :time))
         end
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@value='#{Time.now.hour.to_s.rjust(2,'0')}'][@selected]", :count => 1)
       end
@@ -137,9 +149,10 @@
     fields.each do |field|
       it "should replace the #{field} label with the specified text if :labels[:#{field}] is set" do
         output_buffer.replace ''
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :time, :include_seconds => true, :labels => { field => "another #{field} label" }))
         end
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => fields.length)
         fields.each do |f|
           output_buffer.should have_tag('form li.time fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
@@ -148,9 +161,10 @@
   
       it "should not display the label for the #{field} field when :labels[:#{field}] is blank" do
         output_buffer.replace ''
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :time, :include_seconds => true, :labels => { field => "" }))
         end
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => fields.length-1)
         fields.each do |f|
           output_buffer.should have_tag('form li.time fieldset ol li label', /#{f}/i) unless field == f
diff --git a/spec/inputs/time_zone_input_spec.rb b/spec/inputs/time_zone_input_spec.rb
index 860455a5f..85a2f1b80 100644
--- a/spec/inputs/time_zone_input_spec.rb
+++ b/spec/inputs/time_zone_input_spec.rb
@@ -9,7 +9,7 @@
     @output_buffer = ''
     mock_everything
     
-    semantic_form_for(@new_post) do |builder|
+    @form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:time_zone))
     end
   end
@@ -19,38 +19,43 @@
   it_should_apply_error_logic_for_input_type(:time_zone)
   
   it 'should generate a label for the input' do
+    output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
     output_buffer.should have_tag('form li label')
     output_buffer.should have_tag('form li label[@for="post_time_zone"]')
     output_buffer.should have_tag('form li label', /Time zone/)
   end
 
   it "should generate a select" do
+    output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
     output_buffer.should have_tag("form li select")
     output_buffer.should have_tag("form li select#post_time_zone")
     output_buffer.should have_tag("form li select[@name=\"post[time_zone]\"]")
   end
 
   it 'should use input_html to style inputs' do
-    semantic_form_for(@new_post) do |builder|
+    form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:time_zone, :input_html => { :class => 'myclass' }))
     end
+    output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
     output_buffer.should have_tag("form li select.myclass")
   end
 
   describe 'when no object is given' do
     before(:each) do
-      semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+      @form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
         concat(builder.input(:time_zone, :as => :time_zone))
       end
     end
 
     it 'should generate labels' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag('form li label')
       output_buffer.should have_tag('form li label[@for="project_time_zone"]')
       output_buffer.should have_tag('form li label', /Time zone/)
     end
 
     it 'should generate select inputs' do
+      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag("form li select")
       output_buffer.should have_tag("form li select#project_time_zone")
       output_buffer.should have_tag("form li select[@name=\"project[time_zone]\"]")
@@ -86,13 +91,14 @@
         @new_post.stub!(:time_zone).and_return(nil)
 
         with_deprecation_silenced do
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:time_zone, :as => :time_zone, :selected => 'Melbourne'))
           end
         end
       end
 
       it 'should have a selected item; the specified one' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form li select option[@selected='selected']", :count => 1)
         output_buffer.should have_tag("form li select option[@selected='selected']", /Melbourne/i)
         output_buffer.should have_tag("form li select option[@selected='selected'][@value='Melbourne']")
diff --git a/spec/inputs_spec.rb b/spec/inputs_spec.rb
index ef938e8f0..37bf0f044 100644
--- a/spec/inputs_spec.rb
+++ b/spec/inputs_spec.rb
@@ -15,7 +15,7 @@
     describe 'when no options are provided' do
       before do
         output_buffer.replace 'before_builder' # clear the output buffer and sets before_builder
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           @inputs_output = builder.inputs do
             concat('hello')
           end
@@ -23,33 +23,39 @@
       end
 
       it 'should output just the content wrapped in inputs, not the whole template' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should      =~ /before_builder/
         @inputs_output.should_not =~ /before_builder/
       end
 
       it 'should render a fieldset inside the form, with a class of "inputs"' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form fieldset.inputs")
       end
 
       it 'should render an ol inside the fieldset' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form fieldset.inputs ol")
       end
 
       it 'should render the contents of the block inside the ol' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form fieldset.inputs ol", /hello/)
       end
 
       it 'should not render a legend inside the fieldset' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should_not have_tag("form fieldset.inputs legend")
       end
 
       it 'should render a fieldset even if no object is given' do
-        semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+        form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
           @inputs_output = builder.inputs do
             concat('bye')
           end
         end
 
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form fieldset.inputs ol", /bye/)
       end
     end
@@ -64,12 +70,14 @@
       it 'should render nested inputs' do
         @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
 
-        semantic_form_for(@new_post) do |builder|
-          builder.inputs :for => [:author, @bob] do |bob_builder|
+        form = semantic_form_for(@new_post) do |builder|
+          inputs = builder.inputs :for => [:author, @bob] do |bob_builder|
             concat(bob_builder.input(:login))
           end
+          concat(inputs)
         end
 
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form fieldset.inputs #post_author_attributes_login")
         output_buffer.should_not have_tag("form fieldset.inputs #author_login")
 
@@ -78,11 +86,13 @@
       describe "as a symbol representing the association name" do
         
         it 'should nest the inputs with an _attributes suffix on the association name' do
-          semantic_form_for(@new_post) do |post|
-            post.inputs :for => :author do |author|
+          form = semantic_form_for(@new_post) do |post|
+            inputs = post.inputs :for => :author do |author|
               concat(author.input(:login))
             end
+            concat(inputs)
           end
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag("form input[@name='post[author_attributes][login]']")
         end
         
@@ -91,11 +101,13 @@
       describe 'as an array containing the a symbole for the association name and the associated object' do
         
         it 'should nest the inputs with an _attributes suffix on the association name' do
-          semantic_form_for(@new_post) do |post|
-            post.inputs :for => [:author, @new_post.author] do |author|
+          form = semantic_form_for(@new_post) do |post|
+            inputs = post.inputs :for => [:author, @new_post.author] do |author|
               concat(author.input(:login))
             end
+            concat(inputs)
           end
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag("form input[@name='post[author_attributes][login]']")
         end
         
@@ -104,11 +116,13 @@
       describe 'as an associated object' do
         
         it 'should not nest the inputs with an _attributes suffix' do
-          semantic_form_for(@new_post) do |post|
-            post.inputs :for => @new_post.author do |author|
+          form = semantic_form_for(@new_post) do |post|
+            inputs = post.inputs :for => @new_post.author do |author|
               concat(author.input(:login))
             end
+            concat(inputs)
           end
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag("form input[@name='post[author][login]']")
         end
         
@@ -128,44 +142,52 @@
       it 'should pass options down to semantic_fields_for' do
         @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
 
-        semantic_form_for(@new_post) do |builder|
-          builder.inputs :for => [:author, @bob], :for_options => { :index => 10 } do |bob_builder|
+        form = semantic_form_for(@new_post) do |builder|
+          inputs = builder.inputs :for => [:author, @bob], :for_options => { :index => 10 } do |bob_builder|
             concat(bob_builder.input(:login))
           end
+          concat(inputs)
         end
 
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form fieldset ol li #post_author_attributes_10_login')
       end
 
       it 'should not add builder as a fieldset attribute tag' do
-        semantic_form_for(@new_post) do |builder|
-          builder.inputs :for => [:author, @bob], :for_options => { :index => 10 } do |bob_builder|
+        form = semantic_form_for(@new_post) do |builder|
+          inputs = builder.inputs :for => [:author, @bob], :for_options => { :index => 10 } do |bob_builder|
             concat('input')
           end
+          concat(inputs)
         end
 
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should_not have_tag('fieldset[@builder="Formtastic::SemanticFormHelper"]')
       end
 
       it 'should send parent_builder as an option to allow child index interpolation' do
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           builder.instance_variable_set('@nested_child_index', 0)
-          builder.inputs :for => [:author, @bob], :name => 'Author #%i' do |bob_builder|
+          inputs = builder.inputs :for => [:author, @bob], :name => 'Author #%i' do |bob_builder|
             concat('input')
           end
+          concat(inputs)
         end
 
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('fieldset legend', 'Author #1')
       end
 
       it 'should also provide child index interpolation when nested child index is a hash' do
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           builder.instance_variable_set('@nested_child_index', :author => 10)
-          builder.inputs :for => [:author, @bob], :name => 'Author #%i' do |bob_builder|
+          inputs = builder.inputs :for => [:author, @bob], :name => 'Author #%i' do |bob_builder|
             concat('input')
           end
+          concat(inputs)
         end
 
+        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('fieldset legend', 'Author #11')
       end
     end
@@ -177,19 +199,24 @@
           @legend_text_using_name = "Advanced options 2"
           @legend_text_using_title = "Advanced options 3"
           @nested_forms_legend_text = "This is a nested form title"
-          semantic_form_for(@new_post) do |builder|
-            builder.inputs @legend_text do
+          @form = semantic_form_for(@new_post) do |builder|
+            inputs = builder.inputs @legend_text do
             end
-            builder.inputs :name => @legend_text_using_name do
+            concat(inputs)
+            inputs = builder.inputs :name => @legend_text_using_name do
             end
-            builder.inputs :title => @legend_text_using_title do
+            concat(inputs)
+            inputs = builder.inputs :title => @legend_text_using_title do
             end
-            builder.inputs @nested_forms_legend_text, :for => :authors do |nf|
+            concat(inputs)
+            inputs = builder.inputs @nested_forms_legend_text, :for => :authors do |nf|
             end
+            concat(inputs)
           end
         end
 
         it 'should render a fieldset with a legend inside the form' do
+          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text_using_name}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text_using_title}$/)
@@ -213,19 +240,24 @@
                     }
                 }
             }
-          semantic_form_for(@new_post) do |builder|
-            builder.inputs :advanced_options do
+          @form = semantic_form_for(@new_post) do |builder|
+            inputs = builder.inputs :advanced_options do
             end
-            builder.inputs :name => :advanced_options_using_name do
+            concat(inputs)
+            inputs =builder.inputs :name => :advanced_options_using_name do
             end
-            builder.inputs :title => :advanced_options_using_title do
+            concat(inputs)
+            inputs = builder.inputs :title => :advanced_options_using_title do
             end
-            builder.inputs :nested_forms_title, :for => :authors do |nf|
+            concat(inputs)
+            inputs = builder.inputs :nested_forms_title, :for => :authors do |nf|
             end
+            concat(inputs)
           end
         end
 
         it 'should render a fieldset with a localized legend inside the form' do
+          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text_using_name}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text_using_title}$/)
@@ -239,13 +271,14 @@
         @id_option = 'advanced'
         @class_option = 'wide'
 
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           builder.inputs :id => @id_option, :class => @class_option do
           end
         end
       end
 
       it 'should pass the options into the fieldset tag as attributes' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag("form fieldset##{@id_option}")
         output_buffer.should have_tag("form fieldset.#{@class_option}")
       end
@@ -272,46 +305,55 @@
 
     describe 'with no args' do
       before do
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           concat(builder.inputs)
         end
       end
 
       it 'should render a form' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form')
       end
 
       it 'should render a fieldset inside the form' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form > fieldset.inputs')
       end
 
       it 'should not render a legend in the fieldset' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should_not have_tag('form > fieldset.inputs > legend')
       end
 
       it 'should render an ol in the fieldset' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form > fieldset.inputs > ol')
       end
 
       it 'should render a list item in the ol for each column and reflection' do
         # Remove the :has_many macro and :created_at column
         count = ::Post.content_columns.size + ::Post.reflections.size - 2
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => count)
       end
 
       it 'should render a string list item for title' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form > fieldset.inputs > ol > li.string')
       end
 
       it 'should render a text list item for body' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form > fieldset.inputs > ol > li.text')
       end
 
       it 'should render a select list item for author_id' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form > fieldset.inputs > ol > li.select', :count => 1)
       end
 
       it 'should not render timestamps inputs by default' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should_not have_tag('form > fieldset.inputs > ol > li.datetime')
       end
     end
@@ -319,10 +361,11 @@
     describe 'with column names as args' do
       describe 'and an object is given' do
         it 'should render a form with a fieldset containing two list items' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.inputs(:title, :body))
           end
 
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => 2)
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.string')
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.text')
@@ -331,10 +374,11 @@
 
       describe 'and no object is given' do
         it 'should render a form with a fieldset containing two list items' do
-          semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
             concat(builder.inputs(:title, :body))
           end
 
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.string', :count => 2)
         end
       end
@@ -344,11 +388,11 @@
       describe 'and an object is given' do
         it 'should render nested inputs' do
           @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
-
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.inputs(:login, :for => @bob))
           end
 
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag("form fieldset.inputs #post_author_login")
           output_buffer.should_not have_tag("form fieldset.inputs #author_login")
         end
@@ -356,10 +400,10 @@
 
       describe 'and no object is given' do
         it 'should render nested inputs' do
-          semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+          form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
             concat(builder.inputs(:login, :for => @bob))
           end
-
+          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
           output_buffer.should have_tag("form fieldset.inputs #project_author_login")
           output_buffer.should_not have_tag("form fieldset.inputs #project_login")
         end
@@ -368,7 +412,7 @@
 
     describe 'with column names and an options hash as args' do
       before do
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           @legend_text_using_option = "Legendary Legend Text"
           @legend_text_using_arg = "Legendary Legend Text 2"
           concat(builder.inputs(:title, :body, :name => @legend_text_using_option, :id => "my-id"))
@@ -377,14 +421,17 @@
       end
 
       it 'should render a form with a fieldset containing two list items' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => 4)
       end
 
       it 'should pass the options down to the fieldset' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form > fieldset#my-id.inputs')
       end
 
       it 'should use the special :name option as a text for the legend tag' do
+        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
         output_buffer.should have_tag('form > fieldset#my-id.inputs > legend', /^#{@legend_text_using_option}$/)
         output_buffer.should have_tag('form > fieldset#my-id-2.inputs > legend', /^#{@legend_text_using_arg}$/)
       end
diff --git a/spec/layout_helper_spec.rb b/spec/layout_helper_spec.rb
index 832c651c6..a05943558 100644
--- a/spec/layout_helper_spec.rb
+++ b/spec/layout_helper_spec.rb
@@ -2,7 +2,7 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe 'LayoutHelper' do
-  
+
   include FormtasticSpecHelper
   include Formtastic::LayoutHelper
   
@@ -13,14 +13,16 @@
   describe '#formtastic_stylesheet_link_tag' do
     
     before do
-      concat(formtastic_stylesheet_link_tag())
+      @tags = concat(formtastic_stylesheet_link_tag())
     end
     
     it 'should render a link to formtastic.css' do
+      output_buffer.concat(@tags) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag("link[@href='/stylesheets/formtastic.css']")
     end
     
     it 'should render a link to formtastic_changes.css' do
+      output_buffer.concat(@tags) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag("link[@href='/stylesheets/formtastic_changes.css']")
     end
     
diff --git a/spec/semantic_fields_for_spec.rb b/spec/semantic_fields_for_spec.rb
index c2cff855b..e48a6e05e 100644
--- a/spec/semantic_fields_for_spec.rb
+++ b/spec/semantic_fields_for_spec.rb
@@ -29,11 +29,12 @@
   
   it 'should sanitize html id for li tag' do
     @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
-    semantic_form_for(@new_post) do |builder|
-      builder.semantic_fields_for(@bob, :index => 1) do |nested_builder|
+    form = semantic_form_for(@new_post) do |builder|
+      concat(builder.semantic_fields_for(@bob, :index => 1) do |nested_builder|
         concat(nested_builder.inputs(:login))
-      end
+      end)
     end
+    output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
     output_buffer.should have_tag('form fieldset.inputs #post_author_1_login_input')
     # Not valid selector, so using good ol' regex
     output_buffer.should_not =~ /id="post\[author\]_1_login_input"/

From 793f43608150b2b2f7899fcea23795a3de1c97d1 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Fri, 16 Apr 2010 22:43:14 +0200
Subject: [PATCH 040/992] Adjust configuration for Rspec 2.0 to latest beta
 changes

---
 .rspec              | 2 ++
 spec/spec_helper.rb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 .rspec

diff --git a/.rspec b/.rspec
new file mode 100644
index 000000000..8f815c60d
--- /dev/null
+++ b/.rspec
@@ -0,0 +1,2 @@
+--color
+--format=progress
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 7797a73b4..f0bb087c7 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -29,7 +29,7 @@
   end
 rescue
   require 'rspec/core'
-  Rspec::Core.configure do |config|
+  Rspec.configure do |config|
     config.include RspecTagMatchers
     config.include CustomMacros
     config.mock_with :rspec

From 273ab1431c430516d183550553b614b8d7c00cb0 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 19 Apr 2010 07:11:40 +1000
Subject: [PATCH 041/992] Changed the behaviour of date/time selects when the
 object attribute has a nil value. It used to default to Time.now, but since
 :selected is deprecated you can no longer overrise the Time.now to nil, so we
 must default to nil instead. Closes issue #240.

---
 lib/formtastic.rb                  |  4 ++--
 spec/inputs/date_input_spec.rb     |  7 +++----
 spec/inputs/datetime_input_spec.rb | 21 +++++++++++++++++----
 spec/inputs/time_input_spec.rb     |  7 +++----
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index c8bb72707..0d6ef2d68 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -994,8 +994,8 @@ def date_or_datetime_input(method, options)
         list_items_capture = ""
         hidden_fields_capture = ""
 
-        datetime = options.key?(:selected) ? options[:selected] : Time.now # can't do an || because nil is an important value
-        datetime = @object.send(method) if @object && @object.send(method) # object trumps :selected
+        datetime = options[:selected]
+        datetime = @object.send(method) if @object && @object.send(method) # object value trumps :selected value
 
         html_options = options.delete(:input_html) || {}
         input_ids    = []
diff --git a/spec/inputs/date_input_spec.rb b/spec/inputs/date_input_spec.rb
index 584a54591..1ed149f7a 100644
--- a/spec/inputs/date_input_spec.rb
+++ b/spec/inputs/date_input_spec.rb
@@ -68,7 +68,7 @@
       end
     end
     
-    describe 'when the object has no value' do
+    describe 'when the object has no value (nil)' do
       it "should select the :selected if provided as a Date" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
@@ -104,14 +104,13 @@
         output_buffer.should_not have_tag("form li ol li select#post_created_at_1i option[@selected]")
       end
       
-      it "should select Time.now if a :selected is not provided" do
+      it "should select nothing if a :selected is not provided" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
         semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :date))
         end
-        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
-        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='#{Time.now.year}'][@selected]", :count => 1)
+        output_buffer.should_not have_tag("form li ol li select option[@selected]")
         
       end
     end
diff --git a/spec/inputs/datetime_input_spec.rb b/spec/inputs/datetime_input_spec.rb
index dcc982363..0fb1ac3f2 100644
--- a/spec/inputs/datetime_input_spec.rb
+++ b/spec/inputs/datetime_input_spec.rb
@@ -163,6 +163,21 @@
     end
   end
   
+  #describe 'when an object is given and the attribute value is nil' do
+  #  before(:each) do
+  #    @new_post.stub!(:publish_at).and_return(nil)
+  #    output_buffer.replace ''
+  #    semantic_form_for(@new_post) do |builder|
+  #      concat(builder.input(:publish_at, :as => :datetime))
+  #    end
+  #  end
+  #  
+  #  it 'should not select a value' do
+  #    output_buffer.should_not have_tag('form li.datetime option[@selected]')
+  #  end
+  #  
+  #end
+  
   describe ':selected option' do
     
     describe "when the object has a value" do
@@ -215,15 +230,13 @@
         output_buffer.should_not have_tag("form li ol li select#post_created_at_1i option[@selected]")
       end
       
-      it "should select Time.now if a :selected is not provided" do
+      it "should select nothing if a :selected is not provided" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
         semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :datetime))
         end
-        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
-        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='#{Time.now.year}'][@selected]", :count => 1)
-        
+        output_buffer.should_not have_tag("form li ol li select option[@selected]")
       end
     end
     
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index 93104a80b..fff1da852 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -94,7 +94,7 @@
       end
     end
     
-    describe 'when the object has no value' do
+    describe 'when the object has no value (nil)' do
       it "should select the :selected if provided as a Time" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
@@ -118,14 +118,13 @@
         output_buffer.should_not have_tag("form li ol li select#post_created_at_4i option[@selected]")
       end
       
-      it "should select Time.now if a :selected is not provided" do
+      it "should select nothing if a :selected is not provided" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
         semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :time))
         end
-        output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@selected]", :count => 1)
-        output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@value='#{Time.now.hour.to_s.rjust(2,'0')}'][@selected]", :count => 1)
+        output_buffer.should_not have_tag("form li ol li select option[@selected]")
       end
     end
     

From f0d57edd6ec3fc1282f4fbb7bb74e581395c6320 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 19 Apr 2010 07:18:43 +1000
Subject: [PATCH 042/992] CHANGELOG catchup

---
 CHANGELOG | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 631bb621e..13916e9a8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+0.9.9 [unreleased]
+
+* Changed date/time inputs to default to nil instead of Time.now when the object has no value (due to deprecation warning, #240)
+* Changed the behaviour of associations with a :class_name option to be more consistent with what Rails expects
+* Fixed issues with Ruby 1.9.1 and Haml
+* Add the :disabled option to check_boxes input
+
 0.9.8
 
 * Deprecated :selected/:checked options, see http://wiki.github.com/justinfrench/formtastic/deprecation-of-selected-option

From a722680948344e56032202520cdd9f1400e66605 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Mon, 19 Apr 2010 00:04:47 +0200
Subject: [PATCH 043/992] Use model_name.human if available, otherwise use our
 human_name workaround (#242)

---
 CHANGELOG           |  1 +
 lib/formtastic.rb   | 12 ++++++++----
 spec/spec_helper.rb |  2 ++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 18f846a61..ab860121c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
 * Changed spec_helper to support Rails 2 with Rspec od Rails 3 with Rspec 3 environments
 * Changed Rakefile to initalize the correct testing framework for the enviroment
 * Fixed inputs_for_nested_attributes only appending to the output buffer
+* Fixed use of model_name.human instead of model_name.human_name (rails3)
 * Added railtie to perform initialization tasks after the rails git framework is available (rails3)
 * Added helper to mark strings as HTML safe depending on environment, adapted from haml 2.2 solution (rails3)
 * Added compatible install and form helpers (rails3)
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index b6b7a05ec..fcda57479 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -327,10 +327,14 @@ def commit_button(*args)
         # ActiveRecord::Base.human_name falls back to ActiveRecord::Base.name.humanize ("Userpost") 
         # if there's no i18n, which is pretty crappy.  In this circumstance we want to detect this
         # fall back (human_name == name.humanize) and do our own thing name.underscore.humanize ("User Post")
-        object_human_name = @object.class.human_name                # default is UserPost => "Userpost", but i18n may do better ("User post")
-        crappy_human_name = @object.class.name.humanize             # UserPost => "Userpost"
-        decent_human_name = @object.class.name.underscore.humanize  # UserPost => "User post"
-        object_name = (object_human_name == crappy_human_name) ? decent_human_name : object_human_name
+        if @object.class.respond_to?(:human)
+          object_name = @object.class.human
+        else
+          object_human_name = @object.class.human_name                # default is UserPost => "Userpost", but i18n may do better ("User post")
+          crappy_human_name = @object.class.name.humanize             # UserPost => "Userpost"
+          decent_human_name = @object.class.name.underscore.humanize  # UserPost => "User post"
+          object_name = (object_human_name == crappy_human_name) ? decent_human_name : object_human_name
+        end
       else
         key = :submit
         object_name = @object_name.to_s.send(@@label_str_method)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f0bb087c7..de0b32812 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -159,6 +159,7 @@ def new_author_path; "/authors/new"; end
     ::Author.stub!(:find).and_return([@fred, @bob])
     ::Author.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     ::Author.stub!(:human_name).and_return('::Author')
+    ::Author.stub!(:human).and_return('::Author')
     ::Author.stub!(:reflect_on_validations_for).and_return([])
     ::Author.stub!(:reflect_on_association).and_return { |column_name| mock('reflection', :options => {}, :klass => Post, :macro => :has_many) if column_name == :posts }
     ::Author.stub!(:content_columns).and_return([mock('column', :name => 'login'), mock('column', :name => 'created_at')])
@@ -195,6 +196,7 @@ def new_author_path; "/authors/new"; end
 
     ::Post.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     ::Post.stub!(:human_name).and_return('Post')
+    ::Post.stub!(:human).and_return('Post')
     ::Post.stub!(:reflect_on_all_validations).and_return([])
     ::Post.stub!(:reflect_on_validations_for).and_return([])
     ::Post.stub!(:reflect_on_association).and_return do |column_name|

From 39c22b1a79b9f1823481c2f9f80e2161f172fadb Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Mon, 19 Apr 2010 00:19:16 +0200
Subject: [PATCH 044/992] Fix use of deprecated Errors#on_base (#242)

---
 CHANGELOG                    |  1 +
 lib/formtastic.rb            |  2 +-
 spec/semantic_errors_spec.rb | 12 ++++++------
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ab860121c..0a89d5d61 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@
 * Changed Rakefile to initalize the correct testing framework for the enviroment
 * Fixed inputs_for_nested_attributes only appending to the output buffer
 * Fixed use of model_name.human instead of model_name.human_name (rails3)
+* Fixed use of deprecated Errors#on_base
 * Added railtie to perform initialization tasks after the rails git framework is available (rails3)
 * Added helper to mark strings as HTML safe depending on environment, adapted from haml 2.2 solution (rails3)
 * Added compatible install and form helpers (rails3)
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index fcda57479..aa325eda9 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -456,7 +456,7 @@ def semantic_errors(*args)
         errors = Array(@object.errors[method.to_sym]).to_sentence
         errors.present? ? array << [attribute, errors].join(" ") : array ||= []
       end
-      full_errors << @object.errors.on_base
+      full_errors << @object.errors[:base]
       full_errors.flatten!
       full_errors.compact!
       return nil if full_errors.blank?
diff --git a/spec/semantic_errors_spec.rb b/spec/semantic_errors_spec.rb
index 992d926b3..7045b502e 100644
--- a/spec/semantic_errors_spec.rb
+++ b/spec/semantic_errors_spec.rb
@@ -17,7 +17,7 @@
 
   describe 'when there is only one error on base' do
     before do
-      @errors.stub!(:on_base).and_return(@base_error)
+      @errors.stub!(:[]).with(:base).and_return(@base_error)
     end
 
     it 'should render an unordered list' do
@@ -29,7 +29,7 @@
 
   describe 'when there is more than one error on base' do
     before do
-      @errors.stub!(:on_base).and_return(@base_errors)
+      @errors.stub!(:[]).with(:base).and_return(@base_errors)
     end
 
     it 'should render an unordered list' do
@@ -45,7 +45,7 @@
   describe 'when there are errors on title' do
     before do
       @errors.stub!(:[]).with(:title).and_return(@title_errors)
-      @errors.stub!(:on_base).and_return([])
+      @errors.stub!(:[]).with(:base).and_return([])
     end
 
     it 'should render an unordered list' do
@@ -59,7 +59,7 @@
   describe 'when there are errors on title and base' do
     before do
       @errors.stub!(:[]).with(:title).and_return(@title_errors)
-      @errors.stub!(:on_base).and_return(@base_error)
+      @errors.stub!(:[]).with(:base).and_return(@base_error)
     end
 
     it 'should render an unordered list' do
@@ -74,7 +74,7 @@
   describe 'when there are no errors' do
     before do
       @errors.stub!(:[]).with(:title).and_return(nil)
-      @errors.stub!(:on_base).and_return(nil)
+      @errors.stub!(:[]).with(:base).and_return(nil)
     end
 
     it 'should return nil' do
@@ -86,7 +86,7 @@
 
   describe 'when there is one error on base and options with class is passed' do
     before do
-      @errors.stub!(:on_base).and_return(@base_error)
+      @errors.stub!(:[]).with(:base).and_return(@base_error)
     end
 
     it 'should render an unordered list with given class' do

From 07f01561992294a4c0ea4807e98bad8d33e834d1 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Mon, 19 Apr 2010 00:37:20 -0300
Subject: [PATCH 045/992] human_name has been deprecated, please use
 model_name.human instead

---
 lib/formtastic.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index aa325eda9..cf6c4737f 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -327,8 +327,8 @@ def commit_button(*args)
         # ActiveRecord::Base.human_name falls back to ActiveRecord::Base.name.humanize ("Userpost") 
         # if there's no i18n, which is pretty crappy.  In this circumstance we want to detect this
         # fall back (human_name == name.humanize) and do our own thing name.underscore.humanize ("User Post")
-        if @object.class.respond_to?(:human)
-          object_name = @object.class.human
+        if @object.class.respond_to?(:model_name)
+          object_name = @object.class.model_name.human
         else
           object_human_name = @object.class.human_name                # default is UserPost => "Userpost", but i18n may do better ("User post")
           crappy_human_name = @object.class.name.humanize             # UserPost => "Userpost"

From 90f890da0de24db921985755a17e75628b0381c1 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <m.jonuschat@gute-botschafter.de>
Date: Mon, 19 Apr 2010 08:04:52 +0200
Subject: [PATCH 046/992] Fix undefined method human for
 UserPost:ActiveSupport::ModelName under rails 2.x

---
 lib/formtastic.rb   | 2 +-
 spec/spec_helper.rb | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index cf6c4737f..e37f40d23 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -327,7 +327,7 @@ def commit_button(*args)
         # ActiveRecord::Base.human_name falls back to ActiveRecord::Base.name.humanize ("Userpost") 
         # if there's no i18n, which is pretty crappy.  In this circumstance we want to detect this
         # fall back (human_name == name.humanize) and do our own thing name.underscore.humanize ("User Post")
-        if @object.class.respond_to?(:model_name)
+        if @object.class.model_name.respond_to?(:human)
           object_name = @object.class.model_name.human
         else
           object_human_name = @object.class.human_name                # default is UserPost => "Userpost", but i18n may do better ("User post")
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index de0b32812..f0bb087c7 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -159,7 +159,6 @@ def new_author_path; "/authors/new"; end
     ::Author.stub!(:find).and_return([@fred, @bob])
     ::Author.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     ::Author.stub!(:human_name).and_return('::Author')
-    ::Author.stub!(:human).and_return('::Author')
     ::Author.stub!(:reflect_on_validations_for).and_return([])
     ::Author.stub!(:reflect_on_association).and_return { |column_name| mock('reflection', :options => {}, :klass => Post, :macro => :has_many) if column_name == :posts }
     ::Author.stub!(:content_columns).and_return([mock('column', :name => 'login'), mock('column', :name => 'created_at')])
@@ -196,7 +195,6 @@ def new_author_path; "/authors/new"; end
 
     ::Post.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     ::Post.stub!(:human_name).and_return('Post')
-    ::Post.stub!(:human).and_return('Post')
     ::Post.stub!(:reflect_on_all_validations).and_return([])
     ::Post.stub!(:reflect_on_validations_for).and_return([])
     ::Post.stub!(:reflect_on_association).and_return do |column_name|

From 82f6c8d59dc528d3127028569ed7db635e3f1a62 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 20 Apr 2010 08:09:09 +1000
Subject: [PATCH 047/992] Fixes deprecation warnings with form_for(:name,
 @resource) in rails3 (#245).

* replaced lots of unnecessary `semantic_form_for(:post, ::Post.new...)` with `semantic_form_for(@new_post...)`
* added rails3? and rails2? helper methods to spec_helper
* for the test where it did matter, I added a check for Rails 2 or 3 so we test the right code under both version
---
 spec/form_helper_spec.rb | 34 +++++++++++++++++++++-------------
 spec/spec_helper.rb      |  9 +++++++++
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/spec/form_helper_spec.rb b/spec/form_helper_spec.rb
index 075585e46..fae9b16ba 100644
--- a/spec/form_helper_spec.rb
+++ b/spec/form_helper_spec.rb
@@ -13,20 +13,20 @@
   describe '#semantic_form_for' do
 
     it 'yields an instance of SemanticFormBuilder' do
-      semantic_form_for(:post, ::Post.new, :url => '/hello') do |builder|
+      semantic_form_for(@new_post, :url => '/hello') do |builder|
         builder.class.should == ::Formtastic::SemanticFormBuilder
       end
     end
 
     it 'adds a class of "formtastic" to the generated form' do
-      form = semantic_form_for(:post, ::Post.new, :url => '/hello') do |builder|
+      form = semantic_form_for(@new_post, :url => '/hello') do |builder|
       end
       output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag("form.formtastic")
     end
 
     it 'adds class matching the object name to the generated form when a symbol is provided' do
-      form = semantic_form_for(:post, ::Post.new, :url => '/hello') do |builder|
+      form = semantic_form_for(@new_post, :url => '/hello') do |builder|
       end
       output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag("form.post")
@@ -53,7 +53,7 @@
 
     describe 'allows :html options' do
       before(:each) do
-         @form = semantic_form_for(:post, ::Post.new, :url => '/hello', :html => { :id => "something-special", :class => "something-extra", :multipart => true }) do |builder|
+         @form = semantic_form_for(@new_post, :url => '/hello', :html => { :id => "something-special", :class => "something-extra", :multipart => true }) do |builder|
         end
       end
 
@@ -79,16 +79,24 @@
         builder.object_name.should == "post"
       end
     end
-
+    
     it 'can be called with a generic style and instance variable' do
-      semantic_form_for(:post, @new_post, :url => new_post_path) do |builder|
-        builder.object.class.should == ::Post
-        builder.object_name.to_s.should == "post" # TODO: is this forced .to_s a bad assumption somewhere?
+      if rails3?
+        semantic_form_for(@new_post, :as => :post, :url => new_post_path) do |builder|
+          builder.object.class.should == ::Post
+          builder.object_name.to_s.should == "post" # TODO: is this forced .to_s a bad assumption somewhere?
+        end
+      end
+      if rails2?
+        semantic_form_for(:post, @new_post, :url => new_post_path) do |builder|
+          builder.object.class.should == ::Post
+          builder.object_name.to_s.should == "post" # TODO: is this forced .to_s a bad assumption somewhere?
+        end
       end
     end
 
     it 'can be called with a generic style and inline object' do
-      semantic_form_for(:post, ::Post.new, :url => new_post_path) do |builder|
+      semantic_form_for(@new_post, :url => new_post_path) do |builder|
         builder.object.class.should == ::Post
         builder.object_name.to_s.should == "post" # TODO: is this forced .to_s a bad assumption somewhere?
       end
@@ -98,7 +106,7 @@
       it "yields an instance of the given builder" do
         class MyAwesomeCustomBuilder < ::Formtastic::SemanticFormBuilder
         end
-        semantic_form_for(:post, ::Post.new, :url => '/hello', :builder => MyAwesomeCustomBuilder) do |builder|
+        semantic_form_for(@new_post, :url => '/hello', :builder => MyAwesomeCustomBuilder) do |builder|
           builder.class.should == MyAwesomeCustomBuilder
         end
       end
@@ -108,7 +116,7 @@ class MyAwesomeCustomBuilder < ::Formtastic::SemanticFormBuilder
 
   describe '#semantic_fields_for' do
     it 'yields an instance of SemanticFormBuilder' do
-      semantic_fields_for(:post, ::Post.new, :url => '/hello') do |builder|
+      semantic_fields_for(@new_post, :url => '/hello') do |builder|
         builder.class.should == ::Formtastic::SemanticFormBuilder
       end
     end
@@ -116,7 +124,7 @@ class MyAwesomeCustomBuilder < ::Formtastic::SemanticFormBuilder
 
   describe '#semantic_form_remote_for' do
     it 'yields an instance of SemanticFormBuilder' do
-      semantic_form_remote_for(:post, ::Post.new, :url => '/hello') do |builder|
+      semantic_form_remote_for(@new_post, :url => '/hello') do |builder|
         builder.class.should == ::Formtastic::SemanticFormBuilder
       end
     end
@@ -124,7 +132,7 @@ class MyAwesomeCustomBuilder < ::Formtastic::SemanticFormBuilder
 
   describe '#semantic_form_for_remote' do
     it 'yields an instance of SemanticFormBuilder' do
-      semantic_remote_form_for(:post, ::Post.new, :url => '/hello') do |builder|
+      semantic_remote_form_for(@new_post, :url => '/hello') do |builder|
         builder.class.should == ::Formtastic::SemanticFormBuilder
       end
     end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f0bb087c7..b4602f0d0 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -45,6 +45,7 @@ class OutputBuffer < Formtastic::Util.rails_safe_buffer_class
 end
 
 module FormtasticSpecHelper
+  include ActionPack
   include ActionView::Context if defined?(ActionView::Context)
   include ActionView::Helpers::FormHelper
   include ActionView::Helpers::FormTagHelper
@@ -63,6 +64,14 @@ module FormtasticSpecHelper
   
   include Formtastic::SemanticFormHelper
   
+  def rails3?
+    ActionPack::VERSION::MAJOR > 2
+  end
+
+  def rails2?
+    ActionPack::VERSION::MAJOR == 2
+  end
+  
   def default_input_type(column_type, column_name = :generic_column_name)
     @new_post.stub!(column_name)
     @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => column_type)) unless column_type.nil?

From 44114715fc78511ea490206638400a9b790508c8 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Tue, 20 Apr 2010 06:59:29 +0200
Subject: [PATCH 048/992] =?UTF-8?q?Fix=20html=20escaping=20of=20=C2=B4requ?=
 =?UTF-8?q?ired=C2=B4=20string?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/formtastic.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index e37f40d23..57b622a12 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -11,7 +11,7 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
     @@default_text_area_height = 20
     @@all_fields_required_by_default = true
     @@include_blank_for_select_by_default = true
-    @@required_string = proc { %{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>} }
+    @@required_string = proc { ::Formtastic::Util.html_safe(%{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>}) }
     @@optional_string = ''
     @@inline_errors = :sentence
     @@label_str_method = :humanize

From 2b536030d2d7b13967e3562d0661487c534153f0 Mon Sep 17 00:00:00 2001
From: guillaume belleguic <guillaume.belleguic@cixi.eu>
Date: Tue, 20 Apr 2010 20:06:34 +0200
Subject: [PATCH 049/992] add ActiveModel::Validators support instead of
 ValidationReflection plugin

---
 lib/formtastic.rb | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 57b622a12..600114720 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -544,19 +544,14 @@ def strip_formtastic_options(options) #:nodoc:
       #   configuration option @@all_fields_required_by_default is used.
       #
       def method_required?(attribute) #:nodoc:
-        if @object && @object.class.respond_to?(:reflect_on_validations_for)
+        if @object && @object.class.respond_to?(:validators_on)
           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
+          !@object.class.validators_on(attribute_sym).find{|validator| (validator.kind == :presence) && (validator.options.present? ? options_require_validation?(validator.options) : true)}.nil?
         else
           @@all_fields_required_by_default
         end
       end
-
+      
       # Determines whether the given options evaluate to true
       def options_require_validation?(options) #nodoc
         if_condition = !options[:if].nil?

From 7e6267157e586ff793b599191ef18ebca376c3c1 Mon Sep 17 00:00:00 2001
From: guillaume belleguic <guillaume.belleguic@cixi.eu>
Date: Tue, 20 Apr 2010 20:11:46 +0200
Subject: [PATCH 050/992] change comments

---
 lib/formtastic.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 600114720..7cd09915c 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -535,12 +535,12 @@ def strip_formtastic_options(options) #:nodoc:
       # * 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 :required option isn't provided in the options hash, and the object is an ActiveModel,
+      #   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
+      # * if the :required option isn't provided, and the object isn't an ActiveModel, the value of the
       #   configuration option @@all_fields_required_by_default is used.
       #
       def method_required?(attribute) #:nodoc:

From fd13bd6bb27424f765a5a856e16f75e282e07939 Mon Sep 17 00:00:00 2001
From: guillaume belleguic <guillaume.belleguic@cixi.eu>
Date: Wed, 21 Apr 2010 00:09:20 +0200
Subject: [PATCH 051/992] Please convert the tests from reflection_validation
 to activemodel validation. #todo clean up

---
 spec/input_spec.rb  | 26 +++++++++++++++++---------
 spec/spec_helper.rb |  4 ++--
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index da224a0ed..3602df91d 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -129,19 +129,25 @@
 
         describe 'and an object was given' do
 
-          describe 'and the validation reflection plugin is available' do
+          describe 'and its a ActiveModel' do
 
             before do
-              @new_post.class.stub!(:method_defined?).with(:reflect_on_validations_for).and_return(true)
+              @new_post.class.stub!(:method_defined?).with(:validators_on).and_return(true)
+              @title_validation = mock('ActiveModel::Validations::PresenceValidator', :attributes => [:title], :options => {})
+              @title_validation.stub!(:kind).and_return(:presence)
+              @body_validation = mock('ActiveModel::Validations::PresenceValidator', :attributes => [:body], :options => {:if => true})
+              @body_validation.stub!(:kind).and_return(:presence)
             end
 
             describe 'and validates_presence_of was called for the method' do
               it 'should be required' do
-                @new_post.class.should_receive(:reflect_on_validations_for).with(:title).and_return([
-                  mock('MacroReflection', :macro => :validates_presence_of, :name => :title, :options => nil)
+
+                @new_post.class.should_receive(:validators_on).with(:title).and_return([
+                  @title_validation
                 ])
-                @new_post.class.should_receive(:reflect_on_validations_for).with(:body).and_return([
-                  mock('MacroReflection', :macro => :validates_presence_of, :name => :body, :options => {:if => true})
+
+                @new_post.class.should_receive(:validators_on).with(:body).and_return([
+                  @body_validation
                 ])
 
                 form = semantic_form_for(@new_post) do |builder|
@@ -196,8 +202,10 @@
             
             # TODO make a matcher for this?
             def should_be_required(options)
-              @new_post.class.should_receive(:reflect_on_validations_for).with(:body).and_return([
-                mock('MacroReflection', :macro => :validates_presence_of, :name => :body, :options => options[:options])
+              body_validation = mock('ActiveModel::Validations::PresenceValidator', :attributes => [:body], :options => options[:options])
+              body_validation.stub!(:kind).and_return(:presence)
+              @new_post.class.should_receive(:validators_on).with(:body).and_return([
+                body_validation
               ])
               
               form = semantic_form_for(@new_post) do |builder|
@@ -217,7 +225,7 @@ def should_be_required(options)
 
             describe 'and validates_presence_of was not called for the method' do
               before do
-                @new_post.class.should_receive(:reflect_on_validations_for).with(:title).and_return([])
+                @new_post.class.should_receive(:validators_on).with(:title).and_return([])
               end
 
               it 'should not be required' do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index b4602f0d0..774584522 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -168,7 +168,7 @@ def new_author_path; "/authors/new"; end
     ::Author.stub!(:find).and_return([@fred, @bob])
     ::Author.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     ::Author.stub!(:human_name).and_return('::Author')
-    ::Author.stub!(:reflect_on_validations_for).and_return([])
+    ::Author.stub!(:validators_on).and_return([])
     ::Author.stub!(:reflect_on_association).and_return { |column_name| mock('reflection', :options => {}, :klass => Post, :macro => :has_many) if column_name == :posts }
     ::Author.stub!(:content_columns).and_return([mock('column', :name => 'login'), mock('column', :name => 'created_at')])
     ::Author.stub!(:to_key).and_return(nil)
@@ -205,7 +205,7 @@ def new_author_path; "/authors/new"; end
     ::Post.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     ::Post.stub!(:human_name).and_return('Post')
     ::Post.stub!(:reflect_on_all_validations).and_return([])
-    ::Post.stub!(:reflect_on_validations_for).and_return([])
+    ::Post.stub!(:validators_on).and_return([])
     ::Post.stub!(:reflect_on_association).and_return do |column_name|
       case column_name
       when :author, :author_status

From 2769784d3dde6a3aa857d9ad045c30fc3f0fc228 Mon Sep 17 00:00:00 2001
From: guillaume belleguic <guillaume.belleguic@cixi.eu>
Date: Wed, 21 Apr 2010 00:24:24 +0200
Subject: [PATCH 052/992] add active_model_presence_validator helper and clean
 up test

---
 spec/input_spec.rb  | 12 +++---------
 spec/spec_helper.rb |  6 ++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 3602df91d..c54c75905 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -133,21 +133,17 @@
 
             before do
               @new_post.class.stub!(:method_defined?).with(:validators_on).and_return(true)
-              @title_validation = mock('ActiveModel::Validations::PresenceValidator', :attributes => [:title], :options => {})
-              @title_validation.stub!(:kind).and_return(:presence)
-              @body_validation = mock('ActiveModel::Validations::PresenceValidator', :attributes => [:body], :options => {:if => true})
-              @body_validation.stub!(:kind).and_return(:presence)
             end
 
             describe 'and validates_presence_of was called for the method' do
               it 'should be required' do
 
                 @new_post.class.should_receive(:validators_on).with(:title).and_return([
-                  @title_validation
+                  active_model_presence_validator([:title])
                 ])
 
                 @new_post.class.should_receive(:validators_on).with(:body).and_return([
-                  @body_validation
+                  active_model_presence_validator([:body], {:if => true})
                 ])
 
                 form = semantic_form_for(@new_post) do |builder|
@@ -202,10 +198,8 @@
             
             # TODO make a matcher for this?
             def should_be_required(options)
-              body_validation = mock('ActiveModel::Validations::PresenceValidator', :attributes => [:body], :options => options[:options])
-              body_validation.stub!(:kind).and_return(:presence)
               @new_post.class.should_receive(:validators_on).with(:body).and_return([
-                body_validation
+                active_model_presence_validator([:body], options[:options])
               ])
               
               form = semantic_form_for(@new_post) do |builder|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 774584522..34a9cbb81 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -83,6 +83,12 @@ def default_input_type(column_type, column_name = :generic_column_name)
     return @default_type
   end
   
+  def active_model_presence_validator(attributes, options = {})
+    presence_validator = mock('ActiveModel::Validations::PresenceValidator', :attributes => attributes, :options => options)
+    presence_validator.stub!(:kind).and_return(:presence)
+    presence_validator
+  end
+  
   class ::Post
     extend ActiveModel::Naming if defined?(ActiveModel::Naming)
     include ActiveModel::Conversion if defined?(ActiveModel::Conversion)

From 4a1c8b8762e28fa1262165107304b6e7a8fe9098 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Wed, 21 Apr 2010 13:18:49 +0200
Subject: [PATCH 053/992] Make ActiveModel Validation reflection compatible
 with validation_reflection

* Tests in rails3/rspec2 environment fail due to unstub! not being implemented in rspec-mocks
  (up to and including rspe-mocks 2.0.0.beta7)
---
 lib/formtastic.rb   |  25 ++++++---
 spec/input_spec.rb  | 120 ++++++++++++++++++++++++++++++++++++++++++--
 spec/spec_helper.rb |   2 -
 3 files changed, 135 insertions(+), 12 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 7cd09915c..d4f2ef263 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -535,23 +535,34 @@ def strip_formtastic_options(options) #:nodoc:
       # * 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 object is an ActiveModel,
-      #   true is returned
+      # * if the :required option isn't provided in the options hash, and the ValidationReflection
+      #   plugin is installed (http://github.com/redinger/validation_reflection), or the object is
+      #   an ActiveModel, 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 object isn't an ActiveModel, the value of the
+      # * if the :required option isn't provided, and validates_presence_of can't be determined, the
       #   configuration option @@all_fields_required_by_default is used.
       #
       def method_required?(attribute) #:nodoc:
-        if @object && @object.class.respond_to?(:validators_on)
+        if @object && @object.class.respond_to?(:reflect_on_validations_for)
           attribute_sym = attribute.to_s.sub(/_id$/, '').to_sym
-          !@object.class.validators_on(attribute_sym).find{|validator| (validator.kind == :presence) && (validator.options.present? ? options_require_validation?(validator.options) : true)}.nil?
+
+          @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
+          if @object && @object.class.respond_to?(:validators_on)
+            attribute_sym = attribute.to_s.sub(/_id$/, '').to_sym
+            !@object.class.validators_on(attribute_sym).find{|validator| (validator.kind == :presence) && (validator.options.present? ? options_require_validation?(validator.options) : true)}.nil?
+          else
+            @@all_fields_required_by_default
+          end
         end
       end
-      
+
       # Determines whether the given options evaluate to true
       def options_require_validation?(options) #nodoc
         if_condition = !options[:if].nil?
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index c54c75905..4da6f1d0b 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -129,12 +129,126 @@
 
         describe 'and an object was given' do
 
+          describe 'and the validation reflection plugin is available' do
+
+            before do
+              ::Post.stub!(:reflect_on_validations_for).and_return([])
+              @new_post.class.stub!(:method_defined?).with(:reflect_on_validations_for).and_return(true)
+            end
+
+            after do
+              ::Post.unstub(:reflect_on_validations_for)
+              @new_post.class.stub!(:method_defined?).with(:reflect_on_validations_for).and_return(false)
+            end
+
+            describe 'and validates_presence_of was called for the method' do
+              it 'should be required' do
+                @new_post.class.should_receive(:reflect_on_validations_for).with(:title).and_return([
+                  mock('MacroReflection', :macro => :validates_presence_of, :name => :title, :options => nil)
+                ])
+                @new_post.class.should_receive(:reflect_on_validations_for).with(:body).and_return([
+                  mock('MacroReflection', :macro => :validates_presence_of, :name => :body, :options => {:if => true})
+                ])
+
+                form = semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:title))
+                  concat(builder.input(:body))
+                end
+                output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+                output_buffer.should have_tag('form li.required')
+                output_buffer.should_not have_tag('form li.optional')
+              end
+
+              it 'should be not be required if the optional :if condition is not satisifed' do
+                should_be_required(:required => false, :options => { :if => false })
+              end
+
+              it 'should not be required if the optional :if proc evaluates to false' do
+                should_be_required(:required => false, :options => { :if => proc { |record| false } })
+              end
+
+              it 'should be required if the optional :if proc evaluates to true' do
+                should_be_required(:required => true, :options => { :if => proc { |record| true } })
+              end
+
+              it 'should not be required if the optional :unless proc evaluates to true' do
+                should_be_required(:required => false, :options => { :unless => proc { |record| true } })
+              end
+
+              it 'should be required if the optional :unless proc evaluates to false' do
+                should_be_required(:required => true, :options => { :unless => proc { |record| false } })
+              end
+
+              it 'should be required if the optional :if with a method string evaluates to true' do
+                @new_post.should_receive(:required_condition).and_return(true)
+                should_be_required(:required => true, :options => { :if => :required_condition })
+              end
+
+              it 'should be required if the optional :if with a method string evaluates to false' do
+                @new_post.should_receive(:required_condition).and_return(false)
+                should_be_required(:required => false, :options => { :if => :required_condition })
+              end
+
+              it 'should not be required if the optional :unless with a method string evaluates to false' do
+                 @new_post.should_receive(:required_condition).and_return(false)
+                should_be_required(:required => true, :options => { :unless => :required_condition })
+              end
+
+               it 'should be required if the optional :unless with a method string evaluates to true' do
+                 @new_post.should_receive(:required_condition).and_return(true)
+                 should_be_required(:required => false, :options => { :unless => :required_condition })
+               end
+            end
+
+            # TODO make a matcher for this?
+            def should_be_required(options)
+              @new_post.class.should_receive(:reflect_on_validations_for).with(:body).and_return([
+                mock('MacroReflection', :macro => :validates_presence_of, :name => :body, :options => options[:options])
+              ])
+
+              form = semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:body))
+              end
+
+              output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+
+              if options[:required]
+                output_buffer.should_not have_tag('form li.optional')
+                output_buffer.should have_tag('form li.required')
+              else
+                output_buffer.should have_tag('form li.optional')
+                output_buffer.should_not have_tag('form li.required')
+              end
+            end
+
+            describe 'and validates_presence_of was not called for the method' do
+              before do
+                @new_post.class.should_receive(:reflect_on_validations_for).with(:title).and_return([])
+              end
+
+              it 'should not be required' do
+                form = semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:title))
+                end
+                output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+                output_buffer.should_not have_tag('form li.required')
+                output_buffer.should have_tag('form li.optional')
+              end
+            end
+
+          end
+
           describe 'and its a ActiveModel' do
 
             before do
+              ::Post.stub!(:validators_on).and_return([])
               @new_post.class.stub!(:method_defined?).with(:validators_on).and_return(true)
             end
 
+            after do
+              ::Post.unstub!(:validators_on)
+              @new_post.class.stub!(:method_defined?).with(:validators_on).and_return(false)
+            end
             describe 'and validates_presence_of was called for the method' do
               it 'should be required' do
 
@@ -432,7 +546,7 @@ def should_be_required(options)
                   end
                 
                   output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
-                  output_buffer.should have_tag('form li label', @localized_label_text)
+                  output_buffer.should have_tag('form li label', Regexp.new('^' + @localized_label_text))
                 end
               end
             end
@@ -507,7 +621,7 @@ def should_be_required(options)
               concat(builder.input(:published, :as => :boolean, :label => true))
             end
             output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
-            output_buffer.should have_tag('form li label', @localized_label_text)
+            output_buffer.should have_tag('form li label', Regexp.new('^' + @localized_label_text))
           end
 
           it 'should render a hint paragraph containing an optional localized label (I18n) if first is not set' do
@@ -525,7 +639,7 @@ def should_be_required(options)
               concat(builder.input(:published, :as => :boolean, :label => true))
             end
             output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
-            output_buffer.should have_tag('form li label', @default_localized_label_text)
+            output_buffer.should have_tag('form li label', Regexp.new('^' + @default_localized_label_text))
           end
         end
       end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 34a9cbb81..7500693c6 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -174,7 +174,6 @@ def new_author_path; "/authors/new"; end
     ::Author.stub!(:find).and_return([@fred, @bob])
     ::Author.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     ::Author.stub!(:human_name).and_return('::Author')
-    ::Author.stub!(:validators_on).and_return([])
     ::Author.stub!(:reflect_on_association).and_return { |column_name| mock('reflection', :options => {}, :klass => Post, :macro => :has_many) if column_name == :posts }
     ::Author.stub!(:content_columns).and_return([mock('column', :name => 'login'), mock('column', :name => 'created_at')])
     ::Author.stub!(:to_key).and_return(nil)
@@ -211,7 +210,6 @@ def new_author_path; "/authors/new"; end
     ::Post.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     ::Post.stub!(:human_name).and_return('Post')
     ::Post.stub!(:reflect_on_all_validations).and_return([])
-    ::Post.stub!(:validators_on).and_return([])
     ::Post.stub!(:reflect_on_association).and_return do |column_name|
       case column_name
       when :author, :author_status

From 1bd9545b6c19302c510ad443fded00942619c5cb Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 21 Apr 2010 06:48:37 +1000
Subject: [PATCH 054/992] belongs_to associations will now render errors
 attached to the association and the column (fixes issue #161)

* previously f.input(:section) would only look to errors[:section]
* so anything in errors[:section_id] would not be displayed
* some associations like validates_uniqueness_of need to be done on the column name
* Formtastic will now also look at errors[:section_id] (or whatever the foreign key is named)
* we squish all the errors together, make sure they're unique and display them all with the input
---
 lib/formtastic.rb   | 18 ++++++++++++++++--
 spec/errors_spec.rb | 19 +++++++++++++++++++
 spec/spec_helper.rb |  2 ++
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 0d6ef2d68..d1232096c 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -422,8 +422,10 @@ def label(method, options_or_text=nil, options=nil)
     #
     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?
+        errors = [@object.errors[method.to_sym]]
+        errors << [@object.errors[association_primary_key(method)]] if association_macro_for_method(method) == :belongs_to
+        errors = errors.flatten.compact.uniq
+        send(:"error_#{@@inline_errors}", [*errors]) if errors.any?
       else
         nil
       end
@@ -483,6 +485,18 @@ def association_columns(*by_associations) #:nodoc:
           []
         end
       end
+      
+      # Returns nil, or a symbol like :belongs_to or :has_many
+      def association_macro_for_method(method) #:nodoc:
+        reflection = self.reflection_for(method)
+        reflection.macro if reflection
+      end
+      
+      def association_primary_key(method)
+        reflection = self.reflection_for(method)
+        reflection.options[:foreign_key] if reflection && !reflection.options[:foreign_key].blank?
+        :"#{method}_id"
+      end
 
       # Prepare options to be sent to label
       #
diff --git a/spec/errors_spec.rb b/spec/errors_spec.rb
index 5f1361c38..b7653324f 100644
--- a/spec/errors_spec.rb
+++ b/spec/errors_spec.rb
@@ -81,5 +81,24 @@
     end
   end
   
+  
+  describe 'when there are errors on the association and column' do
+    
+    it "should list all unique errors" do
+      ::Formtastic::SemanticFormBuilder.inline_errors = :list
+      ::Post.stub!(:reflections).and_return({:author => mock('reflection', :options => {}, :macro => :belongs_to)})
+      
+      @errors.stub!(:[]).with(:author).and_return(['must not be blank'])
+      @errors.stub!(:[]).with(:author_id).and_return(['is already taken', 'must not be blank']) # note the duplicate of association
+      
+      semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:author))
+      end
+      output_buffer.should have_tag("ul.errors li", /must not be blank/, :count => 1)
+      output_buffer.should have_tag("ul.errors li", /is already taken/, :count => 1)
+    end
+    
+  end
+  
 end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index b2f9d8988..33638f677 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -146,6 +146,7 @@ def new_author_path; "/authors/new"; end
     ::Post.stub!(:human_name).and_return('Post')
     ::Post.stub!(:reflect_on_all_validations).and_return([])
     ::Post.stub!(:reflect_on_validations_for).and_return([])
+    ::Post.stub!(:reflections).and_return({})
     ::Post.stub!(:reflect_on_association).and_return do |column_name|
       case column_name
       when :author, :author_status
@@ -180,6 +181,7 @@ def new_author_path; "/authors/new"; end
     @new_post.stub!(:column_for_attribute).with(:publish_at).and_return(mock('column', :type => :date))
     @new_post.stub!(:column_for_attribute).with(:time_zone).and_return(mock('column', :type => :string))
     @new_post.stub!(:column_for_attribute).with(:allow_comments).and_return(mock('column', :type => :boolean))
+    @new_post.stub!(:column_for_attribute).with(:author).and_return(mock('column', :type => :integer))
     
     @new_post.stub!(:author).and_return(@bob)
     @new_post.stub!(:author_id).and_return(@bob.id)

From 4088d3f3371e44897497869f4b553cec12981c6f Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <m.jonuschat@gute-botschafter.de>
Date: Fri, 23 Apr 2010 11:08:32 +0200
Subject: [PATCH 055/992] Updated Changelog

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 0a89d5d61..577201a9c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@
 * Added railtie to perform initialization tasks after the rails git framework is available (rails3)
 * Added helper to mark strings as HTML safe depending on environment, adapted from haml 2.2 solution (rails3)
 * Added compatible install and form helpers (rails3)
+* Added support for ActiveModel Validations, thanks to Guillaume Belleguic (rails3)
 
 0.9.9 [unreleased]
 

From 84a3fee908accaa1af3e700ced116dfc97e4ce98 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Fri, 23 Apr 2010 11:54:18 +0200
Subject: [PATCH 056/992] Work around missing unstub! functionality in rspec
 2.0 for now. This change should be reverted once rspec 2.0 gets unstub! and
 allows dynamic switching between the available validation reflection methods

---
 spec/input_spec.rb  | 189 ++++++++++++++++++++++----------------------
 spec/spec_helper.rb |   1 +
 2 files changed, 97 insertions(+), 93 deletions(-)

diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 4da6f1d0b..de95b6d57 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -136,9 +136,11 @@
               @new_post.class.stub!(:method_defined?).with(:reflect_on_validations_for).and_return(true)
             end
 
-            after do
-              ::Post.unstub(:reflect_on_validations_for)
-              @new_post.class.stub!(:method_defined?).with(:reflect_on_validations_for).and_return(false)
+            unless defined?(Rspec)
+              after do
+                ::Post.unstub!(:reflect_on_validations_for)
+                @new_post.class.stub!(:method_defined?).with(:reflect_on_validations_for).and_return(false)
+              end
             end
 
             describe 'and validates_presence_of was called for the method' do
@@ -238,114 +240,115 @@ def should_be_required(options)
 
           end
 
-          describe 'and its a ActiveModel' do
+          unless defined?(Rspec)
+            describe 'and its a ActiveModel' do
+              before do
+                ::Post.stub!(:validators_on).and_return([])
+                @new_post.class.stub!(:method_defined?).with(:validators_on).and_return(true)
+              end
 
-            before do
-              ::Post.stub!(:validators_on).and_return([])
-              @new_post.class.stub!(:method_defined?).with(:validators_on).and_return(true)
-            end
+              after do
+                ::Post.unstub!(:validators_on)
+                @new_post.class.stub!(:method_defined?).with(:validators_on).and_return(false)
+              end
+              describe 'and validates_presence_of was called for the method' do
+                it 'should be required' do
 
-            after do
-              ::Post.unstub!(:validators_on)
-              @new_post.class.stub!(:method_defined?).with(:validators_on).and_return(false)
-            end
-            describe 'and validates_presence_of was called for the method' do
-              it 'should be required' do
+                  @new_post.class.should_receive(:validators_on).with(:title).and_return([
+                    active_model_presence_validator([:title])
+                  ])
 
-                @new_post.class.should_receive(:validators_on).with(:title).and_return([
-                  active_model_presence_validator([:title])
-                ])
+                  @new_post.class.should_receive(:validators_on).with(:body).and_return([
+                    active_model_presence_validator([:body], {:if => true})
+                  ])
+
+                  form = semantic_form_for(@new_post) do |builder|
+                    concat(builder.input(:title))
+                    concat(builder.input(:body))
+                  end
+                  output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+                  output_buffer.should have_tag('form li.required')
+                  output_buffer.should_not have_tag('form li.optional')
+                end
+
+                it 'should be not be required if the optional :if condition is not satisifed' do
+                  should_be_required(:required => false, :options => { :if => false })
+                end
 
+                it 'should not be required if the optional :if proc evaluates to false' do
+                  should_be_required(:required => false, :options => { :if => proc { |record| false } })
+                end
+
+                it 'should be required if the optional :if proc evaluates to true' do
+                  should_be_required(:required => true, :options => { :if => proc { |record| true } })
+                end
+
+                it 'should not be required if the optional :unless proc evaluates to true' do
+                  should_be_required(:required => false, :options => { :unless => proc { |record| true } })
+                end
+
+                it 'should be required if the optional :unless proc evaluates to false' do
+                  should_be_required(:required => true, :options => { :unless => proc { |record| false } })
+                end
+
+                it 'should be required if the optional :if with a method string evaluates to true' do
+                  @new_post.should_receive(:required_condition).and_return(true)
+                  should_be_required(:required => true, :options => { :if => :required_condition })
+                end
+
+                it 'should be required if the optional :if with a method string evaluates to false' do
+                  @new_post.should_receive(:required_condition).and_return(false)
+                  should_be_required(:required => false, :options => { :if => :required_condition })
+                end
+
+                it 'should not be required if the optional :unless with a method string evaluates to false' do
+                   @new_post.should_receive(:required_condition).and_return(false)
+                  should_be_required(:required => true, :options => { :unless => :required_condition })
+                end
+
+                 it 'should be required if the optional :unless with a method string evaluates to true' do
+                   @new_post.should_receive(:required_condition).and_return(true)
+                   should_be_required(:required => false, :options => { :unless => :required_condition })
+                 end
+              end
+
+              # TODO make a matcher for this?
+              def should_be_required(options)
                 @new_post.class.should_receive(:validators_on).with(:body).and_return([
-                  active_model_presence_validator([:body], {:if => true})
+                  active_model_presence_validator([:body], options[:options])
                 ])
 
                 form = semantic_form_for(@new_post) do |builder|
-                  concat(builder.input(:title))
                   concat(builder.input(:body))
                 end
-                output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
-                output_buffer.should have_tag('form li.required')
-                output_buffer.should_not have_tag('form li.optional')
-              end
 
-              it 'should be not be required if the optional :if condition is not satisifed' do
-                should_be_required(:required => false, :options => { :if => false })
-              end
-              
-              it 'should not be required if the optional :if proc evaluates to false' do
-                should_be_required(:required => false, :options => { :if => proc { |record| false } })
-              end
-              
-              it 'should be required if the optional :if proc evaluates to true' do
-                should_be_required(:required => true, :options => { :if => proc { |record| true } })
-              end
-              
-              it 'should not be required if the optional :unless proc evaluates to true' do
-                should_be_required(:required => false, :options => { :unless => proc { |record| true } })
-              end
-              
-              it 'should be required if the optional :unless proc evaluates to false' do
-                should_be_required(:required => true, :options => { :unless => proc { |record| false } })
-              end
-              
-              it 'should be required if the optional :if with a method string evaluates to true' do
-                @new_post.should_receive(:required_condition).and_return(true)
-                should_be_required(:required => true, :options => { :if => :required_condition })
-              end
-              
-              it 'should be required if the optional :if with a method string evaluates to false' do
-                @new_post.should_receive(:required_condition).and_return(false)
-                should_be_required(:required => false, :options => { :if => :required_condition })
-              end
-              
-              it 'should not be required if the optional :unless with a method string evaluates to false' do
-                 @new_post.should_receive(:required_condition).and_return(false)
-                should_be_required(:required => true, :options => { :unless => :required_condition })
-              end
-              
-               it 'should be required if the optional :unless with a method string evaluates to true' do
-                 @new_post.should_receive(:required_condition).and_return(true)
-                 should_be_required(:required => false, :options => { :unless => :required_condition })
-               end
-            end
-            
-            # TODO make a matcher for this?
-            def should_be_required(options)
-              @new_post.class.should_receive(:validators_on).with(:body).and_return([
-                active_model_presence_validator([:body], options[:options])
-              ])
-              
-              form = semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:body))
-              end
+                output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
 
-              output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
-              
-              if options[:required]
-                output_buffer.should_not have_tag('form li.optional')
-                output_buffer.should have_tag('form li.required')
-              else
-                output_buffer.should have_tag('form li.optional')
-                output_buffer.should_not have_tag('form li.required')
+                if options[:required]
+                  output_buffer.should_not have_tag('form li.optional')
+                  output_buffer.should have_tag('form li.required')
+                else
+                  output_buffer.should have_tag('form li.optional')
+                  output_buffer.should_not have_tag('form li.required')
+                end
               end
-            end
 
-            describe 'and validates_presence_of was not called for the method' do
-              before do
-                @new_post.class.should_receive(:validators_on).with(:title).and_return([])
-              end
+              describe 'and validates_presence_of was not called for the method' do
+                before do
+                  @new_post.class.should_receive(:validators_on).with(:title).and_return([])
+                end
 
-              it 'should not be required' do
-                form = semantic_form_for(@new_post) do |builder|
-                  concat(builder.input(:title))
+                it 'should not be required' do
+                  form = semantic_form_for(@new_post) do |builder|
+                    concat(builder.input(:title))
+                  end
+                  output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+                  output_buffer.should_not have_tag('form li.required')
+                  output_buffer.should have_tag('form li.optional')
                 end
-                output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
-                output_buffer.should_not have_tag('form li.required')
-                output_buffer.should have_tag('form li.optional')
               end
-            end
 
+            end
           end
 
           describe 'and the validation reflection plugin is not available' do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 7500693c6..a38849cca 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -210,6 +210,7 @@ def new_author_path; "/authors/new"; end
     ::Post.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     ::Post.stub!(:human_name).and_return('Post')
     ::Post.stub!(:reflect_on_all_validations).and_return([])
+    ::Post.stub!(:reflect_on_validations_for).and_return([]) if defined?(Rspec)
     ::Post.stub!(:reflect_on_association).and_return do |column_name|
       case column_name
       when :author, :author_status

From de8885772daeb3557967584023c3279aa7459f19 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Fri, 23 Apr 2010 12:00:16 +0200
Subject: [PATCH 057/992] Adjust spec test for errors on association and column
 to rspec 2.0

---
 spec/errors_spec.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/errors_spec.rb b/spec/errors_spec.rb
index b7653324f..55c8b9276 100644
--- a/spec/errors_spec.rb
+++ b/spec/errors_spec.rb
@@ -91,9 +91,10 @@
       @errors.stub!(:[]).with(:author).and_return(['must not be blank'])
       @errors.stub!(:[]).with(:author_id).and_return(['is already taken', 'must not be blank']) # note the duplicate of association
       
-      semantic_form_for(@new_post) do |builder|
+      form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author))
       end
+      output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
       output_buffer.should have_tag("ul.errors li", /must not be blank/, :count => 1)
       output_buffer.should have_tag("ul.errors li", /is already taken/, :count => 1)
     end

From b5f771a5a60b8c43bd91c9486c83963d67cb2ce6 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sat, 24 Apr 2010 14:30:05 -0300
Subject: [PATCH 058/992] find_raw_collection_for_column should honour the
 association's conditions

Closes #61
---
 lib/formtastic.rb                |  8 +++++++-
 spec/inputs/select_input_spec.rb | 28 ++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index d1232096c..565f25ad7 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1398,7 +1398,13 @@ 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] || {})
+          options[:find_options] ||= {}
+
+          if conditions = reflection.options[:conditions]
+            options[:find_options][:conditions] = reflection.klass.merge_conditions(conditions, options[:find_options][:conditions])
+          end
+
+          reflection.klass.find(:all, options[:find_options])
         else
           create_boolean_collection(options)
         end
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 55a2ffa1b..c20613396 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -162,6 +162,34 @@
     end
   end
 
+  describe "for a belongs_to association with :conditions" do
+    before do
+      ::Post.stub!(:reflect_on_association).with(:author).and_return do
+        mock = mock('reflection', :options => {:conditions => {:active => true}}, :klass => ::Author, :macro => :belongs_to)
+        mock.stub!(:[]).with(:class_name).and_return("Author")
+        mock
+      end
+    end
+
+    it "should call author.find with association conditions" do
+      ::Author.should_receive(:merge_conditions).with({:active => true}, nil).and_return(:active => true)
+      ::Author.should_receive(:find).with(:all, :conditions => {:active => true})
+
+      semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:author, :as => :select))
+      end
+    end
+
+    it "should call author.find with association conditions and find_options conditions" do
+      ::Author.should_receive(:merge_conditions).with({:active => true}, {:publisher => true}).and_return(:active => true, :publisher => true)
+      ::Author.should_receive(:find).with(:all, :conditions => {:active => true, :publisher => true})
+
+      semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:author, :as => :select, :find_options => {:conditions => {:publisher => true}}))
+      end
+    end
+  end
+
   describe 'for a belongs_to association with :group_by => :continent' do
     before do
       @authors = [@bob, @fred, @fred, @fred]

From a745de3b382a89c6cbd8f347542156dbd2e03ccc Mon Sep 17 00:00:00 2001
From: Petrica Ghiurca <petrica@ghiurca.net>
Date: Mon, 26 Apr 2010 13:52:39 +0300
Subject: [PATCH 059/992] test case

---
 spec/inputs/select_input_spec.rb | 7 +++++--
 spec/inputs_spec.rb              | 1 -
 spec/spec_helper.rb              | 6 +++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 3be01f990..b03709628 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -94,6 +94,7 @@
     before do
       semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select))
+				concat(builder.input(:reviewer, :as => :select))
       end
     end
 
@@ -108,11 +109,13 @@
     it 'should have a select inside the wrapper' do
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#post_author_id')
+			output_buffer.should have_tag('form li select#post_reviewer_id')
     end
 
     it 'should have a valid name' do
       output_buffer.should have_tag("form li select[@name='post[author_id]']")
       output_buffer.should_not have_tag("form li select[@name='post[author_id][]']")
+			output_buffer.should_not have_tag("form li select[@name='post[reviewer_id][]']")
     end
 
     it 'should not create a multi-select' do
@@ -128,14 +131,14 @@
     end
 
     it 'should have a select option for each Author' do
-      output_buffer.should have_tag('form li select option', :count => ::Author.find(:all).size + 1)
+      output_buffer.should have_tag("form li select[@name='post[author_id]'] option", :count => ::Author.find(:all).size + 1)
       ::Author.find(:all).each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
       end
     end
 
     it 'should have one option with a "selected" attribute' do
-      output_buffer.should have_tag('form li select option[@selected]', :count => 1)
+      output_buffer.should have_tag("form li select[@name='post[author_id]'] option[@selected]", :count => 1)
     end
 
     it 'should not singularize the association name' do
diff --git a/spec/inputs_spec.rb b/spec/inputs_spec.rb
index ef938e8f0..a697281b9 100644
--- a/spec/inputs_spec.rb
+++ b/spec/inputs_spec.rb
@@ -391,5 +391,4 @@
     end
 
   end
-
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index b2f9d8988..3eabfe8d6 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -126,6 +126,7 @@ def new_author_path; "/authors/new"; end
     @new_post.stub!(:new_record?).and_return(true)
     @new_post.stub!(:errors).and_return(mock('errors', :[] => nil))
     @new_post.stub!(:author).and_return(nil)
+		@new_post.stub!(:reviewer).and_return(nil)
     @new_post.stub!(:main_post).and_return(nil)
     @new_post.stub!(:sub_posts).and_return([]) #TODO should be a mock with methods for adding sub posts
 
@@ -148,7 +149,7 @@ def new_author_path; "/authors/new"; end
     ::Post.stub!(:reflect_on_validations_for).and_return([])
     ::Post.stub!(:reflect_on_association).and_return do |column_name|
       case column_name
-      when :author, :author_status
+      when :author, :author_status, :reviewer
         mock = mock('reflection', :options => {}, :klass => ::Author, :macro => :belongs_to)
         mock.stub!(:[]).with(:class_name).and_return("Author")
         mock
@@ -184,6 +185,9 @@ def new_author_path; "/authors/new"; end
     @new_post.stub!(:author).and_return(@bob)
     @new_post.stub!(:author_id).and_return(@bob.id)
 
+		@new_post.stub!(:reviewer).and_return(@fred)
+		@new_post.stub!(:reviewer_id).and_return(@fred.id)
+
     @new_post.should_receive(:publish_at=).any_number_of_times
     @new_post.should_receive(:title=).any_number_of_times
     @new_post.stub!(:main_post_id).and_return(nil)

From 74eaf337ac63b32d59bb24a1a6486fd893e60724 Mon Sep 17 00:00:00 2001
From: Petrica Ghiurca <petrica@ghiurca.net>
Date: Mon, 26 Apr 2010 14:49:34 +0300
Subject: [PATCH 060/992] added test case for model that has 2 belongs_to
 fields pointing to same class one specifiying class_name in options

---
 spec/spec_helper.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3eabfe8d6..52a4fac31 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -149,9 +149,13 @@ def new_author_path; "/authors/new"; end
     ::Post.stub!(:reflect_on_validations_for).and_return([])
     ::Post.stub!(:reflect_on_association).and_return do |column_name|
       case column_name
-      when :author, :author_status, :reviewer
+      when :author, :author_status
         mock = mock('reflection', :options => {}, :klass => ::Author, :macro => :belongs_to)
         mock.stub!(:[]).with(:class_name).and_return("Author")
+        mock
+			when :reviewer
+				mock = mock('reflection', :options => {:class_name => 'Author'}, :klass => ::Author, :macro => :belongs_to)
+        mock.stub!(:[]).with(:class_name).and_return("Author")
         mock
       when :authors
         mock('reflection', :options => {}, :klass => ::Author, :macro => :has_and_belongs_to_many)

From 29133e1ab497e4494b0c05a57547e615337091f8 Mon Sep 17 00:00:00 2001
From: Doug Ireton <dougireton@gmail.com>
Date: Wed, 28 Apr 2010 11:22:09 +0800
Subject: [PATCH 061/992] Fixed minor typo in README Usage section.

---
 README.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.textile b/README.textile
index 461800f0c..a620af903 100644
--- a/README.textile
+++ b/README.textile
@@ -206,7 +206,7 @@ When working in has many association, you can even supply @"%i"@ in your fieldse
 </pre>
 
 
-Customize HTML attributes for any input using the @:input_html@ option. Typically his is used to disable the input, change the size of a text field, change the rows in a textarea, or even to add a special class to an input to attach special behavior like "autogrow":http://plugins.jquery.com/project/autogrow textareas:
+Customize HTML attributes for any input using the @:input_html@ option. Typically this is used to disable the input, change the size of a text field, change the rows in a textarea, or even to add a special class to an input to attach special behavior like "autogrow":http://plugins.jquery.com/project/autogrow textareas:
 
 <pre>
   <% semantic_form_for @post do |form| %>

From 3ae6b20655b06f301f7537c5b376d4253f206a9e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 4 May 2010 06:49:02 +1000
Subject: [PATCH 062/992] An input without an :as option will only route to
 country_input if the method name is /country$/ not /country/ (which is too
 greedy). Resolves #260

---
 lib/formtastic.rb                 |  2 +-
 spec/inputs/country_input_spec.rb | 36 ++++++++++++++++++++++++++++++-
 spec/spec_helper.rb               |  6 ++++++
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 565f25ad7..5720f7f05 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1341,7 +1341,7 @@ def default_input_type(method, options = {}) #:nodoc:
           case column.type
           when :string
             return :password  if method.to_s =~ /password/
-            return :country   if method.to_s =~ /country/
+            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$/
diff --git a/spec/inputs/country_input_spec.rb b/spec/inputs/country_input_spec.rb
index fa9e9f6b8..3a28050e8 100644
--- a/spec/inputs/country_input_spec.rb
+++ b/spec/inputs/country_input_spec.rb
@@ -75,6 +75,40 @@
     end
     
   end
-
+  
+  describe "matching" do
+    
+    describe "when the attribute is 'country'" do
+      
+      before do
+        semantic_form_for(@new_post) do |builder|
+          builder.stub!(:country_select).and_return("<select><option>...</option></select>")
+          concat(builder.input(:country))
+        end
+      end
+      
+      it "should render a country input" do
+        output_buffer.should have_tag "form li.country"
+      end
+    end
+    
+    describe "whent the attribute is 'country_something'" do
+      
+      before do
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:country_subdivision))
+          concat(builder.input(:country_code))
+        end
+      end
+      
+      it "should render a country input" do
+        output_buffer.should_not have_tag "form li.country"
+        output_buffer.should have_tag "form li.string", :count => 2
+      end
+      
+    end
+    
+  end
+  
 end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 24103ec82..32f56923d 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -179,6 +179,9 @@ def new_author_path; "/authors/new"; end
     @new_post.stub!(:time_zone)
     @new_post.stub!(:category_name)
     @new_post.stub!(:allow_comments)
+    @new_post.stub!(:country)
+    @new_post.stub!(:country_subdivision)
+    @new_post.stub!(:country_code)
     @new_post.stub!(:column_for_attribute).with(:meta_description).and_return(mock('column', :type => :string, :limit => 255))
     @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :string, :limit => 50))
     @new_post.stub!(:column_for_attribute).with(:body).and_return(mock('column', :type => :text))
@@ -187,6 +190,9 @@ def new_author_path; "/authors/new"; end
     @new_post.stub!(:column_for_attribute).with(:time_zone).and_return(mock('column', :type => :string))
     @new_post.stub!(:column_for_attribute).with(:allow_comments).and_return(mock('column', :type => :boolean))
     @new_post.stub!(:column_for_attribute).with(:author).and_return(mock('column', :type => :integer))
+    @new_post.stub!(:column_for_attribute).with(:country).and_return(mock('column', :type => :string, :limit => 255))
+    @new_post.stub!(:column_for_attribute).with(:country_subdivision).and_return(mock('column', :type => :string, :limit => 255))
+    @new_post.stub!(:column_for_attribute).with(:country_code).and_return(mock('column', :type => :string, :limit => 255))
     
     @new_post.stub!(:author).and_return(@bob)
     @new_post.stub!(:author_id).and_return(@bob.id)

From 9c9dce80d902a919deed3bc41cf6df65755dd4f6 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Tue, 4 May 2010 10:42:33 +0200
Subject: [PATCH 063/992] Fix deprecation warnings regarding toplevel
 rails/init.rb

---
 init.rb | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 init.rb

diff --git a/init.rb b/init.rb
new file mode 100644
index 000000000..41a097dc9
--- /dev/null
+++ b/init.rb
@@ -0,0 +1 @@
+require File.join(File.dirname(__FILE__), 'rails', 'init')
\ No newline at end of file

From 112beb57e2e5f63c59b737f649e2736e09ad89b5 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Thu, 15 Apr 2010 16:28:29 +0800
Subject: [PATCH 064/992] Mark formtastic outputs as html_safe

Formtastic::Util.html_safe() checks the available environment and marks a string as html_safe appropriately
---
 lib/formtastic.rb      | 41 +++++++++++++++++++++--------------------
 lib/formtastic/util.rb | 25 +++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 20 deletions(-)
 create mode 100644 lib/formtastic/util.rb

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 5720f7f05..23bcb17d5 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1,5 +1,6 @@
 # coding: utf-8
 require File.join(File.dirname(__FILE__), *%w[formtastic i18n])
+require File.join(File.dirname(__FILE__), *%w[formtastic util])
 
 module Formtastic #:nodoc:
 
@@ -105,7 +106,7 @@ def input(method, options = {})
         send(:"inline_#{type}_for", method, options)
       end.compact.join("\n")
 
-      return template.content_tag(:li, list_item_content, wrapper_html)
+      return template.content_tag(:li, Formtastic::Util.html_safe(list_item_content), wrapper_html)
     end
 
     # Creates an input fieldset and ol tag wrapping for use around a set of inputs.  It can be
@@ -342,7 +343,7 @@ def commit_button(*args)
       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)
+      template.content_tag(:li, Formtastic::Util.html_safe(self.submit(text, button_html)), :class => element_class)
     end
 
     # A thin wrapper around #fields_for to set :builder => Formtastic::SemanticFormBuilder
@@ -406,7 +407,7 @@ def label(method, options_or_text=nil, options=nil)
       text = (options.delete(:label_prefix_for_nested_input) || "") + text
 
       input_name = options.delete(:input_name) || method
-      super(input_name, text, options)
+      super(input_name, Formtastic::Util.html_safe(text), options)
     end
 
     # Generates error messages for the given method. Errors can be shown as list,
@@ -454,7 +455,7 @@ def semantic_errors(*args)
       return nil if full_errors.blank?
       html_options[:class] ||= "errors"
       template.content_tag(:ul, html_options) do
-        full_errors.map { |error| template.content_tag(:li, error) }.join
+        Formtastic::Util.html_safe(full_errors.map { |error| template.content_tag(:li, Formtastic::Util.html_safe(error)) }.join)
       end
     end
 
@@ -873,12 +874,12 @@ def radio_input(method, options)
           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}",
+            Formtastic::Util.html_safe("#{self.radio_button(input_name, value, html_options)} #{label}"),
             :for => input_id
           )
 
           li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
-          template.content_tag(:li, li_content, li_options)
+          template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
         end
 
         field_set_and_list_wrapping_for_method(method, options, list_item_content)
@@ -1027,10 +1028,10 @@ def date_or_datetime_input(method, options)
             opts = strip_formtastic_options(options).merge(:prefix => @object_name, :field_name => field_name, :default => datetime)
             item_label_text = labels[input] || ::I18n.t(input.to_s, :default => input.to_s.humanize, :scope => [:datetime, :prompts])
 
-            list_items_capture << template.content_tag(:li, [
-                !item_label_text.blank? ? template.content_tag(:label, item_label_text, :for => input_id) : "",
+            list_items_capture << template.content_tag(:li, Formtastic::Util.html_safe([
+                !item_label_text.blank? ? template.content_tag(:label, Formtastic::Util.html_safe(item_label_text), :for => input_id) : "",
                 template.send(:"select_#{input}", datetime, opts, html_options.merge(:id => input_id))
-              ].join("")
+              ].join(""))
             )
           end
         end
@@ -1139,12 +1140,12 @@ def check_boxes_input(method, options)
           html_options[:id] = input_id
 
           li_content = template.content_tag(:label,
-            "#{self.check_box(input_name, html_options, value, unchecked_value)} #{label}",
+            Formtastic::Util.html_safe("#{self.check_box(input_name, html_options, value, unchecked_value)} #{label}"),
             :for => input_id
           )
 
           li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
-          template.content_tag(:li, li_content, li_options)
+          template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
         end
 
         field_set_and_list_wrapping_for_method(method, options, list_item_content)
@@ -1209,13 +1210,13 @@ def inline_input_for(method, options)
       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')
+        template.content_tag(:p, Formtastic::Util.html_safe(options[:hint]), :class => 'inline-hints')
       end
 
       # 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')
+        template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.untaint), :class => 'inline-errors')
       end
 
       # Creates an error li list.
@@ -1223,15 +1224,15 @@ def error_sentence(errors) #:nodoc:
       def error_list(errors) #:nodoc:
         list_elements = []
         errors.each do |error|
-          list_elements <<  template.content_tag(:li, error.untaint)
+          list_elements <<  template.content_tag(:li, Formtastic::Util.html_safe(error.untaint))
         end
-        template.content_tag(:ul, list_elements.join("\n"), :class => 'errors')
+        template.content_tag(:ul, Formtastic::Util.html_safe(list_elements.join("\n")), :class => 'errors')
       end
 
       # Creates an error sentence containing only the first error
       #
       def error_first(errors) #:nodoc:
-        template.content_tag(:p, errors.first.untaint, :class => 'inline-errors')
+        template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => 'inline-errors')
       end
 
       # Generates the required or optional string. If the value set is a proc,
@@ -1278,7 +1279,7 @@ def field_set_and_list_wrapping(*args, &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?
+        legend  = template.content_tag(:legend, template.content_tag(:span, Formtastic::Util.html_safe(legend))) unless legend.blank?
 
         if block_given?
           contents = if template.respond_to?(:is_haml?) && template.is_haml?
@@ -1291,11 +1292,11 @@ def field_set_and_list_wrapping(*args, &block) #:nodoc:
         # 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),
+          Formtastic::Util.html_safe(legend) << template.content_tag(:ol, Formtastic::Util.html_safe(contents)),
           html_options.except(:builder, :parent)
         )
 
-        template.concat(fieldset) if block_given?
+        template.concat(fieldset) if block_given? && (!defined?(Rails::VERSION) || Rails::VERSION::MAJOR == 2)
         fieldset
       end
 
@@ -1323,7 +1324,7 @@ def field_set_and_list_wrapping_for_method(method, options, contents) #:nodoc:
             template.content_tag(:legend,
                 self.label(method, options_for_label(options).merge(:for => options.delete(:label_for))), :class => 'label'
               ) <<
-            template.content_tag(:ol, contents)
+            template.content_tag(:ol, Formtastic::Util.html_safe(contents))
           )
       end
 
diff --git a/lib/formtastic/util.rb b/lib/formtastic/util.rb
new file mode 100644
index 000000000..822d93aa9
--- /dev/null
+++ b/lib/formtastic/util.rb
@@ -0,0 +1,25 @@
+# Adapted from the rails3 compatibility shim in Haml 2.2
+module Formtastic
+  module Util
+    extend self
+    ## Rails XSS Safety
+
+    # Returns the given text, marked as being HTML-safe.
+    # With older versions of the Rails XSS-safety mechanism,
+    # this destructively modifies the HTML-safety of `text`.
+    #
+    # @param text [String]
+    # @return [String] `text`, marked as HTML-safe
+    def html_safe(text)
+      return text if text.nil?
+      return text.html_safe if defined?(ActiveSupport::SafeBuffer)
+      return text.html_safe!
+    end
+
+    def rails_safe_buffer_class
+      return ActionView::SafeBuffer if defined?(ActionView::SafeBuffer)
+      ActiveSupport::SafeBuffer
+    end
+
+  end
+end

From 60f2d1356509b0177e5cc2f2cd58f9b07078a461 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Thu, 15 Apr 2010 16:28:06 +0800
Subject: [PATCH 065/992] Make inputs_for_nested_attributes return strings

---
 CHANGELOG         | 1 +
 lib/formtastic.rb | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 13916e9a8..472481357 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
 * Changed the behaviour of associations with a :class_name option to be more consistent with what Rails expects
 * Fixed issues with Ruby 1.9.1 and Haml
 * Add the :disabled option to check_boxes input
+* Fixed inputs_for_nested_attributes only appending to the output buffer
 
 0.9.8
 
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 23bcb17d5..2ea9d994f 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -519,9 +519,9 @@ def inputs_for_nested_attributes(*args, &block) #:nodoc:
           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) } }
+          proc { |f| return f.inputs(*args){ block.call(f) } }
         else
-          proc { |f| f.inputs(*args) }
+          proc { |f| return f.inputs(*args) }
         end
 
         fields_for_args = [options.delete(:for), options.delete(:for_options) || {}].flatten

From 5a8a859b12f204bc64efefdfec68f9298387c031 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Fri, 16 Apr 2010 09:54:38 -0300
Subject: [PATCH 066/992] Boolean inputs not properly html safe again. Closes
 #241

---
 lib/formtastic.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 2ea9d994f..abb6690c6 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -400,14 +400,18 @@ def label(method, options_or_text=nil, options=nil)
         text = options_or_text
         options ||= {}
       end
+
       text = localized_string(method, text, :label) || humanized_attribute_name(method)
       text += required_or_optional_string(options.delete(:required))
+      text = Formtastic::Util.html_safe(text)
 
       # special case for boolean (checkbox) labels, which have a nested input
-      text = (options.delete(:label_prefix_for_nested_input) || "") + text
+      if options.key?(:label_prefix_for_nested_input)
+        text = options.delete(:label_prefix_for_nested_input) + text
+      end
 
       input_name = options.delete(:input_name) || method
-      super(input_name, Formtastic::Util.html_safe(text), options)
+      super(input_name, text, options)
     end
 
     # Generates error messages for the given method. Errors can be shown as list,

From f07059ce9947c4b76fb1540f6ce960974e89efd7 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Tue, 20 Apr 2010 06:59:29 +0200
Subject: [PATCH 067/992] =?UTF-8?q?Fix=20html=20escaping=20of=20=C2=B4requ?=
 =?UTF-8?q?ired=C2=B4=20string?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/formtastic.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index abb6690c6..40de1c295 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -10,7 +10,7 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
     @@default_text_area_height = 20
     @@all_fields_required_by_default = true
     @@include_blank_for_select_by_default = true
-    @@required_string = proc { %{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>} }
+    @@required_string = proc { ::Formtastic::Util.html_safe(%{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>}) }
     @@optional_string = ''
     @@inline_errors = :sentence
     @@label_str_method = :humanize

From 731b7923f96809c313bf3a5abb38e38da2641d5c Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Thu, 15 Apr 2010 19:18:10 +0200
Subject: [PATCH 068/992] Refactored I18n handling in spec testsuite

* Make use of I18n.backend.reload! to clear/reinitialize translation strings
* Start with a minimal set of translation strings and add expected ones in the test
* Reinitialize the translation backend after each test to start with a known state
---
 CHANGELOG                      |  3 +-
 spec/commit_button_spec.rb     | 75 ++++++++++++++++------------------
 spec/i18n_spec.rb              | 19 ++++-----
 spec/input_spec.rb             | 23 ++++++-----
 spec/inputs/time_input_spec.rb |  1 +
 5 files changed, 59 insertions(+), 62 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 472481357..4af1357c1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,8 +3,9 @@
 * Changed date/time inputs to default to nil instead of Time.now when the object has no value (due to deprecation warning, #240)
 * Changed the behaviour of associations with a :class_name option to be more consistent with what Rails expects
 * Fixed issues with Ruby 1.9.1 and Haml
-* Add the :disabled option to check_boxes input
 * Fixed inputs_for_nested_attributes only appending to the output buffer
+* Add the :disabled option to check_boxes input
+* Changed I18n handling in spec tests to use I18n.backend.reload! instead of assigning nil
 
 0.9.8
 
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index 8645dcf2d..7b8819340 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -140,7 +140,7 @@
           end
           
           after do
-            ::I18n.backend.store_translations :en, :formtastic => {:submit => nil}
+            ::I18n.backend.reload!
           end
           
           it 'should render an input with default I18n-localized label (fallback)' do
@@ -157,33 +157,34 @@
              :formtastic => {
                  :actions => {
                    :submit => 'Custom Submit',
-                   :post => {
-                     :submit => 'Custom Submit {{model}}'
-                    }
                   }
                }
            ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
          end
 
-         it 'should render an input with localized label (I18n)' do
-           semantic_form_for(:post, :url => 'http://example.com') do |builder|
-             concat(builder.commit_button)
-           end
-           output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit Post"][@class~="submit"]})
+         after do
+           ::I18n.backend.reload!
          end
 
-         it 'should render an input with anoptional localized label (I18n) - if first is not set' do
+         it 'should render an input with localized label (I18n)' do
            ::I18n.backend.store_translations :en,
              :formtastic => {
                  :actions => {
                    :post => {
-                     :submit => nil
+                     :submit => 'Custom Submit {{model}}'
                     }
                   }
                }
            semantic_form_for(:post, :url => 'http://example.com') do |builder|
              concat(builder.commit_button)
            end
+           output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit Post"][@class~="submit"]})
+         end
+
+         it 'should render an input with anoptional localized label (I18n) - if first is not set' do
+           semantic_form_for(:post, :url => 'http://example.com') do |builder|
+             concat(builder.commit_button)
+           end
            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit"][@class~="submit"]})
          end
 
@@ -213,7 +214,7 @@
           end
 
           after do
-            ::I18n.backend.store_translations :en, :formtastic => {:create => nil}
+            ::I18n.backend.reload!
           end
 
           it 'should render an input with default I18n-localized label (fallback)' do
@@ -230,40 +231,35 @@
               :formtastic => {
                   :actions => {
                     :create => 'Custom Create',
-                    :post => {
-                      :create => 'Custom Create {{model}}'
-                     }
                    }
                 }
             ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
           end
           
           after do
-            ::I18n.backend.store_translations :en, :formtastic => nil
+            ::I18n.backend.reload!
           end
 
           it 'should render an input with localized label (I18n)' do
-            semantic_form_for(@new_post) do |builder|
-              concat(builder.commit_button)
-            end
-            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create Post"][@class~="create"]})
-          end
-
-          it 'should render an input with anoptional localized label (I18n) - if first is not set' do
             ::I18n.backend.store_translations :en,
               :formtastic => {
                   :actions => {
                     :post => {
-                      :create => nil
+                      :create => 'Custom Create {{model}}'
                      }
                    }
                 }
             semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create"][@class~="create"]})
-            ::I18n.backend.store_translations :en, :formtastic => nil
-            
+            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create Post"][@class~="create"]})
+          end
+
+          it 'should render an input with anoptional localized label (I18n) - if first is not set' do
+            semantic_form_for(@new_post) do |builder|
+              concat(builder.commit_button)
+            end
+            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create"][@class~="create"]})            
           end
 
         end
@@ -292,7 +288,7 @@
           end
           
           after do
-            ::I18n.backend.store_translations :en, :formtastic => {:update => nil}
+            ::I18n.backend.reload!
           end
 
           it 'should render an input with default I18n-localized label (fallback)' do
@@ -309,33 +305,34 @@
               :formtastic => {
                   :actions => {
                     :update => 'Custom Save',
-                    :post => {
-                      :update => 'Custom Save {{model}}'
-                     }
                    }
                 }
             ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
           end
 
-          it 'should render an input with localized label (I18n)' do
-            semantic_form_for(@new_post) do |builder|
-              concat(builder.commit_button)
-            end
-            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save Post"][@class~="update"]})
+          after do
+            ::I18n.backend.reload!
           end
-
-          it 'should render an input with anoptional localized label (I18n) - if first is not set' do
+          
+          it 'should render an input with localized label (I18n)' do
             ::I18n.backend.store_translations :en,
               :formtastic => {
                   :actions => {
                     :post => {
-                      :update => nil
+                      :update => 'Custom Save {{model}}'
                      }
                    }
                 }
             semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
+            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save Post"][@class~="update"]})
+          end
+
+          it 'should render an input with anoptional localized label (I18n) - if first is not set' do
+            semantic_form_for(@new_post) do |builder|
+              concat(builder.commit_button)
+            end
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save"][@class~="update"]})
             ::I18n.backend.store_translations :en, :formtastic => {}
           end
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index d4c480a39..10c3da907 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -24,7 +24,6 @@
     
     before do
       @formtastic_strings = {
-          :required       => 'Default Required',
           :yes            => 'Default Yes',
           :no             => 'Default No',
           :create         => 'Default Create {{model}}',
@@ -36,8 +35,13 @@
         }
       ::I18n.backend.store_translations :en, :formtastic => @formtastic_strings
     end
+
+    after do
+      ::I18n.backend.reload!
+    end
     
     it "should translate core strings correctly" do
+      ::I18n.backend.store_translations :en, {:formtastic => {:required => 'Default Required'}}
       ::Formtastic::I18n.t(:required).should  == "Default Required"
       ::Formtastic::I18n.t(:yes).should       == "Default Yes"
       ::Formtastic::I18n.t(:no).should        == "Default No"
@@ -54,7 +58,6 @@
     end
     
     it "should be possible to override default values" do
-      ::I18n.backend.store_translations :en, {:formtastic => {:required => nil}}
       ::Formtastic::I18n.t(:required, :default => 'Nothing found!').should == 'Nothing found!'
     end
     
@@ -63,15 +66,9 @@
   describe "when no I18n locales are available" do
     
     before do
-      ::I18n.backend.store_translations :en, :formtastic => {
-          :required => nil,
-          :yes => nil,
-          :no => nil,
-          :create => nil,
-          :update => nil
-        }
+      ::I18n.backend.reload!
     end
-    
+
     it "should use default strings" do
       (::Formtastic::I18n::DEFAULT_VALUES.keys).each do |key|
         ::Formtastic::I18n.t(key, :model => '{{model}}').should == ::Formtastic::I18n::DEFAULT_VALUES[key]
@@ -102,7 +99,7 @@
     end
     
     after do
-      ::I18n.backend.store_translations :en, :formtastic => nil
+      ::I18n.backend.reload!
       ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
     end
     
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 07d986e77..2d9f8262d 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -528,34 +528,35 @@ def should_be_required(options)
               :formtastic => {
                   :hints => {
                     :title => @default_localized_hint_text,
-                    :post => {
-                      :title => @localized_hint_text
-                     }
                    }
                 }
             ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
           end
           
+          after do
+            ::I18n.backend.reload!
+          end
+          
           describe 'when provided value (hint value) is set to TRUE' do
             it 'should render a hint paragraph containing a localized hint (I18n)' do
-              semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:title, :hint => true))
-              end
-              output_buffer.should have_tag('form li p.inline-hints', @localized_hint_text)
-            end
-            
-            it 'should render a hint paragraph containing an optional localized hint (I18n) if first is not set' do
               ::I18n.backend.store_translations :en,
               :formtastic => {
                   :hints => {
                     :post => {
-                      :title => nil
+                      :title => @localized_hint_text
                      }
                    }
                 }
               semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => true))
               end
+              output_buffer.should have_tag('form li p.inline-hints', @localized_hint_text)
+            end
+            
+            it 'should render a hint paragraph containing an optional localized hint (I18n) if first is not set' do
+              semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title, :hint => true))
+              end
               output_buffer.should have_tag('form li p.inline-hints', @default_localized_hint_text)
             end
           end
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index fff1da852..ae0b36039 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -12,6 +12,7 @@
   
   describe "general" do
     before do
+      ::I18n.backend.reload!
       output_buffer.replace ''
     end
 

From fe63045235f706f61cf22065746b5dab3e313dbe Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Mon, 24 May 2010 13:24:52 +0200
Subject: [PATCH 069/992] Use HTML safe strings in tests

---
 spec/inputs/country_input_spec.rb | 10 +++++-----
 spec/spec_helper.rb               |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/spec/inputs/country_input_spec.rb b/spec/inputs/country_input_spec.rb
index 3a28050e8..525da8659 100644
--- a/spec/inputs/country_input_spec.rb
+++ b/spec/inputs/country_input_spec.rb
@@ -26,7 +26,7 @@
     
     before do
       semantic_form_for(@new_post) do |builder|
-        builder.stub!(:country_select).and_return("<select><option>...</option></select>")
+        builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         concat(builder.input(:country, :as => :country))
       end
     end
@@ -54,8 +54,8 @@
     it "should be passed down to the country_select helper when provided" do
       priority_countries = ["Foo", "Bah"]
       semantic_form_for(@new_post) do |builder|
-        builder.stub!(:country_select).and_return("<select><option>...</option></select>")
-        builder.should_receive(:country_select).with(:country, priority_countries, {}, {}).and_return("<select><option>...</option></select>")
+        builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        builder.should_receive(:country_select).with(:country, priority_countries, {}, {}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         
         concat(builder.input(:country, :as => :country, :priority_countries => priority_countries))
       end
@@ -68,7 +68,7 @@
       
       semantic_form_for(@new_post) do |builder|
         builder.stub!(:country_select).and_return("<select><option>...</option></select>")
-        builder.should_receive(:country_select).with(:country, priority_countries, {}, {}).and_return("<select><option>...</option></select>")
+        builder.should_receive(:country_select).with(:country, priority_countries, {}, {}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         
         concat(builder.input(:country, :as => :country))
       end
@@ -82,7 +82,7 @@
       
       before do
         semantic_form_for(@new_post) do |builder|
-          builder.stub!(:country_select).and_return("<select><option>...</option></select>")
+          builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
           concat(builder.input(:country))
         end
       end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 32f56923d..9e8b3107c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -22,6 +22,7 @@
 end
 
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic/util'))
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic/layout_helper'))
 
 

From 71e187b5e0cd37c83932b9b05937cb6008b2b68c Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Mon, 24 May 2010 13:40:13 +0200
Subject: [PATCH 070/992] Use Rails 2.3.7 with XSS support for test suite

---
 spec/spec_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9e8b3107c..a40207f64 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,8 +1,8 @@
 # coding: utf-8
 require 'rubygems'
 
-gem 'activesupport', '2.3.5'
-gem 'actionpack', '2.3.5'
+gem 'activesupport', '2.3.7'
+gem 'actionpack', '2.3.7'
 require 'active_support'
 require 'action_pack'
 require 'action_view'

From 32e8aa1659276b7923711e1cd7236cd558ab90ac Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Mon, 24 May 2010 15:50:11 +0200
Subject: [PATCH 071/992] New method to find out if we are running under rails3
 since SafeBuffer is in rails 2.3.7 now

---
 lib/formtastic/util.rb | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic/util.rb b/lib/formtastic/util.rb
index 822d93aa9..9b0d3b648 100644
--- a/lib/formtastic/util.rb
+++ b/lib/formtastic/util.rb
@@ -17,9 +17,19 @@ def html_safe(text)
     end
 
     def rails_safe_buffer_class
-      return ActionView::SafeBuffer if defined?(ActionView::SafeBuffer)
-      ActiveSupport::SafeBuffer
+      # It's important that we check ActiveSupport first,
+      # because in Rails 2.3.6 ActionView::SafeBuffer exists
+      # but is a deprecated proxy object.
+      return ActiveSupport::SafeBuffer if defined?(ActiveSupport::SafeBuffer)
+      return ActionView::SafeBuffer
     end
 
+    def rails3?
+      version=
+        if defined?(ActionPack::VERSION::MAJOR)
+          ActionPack::VERSION::MAJOR
+        end
+      version >= 3
+    end
   end
 end

From ae3d5bcb04cabd5caad5f16550135dfde8483017 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Mon, 24 May 2010 15:51:53 +0200
Subject: [PATCH 072/992] Update spec suite to use new helper to check for
 rails3

---
 spec/buttons_spec.rb                  | 32 +++++------
 spec/commit_button_spec.rb            | 46 +++++++--------
 spec/custom_macros.rb                 | 80 +++++++++++++--------------
 spec/errors_spec.rb                   |  2 +-
 spec/form_helper_spec.rb              | 16 +++---
 spec/i18n_spec.rb                     |  4 +-
 spec/include_blank_spec.rb            |  8 +--
 spec/input_spec.rb                    | 64 ++++++++++-----------
 spec/inputs/boolean_input_spec.rb     | 12 ++--
 spec/inputs/check_boxes_input_spec.rb | 38 ++++++-------
 spec/inputs/country_input_spec.rb     |  8 +--
 spec/inputs/date_input_spec.rb        | 24 ++++----
 spec/inputs/datetime_input_spec.rb    | 36 ++++++------
 spec/inputs/file_input_spec.rb        |  2 +-
 spec/inputs/hidden_input_spec.rb      | 10 ++--
 spec/inputs/radio_input_spec.rb       | 28 +++++-----
 spec/inputs/select_input_spec.rb      | 78 +++++++++++++-------------
 spec/inputs/text_input_spec.rb        |  2 +-
 spec/inputs/time_input_spec.rb        | 28 +++++-----
 spec/inputs/time_zone_input_spec.rb   | 12 ++--
 spec/inputs_spec.rb                   | 66 +++++++++++-----------
 spec/layout_helper_spec.rb            |  4 +-
 spec/semantic_fields_for_spec.rb      |  2 +-
 23 files changed, 301 insertions(+), 301 deletions(-)

diff --git a/spec/buttons_spec.rb b/spec/buttons_spec.rb
index 76178fe3d..0fbee3c09 100644
--- a/spec/buttons_spec.rb
+++ b/spec/buttons_spec.rb
@@ -22,22 +22,22 @@
       end
 
       it 'should render a fieldset inside the form, with a class of "inputs"' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form fieldset.buttons")
       end
 
       it 'should render an ol inside the fieldset' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form fieldset.buttons ol")
       end
 
       it 'should render the contents of the block inside the ol' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form fieldset.buttons ol", /hello/)
       end
 
       it 'should not render a legend inside the fieldset' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form fieldset.buttons legend")
       end
     end
@@ -52,7 +52,7 @@
         end
       end
       it 'should render a fieldset inside the form' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form fieldset legend", /#{@legend_text}/)
       end
     end
@@ -68,7 +68,7 @@
         end
       end
       it 'should pass the options into the fieldset tag as attributes' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form fieldset##{@id_option}")
         output_buffer.should have_tag("form fieldset.#{@class_option}")
       end
@@ -87,32 +87,32 @@
       end
 
       it 'should render a form' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form')
       end
 
       it 'should render a buttons fieldset inside the form' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form fieldset.buttons')
       end
 
       it 'should not render a legend in the fieldset' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag('form fieldset.buttons legend')
       end
 
       it 'should render an ol in the fieldset' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form fieldset.buttons ol')
       end
 
       it 'should render a list item in the ol for each default button' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form fieldset.buttons ol li', :count => 1)
       end
 
       it 'should render a commit list item for the commit button' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form fieldset.buttons ol li.commit')
       end
 
@@ -127,7 +127,7 @@
       end
 
       it 'should render a form with a fieldset containing a list item for each button arg' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset.buttons > ol > li', :count => 1)
         output_buffer.should have_tag('form > fieldset.buttons > ol > li.commit')
       end
@@ -143,18 +143,18 @@
       end
 
       it 'should render a form with a fieldset containing a list item for each button arg' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset.buttons > ol > li', :count => 1)
         output_buffer.should have_tag('form > fieldset.buttons > ol > li.commit', :count => 1)
       end
 
       it 'should pass the options down to the fieldset' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset#my-id.buttons')
       end
 
       it 'should use the special :name option as a text for the legend tag' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset#my-id.buttons > legend', /Now click a button/)
       end
 
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index d2071ed38..18f4289e5 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -20,17 +20,17 @@
     end
 
     it 'should render a commit li' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('li.commit')
     end
 
     it 'should render an input with a type attribute of "submit"' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('li.commit input[@type="submit"]')
     end
 
     it 'should render an input with a name attribute of "commit"' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('li.commit input[@name="commit"]')
     end
 
@@ -40,7 +40,7 @@
         concat(builder.commit_button('text', :button_html => {:class => 'my_class', :id => 'my_id'}))
       end
 
-      output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('li.commit input#my_id')
       output_buffer.should have_tag('li.commit input.my_class')
     end
@@ -61,7 +61,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :button_html => {}))
         end
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('li.commit input[@accesskey="s"]')
       end
     end
@@ -72,7 +72,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :accesskey => 'o'))
         end
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag('li.commit input[@accesskey="s"]')
         output_buffer.should have_tag('li.commit input[@accesskey="o"]')
       end
@@ -84,7 +84,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :accesskey => 'o', :button_html => {:accesskey => 't'}))
         end
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag('li.commit input[@accesskey="s"]')
         output_buffer.should_not have_tag('li.commit input[@accesskey="o"]')
         output_buffer.should have_tag('li.commit input[@accesskey="t"]')
@@ -103,12 +103,12 @@
     end
     
     it "should render the string as the value of the button" do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('li input[@value="a string"]')
     end
     
     it "should deal with the options hash" do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('li input.pretty')
     end
     
@@ -124,7 +124,7 @@
     end
     
     it "should deal with the options hash" do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('li input.pretty')
     end
     
@@ -139,7 +139,7 @@
           form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
             concat(builder.commit_button("Click!"))
           end
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag('li.commit input[@value="Click!"][@class~="submit"]')
         end
       end
@@ -158,7 +158,7 @@
             form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+            output_buffer.concat(form) if Formtastic::Util.rails3?
             output_buffer.should have_tag('li.commit input[@value="Submit Post"][@class~="submit"]')
           end
         end
@@ -190,7 +190,7 @@
            form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
              concat(builder.commit_button)
            end
-           output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+           output_buffer.concat(form) if Formtastic::Util.rails3?
            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit Post"][@class~="submit"]})
          end
 
@@ -198,7 +198,7 @@
            form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
              concat(builder.commit_button)
            end
-           output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+           output_buffer.concat(form) if Formtastic::Util.rails3?
            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit"][@class~="submit"]})
          end
 
@@ -217,7 +217,7 @@
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.commit_button("Click!"))
           end
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag('li.commit input[@value="Click!"][@class~="create"]')
         end
       end
@@ -236,7 +236,7 @@
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+            output_buffer.concat(form) if Formtastic::Util.rails3?
             output_buffer.should have_tag('li.commit input[@value="Create Post"][@class~="create"]')
           end
         end
@@ -268,7 +268,7 @@
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+            output_buffer.concat(form) if Formtastic::Util.rails3?
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create Post"][@class~="create"]})
           end
 
@@ -276,7 +276,7 @@
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+            output_buffer.concat(form) if Formtastic::Util.rails3?
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create"][@class~="create"]})
           end
 
@@ -295,7 +295,7 @@
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.commit_button("Click!"))
           end
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag('li.commit input[@value="Click!"][@class~="update"]')
         end
       end
@@ -314,7 +314,7 @@
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+            output_buffer.concat(form) if Formtastic::Util.rails3?
             output_buffer.should have_tag('li.commit input[@value="Save Post"][@class~="update"]')
           end
         end
@@ -347,7 +347,7 @@
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+            output_buffer.concat(form) if Formtastic::Util.rails3?
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save Post"][@class~="update"]})
           end
 
@@ -355,7 +355,7 @@
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+            output_buffer.concat(form) if Formtastic::Util.rails3?
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save"][@class~="update"]})
             ::I18n.backend.store_translations :en, :formtastic => {}
           end
@@ -392,7 +392,7 @@ def self.human_name
     end
     
     it "should render the string as the value of the button" do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('li input[@value="Create User post"]')
     end
     
diff --git a/spec/custom_macros.rb b/spec/custom_macros.rb
index 2b4702f21..2378e36f1 100644
--- a/spec/custom_macros.rb
+++ b/spec/custom_macros.rb
@@ -8,77 +8,77 @@ module ClassMethods
     
     def it_should_have_input_wrapper_with_class(class_name)
       it "should have input wrapper with class '#{class_name}'" do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li.#{class_name}") 
       end
     end
     
     def it_should_have_input_wrapper_with_id(id_string)
       it "should have input wrapper with id '#{id_string}'" do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li##{id_string}") 
       end
     end
     
     def it_should_not_have_a_label
       it "should not have a label" do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li label") 
       end
     end
     
     def it_should_have_a_nested_fieldset
       it "should have a nested_fieldset" do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li fieldset") 
       end
     end
     
     def it_should_have_label_with_text(string_or_regex)
       it "should have a label with text '#{string_or_regex}'" do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li label", string_or_regex) 
       end
     end
     
     def it_should_have_label_for(element_id)
       it "should have a label for ##{element_id}" do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li label[@for='#{element_id}']")
       end
     end
     
     def it_should_have_input_with_id(element_id)
       it "should have an input with id '#{element_id}'" do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li input##{element_id}")
       end
     end
     
     def it_should_have_input_with_type(input_type)
       it "should have a #{input_type} input" do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li input[@type=\"#{input_type}\"]")
       end
     end
     
     def it_should_have_input_with_name(name)
       it "should have an input named #{name}" do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li input[@name=\"#{name}\"]")
       end
     end
     
     def it_should_have_textarea_with_name(name)
       it "should have an input named #{name}" do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li textarea[@name=\"#{name}\"]")
       end
     end
     
     def it_should_have_textarea_with_id(element_id)
       it "should have an input with id '#{element_id}'" do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li textarea##{element_id}")
       end
     end
@@ -90,7 +90,7 @@ def it_should_use_default_text_field_size_when_method_has_no_database_column(as)
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as))
         end
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li input[@size='#{Formtastic::SemanticFormBuilder.default_text_field_size}']")
       end
     end
@@ -100,7 +100,7 @@ def it_should_apply_custom_input_attributes_when_input_html_provided(as)
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as, :input_html => { :class => 'myclass' }))
         end
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li input.myclass")
       end
     end
@@ -110,7 +110,7 @@ def it_should_apply_custom_for_to_label_when_input_html_id_provided(as)
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as, :input_html => { :id => 'myid' }))
         end
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li label[@for="myid"]')
       end
     end
@@ -118,7 +118,7 @@ def it_should_apply_custom_for_to_label_when_input_html_id_provided(as)
     def it_should_have_maxlength_matching_column_limit
       it 'should have a maxlength matching column limit' do
         @new_post.column_for_attribute(:title).limit.should == 50
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li input[@maxlength='50']")
       end
     end
@@ -132,7 +132,7 @@ def it_should_use_default_text_field_size_for_columns_longer_than_default_text_f
           concat(builder.input(:title, :as => as))
         end
 
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li input[@size='#{default_size}']")
       end
     end
@@ -146,7 +146,7 @@ def it_should_use_column_size_for_columns_shorter_than_default_text_field_size(a
           concat(builder.input(:title, :as => as))
         end
 
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li input[@size='#{column_limit_shorted_than_default}']")
       end
     end
@@ -164,7 +164,7 @@ def it_should_apply_error_logic_for_input_type(type)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
           end
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag('form li.error')
         end
 
@@ -172,7 +172,7 @@ def it_should_apply_error_logic_for_input_type(type)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
           end
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should_not have_tag('div.fieldWithErrors')
         end
 
@@ -181,7 +181,7 @@ def it_should_apply_error_logic_for_input_type(type)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
           end
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag('form li.error p.inline-errors')
         end
 
@@ -190,7 +190,7 @@ def it_should_apply_error_logic_for_input_type(type)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
           end
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag('form li.error ul.errors')
         end
       end
@@ -203,17 +203,17 @@ def it_should_apply_error_logic_for_input_type(type)
         end
 
         it 'should not apply an errors class to the list item' do
-          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should_not have_tag('form li.error')
         end
 
         it 'should not render a paragraph for the errors' do
-          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should_not have_tag('form li.error p.inline-errors')
         end
 
         it 'should not display an error list' do
-          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should_not have_tag('form li.error ul.errors')
         end
       end
@@ -226,17 +226,17 @@ def it_should_apply_error_logic_for_input_type(type)
         end
 
         it 'should not apply an errors class to the list item' do
-          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should_not have_tag('form li.error')
         end
 
         it 'should not render a paragraph for the errors' do
-          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should_not have_tag('form li.error p.inline-errors')
         end
 
         it 'should not display an error list' do
-          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should_not have_tag('form li.error ul.errors')
         end
       end
@@ -270,7 +270,7 @@ def it_should_use_the_collection_when_provided(as, countable)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:author, :as => as, :collection => @authors))
           end
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li.#{as} #{countable}", :count => @authors.size + (as == :select ? 1 : 0))
         end
 
@@ -283,7 +283,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
             end
-            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+            output_buffer.concat(form) if Formtastic::Util.rails3?
 
             @categories.each do |value|
               output_buffer.should have_tag("form li.#{as}", /#{value}/)
@@ -300,7 +300,7 @@ def it_should_use_the_collection_when_provided(as, countable)
                 end
                 concat(fields)
               end
-              output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+              output_buffer.concat(form) if Formtastic::Util.rails3?
               output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_general']")
               output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_design']")
               output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_development']")
@@ -318,7 +318,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
             end
-            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+            output_buffer.concat(form) if Formtastic::Util.rails3?
 
             @categories.each do |label, value|
               output_buffer.should have_tag("form li.#{as}", /#{label}/)
@@ -336,7 +336,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
             end
-            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+            output_buffer.concat(form) if Formtastic::Util.rails3?
 
             @categories.each do |text, value|
               label = as == :select ? :option : :label
@@ -357,7 +357,7 @@ def it_should_use_the_collection_when_provided(as, countable)
               form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:category_name, :as => as, :collection => @choices))
               end
-              output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+              output_buffer.concat(form) if Formtastic::Util.rails3?
               
               output_buffer.should have_tag("form li.#{as} #{countable}#post_category_name_true")
               output_buffer.should have_tag("form li.#{as} #{countable}#post_category_name_false")
@@ -374,7 +374,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
             end
-            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+            output_buffer.concat(form) if Formtastic::Util.rails3?
 
             @categories.each do |value|
               label = as == :select ? :option : :label
@@ -393,7 +393,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
             end
-            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+            output_buffer.concat(form) if Formtastic::Util.rails3?
 
             @categories.each do |label, value|
               output_buffer.should have_tag("form li.#{as}", /#{label}/)
@@ -413,7 +413,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             end
 
             it 'should have options with text content from the specified method' do
-              output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+              output_buffer.concat(@form) if Formtastic::Util.rails3?
               ::Author.find(:all).each do |author|
                 output_buffer.should have_tag("form li.#{as}", /#{author.login}/)
               end
@@ -428,7 +428,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             end
             
             it 'should have options with the proc applied to each' do
-              output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+              output_buffer.concat(@form) if Formtastic::Util.rails3?
               ::Author.find(:all).each do |author|
                 output_buffer.should have_tag("form li.#{as}", /#{author.login.reverse}/)
               end
@@ -451,7 +451,7 @@ def it_should_use_the_collection_when_provided(as, countable)
               end
 
               it "should render the options with #{label_method} as the label" do
-                output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+                output_buffer.concat(@form) if Formtastic::Util.rails3?
                 ::Author.find(:all).each do |author|
                   output_buffer.should have_tag("form li.#{as}", /The Label Text/)
                 end
@@ -471,7 +471,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             end
             
             it 'should have options with values from specified method' do
-              output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+              output_buffer.concat(@form) if Formtastic::Util.rails3?
               ::Author.find(:all).each do |author|
                 output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login}']")
               end
@@ -486,7 +486,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             end
 
             it 'should have options with the proc applied to each value' do
-              output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+              output_buffer.concat(@form) if Formtastic::Util.rails3?
               ::Author.find(:all).each do |author|
                 output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login.reverse}']")
               end
diff --git a/spec/errors_spec.rb b/spec/errors_spec.rb
index 55c8b9276..548aebc53 100644
--- a/spec/errors_spec.rb
+++ b/spec/errors_spec.rb
@@ -94,7 +94,7 @@
       form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author))
       end
-      output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("ul.errors li", /must not be blank/, :count => 1)
       output_buffer.should have_tag("ul.errors li", /is already taken/, :count => 1)
     end
diff --git a/spec/form_helper_spec.rb b/spec/form_helper_spec.rb
index fae9b16ba..620540cb2 100644
--- a/spec/form_helper_spec.rb
+++ b/spec/form_helper_spec.rb
@@ -21,33 +21,33 @@
     it 'adds a class of "formtastic" to the generated form' do
       form = semantic_form_for(@new_post, :url => '/hello') do |builder|
       end
-      output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form.formtastic")
     end
 
     it 'adds class matching the object name to the generated form when a symbol is provided' do
       form = semantic_form_for(@new_post, :url => '/hello') do |builder|
       end
-      output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form.post")
 
       form = semantic_form_for(:project, :url => '/hello') do |builder|
       end
-      output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form.project")
     end
 
     it 'adds class matching the object\'s class to the generated form when an object is provided' do
       form = semantic_form_for(@new_post) do |builder|
       end
-      output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form.post")
     end
 
     it 'adds a namespaced class to the generated form' do
       form = semantic_form_for(::Namespaced::Post.new, :url => '/hello') do |builder|
       end
-      output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form.namespaced_post")
     end
 
@@ -58,17 +58,17 @@
       end
 
       it 'to add a id of "something-special" to generated form' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form#something-special")
       end
 
       it 'to add a class of "something-extra" to generated form' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form.something-extra")
       end
 
       it 'to add enctype="multipart/form-data"' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form[@enctype="multipart/form-data"]')
       end
     end
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index e2a32e474..ee6f4a6ae 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -111,7 +111,7 @@
       form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:title))
       end
-      output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form label", /Hello post!/)
     end
     
@@ -119,7 +119,7 @@
       form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:title))
       end
-      output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form label", /Hello project!/)
     end
     
diff --git a/spec/include_blank_spec.rb b/spec/include_blank_spec.rb
index dee68e524..573be148d 100644
--- a/spec/include_blank_spec.rb
+++ b/spec/include_blank_spec.rb
@@ -27,7 +27,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as))
         end
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li select option[@value='']", "")
       end
     end
@@ -38,7 +38,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as))
         end
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li select option[@value='']", "")
       end
     end
@@ -54,7 +54,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as, :include_blank => false))
         end
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li select option[@value='']", "")
       end
     end
@@ -66,7 +66,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as, :include_blank => true))
         end
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li select option[@value='']", "")
       end
     end
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index de95b6d57..4da10b8f0 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -62,7 +62,7 @@
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => true))
           end
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should_not have_tag('form li.optional')
           output_buffer.should have_tag('form li.required')
         end
@@ -71,7 +71,7 @@
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => true))
           end
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag('form li.required label', /#{@new_string}$/)
         end
 
@@ -92,7 +92,7 @@
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => false))
           end
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should_not have_tag('form li.required')
           output_buffer.should have_tag('form li.optional')
         end
@@ -101,7 +101,7 @@
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => false))
           end
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag('form li.optional label', /#{@string}$/)
         end
 
@@ -118,7 +118,7 @@
             form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
               concat(builder.input(:title))
             end
-            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+            output_buffer.concat(form) if Formtastic::Util.rails3?
             output_buffer.should_not have_tag('form li.required')
             output_buffer.should have_tag('form li.optional')
 
@@ -156,7 +156,7 @@
                   concat(builder.input(:title))
                   concat(builder.input(:body))
                 end
-                output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+                output_buffer.concat(form) if Formtastic::Util.rails3?
                 output_buffer.should have_tag('form li.required')
                 output_buffer.should_not have_tag('form li.optional')
               end
@@ -212,7 +212,7 @@ def should_be_required(options)
                 concat(builder.input(:body))
               end
 
-              output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+              output_buffer.concat(form) if Formtastic::Util.rails3?
 
               if options[:required]
                 output_buffer.should_not have_tag('form li.optional')
@@ -232,7 +232,7 @@ def should_be_required(options)
                 form = semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:title))
                 end
-                output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+                output_buffer.concat(form) if Formtastic::Util.rails3?
                 output_buffer.should_not have_tag('form li.required')
                 output_buffer.should have_tag('form li.optional')
               end
@@ -266,7 +266,7 @@ def should_be_required(options)
                     concat(builder.input(:title))
                     concat(builder.input(:body))
                   end
-                  output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+                  output_buffer.concat(form) if Formtastic::Util.rails3?
                   output_buffer.should have_tag('form li.required')
                   output_buffer.should_not have_tag('form li.optional')
                 end
@@ -322,7 +322,7 @@ def should_be_required(options)
                   concat(builder.input(:body))
                 end
 
-                output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+                output_buffer.concat(form) if Formtastic::Util.rails3?
 
                 if options[:required]
                   output_buffer.should_not have_tag('form li.optional')
@@ -342,7 +342,7 @@ def should_be_required(options)
                   form = semantic_form_for(@new_post) do |builder|
                     concat(builder.input(:title))
                   end
-                  output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+                  output_buffer.concat(form) if Formtastic::Util.rails3?
                   output_buffer.should_not have_tag('form li.required')
                   output_buffer.should have_tag('form li.optional')
                 end
@@ -360,7 +360,7 @@ def should_be_required(options)
               form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title))
               end
-              output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+              output_buffer.concat(form) if Formtastic::Util.rails3?
               output_buffer.should_not have_tag('form li.required')
               output_buffer.should have_tag('form li.optional')
 
@@ -383,7 +383,7 @@ def should_be_required(options)
           form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
             concat(builder.input(:anything))
           end
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag('form li.string')
         end
 
@@ -393,7 +393,7 @@ def should_be_required(options)
             concat(builder.input(:password_confirmation))
             concat(builder.input(:confirm_password))
           end
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag('form li.password', :count => 3)
         end
 
@@ -513,7 +513,7 @@ def should_be_required(options)
             concat(builder.input(:title, :label => "Kustom"))
           end
 
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li label", /Kustom/)
         end
 
@@ -521,7 +521,7 @@ def should_be_required(options)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :label => false))
           end
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should_not have_tag("form li label")
         end
 
@@ -529,7 +529,7 @@ def should_be_required(options)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :label => "Kustom".freeze))
           end
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li label", /Kustom/)
         end
       end
@@ -548,7 +548,7 @@ def should_be_required(options)
                     concat(builder.input(:meta_description))
                   end
                 
-                  output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+                  output_buffer.concat(form) if Formtastic::Util.rails3?
                   output_buffer.should have_tag('form li label', Regexp.new('^' + @localized_label_text))
                 end
               end
@@ -565,7 +565,7 @@ def should_be_required(options)
                 concat(builder.input(:meta_description))
               end
 
-              output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+              output_buffer.concat(form) if Formtastic::Util.rails3?
               output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
             end
           end
@@ -579,7 +579,7 @@ def should_be_required(options)
                 concat(builder.input(:meta_description))
               end
 
-              output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+              output_buffer.concat(form) if Formtastic::Util.rails3?
               output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
             end
           end
@@ -593,7 +593,7 @@ def should_be_required(options)
                   concat(builder.input(:meta_description))
                 end
             
-                output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+                output_buffer.concat(form) if Formtastic::Util.rails3?
                 output_buffer.should have_tag("form li label", /#{'meta_description'.capitalize}/)
               end
             end
@@ -623,7 +623,7 @@ def should_be_required(options)
               concat(builder.input(:title, :label => true))
               concat(builder.input(:published, :as => :boolean, :label => true))
             end
-            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+            output_buffer.concat(form) if Formtastic::Util.rails3?
             output_buffer.should have_tag('form li label', Regexp.new('^' + @localized_label_text))
           end
 
@@ -641,7 +641,7 @@ def should_be_required(options)
               concat(builder.input(:title, :label => true))
               concat(builder.input(:published, :as => :boolean, :label => true))
             end
-            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+            output_buffer.concat(form) if Formtastic::Util.rails3?
             output_buffer.should have_tag('form li label', Regexp.new('^' + @default_localized_label_text))
           end
         end
@@ -657,7 +657,7 @@ def should_be_required(options)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :hint => hint_text))
           end
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li p.inline-hints", hint_text)
         end
       end
@@ -693,7 +693,7 @@ def should_be_required(options)
               form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => true))
               end
-              output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+              output_buffer.concat(form) if Formtastic::Util.rails3?
               output_buffer.should have_tag('form li p.inline-hints', @localized_hint_text)
             end
             
@@ -701,7 +701,7 @@ def should_be_required(options)
               form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => true))
               end
-              output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+              output_buffer.concat(form) if Formtastic::Util.rails3?
               output_buffer.should have_tag('form li p.inline-hints', @default_localized_hint_text)
             end
           end
@@ -711,7 +711,7 @@ def should_be_required(options)
               form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => false))
               end
-              output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+              output_buffer.concat(form) if Formtastic::Util.rails3?
               output_buffer.should_not have_tag('form li p.inline-hints', @localized_hint_text)
             end
           end
@@ -722,7 +722,7 @@ def should_be_required(options)
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:title))
             end
-            output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+            output_buffer.concat(form) if Formtastic::Util.rails3?
             output_buffer.should_not have_tag('form li p.inline-hints')
           end
         end
@@ -737,7 +737,7 @@ def should_be_required(options)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :wrapper_html => {:id => :another_id}))
           end
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li#another_id")
         end
 
@@ -745,7 +745,7 @@ def should_be_required(options)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :wrapper_html => {:class => :another_class}, :required => true))
           end
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li.string")
           output_buffer.should have_tag("form li.required")
           output_buffer.should have_tag("form li.another_class")
@@ -755,7 +755,7 @@ def should_be_required(options)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :wrapper_html => {:class => [ :my_class, :another_class ]}))
           end
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li.string")
           output_buffer.should have_tag("form li.my_class")
           output_buffer.should have_tag("form li.another_class")
@@ -767,7 +767,7 @@ def should_be_required(options)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title))
           end
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li#post_title_input")
           output_buffer.should have_tag("form li.string")
         end
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index cd20f8561..f6909f124 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -19,7 +19,7 @@
   it_should_apply_error_logic_for_input_type(:boolean)
 
   it 'should generate a label containing the input' do
-    output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+    output_buffer.concat(@form) if Formtastic::Util.rails3?
     output_buffer.should have_tag('form li label', :count => 1)
     output_buffer.should have_tag('form li label[@for="post_allow_comments"]')
     output_buffer.should have_tag('form li label', /Allow comments/)
@@ -27,7 +27,7 @@
   end
 
   it 'should generate a checkbox input' do
-    output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+    output_buffer.concat(@form) if Formtastic::Util.rails3?
     output_buffer.should have_tag('form li label input')
     output_buffer.should have_tag('form li label input#post_allow_comments')
     output_buffer.should have_tag('form li label input[@type="checkbox"]')
@@ -40,7 +40,7 @@
       concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'checked', :unchecked_value => 'unchecked'))
     end
 
-    output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+    output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should have_tag('form li label input[@type="checkbox"][@value="checked"]')
     output_buffer.should have_tag('form li label input[@type="hidden"][@value="unchecked"]')
   end
@@ -50,7 +50,7 @@
       concat(builder.input(:allow_comments, :as => :boolean))
     end
 
-    output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+    output_buffer.concat(form) if Formtastic::Util.rails3?
 
     output_buffer.should have_tag('form li label[@for="project_allow_comments"]')
     output_buffer.should have_tag('form li label', /Allow comments/)
@@ -78,7 +78,7 @@
       end
 
       it 'should not be selected' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li label input[@type='checkbox'][@checked='checked']")
       end
     end
@@ -95,7 +95,7 @@
       end
 
       it 'should be selected' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li label input[@type='checkbox'][@checked='checked']")
       end
     end
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 1e29ca3cf..437a4c624 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -23,37 +23,37 @@
     it_should_use_the_collection_when_provided(:check_boxes, 'input[@type="checkbox"]')
     
     it 'should generate a legend containing a label with text for the input' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li fieldset legend.label label')
       output_buffer.should have_tag('form li fieldset legend.label label', /Posts/)
     end
     
     it 'should not link the label within the legend to any input' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should_not have_tag('form li fieldset legend label[@for^="author_post_ids_"]')
     end
     
 
     it 'should generate an ordered list with a list item for each choice' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li fieldset ol')
       output_buffer.should have_tag('form li fieldset ol li', :count => ::Post.find(:all).size)
     end
 
     it 'should have one option with a "checked" attribute' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li input[@checked]', :count => 1)
     end
 
     it 'should generate hidden inputs with default value blank' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form li fieldset ol li label input[@type='hidden'][@value='']", :count => ::Post.find(:all).size)
     end
 
     describe "each choice" do
 
       it 'should contain a label for the radio input with a nested input and label text' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Post.find(:all).each do |post|
           output_buffer.should have_tag('form li fieldset ol li label', /#{post.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='author_post_ids_#{post.id}']")
@@ -61,14 +61,14 @@
       end
 
       it 'should use values as li.class when value_as_class is true' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Post.find(:all).each do |post|
           output_buffer.should have_tag("form li fieldset ol li.post_#{post.id} label")
         end
       end
 
       it 'should have a checkbox input for each post' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Post.find(:all).each do |post|
           output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@name='author[post_ids][]']", :count => 2)
@@ -77,7 +77,7 @@
 
       it "should mark input as checked if it's the the existing choice" do
         ::Post.find(:all).include?(@fred.posts.first).should be_true
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
       end
     end
@@ -91,17 +91,17 @@
       end
 
       it 'should generate a fieldset with legend' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li fieldset legend', /Author/)
       end
 
       it 'shold generate an li tag for each item in the collection' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li fieldset ol li', :count => ::Author.find(:all).size)
       end
 
       it 'should generate labels for each item' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Author.find(:all).each do |author|
           output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='project_author_id_#{author.id}']")
@@ -109,7 +109,7 @@
       end
 
       it 'should generate inputs for each item' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Author.find(:all).each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#project_author_id_#{author.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@type='checkbox']")
@@ -136,7 +136,7 @@
         end
 
         it 'should not have any selected item(s)' do
-          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should_not have_tag("form li fieldset ol li label input[@checked='checked']")
         end
       end
@@ -153,7 +153,7 @@
         end
 
         it "should have one item selected; the specified one" do
-          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']", :count => 1)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
           output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked'][@value='#{@fred.id}']")
@@ -172,7 +172,7 @@
         end
 
         it "should have multiple items selected; the specified ones" do
-          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']", :count => 2)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@bob.id}']", /bob/i)
           output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked'][@value='#{@bob.id}']")
@@ -208,7 +208,7 @@
         end
 
         it 'should not have any disabled item(s)' do
-          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should_not have_tag("form li fieldset ol li label input[@disabled='disabled']")
         end
       end
@@ -223,7 +223,7 @@
         end
 
         it "should have one item disabled; the specified one" do
-          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 1)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@fred.id}']")
@@ -240,7 +240,7 @@
         end
 
         it "should have multiple items disabled; the specified ones" do
-          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 2)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@bob.id}']", /bob/i)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@bob.id}']")
diff --git a/spec/inputs/country_input_spec.rb b/spec/inputs/country_input_spec.rb
index 1d1c243a6..514e1cc00 100644
--- a/spec/inputs/country_input_spec.rb
+++ b/spec/inputs/country_input_spec.rb
@@ -38,14 +38,14 @@
     #it_should_apply_error_logic_for_input_type(:country)
 
     it 'should generate a label for the input' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li label')
       output_buffer.should have_tag('form li label[@for="post_country"]')
       output_buffer.should have_tag('form li label', /Country/)
     end
 
     it "should generate a select" do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form li select")
     end
     
@@ -90,7 +90,7 @@
       end
       
       it "should render a country input" do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag "form li.country"
       end
     end
@@ -105,7 +105,7 @@
       end
       
       it "should render a country input" do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag "form li.country"
         output_buffer.should have_tag "form li.string", :count => 2
       end
diff --git a/spec/inputs/date_input_spec.rb b/spec/inputs/date_input_spec.rb
index 129e60113..15bc0e8ac 100644
--- a/spec/inputs/date_input_spec.rb
+++ b/spec/inputs/date_input_spec.rb
@@ -25,12 +25,12 @@
     it_should_apply_error_logic_for_input_type(:date)
     
     it 'should have a legend and label with the label text inside the fieldset' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.date fieldset legend.label label', /Publish at/)
     end
     
     it 'should associate the legend label with the first select' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.date fieldset legend.label')
       output_buffer.should have_tag('form li.date fieldset legend.label label')
       output_buffer.should have_tag('form li.date fieldset legend.label label[@for]')
@@ -38,13 +38,13 @@
     end
     
     it 'should have an ordered list of three items inside the fieldset' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.date fieldset ol')
       output_buffer.should have_tag('form li.date fieldset ol li', :count => 3)
     end
     
     it 'should have three labels for year, month and day' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.date fieldset ol li label', :count => 3)
       output_buffer.should have_tag('form li.date fieldset ol li label', /year/i)
       output_buffer.should have_tag('form li.date fieldset ol li label', /month/i)
@@ -52,7 +52,7 @@
     end
     
     it 'should have three selects for year, month and day' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.date fieldset ol li select', :count => 3)
     end
   end
@@ -68,7 +68,7 @@
             concat(builder.input(:created_at, :as => :date, :selected => Time.mktime(1999)))
           end
         end
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='2012'][@selected]", :count => 1)
       end
@@ -83,7 +83,7 @@
             concat(builder.input(:created_at, :as => :date, :selected => Date.new(1999)))
           end
         end
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='1999'][@selected]", :count => 1)
       end
@@ -96,7 +96,7 @@
             concat(builder.input(:created_at, :as => :date, :selected => Time.mktime(1999)))
           end
         end
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='1999'][@selected]", :count => 1)
       end
@@ -109,7 +109,7 @@
             concat(builder.input(:created_at, :as => :date, :selected => nil))
           end
         end
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li ol li select#post_created_at_1i option[@selected]")
       end
       
@@ -119,7 +119,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :date))
         end
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li ol li select option[@selected]")
         
       end
@@ -135,7 +135,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :date, :labels => { field => "another #{field} label" }))
         end
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.date fieldset ol li label', :count => fields.length)
         fields.each do |f|
           output_buffer.should have_tag('form li.date fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
@@ -147,7 +147,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :date, :labels => { field => "" }))
         end
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.date fieldset ol li label', :count => fields.length-1)
         fields.each do |f|
           output_buffer.should have_tag('form li.date fieldset ol li label', /#{f}/i) unless field == f
diff --git a/spec/inputs/datetime_input_spec.rb b/spec/inputs/datetime_input_spec.rb
index c2786c914..98fad64e8 100644
--- a/spec/inputs/datetime_input_spec.rb
+++ b/spec/inputs/datetime_input_spec.rb
@@ -30,23 +30,23 @@
     it_should_apply_error_logic_for_input_type(:datetime)
     
     it 'should have a legend and label with the label text inside the fieldset' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset legend.label label', /Publish at/)
     end
     
     it 'should associate the legend label with the first select' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset legend.label label[@for="post_publish_at_1i"]')
     end
     
     it 'should have an ordered list of five items inside the fieldset' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset ol')
       output_buffer.should have_tag('form li.datetime fieldset ol li', :count => 5)
     end
     
     it 'should have five labels for year, month, day, hour and minute' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => 5)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /year/i)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /month/i)
@@ -56,7 +56,7 @@
     end
     
     it 'should have five selects for year, month, day, hour and minute' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset ol li select', :count => 5)
     end
     
@@ -67,7 +67,7 @@
         end
         concat(fields)
       end
-      output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(form) if Formtastic::Util.rails3?
     
       1.upto(5) do |i|
         output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_10_created_at_#{i}i']")
@@ -83,7 +83,7 @@
         concat(builder.input(:publish_at, :as => :datetime, :discard_day => true))
       end
   
-      output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form li input[@type='hidden'][@value='27']")
     end
   end
@@ -142,7 +142,7 @@
     end
   
     it 'should have translated labels for year, month, day, hour and minute' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Year/)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Month/)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Day/)
@@ -160,17 +160,17 @@
     end
   
     it 'should have fieldset with legend - classified as a label' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset legend.label', /Publish at/)
     end
   
     it 'should have labels for each input' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => 5)
     end
   
     it 'should have selects for each inputs' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset ol li select', :count => 5)
     end
   end
@@ -201,7 +201,7 @@
             concat(builder.input(:created_at, :as => :datetime, :selected => Time.mktime(1999)))
           end
         end
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='2012'][@selected]", :count => 1)
       end
@@ -216,7 +216,7 @@
             concat(builder.input(:created_at, :as => :datetime, :selected => Date.new(1999)))
           end
         end
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='1999'][@selected]", :count => 1)
       end
@@ -229,7 +229,7 @@
             concat(builder.input(:created_at, :as => :datetime, :selected => Time.mktime(1999)))
           end
         end
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='1999'][@selected]", :count => 1)
       end
@@ -242,7 +242,7 @@
             concat(builder.input(:created_at, :as => :datetime, :selected => nil))
           end
         end
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li ol li select#post_created_at_1i option[@selected]")
       end
       
@@ -252,7 +252,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :datetime))
         end
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li ol li select option[@selected]")
       end
     end
@@ -276,7 +276,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :datetime, :labels => { field => "another #{field} label" }))
         end
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => fields.length)
         fields.each do |f|
           output_buffer.should have_tag('form li.datetime fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
@@ -288,7 +288,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :datetime, :labels => { field => "" }))
         end
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => fields.length-1)
         fields.each do |f|
           output_buffer.should have_tag('form li.datetime fieldset ol li label', /#{f}/i) unless field == f
diff --git a/spec/inputs/file_input_spec.rb b/spec/inputs/file_input_spec.rb
index 0e7a8eb84..1f5d35850 100644
--- a/spec/inputs/file_input_spec.rb
+++ b/spec/inputs/file_input_spec.rb
@@ -26,7 +26,7 @@
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :file, :input_html => { :class => 'myclass' }))
     end
-    output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+    output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should have_tag("form li input.myclass")
   end
 
diff --git a/spec/inputs/hidden_input_spec.rb b/spec/inputs/hidden_input_spec.rb
index 1c16c5add..9cabe6be2 100644
--- a/spec/inputs/hidden_input_spec.rb
+++ b/spec/inputs/hidden_input_spec.rb
@@ -21,20 +21,20 @@
   it_should_not_have_a_label
 
   it "should generate a input field" do
-    output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+    output_buffer.concat(@form) if Formtastic::Util.rails3?
     output_buffer.should have_tag("form li input#post_secret")
     output_buffer.should have_tag("form li input#post_secret[@type=\"hidden\"]")
     output_buffer.should have_tag("form li input#post_secret[@name=\"post[secret]\"]")
   end
   
   it "should pass any explicitly specified value - using :value" do
-    output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+    output_buffer.concat(@form) if Formtastic::Util.rails3?
     output_buffer.should have_tag("form li input#post_author_id[@type=\"hidden\"][@value=\"99\"]")
   end
   
   # Handle Formtastic :input_html options for consistency.
   it "should pass any explicitly specified value - using :input_html options" do
-    output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+    output_buffer.concat(@form) if Formtastic::Util.rails3?
     output_buffer.should have_tag("form li input#post_published[@type=\"hidden\"][@value=\"true\"]")
   end
   
@@ -47,7 +47,7 @@
       concat(builder.input(:secret, :as => :hidden))
     end
     
-    output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+    output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should_not have_tag("form li p.inline-errors")
     output_buffer.should_not have_tag("form li ul.errors")
   end
@@ -57,7 +57,7 @@
       concat(builder.input(:secret, :as => :hidden, :hint => "all your base are belong to use"))
     end
 
-    output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+    output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should_not have_tag("form li p.inline-hints")
     output_buffer.should_not have_tag("form li ul.hints")
   end
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 2f59a9867..a0a445d98 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -24,31 +24,31 @@
     it_should_use_the_collection_when_provided(:radio, 'input')
     
     it 'should generate a legend containing a label with text for the input' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li fieldset legend.label label')
       output_buffer.should have_tag('form li fieldset legend.label label', /Author/)
     end
     
     it 'should not link the label within the legend to any input' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should_not have_tag('form li fieldset legend label[@for^="post_author_id_"]')
     end
 
     it 'should generate an ordered list with a list item for each choice' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li fieldset ol')
       output_buffer.should have_tag('form li fieldset ol li', :count => ::Author.find(:all).size)
     end
 
     it 'should have one option with a "checked" attribute' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li input[@checked]', :count => 1)
     end
 
     describe "each choice" do
 
       it 'should contain a label for the radio input with a nested input and label text' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Author.find(:all).each do |author|
           output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_id_#{author.id}']")
@@ -56,14 +56,14 @@
       end
 
       it 'should use values as li.class when value_as_class is true' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Author.find(:all).each do |author|
           output_buffer.should have_tag("form li fieldset ol li.author_#{author.id} label")
         end
       end
 
       it "should have a radio input" do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Author.find(:all).each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#post_author_id_#{author.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@type='radio']")
@@ -81,7 +81,7 @@
           concat(builder.input(:author, :as => :radio))
         end
 
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
       end
     end
@@ -95,17 +95,17 @@
       end
 
       it 'should generate a fieldset with legend' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li fieldset legend', /Author/)
       end
 
       it 'should generate an li tag for each item in the collection' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li fieldset ol li', :count => ::Author.find(:all).size)
       end
 
       it 'should generate labels for each item' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Author.find(:all).each do |author|
           output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='project_author_id_#{author.id}']")
@@ -113,7 +113,7 @@
       end
 
       it 'should generate inputs for each item' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Author.find(:all).each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#project_author_id_#{author.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@type='radio']")
@@ -141,7 +141,7 @@
       end
 
       it 'should not have any selected item(s)' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li fieldset ol li label input[@checked='checked']")
       end
     end
@@ -157,7 +157,7 @@
       end
 
       it "should have one item selected; the specified one" do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li fieldset ol li label input[@type='radio'][@checked='checked']", :count => 1)
         output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
         output_buffer.should have_tag("form li fieldset ol li label input[@type='radio'][@checked='checked'][@value='#{@fred.id}']")
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index da6f3641d..c17738ad8 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -22,7 +22,7 @@
       end
 
       it 'should have a option for each key and/or value' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         @array_with_values.each do |v|
           output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
         end
@@ -41,7 +41,7 @@
       end
 
       it 'should have an option for each value' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         @range_with_values.each do |v|
           output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
         end
@@ -66,7 +66,7 @@
       end
 
       it 'should render a select with at least options: true/false' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li select option[@value='true']", /^Yes$/)
         output_buffer.should have_tag("form li select option[@value='false']", /^No$/)
       end
@@ -87,7 +87,7 @@
       end
 
       it 'should render a select with at least options: true/false' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li select option[@value='true']", /#{@boolean_select_labels[:yes]}/)
         output_buffer.should have_tag("form li select option[@value='false']", /#{@boolean_select_labels[:no]}/)
       end
@@ -111,36 +111,36 @@
     it_should_use_the_collection_when_provided(:select, 'option')
 
     it 'should have a select inside the wrapper' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#post_author_id')
       output_buffer.should have_tag('form li select#post_reviewer_id')
     end
 
     it 'should have a valid name' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form li select[@name='post[author_id]']")
       output_buffer.should_not have_tag("form li select[@name='post[author_id][]']")
       output_buffer.should_not have_tag("form li select[@name='post[reviewer_id][]']")
     end
 
     it 'should not create a multi-select' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should_not have_tag('form li select[@multiple]')
     end
 
     it 'should create a select without size' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should_not have_tag('form li select[@size]')
     end
 
     it 'should have a blank option' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form li select option[@value='']")
     end
 
     it 'should have a select option for each Author' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form li select[@name='post[author_id]'] option", :count => ::Author.find(:all).size + 1)
       ::Author.find(:all).each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
@@ -148,7 +148,7 @@
     end
 
     it 'should have one option with a "selected" attribute' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form li select[@name='post[author_id]'] option[@selected]", :count => 1)
     end
 
@@ -161,7 +161,7 @@
         concat(builder.input(:author_status, :as => :select))
       end
 
-      output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li select#post_author_status_id')
     end
   end
@@ -237,23 +237,23 @@
 
     0.upto(1) do |i|
       it 'should have all option groups and the right values' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li select optgroup[@label='#{@continent_names[i]}']", @authors[i].to_label)
       end
 
       it 'should have custom group labels' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li select optgroup[@label='#{@continents[i].id}']", @authors[i].to_label)
       end
     end
 
     it 'should have no duplicate groups' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li select optgroup', :count => 4)
     end
     
     it 'should sort the groups on the label method' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form li select optgroup[@label='Africa']")
       output_buffer.should have_tag("form li select optgroup[@label='99']")
     end
@@ -283,18 +283,18 @@
     it_should_use_the_collection_when_provided(:select, 'option')
 
     it 'should have a select inside the wrapper' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#author_post_ids')
     end
 
     it 'should have a multi-select select' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li select[@multiple="multiple"]')
     end
 
     it 'should have a select option for each Post' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li select option', :count => ::Post.find(:all).size)
       ::Post.find(:all).each do |post|
         output_buffer.should have_tag("form li select option[@value='#{post.id}']", /#{post.to_label}/)
@@ -302,12 +302,12 @@
     end
     
     it 'should not have a blank option' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should_not have_tag("form li select option[@value='']")
     end
 
     it 'should have one option with a "selected" attribute' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li select option[@selected]', :count => 1)
     end
   end
@@ -328,18 +328,18 @@
     it_should_use_the_collection_when_provided(:select, 'option')
     
     it 'should have a select inside the wrapper' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#post_author_ids')
     end
 
     it 'should have a multi-select select' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li select[@multiple="multiple"]')
     end
 
     it 'should have a select option for each Author' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li select option', :count => ::Author.find(:all).size)
       ::Author.find(:all).each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
@@ -347,12 +347,12 @@
     end
     
     it 'should not have a blank option' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should_not have_tag("form li select option[@value='']")
     end
 
     it 'should have one option with a "selected" attribute' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li select option[@selected]', :count => 1)
     end
   end
@@ -366,12 +366,12 @@
     end
 
     it 'should have a select with prompt' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form li select option[@value='']", /choose author/)
     end
 
     it 'should not have a blank select option' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should_not have_tag("form li select option[@value='']", "")
     end
   end
@@ -384,19 +384,19 @@
     end
 
     it 'should generate label' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li label', /Author/)
       output_buffer.should have_tag("form li label[@for='project_author']")
     end
 
     it 'should generate select inputs' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li select#project_author')
       output_buffer.should have_tag('form li select option', :count => ::Author.find(:all).size + 1)
     end
 
     it 'should generate an option to each item' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       ::Author.find(:all).each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
       end
@@ -419,7 +419,7 @@
       end
       
       it 'should not have any selected item(s)' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li select option[@selected='selected']")
       end
     end
@@ -435,7 +435,7 @@
       end
 
       it 'should have a selected item; the specified one' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li select option[@selected='selected']", :count => 1)
         output_buffer.should have_tag("form li select option[@selected='selected']", /bob/i)
         output_buffer.should have_tag("form li select option[@selected='selected'][@value='#{@bob.id}']")
@@ -456,7 +456,7 @@
         end
 
         it "should only select the first value" do
-          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li select option[@selected='selected']", :count => 1)
           output_buffer.should have_tag("form li select:not([@multiple]) option[@selected='selected']", /bob/i)
           output_buffer.should have_tag("form li select:not([@multiple]) option[@selected='selected'][@value='#{@bob.id}']")
@@ -475,7 +475,7 @@
         end
 
         it "should have multiple items selected; the specified ones" do
-          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li select option[@selected='selected']", :count => 2)
           output_buffer.should have_tag("form li select[@multiple] option[@selected='selected']", /bob/i)
           output_buffer.should have_tag("form li select[@multiple] option[@selected='selected'][@value='#{@bob.id}']")
@@ -507,8 +507,8 @@
       end
   
       it "should render a select field" do
-        output_buffer.concat(@form_new_post) if defined?(ActiveSupport::SafeBuffer)
-        output_buffer.concat(@form_project) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form_new_post) if Formtastic::Util.rails3?
+        output_buffer.concat(@form_project) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li select", :count => 2)
       end
     end
@@ -525,8 +525,8 @@
       end
       
       it "should render a text field" do
-        output_buffer.concat(@form_new_post) if defined?(ActiveSupport::SafeBuffer)
-        output_buffer.concat(@form_project) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form_new_post) if Formtastic::Util.rails3?
+        output_buffer.concat(@form_project) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li input[@type='text']", :count => 2)
       end
     end
diff --git a/spec/inputs/text_input_spec.rb b/spec/inputs/text_input_spec.rb
index 6bec69052..0b0439004 100644
--- a/spec/inputs/text_input_spec.rb
+++ b/spec/inputs/text_input_spec.rb
@@ -26,7 +26,7 @@
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :class => 'myclass' }))
     end
-    output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+    output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should have_tag("form li textarea.myclass")
   end
     
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index 2727181c3..c928dffe5 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -29,30 +29,30 @@
       it_should_apply_error_logic_for_input_type(:time)
     
       it 'should have a legend and label with the label text inside the fieldset' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.time fieldset legend.label label', /Publish at/)
       end
     
       it 'should associate the legend label with the first select' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.time fieldset legend.label label[@for="post_publish_at_1i"]')
       end
     
       it 'should have an ordered list of two items inside the fieldset' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.time fieldset ol')
         output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
       end
 
       it 'should have five labels for hour and minute' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => 2)
         output_buffer.should have_tag('form li.time fieldset ol li label', /hour/i)
         output_buffer.should have_tag('form li.time fieldset ol li label', /minute/i)
       end
     
       it 'should have two selects for hour and minute' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
       end
     end
@@ -65,7 +65,7 @@
       end
     
       it 'should have five labels for hour and minute' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => 3)
         output_buffer.should have_tag('form li.time fieldset ol li label', /hour/i)
         output_buffer.should have_tag('form li.time fieldset ol li label', /minute/i)
@@ -73,12 +73,12 @@
       end
 
       it 'should have three selects for hour, minute and seconds' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.time fieldset ol li', :count => 3)
       end
 
       it 'should generate a sanitized label and matching ids for attribute' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         4.upto(6) do |i|
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_publish_at_#{i}i']")
           output_buffer.should have_tag("form li fieldset ol li #post_publish_at_#{i}i")
@@ -98,7 +98,7 @@
             concat(builder.input(:created_at, :as => :time, :selected => Time.mktime(1999, 12, 31, 22, 59)))
           end
         end
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@value='21'][@selected]", :count => 1)
       end
@@ -113,7 +113,7 @@
             concat(builder.input(:created_at, :as => :time, :selected => Time.mktime(1999, 12, 31, 22, 59)))
           end
         end
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@value='22'][@selected]", :count => 1)
       end
@@ -126,7 +126,7 @@
             concat(builder.input(:created_at, :as => :time, :selected => nil))
           end
         end
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li ol li select#post_created_at_4i option[@selected]")
       end
       
@@ -136,7 +136,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :time))
         end
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li ol li select option[@selected]")
       end
     end
@@ -151,7 +151,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :time, :include_seconds => true, :labels => { field => "another #{field} label" }))
         end
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => fields.length)
         fields.each do |f|
           output_buffer.should have_tag('form li.time fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
@@ -163,7 +163,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :time, :include_seconds => true, :labels => { field => "" }))
         end
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => fields.length-1)
         fields.each do |f|
           output_buffer.should have_tag('form li.time fieldset ol li label', /#{f}/i) unless field == f
diff --git a/spec/inputs/time_zone_input_spec.rb b/spec/inputs/time_zone_input_spec.rb
index 85a2f1b80..613f65a38 100644
--- a/spec/inputs/time_zone_input_spec.rb
+++ b/spec/inputs/time_zone_input_spec.rb
@@ -19,14 +19,14 @@
   it_should_apply_error_logic_for_input_type(:time_zone)
   
   it 'should generate a label for the input' do
-    output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+    output_buffer.concat(@form) if Formtastic::Util.rails3?
     output_buffer.should have_tag('form li label')
     output_buffer.should have_tag('form li label[@for="post_time_zone"]')
     output_buffer.should have_tag('form li label', /Time zone/)
   end
 
   it "should generate a select" do
-    output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+    output_buffer.concat(@form) if Formtastic::Util.rails3?
     output_buffer.should have_tag("form li select")
     output_buffer.should have_tag("form li select#post_time_zone")
     output_buffer.should have_tag("form li select[@name=\"post[time_zone]\"]")
@@ -36,7 +36,7 @@
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:time_zone, :input_html => { :class => 'myclass' }))
     end
-    output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+    output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should have_tag("form li select.myclass")
   end
 
@@ -48,14 +48,14 @@
     end
 
     it 'should generate labels' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li label')
       output_buffer.should have_tag('form li label[@for="project_time_zone"]')
       output_buffer.should have_tag('form li label', /Time zone/)
     end
 
     it 'should generate select inputs' do
-      output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form li select")
       output_buffer.should have_tag("form li select#project_time_zone")
       output_buffer.should have_tag("form li select[@name=\"project[time_zone]\"]")
@@ -98,7 +98,7 @@
       end
 
       it 'should have a selected item; the specified one' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li select option[@selected='selected']", :count => 1)
         output_buffer.should have_tag("form li select option[@selected='selected']", /Melbourne/i)
         output_buffer.should have_tag("form li select option[@selected='selected'][@value='Melbourne']")
diff --git a/spec/inputs_spec.rb b/spec/inputs_spec.rb
index 408790dcc..3a78659c7 100644
--- a/spec/inputs_spec.rb
+++ b/spec/inputs_spec.rb
@@ -23,28 +23,28 @@
       end
 
       it 'should output just the content wrapped in inputs, not the whole template' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should      =~ /before_builder/
         @inputs_output.should_not =~ /before_builder/
       end
 
       it 'should render a fieldset inside the form, with a class of "inputs"' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form fieldset.inputs")
       end
 
       it 'should render an ol inside the fieldset' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form fieldset.inputs ol")
       end
 
       it 'should render the contents of the block inside the ol' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form fieldset.inputs ol", /hello/)
       end
 
       it 'should not render a legend inside the fieldset' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form fieldset.inputs legend")
       end
 
@@ -55,7 +55,7 @@
           end
         end
 
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form fieldset.inputs ol", /bye/)
       end
     end
@@ -77,7 +77,7 @@
           concat(inputs)
         end
 
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form fieldset.inputs #post_author_attributes_login")
         output_buffer.should_not have_tag("form fieldset.inputs #author_login")
 
@@ -92,7 +92,7 @@
             end
             concat(inputs)
           end
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form input[@name='post[author_attributes][login]']")
         end
         
@@ -107,7 +107,7 @@
             end
             concat(inputs)
           end
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form input[@name='post[author_attributes][login]']")
         end
         
@@ -122,7 +122,7 @@
             end
             concat(inputs)
           end
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form input[@name='post[author][login]']")
         end
         
@@ -149,7 +149,7 @@
           concat(inputs)
         end
 
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form fieldset ol li #post_author_attributes_10_login')
       end
 
@@ -161,7 +161,7 @@
           concat(inputs)
         end
 
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag('fieldset[@builder="Formtastic::SemanticFormHelper"]')
       end
 
@@ -174,7 +174,7 @@
           concat(inputs)
         end
 
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('fieldset legend', 'Author #1')
       end
 
@@ -187,7 +187,7 @@
           concat(inputs)
         end
 
-        output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('fieldset legend', 'Author #11')
       end
     end
@@ -216,7 +216,7 @@
         end
 
         it 'should render a fieldset with a legend inside the form' do
-          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text_using_name}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text_using_title}$/)
@@ -257,7 +257,7 @@
         end
 
         it 'should render a fieldset with a localized legend inside the form' do
-          output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text_using_name}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text_using_title}$/)
@@ -278,7 +278,7 @@
       end
 
       it 'should pass the options into the fieldset tag as attributes' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form fieldset##{@id_option}")
         output_buffer.should have_tag("form fieldset.#{@class_option}")
       end
@@ -311,49 +311,49 @@
       end
 
       it 'should render a form' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form')
       end
 
       it 'should render a fieldset inside the form' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset.inputs')
       end
 
       it 'should not render a legend in the fieldset' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag('form > fieldset.inputs > legend')
       end
 
       it 'should render an ol in the fieldset' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset.inputs > ol')
       end
 
       it 'should render a list item in the ol for each column and reflection' do
         # Remove the :has_many macro and :created_at column
         count = ::Post.content_columns.size + ::Post.reflections.size - 2
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => count)
       end
 
       it 'should render a string list item for title' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset.inputs > ol > li.string')
       end
 
       it 'should render a text list item for body' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset.inputs > ol > li.text')
       end
 
       it 'should render a select list item for author_id' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset.inputs > ol > li.select', :count => 1)
       end
 
       it 'should not render timestamps inputs by default' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag('form > fieldset.inputs > ol > li.datetime')
       end
     end
@@ -365,7 +365,7 @@
             concat(builder.inputs(:title, :body))
           end
 
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => 2)
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.string')
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.text')
@@ -378,7 +378,7 @@
             concat(builder.inputs(:title, :body))
           end
 
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.string', :count => 2)
         end
       end
@@ -392,7 +392,7 @@
             concat(builder.inputs(:login, :for => @bob))
           end
 
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form fieldset.inputs #post_author_login")
           output_buffer.should_not have_tag("form fieldset.inputs #author_login")
         end
@@ -403,7 +403,7 @@
           form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
             concat(builder.inputs(:login, :for => @bob))
           end
-          output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form fieldset.inputs #project_author_login")
           output_buffer.should_not have_tag("form fieldset.inputs #project_login")
         end
@@ -421,17 +421,17 @@
       end
 
       it 'should render a form with a fieldset containing two list items' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => 4)
       end
 
       it 'should pass the options down to the fieldset' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset#my-id.inputs')
       end
 
       it 'should use the special :name option as a text for the legend tag' do
-        output_buffer.concat(@form) if defined?(ActiveSupport::SafeBuffer)
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset#my-id.inputs > legend', /^#{@legend_text_using_option}$/)
         output_buffer.should have_tag('form > fieldset#my-id-2.inputs > legend', /^#{@legend_text_using_arg}$/)
       end
diff --git a/spec/layout_helper_spec.rb b/spec/layout_helper_spec.rb
index a05943558..e3b36043c 100644
--- a/spec/layout_helper_spec.rb
+++ b/spec/layout_helper_spec.rb
@@ -17,12 +17,12 @@
     end
     
     it 'should render a link to formtastic.css' do
-      output_buffer.concat(@tags) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@tags) if Formtastic::Util.rails3?
       output_buffer.should have_tag("link[@href='/stylesheets/formtastic.css']")
     end
     
     it 'should render a link to formtastic_changes.css' do
-      output_buffer.concat(@tags) if defined?(ActiveSupport::SafeBuffer)
+      output_buffer.concat(@tags) if Formtastic::Util.rails3?
       output_buffer.should have_tag("link[@href='/stylesheets/formtastic_changes.css']")
     end
     
diff --git a/spec/semantic_fields_for_spec.rb b/spec/semantic_fields_for_spec.rb
index e48a6e05e..d80fef6e3 100644
--- a/spec/semantic_fields_for_spec.rb
+++ b/spec/semantic_fields_for_spec.rb
@@ -34,7 +34,7 @@
         concat(nested_builder.inputs(:login))
       end)
     end
-    output_buffer.concat(form) if defined?(ActiveSupport::SafeBuffer)
+    output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should have_tag('form fieldset.inputs #post_author_1_login_input')
     # Not valid selector, so using good ol' regex
     output_buffer.should_not =~ /id="post\[author\]_1_login_input"/

From 0a71ef60becc47876d5d6f0c64b5e9d58330f3b9 Mon Sep 17 00:00:00 2001
From: Vladimir Parfinenko <vladimir.parfinenko@gmail.com>
Date: Tue, 18 May 2010 01:27:31 +0700
Subject: [PATCH 073/992] Fixed misprint

---
 generators/formtastic/templates/formtastic.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generators/formtastic/templates/formtastic.rb b/generators/formtastic/templates/formtastic.rb
index ee76ff638..bb710efcc 100644
--- a/generators/formtastic/templates/formtastic.rb
+++ b/generators/formtastic/templates/formtastic.rb
@@ -28,7 +28,7 @@
 # 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.
+# reading when formtastic is used 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

From 6b53be05e0ec77d2c1798f3a7cd14f3e48a13aed Mon Sep 17 00:00:00 2001
From: Toni Tuominen <toni@cloudmods.net>
Date: Sun, 23 May 2010 10:59:07 +0300
Subject: [PATCH 074/992] Translations for nested models.

---
 lib/formtastic.rb      | 11 ++++++++++-
 lib/formtastic/i18n.rb |  3 +++
 spec/i18n_spec.rb      | 22 +++++++++++++++++++++-
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 40de1c295..cffbfc643 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1616,7 +1616,7 @@ def localized_string(key, value, type, options = {}) #:nodoc:
           use_i18n = value.nil? ? @@i18n_lookups_by_default : (value != false)
 
           if use_i18n
-            model_name  = self.model_name.underscore
+            model_name, nested_model_name  = normalize_model_name(self.model_name.underscore)
             action_name = template.params[:action].to_s rescue ''
             attribute_name = key.to_s
 
@@ -1624,6 +1624,7 @@ def localized_string(key, value, type, options = {}) #:nodoc:
               i18n_path = i18n_scope.dup
               i18n_path.gsub!('{{action}}', action_name)
               i18n_path.gsub!('{{model}}', model_name)
+              i18n_path.gsub!('{{nested_model}}', nested_model_name) unless nested_model_name.nil?
               i18n_path.gsub!('{{attribute}}', attribute_name)
               i18n_path.gsub!('..', '.')
               i18n_path.to_sym
@@ -1641,6 +1642,14 @@ def model_name
         @object.present? ? @object.class.name : @object_name.to_s.classify
       end
 
+      def normalize_model_name(name)
+        if name =~ /(.+)\[(.+)\]/
+          [$1, $2]
+        else
+          [name]
+        end
+      end
+
       def send_or_call(duck, object)
         if duck.is_a?(Proc)
           duck.call(object)
diff --git a/lib/formtastic/i18n.rb b/lib/formtastic/i18n.rb
index c3536f2fa..ba38cbce6 100644
--- a/lib/formtastic/i18n.rb
+++ b/lib/formtastic/i18n.rb
@@ -11,8 +11,11 @@ module I18n
         :update         => 'Update {{model}}'
       }.freeze
     SCOPES = [
+        '{{model}}.{{nested_model}}.{{action}}.{{attribute}}',
         '{{model}}.{{action}}.{{attribute}}',
+        '{{model}}.{{nested_model}}.{{attribute}}',
         '{{model}}.{{attribute}}',
+        '{{nested_model}}.{{attribute}}',
         '{{attribute}}'
       ]
       
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index 10c3da907..b9cfb403f 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -89,7 +89,8 @@
           :labels => {
               :title    => "Hello world!",
               :post     => {:title => "Hello post!"},
-              :project  => {:title => "Hello project!"}
+              :project  => {:title => "Hello project!", :task => {:name => "Hello task name!"}},
+              :line_item => {:name => "Hello line item name!"}
             }
         }
       ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
@@ -121,6 +122,25 @@
       output_buffer.should have_tag("form label", /Hello project!/)
     end
     
+    it 'should be able to translate nested objects with nested translations' do
+      semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        builder.semantic_fields_for(:task) do |f|
+          concat(f.input(:name))
+        end
+      end
+      output_buffer.should have_tag("form label", /Hello task name!/)
+    end
+
+    it 'should be able to translated nested objects with top level translations' do
+      semantic_form_for(:order, :url => 'http://test.host') do |builder|
+        builder.semantic_fields_for(:line_item) do |f|
+          concat(f.input(:name))
+        end
+      end
+      output_buffer.should have_tag("form label", /Hello line item name!/)
+    end
+
+
     # TODO: Add spec for namespaced models?
     
   end

From 5469c792a447851481745cede75b97282bdbe52f Mon Sep 17 00:00:00 2001
From: Hans Petter Wilhelmsen <hanspetter@gmail.com>
Date: Fri, 21 May 2010 19:47:37 +0200
Subject: [PATCH 075/992] i18n fix: "The {{key}} interpolation syntax in I18n
 messages is deprecated. Please use %{key} instead."

---
 lib/formtastic.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index cffbfc643..d6befe99f 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1595,9 +1595,9 @@ def humanized_attribute_name(method) #:nodoc:
       #
       # Lookup priority:
       #
-      #   'formtastic.{{type}}.{{model}}.{{action}}.{{attribute}}'
-      #   'formtastic.{{type}}.{{model}}.{{attribute}}'
-      #   'formtastic.{{type}}.{{attribute}}'
+      #   'formtastic.%{type}.%{model}.%{action}.%{attribute}'
+      #   'formtastic.%{type}.%{model}.%{attribute}'
+      #   'formtastic.%{type}.%{attribute}'
       # 
       # Example:
       #   
@@ -1622,10 +1622,10 @@ def localized_string(key, value, type, options = {}) #:nodoc:
 
             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!('{{nested_model}}', nested_model_name) unless nested_model_name.nil?
-              i18n_path.gsub!('{{attribute}}', attribute_name)
+              i18n_path.gsub!('%{action}', action_name)
+              i18n_path.gsub!('%{model}', model_name)
+              i18n_path.gsub!('%{nested_model}', nested_model_name) unless nested_model_name.nil?
+              i18n_path.gsub!('%{attribute}', attribute_name)
               i18n_path.gsub!('..', '.')
               i18n_path.to_sym
             end

From 49b45f6ad8578607c8a5ecc58695e2cf834ac577 Mon Sep 17 00:00:00 2001
From: Hans Petter Wilhelmsen <hanspetter@gmail.com>
Date: Fri, 21 May 2010 19:57:07 +0200
Subject: [PATCH 076/992] i18n fix II: "The {{key}} interpolation syntax in
 I18n messages is deprecated. Please use %{key} instead."

---
 README.textile             |  4 ++--
 lib/formtastic/i18n.rb     | 16 ++++++++--------
 spec/commit_button_spec.rb | 12 ++++++------
 spec/i18n_spec.rb          |  8 ++++----
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/README.textile b/README.textile
index a620af903..5057ce70b 100644
--- a/README.textile
+++ b/README.textile
@@ -337,7 +337,7 @@ Formtastic supports localized *labels*, *hints*, *legends*, *actions* using the
           title: "Choose a good title for you post."
           body: "Write something inspiring here."
       actions:
-        create: "Create my {{model}}"
+        create: "Create my %{model}"
         update: "Save changes"
         dummie: "Launch!"
 </pre>
@@ -354,7 +354,7 @@ Formtastic supports localized *labels*, *hints*, *legends*, *actions* using the
       <%= form.input :section %>    # => :label => I18n.t('activerecord.attributes.user.section')  or 'Section'
     <% end %>
     <% form.buttons do %>
-      <%= form.commit_button %>     # => "Create my {{model}}"
+      <%= form.commit_button %>     # => "Create my %{model}"
     <% end %>
   <% end %>
 </pre>
diff --git a/lib/formtastic/i18n.rb b/lib/formtastic/i18n.rb
index ba38cbce6..51e72f6ef 100644
--- a/lib/formtastic/i18n.rb
+++ b/lib/formtastic/i18n.rb
@@ -7,16 +7,16 @@ module I18n
         :required       => 'required',
         :yes            => 'Yes',
         :no             => 'No',
-        :create         => 'Create {{model}}',
-        :update         => 'Update {{model}}'
+        :create         => 'Create %{model}',
+        :update         => 'Update %{model}'
       }.freeze
     SCOPES = [
-        '{{model}}.{{nested_model}}.{{action}}.{{attribute}}',
-        '{{model}}.{{action}}.{{attribute}}',
-        '{{model}}.{{nested_model}}.{{attribute}}',
-        '{{model}}.{{attribute}}',
-        '{{nested_model}}.{{attribute}}',
-        '{{attribute}}'
+        '%{model}.%{nested_model}.%{action}.%{attribute}',
+        '%{model}.%{action}.%{attribute}',
+        '%{model}.%{nested_model}.%{attribute}',
+        '%{model}.%{attribute}',
+        '%{nested_model}.%{attribute}',
+        '%{attribute}'
       ]
       
     class << self
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index 7b8819340..5388c04fc 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -136,7 +136,7 @@
       describe 'when no explicit label is provided' do
         describe 'when no I18n-localized label is provided' do
           before do
-            ::I18n.backend.store_translations :en, :formtastic => {:submit => 'Submit {{model}}'}
+            ::I18n.backend.store_translations :en, :formtastic => {:submit => 'Submit %{model}'}
           end
           
           after do
@@ -171,7 +171,7 @@
              :formtastic => {
                  :actions => {
                    :post => {
-                     :submit => 'Custom Submit {{model}}'
+                     :submit => 'Custom Submit %{model}'
                     }
                   }
                }
@@ -210,7 +210,7 @@
       describe 'when no explicit label is provided' do
         describe 'when no I18n-localized label is provided' do
           before do
-            ::I18n.backend.store_translations :en, :formtastic => {:create => 'Create {{model}}'}
+            ::I18n.backend.store_translations :en, :formtastic => {:create => 'Create %{model}'}
           end
 
           after do
@@ -245,7 +245,7 @@
               :formtastic => {
                   :actions => {
                     :post => {
-                      :create => 'Custom Create {{model}}'
+                      :create => 'Custom Create %{model}'
                      }
                    }
                 }
@@ -284,7 +284,7 @@
       describe 'when no explicit label is provided' do
         describe 'when no I18n-localized label is provided' do
           before do
-            ::I18n.backend.store_translations :en, :formtastic => {:update => 'Save {{model}}'}
+            ::I18n.backend.store_translations :en, :formtastic => {:update => 'Save %{model}'}
           end
           
           after do
@@ -319,7 +319,7 @@
               :formtastic => {
                   :actions => {
                     :post => {
-                      :update => 'Custom Save {{model}}'
+                      :update => 'Custom Save %{model}'
                      }
                    }
                 }
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index b9cfb403f..f1aa918ed 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -26,11 +26,11 @@
       @formtastic_strings = {
           :yes            => 'Default Yes',
           :no             => 'Default No',
-          :create         => 'Default Create {{model}}',
-          :update         => 'Default Update {{model}}',
+          :create         => 'Default Create %{model}',
+          :update         => 'Default Update %{model}',
           :custom_scope   => {
               :duck           => 'Duck',
-              :duck_pond      => '{{ducks}} ducks in a pond'
+              :duck_pond      => '%{ducks} ducks in a pond'
             }
         }
       ::I18n.backend.store_translations :en, :formtastic => @formtastic_strings
@@ -71,7 +71,7 @@
 
     it "should use default strings" do
       (::Formtastic::I18n::DEFAULT_VALUES.keys).each do |key|
-        ::Formtastic::I18n.t(key, :model => '{{model}}').should == ::Formtastic::I18n::DEFAULT_VALUES[key]
+        ::Formtastic::I18n.t(key, :model => '%{model}').should == ::Formtastic::I18n::DEFAULT_VALUES[key]
       end
     end
     

From c96809c2de0348038df1020c33a6597d100dd6a6 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Mon, 24 May 2010 16:31:25 +0200
Subject: [PATCH 077/992] Fix tests for nested objects

---
 spec/i18n_spec.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index a19be951a..baa38081c 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -125,20 +125,22 @@
     end
     
     it 'should be able to translate nested objects with nested translations' do
-      semantic_form_for(:project, :url => 'http://test.host') do |builder|
+      form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
         builder.semantic_fields_for(:task) do |f|
           concat(f.input(:name))
         end
       end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form label", /Hello task name!/)
     end
 
     it 'should be able to translated nested objects with top level translations' do
-      semantic_form_for(:order, :url => 'http://test.host') do |builder|
+      form = semantic_form_for(:order, :url => 'http://test.host') do |builder|
         builder.semantic_fields_for(:line_item) do |f|
           concat(f.input(:name))
         end
       end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form label", /Hello line item name!/)
     end
 

From 42f963180f2c1d4533f4b2cf1196094139345f63 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Mon, 24 May 2010 16:43:35 +0200
Subject: [PATCH 078/992] Changelog catchup

---
 CHANGELOG | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4af1357c1..6b6c9ffee 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,11 +1,16 @@
 0.9.9 [unreleased]
 
+* Changed I18n handling in spec tests to use I18n.backend.reload! instead of assigning nil
 * Changed date/time inputs to default to nil instead of Time.now when the object has no value (due to deprecation warning, #240)
 * Changed the behaviour of associations with a :class_name option to be more consistent with what Rails expects
+* Changed testsuite to use rails 2.3.7 as base
+* Fixed use of unsafe HTML strings in tests
 * Fixed issues with Ruby 1.9.1 and Haml
 * Fixed inputs_for_nested_attributes only appending to the output buffer
+* Fixed use of deprecated {{key}} syntax in i18n interpolation (thanks to Hans Petter Wilhelmsen)
 * Add the :disabled option to check_boxes input
-* Changed I18n handling in spec tests to use I18n.backend.reload! instead of assigning nil
+* Added helper to mark strings as HTML safe depending on environment, adapted from haml 2.2 solution
+* Added translation support for nested models (thanks to Toni Tuominen)
 
 0.9.8
 

From fa003bc7cc38a51de5897f873193aa28b50a573b Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Mon, 24 May 2010 16:45:27 +0200
Subject: [PATCH 079/992] Changelog catchup

---
 CHANGELOG | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3c9f74a37..5bab8cf24 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,24 +1,26 @@
 (HEAD)
-* Changed I18n handling in spec tests to use I18n.backend.reload! instead of assigning nil
 * Changed semantic_remote_form_for to allow for unobstrusive javascript / :remote option (rails3)
 * Changed spec_helper to support Rails 2 with Rspec od Rails 3 with Rspec 3 environments
 * Changed Rakefile to initalize the correct testing framework for the enviroment
-* Fixed inputs_for_nested_attributes only appending to the output buffer
 * Fixed use of model_name.human instead of model_name.human_name (rails3)
 * Fixed use of deprecated Errors#on_base
 * Added railtie to perform initialization tasks after the rails git framework is available (rails3)
-* Added helper to mark strings as HTML safe depending on environment, adapted from haml 2.2 solution (rails3)
 * Added compatible install and form helpers (rails3)
 * Added support for ActiveModel Validations, thanks to Guillaume Belleguic (rails3)
 
 0.9.9 [unreleased]
 
+* Changed I18n handling in spec tests to use I18n.backend.reload! instead of assigning nil
 * Changed date/time inputs to default to nil instead of Time.now when the object has no value (due to deprecation warning, #240)
 * Changed the behaviour of associations with a :class_name option to be more consistent with what Rails expects
+* Changed testsuite to use rails 2.3.7 as base
+* Fixed use of unsafe HTML strings in tests
 * Fixed issues with Ruby 1.9.1 and Haml
 * Fixed inputs_for_nested_attributes only appending to the output buffer
+* Fixed use of deprecated {{key}} syntax in i18n interpolation (thanks to Hans Petter Wilhelmsen)
 * Add the :disabled option to check_boxes input
-* Changed I18n handling in spec tests to use I18n.backend.reload! instead of assigning nil
+* Added helper to mark strings as HTML safe depending on environment, adapted from haml 2.2 solution
+* Added translation support for nested models (thanks to Toni Tuominen)
 
 0.9.8
 

From 9a33bfe988407d8da3b2dd1a427a99a3afd1fad1 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 25 May 2010 07:43:57 +1000
Subject: [PATCH 080/992] Tweaked CHANGELOG to reflect only user-facing
 changes/fixes/additions, rather than internal implementation

---
 CHANGELOG | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6b6c9ffee..defd45b81 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,15 +1,11 @@
 0.9.9 [unreleased]
 
-* Changed I18n handling in spec tests to use I18n.backend.reload! instead of assigning nil
 * Changed date/time inputs to default to nil instead of Time.now when the object has no value (due to deprecation warning, #240)
 * Changed the behaviour of associations with a :class_name option to be more consistent with what Rails expects
-* Changed testsuite to use rails 2.3.7 as base
-* Fixed use of unsafe HTML strings in tests
+* Fixed issues relating to Rails 2.3.7 automatically escaping ERB
 * Fixed issues with Ruby 1.9.1 and Haml
-* Fixed inputs_for_nested_attributes only appending to the output buffer
 * Fixed use of deprecated {{key}} syntax in i18n interpolation (thanks to Hans Petter Wilhelmsen)
-* Add the :disabled option to check_boxes input
-* Added helper to mark strings as HTML safe depending on environment, adapted from haml 2.2 solution
+* Added the :disabled option to check_boxes input
 * Added translation support for nested models (thanks to Toni Tuominen)
 
 0.9.8

From 48d943fa93bd2f4030c96a860953b040a10591ed Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 25 May 2010 07:48:11 +1000
Subject: [PATCH 081/992] typo in CHANGELOG

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index defd45b81..6252c5805 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,7 +2,7 @@
 
 * Changed date/time inputs to default to nil instead of Time.now when the object has no value (due to deprecation warning, #240)
 * Changed the behaviour of associations with a :class_name option to be more consistent with what Rails expects
-* Fixed issues relating to Rails 2.3.7 automatically escaping ERB
+* Fixed issues relating to Rails 2.3.6 automatically escaping ERB
 * Fixed issues with Ruby 1.9.1 and Haml
 * Fixed use of deprecated {{key}} syntax in i18n interpolation (thanks to Hans Petter Wilhelmsen)
 * Added the :disabled option to check_boxes input

From 5f3ccac815b89638c4aebb08f8fab23b151bca32 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 25 May 2010 07:58:37 +1000
Subject: [PATCH 082/992] new gemspec

---
 VERSION.yml        | 2 +-
 formtastic.gemspec | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/VERSION.yml b/VERSION.yml
index 29be119c7..b6796933b 100644
--- a/VERSION.yml
+++ b/VERSION.yml
@@ -2,4 +2,4 @@
 :major: 0
 :minor: 9
 :build: 
-:patch: 8
+:patch: 9
diff --git a/formtastic.gemspec b/formtastic.gemspec
index 283747bd7..ff6b557ab 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formtastic}
-  s.version = "0.9.8"
+  s.version = "0.9.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin French"]
-  s.date = %q{2010-03-31}
+  s.date = %q{2010-05-25}
   s.description = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.email = %q{justin@indent.com.au}
   s.extra_rdoc_files = [
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
      "lib/formtastic.rb",
      "lib/formtastic/i18n.rb",
      "lib/formtastic/layout_helper.rb",
+     "lib/formtastic/util.rb",
      "lib/locale/en.yml",
      "rails/init.rb",
      "spec/buttons_spec.rb",

From d13f6b3bd227fdf6af1ea13cbfc79d9cef188602 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 26 May 2010 10:05:10 +1000
Subject: [PATCH 083/992] bumped the test suite up to use Rails 2.3.8

---
 spec/spec_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a40207f64..b1156d296 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,8 +1,8 @@
 # coding: utf-8
 require 'rubygems'
 
-gem 'activesupport', '2.3.7'
-gem 'actionpack', '2.3.7'
+gem 'activesupport', '2.3.8'
+gem 'actionpack', '2.3.8'
 require 'active_support'
 require 'action_pack'
 require 'action_view'

From 7ea72eb2c41e7b890814cbc976b13372a3bdc1f3 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 26 May 2010 10:07:47 +1000
Subject: [PATCH 084/992] mark 0.9.9 as released in CHANGELOG

---
 CHANGELOG | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6252c5805..f0f67b5ab 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,7 @@
-0.9.9 [unreleased]
+0.9.10 [unreleased]
+
+
+0.9.9
 
 * Changed date/time inputs to default to nil instead of Time.now when the object has no value (due to deprecation warning, #240)
 * Changed the behaviour of associations with a :class_name option to be more consistent with what Rails expects

From 1469b533cb7a5d0e54ee0a845a88b72576b62885 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 26 May 2010 11:06:46 +1000
Subject: [PATCH 085/992] Reverting two i18n patches pulled in from the rails3
 branch which are not compatible with Rails 2.3.x.

Specs pass without deprecation warnings, and the relevant commits in Rails (13867a3 and 9bd91b0) seem to be in master, but not in the v2.3.8 branch.

Revert "i18n fix: "The {{key}} interpolation syntax in I18n messages is deprecated. Please use %{key} instead.""
This reverts commit .

Revert "i18n fix II: "The {{key}} interpolation syntax in I18n messages is deprecated. Please use %{key} instead.""
This reverts commit 49b45f6ad8578607c8a5ecc58695e2cf834ac577.
---
 README.textile             |  4 ++--
 lib/formtastic.rb          | 14 +++++++-------
 lib/formtastic/i18n.rb     | 16 ++++++++--------
 spec/commit_button_spec.rb | 12 ++++++------
 spec/i18n_spec.rb          |  8 ++++----
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/README.textile b/README.textile
index 5057ce70b..a620af903 100644
--- a/README.textile
+++ b/README.textile
@@ -337,7 +337,7 @@ Formtastic supports localized *labels*, *hints*, *legends*, *actions* using the
           title: "Choose a good title for you post."
           body: "Write something inspiring here."
       actions:
-        create: "Create my %{model}"
+        create: "Create my {{model}}"
         update: "Save changes"
         dummie: "Launch!"
 </pre>
@@ -354,7 +354,7 @@ Formtastic supports localized *labels*, *hints*, *legends*, *actions* using the
       <%= form.input :section %>    # => :label => I18n.t('activerecord.attributes.user.section')  or 'Section'
     <% end %>
     <% form.buttons do %>
-      <%= form.commit_button %>     # => "Create my %{model}"
+      <%= form.commit_button %>     # => "Create my {{model}}"
     <% end %>
   <% end %>
 </pre>
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index d6befe99f..cffbfc643 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1595,9 +1595,9 @@ def humanized_attribute_name(method) #:nodoc:
       #
       # Lookup priority:
       #
-      #   'formtastic.%{type}.%{model}.%{action}.%{attribute}'
-      #   'formtastic.%{type}.%{model}.%{attribute}'
-      #   'formtastic.%{type}.%{attribute}'
+      #   'formtastic.{{type}}.{{model}}.{{action}}.{{attribute}}'
+      #   'formtastic.{{type}}.{{model}}.{{attribute}}'
+      #   'formtastic.{{type}}.{{attribute}}'
       # 
       # Example:
       #   
@@ -1622,10 +1622,10 @@ def localized_string(key, value, type, options = {}) #:nodoc:
 
             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!('%{nested_model}', nested_model_name) unless nested_model_name.nil?
-              i18n_path.gsub!('%{attribute}', attribute_name)
+              i18n_path.gsub!('{{action}}', action_name)
+              i18n_path.gsub!('{{model}}', model_name)
+              i18n_path.gsub!('{{nested_model}}', nested_model_name) unless nested_model_name.nil?
+              i18n_path.gsub!('{{attribute}}', attribute_name)
               i18n_path.gsub!('..', '.')
               i18n_path.to_sym
             end
diff --git a/lib/formtastic/i18n.rb b/lib/formtastic/i18n.rb
index 51e72f6ef..ba38cbce6 100644
--- a/lib/formtastic/i18n.rb
+++ b/lib/formtastic/i18n.rb
@@ -7,16 +7,16 @@ module I18n
         :required       => 'required',
         :yes            => 'Yes',
         :no             => 'No',
-        :create         => 'Create %{model}',
-        :update         => 'Update %{model}'
+        :create         => 'Create {{model}}',
+        :update         => 'Update {{model}}'
       }.freeze
     SCOPES = [
-        '%{model}.%{nested_model}.%{action}.%{attribute}',
-        '%{model}.%{action}.%{attribute}',
-        '%{model}.%{nested_model}.%{attribute}',
-        '%{model}.%{attribute}',
-        '%{nested_model}.%{attribute}',
-        '%{attribute}'
+        '{{model}}.{{nested_model}}.{{action}}.{{attribute}}',
+        '{{model}}.{{action}}.{{attribute}}',
+        '{{model}}.{{nested_model}}.{{attribute}}',
+        '{{model}}.{{attribute}}',
+        '{{nested_model}}.{{attribute}}',
+        '{{attribute}}'
       ]
       
     class << self
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index 5388c04fc..7b8819340 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -136,7 +136,7 @@
       describe 'when no explicit label is provided' do
         describe 'when no I18n-localized label is provided' do
           before do
-            ::I18n.backend.store_translations :en, :formtastic => {:submit => 'Submit %{model}'}
+            ::I18n.backend.store_translations :en, :formtastic => {:submit => 'Submit {{model}}'}
           end
           
           after do
@@ -171,7 +171,7 @@
              :formtastic => {
                  :actions => {
                    :post => {
-                     :submit => 'Custom Submit %{model}'
+                     :submit => 'Custom Submit {{model}}'
                     }
                   }
                }
@@ -210,7 +210,7 @@
       describe 'when no explicit label is provided' do
         describe 'when no I18n-localized label is provided' do
           before do
-            ::I18n.backend.store_translations :en, :formtastic => {:create => 'Create %{model}'}
+            ::I18n.backend.store_translations :en, :formtastic => {:create => 'Create {{model}}'}
           end
 
           after do
@@ -245,7 +245,7 @@
               :formtastic => {
                   :actions => {
                     :post => {
-                      :create => 'Custom Create %{model}'
+                      :create => 'Custom Create {{model}}'
                      }
                    }
                 }
@@ -284,7 +284,7 @@
       describe 'when no explicit label is provided' do
         describe 'when no I18n-localized label is provided' do
           before do
-            ::I18n.backend.store_translations :en, :formtastic => {:update => 'Save %{model}'}
+            ::I18n.backend.store_translations :en, :formtastic => {:update => 'Save {{model}}'}
           end
           
           after do
@@ -319,7 +319,7 @@
               :formtastic => {
                   :actions => {
                     :post => {
-                      :update => 'Custom Save %{model}'
+                      :update => 'Custom Save {{model}}'
                      }
                    }
                 }
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index f1aa918ed..b9cfb403f 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -26,11 +26,11 @@
       @formtastic_strings = {
           :yes            => 'Default Yes',
           :no             => 'Default No',
-          :create         => 'Default Create %{model}',
-          :update         => 'Default Update %{model}',
+          :create         => 'Default Create {{model}}',
+          :update         => 'Default Update {{model}}',
           :custom_scope   => {
               :duck           => 'Duck',
-              :duck_pond      => '%{ducks} ducks in a pond'
+              :duck_pond      => '{{ducks}} ducks in a pond'
             }
         }
       ::I18n.backend.store_translations :en, :formtastic => @formtastic_strings
@@ -71,7 +71,7 @@
 
     it "should use default strings" do
       (::Formtastic::I18n::DEFAULT_VALUES.keys).each do |key|
-        ::Formtastic::I18n.t(key, :model => '%{model}').should == ::Formtastic::I18n::DEFAULT_VALUES[key]
+        ::Formtastic::I18n.t(key, :model => '{{model}}').should == ::Formtastic::I18n::DEFAULT_VALUES[key]
       end
     end
     

From f7ad17227c007b8b6d5a91644bb4c8282f03fe22 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 26 May 2010 11:26:39 +1000
Subject: [PATCH 086/992] bumping version to 0.9.10 :(

---
 VERSION.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION.yml b/VERSION.yml
index b6796933b..40725be39 100644
--- a/VERSION.yml
+++ b/VERSION.yml
@@ -2,4 +2,4 @@
 :major: 0
 :minor: 9
 :build: 
-:patch: 9
+:patch: 10

From 4d4b0518ffaa5f1a8eeaa3446a0d4a47774cd156 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 26 May 2010 11:27:06 +1000
Subject: [PATCH 087/992] new gemspec

---
 formtastic.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index ff6b557ab..9abadbdb2 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formtastic}
-  s.version = "0.9.9"
+  s.version = "0.9.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin French"]
-  s.date = %q{2010-05-25}
+  s.date = %q{2010-05-26}
   s.description = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.email = %q{justin@indent.com.au}
   s.extra_rdoc_files = [

From a40669495128be0bc7d8632e34ead9f5fac5b0a4 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 26 May 2010 11:29:29 +1000
Subject: [PATCH 088/992] updated CHANGELOG

---
 CHANGELOG | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index f0f67b5ab..f8e3dbc0c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
-0.9.10 [unreleased]
+0.9.10
 
+* Fixed i18n incompatibility with Rails 2.3.8 by reverting two i18n patches pulled in from the rails3 branch
 
 0.9.9
 

From 743b26b921e7c9091863f77e054afb0eb0d84a67 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Sat, 29 May 2010 12:33:01 +0200
Subject: [PATCH 089/992] Revert "Reverting two i18n patches pulled in from the
 rails3 branch which are not compatible with Rails 2.3.x."

This reverts commit 1469b533cb7a5d0e54ee0a845a88b72576b62885.
---
 README.textile             |  4 ++--
 lib/formtastic.rb          | 14 +++++++-------
 lib/formtastic/i18n.rb     | 16 ++++++++--------
 spec/commit_button_spec.rb | 12 ++++++------
 spec/i18n_spec.rb          |  8 ++++----
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/README.textile b/README.textile
index a620af903..5057ce70b 100644
--- a/README.textile
+++ b/README.textile
@@ -337,7 +337,7 @@ Formtastic supports localized *labels*, *hints*, *legends*, *actions* using the
           title: "Choose a good title for you post."
           body: "Write something inspiring here."
       actions:
-        create: "Create my {{model}}"
+        create: "Create my %{model}"
         update: "Save changes"
         dummie: "Launch!"
 </pre>
@@ -354,7 +354,7 @@ Formtastic supports localized *labels*, *hints*, *legends*, *actions* using the
       <%= form.input :section %>    # => :label => I18n.t('activerecord.attributes.user.section')  or 'Section'
     <% end %>
     <% form.buttons do %>
-      <%= form.commit_button %>     # => "Create my {{model}}"
+      <%= form.commit_button %>     # => "Create my %{model}"
     <% end %>
   <% end %>
 </pre>
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index cb3377c53..7319eedcb 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1606,9 +1606,9 @@ def humanized_attribute_name(method) #:nodoc:
       #
       # Lookup priority:
       #
-      #   'formtastic.{{type}}.{{model}}.{{action}}.{{attribute}}'
-      #   'formtastic.{{type}}.{{model}}.{{attribute}}'
-      #   'formtastic.{{type}}.{{attribute}}'
+      #   'formtastic.%{type}.%{model}.%{action}.%{attribute}'
+      #   'formtastic.%{type}.%{model}.%{attribute}'
+      #   'formtastic.%{type}.%{attribute}'
       # 
       # Example:
       #   
@@ -1633,10 +1633,10 @@ def localized_string(key, value, type, options = {}) #:nodoc:
 
             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!('{{nested_model}}', nested_model_name) unless nested_model_name.nil?
-              i18n_path.gsub!('{{attribute}}', attribute_name)
+              i18n_path.gsub!('%{action}', action_name)
+              i18n_path.gsub!('%{model}', model_name)
+              i18n_path.gsub!('%{nested_model}', nested_model_name) unless nested_model_name.nil?
+              i18n_path.gsub!('%{attribute}', attribute_name)
               i18n_path.gsub!('..', '.')
               i18n_path.to_sym
             end
diff --git a/lib/formtastic/i18n.rb b/lib/formtastic/i18n.rb
index abde3a212..5d917fdfb 100644
--- a/lib/formtastic/i18n.rb
+++ b/lib/formtastic/i18n.rb
@@ -6,16 +6,16 @@ module I18n
         :required       => 'required',
         :yes            => 'Yes',
         :no             => 'No',
-        :create         => 'Create {{model}}',
-        :update         => 'Update {{model}}'
+        :create         => 'Create %{model}',
+        :update         => 'Update %{model}'
       }.freeze
     SCOPES = [
-        '{{model}}.{{nested_model}}.{{action}}.{{attribute}}',
-        '{{model}}.{{action}}.{{attribute}}',
-        '{{model}}.{{nested_model}}.{{attribute}}',
-        '{{model}}.{{attribute}}',
-        '{{nested_model}}.{{attribute}}',
-        '{{attribute}}'
+        '%{model}.%{nested_model}.%{action}.%{attribute}',
+        '%{model}.%{action}.%{attribute}',
+        '%{model}.%{nested_model}.%{attribute}',
+        '%{model}.%{attribute}',
+        '%{nested_model}.%{attribute}',
+        '%{attribute}'
       ]
       
     class << self
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index 18f4289e5..efe24cb9d 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -147,7 +147,7 @@
       describe 'when no explicit label is provided' do
         describe 'when no I18n-localized label is provided' do
           before do
-            ::I18n.backend.store_translations :en, :formtastic => {:submit => 'Submit {{model}}'}
+            ::I18n.backend.store_translations :en, :formtastic => {:submit => 'Submit %{model}'}
           end
           
           after do
@@ -183,7 +183,7 @@
              :formtastic => {
                  :actions => {
                    :post => {
-                     :submit => 'Custom Submit {{model}}'
+                     :submit => 'Custom Submit %{model}'
                     }
                   }
                }
@@ -225,7 +225,7 @@
       describe 'when no explicit label is provided' do
         describe 'when no I18n-localized label is provided' do
           before do
-            ::I18n.backend.store_translations :en, :formtastic => {:create => 'Create {{model}}'}
+            ::I18n.backend.store_translations :en, :formtastic => {:create => 'Create %{model}'}
           end
 
           after do
@@ -261,7 +261,7 @@
               :formtastic => {
                   :actions => {
                     :post => {
-                      :create => 'Custom Create {{model}}'
+                      :create => 'Custom Create %{model}'
                      }
                    }
                 }
@@ -303,7 +303,7 @@
       describe 'when no explicit label is provided' do
         describe 'when no I18n-localized label is provided' do
           before do
-            ::I18n.backend.store_translations :en, :formtastic => {:update => 'Save {{model}}'}
+            ::I18n.backend.store_translations :en, :formtastic => {:update => 'Save %{model}'}
           end
           
           after do
@@ -340,7 +340,7 @@
               :formtastic => {
                   :actions => {
                     :post => {
-                      :update => 'Custom Save {{model}}'
+                      :update => 'Custom Save %{model}'
                      }
                    }
                 }
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index d910a4351..baa38081c 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -26,11 +26,11 @@
       @formtastic_strings = {
           :yes            => 'Default Yes',
           :no             => 'Default No',
-          :create         => 'Default Create {{model}}',
-          :update         => 'Default Update {{model}}',
+          :create         => 'Default Create %{model}',
+          :update         => 'Default Update %{model}',
           :custom_scope   => {
               :duck           => 'Duck',
-              :duck_pond      => '{{ducks}} ducks in a pond'
+              :duck_pond      => '%{ducks} ducks in a pond'
             }
         }
       ::I18n.backend.store_translations :en, :formtastic => @formtastic_strings
@@ -71,7 +71,7 @@
 
     it "should use default strings" do
       (::Formtastic::I18n::DEFAULT_VALUES.keys).each do |key|
-        ::Formtastic::I18n.t(key, :model => '{{model}}').should == ::Formtastic::I18n::DEFAULT_VALUES[key]
+        ::Formtastic::I18n.t(key, :model => '%{model}').should == ::Formtastic::I18n::DEFAULT_VALUES[key]
       end
     end
     

From f134673ba17c51ec6789510294fa775c00d542ff Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Sat, 29 May 2010 12:39:11 +0200
Subject: [PATCH 090/992] Require i18n >= 0.4.0, this closes GH-277

---
 Rakefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Rakefile b/Rakefile
index 54ca1b0fe..889304e38 100644
--- a/Rakefile
+++ b/Rakefile
@@ -59,6 +59,7 @@ begin
     # 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'
+    s.add_dependency 'i18n', '>= 0.4.0'
     
     # Development dependencies. Not installed by default.
     # Install with: sudo gem install formtastic --development

From 4b3bb6021b2ada5c18281bc7168e130a6901bca7 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Sat, 29 May 2010 12:59:46 +0200
Subject: [PATCH 091/992] Rspec renamed to RSpec (since 2.0.0.beta.9)

---
 Rakefile            | 8 ++++----
 spec/input_spec.rb  | 4 ++--
 spec/spec_helper.rb | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Rakefile b/Rakefile
index 889304e38..63628d737 100644
--- a/Rakefile
+++ b/Rakefile
@@ -105,19 +105,19 @@ if defined?(Spec)
   end
 end
 
-if defined?(Rspec)
+if defined?(RSpec)
   desc 'Test the formtastic plugin.'
-  Rspec::Core::RakeTask.new('spec') do |t|
+  RSpec::Core::RakeTask.new('spec') do |t|
     t.pattern = FileList['spec/**/*_spec.rb']
   end
 
   desc 'Test the formtastic plugin with specdoc formatting and colors'
-  Rspec::Core::RakeTask.new('specdoc') do |t|
+  RSpec::Core::RakeTask.new('specdoc') do |t|
     t.pattern = FileList['spec/**/*_spec.rb']
   end
 
   desc "Run all examples with RCov"
-  Rspec::Core::RakeTask.new('examples_with_rcov') do |t|
+  RSpec::Core::RakeTask.new('examples_with_rcov') do |t|
     t.pattern = FileList['spec/**/*_spec.rb']
     t.rcov = true
     t.rcov_opts = ['--exclude', 'spec,Library']
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 4da10b8f0..062f7e9ef 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -136,7 +136,7 @@
               @new_post.class.stub!(:method_defined?).with(:reflect_on_validations_for).and_return(true)
             end
 
-            unless defined?(Rspec)
+            unless defined?(RSpec)
               after do
                 ::Post.unstub!(:reflect_on_validations_for)
                 @new_post.class.stub!(:method_defined?).with(:reflect_on_validations_for).and_return(false)
@@ -240,7 +240,7 @@ def should_be_required(options)
 
           end
 
-          unless defined?(Rspec)
+          unless defined?(RSpec)
             describe 'and its a ActiveModel' do
               before do
                 ::Post.stub!(:validators_on).and_return([])
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index bb6a99916..f7ee6ff68 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -212,7 +212,7 @@ def new_author_path; "/authors/new"; end
     ::Post.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     ::Post.stub!(:human_name).and_return('Post')
     ::Post.stub!(:reflect_on_all_validations).and_return([])
-    ::Post.stub!(:reflect_on_validations_for).and_return([]) if defined?(Rspec)
+    ::Post.stub!(:reflect_on_validations_for).and_return([]) if defined?(RSpec)
     ::Post.stub!(:reflections).and_return({})
     ::Post.stub!(:reflect_on_association).and_return do |column_name|
       case column_name

From c8a48c2d59c61fc4bfd64724a201c44bb640c133 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Sun, 6 Jun 2010 11:11:30 +0200
Subject: [PATCH 092/992] Only call html_safe! if it's supported

---
 lib/formtastic/util.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/util.rb b/lib/formtastic/util.rb
index 822d93aa9..ebf99bdba 100644
--- a/lib/formtastic/util.rb
+++ b/lib/formtastic/util.rb
@@ -13,7 +13,8 @@ module Util
     def html_safe(text)
       return text if text.nil?
       return text.html_safe if defined?(ActiveSupport::SafeBuffer)
-      return text.html_safe!
+      return text.html_safe! if text.respond_to?(:html_safe!)
+      text
     end
 
     def rails_safe_buffer_class

From ecd16ce1906bca70ec5e51048d9e548f5cde49e9 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 7 Jun 2010 09:32:40 +1000
Subject: [PATCH 093/992] added find_options to the list of options that should
 be stripped from HTML options, resolving #262

---
 lib/formtastic.rb               |  2 +-
 spec/inputs/radio_input_spec.rb | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index cffbfc643..3ce1d4a04 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -536,7 +536,7 @@ def inputs_for_nested_attributes(*args, &block) #:nodoc:
       #
       def strip_formtastic_options(options) #:nodoc:
         options.except(:value_method, :label_method, :collection, :required, :label,
-                       :as, :hint, :input_html, :label_html, :value_as_class)
+                       :as, :hint, :input_html, :label_html, :value_as_class, :find_options)
       end
 
       # Determins if the attribute (eg :title) should be considered required or not.
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 8ba38e675..8e65f95d9 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -76,6 +76,16 @@
 
         output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
       end
+      
+      it "should not contain invalid HTML attributes" do
+        
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:author, :as => :radio))
+        end
+        
+        output_buffer.should_not have_tag("form li fieldset ol li input[@find_options]")
+      end
+      
     end
 
     describe 'and no object is given' do

From 0d692326ee3d5448ee9c5dbe4db7a66dc1700ac4 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 7 Jun 2010 09:47:07 +1000
Subject: [PATCH 094/992] :input_html can now specify a :size option of nil,
 resolving #267 with many thanks to indrekj for the patch.

---
 lib/formtastic.rb                |  3 +-
 spec/inputs/string_input_spec.rb | 52 +++++++++++++++++++++-----------
 2 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 3ce1d4a04..52631c024 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1531,7 +1531,8 @@ def default_string_options(method, type) #:nodoc:
         elsif type == :numeric || column.nil? || column.limit.nil?
           { :size => @@default_text_field_size }
         else
-          { :maxlength => column.limit, :size => [column.limit, @@default_text_field_size].min }
+          { :maxlength => column.limit, 
+            :size => @@default_text_field_size && [column.limit, @@default_text_field_size].min }
         end
       end
 
diff --git a/spec/inputs/string_input_spec.rb b/spec/inputs/string_input_spec.rb
index 5175e8e67..86f4bebfa 100644
--- a/spec/inputs/string_input_spec.rb
+++ b/spec/inputs/string_input_spec.rb
@@ -8,26 +8,30 @@
   before do
     @output_buffer = ''
     mock_everything
-    
-    semantic_form_for(@new_post) do |builder|
-      concat(builder.input(:title, :as => :string))
+  end
+  
+  describe "when object is provided" do
+    before do
+      semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:title, :as => :string))
+      end
     end
+    
+    it_should_have_input_wrapper_with_class(:string)
+    it_should_have_input_wrapper_with_id("post_title_input")
+    it_should_have_label_with_text(/Title/)
+    it_should_have_label_for("post_title")
+    it_should_have_input_with_id("post_title")
+    it_should_have_input_with_type(:text)
+    it_should_have_input_with_name("post[title]")
+    it_should_have_maxlength_matching_column_limit
+    it_should_use_default_text_field_size_for_columns_longer_than_default_text_field_size(:string)
+    it_should_use_column_size_for_columns_shorter_than_default_text_field_size(:string)
+    it_should_use_default_text_field_size_when_method_has_no_database_column(:string)
+    it_should_apply_custom_input_attributes_when_input_html_provided(:string)
+    it_should_apply_custom_for_to_label_when_input_html_id_provided(:string)
+    it_should_apply_error_logic_for_input_type(:string)
   end
-
-  it_should_have_input_wrapper_with_class(:string)
-  it_should_have_input_wrapper_with_id("post_title_input")
-  it_should_have_label_with_text(/Title/)
-  it_should_have_label_for("post_title")
-  it_should_have_input_with_id("post_title")
-  it_should_have_input_with_type(:text)
-  it_should_have_input_with_name("post[title]")
-  it_should_have_maxlength_matching_column_limit
-  it_should_use_default_text_field_size_for_columns_longer_than_default_text_field_size(:string)
-  it_should_use_column_size_for_columns_shorter_than_default_text_field_size(:string)
-  it_should_use_default_text_field_size_when_method_has_no_database_column(:string)
-  it_should_apply_custom_input_attributes_when_input_html_provided(:string)
-  it_should_apply_custom_for_to_label_when_input_html_id_provided(:string)
-  it_should_apply_error_logic_for_input_type(:string)
   
   describe "when no object is provided" do
     before do
@@ -43,5 +47,17 @@
     it_should_have_input_with_name("project[title]")
   end
   
+  describe "when size is nil" do
+    before do
+      semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+        concat(builder.input(:title, :as => :string, :input_html => {:size => nil}))
+      end
+    end
+  
+    it "should have no size attribute" do
+      output_buffer.should_not have_tag("input[@size]")
+    end
+  end
+  
 end
 

From 9593e4b2164d276fdf21f5991b98962a2b3982c0 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 7 Jun 2010 11:10:08 +1000
Subject: [PATCH 095/992] Changed radio_input and check_boxes_input to no
 longer uses field_set_wrapping_for_method() [which was designed for use with
 labels that have a mapping to actual inputs]. Instead, I've hard-coded the
 desired markup into the method. Less DRY, but decoupled.

As a result, we now have control over things like the label(), which no longer contains a `for` attribute for an input that doesn't exist, resolving #253.
---
 lib/formtastic.rb                     | 16 +++++++++++++---
 spec/inputs/check_boxes_input_spec.rb | 23 +++++++++++++++++++++--
 spec/inputs/radio_input_spec.rb       | 23 ++++++++++++++++++++++-
 3 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 52631c024..d28fca03d 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -885,8 +885,13 @@ def radio_input(method, options)
           li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
           template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
         end
-
-        field_set_and_list_wrapping_for_method(method, options, list_item_content)
+        
+        template.content_tag(:fieldset,
+          template.content_tag(:legend, 
+            template.label_tag(nil, localized_string(method, method, :label) || humanized_attribute_name(method), :for => nil), :class => :label
+          ) << 
+          template.content_tag(:ol, list_item_content)
+        )
       end
       alias :boolean_radio_input :radio_input
 
@@ -1152,7 +1157,12 @@ def check_boxes_input(method, options)
           template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
         end
 
-        field_set_and_list_wrapping_for_method(method, options, list_item_content)
+        template.content_tag(:fieldset,
+          template.content_tag(:legend, 
+            template.label_tag(nil, localized_string(method, method, :label) || humanized_attribute_name(method), :for => nil), :class => :label
+          ) << 
+          template.content_tag(:ol, list_item_content)
+        )
       end
 
       # Outputs a country select input, wrapping around a regular country_select helper. 
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index f0017bdf9..eb6c36dda 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -231,10 +231,29 @@
       end
 
     end
+    
+    describe "with i18n of the legend label" do
+
+      before do
+        ::I18n.backend.store_translations :en, :formtastic => { :labels => { :post => { :authors => "Translated!" }}}
+
+        @new_post.stub!(:author_ids).and_return(nil)
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:authors, :as => :check_boxes))
+        end
+      end
 
+      after do
+        ::I18n.backend.reload!
+      end
+
+      it "should do foo" do
+        output_buffer.should have_tag("legend.label label", /Translated/)
+      end
+
+    end
+    
   end
-  
-  
 
 end
 
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 8e65f95d9..832f746ec 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -29,7 +29,7 @@
     end
     
     it 'should not link the label within the legend to any input' do
-      output_buffer.should_not have_tag('form li fieldset legend label[@for^="post_author_id_"]')
+      output_buffer.should_not have_tag('form li fieldset legend label[@for]')
     end
 
     it 'should generate an ordered list with a list item for each choice' do
@@ -161,5 +161,26 @@
     end
 
   end
+  
+  describe "with i18n of the legend label" do
+    
+    before do
+      ::I18n.backend.store_translations :en, :formtastic => { :labels => { :post => { :authors => "Translated!" }}}
+
+      @new_post.stub!(:author_ids).and_return(nil)
+      semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:authors, :as => :radio))
+      end
+    end
+    
+    after do
+      ::I18n.backend.reload!
+    end
+    
+    it "should do foo" do
+      output_buffer.should have_tag("legend.label label", /Translated/)
+    end
+    
+  end
 
 end

From fcdf14d75885b1b56e25a7730a598bca3c547b72 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 7 Jun 2010 13:31:55 +1000
Subject: [PATCH 096/992] CHANGELOG catch-up

---
 CHANGELOG | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index f8e3dbc0c..b3281d1c9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+1.0.0.beta
+
+* Fixed :radio and :check_boxes inputs so that the legend no longer includes a <label> with a `for` attribute pointing to an input that doesn't exist (#253)
+* Fixed that some inputs had invalid 'find_options' attribute (#262)
+* Fixed that we were calling html_safe! when it was not always available
+* Added the ability for :input_html to now accept an option of :size => nil, to exclude the :size attribute altogether (#267)
+
 0.9.10
 
 * Fixed i18n incompatibility with Rails 2.3.8 by reverting two i18n patches pulled in from the rails3 branch

From 378729709f214d35fbcffe0abdca114dd9ffb778 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 7 Jun 2010 13:32:41 +1000
Subject: [PATCH 097/992] version bump to 1.0.0.beta

---
 VERSION.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/VERSION.yml b/VERSION.yml
index 40725be39..8c85f482b 100644
--- a/VERSION.yml
+++ b/VERSION.yml
@@ -1,5 +1,5 @@
 --- 
-:major: 0
-:minor: 9
-:build: 
-:patch: 10
+:major: 1
+:minor: 0
+:patch: 0
+:build: beta

From cb9e146586447561bdd8a8d4f693ce35bde5cb8e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 7 Jun 2010 13:32:49 +1000
Subject: [PATCH 098/992] new gemspec

---
 formtastic.gemspec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 9abadbdb2..4b21df90e 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formtastic}
-  s.version = "0.9.10"
+  s.version = "1.0.0.beta"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin French"]
-  s.date = %q{2010-05-26}
+  s.date = %q{2010-06-07}
   s.description = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.email = %q{justin@indent.com.au}
   s.extra_rdoc_files = [

From c768a99145e82d1a986518d0c5766bf0d8504a53 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Tue, 8 Jun 2010 23:53:00 +0200
Subject: [PATCH 099/992] Fix form generator not working with Rails3 (Closes
 GH-273)

---
 lib/generators/formtastic/form/form_generator.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/generators/formtastic/form/form_generator.rb b/lib/generators/formtastic/form/form_generator.rb
index 8b64c0788..5df60df00 100644
--- a/lib/generators/formtastic/form/form_generator.rb
+++ b/lib/generators/formtastic/form/form_generator.rb
@@ -5,6 +5,9 @@ class FormGenerator < Rails::Generators::NamedBase
          "generated code will be printed out directly in the terminal, and also copied " <<
          "to clipboard. Can optionally be saved into partial directly."
 
+    argument :name, :type => :string, :required => true, :banner => 'ExistingModelName'
+    argument :attributes, :type => :array, :default => [], :banner => 'field:type field:type'
+
     class_option :haml, :type => :boolean, :default => false, :group => :formtastic,
                  :desc => "Generate HAML instead of ERB"
 
@@ -19,10 +22,6 @@ def self.source_root
      @source_root ||= File.expand_path(File.join('..', '..', '..', '..', 'generators', 'form', 'templates'), File.dirname(__FILE__))
     end
 
-    def self.banner
-      "rails generate formtastic:form ExistingModelName [options]"
-    end
-
     def create_or_show
       if options[:partial]
         empty_directory "app/views/#{controller_path}"

From cedf4a7d924fb27751f8d5941e36eff6717516aa Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Wed, 9 Jun 2010 08:56:02 +0200
Subject: [PATCH 100/992] Make commit 9593e4b2164d276fdf21 html_safe

---
 lib/formtastic.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 4dce69e58..4e4924657 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -901,7 +901,7 @@ def radio_input(method, options)
           template.content_tag(:legend, 
             template.label_tag(nil, localized_string(method, method, :label) || humanized_attribute_name(method), :for => nil), :class => :label
           ) << 
-          template.content_tag(:ol, list_item_content)
+          template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
         )
       end
       alias :boolean_radio_input :radio_input
@@ -1172,7 +1172,7 @@ def check_boxes_input(method, options)
           template.content_tag(:legend, 
             template.label_tag(nil, localized_string(method, method, :label) || humanized_attribute_name(method), :for => nil), :class => :label
           ) << 
-          template.content_tag(:ol, list_item_content)
+          template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
         )
       end
 

From a78232c05b3b60e99901f97764fc6dfb59cea4d1 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Wed, 9 Jun 2010 08:56:02 +0200
Subject: [PATCH 101/992] Make commit 9593e4b2164d276fdf21 html_safe (Closes
 GH-281)

---
 lib/formtastic.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index d28fca03d..53ad29d45 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -890,7 +890,7 @@ def radio_input(method, options)
           template.content_tag(:legend, 
             template.label_tag(nil, localized_string(method, method, :label) || humanized_attribute_name(method), :for => nil), :class => :label
           ) << 
-          template.content_tag(:ol, list_item_content)
+          template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
         )
       end
       alias :boolean_radio_input :radio_input
@@ -1161,7 +1161,7 @@ def check_boxes_input(method, options)
           template.content_tag(:legend, 
             template.label_tag(nil, localized_string(method, method, :label) || humanized_attribute_name(method), :for => nil), :class => :label
           ) << 
-          template.content_tag(:ol, list_item_content)
+          template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
         )
       end
 

From b1960794ba1a04f7d3f293387f02dae0cfc94a8d Mon Sep 17 00:00:00 2001
From: Adam Meehan <adam.meehan@gmail.com>
Date: Thu, 17 Jun 2010 14:22:19 +1000
Subject: [PATCH 102/992] allow custom settings per form builder subclass

class_inheritable_accessors can have instance methods as well to avoid the need for self.class. noise. I have turned this off for now as self.class can provide a bit scope context so they don't look like instance methods or local variables
---
 lib/formtastic.rb           | 89 +++++++++++++++++++------------------
 spec/custom_builder_spec.rb | 11 ++++-
 2 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 53ad29d45..f01665947 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -5,25 +5,26 @@
 module Formtastic #:nodoc:
 
   class SemanticFormBuilder < ActionView::Helpers::FormBuilder
-
-    @@default_text_field_size = 50
-    @@default_text_area_height = 20
-    @@all_fields_required_by_default = true
-    @@include_blank_for_select_by_default = true
-    @@required_string = proc { ::Formtastic::Util.html_safe(%{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>}) }
-    @@optional_string = ''
-    @@inline_errors = :sentence
-    @@label_str_method = :humanize
-    @@collection_label_methods = %w[to_label display_name full_name name title username login value to_s]
-    @@inline_order = [ :input, :hints, :errors ]
-    @@file_methods = [ :file?, :public_filename, :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, :default_text_area_height, :all_fields_required_by_default, :include_blank_for_select_by_default,
+    class_inheritable_accessor :default_text_field_size, :default_text_area_height, :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 
+                   :inline_order, :file_methods, :priority_countries, :i18n_lookups_by_default, :default_commit_button_accesskey,
+                   :instance_reader => false
+
+    self.default_text_field_size = 50
+    self.default_text_area_height = 20
+    self.all_fields_required_by_default = true
+    self.include_blank_for_select_by_default = true
+    self.required_string = proc { ::Formtastic::Util.html_safe(%{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>}) }
+    self.optional_string = ''
+    self.inline_errors = :sentence
+    self.label_str_method = :humanize
+    self.collection_label_methods = %w[to_label display_name full_name name title username login value to_s]
+    self.inline_order = [ :input, :hints, :errors ]
+    self.file_methods = [ :file?, :public_filename, :filename ]
+    self.priority_countries = ["Australia", "Canada", "United Kingdom", "United States"]
+    self.i18n_lookups_by_default = false
+    self.default_commit_button_accesskey = nil
+
 
     RESERVED_COLUMNS = [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
 
@@ -99,7 +100,7 @@ def input(method, options = {})
         options[:label_html][:for] ||= options[:input_html][:id]
       end
 
-      input_parts = @@inline_order.dup
+      input_parts = self.class.inline_order.dup
       input_parts = input_parts - [:errors, :hints] if options[:as] == :hidden
 
       list_item_content = input_parts.map do |type|
@@ -332,7 +333,7 @@ def commit_button(*args)
         object_name = (object_human_name == crappy_human_name) ? decent_human_name : object_human_name
       else
         key = :submit
-        object_name = @object_name.to_s.send(@@label_str_method)
+        object_name = @object_name.to_s.send(self.class.label_str_method)
       end
 
       text = (self.localized_string(key, text, :action, :model => object_name) ||
@@ -341,8 +342,8 @@ def commit_button(*args)
       button_html = options.delete(:button_html) || {}
       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  
+      accesskey = (options.delete(:accesskey) || self.class.default_commit_button_accesskey) unless button_html.has_key?(:accesskey)
+      button_html = button_html.merge(:accesskey => accesskey) if accesskey
       template.content_tag(:li, Formtastic::Util.html_safe(self.submit(text, button_html)), :class => element_class)
     end
 
@@ -430,7 +431,7 @@ def inline_errors_for(method, options = nil) #:nodoc:
         errors = [@object.errors[method.to_sym]]
         errors << [@object.errors[association_primary_key(method)]] if association_macro_for_method(method) == :belongs_to
         errors = errors.flatten.compact.uniq
-        send(:"error_#{@@inline_errors}", [*errors]) if errors.any?
+        send(:"error_#{self.class.inline_errors}", [*errors]) if errors.any?
       else
         nil
       end
@@ -466,7 +467,7 @@ def semantic_errors(*args)
     protected
 
       def render_inline_errors?
-        @object && @object.respond_to?(:errors) && INLINE_ERROR_TYPES.include?(@@inline_errors)
+        @object && @object.respond_to?(:errors) && INLINE_ERROR_TYPES.include?(self.class.inline_errors)
       end
 
       # Collects content columns (non-relation columns) for the current form object class.
@@ -550,7 +551,7 @@ def strip_formtastic_options(options) #:nodoc:
       #   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.
+      #   configuration option all_fields_required_by_default is used.
       #
       def method_required?(attribute) #:nodoc:
         if @object && @object.class.respond_to?(:reflect_on_validations_for)
@@ -562,7 +563,7 @@ def method_required?(attribute) #:nodoc:
             (validation.options.present? ? options_require_validation?(validation.options) : true)
           end
         else
-          @@all_fields_required_by_default
+          self.class.all_fields_required_by_default
         end
       end
 
@@ -1181,9 +1182,9 @@ def check_boxes_input(method, options)
       #
       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
+        priority_countries = options.delete(:priority_countries) || self.class.priority_countries
 
         self.label(method, options_for_label(options)) <<
         self.country_select(method, priority_countries, strip_formtastic_options(options), html_options)
@@ -1255,9 +1256,9 @@ def error_first(errors) #:nodoc:
       def required_or_optional_string(required) #:nodoc:
         string_or_proc = case required
           when true
-            @@required_string
+            self.class.required_string
           when false
-            @@optional_string
+            self.class.optional_string
           else
             required
         end
@@ -1376,7 +1377,7 @@ def default_input_type(method, options = {}) #:nodoc:
             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) }
+            return :file    if file && self.class.file_methods.any? { |m| file.respond_to?(m) }
           end
 
           return :select    if options.key?(:collection)
@@ -1428,8 +1429,8 @@ def find_raw_collection_for_column(column, options) #:nodoc:
         collection
       end
 
-      # Detects the label and value methods from a collection values set in 
-      # @@collection_label_methods. It will use and delete
+      # 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
@@ -1439,10 +1440,10 @@ def detect_label_and_value_method!(collection_or_instance, options = {}) #:nodoc
       end
 
       # Detected the label collection method when none is supplied using the
-      # values set in @@collection_label_methods.
+      # values set in collection_label_methods.
       #
       def detect_label_method(collection) #:nodoc:
-        @@collection_label_methods.detect { |m| collection.first.respond_to?(m) }
+        self.class.collection_label_methods.detect { |m| collection.first.respond_to?(m) }
       end
 
       # Detects the method to call for fetching group members from the groups when grouping select options
@@ -1537,12 +1538,12 @@ def default_string_options(method, type) #:nodoc:
         column = self.column_for(method)
 
         if type == :text
-          { :cols => @@default_text_field_size, :rows => @@default_text_area_height }
+          { :cols => self.class.default_text_field_size, :rows => self.class.default_text_area_height }
         elsif type == :numeric || column.nil? || column.limit.nil?
-          { :size => @@default_text_field_size }
+          { :size => self.class.default_text_field_size }
         else
-          { :maxlength => column.limit, 
-            :size => @@default_text_field_size && [column.limit, @@default_text_field_size].min }
+          { :maxlength => column.limit,
+            :size => self.class.default_text_field_size && [column.limit, self.class.default_text_field_size].min }
         end
       end
 
@@ -1588,18 +1589,18 @@ def humanized_attribute_name(method) #:nodoc:
         if @object && @object.class.respond_to?(:human_attribute_name)
           humanized_name = @object.class.human_attribute_name(method.to_s)
           if humanized_name == method.to_s.send(:humanize)
-            method.to_s.send(@@label_str_method)
+            method.to_s.send(self.class.label_str_method)
           else
             humanized_name
           end
         else
-          method.to_s.send(@@label_str_method)
+          method.to_s.send(self.class.label_str_method)
         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
@@ -1624,7 +1625,7 @@ def localized_string(key, value, type, options = {}) #:nodoc:
         if value.is_a?(::String)
           value
         else
-          use_i18n = value.nil? ? @@i18n_lookups_by_default : (value != false)
+          use_i18n = value.nil? ? self.class.i18n_lookups_by_default : (value != false)
 
           if use_i18n
             model_name, nested_model_name  = normalize_model_name(self.model_name.underscore)
@@ -1671,7 +1672,7 @@ def send_or_call(duck, object)
 
       def set_include_blank(options)
         unless options.key?(:include_blank) || options.key?(:prompt)
-          options[:include_blank] = @@include_blank_for_select_by_default
+          options[:include_blank] = self.class.include_blank_for_select_by_default
         end
         options
       end
diff --git a/spec/custom_builder_spec.rb b/spec/custom_builder_spec.rb
index 5fd6a7256..2ff7a9ea1 100644
--- a/spec/custom_builder_spec.rb
+++ b/spec/custom_builder_spec.rb
@@ -29,7 +29,16 @@ def awesome_input(method, options)
     ::Formtastic::SemanticFormHelper.builder = ::Formtastic::SemanticFormBuilder
     ::Formtastic::SemanticFormHelper.builder.should == ::Formtastic::SemanticFormBuilder
   end
-  
+
+  it 'should allow custom settings per form builder subclass' do
+    with_config(:all_fields_required_by_default, true) do
+      MyCustomFormBuilder.all_fields_required_by_default = false
+
+      MyCustomFormBuilder.all_fields_required_by_default.should be_false
+      ::Formtastic::SemanticFormBuilder.all_fields_required_by_default.should be_true
+    end
+  end
+
   describe "when using a custom builder" do
     
     before do

From 4369f54ac292cf60a1591241c6b5d16cd795fec8 Mon Sep 17 00:00:00 2001
From: Adam Meehan <adam.meehan@gmail.com>
Date: Thu, 17 Jun 2010 14:34:28 +1000
Subject: [PATCH 103/992] semantic_fields_for should use parent builder class

---
 lib/formtastic.rb           |  2 +-
 spec/custom_builder_spec.rb | 31 +++++++++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index f01665947..f3994e249 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -368,7 +368,7 @@ def commit_button(*args)
     #
     def semantic_fields_for(record_or_name_or_array, *args, &block)
       opts = args.extract_options!
-      opts[:builder] ||= Formtastic::SemanticFormHelper.builder
+      opts[:builder] ||= self.class
       args.push(opts)
       fields_for(record_or_name_or_array, *args, &block)
     end
diff --git a/spec/custom_builder_spec.rb b/spec/custom_builder_spec.rb
index 2ff7a9ea1..6c694bbb7 100644
--- a/spec/custom_builder_spec.rb
+++ b/spec/custom_builder_spec.rb
@@ -52,7 +52,7 @@ def awesome_input(method, options)
     
     describe "semantic_form_for" do
       
-      it "should yeild and instance of the custom builder" do
+      it "should yield an instance of the custom builder" do
         semantic_form_for(@new_post) do |builder|
           builder.class.should == MyCustomFormBuilder
         end
@@ -65,7 +65,34 @@ def awesome_input(method, options)
       end
     
     end
+
+    describe "semantic_fields_for" do
+
+      it "should yield an instance of the parent form builder" do
+        semantic_form_for(@new_post) do |builder|
+          builder.semantic_fields_for(:author) do |nested_builder|
+            nested_builder.class.should == MyCustomFormBuilder
+          end
+        end
+      end
+
+    end
     
   end
 
-end
\ No newline at end of file
+  describe "when using a builder passed to form options" do
+
+    describe "semantic_fields_for" do
+
+      it "should yield an instance of the parent form builder" do
+        semantic_form_for(@new_post, :builder => MyCustomFormBuilder) do |builder|
+          builder.semantic_fields_for(:author) do |nested_builder|
+            nested_builder.class.should == MyCustomFormBuilder
+          end
+        end
+      end
+
+    end
+
+  end
+end

From 431333f25b16115760bbb018f889495fedb548e1 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Thu, 17 Jun 2010 21:23:15 +0200
Subject: [PATCH 104/992] Concat the output of inputs_for_nested_attributes to
 the template under rails3

Instead of returning the output the result needs to be added to the template
since the rails fields_for helper doesn't do this automatically. This can be
seen here: http://github.com/rails/rails/commit/7fadb3f2#L0R1081
---
 lib/formtastic.rb      | 14 +++++++++++---
 lib/formtastic/util.rb |  2 +-
 spec/inputs_spec.rb    | 18 +++++++++++++++++-
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 4e4924657..3648862f6 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -528,9 +528,17 @@ def inputs_for_nested_attributes(*args, &block) #:nodoc:
           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| return f.inputs(*args){ block.call(f) } }
+          Proc.new do |f|
+            contents = f.inputs(*args){ block.call(f) }
+            template.concat(contents) if ::Formtastic::Util.rails3?
+            contents
+          end
         else
-          proc { |f| return f.inputs(*args) }
+          Proc.new do |f|
+            contents = f.inputs(*args)
+            template.concat(contents) if ::Formtastic::Util.rails3?
+            contents
+          end
         end
 
         fields_for_args = [options.delete(:for), options.delete(:for_options) || {}].flatten
@@ -1321,7 +1329,7 @@ def field_set_and_list_wrapping(*args, &block) #:nodoc:
           html_options.except(:builder, :parent)
         )
 
-        template.concat(fieldset) if block_given? && (!defined?(Rails::VERSION) || Rails::VERSION::MAJOR == 2)
+        template.concat(fieldset) if block_given? && !Formtastic::Util.rails3?
         fieldset
       end
 
diff --git a/lib/formtastic/util.rb b/lib/formtastic/util.rb
index 214651a55..301e39ddc 100644
--- a/lib/formtastic/util.rb
+++ b/lib/formtastic/util.rb
@@ -30,7 +30,7 @@ def rails3?
         if defined?(ActionPack::VERSION::MAJOR)
           ActionPack::VERSION::MAJOR
         end
-      version >= 3
+      !version.blank? && version >= 3
     end
   end
 end
diff --git a/spec/inputs_spec.rb b/spec/inputs_spec.rb
index 3a78659c7..510869ccf 100644
--- a/spec/inputs_spec.rb
+++ b/spec/inputs_spec.rb
@@ -82,7 +82,23 @@
         output_buffer.should_not have_tag("form fieldset.inputs #author_login")
 
       end
-      
+
+      it 'should concat rendered nested inputs to the template under rails3' do
+        @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
+        ::Formtastic::Util.stub!(:rails3?).and_return(true)
+
+        form = semantic_form_for(@new_post) do |builder|
+          builder.inputs :for => [:author, @bob] do |bob_builder|
+            concat(bob_builder.input(:login))
+          end
+        end
+
+        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag("form fieldset.inputs #post_author_attributes_login")
+        output_buffer.should_not have_tag("form fieldset.inputs #author_login")
+
+      end
+
       describe "as a symbol representing the association name" do
         
         it 'should nest the inputs with an _attributes suffix on the association name' do

From 051457bf0361cc63fcf2509478f6b1b715c30054 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Thu, 17 Jun 2010 21:47:28 +0200
Subject: [PATCH 105/992] Fix a deprecation warning in Rails 2.3.6 and newer

---
 lib/formtastic/util.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic/util.rb b/lib/formtastic/util.rb
index ebf99bdba..e5078665a 100644
--- a/lib/formtastic/util.rb
+++ b/lib/formtastic/util.rb
@@ -18,8 +18,11 @@ def html_safe(text)
     end
 
     def rails_safe_buffer_class
-      return ActionView::SafeBuffer if defined?(ActionView::SafeBuffer)
-      ActiveSupport::SafeBuffer
+      # It's important that we check ActiveSupport first,
+      # because in Rails 2.3.6 ActionView::SafeBuffer exists
+      # but is a deprecated proxy object.
+      return ActiveSupport::SafeBuffer if defined?(ActiveSupport::SafeBuffer)
+      return ActionView::SafeBuffer
     end
 
   end

From b86266edbc170f32c9fdfb0764aed85c8b29d7eb Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Thu, 17 Jun 2010 23:29:39 +0200
Subject: [PATCH 106/992] Separate test environment setup and misc setup blocks
 into spec/support dir. Move custom_macros into spec/support directory where
 rspec automatically loads it. Add log/ directory and files to the .gitignore
 file. RSpec 2.0 is writing some logs there.

---
 .gitignore                          |  1 +
 spec/spec_helper.rb                 | 40 +++--------------------------
 spec/{ => support}/custom_macros.rb |  0
 spec/support/output_buffer.rb       |  4 +++
 spec/support/test_environment.rb    | 39 ++++++++++++++++++++++++++++
 5 files changed, 48 insertions(+), 36 deletions(-)
 rename spec/{ => support}/custom_macros.rb (100%)
 create mode 100644 spec/support/output_buffer.rb
 create mode 100644 spec/support/test_environment.rb

diff --git a/.gitignore b/.gitignore
index affdfb0c3..6bb82764e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ coverage
 pkg
 *~
 *watchr.rb
+log/*
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f7ee6ff68..641f1b39c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,49 +1,17 @@
 # coding: utf-8
 require 'rubygems'
-
-gem 'activesupport', '>=2.3.8'
-gem 'actionpack', '>=2.3.8'
 require 'active_support'
 require 'action_pack'
 require 'action_view'
 require 'action_controller'
 
-begin
-  gem 'activemodel', '>= 3.0.0.beta'
-  require 'active_model'
-rescue Exception
-end
-
-gem 'rspec', '>= 1.2.6'
-gem 'rspec-rails', '>= 1.2.6'
-gem 'hpricot', '>= 0.6.1'
-gem 'rspec_tag_matchers', '>= 1.0.0'
-require 'rspec_tag_matchers'
-
-require 'custom_macros'
-
-begin
-  Spec::Runner.configure do |config|
-    config.include(RspecTagMatchers)
-    config.include(CustomMacros)
-  end
-rescue
-  require 'rspec/core'
-  Rspec.configure do |config|
-    config.include RspecTagMatchers
-    config.include CustomMacros
-    config.mock_with :rspec
-  end
-end
-
-require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic'))
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic/util'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic'))
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic/layout_helper'))
 
-module ActionView
-  class OutputBuffer < Formtastic::Util.rails_safe_buffer_class
-  end
-end
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 module FormtasticSpecHelper
   include ActionPack
diff --git a/spec/custom_macros.rb b/spec/support/custom_macros.rb
similarity index 100%
rename from spec/custom_macros.rb
rename to spec/support/custom_macros.rb
diff --git a/spec/support/output_buffer.rb b/spec/support/output_buffer.rb
new file mode 100644
index 000000000..b17ce95c3
--- /dev/null
+++ b/spec/support/output_buffer.rb
@@ -0,0 +1,4 @@
+module ActionView
+  class OutputBuffer < Formtastic::Util.rails_safe_buffer_class
+  end
+end
diff --git a/spec/support/test_environment.rb b/spec/support/test_environment.rb
new file mode 100644
index 000000000..37ece3d85
--- /dev/null
+++ b/spec/support/test_environment.rb
@@ -0,0 +1,39 @@
+if Formtastic::Util.rails3?
+  gem 'rspec', '~> 2.0.0.beta12'
+  gem 'rspec-rails', '~> 2.0.0.beta12'
+  
+  require "rubygems"
+  require "action_controller/railtie"
+  require "active_resource/railtie"
+  require 'active_model'
+  require 'rspec/core'
+  require 'rspec/rails'
+  require 'rspec_tag_matchers'
+  
+  # Create a simple rails application for use in testing the viewhelper
+  module FormtasticTest
+    class Application < Rails::Application
+      # Configure the default encoding used in templates for Ruby 1.9.
+      config.encoding = "utf-8"
+    end
+  end
+  FormtasticTest::Application.initialize!
+
+  # Configure RSpec 2.0
+  RSpec.configure do |config|
+    config.include RspecTagMatchers
+    config.include CustomMacros
+    config.mock_with :rspec
+  end
+
+else
+  gem 'rspec', '>= 1.2.6'
+  gem 'rspec-rails', '>= 1.2.6'
+  gem 'hpricot', '>= 0.6.1'
+  require 'rspec_tag_matchers'
+
+  Spec::Runner.configure do |config|
+    config.include(RspecTagMatchers)
+    config.include(CustomMacros)
+  end
+end  
\ No newline at end of file

From fc1e98c3b14efee83eb738e76c0d310c315f9507 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Thu, 17 Jun 2010 23:31:57 +0200
Subject: [PATCH 107/992] Move layout_helper test into helpers subdirectory.

RSpec 2.0 now automatically initializes the needed rails3 infrastructure
to test viewhelpers for all tests in spec/helpers directory.
---
 spec/helpers/layout_helper_spec.rb | 21 ++++++++++++++++++++
 spec/layout_helper_spec.rb         | 31 ------------------------------
 2 files changed, 21 insertions(+), 31 deletions(-)
 create mode 100644 spec/helpers/layout_helper_spec.rb
 delete mode 100644 spec/layout_helper_spec.rb

diff --git a/spec/helpers/layout_helper_spec.rb b/spec/helpers/layout_helper_spec.rb
new file mode 100644
index 000000000..e841c77ca
--- /dev/null
+++ b/spec/helpers/layout_helper_spec.rb
@@ -0,0 +1,21 @@
+# coding: utf-8
+require 'spec_helper'
+
+describe Formtastic::LayoutHelper do
+  
+  include FormtasticSpecHelper
+  include Formtastic::LayoutHelper
+  
+  describe '#formtastic_stylesheet_link_tag' do
+    
+    it 'should render a link to formtastic.css' do
+      formtastic_stylesheet_link_tag.should have_tag("link[@href='/stylesheets/formtastic.css']")
+    end
+    
+    it 'should render a link to formtastic_changes.css' do
+      formtastic_stylesheet_link_tag.should have_tag("link[@href='/stylesheets/formtastic_changes.css']")
+    end
+    
+  end
+end
+
diff --git a/spec/layout_helper_spec.rb b/spec/layout_helper_spec.rb
deleted file mode 100644
index e3b36043c..000000000
--- a/spec/layout_helper_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe 'LayoutHelper' do
-
-  include FormtasticSpecHelper
-  include Formtastic::LayoutHelper
-  
-  before do
-    @output_buffer = ''
-  end
-  
-  describe '#formtastic_stylesheet_link_tag' do
-    
-    before do
-      @tags = concat(formtastic_stylesheet_link_tag())
-    end
-    
-    it 'should render a link to formtastic.css' do
-      output_buffer.concat(@tags) if Formtastic::Util.rails3?
-      output_buffer.should have_tag("link[@href='/stylesheets/formtastic.css']")
-    end
-    
-    it 'should render a link to formtastic_changes.css' do
-      output_buffer.concat(@tags) if Formtastic::Util.rails3?
-      output_buffer.should have_tag("link[@href='/stylesheets/formtastic_changes.css']")
-    end
-    
-  end
-end
-

From f6ef65e7ef2f9b8254b84f65eae1f189859b5434 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Fri, 18 Jun 2010 07:07:12 +0200
Subject: [PATCH 108/992] Check that reflection information is accessible
 before querying the object for it (GH-286)

---
 lib/formtastic.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 3648862f6..6cd7bfc58 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -2,6 +2,7 @@
 require File.join(File.dirname(__FILE__), *%w[formtastic i18n])
 require File.join(File.dirname(__FILE__), *%w[formtastic util])
 require File.join(File.dirname(__FILE__), *%w[formtastic railtie]) if defined?(::Rails::Railtie)
+require 'pp'
 
 module Formtastic #:nodoc:
 
@@ -483,7 +484,7 @@ def content_columns #:nodoc:
       # Collects association columns (relation columns) for the current form object class.
       #
       def association_columns(*by_associations) #:nodoc:
-        if @object.present?
+        if @object.present? && @object.class.respond_to?(:reflections)
           @object.class.reflections.collect do |name, _|
             if by_associations.present?
               name if by_associations.include?(_.macro)
@@ -577,6 +578,7 @@ def method_required?(attribute) #:nodoc:
           end
         else
           if @object && @object.class.respond_to?(:validators_on)
+            puts "TEHR"
             attribute_sym = attribute.to_s.sub(/_id$/, '').to_sym
             !@object.class.validators_on(attribute_sym).find{|validator| (validator.kind == :presence) && (validator.options.present? ? options_require_validation?(validator.options) : true)}.nil?
           else

From 22f21ede8d35142ddde62e02ff99ae8901dc0ce9 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Fri, 18 Jun 2010 16:11:14 +0200
Subject: [PATCH 109/992] Remove debugging output

---
 lib/formtastic.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 6cd7bfc58..a19335233 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -2,7 +2,6 @@
 require File.join(File.dirname(__FILE__), *%w[formtastic i18n])
 require File.join(File.dirname(__FILE__), *%w[formtastic util])
 require File.join(File.dirname(__FILE__), *%w[formtastic railtie]) if defined?(::Rails::Railtie)
-require 'pp'
 
 module Formtastic #:nodoc:
 
@@ -578,7 +577,6 @@ def method_required?(attribute) #:nodoc:
           end
         else
           if @object && @object.class.respond_to?(:validators_on)
-            puts "TEHR"
             attribute_sym = attribute.to_s.sub(/_id$/, '').to_sym
             !@object.class.validators_on(attribute_sym).find{|validator| (validator.kind == :presence) && (validator.options.present? ? options_require_validation?(validator.options) : true)}.nil?
           else

From 506182bcdb33637b53a8793bc33eff5abe53ba4c Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Fri, 18 Jun 2010 20:08:10 +0200
Subject: [PATCH 110/992] Make ActiveModel Tests work without relying on RSpec
 unstub!

---
 spec/input_spec.rb  | 173 +++++++++++++++++++++-----------------------
 spec/spec_helper.rb |   8 +-
 2 files changed, 88 insertions(+), 93 deletions(-)

diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 062f7e9ef..2e83d3a55 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -136,13 +136,6 @@
               @new_post.class.stub!(:method_defined?).with(:reflect_on_validations_for).and_return(true)
             end
 
-            unless defined?(RSpec)
-              after do
-                ::Post.unstub!(:reflect_on_validations_for)
-                @new_post.class.stub!(:method_defined?).with(:reflect_on_validations_for).and_return(false)
-              end
-            end
-
             describe 'and validates_presence_of was called for the method' do
               it 'should be required' do
                 @new_post.class.should_receive(:reflect_on_validations_for).with(:title).and_return([
@@ -240,115 +233,111 @@ def should_be_required(options)
 
           end
 
-          unless defined?(RSpec)
-            describe 'and its a ActiveModel' do
-              before do
-                ::Post.stub!(:validators_on).and_return([])
-                @new_post.class.stub!(:method_defined?).with(:validators_on).and_return(true)
-              end
-
-              after do
-                ::Post.unstub!(:validators_on)
-                @new_post.class.stub!(:method_defined?).with(:validators_on).and_return(false)
-              end
-              describe 'and validates_presence_of was called for the method' do
-                it 'should be required' do
+          describe 'and its a ActiveModel' do
+            before do
+              @new_post.stub!(:class).and_return(::PostModel)
+            end
 
-                  @new_post.class.should_receive(:validators_on).with(:title).and_return([
-                    active_model_presence_validator([:title])
-                  ])
+            after do
+              @new_post.stub!(:class).and_return(::Post)
+            end
+            describe 'and validates_presence_of was called for the method' do
+              it 'should be required' do
 
-                  @new_post.class.should_receive(:validators_on).with(:body).and_return([
-                    active_model_presence_validator([:body], {:if => true})
-                  ])
+                @new_post.class.should_receive(:validators_on).with(:title).and_return([
+                  active_model_presence_validator([:title])
+                ])
 
-                  form = semantic_form_for(@new_post) do |builder|
-                    concat(builder.input(:title))
-                    concat(builder.input(:body))
-                  end
-                  output_buffer.concat(form) if Formtastic::Util.rails3?
-                  output_buffer.should have_tag('form li.required')
-                  output_buffer.should_not have_tag('form li.optional')
-                end
+                @new_post.class.should_receive(:validators_on).with(:body).and_return([
+                  active_model_presence_validator([:body], {:if => true})
+                ])
 
-                it 'should be not be required if the optional :if condition is not satisifed' do
-                  should_be_required(:required => false, :options => { :if => false })
+                form = semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:title))
+                  concat(builder.input(:body))
                 end
+                output_buffer.concat(form) if Formtastic::Util.rails3?
+                output_buffer.should have_tag('form li.required')
+                output_buffer.should_not have_tag('form li.optional')
+              end
 
-                it 'should not be required if the optional :if proc evaluates to false' do
-                  should_be_required(:required => false, :options => { :if => proc { |record| false } })
-                end
+              it 'should be not be required if the optional :if condition is not satisifed' do
+                should_be_required(:required => false, :options => { :if => false })
+              end
 
-                it 'should be required if the optional :if proc evaluates to true' do
-                  should_be_required(:required => true, :options => { :if => proc { |record| true } })
-                end
+              it 'should not be required if the optional :if proc evaluates to false' do
+                should_be_required(:required => false, :options => { :if => proc { |record| false } })
+              end
 
-                it 'should not be required if the optional :unless proc evaluates to true' do
-                  should_be_required(:required => false, :options => { :unless => proc { |record| true } })
-                end
+              it 'should be required if the optional :if proc evaluates to true' do
+                should_be_required(:required => true, :options => { :if => proc { |record| true } })
+              end
 
-                it 'should be required if the optional :unless proc evaluates to false' do
-                  should_be_required(:required => true, :options => { :unless => proc { |record| false } })
-                end
+              it 'should not be required if the optional :unless proc evaluates to true' do
+                should_be_required(:required => false, :options => { :unless => proc { |record| true } })
+              end
 
-                it 'should be required if the optional :if with a method string evaluates to true' do
-                  @new_post.should_receive(:required_condition).and_return(true)
-                  should_be_required(:required => true, :options => { :if => :required_condition })
-                end
+              it 'should be required if the optional :unless proc evaluates to false' do
+                should_be_required(:required => true, :options => { :unless => proc { |record| false } })
+              end
 
-                it 'should be required if the optional :if with a method string evaluates to false' do
-                  @new_post.should_receive(:required_condition).and_return(false)
-                  should_be_required(:required => false, :options => { :if => :required_condition })
-                end
+              it 'should be required if the optional :if with a method string evaluates to true' do
+                @new_post.should_receive(:required_condition).and_return(true)
+                should_be_required(:required => true, :options => { :if => :required_condition })
+              end
 
-                it 'should not be required if the optional :unless with a method string evaluates to false' do
-                   @new_post.should_receive(:required_condition).and_return(false)
-                  should_be_required(:required => true, :options => { :unless => :required_condition })
-                end
+              it 'should be required if the optional :if with a method string evaluates to false' do
+                @new_post.should_receive(:required_condition).and_return(false)
+                should_be_required(:required => false, :options => { :if => :required_condition })
+              end
 
-                 it 'should be required if the optional :unless with a method string evaluates to true' do
-                   @new_post.should_receive(:required_condition).and_return(true)
-                   should_be_required(:required => false, :options => { :unless => :required_condition })
-                 end
+              it 'should not be required if the optional :unless with a method string evaluates to false' do
+                 @new_post.should_receive(:required_condition).and_return(false)
+                should_be_required(:required => true, :options => { :unless => :required_condition })
               end
 
-              # TODO make a matcher for this?
-              def should_be_required(options)
-                @new_post.class.should_receive(:validators_on).with(:body).and_return([
-                  active_model_presence_validator([:body], options[:options])
-                ])
+               it 'should be required if the optional :unless with a method string evaluates to true' do
+                 @new_post.should_receive(:required_condition).and_return(true)
+                 should_be_required(:required => false, :options => { :unless => :required_condition })
+               end
+            end
 
-                form = semantic_form_for(@new_post) do |builder|
-                  concat(builder.input(:body))
-                end
+            # TODO make a matcher for this?
+            def should_be_required(options)
+              @new_post.class.should_receive(:validators_on).with(:body).and_return([
+                active_model_presence_validator([:body], options[:options])
+              ])
 
-                output_buffer.concat(form) if Formtastic::Util.rails3?
+              form = semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:body))
+              end
 
-                if options[:required]
-                  output_buffer.should_not have_tag('form li.optional')
-                  output_buffer.should have_tag('form li.required')
-                else
-                  output_buffer.should have_tag('form li.optional')
-                  output_buffer.should_not have_tag('form li.required')
-                end
+              output_buffer.concat(form) if Formtastic::Util.rails3?
+
+              if options[:required]
+                output_buffer.should_not have_tag('form li.optional')
+                output_buffer.should have_tag('form li.required')
+              else
+                output_buffer.should have_tag('form li.optional')
+                output_buffer.should_not have_tag('form li.required')
               end
+            end
 
-              describe 'and validates_presence_of was not called for the method' do
-                before do
-                  @new_post.class.should_receive(:validators_on).with(:title).and_return([])
-                end
+            describe 'and validates_presence_of was not called for the method' do
+              before do
+                @new_post.class.should_receive(:validators_on).with(:title).and_return([])
+              end
 
-                it 'should not be required' do
-                  form = semantic_form_for(@new_post) do |builder|
-                    concat(builder.input(:title))
-                  end
-                  output_buffer.concat(form) if Formtastic::Util.rails3?
-                  output_buffer.should_not have_tag('form li.required')
-                  output_buffer.should have_tag('form li.optional')
+              it 'should not be required' do
+                form = semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:title))
                 end
+                output_buffer.concat(form) if Formtastic::Util.rails3?
+                output_buffer.should_not have_tag('form li.required')
+                output_buffer.should have_tag('form li.optional')
               end
-
             end
+
           end
 
           describe 'and the validation reflection plugin is not available' do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 641f1b39c..dfd69582c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -91,11 +91,17 @@ class ::Continent
     extend ActiveModel::Naming if defined?(ActiveModel::Naming)
     include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
   end
+  class ::PostModel
+    extend ActiveModel::Naming if defined?(ActiveModel::Naming)
+    include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
+  end
   
   def mock_everything
     
     # Resource-oriented styles like form_for(@post) will expect a path method for the object,
     # so we're defining some here.
+    def post_models_path; "/postmodels/1"; end
+
     def post_path(o); "/posts/1"; end
     def posts_path; "/posts"; end
     def new_post_path; "/posts/new"; end
@@ -180,7 +186,7 @@ def new_author_path; "/authors/new"; end
     ::Post.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     ::Post.stub!(:human_name).and_return('Post')
     ::Post.stub!(:reflect_on_all_validations).and_return([])
-    ::Post.stub!(:reflect_on_validations_for).and_return([]) if defined?(RSpec)
+    ::Post.stub!(:reflect_on_validations_for).and_return([])
     ::Post.stub!(:reflections).and_return({})
     ::Post.stub!(:reflect_on_association).and_return do |column_name|
       case column_name

From fec501e97349d01efa41de8d3791019249896772 Mon Sep 17 00:00:00 2001
From: Mattias Pfeiffer <mattias@pfeiffer.dk>
Date: Wed, 23 Jun 2010 19:44:57 +0800
Subject: [PATCH 111/992] Made :check_boxes and :radio accept :label as label
 value

---
 lib/formtastic.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 53ad29d45..8129b4b2e 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -888,7 +888,7 @@ def radio_input(method, options)
         
         template.content_tag(:fieldset,
           template.content_tag(:legend, 
-            template.label_tag(nil, localized_string(method, method, :label) || humanized_attribute_name(method), :for => nil), :class => :label
+            template.label_tag(nil, localized_string(method, options[:label], :label) || humanized_attribute_name(method), :for => nil), :class => :label
           ) << 
           template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
         )
@@ -1159,7 +1159,7 @@ def check_boxes_input(method, options)
 
         template.content_tag(:fieldset,
           template.content_tag(:legend, 
-            template.label_tag(nil, localized_string(method, method, :label) || humanized_attribute_name(method), :for => nil), :class => :label
+            template.label_tag(nil, localized_string(method, options[:label], :label) || humanized_attribute_name(method), :for => nil), :class => :label
           ) << 
           template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
         )

From f4d6779bf1353fe9c738d6b4ea87e54e57ac67f7 Mon Sep 17 00:00:00 2001
From: Mattias Pfeiffer <mattias@pfeiffer.dk>
Date: Thu, 24 Jun 2010 15:40:27 +0800
Subject: [PATCH 112/992] Added spec for :label option

Unfortunately untested, since I can't get rspec to run.
---
 spec/inputs/check_boxes_input_spec.rb | 13 +++++++++++++
 spec/inputs/radio_input_spec.rb       | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index eb6c36dda..f89de29ae 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -254,6 +254,19 @@
     end
     
   end
+  
+  describe "when :label option is set" do
+    before do
+      @new_post.stub!(:author_ids).and_return(nil)
+      @form = semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:authors, :as => :check_boxes, :label => 'The authors'))
+      end
+    end
 
+    it "should output the correct label title" do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag("legend.label label", /The authors/)
+    end
+  end
 end
 
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 832f746ec..2809efd91 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -183,4 +183,17 @@
     
   end
 
+  describe "when :label option is set" do
+    before do
+      @new_post.stub!(:author_ids).and_return(nil)
+      @form = semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:authors, :as => :radio, :label => 'The authors'))
+      end
+    end
+
+    it "should output the correct label title" do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag("legend.label label", /The authors/)
+    end
+  end
 end

From f6ab67d2b0191072085d11ebae856cb5ac3d1520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Tue, 29 Jun 2010 08:49:09 +0200
Subject: [PATCH 113/992] Require action_mailer in rspecs.

---
 spec/spec_helper.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index dfd69582c..0b385360e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -4,6 +4,7 @@
 require 'action_pack'
 require 'action_view'
 require 'action_controller'
+require 'action_mailer'
 
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic/util'))
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic'))

From 1fd61b1c11fa2c13e897c44209e99b8c1625e66d Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Wed, 30 Jun 2010 18:42:40 +0200
Subject: [PATCH 114/992] Load rspec_tag_matchers gem before requiring it

---
 spec/support/test_environment.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spec/support/test_environment.rb b/spec/support/test_environment.rb
index 37ece3d85..bf9dc45a7 100644
--- a/spec/support/test_environment.rb
+++ b/spec/support/test_environment.rb
@@ -1,6 +1,7 @@
 if Formtastic::Util.rails3?
   gem 'rspec', '~> 2.0.0.beta12'
   gem 'rspec-rails', '~> 2.0.0.beta12'
+  gem 'rspec_tag_matchers'
   
   require "rubygems"
   require "action_controller/railtie"
@@ -29,7 +30,9 @@ class Application < Rails::Application
 else
   gem 'rspec', '>= 1.2.6'
   gem 'rspec-rails', '>= 1.2.6'
+  gem 'rspec_tag_matchers'
   gem 'hpricot', '>= 0.6.1'
+  
   require 'rspec_tag_matchers'
 
   Spec::Runner.configure do |config|

From 2c68cd34be8b763e845912bdaa138e0b2a687545 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Tue, 29 Jun 2010 08:49:26 +0200
Subject: [PATCH 115/992] Sort list of files to require in spec helper.

While files are often returned in alphabetic order, this is not
guaranteed. Do it explicit now.
---
 spec/spec_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 0b385360e..2a8fbc84a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -11,8 +11,8 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic/layout_helper'))
 
 # Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+# in ./support/ and its subdirectories in alphabetic order.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each {|f| require f}
 
 module FormtasticSpecHelper
   include ActionPack

From 49c4418665028dda1dcde45ab8f9216d9ee8e6ef Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Wed, 30 Jun 2010 19:29:40 +0200
Subject: [PATCH 116/992] Fix the test-suite

---
 log/development.log                   |  0
 spec/inputs/check_boxes_input_spec.rb | 24 ++++++++++++------------
 spec/inputs/radio_input_spec.rb       |  3 ++-
 3 files changed, 14 insertions(+), 13 deletions(-)
 create mode 100644 log/development.log

diff --git a/log/development.log b/log/development.log
new file mode 100644
index 000000000..e69de29bb
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index f89de29ae..a63804ab1 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -236,6 +236,7 @@
 
       before do
         ::I18n.backend.store_translations :en, :formtastic => { :labels => { :post => { :authors => "Translated!" }}}
+        Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
 
         @new_post.stub!(:author_ids).and_return(nil)
         semantic_form_for(@new_post) do |builder|
@@ -245,6 +246,7 @@
 
       after do
         ::I18n.backend.reload!
+        Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
       end
 
       it "should do foo" do
@@ -252,20 +254,18 @@
       end
 
     end
-    
-  end
-  
-  describe "when :label option is set" do
-    before do
-      @new_post.stub!(:author_ids).and_return(nil)
-      @form = semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:authors, :as => :check_boxes, :label => 'The authors'))
+
+    describe "when :label option is set" do
+      before do
+        @new_post.stub!(:author_ids).and_return(nil)
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:authors, :as => :check_boxes, :label => 'The authors'))
+        end
       end
-    end
 
-    it "should output the correct label title" do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
-      output_buffer.should have_tag("legend.label label", /The authors/)
+      it "should output the correct label title" do
+        output_buffer.should have_tag("legend.label label", /The authors/)
+      end
     end
   end
 end
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 2809efd91..3a2baa6bf 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -167,6 +167,7 @@
     before do
       ::I18n.backend.store_translations :en, :formtastic => { :labels => { :post => { :authors => "Translated!" }}}
 
+      Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
       @new_post.stub!(:author_ids).and_return(nil)
       semantic_form_for(@new_post) do |builder|
         concat(builder.input(:authors, :as => :radio))
@@ -175,6 +176,7 @@
     
     after do
       ::I18n.backend.reload!
+      Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
     end
     
     it "should do foo" do
@@ -192,7 +194,6 @@
     end
 
     it "should output the correct label title" do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("legend.label label", /The authors/)
     end
   end

From 1c1ba8d3a9e512974399d7505558dfebdef714bd Mon Sep 17 00:00:00 2001
From: Daan Oosterveld <daan@dusdanig.com>
Date: Wed, 30 Jun 2010 14:44:15 +0200
Subject: [PATCH 117/992] Fixes: 293 Hint lookup fails when an attribute and
 model have the same name

Added fix in inline_hints_for to see a hash as a blank entry.
Added spec to test this failure.
---
 lib/formtastic.rb  |  2 +-
 spec/input_spec.rb | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 8129b4b2e..6c4aa7999 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1223,7 +1223,7 @@ def inline_input_for(method, options)
       #
       def inline_hints_for(method, options) #:nodoc:
         options[:hint] = localized_string(method, options[:hint], :hint)
-        return if options[:hint].blank?
+        return if options[:hint].blank? or options[:hint].kind_of? Hash
         template.content_tag(:p, Formtastic::Util.html_safe(options[:hint]), :class => 'inline-hints')
       end
 
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 2d9f8262d..d1f81b598 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -571,6 +571,23 @@ def should_be_required(options)
           end
         end
         
+        describe 'when localized hint (I18n) is a model with attribute hints' do
+          it "should see the provided hash as a blank entry" do
+            ::I18n.backend.store_translations :en,
+            :formtastic => {
+                :hints => {
+                  :title => { # movie title
+                    :summary => @localized_hint_text # summary of movie
+                   }
+                 }
+              }
+            semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:title, :hint => true))
+            end
+            output_buffer.should_not have_tag('form li p.inline-hints', @localized_hint_text)
+          end
+        end
+        
         describe 'when localized hint (I18n) is not provided' do
           it 'should not render a hint paragraph' do
             semantic_form_for(@new_post) do |builder|

From e2ffb7dda3e588ac0fce29d0e4fc94c83716119a Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Wed, 30 Jun 2010 19:34:05 +0200
Subject: [PATCH 118/992] Make new tests RSpec 2.0 compatible

---
 spec/inputs/check_boxes_input_spec.rb | 3 ++-
 spec/inputs/radio_input_spec.rb       | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index ad5846573..3a4d413fe 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -278,12 +278,13 @@
     describe "when :label option is set" do
       before do
         @new_post.stub!(:author_ids).and_return(nil)
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:authors, :as => :check_boxes, :label => 'The authors'))
         end
       end
 
       it "should output the correct label title" do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("legend.label label", /The authors/)
       end
     end
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 15f13b2ed..cf30f7e6b 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -210,6 +210,7 @@
     end
 
     it "should output the correct label title" do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("legend.label label", /The authors/)
     end
   end

From 5a29695aeaff67b712f3b932f1ac19097c8e0572 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Wed, 30 Jun 2010 19:38:11 +0200
Subject: [PATCH 119/992] Regenerate formtastic.gemspec to reflect moved files

---
 formtastic.gemspec | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 4b21df90e..e625e8cd4 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin French"]
-  s.date = %q{2010-06-07}
+  s.date = %q{2010-06-30}
   s.description = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.email = %q{justin@indent.com.au}
   s.extra_rdoc_files = [
@@ -31,17 +31,20 @@ Gem::Specification.new do |s|
      "lib/formtastic.rb",
      "lib/formtastic/i18n.rb",
      "lib/formtastic/layout_helper.rb",
+     "lib/formtastic/railtie.rb",
      "lib/formtastic/util.rb",
+     "lib/generators/formtastic/form/form_generator.rb",
+     "lib/generators/formtastic/install/install_generator.rb",
      "lib/locale/en.yml",
      "rails/init.rb",
      "spec/buttons_spec.rb",
      "spec/commit_button_spec.rb",
      "spec/custom_builder_spec.rb",
-     "spec/custom_macros.rb",
      "spec/defaults_spec.rb",
      "spec/error_proc_spec.rb",
      "spec/errors_spec.rb",
      "spec/form_helper_spec.rb",
+     "spec/helpers/layout_helper_spec.rb",
      "spec/i18n_spec.rb",
      "spec/include_blank_spec.rb",
      "spec/input_spec.rb",
@@ -62,11 +65,13 @@ Gem::Specification.new do |s|
      "spec/inputs/time_zone_input_spec.rb",
      "spec/inputs_spec.rb",
      "spec/label_spec.rb",
-     "spec/layout_helper_spec.rb",
      "spec/semantic_errors_spec.rb",
      "spec/semantic_fields_for_spec.rb",
      "spec/spec.opts",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "spec/support/custom_macros.rb",
+     "spec/support/output_buffer.rb",
+     "spec/support/test_environment.rb"
   ]
   s.homepage = %q{http://github.com/justinfrench/formtastic/tree/master}
   s.post_install_message = %q{
@@ -87,17 +92,17 @@ Gem::Specification.new do |s|
   }
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.test_files = [
     "spec/buttons_spec.rb",
      "spec/commit_button_spec.rb",
      "spec/custom_builder_spec.rb",
-     "spec/custom_macros.rb",
      "spec/defaults_spec.rb",
      "spec/error_proc_spec.rb",
      "spec/errors_spec.rb",
      "spec/form_helper_spec.rb",
+     "spec/helpers/layout_helper_spec.rb",
      "spec/i18n_spec.rb",
      "spec/include_blank_spec.rb",
      "spec/input_spec.rb",
@@ -118,30 +123,35 @@ Gem::Specification.new do |s|
      "spec/inputs/time_zone_input_spec.rb",
      "spec/inputs_spec.rb",
      "spec/label_spec.rb",
-     "spec/layout_helper_spec.rb",
      "spec/semantic_errors_spec.rb",
      "spec/semantic_fields_for_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "spec/support/custom_macros.rb",
+     "spec/support/output_buffer.rb",
+     "spec/support/test_environment.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.0"])
       s.add_runtime_dependency(%q<actionpack>, [">= 2.3.0"])
+      s.add_runtime_dependency(%q<i18n>, [">= 0.4.0"])
       s.add_development_dependency(%q<rspec-rails>, [">= 1.2.6"])
       s.add_development_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3.0"])
       s.add_dependency(%q<actionpack>, [">= 2.3.0"])
+      s.add_dependency(%q<i18n>, [">= 0.4.0"])
       s.add_dependency(%q<rspec-rails>, [">= 1.2.6"])
       s.add_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3.0"])
     s.add_dependency(%q<actionpack>, [">= 2.3.0"])
+    s.add_dependency(%q<i18n>, [">= 0.4.0"])
     s.add_dependency(%q<rspec-rails>, [">= 1.2.6"])
     s.add_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
   end

From c0921628cdd25490cb4b4d55c56750c0edbabbf3 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Wed, 30 Jun 2010 19:41:41 +0200
Subject: [PATCH 120/992] Add log directory to .gitignore

---
 .gitignore          | 1 +
 log/development.log | 0
 2 files changed, 1 insertion(+)
 delete mode 100644 log/development.log

diff --git a/.gitignore b/.gitignore
index affdfb0c3..6bb82764e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ coverage
 pkg
 *~
 *watchr.rb
+log/*
diff --git a/log/development.log b/log/development.log
deleted file mode 100644
index e69de29bb..000000000

From 0c0a9e10b8241804c1f363590bb35bee2da890d6 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Wed, 30 Jun 2010 19:41:41 +0200
Subject: [PATCH 121/992] Add log directory to .gitignore

---
 log/development.log | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 log/development.log

diff --git a/log/development.log b/log/development.log
deleted file mode 100644
index e69de29bb..000000000

From 5043d432a805e021b7f3ad17f0038a7e0d887a07 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 1 Jul 2010 10:24:08 +1000
Subject: [PATCH 122/992] silcence i18n deprecation warnings under Rails 2, not
 sure if this appropriate, but it solves the immediate problem on master

---
 spec/spec_helper.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index b1156d296..1ef86160b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,6 +1,8 @@
 # coding: utf-8
 require 'rubygems'
 
+gem 'i18n', '< 0.4'
+
 gem 'activesupport', '2.3.8'
 gem 'actionpack', '2.3.8'
 require 'active_support'
@@ -8,6 +10,8 @@
 require 'action_view'
 require 'action_controller'
 
+
+
 gem 'rspec', '>= 1.2.6'
 gem 'rspec-rails', '>= 1.2.6'
 gem 'hpricot', '>= 0.6.1'

From 4d3e4fff1d8b850d856cbfa65771bfe92ce9504f Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Fri, 18 Jun 2010 07:07:12 +0200
Subject: [PATCH 123/992] Check that reflection information is accessible
 before querying the object for it (GH-286)

---
 lib/formtastic.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 6c4aa7999..859b01593 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -478,7 +478,7 @@ def content_columns #:nodoc:
       # Collects association columns (relation columns) for the current form object class.
       #
       def association_columns(*by_associations) #:nodoc:
-        if @object.present?
+        if @object.present? && @object.class.respond_to?(:reflections)
           @object.class.reflections.collect do |name, _|
             if by_associations.present?
               name if by_associations.include?(_.macro)

From 364ae5c20efbd42a6a882f7e458bd9523433e3a0 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Fri, 2 Jul 2010 01:22:18 +0200
Subject: [PATCH 124/992] HTML-escape the label strings (GH-292)

---
 lib/formtastic.rb                     |  7 ++++---
 spec/inputs/check_boxes_input_spec.rb | 10 ++++++++++
 spec/inputs/radio_input_spec.rb       | 10 ++++++++++
 spec/label_spec.rb                    |  6 ++++++
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 859b01593..bc3cf4218 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -878,7 +878,7 @@ def radio_input(method, options)
           html_options[:checked] = selected_value == value if selected_option_is_present
 
           li_content = template.content_tag(:label,
-            Formtastic::Util.html_safe("#{self.radio_button(input_name, value, html_options)} #{label}"),
+            Formtastic::Util.html_safe("#{self.radio_button(input_name, value, html_options)} #{template.escape_once(label)}"),
             :for => input_id
           )
 
@@ -1149,7 +1149,7 @@ def check_boxes_input(method, options)
           html_options[:id] = input_id
 
           li_content = template.content_tag(:label,
-            Formtastic::Util.html_safe("#{self.check_box(input_name, html_options, value, unchecked_value)} #{label}"),
+            Formtastic::Util.html_safe("#{self.check_box(input_name, html_options, value, unchecked_value)} #{template.escape_once(label)}"),
             :for => input_id
           )
 
@@ -1622,7 +1622,7 @@ def localized_string(key, value, type, options = {}) #:nodoc:
         key = value if value.is_a?(::Symbol)
 
         if value.is_a?(::String)
-          value
+          template.escape_once(value)
         else
           use_i18n = value.nil? ? @@i18n_lookups_by_default : (value != false)
 
@@ -1644,6 +1644,7 @@ def localized_string(key, value, type, options = {}) #:nodoc:
 
             i18n_value = ::Formtastic::I18n.t(defaults.shift,
               options.merge(:default => defaults, :scope => type.to_s.pluralize.to_sym))
+            i18n_value = template.escape_once(i18n_value) if i18n_value.is_a?(::String)
             i18n_value.blank? ? nil : i18n_value
           end
         end
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index a63804ab1..cbcd22868 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -104,6 +104,16 @@
           output_buffer.should have_tag("form li fieldset ol li label input[@name='project[author_id][]']")
         end
       end
+
+      it 'should html escape the label string' do
+        output_buffer.replace ''
+        semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          concat(builder.input(:author_id, :as => :check_boxes, :collection => [["<b>Item 1</b>", 1], ["<b>Item 2</b>", 2]]))
+        end
+        output_buffer.should have_tag('form li fieldset ol li label') do |label|
+          label.body.should match /&lt;b&gt;Item [12]&lt;\/b&gt;$/
+        end
+      end
     end
 
     describe 'when :selected is set' do
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 3a2baa6bf..8a6a0d688 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -111,6 +111,16 @@
         end
       end
 
+      it 'should html escape the label string' do
+        output_buffer.replace ''
+        semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          concat(builder.input(:author_id, :as => :radio, :collection => [["<b>Item 1</b>", 1], ["<b>Item 2</b>", 2]]))
+        end
+        output_buffer.should have_tag('form li fieldset ol li label') do |label|
+          label.body.should match /&lt;b&gt;Item [12]&lt;\/b&gt;$/
+        end
+      end
+
       it 'should generate inputs for each item' do
         ::Author.find(:all).each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#project_author_id_#{author.id}")
diff --git a/spec/label_spec.rb b/spec/label_spec.rb
index 55d639fb5..3dfdebec7 100644
--- a/spec/label_spec.rb
+++ b/spec/label_spec.rb
@@ -42,6 +42,12 @@
         builder.label(:login, :label => false).should be_blank
       end
     end
+
+    it 'should html escape the label string' do
+      semantic_form_for(@new_post) do |builder|
+        builder.label(:login, :required => false, :label => '<b>My label</b>').should == "<label for=\"post_login\">&lt;b&gt;My label&lt;/b&gt;</label>"
+      end
+    end
   end
   
 end

From f73ae616d1f2e6783d00d96fc5abd20fec52f27e Mon Sep 17 00:00:00 2001
From: Robert Pankowecki <robert.pankowecki@gmail.com>
Date: Sat, 10 Jul 2010 00:17:34 +0800
Subject: [PATCH 125/992] Allow other plugins to hook after formtastic is
 initialized so they can extend its functionality ex.
 formtastic_calendar_date_select.

---
 lib/formtastic/railtie.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/railtie.rb b/lib/formtastic/railtie.rb
index 67c87ce8f..4a7910240 100644
--- a/lib/formtastic/railtie.rb
+++ b/lib/formtastic/railtie.rb
@@ -4,7 +4,7 @@
 
 module Formtastic
   class Railtie < Rails::Railtie
-    initializer :after_initialize do
+    initializer 'formtastic.initialize', :after => :after_initialize do
       ActionView::Base.send :include, Formtastic::SemanticFormHelper
       ActionView::Base.send(:include, Formtastic::LayoutHelper)
     end

From 2d2d8131016d560807940fad2720f187d9b16f67 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <m.jonuschat@gute-botschafter.de>
Date: Mon, 12 Jul 2010 16:43:32 +0200
Subject: [PATCH 126/992] More intelligent way to html_escape labels and hints
 (GH-299)

This commit won't escape html entities in strings marked as html_safe according to newer rails versions.
Additionally you can now turn html escaping off by setting

Formtastic::SemanticFormBuilder.escape_html_entities_in_hints_and_labels = false
---
 README.textile     |  4 ++++
 lib/formtastic.rb  | 19 ++++++++++++++-----
 spec/label_spec.rb | 17 ++++++++++++++++-
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/README.textile b/README.textile
index a620af903..960461973 100644
--- a/README.textile
+++ b/README.textile
@@ -517,7 +517,11 @@ If you want to add your own input types to encapsulate your own logic or interfa
 
 @Formtastic::SemanticFormHelper.builder = MyCustomBuilder@
 
+h2. Security
 
+By default formtastic escapes html entities in both labels and hints unless a string is marked as html_safe. If you are using an older rails version which doesn't know html_safe, or you want to globally turn this feature off, you can set the following in your initializer:
+
+Formtastic::SemanticFormBuilder.escape_html_entities_in_hints_and_labels = false
 
 
 h2. Status
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index bc3cf4218..92dd14fe2 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -19,11 +19,12 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
     @@file_methods = [ :file?, :public_filename, :filename ]
     @@priority_countries = ["Australia", "Canada", "United Kingdom", "United States"]
     @@i18n_lookups_by_default = false
+    @@escape_html_entities_in_hints_and_labels = true
     @@default_commit_button_accesskey = nil 
 
     cattr_accessor :default_text_field_size, :default_text_area_height, :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 
+                   :inline_order, :file_methods, :priority_countries, :i18n_lookups_by_default, :escape_html_entities_in_hints_and_labels, :default_commit_button_accesskey 
 
     RESERVED_COLUMNS = [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
 
@@ -878,7 +879,7 @@ def radio_input(method, options)
           html_options[:checked] = selected_value == value if selected_option_is_present
 
           li_content = template.content_tag(:label,
-            Formtastic::Util.html_safe("#{self.radio_button(input_name, value, html_options)} #{template.escape_once(label)}"),
+            Formtastic::Util.html_safe("#{self.radio_button(input_name, value, html_options)} #{escape_html_entities(label)}"),
             :for => input_id
           )
 
@@ -1149,7 +1150,7 @@ def check_boxes_input(method, options)
           html_options[:id] = input_id
 
           li_content = template.content_tag(:label,
-            Formtastic::Util.html_safe("#{self.check_box(input_name, html_options, value, unchecked_value)} #{template.escape_once(label)}"),
+            Formtastic::Util.html_safe("#{self.check_box(input_name, html_options, value, unchecked_value)} #{escape_html_entities(label)}"),
             :for => input_id
           )
 
@@ -1622,7 +1623,7 @@ def localized_string(key, value, type, options = {}) #:nodoc:
         key = value if value.is_a?(::Symbol)
 
         if value.is_a?(::String)
-          template.escape_once(value)
+          escape_html_entities(value)
         else
           use_i18n = value.nil? ? @@i18n_lookups_by_default : (value != false)
 
@@ -1644,7 +1645,7 @@ def localized_string(key, value, type, options = {}) #:nodoc:
 
             i18n_value = ::Formtastic::I18n.t(defaults.shift,
               options.merge(:default => defaults, :scope => type.to_s.pluralize.to_sym))
-            i18n_value = template.escape_once(i18n_value) if i18n_value.is_a?(::String)
+            i18n_value = escape_html_entities(i18n_value) if i18n_value.is_a?(::String)
             i18n_value.blank? ? nil : i18n_value
           end
         end
@@ -1677,6 +1678,14 @@ def set_include_blank(options)
         options
       end
 
+      def escape_html_entities(string) #:nodoc:
+        if @@escape_html_entities_in_hints_and_labels
+          # Acceppt html_safe flag as indicator to skip escaping
+          string = template.escape_once(string) unless string.respond_to?(:html_safe?) && string.html_safe? == true
+        end
+        string
+      end
+
   end
 
   # Wrappers around form_for (etc) with :builder => SemanticFormBuilder.
diff --git a/spec/label_spec.rb b/spec/label_spec.rb
index 3dfdebec7..b21904cb6 100644
--- a/spec/label_spec.rb
+++ b/spec/label_spec.rb
@@ -43,11 +43,26 @@
       end
     end
 
-    it 'should html escape the label string' do
+    it 'should html escape the label string by default' do
       semantic_form_for(@new_post) do |builder|
         builder.label(:login, :required => false, :label => '<b>My label</b>').should == "<label for=\"post_login\">&lt;b&gt;My label&lt;/b&gt;</label>"
       end
     end
+
+    it 'should not html escape the label if configured that way' do
+      ::Formtastic::SemanticFormBuilder.escape_html_entities_in_hints_and_labels = false
+      semantic_form_for(@new_post) do |builder|
+        builder.label(:login, :required => false, :label => '<b>My label</b>').should == "<label for=\"post_login\"><b>My label</b></label>"
+      end
+    end
+
+    it 'should not html escape the label string for html_safe strings' do
+      ::Formtastic::SemanticFormBuilder.escape_html_entities_in_hints_and_labels = true
+      semantic_form_for(@new_post) do |builder|
+        builder.label(:login, :required => false, :label => '<b>My label</b>'.html_safe).should == "<label for=\"post_login\"><b>My label</b></label>"
+      end
+    end
+
   end
   
 end

From d1df80b379323f13e0ce23d0aef2f8907dceae79 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <m.jonuschat@gute-botschafter.de>
Date: Mon, 12 Jul 2010 16:48:26 +0200
Subject: [PATCH 127/992] Changelog updates

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index b3281d1c9..96a81705f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+1.0.0.beta2 (unreleased)
+* Added default escaping of html entities in labels and hints (#292, #299)
+
 1.0.0.beta
 
 * Fixed :radio and :check_boxes inputs so that the legend no longer includes a <label> with a `for` attribute pointing to an input that doesn't exist (#253)

From 1420c6b74c83c7654f5511c6a1e8c40cc2ce1347 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Tue, 13 Jul 2010 23:32:51 +0200
Subject: [PATCH 128/992] Always use supplied label_method for collection
 (GH-301)

---
 lib/formtastic.rb  | 3 ++-
 spec/label_spec.rb | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 92dd14fe2..76bb96f7d 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1402,7 +1402,8 @@ def find_collection_for_column(column, options) #:nodoc:
 
         # 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)
+                             [Array, Fixnum, String, Symbol].include?(collection.first.class) &&
+                             !options.include?(:label_method)
 
         label, value = detect_label_and_value_method!(collection, options)
         collection.map { |o| [send_or_call(label, o), send_or_call(value, o)] }
diff --git a/spec/label_spec.rb b/spec/label_spec.rb
index b21904cb6..8117d6539 100644
--- a/spec/label_spec.rb
+++ b/spec/label_spec.rb
@@ -30,6 +30,15 @@
     end
   end
 
+  describe 'when label method is given' do
+    it 'should ignore the shortcut for simple collections if a label_method is supplied' do
+      semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :value_method => :to_s, :label_method => proc {|f| ('Label_%s' % [f])}))
+      end
+      output_buffer.should have_tag('form li fieldset ol li label', :with => /Label_[abc]/, :count => 3)
+    end
+  end
+
   describe 'when label is given' do
     it 'should allow the text to be given as label option' do
       semantic_form_for(@new_post) do |builder|

From 12029dc1c0a177059bf0a32dabf72ba8172dec84 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Tue, 13 Jul 2010 23:40:54 +0200
Subject: [PATCH 129/992] Ensure :value_method gets used for collections of
 arrays

---
 lib/formtastic.rb  |  2 +-
 spec/label_spec.rb | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 76bb96f7d..0936700b6 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1403,7 +1403,7 @@ def find_collection_for_column(column, options) #:nodoc:
         # 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) &&
-                             !options.include?(:label_method)
+                             !(options.include?(:label_method) || options.include?(:value_method))
 
         label, value = detect_label_and_value_method!(collection, options)
         collection.map { |o| [send_or_call(label, o), send_or_call(value, o)] }
diff --git a/spec/label_spec.rb b/spec/label_spec.rb
index 8117d6539..5324fbead 100644
--- a/spec/label_spec.rb
+++ b/spec/label_spec.rb
@@ -30,13 +30,22 @@
     end
   end
 
-  describe 'when label method is given' do
-    it 'should ignore the shortcut for simple collections if a label_method is supplied' do
+  describe 'when a collection is given' do
+    it 'should use a supplied label_method for simple collections' do
       semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :value_method => :to_s, :label_method => proc {|f| ('Label_%s' % [f])}))
       end
       output_buffer.should have_tag('form li fieldset ol li label', :with => /Label_[abc]/, :count => 3)
     end
+
+    it 'should use a supplied value_method for simple collections' do
+      semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :value_method => proc {|f| ('Value_%s' % [f.to_s])}))
+      end
+      output_buffer.should have_tag('form li fieldset ol li label input[value="Value_a"]')
+      output_buffer.should have_tag('form li fieldset ol li label input[value="Value_b"]')
+      output_buffer.should have_tag('form li fieldset ol li label input[value="Value_c"]')
+    end
   end
 
   describe 'when label is given' do

From 8b5d0ee690a37c95f0f996d7faaa06e021a5c449 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Tue, 13 Jul 2010 23:43:10 +0200
Subject: [PATCH 130/992] Update testsuite for RSpec 2.0

---
 spec/label_spec.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spec/label_spec.rb b/spec/label_spec.rb
index 5324fbead..ba9029e79 100644
--- a/spec/label_spec.rb
+++ b/spec/label_spec.rb
@@ -32,16 +32,18 @@
 
   describe 'when a collection is given' do
     it 'should use a supplied label_method for simple collections' do
-      semantic_form_for(:project, :url => 'http://test.host') do |builder|
+      form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :value_method => :to_s, :label_method => proc {|f| ('Label_%s' % [f])}))
       end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li fieldset ol li label', :with => /Label_[abc]/, :count => 3)
     end
 
     it 'should use a supplied value_method for simple collections' do
-      semantic_form_for(:project, :url => 'http://test.host') do |builder|
+      form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :value_method => proc {|f| ('Value_%s' % [f.to_s])}))
       end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li fieldset ol li label input[value="Value_a"]')
       output_buffer.should have_tag('form li fieldset ol li label input[value="Value_b"]')
       output_buffer.should have_tag('form li fieldset ol li label input[value="Value_c"]')

From 03361977787fac14cb3342c73f0b20fad76e3797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mihai=20T=C3=A2rnovan?= <mihai.tarnovan@cubus.ro>
Date: Wed, 14 Jul 2010 18:23:59 +0300
Subject: [PATCH 131/992] * changed with_custom_field_error_proc to use ensure
 for restoring default field_error_proc and to store it in a local variable
 instead of in a class variable (nested calls were problematic due to the
 globalness of class variables)

---
 lib/formtastic.rb | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 0936700b6..2ec46cb6d 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1724,9 +1724,7 @@ def escape_html_entities(string) #:nodoc:
   module SemanticFormHelper
     @@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.
@@ -1736,13 +1734,13 @@ module SemanticFormHelper
     end
     
     def with_custom_field_error_proc(&block)
-      @@default_field_error_proc = ::ActionView::Base.field_error_proc
+      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
+      yield
+    ensure
+      ::ActionView::Base.field_error_proc = default_field_error_proc
     end
-    
+        
     [:form_for, :fields_for, :remote_form_for].each do |meth|
       module_eval <<-END_SRC, __FILE__, __LINE__ + 1
         def semantic_#{meth}(record_or_name_or_array, *args, &proc)

From 510d7fdfa89adf1eb18939273935f9b97d5c2ca1 Mon Sep 17 00:00:00 2001
From: Nicholas Clark <nick4jesus@gmail.com>
Date: Tue, 22 Jun 2010 02:04:19 +0800
Subject: [PATCH 132/992] Fixed form generator to use automatically detected
 columns when no field arguments are passed

---
 lib/generators/formtastic/form/form_generator.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/generators/formtastic/form/form_generator.rb b/lib/generators/formtastic/form/form_generator.rb
index 5df60df00..b0aca032e 100644
--- a/lib/generators/formtastic/form/form_generator.rb
+++ b/lib/generators/formtastic/form/form_generator.rb
@@ -23,6 +23,7 @@ def self.source_root
     end
 
     def create_or_show
+      @attributes = self.columns if @attributes.empty?
       if options[:partial]
         empty_directory "app/views/#{controller_path}"
         template "view__form.html.#{template_type}", "app/views/#{controller_path}/_form.html.#{template_type}"

From f741375f24644f87ec7f1577ca05aea62367a1df Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Mon, 31 May 2010 22:38:03 +0200
Subject: [PATCH 133/992] This commit introduces a new option to be passed to
 inputs rendered as check_boxes. If :no_hidden_input gets passed, the form
 rendering will only output the checkbox tags. Otherwise the normal rails
 helper for checkboxes will get called and generate an additional hidden input
 field which allows to discern between checked and unchecked states.

---
 lib/formtastic.rb                     | 52 +++++++++++++++++++++++----
 spec/custom_macros.rb                 |  7 ----
 spec/inputs/check_boxes_input_spec.rb | 27 ++++++++++++++
 3 files changed, 72 insertions(+), 14 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 0936700b6..40ec1426c 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1127,15 +1127,13 @@ def check_boxes_input(method, options)
         html_options = options.delete(:input_html) || {}
 
         input_name      = generate_association_input_name(method)
+        no_hidden_input = options.delete(:no_hidden_input)
         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
-
+        selected_values = find_selected_values_for_column(method, options)
         disabled_option_is_present = options.key?(:disabled)
         disabled_values = [*options[:disabled]] if disabled_option_is_present
 
@@ -1145,12 +1143,12 @@ def check_boxes_input(method, options)
           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[:checked] = selected_values.include?(value)
           html_options[:disabled] = disabled_values.include?(value) if disabled_option_is_present
           html_options[:id] = input_id
 
           li_content = template.content_tag(:label,
-            Formtastic::Util.html_safe("#{self.check_box(input_name, html_options, value, unchecked_value)} #{escape_html_entities(label)}"),
+            Formtastic::Util.html_safe("#{self.check_box(input_name, html_options, value, unchecked_value, no_hidden_input)} #{escape_html_entities(label)}"),
             :for => input_id
           )
 
@@ -1166,6 +1164,47 @@ def check_boxes_input(method, options)
         )
       end
 
+      # Used by check_boxes input. The selected values will be set either by:
+      #
+      # * Explicitly provided through :selected or :checked
+      # * Values retrieved through an association
+      #
+      # If the collection is not a hash or an array of strings, fixnums or symbols,
+      # we use value_method to retrieve an array with the values
+      #
+      def find_selected_values_for_column(method, options)
+        selected_option_is_present = [:selected, :checked].any? { |k| options.key?(k) }
+        if selected_option_is_present
+          selected_values = (options.key?(:checked) ? options[:checked] : options[:selected])
+        else
+          if reflection = self.reflection_for(method)
+            options[:find_options] ||= {}
+
+            if conditions = reflection.options[:conditions]
+              options[:find_options][:conditions] = reflection.klass.merge_conditions(conditions, options[:find_options][:conditions])
+            end
+            collection = reflection.klass.find(:all, options[:find_options])
+            collection = collection.to_a if collection.is_a?(Hash)
+
+            # Return if we have an Array of strings, fixnums or symbols
+            return collection if (collection.instance_of?(Array) || collection.instance_of?(Range)) &&
+                                 [Fixnum, String, Symbol].include?(collection.first.class)
+
+            label, value = detect_label_and_value_method!(collection, options)
+            selected_values = collection.map { |o| send_or_call(value, o) }
+          end
+        end
+        selected_values = [*selected_values].compact
+        selected_values
+      end
+      
+      # Outputs a checkbox tag. If called with no_hidden_input = true a plain check_box_tag is returned,
+      # otherwise the helper uses the output generated by the rails check_box method.
+      def check_box(input_name, html_options = {}, checked_value = "1", unchecked_value = "0", no_hidden_input = false)
+        return template.check_box_tag(input_name, checked_value, html_options[:checked], html_options) if no_hidden_input
+        super(input_name, html_options, checked_value, unchecked_value)
+      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
@@ -1420,7 +1459,6 @@ def find_raw_collection_for_column(column, options) #:nodoc:
           if conditions = reflection.options[:conditions]
             options[:find_options][:conditions] = reflection.klass.merge_conditions(conditions, options[:find_options][:conditions])
           end
-
           reflection.klass.find(:all, options[:find_options])
         else
           create_boolean_collection(options)
diff --git a/spec/custom_macros.rb b/spec/custom_macros.rb
index 589753d6f..efd28140b 100644
--- a/spec/custom_macros.rb
+++ b/spec/custom_macros.rb
@@ -232,13 +232,6 @@ def it_should_use_the_collection_when_provided(as, countable)
           output_buffer.replace '' # clears the output_buffer from the before block, hax!
         end
 
-        it 'should not call find() on the parent class' do
-          ::Author.should_not_receive(:find)
-          semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:author, :as => as, :collection => @authors))
-          end
-        end
-
         it 'should use the provided collection' do
           semantic_form_for(@new_post) do |builder|
             concat(builder.input(:author, :as => as, :collection => @authors))
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index cbcd22868..0795a67b7 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -116,6 +116,33 @@
       end
     end
 
+    describe 'when :no_hidden_input is set' do
+      before do
+        @output_buffer = ''
+        mock_everything
+
+        semantic_form_for(@fred) do |builder|
+          concat(builder.input(:posts, :as => :check_boxes, :value_as_class => true, :no_hidden_input => true))
+        end
+      end
+
+      it 'should have a checkbox input for each post' do
+        ::Post.find(:all).each do |post|
+          output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
+          output_buffer.should have_tag("form li fieldset ol li label input[@name='author[post_ids][]']", :count => ::Post.find(:all).length)
+        end
+      end
+
+      it "should mark input as checked if it's the the existing choice" do
+        ::Post.find(:all).include?(@fred.posts.first).should be_true
+        output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
+      end
+
+      it 'should not generate empty hidden inputs' do
+        output_buffer.should_not have_tag("form li fieldset ol li label input[@type='hidden'][@value='']", :count => ::Post.find(:all).length)
+      end
+    end
+
     describe 'when :selected is set' do
       before do
         @output_buffer = ''

From beeb949dff1085e05bc964ca852d3e72b848d5bb Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Wed, 14 Jul 2010 22:56:40 +0200
Subject: [PATCH 134/992] Changing the default behaviour of check_boxes to
 suppress the rails check_box helper generated hidden fields by default unless
 :hidden_fields is set to true.

This is an backwards incompatible change and might break applications.
---
 lib/formtastic.rb                     | 10 +++++-----
 spec/inputs/check_boxes_input_spec.rb | 20 +++++++++++++++++---
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 40ec1426c..b1c25d5bb 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1127,7 +1127,7 @@ def check_boxes_input(method, options)
         html_options = options.delete(:input_html) || {}
 
         input_name      = generate_association_input_name(method)
-        no_hidden_input = options.delete(:no_hidden_input)
+        hidden_fields   = options.delete(:hidden_fields)
         value_as_class  = options.delete(:value_as_class)
         unchecked_value = options.delete(:unchecked_value) || ''
         html_options    = { :name => "#{@object_name}[#{input_name}][]" }.merge(html_options)
@@ -1148,7 +1148,7 @@ def check_boxes_input(method, options)
           html_options[:id] = input_id
 
           li_content = template.content_tag(:label,
-            Formtastic::Util.html_safe("#{self.check_box(input_name, html_options, value, unchecked_value, no_hidden_input)} #{escape_html_entities(label)}"),
+            Formtastic::Util.html_safe("#{self.create_check_boxes(input_name, html_options, value, unchecked_value, hidden_fields)} #{escape_html_entities(label)}"),
             :for => input_id
           )
 
@@ -1200,9 +1200,9 @@ def find_selected_values_for_column(method, options)
       
       # Outputs a checkbox tag. If called with no_hidden_input = true a plain check_box_tag is returned,
       # otherwise the helper uses the output generated by the rails check_box method.
-      def check_box(input_name, html_options = {}, checked_value = "1", unchecked_value = "0", no_hidden_input = false)
-        return template.check_box_tag(input_name, checked_value, html_options[:checked], html_options) if no_hidden_input
-        super(input_name, html_options, checked_value, unchecked_value)
+      def create_check_boxes(input_name, html_options = {}, checked_value = "1", unchecked_value = "0", hidden_fields = false)
+        return template.check_box_tag(input_name, checked_value, html_options[:checked], html_options) unless hidden_fields == true
+        self.check_box(input_name, html_options, checked_value, unchecked_value)
       end
 
       # Outputs a country select input, wrapping around a regular country_select helper. 
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 0795a67b7..5f79c7634 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -41,8 +41,8 @@
       output_buffer.should have_tag('form li input[@checked]', :count => 1)
     end
 
-    it 'should generate hidden inputs with default value blank' do
-      output_buffer.should have_tag("form li fieldset ol li label input[@type='hidden'][@value='']", :count => ::Post.find(:all).size)
+    it 'should not generate hidden inputs with default value blank' do
+      output_buffer.should_not have_tag("form li fieldset ol li label input[@type='hidden'][@value='']", :count => ::Post.find(:all).size)
     end
 
     describe "each choice" do
@@ -60,11 +60,25 @@
         end
       end
 
-      it 'should have a checkbox input for each post' do
+      it 'should have a checkbox input but no hidden field for each post' do
+        ::Post.find(:all).each do |post|
+          output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
+          output_buffer.should have_tag("form li fieldset ol li label input[@name='author[post_ids][]']", :count => 1)
+        end
+      end
+
+      it 'should have a checkbox and a hidden field for each post with :hidden_field => true' do
+        output_buffer.replace ''
+
+        semantic_form_for(@fred) do |builder|
+          concat(builder.input(:posts, :as => :check_boxes, :hidden_fields => true, :value_as_class => true))
+        end
+
         ::Post.find(:all).each do |post|
           output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@name='author[post_ids][]']", :count => 2)
         end
+
       end
 
       it "should mark input as checked if it's the the existing choice" do

From 235bc6efb1f19eecfc519d316efc6b313939df4c Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Wed, 14 Jul 2010 23:13:05 +0200
Subject: [PATCH 135/992] Make tests reflect renamed option

---
 spec/inputs/check_boxes_input_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 5f79c7634..7416c47ea 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -130,13 +130,13 @@
       end
     end
 
-    describe 'when :no_hidden_input is set' do
+    describe 'when :hidden_fields is set to false' do
       before do
         @output_buffer = ''
         mock_everything
 
         semantic_form_for(@fred) do |builder|
-          concat(builder.input(:posts, :as => :check_boxes, :value_as_class => true, :no_hidden_input => true))
+          concat(builder.input(:posts, :as => :check_boxes, :value_as_class => true, :hidden_fields => false))
         end
       end
 

From 480e559090278cb20bf2f237ed0f8897af1840ca Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Sun, 18 Jul 2010 00:31:50 +0200
Subject: [PATCH 136/992] Make tests use require 'spec_helper'

---
 spec/buttons_spec.rb                  | 2 +-
 spec/commit_button_spec.rb            | 2 +-
 spec/custom_builder_spec.rb           | 2 +-
 spec/defaults_spec.rb                 | 2 +-
 spec/error_proc_spec.rb               | 2 +-
 spec/errors_spec.rb                   | 2 +-
 spec/form_helper_spec.rb              | 2 +-
 spec/i18n_spec.rb                     | 2 +-
 spec/include_blank_spec.rb            | 2 +-
 spec/input_spec.rb                    | 2 +-
 spec/inputs/boolean_input_spec.rb     | 2 +-
 spec/inputs/check_boxes_input_spec.rb | 2 +-
 spec/inputs/country_input_spec.rb     | 2 +-
 spec/inputs/date_input_spec.rb        | 2 +-
 spec/inputs/datetime_input_spec.rb    | 2 +-
 spec/inputs/file_input_spec.rb        | 2 +-
 spec/inputs/hidden_input_spec.rb      | 2 +-
 spec/inputs/numeric_input_spec.rb     | 2 +-
 spec/inputs/password_input_spec.rb    | 2 +-
 spec/inputs/radio_input_spec.rb       | 2 +-
 spec/inputs/select_input_spec.rb      | 2 +-
 spec/inputs/string_input_spec.rb      | 2 +-
 spec/inputs/text_input_spec.rb        | 2 +-
 spec/inputs/time_input_spec.rb        | 2 +-
 spec/inputs/time_zone_input_spec.rb   | 2 +-
 spec/inputs_spec.rb                   | 2 +-
 spec/label_spec.rb                    | 2 +-
 spec/semantic_errors_spec.rb          | 2 +-
 spec/semantic_fields_for_spec.rb      | 2 +-
 29 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/spec/buttons_spec.rb b/spec/buttons_spec.rb
index 0fbee3c09..cdd2221a0 100644
--- a/spec/buttons_spec.rb
+++ b/spec/buttons_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'SemanticFormBuilder#buttons' do
 
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index efe24cb9d..00531188c 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'SemanticFormBuilder#commit_button' do
 
diff --git a/spec/custom_builder_spec.rb b/spec/custom_builder_spec.rb
index 5fd6a7256..eb31f7f61 100644
--- a/spec/custom_builder_spec.rb
+++ b/spec/custom_builder_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'Formtastic::SemanticFormHelper.builder' do
 
diff --git a/spec/defaults_spec.rb b/spec/defaults_spec.rb
index fab91f137..2a2c1df00 100644
--- a/spec/defaults_spec.rb
+++ b/spec/defaults_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.join(File.dirname(__FILE__), *%w[spec_helper])
+require 'spec_helper'
 
 describe 'Formtastic::SemanticFormBuilder-defaults' do
   
diff --git a/spec/error_proc_spec.rb b/spec/error_proc_spec.rb
index 6225e786a..0f316f0c4 100644
--- a/spec/error_proc_spec.rb
+++ b/spec/error_proc_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'Rails field_error_proc' do
   
diff --git a/spec/errors_spec.rb b/spec/errors_spec.rb
index 548aebc53..c5b9e8a76 100644
--- a/spec/errors_spec.rb
+++ b/spec/errors_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'SemanticFormBuilder#errors_on' do
   
diff --git a/spec/form_helper_spec.rb b/spec/form_helper_spec.rb
index 620540cb2..e4b3c8670 100644
--- a/spec/form_helper_spec.rb
+++ b/spec/form_helper_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'SemanticFormHelper' do
   
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index baa38081c..5893c03bb 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.join(File.dirname(__FILE__), *%w[spec_helper])
+require 'spec_helper'
 
 describe 'Formtastic::I18n' do
   
diff --git a/spec/include_blank_spec.rb b/spec/include_blank_spec.rb
index 573be148d..132b1a21a 100644
--- a/spec/include_blank_spec.rb
+++ b/spec/include_blank_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe "*select: options[:include_blank]" do
 
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 4d64cc6a9..0a1fe89de 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'SemanticFormBuilder#input' do
   
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index f6909f124..83f8f16b4 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'boolean input' do
   
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 85fc16d6d..27656ff0f 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'check_boxes input' do
   
diff --git a/spec/inputs/country_input_spec.rb b/spec/inputs/country_input_spec.rb
index 67570b32d..7ed5e28f9 100644
--- a/spec/inputs/country_input_spec.rb
+++ b/spec/inputs/country_input_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'country input' do
   
diff --git a/spec/inputs/date_input_spec.rb b/spec/inputs/date_input_spec.rb
index 15bc0e8ac..62af218ef 100644
--- a/spec/inputs/date_input_spec.rb
+++ b/spec/inputs/date_input_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'date input' do
   
diff --git a/spec/inputs/datetime_input_spec.rb b/spec/inputs/datetime_input_spec.rb
index 98fad64e8..a22f8ea69 100644
--- a/spec/inputs/datetime_input_spec.rb
+++ b/spec/inputs/datetime_input_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'datetime input' do
   
diff --git a/spec/inputs/file_input_spec.rb b/spec/inputs/file_input_spec.rb
index 1f5d35850..c5610731d 100644
--- a/spec/inputs/file_input_spec.rb
+++ b/spec/inputs/file_input_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'file input' do
   
diff --git a/spec/inputs/hidden_input_spec.rb b/spec/inputs/hidden_input_spec.rb
index 9cabe6be2..66940eed7 100644
--- a/spec/inputs/hidden_input_spec.rb
+++ b/spec/inputs/hidden_input_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'hidden input' do
   
diff --git a/spec/inputs/numeric_input_spec.rb b/spec/inputs/numeric_input_spec.rb
index d1e3ea56b..8fa1ebbf0 100644
--- a/spec/inputs/numeric_input_spec.rb
+++ b/spec/inputs/numeric_input_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'numeric input' do
   
diff --git a/spec/inputs/password_input_spec.rb b/spec/inputs/password_input_spec.rb
index dbd6a9961..b2d5d2db7 100644
--- a/spec/inputs/password_input_spec.rb
+++ b/spec/inputs/password_input_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'password input' do
   
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 428aeb60e..7184f42e2 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'radio input' do
   
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index c17738ad8..ff3edb18e 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'select input' do
 
diff --git a/spec/inputs/string_input_spec.rb b/spec/inputs/string_input_spec.rb
index b4a2ad647..7bf1b537f 100644
--- a/spec/inputs/string_input_spec.rb
+++ b/spec/inputs/string_input_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'string input' do
   
diff --git a/spec/inputs/text_input_spec.rb b/spec/inputs/text_input_spec.rb
index 0b0439004..47f3d894b 100644
--- a/spec/inputs/text_input_spec.rb
+++ b/spec/inputs/text_input_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'text input' do
   
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index c928dffe5..9727ce264 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'time input' do
   
diff --git a/spec/inputs/time_zone_input_spec.rb b/spec/inputs/time_zone_input_spec.rb
index 613f65a38..fffca3544 100644
--- a/spec/inputs/time_zone_input_spec.rb
+++ b/spec/inputs/time_zone_input_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'time_zone input' do
   
diff --git a/spec/inputs_spec.rb b/spec/inputs_spec.rb
index 510869ccf..66c5aca1c 100644
--- a/spec/inputs_spec.rb
+++ b/spec/inputs_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'SemanticFormBuilder#inputs' do
   
diff --git a/spec/label_spec.rb b/spec/label_spec.rb
index ba9029e79..e9156b024 100644
--- a/spec/label_spec.rb
+++ b/spec/label_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'SemanticFormBuilder#label' do
 
diff --git a/spec/semantic_errors_spec.rb b/spec/semantic_errors_spec.rb
index 7045b502e..94fc37599 100644
--- a/spec/semantic_errors_spec.rb
+++ b/spec/semantic_errors_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'SemanticFormBuilder#semantic_errors' do
 
diff --git a/spec/semantic_fields_for_spec.rb b/spec/semantic_fields_for_spec.rb
index d80fef6e3..98a80beae 100644
--- a/spec/semantic_fields_for_spec.rb
+++ b/spec/semantic_fields_for_spec.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'SemanticFormBuilder#semantic_fields_for' do
 

From 57a16f46ad9ddb5a4f32439c5e2182866039b533 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Sun, 18 Jul 2010 00:42:42 +0200
Subject: [PATCH 137/992] Make tests work with ruby 1.9.2

---
 spec/spec_helper.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 2a8fbc84a..3a6c09092 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -122,6 +122,7 @@ def new_author_path; "/authors/new"; end
     @fred.stub!(:persisted?).and_return(nil)
 
     @bob = mock('user')
+    @bob.stub!(:to_ary)
     @bob.stub!(:class).and_return(::Author)
     @bob.stub!(:to_label).and_return('Bob Rock')
     @bob.stub!(:login).and_return('bob')

From 038357cae3fbe4ce9d648249a4c6d0b1f520a1f4 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Sun, 18 Jul 2010 00:49:11 +0200
Subject: [PATCH 138/992] Document hidden_fields option

---
 lib/formtastic.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 6a8b3d2b1..20f1e2691 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1137,6 +1137,15 @@ def date_or_datetime_input(method, options)
       #   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
       #
+      #
+      # Formtastic works around a bug in rails handling of check box collections by
+      # not generating the hidden fields for state checking of the checkboxes 
+      # The :hidden_fields option provides a way to re-enable these hidden inputs by
+      # setting it to true.
+      #
+      #   f.input :authors, :as => :check_boxes, hidden_fields => false
+      #   f.input :authors, :as => :check_boxes, hidden_fields => true
+      #
       # 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).

From 69eb5ebc4c2d3cbb9caa252a6bda55bb3f89fa54 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 21 Jul 2010 08:48:35 +1000
Subject: [PATCH 139/992] CHANGELOG catch-up

---
 CHANGELOG | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 96a81705f..06babe6c9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,12 @@
 1.0.0.beta2 (unreleased)
+
 * Added default escaping of html entities in labels and hints (#292, #299)
+* Added/Fixed that :value_method and :label_method were not being used for simple collections (like Arrays)
+* Added some more compatibility for Mongooid and other ORMs by checking for reflection information before calling it
+* Fixed deprecation warnings in Rails 2.3.6 and newer
+* Fixed a bug where :check_boxes and :radio were using method instead of :label option
+* Fixed a conflict where i18n lookups were failing when an attribute and model have the same name
+* Fixed some html that was not marked as safe
 
 1.0.0.beta
 

From 3f6e15a2147fe9951f1113ca2272d007ac93ef22 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 21 Jul 2010 08:50:18 +1000
Subject: [PATCH 140/992] tweaked release process

---
 RELEASE_PROCESS | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/RELEASE_PROCESS b/RELEASE_PROCESS
index 6780d04b3..2e2f0bbcc 100644
--- a/RELEASE_PROCESS
+++ b/RELEASE_PROCESS
@@ -3,9 +3,7 @@ rake version:bump:minor                 # or patch or major, commits the change
 rake gemspec                            # to generate the new gemspec file
 git add formtastic.gemspec              # stage changes
 git commit -am "new gemspec"            # commit and describe the reason for the new gem
-git tag -am "0.2.3" 0.2.3               # tag the new version in the code base too
-git log 0.2.2..0.2.3                    # check the log since last tag
+git tag 0.2.3                           # tag the new version in the code base too
 gem build formtastic.gemspec            # build the gem
 gem push formtastic-0.2.3.gem           # publish the gem
-git push                                # push to github
-git push --tags                         # push the tags up to remote too
+git push && git push --tags             # push to remote

From cd89a857295919ab514d826863be621ed7c4730e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 21 Jul 2010 08:51:15 +1000
Subject: [PATCH 141/992] version bump for 1.0.0.beta2

---
 VERSION.yml        | 2 +-
 formtastic.gemspec | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION.yml b/VERSION.yml
index 8c85f482b..b71727baf 100644
--- a/VERSION.yml
+++ b/VERSION.yml
@@ -2,4 +2,4 @@
 :major: 1
 :minor: 0
 :patch: 0
-:build: beta
+:build: beta2
diff --git a/formtastic.gemspec b/formtastic.gemspec
index 4b21df90e..2510a89f2 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formtastic}
-  s.version = "1.0.0.beta"
+  s.version = "1.0.0.beta2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin French"]
-  s.date = %q{2010-06-07}
+  s.date = %q{2010-07-21}
   s.description = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.email = %q{justin@indent.com.au}
   s.extra_rdoc_files = [

From 629111304a89b232358e38955eaa5409d4964867 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 21 Jul 2010 08:54:14 +1000
Subject: [PATCH 142/992] README udpated to mention --pre and ditch the
 gemcutter guff

---
 README.textile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.textile b/README.textile
index 960461973..5231280e1 100644
--- a/README.textile
+++ b/README.textile
@@ -79,16 +79,16 @@ RDoc documentation _should_ be automatically generated after each commit and mad
 
 h2. Installation
 
-The gem is hosted on gemcutter, so *if you haven't already*, add it as a gem source:
+Install the Formtastic gem:
 
 <pre>
-  sudo gem sources -a http://gemcutter.org/
+  sudo gem install formtastic
 </pre>
 
-Then install the Formtastic gem:
+Or try the 1.0.0.beta2:
 
 <pre>
-  sudo gem install formtastic
+  sudo gem install formtastic --pre
 </pre>
 
 And add it to your environment.rb configuration as a gem dependency:

From 4036e741434daebc0a314ec23ca937ad85f44ee2 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 21 Jul 2010 09:56:35 +1000
Subject: [PATCH 143/992] pruning and cleaning up the README, it's been a while

---
 README.textile | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/README.textile b/README.textile
index 5231280e1..fd3331310 100644
--- a/README.textile
+++ b/README.textile
@@ -77,7 +77,20 @@ h2. Documentation
 RDoc documentation _should_ be automatically generated after each commit and made available on the "rdoc.info website":http://rdoc.info/projects/justinfrench/formtastic.
 
 
-h2. Installation
+h2. A Note About Rails 3 Support
+
+Formtastic 1.0 will only support the latest stable Rails 2.x. We're maintaining a rails3 branch which aims to provide both Rails 2.x and 3.x support, which is targeted for the 1.1 release soon after 1.0, around the same time Rails 3.0 ships.
+
+If you have a Rails 3 project and would like to use Formtastic's rails3 branch, bundler provides you with the ability to do this easily. Just add Formtastic as a git dependency in your Gemfile with the :branch option:
+
+<pre>
+  gem 'formtastic', :git => "http://github.com/justinfrench/formtastic.git", :branch => "rails3"
+</pre>
+
+Please be aware that Rails 3 is still under heavy development (even in the later betas), as is Formtastic, so our rails3 branch is very much "on the edge", just like Rails. if you find issues, compatibility issues with Rails 2 or 3, please report an issue on Github.
+
+
+h2. Installation under Rails 2.x
 
 Install the Formtastic gem:
 
@@ -113,6 +126,7 @@ A proof-of-concept stylesheet is provided which you can include in your layout.
   </head>
 </pre>
 
+
 h2. Usage
 
 Forms are really boring to code... you want to get onto the good stuff as fast as possible.
@@ -524,9 +538,11 @@ By default formtastic escapes html entities in both labels and hints unless a st
 Formtastic::SemanticFormBuilder.escape_html_entities_in_hints_and_labels = false
 
 
-h2. Status
+h2. Focus
 
-Formtastic has been in active development for about a year. We've just recently jumped to an 0.9 version number, signaling that we consider this a 1.0 release candidate, and that the API won't change significantly for the 1.x series.
+Formtastic is close to shipping a 1.0 release candidate after more than a year of active development. 1.0 will be compatible with Rails 2, and this is our top priority right now. We've also been working hard on a Rails 2 *and* 3 compatible version in the rails3 branch, targeting a 1.1 release shortly after Rails 3.0 ships.
+
+There's heaps more we want to do, but we have to do this first.
 
 
 h2. Dependencies
@@ -540,18 +556,14 @@ There are none, but...
 
 h2. Compatibility
 
-I'm only testing Formtastic with the latest Rails 2.4.x stable release, and it should be fine under Rails 2.3.x as well (including nested forms). Patches are welcome to allow backwards compatibility, but I don't have the energy!
-
-h2. Got TextMate?
-
-Well...there's a TextMate-bundle in town, dedicated to make usage of Formtastic in the "TextMate":http://macromates.com/ editor even more of a breeze:
-
-"Formtastic.tmbundle":http://github.com/grimen/formtastic_tmbundle
-
+* We're only testing Formtastic with the latest Rails 2.x stable release. Patches are welcome to allow backwards compatibility with older versions of Rails, of course.
+* Development of a Rails 2 *and* 3 compatible version of Formtastic is underway in the rails3 branch, targeting a Formtastic 1.1 release shortly after Rails 3.0 ships.
+* Formtastic, much like Rails 2, is very ActiveRecord-centric. Many people are using Formtastic (especially the rails3 branch) successfully with other ActiveModel-like ORMs and classes (DataMapper, MongoMapper, Mongoid, Authlogic, Devise...) but we're not guaranteeing anything at this stage. Patches are welcome, but it's not our core focus right now. Shipping a solid 1.0 and Rails 3 compatible 1.1 is. 
+ 
 
 h2. How to contribute
 
-*Before you send a pull request*, please ensure that you provide appropriate spec/test coverage and ensure the documentation is up-to-date.  Bonus points if you perform your changes in a clean topic branch rather than master.
+Please ensure that you provide appropriate spec/test coverage and ensure the documentation is up-to-date.  Bonus points if you perform your changes in a clean topic branch rather than master, and if you create an issue on GH for us to discuss your changes. Pull requests tend to get lost.
 
 Please also keep your commits *atomic* so that they are more likely to apply cleanly.  That means that each commit should contain the smallest possible logical change.  Don't commit two features at once, don't update the gemspec at the same time you add a feature, don't fix a whole bunch of whitespace in a file at the same time you change a few lines, etc, etc.
 
@@ -560,7 +572,7 @@ For significant changes, you may wish to discuss your idea on the Formtastic Goo
 
 h2. Maintainers & Contributors
 
-Formtastic is maintained by "Justin French":http://justinfrench.com, "José Valim":http://github.com/josevalim and "Jonas Grimfelt":http://github.com/grimen, but it wouldn't be as awesome as it is today without help from over 40 contributors.
+Formtastic is maintained by "Justin French":http://github.com/justinfrench, "Morton Jonuscha":http://github.com/yabawock and "Gabriel Sobrinho":http://github.com/sobrinho. "Denis Major":http://github.com/denismajor1 is doing some amazing documentation work in the wiki, and we very much appreciate the past efforts of "José Valim":http://github.com/josevalim and "Jonas Grimfelt":http://github.com/grimen and over 40 other contributors.
 
 @git shortlog -n -s --no-merges@
 

From 644d1001ef091782c07c19c6bcf1d88d8e5dbdc8 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <m.jonuschat@gute-botschafter.de>
Date: Thu, 22 Jul 2010 10:38:05 +0200
Subject: [PATCH 144/992] Fix typo in Readme

---
 README.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.textile b/README.textile
index fd3331310..029f831d7 100644
--- a/README.textile
+++ b/README.textile
@@ -572,7 +572,7 @@ For significant changes, you may wish to discuss your idea on the Formtastic Goo
 
 h2. Maintainers & Contributors
 
-Formtastic is maintained by "Justin French":http://github.com/justinfrench, "Morton Jonuscha":http://github.com/yabawock and "Gabriel Sobrinho":http://github.com/sobrinho. "Denis Major":http://github.com/denismajor1 is doing some amazing documentation work in the wiki, and we very much appreciate the past efforts of "José Valim":http://github.com/josevalim and "Jonas Grimfelt":http://github.com/grimen and over 40 other contributors.
+Formtastic is maintained by "Justin French":http://github.com/justinfrench, "Morton Jonuschat":http://github.com/yabawock and "Gabriel Sobrinho":http://github.com/sobrinho. "Denis Major":http://github.com/denismajor1 is doing some amazing documentation work in the wiki, and we very much appreciate the past efforts of "José Valim":http://github.com/josevalim and "Jonas Grimfelt":http://github.com/grimen and over 40 other contributors.
 
 @git shortlog -n -s --no-merges@
 

From 44813410b6c9d948dd6f2d08356a2fec4b89e3c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Dro=C5=BCd=C5=BCy=C5=84ski?= <matid@matid.net>
Date: Thu, 22 Jul 2010 12:06:18 +0200
Subject: [PATCH 145/992] Use ActiveModel::Naming#singular instead of
 ActionController::RecordIdentifier#singular_class_name in Rails 3

---
 lib/formtastic.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 12fb5559e..cbe7dddc5 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1824,12 +1824,14 @@ def semantic_#{meth}(record_or_name_or_array, *args, &proc)
           options[:builder] ||= @@builder
           options[:html] ||= {}
 
+          singularizer = defined?(ActiveModel::Naming.singular) ? ActiveModel::Naming.method(:singular) : ActionController::RecordIdentifier.method(:singular_class_name)
+
           class_names = options[:html][:class] ? options[:html][:class].split(" ") : []
           class_names << "formtastic"
           class_names << case record_or_name_or_array
             when String, Symbol then record_or_name_or_array.to_s               # :post => "post"
-            when Array then ActionController::RecordIdentifier.singular_class_name(record_or_name_or_array.last.class)  # [@post, @comment] # => "comment"
-            else ActionController::RecordIdentifier.singular_class_name(record_or_name_or_array.class)                  # @post => "post"
+            when Array then singularizer.call(record_or_name_or_array.last.class)  # [@post, @comment] # => "comment"
+            else singularizer.call(record_or_name_or_array.class)                  # @post => "post"
           end
           options[:html][:class] = class_names.join(" ")
           

From cc85bdfbc41c79be48af61366655557af3429e12 Mon Sep 17 00:00:00 2001
From: Brian Landau <brianjlandau@gmail.com>
Date: Wed, 21 Jul 2010 16:30:03 -0400
Subject: [PATCH 146/992] Fix for "inputs_for_nested_attributes" returning out
 of the proc on has_many associated nested models.

---
 lib/formtastic.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 2ec46cb6d..29e746a8b 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -524,9 +524,9 @@ def inputs_for_nested_attributes(*args, &block) #:nodoc:
           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| return f.inputs(*args){ block.call(f) } }
+          lambda { |f| f.inputs(*args){ block.call(f) } }
         else
-          proc { |f| return f.inputs(*args) }
+          lambda { |f| f.inputs(*args) }
         end
 
         fields_for_args = [options.delete(:for), options.delete(:for_options) || {}].flatten

From 65f9b9fb8f67ff235577bf6689a5f57e208393cb Mon Sep 17 00:00:00 2001
From: Brian Landau <brianjlandau@gmail.com>
Date: Wed, 21 Jul 2010 17:32:24 -0400
Subject: [PATCH 147/992] Add test for has_many association with .inputs :for
 option

---
 spec/inputs_spec.rb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/spec/inputs_spec.rb b/spec/inputs_spec.rb
index a697281b9..51f32bc3f 100644
--- a/spec/inputs_spec.rb
+++ b/spec/inputs_spec.rb
@@ -88,6 +88,24 @@
         
       end
       
+      describe "as a symbol representing a has_many association name" do
+        before do
+          @new_post.stub!(:authors).and_return([@bob, @fred])
+          @new_post.stub!(:authors_attributes=)
+        end
+        
+        it 'should nest the inputs with a name input for each item' do
+          semantic_form_for(@new_post) do |post|
+            post.inputs :for => :authors do |author|
+              concat(author.input(:login))
+            end
+          end
+          
+          output_buffer.should have_tag("form input[@name='post[authors_attributes][0][login]']")
+          output_buffer.should have_tag("form input[@name='post[authors_attributes][1][login]']")
+        end
+      end
+      
       describe 'as an array containing the a symbole for the association name and the associated object' do
         
         it 'should nest the inputs with an _attributes suffix on the association name' do

From 71c82c2bbe9dc5358c2b6df9bfe74e3a94b17da6 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 27 Jul 2010 16:06:43 +1000
Subject: [PATCH 148/992] :as => :time will now exclude the three hidden inputs
 for year, month and day if the :ignore_date option is true, just like in
 Rails' time_select, resolving GH-308.

---
 lib/formtastic.rb              |  1 +
 spec/inputs/time_input_spec.rb | 22 +++++++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 29e746a8b..824facc27 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1011,6 +1011,7 @@ def date_or_datetime_input(method, options)
         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]
+        inputs   = [] if options[:ignore_date]
         labels   = options.delete(:labels) || {}
 
         time_inputs = [:hour, :minute]
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index ae0b36039..eb0d34bf0 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -15,7 +15,27 @@
       ::I18n.backend.reload!
       output_buffer.replace ''
     end
-
+    
+    describe "with :ignore_date" do
+      before do
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:publish_at, :as => :time, :ignore_date => true))
+        end
+      end
+      
+      it 'should not have an input for day, month and year' do
+        output_buffer.should_not have_tag('#post_publish_at_1i')
+        output_buffer.should_not have_tag('#post_publish_at_2i')
+        output_buffer.should_not have_tag('#post_publish_at_3i')
+      end
+      
+      it 'should have an input for hour and minute' do
+        output_buffer.should have_tag('#post_publish_at_4i')
+        output_buffer.should have_tag('#post_publish_at_5i')
+      end
+      
+    end
+    
     describe "without seconds" do
       before do
         semantic_form_for(@new_post) do |builder|

From dc471acd429d7a423a6baa1e8a0aca098f70bab6 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 29 Jul 2010 08:35:04 +1000
Subject: [PATCH 149/992] version bump

---
 VERSION.yml        | 2 +-
 formtastic.gemspec | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION.yml b/VERSION.yml
index b71727baf..8a9166ff9 100644
--- a/VERSION.yml
+++ b/VERSION.yml
@@ -2,4 +2,4 @@
 :major: 1
 :minor: 0
 :patch: 0
-:build: beta2
+:build: beta3
diff --git a/formtastic.gemspec b/formtastic.gemspec
index 2510a89f2..310665218 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formtastic}
-  s.version = "1.0.0.beta2"
+  s.version = "1.0.0.beta3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin French"]
-  s.date = %q{2010-07-21}
+  s.date = %q{2010-07-29}
   s.description = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.email = %q{justin@indent.com.au}
   s.extra_rdoc_files = [

From bb149a9868238103b8af8b1f26cb7589ad9e1d36 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 29 Jul 2010 08:44:35 +1000
Subject: [PATCH 150/992] CHANGELOG CATCH-UP

---
 CHANGELOG | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 06babe6c9..e91b1ed48 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,10 @@
-1.0.0.beta2 (unreleased)
+1.0.0.beta3
+
+* Added :ignore_date option to time inputs (#308)
+* Fixed inputs_for_nested_attributes returning out of the proc on has_many associated nested models.
+* Fixed with_custom_field_error_proc to use ensure for restoring default field_error_proc and to store it in a local variable instead of in a class variable (nested calls were problematic due to the globalness of class variables)
+
+1.0.0.beta2
 
 * Added default escaping of html entities in labels and hints (#292, #299)
 * Added/Fixed that :value_method and :label_method were not being used for simple collections (like Arrays)

From 0aa2cc2e887bad7b002ca0afdf90226964001dc1 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 30 Jul 2010 20:45:52 +1000
Subject: [PATCH 151/992] ensure i18n < 0.4 is listed as a dependency in the
 gemspec

---
 Rakefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Rakefile b/Rakefile
index 6a57cbc2a..621490c73 100644
--- a/Rakefile
+++ b/Rakefile
@@ -55,6 +55,7 @@ begin
     # 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'
+    s.add_dependency 'i18n', '< 0.4'
     
     # Development dependencies. Not installed by default.
     # Install with: sudo gem install formtastic --development

From 6dd0dcadb430d2862405e191785ca3d6f197d995 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 30 Jul 2010 21:44:04 +1000
Subject: [PATCH 152/992] failing spec exposing gh-314 bug where habtm
 checkboxes inputs check every box, not just the ones present on the
 association

---
 spec/inputs/check_boxes_input_spec.rb | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 27656ff0f..9b3a91141 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -342,5 +342,32 @@
       end
     end
   end
+
+  describe 'for a has_and_belongs_to_many association' do
+    
+    before do
+      @output_buffer = ''
+      mock_everything
+      
+      @form = semantic_form_for(@freds_post) do |builder|
+        concat(builder.input(:authors, :as => :check_boxes))
+      end
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
+    end
+    
+    it 'should render checkboxes' do
+      # I'm aware these two lines test the same thing
+      output_buffer.should have_tag('input[type="checkbox"]', :count => 2)
+      output_buffer.should have_tag('input[type="checkbox"]', :count => ::Author.find(:all).size)
+    end
+    
+    it 'should only select checkboxes that are present in the association' do
+      # I'm aware these two lines test the same thing
+      output_buffer.should have_tag('input[checked="checked"]', :count => 1)
+      output_buffer.should have_tag('input[checked="checked"]', :count => @freds_post.authors.size)
+    end
+    
+  end
+
 end
 

From 229eb53a626bb2c5272a4e7eee0b6f3210dd3c45 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Fri, 30 Jul 2010 15:59:55 +0200
Subject: [PATCH 153/992] Make testsuite work with Rails 3.0.0.rc and RSpec
 2.0.0.beta19

---
 spec/spec_helper.rb              | 4 ++--
 spec/support/test_environment.rb | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3a6c09092..6fb64c320 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -17,6 +17,7 @@
 module FormtasticSpecHelper
   include ActionPack
   include ActionView::Context if defined?(ActionView::Context)
+  include ActionController::RecordIdentifier
   include ActionView::Helpers::FormHelper
   include ActionView::Helpers::FormTagHelper
   include ActionView::Helpers::FormOptionsHelper
@@ -25,12 +26,11 @@ module FormtasticSpecHelper
   include ActionView::Helpers::TextHelper
   include ActionView::Helpers::ActiveRecordHelper if defined?(ActionView::Helpers::ActiveRecordHelper)
   include ActionView::Helpers::ActiveModelHelper if defined?(ActionView::Helpers::ActiveModelHelper)
-  include ActionView::Helpers::RecordIdentificationHelper
   include ActionView::Helpers::DateHelper
   include ActionView::Helpers::CaptureHelper
   include ActionView::Helpers::AssetTagHelper
   include ActiveSupport
-  include ActionController::PolymorphicRoutes
+  include ActionController::PolymorphicRoutes if defined?(ActionController::PolymorphicRoutes)
   
   include Formtastic::SemanticFormHelper
   
diff --git a/spec/support/test_environment.rb b/spec/support/test_environment.rb
index a68e22087..658d3a943 100644
--- a/spec/support/test_environment.rb
+++ b/spec/support/test_environment.rb
@@ -1,6 +1,6 @@
 if Formtastic::Util.rails3?
-  gem 'rspec', '~> 2.0.0.beta12'
-  gem 'rspec-rails', '~> 2.0.0.beta12'
+  gem 'rspec', '~> 2.0.0.beta19'
+  gem 'rspec-rails', '~> 2.0.0.beta19'
   gem 'rspec_tag_matchers'
   gem 'i18n', '>= 0.4.0'
 
@@ -17,6 +17,7 @@ module FormtasticTest
     class Application < Rails::Application
       # Configure the default encoding used in templates for Ruby 1.9.
       config.encoding = "utf-8"
+      config.active_support.deprecation = :stderr
     end
   end
   FormtasticTest::Application.initialize!
@@ -33,6 +34,7 @@ class Application < Rails::Application
   gem 'rspec-rails', '>= 1.2.6'
   gem 'rspec_tag_matchers'
   gem 'hpricot', '>= 0.6.1'
+  gem 'i18n', '< 0.4.0'
 
   require 'rspec_tag_matchers'
 

From 6c3a884b741969ef77c22f26f668a3906f0e0a54 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Fri, 30 Jul 2010 16:16:40 +0200
Subject: [PATCH 154/992] GH-314: Correctly retrieve the selected values from
 an association instead of blindly retrieving all records available for the
 class of the object.

---
 lib/formtastic.rb | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index dd615fcf1..44a5677c8 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1205,23 +1205,10 @@ def find_selected_values_for_column(method, options)
         selected_option_is_present = [:selected, :checked].any? { |k| options.key?(k) }
         if selected_option_is_present
           selected_values = (options.key?(:checked) ? options[:checked] : options[:selected])
-        else
-          if reflection = self.reflection_for(method)
-            options[:find_options] ||= {}
-
-            if conditions = reflection.options[:conditions]
-              options[:find_options][:conditions] = reflection.klass.merge_conditions(conditions, options[:find_options][:conditions])
-            end
-            collection = reflection.klass.find(:all, options[:find_options])
-            collection = collection.to_a if collection.is_a?(Hash)
-
-            # Return if we have an Array of strings, fixnums or symbols
-            return collection if (collection.instance_of?(Array) || collection.instance_of?(Range)) &&
-                                 [Fixnum, String, Symbol].include?(collection.first.class)
-
-            label, value = detect_label_and_value_method!(collection, options)
-            selected_values = collection.map { |o| send_or_call(value, o) }
-          end
+        elsif object.respond_to?(method)
+          collection = [object.send(method)].compact.flatten
+          label, value = detect_label_and_value_method!(collection, options)
+          selected_values = collection.map { |o| send_or_call(value, o) }
         end
         selected_values = [*selected_values].compact
         selected_values

From f2ec5a0ffbf758e8420e7adc19db4ddfe6392fe3 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 31 Jul 2010 11:21:55 +1000
Subject: [PATCH 155/992] gem version bump

---
 VERSION.yml        | 2 +-
 formtastic.gemspec | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/VERSION.yml b/VERSION.yml
index 8a9166ff9..9ebcb9a84 100644
--- a/VERSION.yml
+++ b/VERSION.yml
@@ -2,4 +2,4 @@
 :major: 1
 :minor: 0
 :patch: 0
-:build: beta3
+:build: beta4
diff --git a/formtastic.gemspec b/formtastic.gemspec
index 310665218..4b4298c79 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formtastic}
-  s.version = "1.0.0.beta3"
+  s.version = "1.0.0.beta4"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin French"]
-  s.date = %q{2010-07-29}
+  s.date = %q{2010-07-31}
   s.description = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.email = %q{justin@indent.com.au}
   s.extra_rdoc_files = [
@@ -131,17 +131,20 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.0"])
       s.add_runtime_dependency(%q<actionpack>, [">= 2.3.0"])
+      s.add_runtime_dependency(%q<i18n>, ["< 0.4"])
       s.add_development_dependency(%q<rspec-rails>, [">= 1.2.6"])
       s.add_development_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3.0"])
       s.add_dependency(%q<actionpack>, [">= 2.3.0"])
+      s.add_dependency(%q<i18n>, ["< 0.4"])
       s.add_dependency(%q<rspec-rails>, [">= 1.2.6"])
       s.add_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3.0"])
     s.add_dependency(%q<actionpack>, [">= 2.3.0"])
+    s.add_dependency(%q<i18n>, ["< 0.4"])
     s.add_dependency(%q<rspec-rails>, [">= 1.2.6"])
     s.add_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
   end

From 19257b20234ed67d5fb30c0f6f752f1ad64171da Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 31 Jul 2010 11:23:32 +1000
Subject: [PATCH 156/992] CHANGELOG catch-up

---
 CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index e91b1ed48..3f189afd9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+1.0.0.beta4
+
+* ensure i18n < 0.4 is listed as a dependency in the gemspec
+
 1.0.0.beta3
 
 * Added :ignore_date option to time inputs (#308)

From 281ea9890aaa0900a6fb18d209fb278b5e58a66b Mon Sep 17 00:00:00 2001
From: Moritz Heidkamp <moritz.heidkamp@bevuta.com>
Date: Sun, 1 Aug 2010 09:01:04 +0800
Subject: [PATCH 157/992] extract checked_value and unchecked_value before
 passing options to the check_box helper so as not to make them attributes of
 the resulting input HTML element

---
 lib/formtastic.rb                 | 4 +++-
 spec/inputs/boolean_input_spec.rb | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 824facc27..1d06a2783 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1205,9 +1205,11 @@ 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) }
+        checked_value = options.delete(:checked_value) || '1'
+        unchecked_value = options.delete(:unchecked_value) || '0'
 
         input = self.check_box(method, strip_formtastic_options(options).merge(html_options),
-                               options.delete(:checked_value) || '1', options.delete(:unchecked_value) || '0')
+                               checked_value, unchecked_value)
         options = options_for_label(options)
 
         # the label() method will insert this nested input into the label at the last minute
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index 138ee5d87..c14a4aa45 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -38,7 +38,7 @@
       concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'checked', :unchecked_value => 'unchecked'))
     end
 
-    output_buffer.should have_tag('form li label input[@type="checkbox"][@value="checked"]')
+    output_buffer.should have_tag('form li label input[@type="checkbox"][@value="checked"]:not([@unchecked_value][@checked_value])')
     output_buffer.should have_tag('form li label input[@type="hidden"][@value="unchecked"]')
   end
 

From ce2b08a64d042a92a5ee756b0cb595e296f8fa68 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 1 Aug 2010 21:17:23 +1000
Subject: [PATCH 158/992] version bump to a release candidate

---
 VERSION.yml        | 2 +-
 formtastic.gemspec | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION.yml b/VERSION.yml
index 9ebcb9a84..0b3c65b1a 100644
--- a/VERSION.yml
+++ b/VERSION.yml
@@ -2,4 +2,4 @@
 :major: 1
 :minor: 0
 :patch: 0
-:build: beta4
+:build: rc
diff --git a/formtastic.gemspec b/formtastic.gemspec
index 4b4298c79..5ceed2147 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formtastic}
-  s.version = "1.0.0.beta4"
+  s.version = "1.0.0.rc"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin French"]
-  s.date = %q{2010-07-31}
+  s.date = %q{2010-08-01}
   s.description = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.email = %q{justin@indent.com.au}
   s.extra_rdoc_files = [

From efbb09c5bd4fc327a90c926b2df0d67c793385d4 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Sun, 1 Aug 2010 17:05:52 +0200
Subject: [PATCH 159/992] More ruby 1.9.2 fixes for the testsuite

---
 spec/spec_helper.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6fb64c320..2c00266ae 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -112,6 +112,7 @@ def authors_path; "/authors"; end
     def new_author_path; "/authors/new"; end
     
     @fred = mock('user')
+    @fred.stub!(:to_ary)
     @fred.stub!(:class).and_return(::Author)
     @fred.stub!(:to_label).and_return('Fred Smith')
     @fred.stub!(:login).and_return('fred_smith')
@@ -123,6 +124,7 @@ def new_author_path; "/authors/new"; end
 
     @bob = mock('user')
     @bob.stub!(:to_ary)
+    @bob.stub!(:to_ary)
     @bob.stub!(:class).and_return(::Author)
     @bob.stub!(:to_label).and_return('Bob Rock')
     @bob.stub!(:login).and_return('bob')
@@ -136,6 +138,7 @@ def new_author_path; "/authors/new"; end
     @bob.stub!(:persisted?).and_return(nil)
     
     @james = mock('user')
+    @james.stub!(:to_ary)
     @james.stub!(:class).and_return(::Author)
     @james.stub!(:to_label).and_return('James Shock')
     @james.stub!(:login).and_return('james')
@@ -149,6 +152,7 @@ def new_author_path; "/authors/new"; end
     
 
     ::Author.stub!(:find).and_return([@fred, @bob])
+    ::Author.stub!(:to_ary)
     ::Author.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     ::Author.stub!(:human_name).and_return('::Author')
     ::Author.stub!(:reflect_on_association).and_return { |column_name| mock('reflection', :options => {}, :klass => Post, :macro => :has_many) if column_name == :posts }
@@ -158,6 +162,7 @@ def new_author_path; "/authors/new"; end
 
     # Sometimes we need a mock @post object and some Authors for belongs_to
     @new_post = mock('post')
+    @new_post.stub!(:to_ary)
     @new_post.stub!(:class).and_return(::Post)
     @new_post.stub!(:id).and_return(nil)
     @new_post.stub!(:new_record?).and_return(true)
@@ -171,6 +176,7 @@ def new_author_path; "/authors/new"; end
     @new_post.stub!(:persisted?).and_return(nil)
 
     @freds_post = mock('post')
+    @freds_post.stub!(:to_ary)
     @freds_post.stub!(:class).and_return(::Post)
     @freds_post.stub!(:to_label).and_return('Fred Smith')
     @freds_post.stub!(:id).and_return(19)
@@ -213,8 +219,10 @@ def new_author_path; "/authors/new"; end
     ::Post.stub!(:content_columns).and_return([mock('column', :name => 'title'), mock('column', :name => 'body'), mock('column', :name => 'created_at')])
     ::Post.stub!(:to_key).and_return(nil)
     ::Post.stub!(:persisted?).and_return(nil)
+    ::Post.stub!(:to_ary)
     
     @new_post.stub!(:title)
+    @new_post.stub!(:to_ary)
     @new_post.stub!(:body)
     @new_post.stub!(:published)
     @new_post.stub!(:publish_at)

From a2ce2ea5bf0c437af050ce9aaa8ce413204ccc92 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Sun, 1 Aug 2010 23:31:47 +0200
Subject: [PATCH 160/992] Remove double stubbing of :to_ary on user @bob

---
 spec/spec_helper.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 2c00266ae..5539438d8 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -124,7 +124,6 @@ def new_author_path; "/authors/new"; end
 
     @bob = mock('user')
     @bob.stub!(:to_ary)
-    @bob.stub!(:to_ary)
     @bob.stub!(:class).and_return(::Author)
     @bob.stub!(:to_label).and_return('Bob Rock')
     @bob.stub!(:login).and_return('bob')

From ba407d74e97cceb4a1f2f8950d58bfcf466699d5 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 2 Aug 2010 09:21:44 +1000
Subject: [PATCH 161/992] Added rails 3 generator syntax alongside existing
 rails2 syntax

---
 Rakefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Rakefile b/Rakefile
index 63628d737..bd7ea660a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -29,10 +29,12 @@ begin
   ------------------------------------------------------------------------
   You can now (optionally) run the generator to copy some stylesheets and
   a config initializer into your application:
-    ./script/generate formtastic
+    rails generator formastic:install # Rails 3
+    ./script/generate formtastic      # Rails 2
 
   To generate some semantic form markup for your existing models, just run:
-    ./script/generate form MODEL_NAME
+    rails generate formtastic:form MODEL_NAME # Rails 3
+    ./script/generate form MODEL_NAME         # Rails 2
 
   Find out more and get involved:
     http://github.com/justinfrench/formtastic

From 9fee54317f45f3932811e0c33ca0e14b1969fc15 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 2 Aug 2010 16:18:46 +1000
Subject: [PATCH 162/992] call new? in Rails 3 and new_record? in Rails 2,
 silencing deprecation warnings (GH-318)

---
 lib/formtastic.rb          | 10 +++++++---
 spec/commit_button_spec.rb | 39 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 0b963c10f..017864d8b 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -321,9 +321,13 @@ def commit_button(*args)
       options = args.extract_options!
       text = options.delete(:label) || args.shift
 
-      if @object && @object.respond_to?(:new_record?)
-        key = @object.new_record? ? :create : :update
-        
+      if @object && (@object.respond_to?(:new_record?) || @object.respond_to?(:new?))
+        if @object.respond_to?(:new?) # Rails 3
+          key = @object.new? ? :create : :update
+        else # Rails 2
+          key = @object.new_record? ? :create : :update
+        end
+                
         # Deal with some complications with ActiveRecord::Base.human_name and two name models (eg UserPost)
         # ActiveRecord::Base.human_name falls back to ActiveRecord::Base.name.humanize ("Userpost") 
         # if there's no i18n, which is pretty crappy.  In this circumstance we want to detect this
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index 00531188c..0866cde8e 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -10,6 +10,45 @@
     mock_everything
   end
 
+  describe 'when the object responds to :new_record? (Rails 2, deprecated in 3)' do
+    
+    before do
+      @new_post.stub(:respond_to?).with(:to_model).and_return("X")
+      @new_post.stub(:respond_to?).with(:new?).and_return(false)
+      @new_post.stub(:respond_to?).with(:new_record?).and_return(true)
+      @new_post.stub(:respond_to?).with(:persisted?).and_return(true)
+    end
+    
+    it 'should call :new_record?' do
+      @new_post.should_receive(:new_record?)
+      @new_post.should_not_receive(:new?)
+      semantic_form_for(@new_post) do |builder|
+        concat(builder.commit_button)
+      end
+    end
+    
+  end
+  
+  describe 'when the object responds to :new? (Rails 3)' do
+    
+    before do
+      @new_post.stub(:respond_to?).with(:to_model).and_return("X")
+      @new_post.stub(:respond_to?).with(:new?).and_return(true)
+      @new_post.stub(:respond_to?).with(:new_record?).and_return(false)
+      @new_post.stub(:respond_to?).with(:persisted?).and_return(true)
+    end
+    
+    it 'should call :new?' do
+      @new_post.should_receive(:new?)
+      @new_post.should_not_receive(:new_record?)
+      semantic_form_for(@new_post) do |builder|
+        concat(builder.commit_button)
+      end
+    end
+    
+  end
+  
+
   describe 'when used on any record' do
 
     before do

From 1befaa46d6e9cdd21a2a12572e674674a4343faf Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 2 Aug 2010 18:28:44 +1000
Subject: [PATCH 163/992] Revert "call new? in Rails 3 and new_record? in Rails
 2, silencing deprecation warnings (GH-318)", because I'm an idiot. Looks like
 that's a DataMapper deprecation. Sorry all.

This reverts commit 9fee54317f45f3932811e0c33ca0e14b1969fc15.
---
 lib/formtastic.rb          | 10 +++-------
 spec/commit_button_spec.rb | 39 --------------------------------------
 2 files changed, 3 insertions(+), 46 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 017864d8b..0b963c10f 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -321,13 +321,9 @@ def commit_button(*args)
       options = args.extract_options!
       text = options.delete(:label) || args.shift
 
-      if @object && (@object.respond_to?(:new_record?) || @object.respond_to?(:new?))
-        if @object.respond_to?(:new?) # Rails 3
-          key = @object.new? ? :create : :update
-        else # Rails 2
-          key = @object.new_record? ? :create : :update
-        end
-                
+      if @object && @object.respond_to?(:new_record?)
+        key = @object.new_record? ? :create : :update
+        
         # Deal with some complications with ActiveRecord::Base.human_name and two name models (eg UserPost)
         # ActiveRecord::Base.human_name falls back to ActiveRecord::Base.name.humanize ("Userpost") 
         # if there's no i18n, which is pretty crappy.  In this circumstance we want to detect this
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index 0866cde8e..00531188c 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -10,45 +10,6 @@
     mock_everything
   end
 
-  describe 'when the object responds to :new_record? (Rails 2, deprecated in 3)' do
-    
-    before do
-      @new_post.stub(:respond_to?).with(:to_model).and_return("X")
-      @new_post.stub(:respond_to?).with(:new?).and_return(false)
-      @new_post.stub(:respond_to?).with(:new_record?).and_return(true)
-      @new_post.stub(:respond_to?).with(:persisted?).and_return(true)
-    end
-    
-    it 'should call :new_record?' do
-      @new_post.should_receive(:new_record?)
-      @new_post.should_not_receive(:new?)
-      semantic_form_for(@new_post) do |builder|
-        concat(builder.commit_button)
-      end
-    end
-    
-  end
-  
-  describe 'when the object responds to :new? (Rails 3)' do
-    
-    before do
-      @new_post.stub(:respond_to?).with(:to_model).and_return("X")
-      @new_post.stub(:respond_to?).with(:new?).and_return(true)
-      @new_post.stub(:respond_to?).with(:new_record?).and_return(false)
-      @new_post.stub(:respond_to?).with(:persisted?).and_return(true)
-    end
-    
-    it 'should call :new?' do
-      @new_post.should_receive(:new?)
-      @new_post.should_not_receive(:new_record?)
-      semantic_form_for(@new_post) do |builder|
-        concat(builder.commit_button)
-      end
-    end
-    
-  end
-  
-
   describe 'when used on any record' do
 
     before do

From 4d83225df73e051a82d3530b7c99cb8d45220ba8 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Mon, 2 Aug 2010 08:43:11 -0300
Subject: [PATCH 164/992] Fix a typo on check_boxes_input rdoc

---
 lib/formtastic.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 0b963c10f..7cc7941f5 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1144,8 +1144,8 @@ def date_or_datetime_input(method, options)
       # The :hidden_fields option provides a way to re-enable these hidden inputs by
       # setting it to true.
       #
-      #   f.input :authors, :as => :check_boxes, hidden_fields => false
-      #   f.input :authors, :as => :check_boxes, hidden_fields => true
+      #   f.input :authors, :as => :check_boxes, :hidden_fields => false
+      #   f.input :authors, :as => :check_boxes, :hidden_fields => true
       #
       # 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 

From 96a2e54b3e8ee71e9907df3868819b6c077d30b2 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Mon, 2 Aug 2010 19:53:52 +0200
Subject: [PATCH 165/992] Provide an empty default value for the form variable
 that's going to hold the array of values the user selected. This value get's
 replaced by the array as soon as a single checkbox is ticked, otherwise this
 default value is being used, very similar to the way the upstream rails
 helper handles this situation for single checkboxes.

More background information on this is available in GH-246
---
 lib/formtastic.rb                     | 6 +++++-
 spec/inputs/check_boxes_input_spec.rb | 9 +++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 7cc7941f5..5acae8b9a 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1166,7 +1166,11 @@ def check_boxes_input(method, options)
         disabled_option_is_present = options.key?(:disabled)
         disabled_values = [*options[:disabled]] if disabled_option_is_present
 
-        list_item_content = collection.map do |c|
+        li_options = value_as_class ? { :class => [method.to_s.singularize, 'default'].join('_') } : {}
+
+        list_item_content = []
+        list_item_content << template.content_tag(:li, self.hidden_field(input_name, {:value => ''}), li_options) unless hidden_fields
+        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)
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 9b3a91141..7286df591 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -37,7 +37,7 @@
     it 'should generate an ordered list with a list item for each choice' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li fieldset ol')
-      output_buffer.should have_tag('form li fieldset ol li', :count => ::Post.find(:all).size)
+      output_buffer.should have_tag('form li fieldset ol li input[@type=checkbox]', :count => ::Post.find(:all).size)
     end
 
     it 'should have one option with a "checked" attribute' do
@@ -75,6 +75,11 @@
         end
       end
 
+      it 'should have a hidden field with an empty value for the collection to allow clearing of all checkboxes' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag("form li fieldset ol li input[@type=hidden][@name='author[post_ids]'][@value='']", :count => 1)
+      end
+
       it 'should have a checkbox and a hidden field for each post with :hidden_field => true' do
         output_buffer.replace ''
 
@@ -112,7 +117,7 @@
 
       it 'shold generate an li tag for each item in the collection' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag('form li fieldset ol li', :count => ::Author.find(:all).size)
+        output_buffer.should have_tag('form li fieldset ol li input[@type=checkbox]', :count => ::Author.find(:all).size)
       end
 
       it 'should generate labels for each item' do

From 2d56fb0878a2a00dc8bdc38a5b73c64b0ebc5db3 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Mon, 2 Aug 2010 23:28:11 +0200
Subject: [PATCH 166/992] Full support of :input_html options for hidden fields

---
 lib/formtastic.rb                | 11 +++++------
 spec/inputs/hidden_input_spec.rb | 10 ++++++++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 1d06a2783..96fddfb94 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -617,15 +617,14 @@ def file_input(method, options)
       end
 
       # 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.
+      # Additionals options can be given using :input_hml. Should :input_html not be
+      # specified every option except for formtastic options 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))
+        html_options = options.delete(:input_html) || strip_formtastic_options(options)
+        self.hidden_field(method, html_options)
       end
 
       # Outputs a label and a select box containing options from the parent
diff --git a/spec/inputs/hidden_input_spec.rb b/spec/inputs/hidden_input_spec.rb
index c1f3b603a..393ea27bf 100644
--- a/spec/inputs/hidden_input_spec.rb
+++ b/spec/inputs/hidden_input_spec.rb
@@ -13,6 +13,8 @@
       concat(builder.input(:secret, :as => :hidden))
       concat(builder.input(:author_id, :as => :hidden, :value => 99))
       concat(builder.input(:published, :as => :hidden, :input_html => {:value => true}))
+      concat(builder.input(:reviewer, :as => :hidden, :input_html => {:class => 'new_post_reviewer', :id => 'new_post_reviewer'}))
+      concat(builder.input(:author, :as => :hidden, :value => 'direct_value', :input_html => {:value => "formtastic_value"}))
     end
   end
 
@@ -34,6 +36,14 @@
   it "should pass any explicitly specified value - using :input_html options" do
     output_buffer.should have_tag("form li input#post_published[@type=\"hidden\"][@value=\"true\"]")
   end
+
+  it "should pass any option specified using :input_html" do
+    output_buffer.should have_tag("form li input#new_post_reviewer[@type=\"hidden\"][@class=\"new_post_reviewer\"]")
+  end
+
+  it "should prefer :input_html over directly supplied options" do
+    output_buffer.should have_tag("form li input#post_author[@type=\"hidden\"][@value=\"formtastic_value\"]")
+  end
   
   it "should not render inline errors" do
     @errors = mock('errors')

From 4f6917149c34a809ecf6586c8efdd0bff0772720 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Mon, 2 Aug 2010 23:28:11 +0200
Subject: [PATCH 167/992] Full support of :input_html options for hidden fields

---
 lib/formtastic.rb                | 11 +++++------
 spec/inputs/hidden_input_spec.rb | 10 ++++++++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 5acae8b9a..8b5365cce 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -636,15 +636,14 @@ def file_input(method, options)
       end
 
       # 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.
+      # Additionals options can be given using :input_hml. Should :input_html not be
+      # specified every option except for formtastic options 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))
+        html_options = options.delete(:input_html) || strip_formtastic_options(options)
+        self.hidden_field(method, html_options)
       end
 
       # Outputs a label and a select box containing options from the parent
diff --git a/spec/inputs/hidden_input_spec.rb b/spec/inputs/hidden_input_spec.rb
index 66940eed7..6a215a36b 100644
--- a/spec/inputs/hidden_input_spec.rb
+++ b/spec/inputs/hidden_input_spec.rb
@@ -13,6 +13,8 @@
       concat(builder.input(:secret, :as => :hidden))
       concat(builder.input(:author_id, :as => :hidden, :value => 99))
       concat(builder.input(:published, :as => :hidden, :input_html => {:value => true}))
+      concat(builder.input(:reviewer, :as => :hidden, :input_html => {:class => 'new_post_reviewer', :id => 'new_post_reviewer'}))
+      concat(builder.input(:author, :as => :hidden, :value => 'direct_value', :input_html => {:value => "formtastic_value"}))
     end
   end
 
@@ -37,6 +39,14 @@
     output_buffer.concat(@form) if Formtastic::Util.rails3?
     output_buffer.should have_tag("form li input#post_published[@type=\"hidden\"][@value=\"true\"]")
   end
+
+  it "should pass any option specified using :input_html" do
+    output_buffer.should have_tag("form li input#new_post_reviewer[@type=\"hidden\"][@class=\"new_post_reviewer\"]")
+  end
+
+  it "should prefer :input_html over directly supplied options" do
+    output_buffer.should have_tag("form li input#post_author[@type=\"hidden\"][@value=\"formtastic_value\"]")
+  end
   
   it "should not render inline errors" do
     @errors = mock('errors')

From 515687755af2537f0d11ca424909f47d4ea07865 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Mon, 2 Aug 2010 23:30:31 +0200
Subject: [PATCH 168/992] Fix testsuite for RSpec 2

---
 spec/inputs/hidden_input_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/inputs/hidden_input_spec.rb b/spec/inputs/hidden_input_spec.rb
index 6a215a36b..fd7837bad 100644
--- a/spec/inputs/hidden_input_spec.rb
+++ b/spec/inputs/hidden_input_spec.rb
@@ -41,10 +41,12 @@
   end
 
   it "should pass any option specified using :input_html" do
+    output_buffer.concat(@form) if Formtastic::Util.rails3?
     output_buffer.should have_tag("form li input#new_post_reviewer[@type=\"hidden\"][@class=\"new_post_reviewer\"]")
   end
 
   it "should prefer :input_html over directly supplied options" do
+    output_buffer.concat(@form) if Formtastic::Util.rails3?
     output_buffer.should have_tag("form li input#post_author[@type=\"hidden\"][@value=\"formtastic_value\"]")
   end
   

From 384e711237b1698a2f0599f4a48c92599b5fe9b9 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Mon, 2 Aug 2010 22:10:08 -0300
Subject: [PATCH 169/992] escape_html_entities_in_hints_and_labels should allow
 custom value per form builder

---
 lib/formtastic.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index edc1dfce6..fb3a9c6d6 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1739,7 +1739,7 @@ def set_include_blank(options)
       end
 
       def escape_html_entities(string) #:nodoc:
-        if @@escape_html_entities_in_hints_and_labels
+        if self.class.escape_html_entities_in_hints_and_labels
           # Acceppt html_safe flag as indicator to skip escaping
           string = template.escape_once(string) unless string.respond_to?(:html_safe?) && string.html_safe? == true
         end

From 7a5120edbd4db386c98d9dd6a903a1b927951e62 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <m.jonuschat@gute-botschafter.de>
Date: Tue, 3 Aug 2010 13:13:49 +0200
Subject: [PATCH 170/992] Make sure that the empty default value for
 check_boxes collections is passed as an array value

The current way of sending the value as string can trigger a TypeError when Rack validates
the input field and one or more check_boxes have been ticked.

See rails issue #3030 for some more background information.

This changes the variable type used for commit 96a2e54b3e8ee71e9907df3868819b6c077d30b
---
 lib/formtastic.rb                     | 11 +++++++++--
 spec/inputs/check_boxes_input_spec.rb |  9 +++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 8b5365cce..7b6094395 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1168,7 +1168,7 @@ def check_boxes_input(method, options)
         li_options = value_as_class ? { :class => [method.to_s.singularize, 'default'].join('_') } : {}
 
         list_item_content = []
-        list_item_content << template.content_tag(:li, self.hidden_field(input_name, {:value => ''}), li_options) unless hidden_fields
+        list_item_content << self.create_hidden_field_for_check_boxes(input_name, value_as_class) unless hidden_fields
         list_item_content << collection.map do |c|
           label = c.is_a?(Array) ? c.first : c
           value = c.is_a?(Array) ? c.last : c
@@ -1217,9 +1217,16 @@ def find_selected_values_for_column(method, options)
         selected_values
       end
       
+      # Outputs a custom hidden field for check_boxes
+      def create_hidden_field_for_check_boxes(method, value_as_class) #:nodoc:
+        li_options = value_as_class ? { :class => [method.to_s.singularize, 'default'].join('_') } : {}
+        input_name = "#{object_name}[#{method.to_s}][]"
+        template.content_tag(:li, template.hidden_field_tag(input_name, ''), li_options)
+      end
+
       # Outputs a checkbox tag. If called with no_hidden_input = true a plain check_box_tag is returned,
       # otherwise the helper uses the output generated by the rails check_box method.
-      def create_check_boxes(input_name, html_options = {}, checked_value = "1", unchecked_value = "0", hidden_fields = false)
+      def create_check_boxes(input_name, html_options = {}, checked_value = "1", unchecked_value = "0", hidden_fields = false) #:nodoc:
         return template.check_box_tag(input_name, checked_value, html_options[:checked], html_options) unless hidden_fields == true
         self.check_box(input_name, html_options, checked_value, unchecked_value)
       end
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 7286df591..4c8019561 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -75,9 +75,14 @@
         end
       end
 
-      it 'should have a hidden field with an empty value for the collection to allow clearing of all checkboxes' do
+      it 'should have a hidden field with an empty array value for the collection to allow clearing of all checkboxes' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag("form li fieldset ol li input[@type=hidden][@name='author[post_ids]'][@value='']", :count => 1)
+        output_buffer.should have_tag("form li fieldset ol li input[@type=hidden][@name='author[post_ids][]'][@value='']", :count => 1)
+      end
+
+      it 'should not have a hidden field with an empty string value for the collection' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.should_not have_tag("form li fieldset ol li input[@type=hidden][@name='author[post_ids]'][@value='']", :count => 1)
       end
 
       it 'should have a checkbox and a hidden field for each post with :hidden_field => true' do

From 8fb219c7d7f03fa13f391400975f719bd1e41a7d Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Tue, 3 Aug 2010 20:26:32 +0200
Subject: [PATCH 171/992] Refactor the label and value detection for
 collections

The new detection mechanism is a bit less reliant on ActiveRecord
and provides some better defaults for common use cases like Array,
Integer, String oder Nil.

Additionally custom methods for label and value now get used for
finding selected values in a collection as well as for rendering
the collection.

Detection of methods based on work in Plataformatec SimpleForm.
---
 lib/formtastic.rb                     | 31 ++++++++++++++++++++-------
 spec/inputs/check_boxes_input_spec.rb | 23 ++++++++++++++++++++
 spec/support/custom_macros.rb         |  2 +-
 3 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 7b6094395..94d854660 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -16,6 +16,7 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
     @@inline_errors = :sentence
     @@label_str_method = :humanize
     @@collection_label_methods = %w[to_label display_name full_name name title username login value to_s]
+    @@collection_value_methods = %w[id to_s]
     @@inline_order = [ :input, :hints, :errors ]
     @@file_methods = [ :file?, :public_filename, :filename ]
     @@priority_countries = ["Australia", "Canada", "United Kingdom", "United States"]
@@ -1496,21 +1497,35 @@ def find_raw_collection_for_column(column, options) #:nodoc:
         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
+      # Detects the label and value methods from a collection using methods set in
+      # @@collection_label_methods and @@collection_value_methods. For some ruby core
+      # classes sensible defaults have been defined. 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
+      def detect_label_and_value_method!(collection, options = {})
+        sample = collection.first || collection.last
+
+        case sample
+        when Array
+          label, value = :first, :last
+        when Integer
+          label, value = :to_s, :to_i
+        when String, NilClass
+          label, value = :to_s, :to_s
+        end
+
+        # Order of preference: user supplied method, class defaults, auto-detect
+        label = options[:label_method] || label || @@collection_label_methods.find { |m| sample.respond_to?(m) }
+        value = options[:value_method] || value || @@collection_value_methods.find { |m| sample.respond_to?(m) }
+
         [label, value]
       end
 
-      # Detected the label collection method when none is supplied using the
+      # Return 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) }
+        detect_label_and_value_method!(collection).first
       end
 
       # Detects the method to call for fetching group members from the groups when grouping select options
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 4c8019561..27a5744a3 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -379,5 +379,28 @@
     
   end
 
+  describe 'for an association when a :collection is provided' do
+    describe 'it should use the specified :value_method option' do
+      before do
+        @output_buffer = ''
+        mock_everything
+      end
+
+      it 'to set the right input value' do
+        item = mock('item')
+        item.should_not_receive(:id)
+        item.stub!(:custom_value).and_return('custom_value')
+        item.should_receive(:custom_value).exactly(3).times
+        @new_post.author.should_receive(:custom_value)
+        @form = semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:author, :as => :check_boxes, :value_method => :custom_value, :collection => [item, item, item]))
+        end
+
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag('input[@type=checkbox][@value="custom_value"]', :count => 3)
+      end
+    end
+  end
+
 end
 
diff --git a/spec/support/custom_macros.rb b/spec/support/custom_macros.rb
index eeb7e59b1..466f08aed 100644
--- a/spec/support/custom_macros.rb
+++ b/spec/support/custom_macros.rb
@@ -435,7 +435,7 @@ def it_should_use_the_collection_when_provided(as, countable)
 
             describe "when the collection objects respond to #{label_method}" do
               before do
-                @fred.stub!(:respond_to?).and_return { |m| m.to_s == label_method }
+                @fred.stub!(:respond_to?).and_return { |m| m.to_s == label_method || m.to_s == 'id' }
                 ::Author.find(:all).each { |a| a.stub!(label_method).and_return('The Label Text') }
 
                 @form = semantic_form_for(@new_post) do |builder|

From 7b5ed06b6207439fe6e3a23ae36b6af2dcaca3b0 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Tue, 3 Aug 2010 23:16:46 +0200
Subject: [PATCH 172/992] Output the hidden field for the check_boxes
 collection before the ordered list containing the choices. This avoids having
 an additional listitem which only contains the hidden field.

---
 lib/formtastic.rb                     | 18 ++++++++----------
 spec/inputs/check_boxes_input_spec.rb |  9 +++++++--
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 94d854660..ade8f7ebd 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1168,9 +1168,7 @@ def check_boxes_input(method, options)
 
         li_options = value_as_class ? { :class => [method.to_s.singularize, 'default'].join('_') } : {}
 
-        list_item_content = []
-        list_item_content << self.create_hidden_field_for_check_boxes(input_name, value_as_class) unless hidden_fields
-        list_item_content << collection.map do |c|
+        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)
@@ -1189,12 +1187,12 @@ def check_boxes_input(method, options)
           template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
         end
 
-        template.content_tag(:fieldset,
-          template.content_tag(:legend, 
-            template.label_tag(nil, localized_string(method, options[:label], :label) || humanized_attribute_name(method), :for => nil), :class => :label
-          ) << 
-          template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
+        fieldset_content = template.content_tag(:legend,
+          template.label_tag(nil, localized_string(method, options[:label], :label) || humanized_attribute_name(method), :for => nil), :class => :label
         )
+        fieldset_content << self.create_hidden_field_for_check_boxes(input_name, value_as_class) unless hidden_fields
+        fieldset_content << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
+        template.content_tag(:fieldset, fieldset_content)
       end
 
       # Used by check_boxes input. The selected values will be set either by:
@@ -1220,9 +1218,9 @@ def find_selected_values_for_column(method, options)
       
       # Outputs a custom hidden field for check_boxes
       def create_hidden_field_for_check_boxes(method, value_as_class) #:nodoc:
-        li_options = value_as_class ? { :class => [method.to_s.singularize, 'default'].join('_') } : {}
+        options = value_as_class ? { :class => [method.to_s.singularize, 'default'].join('_') } : {}
         input_name = "#{object_name}[#{method.to_s}][]"
-        template.content_tag(:li, template.hidden_field_tag(input_name, ''), li_options)
+        template.hidden_field_tag(input_name, '', options)
       end
 
       # Outputs a checkbox tag. If called with no_hidden_input = true a plain check_box_tag is returned,
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 27a5744a3..7c133bfe7 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -77,12 +77,17 @@
 
       it 'should have a hidden field with an empty array value for the collection to allow clearing of all checkboxes' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag("form li fieldset ol li input[@type=hidden][@name='author[post_ids][]'][@value='']", :count => 1)
+        output_buffer.should have_tag("form li fieldset > input[@type=hidden][@name='author[post_ids][]'][@value='']", :count => 1)
+      end
+
+      it 'the hidden field with an empty array value should be followed by the ol' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag("form li fieldset > input[@type=hidden][@name='author[post_ids][]'][@value=''] + ol", :count => 1)
       end
 
       it 'should not have a hidden field with an empty string value for the collection' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should_not have_tag("form li fieldset ol li input[@type=hidden][@name='author[post_ids]'][@value='']", :count => 1)
+        output_buffer.should_not have_tag("form li fieldset > input[@type=hidden][@name='author[post_ids]'][@value='']", :count => 1)
       end
 
       it 'should have a checkbox and a hidden field for each post with :hidden_field => true' do

From 89db185f506197856237abd2c4f52de25ca98455 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 6 Aug 2010 10:40:37 +1000
Subject: [PATCH 173/992] ensure rails gem dependency is < 3.0

---
 Rakefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Rakefile b/Rakefile
index 621490c73..67e3c4322 100644
--- a/Rakefile
+++ b/Rakefile
@@ -53,8 +53,8 @@ begin
     
     # 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'
+    s.add_dependency 'activesupport', '>= 2.3.0', '< 3.0.0'
+    s.add_dependency 'actionpack', '>= 2.3.0', '< 3.0.0'
     s.add_dependency 'i18n', '< 0.4'
     
     # Development dependencies. Not installed by default.

From a35c7a53c954d2a69ef671a721d1301ff9af3337 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <m.jonuschat@gute-botschafter.de>
Date: Fri, 6 Aug 2010 08:31:25 +0200
Subject: [PATCH 174/992] Fix for already initialized constant (rails3) and
 rails/init.rb [GH-328]

---
 Rakefile           | 2 +-
 formtastic.gemspec | 9 ++++++---
 init.rb            | 6 +++++-
 rails/init.rb      | 5 +----
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Rakefile b/Rakefile
index bd7ea660a..23e18f159 100644
--- a/Rakefile
+++ b/Rakefile
@@ -55,7 +55,7 @@ begin
     s.post_install_message = INSTALL_MESSAGE
     
     s.require_path = 'lib'
-    s.files = %w(MIT-LICENSE README.textile Rakefile) + Dir.glob("{rails,lib,generators,spec}/**/*")
+    s.files = %w(MIT-LICENSE README.textile Rakefile init.rb) + 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.
diff --git a/formtastic.gemspec b/formtastic.gemspec
index 9b39ee71f..ec2af6d0e 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin French"]
-  s.date = %q{2010-08-01}
+  s.date = %q{2010-08-06}
   s.description = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.email = %q{justin@indent.com.au}
   s.extra_rdoc_files = [
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
      "generators/formtastic/templates/formtastic.rb",
      "generators/formtastic/templates/formtastic_changes.css",
      "generators/formtastic_stylesheets/formtastic_stylesheets_generator.rb",
+     "init.rb",
      "lib/formtastic.rb",
      "lib/formtastic/i18n.rb",
      "lib/formtastic/layout_helper.rb",
@@ -80,10 +81,12 @@ Gem::Specification.new do |s|
   ------------------------------------------------------------------------
   You can now (optionally) run the generator to copy some stylesheets and
   a config initializer into your application:
-    ./script/generate formtastic
+    rails generator formastic:install # Rails 3
+    ./script/generate formtastic      # Rails 2
 
   To generate some semantic form markup for your existing models, just run:
-    ./script/generate form MODEL_NAME
+    rails generate formtastic:form MODEL_NAME # Rails 3
+    ./script/generate form MODEL_NAME         # Rails 2
 
   Find out more and get involved:
     http://github.com/justinfrench/formtastic
diff --git a/init.rb b/init.rb
index 41a097dc9..df91e4194 100644
--- a/init.rb
+++ b/init.rb
@@ -1 +1,5 @@
-require File.join(File.dirname(__FILE__), 'rails', 'init')
\ No newline at end of file
+# coding: utf-8
+require 'formtastic'
+require 'formtastic/layout_helper'
+ActionView::Base.send :include, Formtastic::SemanticFormHelper
+ActionView::Base.send :include, Formtastic::LayoutHelper
diff --git a/rails/init.rb b/rails/init.rb
index 1db466496..702edb564 100644
--- a/rails/init.rb
+++ b/rails/init.rb
@@ -1,5 +1,2 @@
 # coding: utf-8
-require File.join(File.dirname(__FILE__), *%w[.. lib formtastic])
-require File.join(File.dirname(__FILE__), *%w[.. lib formtastic layout_helper])
-ActionView::Base.send :include, Formtastic::SemanticFormHelper
-ActionView::Base.send :include, Formtastic::LayoutHelper
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "init"))

From d1009b27961a98160253a44a2c743a851c77347b Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Sat, 7 Aug 2010 14:05:45 +0200
Subject: [PATCH 175/992] Use ActiveRecord Query Interface 3.0 to merge
 conditions

---
 lib/formtastic.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index ade8f7ebd..e9f0e011f 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1484,9 +1484,13 @@ def find_raw_collection_for_column(column, options) #:nodoc:
           options[:find_options] ||= {}
 
           if conditions = reflection.options[:conditions]
-            options[:find_options][:conditions] = reflection.klass.merge_conditions(conditions, options[:find_options][:conditions])
+            if defined?(ActiveRecord::Base.merge_conditions)
+              options[:find_options][:conditions] = reflection.klass.merge_conditions(conditions, options[:find_options][:conditions])
+              reflection.klass.find(:all, options[:find_options])
+            elsif reflection.klass.respond_to?(:where)
+              reflection.klass.where(conditions).where(options[:find_options][:conditions])
+            end
           end
-          reflection.klass.find(:all, options[:find_options])
         else
           create_boolean_collection(options)
         end

From ea4b0c4ed0de030035671ac727d4822fe2d2cb12 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sat, 7 Aug 2010 16:23:17 -0300
Subject: [PATCH 176/992] Look for merge_conditions on reflection.klass and not
 on ActiveRecord::Base

---
 lib/formtastic.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index e9f0e011f..c0a797397 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1484,7 +1484,7 @@ def find_raw_collection_for_column(column, options) #:nodoc:
           options[:find_options] ||= {}
 
           if conditions = reflection.options[:conditions]
-            if defined?(ActiveRecord::Base.merge_conditions)
+            if reflection.klass.respond_to?(:merge_conditions)
               options[:find_options][:conditions] = reflection.klass.merge_conditions(conditions, options[:find_options][:conditions])
               reflection.klass.find(:all, options[:find_options])
             elsif reflection.klass.respond_to?(:where)

From 5a4fc60e5713c4080b04e5a365b2302f0caf2e17 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sat, 7 Aug 2010 16:24:09 -0300
Subject: [PATCH 177/992] Otherwise will be Rails 3

---
 lib/formtastic.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index c0a797397..41cc3117a 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1487,7 +1487,7 @@ def find_raw_collection_for_column(column, options) #:nodoc:
             if reflection.klass.respond_to?(:merge_conditions)
               options[:find_options][:conditions] = reflection.klass.merge_conditions(conditions, options[:find_options][:conditions])
               reflection.klass.find(:all, options[:find_options])
-            elsif reflection.klass.respond_to?(:where)
+            else
               reflection.klass.where(conditions).where(options[:find_options][:conditions])
             end
           end

From d66084a62b19e5016bc44369a55f8ae477d152f1 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sat, 7 Aug 2010 16:24:37 -0300
Subject: [PATCH 178/992] Remove deprecated find(:all) in favor of all

---
 lib/formtastic.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 41cc3117a..82f613410 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1486,7 +1486,7 @@ def find_raw_collection_for_column(column, options) #:nodoc:
           if conditions = reflection.options[:conditions]
             if reflection.klass.respond_to?(:merge_conditions)
               options[:find_options][:conditions] = reflection.klass.merge_conditions(conditions, options[:find_options][:conditions])
-              reflection.klass.find(:all, options[:find_options])
+              reflection.klass.all(options[:find_options])
             else
               reflection.klass.where(conditions).where(options[:find_options][:conditions])
             end

From ec0cdb42592eacb27b2619cc4e32ed2db22428ff Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sat, 7 Aug 2010 16:26:08 -0300
Subject: [PATCH 179/992] We should send all records when dev do not set
 conditions

---
 lib/formtastic.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 82f613410..2b4d9fb08 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1490,6 +1490,8 @@ def find_raw_collection_for_column(column, options) #:nodoc:
             else
               reflection.klass.where(conditions).where(options[:find_options][:conditions])
             end
+          else
+            reflection.klass.all
           end
         else
           create_boolean_collection(options)

From 2f279755c2537fdc0c6af3a932a0b96090813237 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Sat, 7 Aug 2010 23:27:30 +0200
Subject: [PATCH 180/992] Fix testsuite to match use of :all.

One test is still failing, checking to see if :all supports :include syntax
---
 spec/inputs/select_input_spec.rb | 6 +++---
 spec/spec_helper.rb              | 2 ++
 spec/support/custom_macros.rb    | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index ff3edb18e..4e2249d5c 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -188,7 +188,7 @@
 
     it "should call author.find with association conditions" do
       ::Author.should_receive(:merge_conditions).with({:active => true}, nil).and_return(:active => true)
-      ::Author.should_receive(:find).with(:all, :conditions => {:active => true})
+      ::Author.should_receive(:all).with(:conditions => {:active => true})
 
       semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select))
@@ -197,7 +197,7 @@
 
     it "should call author.find with association conditions and find_options conditions" do
       ::Author.should_receive(:merge_conditions).with({:active => true}, {:publisher => true}).and_return(:active => true, :publisher => true)
-      ::Author.should_receive(:find).with(:all, :conditions => {:active => true, :publisher => true})
+      ::Author.should_receive(:all).with(:conditions => {:active => true, :publisher => true})
 
       semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select, :find_options => {:conditions => {:publisher => true}}))
@@ -259,7 +259,7 @@
     end
     
     it 'should call find with :include for more optimized queries' do
-      Author.should_receive(:find).with(:all, :include => :continent)
+      Author.should_receive(:all).with(:include => :continent)
 
       semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select, :group_by => :continent ) )
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 5539438d8..3c6b22ab1 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -151,6 +151,7 @@ def new_author_path; "/authors/new"; end
     
 
     ::Author.stub!(:find).and_return([@fred, @bob])
+    ::Author.stub!(:all).and_return([@fred, @bob])
     ::Author.stub!(:to_ary)
     ::Author.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     ::Author.stub!(:human_name).and_return('::Author')
@@ -215,6 +216,7 @@ def new_author_path; "/authors/new"; end
       
     end
     ::Post.stub!(:find).and_return([@freds_post])
+    ::Post.stub!(:all).and_return([@freds_post])
     ::Post.stub!(:content_columns).and_return([mock('column', :name => 'title'), mock('column', :name => 'body'), mock('column', :name => 'created_at')])
     ::Post.stub!(:to_key).and_return(nil)
     ::Post.stub!(:persisted?).and_return(nil)
diff --git a/spec/support/custom_macros.rb b/spec/support/custom_macros.rb
index 466f08aed..b4c5ff386 100644
--- a/spec/support/custom_macros.rb
+++ b/spec/support/custom_macros.rb
@@ -244,7 +244,7 @@ def it_should_apply_error_logic_for_input_type(type)
     
     def it_should_call_find_on_association_class_when_no_collection_is_provided(as)
       it "should call find on the association class when no collection is provided" do
-        ::Author.should_receive(:find)
+        ::Author.should_receive(:all)
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:author, :as => as))
         end

From a53315a0d3fd1d6134ccb4eb1b56371fa2a9e8d8 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Sat, 7 Aug 2010 23:33:43 +0200
Subject: [PATCH 181/992] Respect :find_options even when no conditions have
 been set

---
 lib/formtastic.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 2b4d9fb08..0a8d13e42 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1491,7 +1491,7 @@ def find_raw_collection_for_column(column, options) #:nodoc:
               reflection.klass.where(conditions).where(options[:find_options][:conditions])
             end
           else
-            reflection.klass.all
+            reflection.klass.all(options[:find_options])
           end
         else
           create_boolean_collection(options)

From 214135dc740ec060b461ca8423cf60e9d117a23f Mon Sep 17 00:00:00 2001
From: coreyhaines <coreyhaines@gmail.com>
Date: Sat, 7 Aug 2010 17:18:34 -0400
Subject: [PATCH 182/992] Fix issue #331, :label=>false on
 checkboxes/radiobuttons

---
 lib/formtastic.rb                     | 17 ++++++++++-------
 spec/inputs/check_boxes_input_spec.rb | 15 +++++++++++++++
 spec/inputs/radio_input_spec.rb       | 15 +++++++++++++++
 3 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 0a8d13e42..32ddd13f9 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -907,10 +907,7 @@ def radio_input(method, options)
         end
         
         template.content_tag(:fieldset,
-          template.content_tag(:legend, 
-            template.label_tag(nil, localized_string(method, options[:label], :label) || humanized_attribute_name(method), :for => nil), :class => :label
-          ) << 
-          template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
+          legend_tag(method, options) << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
         )
       end
       alias :boolean_radio_input :radio_input
@@ -1187,9 +1184,7 @@ def check_boxes_input(method, options)
           template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
         end
 
-        fieldset_content = template.content_tag(:legend,
-          template.label_tag(nil, localized_string(method, options[:label], :label) || humanized_attribute_name(method), :for => nil), :class => :label
-        )
+        fieldset_content = legend_tag(method, options)
         fieldset_content << self.create_hidden_field_for_check_boxes(input_name, value_as_class) unless hidden_fields
         fieldset_content << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
         template.content_tag(:fieldset, fieldset_content)
@@ -1409,6 +1404,14 @@ def field_set_and_list_wrapping_for_method(method, options, contents) #:nodoc:
           )
       end
 
+      # Generates the legend for radiobuttons and checkboxes
+      def legend_tag(method, options = {})
+        (options[:label] == false) ? "" : template.content_tag(:legend, 
+            template.label_tag(nil, localized_string(method, options[:label], :label) || humanized_attribute_name(method), :for => nil), :class => :label
+          )
+      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
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 7c133bfe7..35c945695 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -356,6 +356,21 @@
         output_buffer.should have_tag("legend.label label", /The authors/)
       end
     end
+
+    describe "when :label option is false" do
+      before do
+        @output_buffer = ''
+        @new_post.stub!(:author_ids).and_return(nil)
+        @form = semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:authors, :as => :check_boxes, :label => false))
+        end
+      end
+
+      it "should not output the legend" do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.should_not have_tag("legend.label")
+      end
+    end
   end
 
   describe 'for a has_and_belongs_to_many association' do
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 7184f42e2..20fd9bf1b 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -225,4 +225,19 @@
       output_buffer.should have_tag("legend.label label", /The authors/)
     end
   end
+
+  describe "when :label option is false" do
+    before do
+      @output_buffer = ''
+      @new_post.stub!(:author_ids).and_return(nil)
+      @form = semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:authors, :as => :radio, :label => false))
+      end
+    end
+
+    it "should not output the legend" do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.should_not have_tag("legend.label")
+    end
+  end
 end

From d8df6bf7d0067f6063bb23aa5bb648828ff4923a Mon Sep 17 00:00:00 2001
From: coreyhaines <coreyhaines@gmail.com>
Date: Sat, 7 Aug 2010 17:18:34 -0400
Subject: [PATCH 183/992] Fix issue #331, :label=>false on
 checkboxes/radiobuttons

---
 lib/formtastic.rb                     | 21 +++++++++++----------
 spec/inputs/check_boxes_input_spec.rb | 14 ++++++++++++++
 spec/inputs/radio_input_spec.rb       | 14 ++++++++++++++
 3 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 96fddfb94..c582ee539 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -887,10 +887,7 @@ def radio_input(method, options)
         end
         
         template.content_tag(:fieldset,
-          template.content_tag(:legend, 
-            template.label_tag(nil, localized_string(method, options[:label], :label) || humanized_attribute_name(method), :for => nil), :class => :label
-          ) << 
-          template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
+          legend_tag(method, options) << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
         )
       end
       alias :boolean_radio_input :radio_input
@@ -1158,12 +1155,9 @@ def check_boxes_input(method, options)
           template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
         end
 
-        template.content_tag(:fieldset,
-          template.content_tag(:legend, 
-            template.label_tag(nil, localized_string(method, options[:label], :label) || humanized_attribute_name(method), :for => nil), :class => :label
-          ) << 
-          template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
-        )
+        fieldset_content = legend_tag(method, options)
+        fieldset_content << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
+        template.content_tag(:fieldset, fieldset_content)
       end
 
       # Outputs a country select input, wrapping around a regular country_select helper. 
@@ -1345,6 +1339,13 @@ def field_set_and_list_wrapping_for_method(method, options, contents) #:nodoc:
           )
       end
 
+      # Generates the legend for radiobuttons and checkboxes
+      def legend_tag(method, options = {})
+        (options[:label] == false) ? "" : template.content_tag(:legend, 
+            template.label_tag(nil, localized_string(method, options[:label], :label) || humanized_attribute_name(method), :for => nil), :class => :label
+          )
+      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
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index cbcd22868..65bc19ab0 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -277,6 +277,20 @@
         output_buffer.should have_tag("legend.label label", /The authors/)
       end
     end
+
+    describe "when :label option is false" do
+      before do
+        @output_buffer = ''
+        @new_post.stub!(:author_ids).and_return(nil)
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:authors, :as => :check_boxes, :label => false, :morton => true))
+        end
+      end
+
+      it "should not output the legend" do
+        output_buffer.should_not have_tag("legend.label")
+      end
+    end
   end
 end
 
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 8a6a0d688..34ceb4813 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -207,4 +207,18 @@
       output_buffer.should have_tag("legend.label label", /The authors/)
     end
   end
+
+  describe "when :label option is false" do
+    before do
+      @output_buffer = ''
+      @new_post.stub!(:author_ids).and_return(nil)
+      semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:authors, :as => :radio, :label => false))
+      end
+    end
+
+    it "should not output the legend" do
+      output_buffer.should_not have_tag("legend.label")
+    end
+  end
 end

From 084ce3bd059ff30496771c27a825c1b54ec2d3cb Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Sun, 8 Aug 2010 16:39:29 +0200
Subject: [PATCH 184/992] Return a html_safe buffer when :label => false

---
 lib/formtastic.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 32ddd13f9..4e7824e5d 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1406,7 +1406,7 @@ def field_set_and_list_wrapping_for_method(method, options, contents) #:nodoc:
 
       # Generates the legend for radiobuttons and checkboxes
       def legend_tag(method, options = {})
-        (options[:label] == false) ? "" : template.content_tag(:legend, 
+        (options[:label] == false) ? Formtastic::Util.html_safe("") : template.content_tag(:legend, 
             template.label_tag(nil, localized_string(method, options[:label], :label) || humanized_attribute_name(method), :for => nil), :class => :label
           )
       end

From 75aafcd43367772d71b5b9107d991074dc4bcb89 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Sun, 8 Aug 2010 16:39:29 +0200
Subject: [PATCH 185/992] Return a html_safe buffer when :label => false

---
 lib/formtastic.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index c582ee539..2202778f8 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1341,7 +1341,7 @@ def field_set_and_list_wrapping_for_method(method, options, contents) #:nodoc:
 
       # Generates the legend for radiobuttons and checkboxes
       def legend_tag(method, options = {})
-        (options[:label] == false) ? "" : template.content_tag(:legend, 
+        (options[:label] == false) ? Formtastic::Util.html_safe("") : template.content_tag(:legend, 
             template.label_tag(nil, localized_string(method, options[:label], :label) || humanized_attribute_name(method), :for => nil), :class => :label
           )
       end

From 729a1d99d4205ba221978f2db6681b62d2a4911b Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 9 Aug 2010 16:36:17 +1000
Subject: [PATCH 186/992] catch-up changelong

---
 CHANGELOG | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 3f189afd9..76a1824d6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,12 @@
+1.0.0.rc2
+
+* Fixed that :label=>false didn't disable the label on checkboxes/radiobuttons (#331)
+* Added full support of :input_html options for hidden fields
+
+1.0.0.rc
+
+* Fixed that :checked_value and :unchecked_value options were being passed down into the HTML tags as attributes 
+
 1.0.0.beta4
 
 * ensure i18n < 0.4 is listed as a dependency in the gemspec

From 8a856345f06c6e42f1bd952c71edd7f54721ae66 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 9 Aug 2010 16:36:47 +1000
Subject: [PATCH 187/992] version bump to rc2

---
 VERSION.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION.yml b/VERSION.yml
index 0b3c65b1a..0a4ce9fc3 100644
--- a/VERSION.yml
+++ b/VERSION.yml
@@ -2,4 +2,4 @@
 :major: 1
 :minor: 0
 :patch: 0
-:build: rc
+:build: rc2

From b9fc1c41200bddb4fc7b63a01573de43191125e3 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 9 Aug 2010 16:37:12 +1000
Subject: [PATCH 188/992] new gemspec

---
 formtastic.gemspec | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 5ceed2147..3a19de969 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formtastic}
-  s.version = "1.0.0.rc"
+  s.version = "1.0.0.rc2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin French"]
-  s.date = %q{2010-08-01}
+  s.date = %q{2010-08-09}
   s.description = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.email = %q{justin@indent.com.au}
   s.extra_rdoc_files = [
@@ -129,21 +129,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.0"])
-      s.add_runtime_dependency(%q<actionpack>, [">= 2.3.0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.0", "< 3.0.0"])
+      s.add_runtime_dependency(%q<actionpack>, [">= 2.3.0", "< 3.0.0"])
       s.add_runtime_dependency(%q<i18n>, ["< 0.4"])
       s.add_development_dependency(%q<rspec-rails>, [">= 1.2.6"])
       s.add_development_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
     else
-      s.add_dependency(%q<activesupport>, [">= 2.3.0"])
-      s.add_dependency(%q<actionpack>, [">= 2.3.0"])
+      s.add_dependency(%q<activesupport>, [">= 2.3.0", "< 3.0.0"])
+      s.add_dependency(%q<actionpack>, [">= 2.3.0", "< 3.0.0"])
       s.add_dependency(%q<i18n>, ["< 0.4"])
       s.add_dependency(%q<rspec-rails>, [">= 1.2.6"])
       s.add_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 2.3.0"])
-    s.add_dependency(%q<actionpack>, [">= 2.3.0"])
+    s.add_dependency(%q<activesupport>, [">= 2.3.0", "< 3.0.0"])
+    s.add_dependency(%q<actionpack>, [">= 2.3.0", "< 3.0.0"])
     s.add_dependency(%q<i18n>, ["< 0.4"])
     s.add_dependency(%q<rspec-rails>, [">= 1.2.6"])
     s.add_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])

From 2f381ba07e6e50cd184c63bad4a939ce34151193 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 9 Aug 2010 17:07:30 +1000
Subject: [PATCH 189/992] Changed CSS to work better with HTML4/5:

* changed styles to clear containing floats on fieldsets and list items with a more modern clearing technique that doesn't rely on XHTML attributes on the HTML tag
* removed a double declaration that's no longer required now that the xmlns rules are removed

Checked in IE7/8, FF3.6 & Safari 5. The overflow technique should work in pretty much everything except IE6. Add zoom:1; for IE6 support.
---
 .../formtastic/templates/formtastic.css       | 21 +++----------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/generators/formtastic/templates/formtastic.css b/generators/formtastic/templates/formtastic.css
index a64a16451..805138393 100644
--- a/generators/formtastic/templates/formtastic.css
+++ b/generators/formtastic/templates/formtastic.css
@@ -30,28 +30,16 @@ form.formtastic ul.errors li { padding:0; border:none; display:list-item; }
 
 /* FIELDSETS & LISTS
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset { }
+form.formtastic fieldset { overflow:auto; } /* clearing contained floats */
 form.formtastic fieldset.inputs { }
 form.formtastic fieldset.buttons { padding-left:25%; }
 form.formtastic fieldset ol { }
 form.formtastic fieldset.buttons li { float:left; padding-right:0.5em; }
 
-/* clearfixing the fieldsets */
-form.formtastic fieldset { display: inline-block; }
-form.formtastic fieldset:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
-html[xmlns] form.formtastic fieldset { display: block; }
-* html form.formtastic fieldset { height: 1%; }
-
-
 /* INPUT LIs
 --------------------------------------------------------------------------------------------------*/
 form.formtastic fieldset > ol > li { margin-bottom:1.5em; }
-
-/* clearfixing the li's */
-form.formtastic fieldset > ol > li { display: inline-block; }
-form.formtastic fieldset > ol > li:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
-html[xmlns] form.formtastic fieldset > ol > li { display: block; }
-* html form.formtastic fieldset > ol > li { height: 1%; }
+form.formtastic fieldset > ol > li { overflow:auto; } /* clearing contained floats */
 
 form.formtastic fieldset > ol > li.required { }
 form.formtastic fieldset > ol > li.optional { }
@@ -100,11 +88,8 @@ form.formtastic fieldset > ol > li.text textarea { width:74%; }
 
 
 /* HIDDEN OVERRIDES
-The dual declarations are required because of our clearfix display hack on the LIs, which is more
-specific than the more general rule below. TODO: Revist the clearing hack and this rule.
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset ol li.hidden,
-html[xmlns] form.formtastic fieldset ol li.hidden { display:none; }
+form.formtastic fieldset ol li.hidden { display:none; }
 
 /* BOOLEAN OVERRIDES
 --------------------------------------------------------------------------------------------------*/

From eab18fa1fc7915d82815a8c4779ad0cd7b882541 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 12 Aug 2010 08:49:43 +1000
Subject: [PATCH 190/992] prep README for 1.0

---
 README.textile | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/README.textile b/README.textile
index 029f831d7..e2ffe36b9 100644
--- a/README.textile
+++ b/README.textile
@@ -79,7 +79,7 @@ RDoc documentation _should_ be automatically generated after each commit and mad
 
 h2. A Note About Rails 3 Support
 
-Formtastic 1.0 will only support the latest stable Rails 2.x. We're maintaining a rails3 branch which aims to provide both Rails 2.x and 3.x support, which is targeted for the 1.1 release soon after 1.0, around the same time Rails 3.0 ships.
+Formtastic 1.0 only supports the latest stable Rails 2.x. We're maintaining a rails3 branch which aims to provide both Rails 2.x and 3.x support, which is targeted for the 1.1 release around the same time Rails 3.0 final ships.
 
 If you have a Rails 3 project and would like to use Formtastic's rails3 branch, bundler provides you with the ability to do this easily. Just add Formtastic as a git dependency in your Gemfile with the :branch option:
 
@@ -98,12 +98,6 @@ Install the Formtastic gem:
   sudo gem install formtastic
 </pre>
 
-Or try the 1.0.0.beta2:
-
-<pre>
-  sudo gem install formtastic --pre
-</pre>
-
 And add it to your environment.rb configuration as a gem dependency:
 
 <pre>
@@ -540,7 +534,7 @@ Formtastic::SemanticFormBuilder.escape_html_entities_in_hints_and_labels = false
 
 h2. Focus
 
-Formtastic is close to shipping a 1.0 release candidate after more than a year of active development. 1.0 will be compatible with Rails 2, and this is our top priority right now. We've also been working hard on a Rails 2 *and* 3 compatible version in the rails3 branch, targeting a 1.1 release shortly after Rails 3.0 ships.
+Formtastic 1.0 is compatible with Rails 2.x *only*. We've also been working hard on a Rails 2 *and* 3 compatible version in the rails3 branch, targeting a 1.1 release shortly after Rails 3.0 final ships.
 
 There's heaps more we want to do, but we have to do this first.
 
@@ -558,7 +552,7 @@ h2. Compatibility
 
 * We're only testing Formtastic with the latest Rails 2.x stable release. Patches are welcome to allow backwards compatibility with older versions of Rails, of course.
 * Development of a Rails 2 *and* 3 compatible version of Formtastic is underway in the rails3 branch, targeting a Formtastic 1.1 release shortly after Rails 3.0 ships.
-* Formtastic, much like Rails 2, is very ActiveRecord-centric. Many people are using Formtastic (especially the rails3 branch) successfully with other ActiveModel-like ORMs and classes (DataMapper, MongoMapper, Mongoid, Authlogic, Devise...) but we're not guaranteeing anything at this stage. Patches are welcome, but it's not our core focus right now. Shipping a solid 1.0 and Rails 3 compatible 1.1 is. 
+* Formtastic, much like Rails 2, is very ActiveRecord-centric. Many people are using Formtastic (especially the rails3 branch) successfully with other ActiveModel-like ORMs and classes (DataMapper, MongoMapper, Mongoid, Authlogic, Devise...) but we're not guaranteeing anything at this stage. Patches are welcome, but it's not our core focus right now.
  
 
 h2. How to contribute

From c42d463b87d80a725c28e43c5fec61ee6486e4ca Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 12 Aug 2010 08:49:32 +1000
Subject: [PATCH 191/992] version bump to 1.0.0, at last

---
 VERSION.yml        | 2 +-
 formtastic.gemspec | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/VERSION.yml b/VERSION.yml
index 0a4ce9fc3..cb312ad43 100644
--- a/VERSION.yml
+++ b/VERSION.yml
@@ -2,4 +2,4 @@
 :major: 1
 :minor: 0
 :patch: 0
-:build: rc2
+:build: 
diff --git a/formtastic.gemspec b/formtastic.gemspec
index 3a19de969..7e0b00608 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formtastic}
-  s.version = "1.0.0.rc2"
+  s.version = "1.0.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin French"]
-  s.date = %q{2010-08-09}
+  s.date = %q{2010-08-12}
   s.description = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.email = %q{justin@indent.com.au}
   s.extra_rdoc_files = [

From 7f0bc84f12f6e92b74dc43ec08a6e303de5efcbd Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 12 Aug 2010 08:55:04 +1000
Subject: [PATCH 192/992] CHANGELOG catch-up

---
 CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 76a1824d6..4acf76f67 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+1.0.0
+
+* nothing changed from rc2
+
 1.0.0.rc2
 
 * Fixed that :label=>false didn't disable the label on checkboxes/radiobuttons (#331)

From 6eeb35f547a451c76ec7b69347f733d534b735c8 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 16 Aug 2010 18:18:20 +1000
Subject: [PATCH 193/992] Simplified the require statements in rails/init.rb to
 avoid "already initialized constant" warnings.

I think Rails loads the init before lib/formtastic.rb (which requires lib/formtastic.rb). When the Rails process later loads lib/formtastic.rb, the warnings happen. For some reason, simplifying these requires has avoided the warnings. Tested under Rails 2.3.8.
---
 rails/init.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rails/init.rb b/rails/init.rb
index 1db466496..67e2d091e 100644
--- a/rails/init.rb
+++ b/rails/init.rb
@@ -1,5 +1,7 @@
 # coding: utf-8
-require File.join(File.dirname(__FILE__), *%w[.. lib formtastic])
-require File.join(File.dirname(__FILE__), *%w[.. lib formtastic layout_helper])
+require 'formtastic'
+require 'formtastic/layout_helper'
+
 ActionView::Base.send :include, Formtastic::SemanticFormHelper
 ActionView::Base.send :include, Formtastic::LayoutHelper
+

From c8edb04c5235a33d3bf0d248259c9a645e10fd03 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 16 Aug 2010 18:18:20 +1000
Subject: [PATCH 194/992] Simplified the require statements in rails/init.rb to
 avoid "already initialized constant" warnings.

I think Rails loads the init before lib/formtastic.rb (which requires lib/formtastic.rb). When the Rails process later loads lib/formtastic.rb, the warnings happen. For some reason, simplifying these requires has avoided the warnings. Tested under Rails 2.3.8.
---
 rails/init.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rails/init.rb b/rails/init.rb
index 1db466496..67e2d091e 100644
--- a/rails/init.rb
+++ b/rails/init.rb
@@ -1,5 +1,7 @@
 # coding: utf-8
-require File.join(File.dirname(__FILE__), *%w[.. lib formtastic])
-require File.join(File.dirname(__FILE__), *%w[.. lib formtastic layout_helper])
+require 'formtastic'
+require 'formtastic/layout_helper'
+
 ActionView::Base.send :include, Formtastic::SemanticFormHelper
 ActionView::Base.send :include, Formtastic::LayoutHelper
+

From 3e163b3ed26d3a5a1d1d9de3ced65ed7ac703404 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 22 Aug 2010 09:44:09 +1000
Subject: [PATCH 195/992] Version bump to 1.0.1

---
 VERSION.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION.yml b/VERSION.yml
index cb312ad43..c06bc0783 100644
--- a/VERSION.yml
+++ b/VERSION.yml
@@ -1,5 +1,5 @@
 --- 
 :major: 1
 :minor: 0
-:patch: 0
 :build: 
+:patch: 1

From 0f88bdbe3da3b8bb9efee56bd92c83010f51f8fd Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 22 Aug 2010 09:44:57 +1000
Subject: [PATCH 196/992] new gemspec

---
 formtastic.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 7e0b00608..0d2b78433 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formtastic}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin French"]
-  s.date = %q{2010-08-12}
+  s.date = %q{2010-08-22}
   s.description = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.email = %q{justin@indent.com.au}
   s.extra_rdoc_files = [

From b288b1071b9751eb00f6c76764e608ec97d8a74d Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 22 Aug 2010 09:50:39 +1000
Subject: [PATCH 197/992] CHANGELOG update

---
 CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 4acf76f67..1592a6b52 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+1.0.1
+
+* fixed "already initialised constant" warnings on boot
+
 1.0.0
 
 * nothing changed from rc2

From f9549772cfdcd8c4da507c08a62415582ee706f5 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 28 Aug 2010 14:29:58 +1000
Subject: [PATCH 198/992] added .rvmrc files to .gitiginore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 6bb82764e..4f1ff299d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ pkg
 *~
 *watchr.rb
 log/*
+.rvmrc

From 19770b6859cd367c1cdd7dba8f4d6ddf2e820b26 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 28 Aug 2010 14:34:27 +1000
Subject: [PATCH 199/992] version bump to 1.1.0.beta

---
 VERSION.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION.yml b/VERSION.yml
index c06bc0783..9add5ed60 100644
--- a/VERSION.yml
+++ b/VERSION.yml
@@ -1,5 +1,5 @@
 --- 
 :major: 1
-:minor: 0
-:build: 
-:patch: 1
+:minor: 1
+:patch: 0
+:build: beta

From eeba8d402721a3b3ae3c6e0d8f1b123fcae96b65 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 28 Aug 2010 14:34:45 +1000
Subject: [PATCH 200/992] new gemspec

---
 formtastic.gemspec | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 0be2d8eb8..4d3963b1b 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formtastic}
-  s.version = "1.0.1"
+  s.version = "1.1.0.beta"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin French"]
-  s.date = %q{2010-08-22}
+  s.date = %q{2010-08-28}
   s.description = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.email = %q{justin@indent.com.au}
   s.extra_rdoc_files = [
@@ -95,7 +95,7 @@ Gem::Specification.new do |s|
   }
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.test_files = [
     "spec/buttons_spec.rb",
@@ -138,7 +138,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.0"])
       s.add_runtime_dependency(%q<actionpack>, [">= 2.3.0"])
       s.add_runtime_dependency(%q<i18n>, [">= 0.4.0"])
@@ -150,7 +150,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<i18n>, [">= 0.4.0"])
       s.add_dependency(%q<rspec-rails>, [">= 1.2.6"])
       s.add_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
-      s.add_runtime_dependency(%q<i18n>, [">= 0.4.0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3.0"])

From 557f9295f078d1504452ca6d92ea25a37b9507c4 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 28 Aug 2010 15:15:54 +1000
Subject: [PATCH 201/992] updated README to reflect new 1.1.0.beta gem, etc

---
 README.textile | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/README.textile b/README.textile
index f49a9010a..47ca4f591 100644
--- a/README.textile
+++ b/README.textile
@@ -81,13 +81,25 @@ h2. A Note About Rails 3 Support
 
 Formtastic 1.0 only supports the latest stable Rails 2.x. We're maintaining a rails3 branch which aims to provide both Rails 2.x and 3.x support, which is targeted for the 1.1 release around the same time Rails 3.0 final ships.
 
-If you have a Rails 3 project and would like to use Formtastic's rails3 branch, bundler provides you with the ability to do this easily. Just add Formtastic as a git dependency in your Gemfile with the :branch option:
+A 1.1.0.beta gem is now available on RubyGems.org, so install that with the --pre option:
 
 <pre>
-  gem 'formtastic', :git => "http://github.com/justinfrench/formtastic.git", :branch => "rails3"
+  gem install formtastic --pre
 </pre>
 
-Please be aware that Rails 3 is still under heavy development (even in the later betas), as is Formtastic, so our rails3 branch is very much "on the edge", just like Rails. if you find issues, compatibility issues with Rails 2 or 3, please report an issue on Github.
+Or bundle it in your Gemfile:
+
+<pre>
+  gem 'formtastic', '1.1.0.beta'
+</pre>
+
+You can also live on the edge and track our rails3 branch in your Gemfile with the :git and :branch options:
+
+<pre>
+  gem 'formtastic', :git => "git://github.com/justinfrench/formtastic.git", :branch => "rails3"
+</pre>
+
+Please be aware that Rails 3 is still under heavy development (even in the RCs), as is Formtastic, so our beta gems and the rails3 branch is very much "on the edge", just like Rails. If you find compatibility issues with Rails 2 or 3, please report them on Github.
 
 
 h2. Installation under Rails 2.x

From 3223f577053c70873cb9fc7d2e37f64df5b31525 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 28 Aug 2010 15:15:54 +1000
Subject: [PATCH 202/992] updated README to reflect new 1.1.0.beta gem, etc

---
 README.textile | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/README.textile b/README.textile
index e2ffe36b9..9de7ed860 100644
--- a/README.textile
+++ b/README.textile
@@ -81,13 +81,25 @@ h2. A Note About Rails 3 Support
 
 Formtastic 1.0 only supports the latest stable Rails 2.x. We're maintaining a rails3 branch which aims to provide both Rails 2.x and 3.x support, which is targeted for the 1.1 release around the same time Rails 3.0 final ships.
 
-If you have a Rails 3 project and would like to use Formtastic's rails3 branch, bundler provides you with the ability to do this easily. Just add Formtastic as a git dependency in your Gemfile with the :branch option:
+A 1.1.0.beta gem is now available on RubyGems.org, so install that with the --pre option:
 
 <pre>
-  gem 'formtastic', :git => "http://github.com/justinfrench/formtastic.git", :branch => "rails3"
+  gem install formtastic --pre
 </pre>
 
-Please be aware that Rails 3 is still under heavy development (even in the later betas), as is Formtastic, so our rails3 branch is very much "on the edge", just like Rails. if you find issues, compatibility issues with Rails 2 or 3, please report an issue on Github.
+Or bundle it in your Gemfile:
+
+<pre>
+  gem 'formtastic', '1.1.0.beta'
+</pre>
+
+You can also live on the edge and track our rails3 branch in your Gemfile with the :git and :branch options:
+
+<pre>
+  gem 'formtastic', :git => "git://github.com/justinfrench/formtastic.git", :branch => "rails3"
+</pre>
+
+Please be aware that Rails 3 is still under heavy development (even in the RCs), as is Formtastic, so our beta gems and the rails3 branch is very much "on the edge", just like Rails. If you find compatibility issues with Rails 2 or 3, please report them on Github.
 
 
 h2. Installation under Rails 2.x

From 3459aad15b7c7c625a3be8b754498187ae0610e5 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 30 Aug 2010 14:54:16 +1000
Subject: [PATCH 203/992] changelog catch-up

---
 CHANGELOG | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 49f68a8b4..16df64fa3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
-(HEAD)
+1.1.0.beta [Specs passed against Rails 2.3.8, 3.0.0.rc & 3.0.0]
+
 * Changed semantic_remote_form_for to allow for unobstrusive javascript / :remote option (rails3)
 * Changed spec_helper to support Rails 2 with RSpec or Rails 3 with RSpec 2 environments
 * Changed Rakefile to initalize the correct testing framework for the enviroment

From 84fae8459e67988653faf9b8994c91ad03b9415d Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 30 Aug 2010 17:21:55 +1000
Subject: [PATCH 204/992] ignore .rvmrc

---
 .rvmrc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .rvmrc

diff --git a/.rvmrc b/.rvmrc
new file mode 100644
index 000000000..22faf2e8f
--- /dev/null
+++ b/.rvmrc
@@ -0,0 +1 @@
+rvm ruby-1.8.7-p249@formtastic-rails-3
\ No newline at end of file

From eb18854a187841f06b1626132005b0f0ef9f5282 Mon Sep 17 00:00:00 2001
From: Philippe Creux <pcreux@gmail.com>
Date: Tue, 31 Aug 2010 07:49:31 -0700
Subject: [PATCH 205/992] Add :first to the list of available options for
 inline errors

---
 generators/formtastic/templates/formtastic.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generators/formtastic/templates/formtastic.rb b/generators/formtastic/templates/formtastic.rb
index bb710efcc..4b9f5321b 100644
--- a/generators/formtastic/templates/formtastic.rb
+++ b/generators/formtastic/templates/formtastic.rb
@@ -24,7 +24,7 @@
 # Formtastic::SemanticFormBuilder.optional_string = "(optional)"
 
 # Set the way inline errors will be displayed.
-# Defaults to :sentence, valid options are :sentence, :list and :none
+# Defaults to :sentence, valid options are :sentence, :list, :first and :none
 # Formtastic::SemanticFormBuilder.inline_errors = :sentence
 
 # Set the method to call on label text to transform or format it for human-friendly

From 7ef8ca941cb7939ec9f54bd94f947d416d267540 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Wed, 1 Sep 2010 18:56:43 -0300
Subject: [PATCH 206/992] Ignore .rvmrc file

---
 .gitignore | 1 +
 .rvmrc     | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 .rvmrc

diff --git a/.gitignore b/.gitignore
index 6bb82764e..25025439e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .DS_Store
+.rvmrc
 coverage
 pkg
 *~
diff --git a/.rvmrc b/.rvmrc
deleted file mode 100644
index 22faf2e8f..000000000
--- a/.rvmrc
+++ /dev/null
@@ -1 +0,0 @@
-rvm ruby-1.8.7-p249@formtastic-rails-3
\ No newline at end of file

From f26e307619045da3ba296390c1e4f30c25806b54 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 2 Sep 2010 14:20:33 +1000
Subject: [PATCH 207/992] there's no additional documentation for that :)

---
 generators/formtastic/templates/formtastic.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generators/formtastic/templates/formtastic.rb b/generators/formtastic/templates/formtastic.rb
index bb710efcc..fe03b8efe 100644
--- a/generators/formtastic/templates/formtastic.rb
+++ b/generators/formtastic/templates/formtastic.rb
@@ -5,7 +5,7 @@
 # Formtastic::SemanticFormBuilder.default_text_area_height = 5
 
 # Should all fields be considered "required" by default?
-# Defaults to true, see ValidationReflection notes below.
+# Defaults to true.
 # Formtastic::SemanticFormBuilder.all_fields_required_by_default = true
 
 # Should select fields have a blank option/prompt by default?

From e42d256ebe7fdbd3881665d94ce54cf061a9186f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 2 Sep 2010 14:22:04 +1000
Subject: [PATCH 208/992] clarify that all_fields_required_by_default config is
 only applicable in Rails 2

---
 generators/formtastic/templates/formtastic.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/generators/formtastic/templates/formtastic.rb b/generators/formtastic/templates/formtastic.rb
index fe03b8efe..d5c9c6d60 100644
--- a/generators/formtastic/templates/formtastic.rb
+++ b/generators/formtastic/templates/formtastic.rb
@@ -5,6 +5,7 @@
 # Formtastic::SemanticFormBuilder.default_text_area_height = 5
 
 # Should all fields be considered "required" by default?
+# Rails 2 only, ignored by Rails 3 because it will never fall back to this default.
 # Defaults to true.
 # Formtastic::SemanticFormBuilder.all_fields_required_by_default = true
 

From a458c2b850f3fdad77038ad6992a6ee4a1962f5a Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 8 Sep 2010 15:35:23 +1000
Subject: [PATCH 209/992] changelog catch-up

---
 CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 16df64fa3..51e040e2c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+1.1.0
+
+* documentation changes only
+
 1.1.0.beta [Specs passed against Rails 2.3.8, 3.0.0.rc & 3.0.0]
 
 * Changed semantic_remote_form_for to allow for unobstrusive javascript / :remote option (rails3)

From 4d9c5e979980d2a76e535b091450f500cb661783 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 8 Sep 2010 15:35:40 +1000
Subject: [PATCH 210/992] version bump

---
 VERSION.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION.yml b/VERSION.yml
index 9add5ed60..61576358c 100644
--- a/VERSION.yml
+++ b/VERSION.yml
@@ -2,4 +2,4 @@
 :major: 1
 :minor: 1
 :patch: 0
-:build: beta
+:build: 

From 335dc77eff2a5391abaeb13771cb00f5096feae6 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 8 Sep 2010 15:40:22 +1000
Subject: [PATCH 211/992] new gemspec

---
 formtastic.gemspec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 4d3963b1b..7f768580d 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formtastic}
-  s.version = "1.1.0.beta"
+  s.version = "1.1.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin French"]
-  s.date = %q{2010-08-28}
+  s.date = %q{2010-09-08}
   s.description = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.email = %q{justin@indent.com.au}
   s.extra_rdoc_files = [

From ab045a589cfb65952618fccc7957292188adaf15 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 8 Sep 2010 16:16:54 +1000
Subject: [PATCH 212/992] README updated with new gem versions

---
 README.textile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.textile b/README.textile
index 9de7ed860..ff40e2374 100644
--- a/README.textile
+++ b/README.textile
@@ -81,16 +81,16 @@ h2. A Note About Rails 3 Support
 
 Formtastic 1.0 only supports the latest stable Rails 2.x. We're maintaining a rails3 branch which aims to provide both Rails 2.x and 3.x support, which is targeted for the 1.1 release around the same time Rails 3.0 final ships.
 
-A 1.1.0.beta gem is now available on RubyGems.org, so install that with the --pre option:
+A 1.1.0 gem is now available on RubyGems.org:
 
 <pre>
-  gem install formtastic --pre
+  gem install formtastic
 </pre>
 
 Or bundle it in your Gemfile:
 
 <pre>
-  gem 'formtastic', '1.1.0.beta'
+  gem 'formtastic', '1.1.0'
 </pre>
 
 You can also live on the edge and track our rails3 branch in your Gemfile with the :git and :branch options:

From 8054d6aa3a75109d2f2583d4b171e111e1fbffd6 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 8 Sep 2010 16:16:54 +1000
Subject: [PATCH 213/992] README updated with new gem versions

---
 README.textile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.textile b/README.textile
index 47ca4f591..cf3adacaf 100644
--- a/README.textile
+++ b/README.textile
@@ -81,16 +81,16 @@ h2. A Note About Rails 3 Support
 
 Formtastic 1.0 only supports the latest stable Rails 2.x. We're maintaining a rails3 branch which aims to provide both Rails 2.x and 3.x support, which is targeted for the 1.1 release around the same time Rails 3.0 final ships.
 
-A 1.1.0.beta gem is now available on RubyGems.org, so install that with the --pre option:
+A 1.1.0 gem is now available on RubyGems.org:
 
 <pre>
-  gem install formtastic --pre
+  gem install formtastic
 </pre>
 
 Or bundle it in your Gemfile:
 
 <pre>
-  gem 'formtastic', '1.1.0.beta'
+  gem 'formtastic', '1.1.0'
 </pre>
 
 You can also live on the edge and track our rails3 branch in your Gemfile with the :git and :branch options:

From ebe4e51c1a5745dcb4bec6eb96342f5b734ada75 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 8 Sep 2010 21:57:50 +1000
Subject: [PATCH 214/992] updated the README to reflect the new gem versions
 and other compatibility details (GH-363)

---
 README.textile | 48 +++++++++++++++---------------------------------
 1 file changed, 15 insertions(+), 33 deletions(-)

diff --git a/README.textile b/README.textile
index cf3adacaf..00ec7b911 100644
--- a/README.textile
+++ b/README.textile
@@ -77,50 +77,40 @@ h2. Documentation
 RDoc documentation _should_ be automatically generated after each commit and made available on the "rdoc.info website":http://rdoc.info/projects/justinfrench/formtastic.
 
 
-h2. A Note About Rails 3 Support
+h2. Gems and Bundles
 
-Formtastic 1.0 only supports the latest stable Rails 2.x. We're maintaining a rails3 branch which aims to provide both Rails 2.x and 3.x support, which is targeted for the 1.1 release around the same time Rails 3.0 final ships.
+Formtastic is now compatible with both Rails 2 and Rails 3, and the gem is "hosted":http://rubygems.org/gems/formtastic on RubyGems.org.
 
-A 1.1.0 gem is now available on RubyGems.org:
 
-<pre>
-  gem install formtastic
-</pre>
-
-Or bundle it in your Gemfile:
-
-<pre>
-  gem 'formtastic', '1.1.0'
-</pre>
+h4. For Rails 3 (or Rails 2 with Bundler)
 
-You can also live on the edge and track our rails3 branch in your Gemfile with the :git and :branch options:
+Simply add Formtastic to your Gemfile and bundle it up:
 
 <pre>
-  gem 'formtastic', :git => "git://github.com/justinfrench/formtastic.git", :branch => "rails3"
+  gem 'formtastic', '~> 1.1.0'
 </pre>
 
-Please be aware that Rails 3 is still under heavy development (even in the RCs), as is Formtastic, so our beta gems and the rails3 branch is very much "on the edge", just like Rails. If you find compatibility issues with Rails 2 or 3, please report them on Github.
+Optionally, run @rails generate formtastic:install@ to copy some stylesheets and a configuration initializer into your application.
 
 
-h2. Installation under Rails 2.x
+h4. For Rails 2:
 
-Install the Formtastic gem:
+Install the gem:
 
 <pre>
   sudo gem install formtastic
 </pre>
 
-And add it to your environment.rb configuration as a gem dependency:
+And add the gem to your environment.rb configuration as a gem dependency:
 
 <pre>
-  config.gem 'formtastic'
+  config.gem 'formtastic', '~> 1.1.0'
 </pre>
 
-Optionally, run @./script/generate formtastic@ to copy the following files into your app:
+Optionally, run @./script/generate formtastic@ to copy some stylesheets and a configuration initializer into your application.
 
-* @config/initializers/formtastic.rb@ - a commented out Formtastic config initializer
-* @public/stylesheets/formtastic.css@
-* @public/stylesheets/formtastic_changes.css@
+
+h2. Stylesheets
 
 A proof-of-concept stylesheet is provided which you can include in your layout. Customization is best achieved by overriding these styles in an additional stylesheet so that the Formtastic styles can be updated without clobbering your changes. If you want to use these stylesheets, add both to your layout with this helper:
 
@@ -544,13 +534,6 @@ By default formtastic escapes html entities in both labels and hints unless a st
 Formtastic::SemanticFormBuilder.escape_html_entities_in_hints_and_labels = false
 
 
-h2. Focus
-
-Formtastic 1.0 is compatible with Rails 2.x *only*. We've also been working hard on a Rails 2 *and* 3 compatible version in the rails3 branch, targeting a 1.1 release shortly after Rails 3.0 final ships.
-
-There's heaps more we want to do, but we have to do this first.
-
-
 h2. Dependencies
 
 There are none, but...
@@ -562,8 +545,7 @@ There are none, but...
 
 h2. Compatibility
 
-* We're only testing Formtastic with the latest Rails 2.x stable release. Patches are welcome to allow backwards compatibility with older versions of Rails, of course.
-* Development of a Rails 2 *and* 3 compatible version of Formtastic is underway in the rails3 branch, targeting a Formtastic 1.1 release shortly after Rails 3.0 ships.
+* We're only testing Formtastic with the latest Rails 2.x and 3.x stable releases. Patches are welcome to allow backwards compatibility with older versions of Rails, of course.
 * Formtastic, much like Rails 2, is very ActiveRecord-centric. Many people are using Formtastic (especially the rails3 branch) successfully with other ActiveModel-like ORMs and classes (DataMapper, MongoMapper, Mongoid, Authlogic, Devise...) but we're not guaranteeing anything at this stage. Patches are welcome, but it's not our core focus right now.
  
 
@@ -593,4 +575,4 @@ h2. Project Info
 Formtastic is hosted on Github: "http://github.com/justinfrench/formtastic":http://github.com/justinfrench/formtastic, where your contributions, forkings, comments and feedback are greatly welcomed.
 
 
-Copyright (c) 2007-2008 Justin French, released under the MIT license.
+Copyright (c) 2007-2010 Justin French, released under the MIT license.

From 09a46096458a9871f9b46aba932f095d01d1730f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 10 Sep 2010 12:25:09 +1000
Subject: [PATCH 215/992] resolves GH-365 by adding top and bottom padding to
 the li, then taking it away with a negative margin (top) and reduced margin
 (bottom)

---
 generators/formtastic/templates/formtastic.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generators/formtastic/templates/formtastic.css b/generators/formtastic/templates/formtastic.css
index 805138393..b7152d89a 100644
--- a/generators/formtastic/templates/formtastic.css
+++ b/generators/formtastic/templates/formtastic.css
@@ -38,7 +38,7 @@ form.formtastic fieldset.buttons li { float:left; padding-right:0.5em; }
 
 /* INPUT LIs
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol > li { margin-bottom:1.5em; }
+form.formtastic fieldset > ol > li { padding:0.5em 0; margin-top:-0.5em; margin-bottom:1em; } /* padding and negative margin juggling is for Firefox */
 form.formtastic fieldset > ol > li { overflow:auto; } /* clearing contained floats */
 
 form.formtastic fieldset > ol > li.required { }

From e3f04f666621394c7dd52e066bf2c6d968d7df71 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 13 Sep 2010 16:01:29 +1000
Subject: [PATCH 216/992] README installation instructions simlified and
 clarified to specific that Bundler is required, even under Rails 2

---
 README.textile | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/README.textile b/README.textile
index 00ec7b911..11547d06b 100644
--- a/README.textile
+++ b/README.textile
@@ -77,12 +77,11 @@ h2. Documentation
 RDoc documentation _should_ be automatically generated after each commit and made available on the "rdoc.info website":http://rdoc.info/projects/justinfrench/formtastic.
 
 
-h2. Gems and Bundles
+h2. Installation
 
 Formtastic is now compatible with both Rails 2 and Rails 3, and the gem is "hosted":http://rubygems.org/gems/formtastic on RubyGems.org.
 
-
-h4. For Rails 3 (or Rails 2 with Bundler)
+*You'll need to use Bundler (yes, even under Rails 2, due to the many ways gem dependencies suck). Follow "this tutorial":http://gembundler.com/rails23.html.*
 
 Simply add Formtastic to your Gemfile and bundle it up:
 
@@ -90,25 +89,16 @@ Simply add Formtastic to your Gemfile and bundle it up:
   gem 'formtastic', '~> 1.1.0'
 </pre>
 
-Optionally, run @rails generate formtastic:install@ to copy some stylesheets and a configuration initializer into your application.
-
-
-h4. For Rails 2:
-
-Install the gem:
+Optionally, run the generator to copy some stylesheets and a configuration initializer into your application:
 
 <pre>
-  sudo gem install formtastic
+  # Rails 3:
+  $ rails generate formtastic:install 
+  
+  # Or Rails 2:
+  $ ./script/generate formtastic 
 </pre>
 
-And add the gem to your environment.rb configuration as a gem dependency:
-
-<pre>
-  config.gem 'formtastic', '~> 1.1.0'
-</pre>
-
-Optionally, run @./script/generate formtastic@ to copy some stylesheets and a configuration initializer into your application.
-
 
 h2. Stylesheets
 

From 54df9be5569e2c0be21566407661b9083f33ebda Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Tue, 6 Jul 2010 23:42:33 +0800
Subject: [PATCH 217/992] Name block variable.

"_" variable names are used when they are not important and not used,
in this case the variable is used so it should have a descriptive name.
---
 lib/formtastic.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 4386d25eb..9942d995b 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -486,9 +486,9 @@ def content_columns #:nodoc:
       #
       def association_columns(*by_associations) #:nodoc:
         if @object.present? && @object.class.respond_to?(:reflections)
-          @object.class.reflections.collect do |name, _|
+          @object.class.reflections.collect do |name, association_reflection|
             if by_associations.present?
-              name if by_associations.include?(_.macro)
+              name if by_associations.include?(association_reflection.macro)
             else
               name
             end

From 3fc988db8eb232a86371520daa7f59f8fe17bd1a Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 17 Sep 2010 10:13:55 +1000
Subject: [PATCH 218/992] reduce the max-width of string/numeric inputs and the
 width of textareas by 2% to avoid issues with overflow:auto; in Firefox.
 Quick fix for now to (re-)address GH-365

---
 generators/formtastic/templates/formtastic.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/generators/formtastic/templates/formtastic.css b/generators/formtastic/templates/formtastic.css
index b7152d89a..8d05f3186 100644
--- a/generators/formtastic/templates/formtastic.css
+++ b/generators/formtastic/templates/formtastic.css
@@ -77,14 +77,14 @@ form.formtastic fieldset > ol > li ul.errors li { padding:0; border:none; displa
 
 /* STRING & NUMERIC OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol > li.string input { max-width:74%; }
+form.formtastic fieldset > ol > li.string input { max-width:72%; }
 form.formtastic fieldset > ol > li.password input { max-width: 13em; }
-form.formtastic fieldset > ol > li.numeric input { max-width:74%; }
+form.formtastic fieldset > ol > li.numeric input { max-width:72%; }
 
 
 /* TEXTAREA OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol > li.text textarea { width:74%; }
+form.formtastic fieldset > ol > li.text textarea { width:72%; }
 
 
 /* HIDDEN OVERRIDES

From 3877f586a33c728ab716f370fc84cdfdb6f99068 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 17 Sep 2010 10:15:46 +1000
Subject: [PATCH 219/992] remove the em width on password inputs, replace with
 a percentage which is conistent with other inputs -- designers can override
 in their own styles if needed, resolves GH-367

---
 generators/formtastic/templates/formtastic.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/generators/formtastic/templates/formtastic.css b/generators/formtastic/templates/formtastic.css
index 8d05f3186..83a934d40 100644
--- a/generators/formtastic/templates/formtastic.css
+++ b/generators/formtastic/templates/formtastic.css
@@ -77,8 +77,8 @@ form.formtastic fieldset > ol > li ul.errors li { padding:0; border:none; displa
 
 /* STRING & NUMERIC OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol > li.string input { max-width:72%; }
-form.formtastic fieldset > ol > li.password input { max-width: 13em; }
+form.formtastic fieldset > ol > li.string input, 
+form.formtastic fieldset > ol > li.password input, 
 form.formtastic fieldset > ol > li.numeric input { max-width:72%; }
 
 

From e11d0a44027647946fe5cc8f76ae21cc0d672443 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 13 Sep 2010 10:31:00 +1000
Subject: [PATCH 220/992] ditched jeweler & VERSION.yml, updated
 RELEASE_PROCESS resolves GH-353

---
 RELEASE_PROCESS    | 15 +++++-------
 Rakefile           | 57 ----------------------------------------------
 VERSION.yml        |  5 ----
 formtastic.gemspec |  5 ----
 4 files changed, 6 insertions(+), 76 deletions(-)
 delete mode 100644 VERSION.yml

diff --git a/RELEASE_PROCESS b/RELEASE_PROCESS
index 2e2f0bbcc..2f03c4e79 100644
--- a/RELEASE_PROCESS
+++ b/RELEASE_PROCESS
@@ -1,9 +1,6 @@
-git status                              # check you have a clean working directory
-rake version:bump:minor                 # or patch or major, commits the change
-rake gemspec                            # to generate the new gemspec file
-git add formtastic.gemspec              # stage changes
-git commit -am "new gemspec"            # commit and describe the reason for the new gem
-git tag 0.2.3                           # tag the new version in the code base too
-gem build formtastic.gemspec            # build the gem
-gem push formtastic-0.2.3.gem           # publish the gem
-git push && git push --tags             # push to remote
+# edit gemspec version number, etc
+git ci formtastic.gemspec -m "new gemspec" # stage changes
+git tag X.X.X                              # tag the new version in the code base too
+gem build formtastic.gemspec               # build the gem
+gem push formtastic-X.X.X.gem              # publish the gem
+git push && git push --tags                # push to remote
diff --git a/Rakefile b/Rakefile
index 23e18f159..d4b5b4f73 100644
--- a/Rakefile
+++ b/Rakefile
@@ -17,63 +17,6 @@ rescue LoadError
   end
 end
 
-begin
-  GEM = "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"
-  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:
-    rails generator formastic:install # Rails 3
-    ./script/generate formtastic      # Rails 2
-
-  To generate some semantic form markup for your existing models, just run:
-    rails generate formtastic:form MODEL_NAME # Rails 3
-    ./script/generate form MODEL_NAME         # Rails 2
-
-  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
-    s.email = EMAIL
-    s.homepage = HOMEPAGE
-    s.description = SUMMARY
-    s.author = AUTHOR
-    s.post_install_message = INSTALL_MESSAGE
-    
-    s.require_path = 'lib'
-    s.files = %w(MIT-LICENSE README.textile Rakefile init.rb) + 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'
-    s.add_dependency 'i18n', '>= 0.4.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 "[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
 
diff --git a/VERSION.yml b/VERSION.yml
deleted file mode 100644
index 61576358c..000000000
--- a/VERSION.yml
+++ /dev/null
@@ -1,5 +0,0 @@
---- 
-:major: 1
-:minor: 1
-:patch: 0
-:build: 
diff --git a/formtastic.gemspec b/formtastic.gemspec
index 7f768580d..8c987be3f 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -1,8 +1,3 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
   s.name = %q{formtastic}
   s.version = "1.1.0"

From 16ded9e7f409be23b8b9f2a3b638db43429af147 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Fri, 17 Sep 2010 18:20:13 +0200
Subject: [PATCH 221/992] Upgrade testsuite to work with RSpec 2.0.0.beta.22

---
 spec/support/test_environment.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/spec/support/test_environment.rb b/spec/support/test_environment.rb
index 658d3a943..59e1d9db2 100644
--- a/spec/support/test_environment.rb
+++ b/spec/support/test_environment.rb
@@ -1,6 +1,6 @@
 if Formtastic::Util.rails3?
-  gem 'rspec', '~> 2.0.0.beta19'
-  gem 'rspec-rails', '~> 2.0.0.beta19'
+  gem 'rspec', '~> 2.0.0.beta22'
+  gem 'rspec-rails', '~> 2.0.0.beta22'
   gem 'rspec_tag_matchers'
   gem 'i18n', '>= 0.4.0'
 
@@ -8,9 +8,6 @@
   require "action_controller/railtie"
   require "active_resource/railtie"
   require 'active_model'
-  require 'rspec/core'
-  require 'rspec/rails'
-  require 'rspec_tag_matchers'
 
   # Create a simple rails application for use in testing the viewhelper
   module FormtasticTest
@@ -23,6 +20,9 @@ class Application < Rails::Application
   FormtasticTest::Application.initialize!
 
   # Configure RSpec 2.0
+  require 'rspec/core'
+  require 'rspec/rails'
+  require 'rspec_tag_matchers'
   RSpec.configure do |config|
     config.include RspecTagMatchers
     config.include CustomMacros
@@ -42,4 +42,4 @@ class Application < Rails::Application
     config.include(RspecTagMatchers)
     config.include(CustomMacros)
   end
-end  
\ No newline at end of file
+end

From 7767af6b8dc7f4eb55655fc87227b0461935d938 Mon Sep 17 00:00:00 2001
From: Dimitrij Denissenko <dimitrij.denissenko@blacksquaremedia.com>
Date: Mon, 6 Sep 2010 13:52:45 +0100
Subject: [PATCH 222/992] Fix spec for non-US locales

---
 spec/inputs/date_input_spec.rb | 38 +++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/spec/inputs/date_input_spec.rb b/spec/inputs/date_input_spec.rb
index 62af218ef..3da77f002 100644
--- a/spec/inputs/date_input_spec.rb
+++ b/spec/inputs/date_input_spec.rb
@@ -2,20 +2,20 @@
 require 'spec_helper'
 
 describe 'date input' do
-  
+
   include FormtasticSpecHelper
-  
+
   before do
     @output_buffer = ''
     mock_everything
   end
-  
+
   describe "general" do
-    
+
     before do
       output_buffer.replace ''
       @form = semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:publish_at, :as => :date))
+        concat(builder.input(:publish_at, :as => :date, :order => [:year, :month, :day]))
       end
     end
 
@@ -23,12 +23,12 @@
     it_should_have_input_wrapper_with_id("post_publish_at_input")
     it_should_have_a_nested_fieldset
     it_should_apply_error_logic_for_input_type(:date)
-    
+
     it 'should have a legend and label with the label text inside the fieldset' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.date fieldset legend.label label', /Publish at/)
     end
-    
+
     it 'should associate the legend label with the first select' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.date fieldset legend.label')
@@ -36,13 +36,13 @@
       output_buffer.should have_tag('form li.date fieldset legend.label label[@for]')
       output_buffer.should have_tag('form li.date fieldset legend.label label[@for="post_publish_at_1i"]')
     end
-    
+
     it 'should have an ordered list of three items inside the fieldset' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.date fieldset ol')
       output_buffer.should have_tag('form li.date fieldset ol li', :count => 3)
     end
-    
+
     it 'should have three labels for year, month and day' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.date fieldset ol li label', :count => 3)
@@ -50,15 +50,15 @@
       output_buffer.should have_tag('form li.date fieldset ol li label', /month/i)
       output_buffer.should have_tag('form li.date fieldset ol li label', /day/i)
     end
-    
+
     it 'should have three selects for year, month and day' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.date fieldset ol li select', :count => 3)
     end
   end
-    
+
   describe ':selected option' do
-    
+
     describe "when the object has a value" do
       it "should select the object value (ignoring :selected)" do
         output_buffer.replace ''
@@ -73,7 +73,7 @@
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='2012'][@selected]", :count => 1)
       end
     end
-    
+
     describe 'when the object has no value (nil)' do
       it "should select the :selected if provided as a Date" do
         output_buffer.replace ''
@@ -87,7 +87,7 @@
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='1999'][@selected]", :count => 1)
       end
-      
+
       it "should select the :selected if provided as a Time" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
@@ -100,7 +100,7 @@
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='1999'][@selected]", :count => 1)
       end
-      
+
       it "should not select an option if the :selected is provided as nil" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
@@ -112,7 +112,7 @@
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li ol li select#post_created_at_1i option[@selected]")
       end
-      
+
       it "should select nothing if a :selected is not provided" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
@@ -121,10 +121,10 @@
         end
         output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li ol li select option[@selected]")
-        
+
       end
     end
-    
+
   end
 
   describe ':labels option' do
@@ -164,5 +164,5 @@
       end
     end
   end
-  
+
 end

From c02f6f15589dcb814c9ea2563bb2d00f66aced28 Mon Sep 17 00:00:00 2001
From: Dimitrij Denissenko <dimitrij.denissenko@blacksquaremedia.com>
Date: Mon, 6 Sep 2010 13:52:00 +0100
Subject: [PATCH 223/992] Include 'required' information in :check_boxes and
 :radio inputs.

---
 lib/formtastic.rb                     | 11 ++++++++---
 spec/inputs/check_boxes_input_spec.rb | 15 +++++++++++++++
 spec/inputs/radio_input_spec.rb       | 17 ++++++++++++++++-
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 9942d995b..671200672 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1406,9 +1406,14 @@ def field_set_and_list_wrapping_for_method(method, options, contents) #:nodoc:
 
       # Generates the legend for radiobuttons and checkboxes
       def legend_tag(method, options = {})
-        (options[:label] == false) ? Formtastic::Util.html_safe("") : template.content_tag(:legend, 
-            template.label_tag(nil, localized_string(method, options[:label], :label) || humanized_attribute_name(method), :for => nil), :class => :label
-          )
+        if options[:label] == false
+          Formtastic::Util.html_safe("")
+        else
+          text = localized_string(method, options[:label], :label) || humanized_attribute_name(method)
+          text += required_or_optional_string(options.delete(:required))
+          text = Formtastic::Util.html_safe(text)
+          template.content_tag :legend, template.label_tag(nil, text, :for => nil), :class => :label
+        end
       end
 
       # For methods that have a database column, take a best guess as to what the input method
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 35c945695..f95dba59a 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -371,6 +371,21 @@
         output_buffer.should_not have_tag("legend.label")
       end
     end
+
+    describe "when :required option is true" do
+      before do
+        @new_post.stub!(:author_ids).and_return(nil)
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:authors, :as => :check_boxes, :required => true))
+        end
+      end
+  
+      it "should output the correct label title" do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag("legend.label label abbr")
+      end
+    end
+
   end
 
   describe 'for a has_and_belongs_to_many association' do
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 20fd9bf1b..e8a3f33e1 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -28,7 +28,7 @@
       output_buffer.should have_tag('form li fieldset legend.label label')
       output_buffer.should have_tag('form li fieldset legend.label label', /Author/)
     end
-    
+
     it 'should not link the label within the legend to any input' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should_not have_tag('form li fieldset legend label[@for]')
@@ -240,4 +240,19 @@
       output_buffer.should_not have_tag("legend.label")
     end
   end
+
+  describe "when :required option is true" do
+    before do
+      @new_post.stub!(:author_ids).and_return(nil)
+      @form = semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:authors, :as => :radio, :required => true))
+      end
+    end
+
+    it "should output the correct label title" do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag("legend.label label abbr")
+    end
+  end
+
 end

From f066e351e9bb86c0c2133d089a6002a27850a336 Mon Sep 17 00:00:00 2001
From: Disha Al Baqui <disha.albaqui@gmail.com>
Date: Mon, 31 May 2010 15:57:53 -0700
Subject: [PATCH 224/992] Added the ability to customize the order for specific
 types of inputs. This is configured on a type basis and if a type is not
 found it willfall back to the default order as defined by @@inline_order

---
 CHANGELOG                                     |  4 ++++
 generators/formtastic/templates/formtastic.rb |  7 +++++++
 lib/formtastic.rb                             |  7 ++++---
 spec/input_spec.rb                            | 17 +++++++++++++++++
 4 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 51e040e2c..0cfadccc9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+1.2.0
+
+* Added custom_inline_order to allow inline ordering per input type
+
 1.1.0
 
 * documentation changes only
diff --git a/generators/formtastic/templates/formtastic.rb b/generators/formtastic/templates/formtastic.rb
index 16b3790a6..1010b25bc 100644
--- a/generators/formtastic/templates/formtastic.rb
+++ b/generators/formtastic/templates/formtastic.rb
@@ -45,6 +45,13 @@
 # customize it doing just as below:
 # Formtastic::SemanticFormBuilder.inline_order = [:input, :hints, :errors]
 
+# Additionally, you can customize the order for specific types of inputs.
+# This is configured on a type basis and if a type is not found it will
+# fall back to the default order as defined by #inline_order
+# Formtastic::SemanticFormBuilder.custom_inline_order[:checkbox] = [:errors, :hints, :input]
+# Formtastic::SemanticFormBuilder.custom_inline_order[:select] = [:hints, :input, :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)
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 671200672..6db3c9d75 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -8,8 +8,8 @@ module Formtastic #:nodoc:
   class SemanticFormBuilder < ActionView::Helpers::FormBuilder
     class_inheritable_accessor :default_text_field_size, :default_text_area_height, :all_fields_required_by_default, :include_blank_for_select_by_default,
                    :required_string, :optional_string, :inline_errors, :label_str_method, :collection_value_methods, :collection_label_methods,
-                   :inline_order, :file_methods, :priority_countries, :i18n_lookups_by_default, :escape_html_entities_in_hints_and_labels, :default_commit_button_accesskey,
-                   :instance_reader => false
+                   :inline_order, :custom_inline_order, :file_methods, :priority_countries, :i18n_lookups_by_default, :escape_html_entities_in_hints_and_labels,
+                   :default_commit_button_accesskey, :instance_reader => false
 
     self.default_text_field_size = 50
     self.default_text_area_height = 20
@@ -22,6 +22,7 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
     self.collection_label_methods = %w[to_label display_name full_name name title username login value to_s]
     self.collection_value_methods = %w[id to_s]
     self.inline_order = [ :input, :hints, :errors ]
+    self.custom_inline_order = {}
     self.file_methods = [ :file?, :public_filename, :filename ]
     self.priority_countries = ["Australia", "Canada", "United Kingdom", "United States"]
     self.i18n_lookups_by_default = false
@@ -102,7 +103,7 @@ def input(method, options = {})
         options[:label_html][:for] ||= options[:input_html][:id]
       end
 
-      input_parts = self.class.inline_order.dup
+      input_parts = (self.class.custom_inline_order[options[:as]] || self.class.inline_order).dup
       input_parts = input_parts - [:errors, :hints] if options[:as] == :hidden
 
       list_item_content = input_parts.map do |type|
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 0a1fe89de..833066edb 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -32,6 +32,23 @@
         concat(builder.input(:title))
       end
     end
+
+    it 'should allow errors, input, hint for a custom type while preserving original inline order' do
+      ::Formtastic::SemanticFormBuilder.custom_inline_order[:checkbox] = [:errors, :input, :hints]
+      ::Formtastic::SemanticFormBuilder.inline_order = [:hints, :input, :errors]
+
+      semantic_form_for(@new_post) do |builder|
+        builder.should_receive(:inline_errors_for).once.ordered
+        builder.should_receive(:inline_input_for).once.ordered
+        builder.should_receive(:inline_hints_for).once.ordered
+        concat(builder.input(:title, :as => :checkbox))
+        builder.should_receive(:inline_hints_for).once.ordered
+        builder.should_receive(:inline_input_for).once.ordered
+        builder.should_receive(:inline_errors_for).once.ordered
+        concat(builder.input(:title))
+      end
+    end
+
   end
 
   describe 'arguments and options' do

From 5f3d7a617bf94d68998cfecf15f850bc0436b15e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 21 Sep 2010 10:03:23 +1000
Subject: [PATCH 225/992] updated the generator docs in README to reflect both
 Rails 3 and 2

---
 README.textile | 57 ++++++++++++++++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 20 deletions(-)

diff --git a/README.textile b/README.textile
index 11547d06b..a9df54e0a 100644
--- a/README.textile
+++ b/README.textile
@@ -461,51 +461,67 @@ If you have the "ValidationReflection":http://github.com/redinger/validation_ref
 
 h2. Configuration
 
-Run @./script/generate formtastic@ to copy a commented out config file into @config/initializers/formtastic.rb@. You can "view the configuration file on GitHub":http://github.com/justinfrench/formtastic/blob/master/generators/formtastic/templates/formtastic.rb
+Run @rails generate formtastic:install@ (Rails 3) or @./script/generate formtastic@ (Rails 2) to copy a commented out config file into @config/initializers/formtastic.rb@. You can "view the configuration file on GitHub":http://github.com/justinfrench/formtastic/blob/master/generators/formtastic/templates/formtastic.rb
 
 
 h2. Form Generator
 
-There's a Formtastic form code generator to make your transition to Formtastic easier. All you have to do is to *specify an existing model name*, and optionally specify view template framework (ERB/HAML), and you are good to go. *Note:* This won't overwrite any of you stuff. This is how you use it:
+There's a Formtastic form code generator to make your transition to Formtastic easier. All you have to do is to *specify an existing model name*, and optionally specify view template framework (ERB/HAML), and you are good to go. *Note:* This won't overwrite any of your stuff.
 
-*Alt. 1: Generate in terminal:*
+h3. Basic usage
+
+Rails 3:
 
 <pre>
-$ ./script/generate form Post
-# ---------------------------------------------------------
-#  GENERATED FORMTASTIC CODE
-# ---------------------------------------------------------
+  $ rails generate formtastic:form ModelName
+</pre>
 
-<% f.inputs do %>
-  <%= f.input :title, :label => 'Title' %>
-  <%= f.input :body, :label => 'Body' %>
-  <%= f.input :published, :label => 'Published' %>
-<% end %>
+Rails 2:
+
+<pre>
+  $ ./script/generate form ModelName
+</pre>
 
-# ---------------------------------------------------------
- Copied to clipboard - just paste it!
+The results are something like this, with the ERB code printed out to the terminal 
+
+<pre>
+  $ rails generate formtastic:form Post
+  # ---------------------------------------------------------
+  #  GENERATED FORMTASTIC CODE
+  # ---------------------------------------------------------
+
+  <% f.inputs do %>
+    <%= f.input :title, :label => 'Title' %>
+    <%= f.input :body, :label => 'Body' %>
+    <%= f.input :published, :label => 'Published' %>
+  <% end %>
+
+  # ---------------------------------------------------------
+   Copied to clipboard - just paste it!
 </pre>
 
-*Alt. 2: Generate partial:*
+h3. Generating a partial with @--partial@
+
+You can also ask Formtastic to *generate a partial* with the @--partial@ option, placing it in the correct location inside your @app/views@ directory:
 
 <pre>
-$ ./script/generate form Post --partial
+  $ rails generate formastic:form Post --partial
       exists  app/views/posts
       create  app/views/posts/_form.html.erb
 </pre>
 
-To generate *HAML* markup, just add the @--haml@ as argument:
+h3. Specifying HAML instead of ERB with @--haml@
 
 <pre>
-$ ./script/generate form Post --haml
+  $ rails generate formastic:form Post --haml
       exists  app/views/admin/posts
       create  app/views/admin/posts/_form.html.haml
 </pre>
 
-To specify the controller in a namespace (eg admin/posts instead of posts), use the --controller argument:
+h3. Specifying controller namespace with @--controller@
 
 <pre>
-$ ./script/generate form Post --partial --controller admin/posts
+  $ rails generate formastic:form Post --partial --controller admin/posts
       exists  app/views/admin/posts
       create  app/views/admin/posts/_form.html.erb
 </pre>
@@ -517,6 +533,7 @@ If you want to add your own input types to encapsulate your own logic or interfa
 
 @Formtastic::SemanticFormHelper.builder = MyCustomBuilder@
 
+
 h2. Security
 
 By default formtastic escapes html entities in both labels and hints unless a string is marked as html_safe. If you are using an older rails version which doesn't know html_safe, or you want to globally turn this feature off, you can set the following in your initializer:

From c66be9f7454efecffa7d93cdad546a6bc2123047 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 24 Sep 2010 22:04:35 +1000
Subject: [PATCH 226/992] ignore .bundle

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index bced560d5..1564d2ecc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ pkg
 *watchr.rb
 log/*
 .rvmrc
+.bundle

From 0f9066e67fc9e0205b11857e695a0f51913cf6eb Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 24 Sep 2010 22:05:41 +1000
Subject: [PATCH 227/992] added a Gemfile and Gemfile.lock with existing
 dependencies untouched

---
 Gemfile      |  4 ++++
 Gemfile.lock | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 Gemfile
 create mode 100644 Gemfile.lock

diff --git a/Gemfile b/Gemfile
new file mode 100644
index 000000000..1862678ee
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,4 @@
+source :rubygems
+
+# Include dependencies from gemspec.
+gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 000000000..7e795cacc
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,56 @@
+PATH
+  remote: .
+  specs:
+    formtastic (1.1.0)
+      actionpack (>= 2.3.0)
+      activesupport (>= 2.3.0)
+      i18n (>= 0.4.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionpack (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4.1)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.12)
+      rack-test (~> 0.5.4)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.0)
+      activesupport (= 3.0.0)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activesupport (3.0.0)
+    builder (2.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.4.1)
+    nokogiri (1.4.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.5)
+      rack (>= 1.0)
+    rspec (1.3.0)
+    rspec-rails (1.3.2)
+      rack (>= 1.0.0)
+      rspec (>= 1.3.0)
+    rspec_tag_matchers (1.0.0)
+      nokogiri (>= 1.4.0)
+      rspec-rails (>= 1.2.6)
+    tzinfo (0.3.23)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (>= 2.3.0)
+  activesupport (>= 2.3.0)
+  formtastic!
+  i18n (>= 0.4.0)
+  rspec-rails (>= 1.2.6)
+  rspec_tag_matchers (>= 1.0.0)

From 791b4773589b1d760c438a6da1291ca1708b0043 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 24 Sep 2010 22:51:08 +1000
Subject: [PATCH 228/992] simplified the shit out of the gemspec

---
 formtastic.gemspec | 130 +++------------------------------------------
 1 file changed, 8 insertions(+), 122 deletions(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 8c987be3f..4ed7362e2 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -6,69 +6,10 @@ Gem::Specification.new do |s|
   s.authors = ["Justin French"]
   s.date = %q{2010-09-08}
   s.description = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
+  s.summary = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.email = %q{justin@indent.com.au}
-  s.extra_rdoc_files = [
-    "README.textile"
-  ]
-  s.files = [
-    "MIT-LICENSE",
-     "README.textile",
-     "Rakefile",
-     "generators/form/USAGE",
-     "generators/form/form_generator.rb",
-     "generators/form/templates/view__form.html.erb",
-     "generators/form/templates/view__form.html.haml",
-     "generators/formtastic/formtastic_generator.rb",
-     "generators/formtastic/templates/formtastic.css",
-     "generators/formtastic/templates/formtastic.rb",
-     "generators/formtastic/templates/formtastic_changes.css",
-     "generators/formtastic_stylesheets/formtastic_stylesheets_generator.rb",
-     "init.rb",
-     "lib/formtastic.rb",
-     "lib/formtastic/i18n.rb",
-     "lib/formtastic/layout_helper.rb",
-     "lib/formtastic/railtie.rb",
-     "lib/formtastic/util.rb",
-     "lib/generators/formtastic/form/form_generator.rb",
-     "lib/generators/formtastic/install/install_generator.rb",
-     "lib/locale/en.yml",
-     "rails/init.rb",
-     "spec/buttons_spec.rb",
-     "spec/commit_button_spec.rb",
-     "spec/custom_builder_spec.rb",
-     "spec/defaults_spec.rb",
-     "spec/error_proc_spec.rb",
-     "spec/errors_spec.rb",
-     "spec/form_helper_spec.rb",
-     "spec/helpers/layout_helper_spec.rb",
-     "spec/i18n_spec.rb",
-     "spec/include_blank_spec.rb",
-     "spec/input_spec.rb",
-     "spec/inputs/boolean_input_spec.rb",
-     "spec/inputs/check_boxes_input_spec.rb",
-     "spec/inputs/country_input_spec.rb",
-     "spec/inputs/date_input_spec.rb",
-     "spec/inputs/datetime_input_spec.rb",
-     "spec/inputs/file_input_spec.rb",
-     "spec/inputs/hidden_input_spec.rb",
-     "spec/inputs/numeric_input_spec.rb",
-     "spec/inputs/password_input_spec.rb",
-     "spec/inputs/radio_input_spec.rb",
-     "spec/inputs/select_input_spec.rb",
-     "spec/inputs/string_input_spec.rb",
-     "spec/inputs/text_input_spec.rb",
-     "spec/inputs/time_input_spec.rb",
-     "spec/inputs/time_zone_input_spec.rb",
-     "spec/inputs_spec.rb",
-     "spec/label_spec.rb",
-     "spec/semantic_errors_spec.rb",
-     "spec/semantic_fields_for_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/support/custom_macros.rb",
-     "spec/support/output_buffer.rb",
-     "spec/support/test_environment.rb"
-  ]
+  s.extra_rdoc_files = ["README.textile"]
+  s.files = Dir.glob("lib/**/*") + %w(MIT-LICENSE README.textile)
   s.homepage = %q{http://github.com/justinfrench/formtastic/tree/master}
   s.post_install_message = %q{
   ========================================================================
@@ -91,67 +32,12 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
-  s.test_files = [
-    "spec/buttons_spec.rb",
-     "spec/commit_button_spec.rb",
-     "spec/custom_builder_spec.rb",
-     "spec/defaults_spec.rb",
-     "spec/error_proc_spec.rb",
-     "spec/errors_spec.rb",
-     "spec/form_helper_spec.rb",
-     "spec/helpers/layout_helper_spec.rb",
-     "spec/i18n_spec.rb",
-     "spec/include_blank_spec.rb",
-     "spec/input_spec.rb",
-     "spec/inputs/boolean_input_spec.rb",
-     "spec/inputs/check_boxes_input_spec.rb",
-     "spec/inputs/country_input_spec.rb",
-     "spec/inputs/date_input_spec.rb",
-     "spec/inputs/datetime_input_spec.rb",
-     "spec/inputs/file_input_spec.rb",
-     "spec/inputs/hidden_input_spec.rb",
-     "spec/inputs/numeric_input_spec.rb",
-     "spec/inputs/password_input_spec.rb",
-     "spec/inputs/radio_input_spec.rb",
-     "spec/inputs/select_input_spec.rb",
-     "spec/inputs/string_input_spec.rb",
-     "spec/inputs/text_input_spec.rb",
-     "spec/inputs/time_input_spec.rb",
-     "spec/inputs/time_zone_input_spec.rb",
-     "spec/inputs_spec.rb",
-     "spec/label_spec.rb",
-     "spec/semantic_errors_spec.rb",
-     "spec/semantic_fields_for_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/support/custom_macros.rb",
-     "spec/support/output_buffer.rb",
-     "spec/support/test_environment.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_dependency(%q<activesupport>, [">= 2.3.0"])
+  s.add_dependency(%q<actionpack>, [">= 2.3.0"])
+  s.add_dependency(%q<i18n>, [">= 0.4.0"])
+  s.add_development_dependency(%q<rspec-rails>, [">= 1.2.6"])
+  s.add_development_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.0"])
-      s.add_runtime_dependency(%q<actionpack>, [">= 2.3.0"])
-      s.add_runtime_dependency(%q<i18n>, [">= 0.4.0"])
-      s.add_development_dependency(%q<rspec-rails>, [">= 1.2.6"])
-      s.add_development_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
-    else
-      s.add_dependency(%q<activesupport>, [">= 2.3.0"])
-      s.add_dependency(%q<actionpack>, [">= 2.3.0"])
-      s.add_dependency(%q<i18n>, [">= 0.4.0"])
-      s.add_dependency(%q<rspec-rails>, [">= 1.2.6"])
-      s.add_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
-    end
-  else
-    s.add_dependency(%q<activesupport>, [">= 2.3.0"])
-    s.add_dependency(%q<actionpack>, [">= 2.3.0"])
-    s.add_dependency(%q<i18n>, [">= 0.4.0"])
-    s.add_dependency(%q<rspec-rails>, [">= 1.2.6"])
-    s.add_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
-  end
 end
 

From 5464f3763ad1bf9332845a380856a7fc31ff4b9a Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 24 Sep 2010 23:03:04 +1000
Subject: [PATCH 229/992] update the rails dependencies to 2.3.7, which the
 earliest version which the specs pass with

---
 formtastic.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 4ed7362e2..ea599420c 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -33,8 +33,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}
 
-  s.add_dependency(%q<activesupport>, [">= 2.3.0"])
-  s.add_dependency(%q<actionpack>, [">= 2.3.0"])
+  s.add_dependency(%q<activesupport>, [">= 2.3.7"])
+  s.add_dependency(%q<actionpack>, [">= 2.3.7"])
   s.add_dependency(%q<i18n>, [">= 0.4.0"])
   s.add_development_dependency(%q<rspec-rails>, [">= 1.2.6"])
   s.add_development_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])

From adb3319c62eda830187a075e5b57ee292fed965e Mon Sep 17 00:00:00 2001
From: Evgeniy Dolzhenko <dolzenko@gmail.com>
Date: Thu, 2 Sep 2010 15:54:22 +0800
Subject: [PATCH 230/992] Support :as form_for option (generate proper class
 names for form tag)

---
 lib/formtastic.rb        |  6 +++---
 spec/form_helper_spec.rb | 12 ++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 6db3c9d75..ea1dee94e 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1856,9 +1856,9 @@ def semantic_#{meth}(record_or_name_or_array, *args, &proc)
           class_names = options[:html][:class] ? options[:html][:class].split(" ") : []
           class_names << "formtastic"
           class_names << case record_or_name_or_array
-            when String, Symbol then record_or_name_or_array.to_s               # :post => "post"
-            when Array then singularizer.call(record_or_name_or_array.last.class)  # [@post, @comment] # => "comment"
-            else singularizer.call(record_or_name_or_array.class)                  # @post => "post"
+            when String, Symbol then record_or_name_or_array.to_s                                  # :post => "post"
+            when Array then options[:as] || singularizer.call(record_or_name_or_array.last.class)  # [@post, @comment] # => "comment"
+            else options[:as] || singularizer.call(record_or_name_or_array.class)                  # @post => "post"
           end
           options[:html][:class] = class_names.join(" ")
           
diff --git a/spec/form_helper_spec.rb b/spec/form_helper_spec.rb
index e4b3c8670..550954985 100644
--- a/spec/form_helper_spec.rb
+++ b/spec/form_helper_spec.rb
@@ -37,6 +37,18 @@
       output_buffer.should have_tag("form.project")
     end
 
+    it 'adds class matching the :as option when provided' do
+      form = semantic_form_for(@new_post, :as => :message, :url => '/hello') do |builder|
+      end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag("form.message")
+
+      form = semantic_form_for([:admins, @new_post], :as => :message, :url => '/hello') do |builder|
+      end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag("form.message")
+    end
+
     it 'adds class matching the object\'s class to the generated form when an object is provided' do
       form = semantic_form_for(@new_post) do |builder|
       end

From 099fb7305b278fae2f4a5f667e72da489e8d94af Mon Sep 17 00:00:00 2001
From: Jakob Skjerning <jakob@mentalized.net>
Date: Fri, 27 Aug 2010 16:43:50 +0800
Subject: [PATCH 231/992] Automatically set maxlength if ValidationReflection
 is available and the fields method has a maximum length validation

---
 lib/formtastic.rb                | 24 ++++++++++++++++++++--
 spec/inputs/string_input_spec.rb | 34 ++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index ea1dee94e..b962c0111 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1631,12 +1631,32 @@ def column_for(method) #:nodoc:
       def default_string_options(method, type) #:nodoc:
         column = self.column_for(method)
 
+        def get_maxlength_for(method)
+          # TODO: Extract this into a validations_for method in line with reflection_for, and update here and in method_required?
+          if @object && @object.class.respond_to?(:reflect_on_validations_for)
+
+            validation = @object.class.reflect_on_validations_for(method).find { |validation|
+              validation.macro == :validates_length_of &&
+              validation.name == method
+            }
+            if validation
+              validation_max_limit = validation.options[:maximum] || (validation.options[:within].present? ? validation.options[:within].max : nil)
+            else
+              validation_max_limit = nil
+            end
+          end
+          return validation_max_limit
+        end
+
+        validation_max_limit = get_maxlength_for(method)
+
         if type == :text
           { :cols => self.class.default_text_field_size, :rows => self.class.default_text_area_height }
         elsif type == :numeric || column.nil? || column.limit.nil?
-          { :size => self.class.default_text_field_size }
+          { :maxlength => validation_max_limit,
+            :size => self.class.default_text_field_size }
         else
-          { :maxlength => column.limit,
+          { :maxlength => validation_max_limit || column.limit,
             :size => self.class.default_text_field_size && [column.limit, self.class.default_text_field_size].min }
         end
       end
diff --git a/spec/inputs/string_input_spec.rb b/spec/inputs/string_input_spec.rb
index 7bf1b537f..c2ab97aa1 100644
--- a/spec/inputs/string_input_spec.rb
+++ b/spec/inputs/string_input_spec.rb
@@ -31,6 +31,40 @@
     it_should_apply_custom_input_attributes_when_input_html_provided(:string)
     it_should_apply_custom_for_to_label_when_input_html_id_provided(:string)
     it_should_apply_error_logic_for_input_type(:string)
+
+    describe 'and the validation reflection plugin is available' do
+      def input_field_for_method_should_have_maxlength(method, maxlength)
+        form = semantic_form_for(@new_post) do |builder|
+          concat(builder.input(method))
+        end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag("form li input[@maxlength='#{maxlength}']")
+      end
+
+      describe 'and validates_length_of was called for the method' do
+        it 'should have a maxlength matching validation range top' do
+          @new_post.class.should_receive(:reflect_on_validations_for).with(:title).at_least(2).and_return([
+            mock('MacroReflection', :macro => :validates_length_of, :name => :title, :options => {:within => 5..42})
+          ])
+
+          input_field_for_method_should_have_maxlength :title, 42
+        end
+
+        it 'should have a maxlength matching validation maximum' do
+          @new_post.class.should_receive(:reflect_on_validations_for).with(:title).at_least(2).and_return([
+            mock('MacroReflection', :macro => :validates_length_of, :name => :title, :options => {:maximum => 42})
+          ])
+          input_field_for_method_should_have_maxlength :title, 42
+        end
+      end
+
+      describe 'and validates_length_of was not called for the method' do
+        it "should use default maxlength" do
+          @new_post.class.should_receive(:reflect_on_validations_for).with(:title).at_least(2).and_return([])
+          input_field_for_method_should_have_maxlength :title, 50
+        end
+      end
+    end
   end
   
   describe "when no object is provided" do

From 98ceff5e9efac372f17bcf3e70181d6641736505 Mon Sep 17 00:00:00 2001
From: Jakob Skjerning <jakob@mentalized.net>
Date: Fri, 27 Aug 2010 18:33:13 +0800
Subject: [PATCH 232/992] Automatically set maxlength if object is an
 ActiveModel and the fields method has a maximum length validation

---
 lib/formtastic.rb                |  17 ++++-
 spec/inputs/string_input_spec.rb | 120 +++++++++++++++++++++++++++++--
 spec/spec_helper.rb              |  16 +++--
 3 files changed, 141 insertions(+), 12 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index b962c0111..dd001aa9e 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1634,7 +1634,6 @@ def default_string_options(method, type) #:nodoc:
         def get_maxlength_for(method)
           # TODO: Extract this into a validations_for method in line with reflection_for, and update here and in method_required?
           if @object && @object.class.respond_to?(:reflect_on_validations_for)
-
             validation = @object.class.reflect_on_validations_for(method).find { |validation|
               validation.macro == :validates_length_of &&
               validation.name == method
@@ -1644,6 +1643,22 @@ def get_maxlength_for(method)
             else
               validation_max_limit = nil
             end
+          else
+            # ActiveModel?
+            if @object && @object.class.respond_to?(:validators_on)
+              validation = @object.class.validators_on(method).find{ |validator|
+                validator.kind == :length &&
+                (validator.options.present? ? options_require_validation?(validator.options) : true)
+              }
+
+              if validation
+                validation_max_limit = validation.options[:maximum] || (validation.options[:within].present? ? validation.options[:within].max : nil)
+              else
+                validation_max_limit = nil
+              end
+            else
+              validation_max_limit = nil
+            end
           end
           return validation_max_limit
         end
diff --git a/spec/inputs/string_input_spec.rb b/spec/inputs/string_input_spec.rb
index c2ab97aa1..a54da9ae3 100644
--- a/spec/inputs/string_input_spec.rb
+++ b/spec/inputs/string_input_spec.rb
@@ -32,14 +32,15 @@
     it_should_apply_custom_for_to_label_when_input_html_id_provided(:string)
     it_should_apply_error_logic_for_input_type(:string)
 
-    describe 'and the validation reflection plugin is available' do
-      def input_field_for_method_should_have_maxlength(method, maxlength)
-        form = semantic_form_for(@new_post) do |builder|
-          concat(builder.input(method))
-        end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag("form li input[@maxlength='#{maxlength}']")
+    def input_field_for_method_should_have_maxlength(method, maxlength)
+      form = semantic_form_for(@new_post) do |builder|
+        concat(builder.input(method))
       end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag("form li input[@maxlength='#{maxlength}']")
+    end
+
+    describe 'and the validation reflection plugin is available' do
 
       describe 'and validates_length_of was called for the method' do
         it 'should have a maxlength matching validation range top' do
@@ -65,6 +66,111 @@ def input_field_for_method_should_have_maxlength(method, maxlength)
         end
       end
     end
+
+    describe 'and its a ActiveModel' do
+      let(:default_maxlength) { 50 }
+
+      before do
+        @new_post.stub!(:class).and_return(::PostModel)
+      end
+
+      after do
+        @new_post.stub!(:class).and_return(::Post)
+      end
+
+      describe 'and validates_length_of was called for the method' do
+        it 'should have a maxlength' do
+          @new_post.class.should_receive(:validators_on).with(:title).at_least(2).and_return([
+            active_model_length_validator([:title], {:within => 5..42})
+          ])
+
+          @new_post.class.should_receive(:validators_on).with(:body).at_least(2).and_return([
+            active_model_length_validator([:body], {:if => true, :maximum => 42})
+          ])
+
+          input_field_for_method_should_have_maxlength(:title, 42)
+          input_field_for_method_should_have_maxlength(:body, 42)
+        end
+
+        it 'should have default maxlength if the optional :if condition is not satisifed' do
+          @new_post.class.should_receive(:validators_on).with(:title).at_least(2).and_return([
+            active_model_length_validator([:title], {:maximum => 42, :if => false})
+          ])
+
+          input_field_for_method_should_have_maxlength(:title, default_maxlength)
+        end
+
+        # TODO make a matcher for this?
+        def should_be_required(options)
+          @new_post.class.should_receive(:validators_on).with(:body).and_return([
+            active_model_presence_validator([:body], options[:options])
+          ])
+
+          form = semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:body))
+          end
+
+          output_buffer.concat(form) if Formtastic::Util.rails3?
+
+          if options[:required]
+            output_buffer.should_not have_tag('form li.optional')
+            output_buffer.should have_tag('form li.required')
+          else
+            output_buffer.should have_tag('form li.optional')
+            output_buffer.should_not have_tag('form li.required')
+          end
+        end
+
+        def should_have_maxlength(maxlength, options)
+          @new_post.class.should_receive(:validators_on).with(:title).at_least(2).and_return([
+            active_model_length_validator([:title], options[:options])
+          ])
+
+          form = semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:title))
+          end
+
+          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.should have_tag("form li input[@maxlength='#{maxlength}']")
+        end
+
+        it 'should have default_maxlength if the optional :if proc evaluates to false' do
+          should_have_maxlength(default_maxlength, :options => {:maximum => 42, :if => proc { |record| false }})
+        end
+
+        it 'should have maxlength if the optional :if proc evaluates to true' do
+          should_have_maxlength(42, :options => { :maximum => 42, :if => proc { |record| true } })
+        end
+
+        it 'should have default maxlength if the optional :if with a method name evaluates to false' do
+          @new_post.should_receive(:specify_maxlength).and_return(false)
+          should_have_maxlength(default_maxlength, :options => { :maximum => 42, :if => :specify_maxlength })
+        end
+
+        it 'should have maxlength if the optional :if with a method name evaluates to true' do
+          @new_post.should_receive(:specify_maxlength).and_return(true)
+          should_have_maxlength(42, :options => { :maximum => 42, :if => :specify_maxlength })
+        end
+
+        it 'should have default maxlength if the optional :unless proc evaluates to true' do
+          should_have_maxlength(default_maxlength, :options => { :maximum => 42, :unless => proc { |record| true } })
+        end
+
+        it 'should have maxlength if the optional :unless proc evaluates to false' do
+          should_have_maxlength(42, :options => { :maximum => 42, :unless => proc { |record| false } })
+        end
+
+        it 'should have default maxlength if the optional :unless with a method name evaluates to true' do
+          @new_post.should_receive(:specify_maxlength).and_return(true)
+          should_have_maxlength(default_maxlength, :options => { :maximum => 42, :unless => :specify_maxlength })
+        end
+
+        it 'should have maxlength if the optional :unless with a method name evaluates to false' do
+          @new_post.should_receive(:specify_maxlength).and_return(false)
+          should_have_maxlength(42, :options => { :maximum => 42, :unless => :specify_maxlength })
+        end
+      end
+    end
   end
   
   describe "when no object is provided" do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3c6b22ab1..8c45a54ca 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -53,12 +53,20 @@ def default_input_type(column_type, column_name = :generic_column_name)
     return @default_type
   end
   
+  def active_model_validator(kind, attributes, options = {})
+    validator = mock("ActiveModel::Validations::#{kind.to_s.titlecase}Validator", :attributes => attributes, :options => options)
+    validator.stub!(:kind).and_return(kind)
+    validator
+  end
+
   def active_model_presence_validator(attributes, options = {})
-    presence_validator = mock('ActiveModel::Validations::PresenceValidator', :attributes => attributes, :options => options)
-    presence_validator.stub!(:kind).and_return(:presence)
-    presence_validator
+    active_model_validator(:presence, attributes, options)
   end
-  
+
+  def active_model_length_validator(attributes, options = {})
+    active_model_validator(:length, attributes, options)
+  end
+
   class ::Post
     extend ActiveModel::Naming if defined?(ActiveModel::Naming)
     include ActiveModel::Conversion if defined?(ActiveModel::Conversion)

From b70f2b689d80a07dc1f2488151177f4a41bda34f Mon Sep 17 00:00:00 2001
From: Jakob Skjerning <jakob@mentalized.net>
Date: Fri, 27 Aug 2010 19:32:45 +0800
Subject: [PATCH 233/992] Extract validation reflection functionality into a
 common method

---
 lib/formtastic.rb                | 73 ++++++++++++++++++--------------
 spec/input_spec.rb               | 16 +++----
 spec/inputs/string_input_spec.rb | 70 ++++++++----------------------
 3 files changed, 67 insertions(+), 92 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index dd001aa9e..1b1b42578 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -570,9 +570,9 @@ def strip_formtastic_options(options) #:nodoc:
       #   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
+        attribute_sym = attribute.to_s.sub(/_id$/, '').to_sym
 
+        if @object && @object.class.respond_to?(:reflect_on_validations_for)
           @object.class.reflect_on_validations_for(attribute_sym).any? do |validation|
             validation.macro == :validates_presence_of &&
             validation.name == attribute_sym &&
@@ -580,7 +580,6 @@ def method_required?(attribute) #:nodoc:
           end
         else
           if @object && @object.class.respond_to?(:validators_on)
-            attribute_sym = attribute.to_s.sub(/_id$/, '').to_sym
             !@object.class.validators_on(attribute_sym).find{|validator| (validator.kind == :presence) && (validator.options.present? ? options_require_validation?(validator.options) : true)}.nil?
           else
             self.class.all_fields_required_by_default
@@ -1625,45 +1624,55 @@ def column_for(method) #:nodoc:
         @object.column_for_attribute(method) if @object.respond_to?(:column_for_attribute)
       end
 
+      # Returns the active validations for the given method or an empty Array if no validations are
+      # found for the method.
+      #
+      # By default, the if/unless options of the validations are evaluated and only the validations
+      # that should be run for the current object state are returned. Pass :all to the last 
+      # parameter to return :all validations regardless of if/unless options.
+      #
+      # Requires the ValidationReflection plugin to be present or an ActiveModel. Returns an epmty
+      # Array if neither is the case.
+      #
+      def validations_for(method, mode = :active)
+        # ActiveModel?
+        validations = if @object && @object.class.respond_to?(:validators_on)
+          @object.class.validators_on(method)
+        else
+          # ValidationReflection plugin?
+          if @object && @object.class.respond_to?(:reflect_on_validations_for)
+            @object.class.reflect_on_validations_for(method)
+          else
+            []
+          end
+        end
+
+        validations = validations.select do |validation|
+          (validation.options.present? ? options_require_validation?(validation.options) : true)
+        end unless mode == :all
+
+        return validations
+      end
+
       # Generates default_string_options by retrieving column information from
       # the database.
       #
       def default_string_options(method, type) #:nodoc:
-        column = self.column_for(method)
-
         def get_maxlength_for(method)
-          # TODO: Extract this into a validations_for method in line with reflection_for, and update here and in method_required?
-          if @object && @object.class.respond_to?(:reflect_on_validations_for)
-            validation = @object.class.reflect_on_validations_for(method).find { |validation|
-              validation.macro == :validates_length_of &&
-              validation.name == method
-            }
-            if validation
-              validation_max_limit = validation.options[:maximum] || (validation.options[:within].present? ? validation.options[:within].max : nil)
-            else
-              validation_max_limit = nil
-            end
+          validation = validations_for(method).find do |validation|
+            (validation.respond_to?(:macro) && validation.macro == :validates_length_of) || # Rails 2 validation
+            (validation.respond_to?(:kind) && validation.kind == :length) # Rails 3 validator
+          end
+
+          if validation
+            validation.options[:maximum] || (validation.options[:within].present? ? validation.options[:within].max : nil)
           else
-            # ActiveModel?
-            if @object && @object.class.respond_to?(:validators_on)
-              validation = @object.class.validators_on(method).find{ |validator|
-                validator.kind == :length &&
-                (validator.options.present? ? options_require_validation?(validator.options) : true)
-              }
-
-              if validation
-                validation_max_limit = validation.options[:maximum] || (validation.options[:within].present? ? validation.options[:within].max : nil)
-              else
-                validation_max_limit = nil
-              end
-            else
-              validation_max_limit = nil
-            end
+            nil
           end
-          return validation_max_limit
         end
 
         validation_max_limit = get_maxlength_for(method)
+        column = self.column_for(method)
 
         if type == :text
           { :cols => self.class.default_text_field_size, :rows => self.class.default_text_area_height }
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 833066edb..44c0ab2ad 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -261,11 +261,11 @@ def should_be_required(options)
             describe 'and validates_presence_of was called for the method' do
               it 'should be required' do
 
-                @new_post.class.should_receive(:validators_on).with(:title).and_return([
+                @new_post.class.should_receive(:validators_on).with(:title).any_number_of_times.and_return([
                   active_model_presence_validator([:title])
                 ])
 
-                @new_post.class.should_receive(:validators_on).with(:body).and_return([
+                @new_post.class.should_receive(:validators_on).with(:body).any_number_of_times.and_return([
                   active_model_presence_validator([:body], {:if => true})
                 ])
 
@@ -299,29 +299,29 @@ def should_be_required(options)
               end
 
               it 'should be required if the optional :if with a method string evaluates to true' do
-                @new_post.should_receive(:required_condition).and_return(true)
+                @new_post.should_receive(:required_condition).at_least(2).and_return(true)
                 should_be_required(:required => true, :options => { :if => :required_condition })
               end
 
               it 'should be required if the optional :if with a method string evaluates to false' do
-                @new_post.should_receive(:required_condition).and_return(false)
+                @new_post.should_receive(:required_condition).at_least(2).and_return(false)
                 should_be_required(:required => false, :options => { :if => :required_condition })
               end
 
               it 'should not be required if the optional :unless with a method string evaluates to false' do
-                 @new_post.should_receive(:required_condition).and_return(false)
+                 @new_post.should_receive(:required_condition).at_least(2).and_return(false)
                 should_be_required(:required => true, :options => { :unless => :required_condition })
               end
 
                it 'should be required if the optional :unless with a method string evaluates to true' do
-                 @new_post.should_receive(:required_condition).and_return(true)
+                 @new_post.should_receive(:required_condition).at_least(2).and_return(true)
                  should_be_required(:required => false, :options => { :unless => :required_condition })
                end
             end
 
             # TODO make a matcher for this?
             def should_be_required(options)
-              @new_post.class.should_receive(:validators_on).with(:body).and_return([
+              @new_post.class.should_receive(:validators_on).with(:body).at_least(2).and_return([
                 active_model_presence_validator([:body], options[:options])
               ])
 
@@ -342,7 +342,7 @@ def should_be_required(options)
 
             describe 'and validates_presence_of was not called for the method' do
               before do
-                @new_post.class.should_receive(:validators_on).with(:title).and_return([])
+                @new_post.class.should_receive(:validators_on).with(:title).at_least(2).and_return([])
               end
 
               it 'should not be required' do
diff --git a/spec/inputs/string_input_spec.rb b/spec/inputs/string_input_spec.rb
index a54da9ae3..0b0b3f284 100644
--- a/spec/inputs/string_input_spec.rb
+++ b/spec/inputs/string_input_spec.rb
@@ -16,7 +16,7 @@
         concat(builder.input(:title, :as => :string))
       end
     end
-    
+
     it_should_have_input_wrapper_with_class(:string)
     it_should_have_input_wrapper_with_id("post_title_input")
     it_should_have_label_with_text(/Title/)
@@ -44,7 +44,7 @@ def input_field_for_method_should_have_maxlength(method, maxlength)
 
       describe 'and validates_length_of was called for the method' do
         it 'should have a maxlength matching validation range top' do
-          @new_post.class.should_receive(:reflect_on_validations_for).with(:title).at_least(2).and_return([
+          @new_post.class.should_receive(:reflect_on_validations_for).with(:title).any_number_of_times.and_return([
             mock('MacroReflection', :macro => :validates_length_of, :name => :title, :options => {:within => 5..42})
           ])
 
@@ -52,7 +52,7 @@ def input_field_for_method_should_have_maxlength(method, maxlength)
         end
 
         it 'should have a maxlength matching validation maximum' do
-          @new_post.class.should_receive(:reflect_on_validations_for).with(:title).at_least(2).and_return([
+          @new_post.class.should_receive(:reflect_on_validations_for).with(:title).any_number_of_times.and_return([
             mock('MacroReflection', :macro => :validates_length_of, :name => :title, :options => {:maximum => 42})
           ])
           input_field_for_method_should_have_maxlength :title, 42
@@ -61,7 +61,7 @@ def input_field_for_method_should_have_maxlength(method, maxlength)
 
       describe 'and validates_length_of was not called for the method' do
         it "should use default maxlength" do
-          @new_post.class.should_receive(:reflect_on_validations_for).with(:title).at_least(2).and_return([])
+          @new_post.class.should_receive(:reflect_on_validations_for).with(:title).at_least(1).and_return([])
           input_field_for_method_should_have_maxlength :title, 50
         end
       end
@@ -79,50 +79,8 @@ def input_field_for_method_should_have_maxlength(method, maxlength)
       end
 
       describe 'and validates_length_of was called for the method' do
-        it 'should have a maxlength' do
-          @new_post.class.should_receive(:validators_on).with(:title).at_least(2).and_return([
-            active_model_length_validator([:title], {:within => 5..42})
-          ])
-
-          @new_post.class.should_receive(:validators_on).with(:body).at_least(2).and_return([
-            active_model_length_validator([:body], {:if => true, :maximum => 42})
-          ])
-
-          input_field_for_method_should_have_maxlength(:title, 42)
-          input_field_for_method_should_have_maxlength(:body, 42)
-        end
-
-        it 'should have default maxlength if the optional :if condition is not satisifed' do
-          @new_post.class.should_receive(:validators_on).with(:title).at_least(2).and_return([
-            active_model_length_validator([:title], {:maximum => 42, :if => false})
-          ])
-
-          input_field_for_method_should_have_maxlength(:title, default_maxlength)
-        end
-
-        # TODO make a matcher for this?
-        def should_be_required(options)
-          @new_post.class.should_receive(:validators_on).with(:body).and_return([
-            active_model_presence_validator([:body], options[:options])
-          ])
-
-          form = semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:body))
-          end
-
-          output_buffer.concat(form) if Formtastic::Util.rails3?
-
-          if options[:required]
-            output_buffer.should_not have_tag('form li.optional')
-            output_buffer.should have_tag('form li.required')
-          else
-            output_buffer.should have_tag('form li.optional')
-            output_buffer.should_not have_tag('form li.required')
-          end
-        end
-
         def should_have_maxlength(maxlength, options)
-          @new_post.class.should_receive(:validators_on).with(:title).at_least(2).and_return([
+          @new_post.class.should_receive(:validators_on).with(:title).at_least(1).and_return([
             active_model_length_validator([:title], options[:options])
           ])
 
@@ -131,7 +89,15 @@ def should_have_maxlength(maxlength, options)
           end
 
           output_buffer.concat(form) if Formtastic::Util.rails3?
-          output_buffer.should have_tag("form li input[@maxlength='#{maxlength}']")
+          output_buffer.should have_tag("form li input##{@new_post.class.name.underscore}_title[@maxlength='#{maxlength}']")
+        end
+
+        it 'should have maxlength if the optional :if or :unless options are not supplied' do
+          should_have_maxlength(42, :options => {:maximum => 42})
+        end
+
+        it 'should have default maxlength if the optional :if condition is not satisifed' do
+          should_have_maxlength(default_maxlength, :options => {:maximum => 42, :if => false})
         end
 
         it 'should have default_maxlength if the optional :if proc evaluates to false' do
@@ -143,12 +109,12 @@ def should_have_maxlength(maxlength, options)
         end
 
         it 'should have default maxlength if the optional :if with a method name evaluates to false' do
-          @new_post.should_receive(:specify_maxlength).and_return(false)
+          @new_post.should_receive(:specify_maxlength).at_least(1).and_return(false)
           should_have_maxlength(default_maxlength, :options => { :maximum => 42, :if => :specify_maxlength })
         end
 
         it 'should have maxlength if the optional :if with a method name evaluates to true' do
-          @new_post.should_receive(:specify_maxlength).and_return(true)
+          @new_post.should_receive(:specify_maxlength).at_least(1).and_return(true)
           should_have_maxlength(42, :options => { :maximum => 42, :if => :specify_maxlength })
         end
 
@@ -161,12 +127,12 @@ def should_have_maxlength(maxlength, options)
         end
 
         it 'should have default maxlength if the optional :unless with a method name evaluates to true' do
-          @new_post.should_receive(:specify_maxlength).and_return(true)
+          @new_post.should_receive(:specify_maxlength).at_least(1).and_return(true)
           should_have_maxlength(default_maxlength, :options => { :maximum => 42, :unless => :specify_maxlength })
         end
 
         it 'should have maxlength if the optional :unless with a method name evaluates to false' do
-          @new_post.should_receive(:specify_maxlength).and_return(false)
+          @new_post.should_receive(:specify_maxlength).at_least(1).and_return(false)
           should_have_maxlength(42, :options => { :maximum => 42, :unless => :specify_maxlength })
         end
       end

From 41744bb5e37f681a37b6324b50798505d8b3085d Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Mon, 27 Sep 2010 09:49:22 -0300
Subject: [PATCH 234/992] Update license

---
 Gemfile.lock | 8 ++++----
 MIT-LICENSE  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7e795cacc..22a84ebfd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,8 +2,8 @@ PATH
   remote: .
   specs:
     formtastic (1.1.0)
-      actionpack (>= 2.3.0)
-      activesupport (>= 2.3.0)
+      actionpack (>= 2.3.7)
+      activesupport (>= 2.3.7)
       i18n (>= 0.4.0)
 
 GEM
@@ -48,8 +48,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (>= 2.3.0)
-  activesupport (>= 2.3.0)
+  actionpack (>= 2.3.7)
+  activesupport (>= 2.3.7)
   formtastic!
   i18n (>= 0.4.0)
   rspec-rails (>= 1.2.6)
diff --git a/MIT-LICENSE b/MIT-LICENSE
index b32f74184..ef6f718d0 100644
--- a/MIT-LICENSE
+++ b/MIT-LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2008 Justin French
+Copyright (c) 2008-2010 Justin French
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

From 5137ce5456ce28769b031dfe89fdad73b731c37f Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Mon, 27 Sep 2010 10:07:20 -0300
Subject: [PATCH 235/992] Remove old formtastic_stylesheets generator

Closes #369
---
 .../formtastic_stylesheets_generator.rb          | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 generators/formtastic_stylesheets/formtastic_stylesheets_generator.rb

diff --git a/generators/formtastic_stylesheets/formtastic_stylesheets_generator.rb b/generators/formtastic_stylesheets/formtastic_stylesheets_generator.rb
deleted file mode 100644
index cf3255506..000000000
--- a/generators/formtastic_stylesheets/formtastic_stylesheets_generator.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-class FormtasticStylesheetsGenerator < Rails::Generator::Base
-  
-  def initialize(*runtime_args)
-    puts %q{
-===================================================
-Please run `./script/generate formtastic` instead.
-===================================================
-  }
-  end
-  
-  def manifest
-    record do |m|
-    end
-  end
-  
-end
\ No newline at end of file

From fc663a0b9152d21bbd67cc6dd6a2bd0655b2e2f2 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Mon, 27 Sep 2010 10:29:53 -0300
Subject: [PATCH 236/992] Change all `find(:all)` to `all`

---
 lib/formtastic.rb                     | 16 +++++++-------
 spec/inputs/check_boxes_input_spec.rb | 32 +++++++++++++--------------
 spec/inputs/radio_input_spec.rb       | 16 +++++++-------
 spec/inputs/select_input_spec.rb      | 18 +++++++--------
 spec/support/custom_macros.rb         | 14 ++++++------
 5 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 1b1b42578..14a514cb1 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -688,13 +688,13 @@ def hidden_input(method, options)
       #
       # 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).
+      # parent's class name from the method name and simply calling all on it 
+      # (VehicleOwner.all in the example above).
       #
       # Examples:
       #
       #   f.input :author, :collection => @authors
-      #   f.input :author, :collection => Author.find(:all)
+      #   f.input :author, :collection => Author.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"]
@@ -839,12 +839,12 @@ def time_zone_input(method, options)
       #
       # 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).
+      # (Author.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 => Author.all
       #   f.input :author, :as => :radio, :collection => [@justin, @kate]
       #   f.input :author, :collection => ["Justin", "Kate", "Amelia", "Gus", "Meg"]
       #
@@ -1098,13 +1098,13 @@ def date_or_datetime_input(method, options)
       #
       # 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).
+      # by inferring the parent's class name from the method name and simply calling all on
+      # it (Author.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 => Author.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:
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index f95dba59a..05bc7e0f9 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -37,7 +37,7 @@
     it 'should generate an ordered list with a list item for each choice' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li fieldset ol')
-      output_buffer.should have_tag('form li fieldset ol li input[@type=checkbox]', :count => ::Post.find(:all).size)
+      output_buffer.should have_tag('form li fieldset ol li input[@type=checkbox]', :count => ::Post.all.size)
     end
 
     it 'should have one option with a "checked" attribute' do
@@ -47,14 +47,14 @@
 
     it 'should not generate hidden inputs with default value blank' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
-      output_buffer.should_not have_tag("form li fieldset ol li label input[@type='hidden'][@value='']", :count => ::Post.find(:all).size)
+      output_buffer.should_not have_tag("form li fieldset ol li label input[@type='hidden'][@value='']", :count => ::Post.all.size)
     end
 
     describe "each choice" do
 
       it 'should contain a label for the radio input with a nested input and label text' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
-        ::Post.find(:all).each do |post|
+        ::Post.all.each do |post|
           output_buffer.should have_tag('form li fieldset ol li label', /#{post.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='author_post_ids_#{post.id}']")
         end
@@ -62,14 +62,14 @@
 
       it 'should use values as li.class when value_as_class is true' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
-        ::Post.find(:all).each do |post|
+        ::Post.all.each do |post|
           output_buffer.should have_tag("form li fieldset ol li.post_#{post.id} label")
         end
       end
 
       it 'should have a checkbox input but no hidden field for each post' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
-        ::Post.find(:all).each do |post|
+        ::Post.all.each do |post|
           output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@name='author[post_ids][]']", :count => 1)
         end
@@ -98,7 +98,7 @@
         end
         output_buffer.concat(form) if Formtastic::Util.rails3?
 
-        ::Post.find(:all).each do |post|
+        ::Post.all.each do |post|
           output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@name='author[post_ids][]']", :count => 2)
         end
@@ -106,7 +106,7 @@
       end
 
       it "should mark input as checked if it's the the existing choice" do
-        ::Post.find(:all).include?(@fred.posts.first).should be_true
+        ::Post.all.include?(@fred.posts.first).should be_true
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
       end
@@ -116,7 +116,7 @@
       before(:each) do
         output_buffer.replace ''
         @form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
-          concat(builder.input(:author_id, :as => :check_boxes, :collection => ::Author.find(:all)))
+          concat(builder.input(:author_id, :as => :check_boxes, :collection => ::Author.all))
         end
       end
 
@@ -127,12 +127,12 @@
 
       it 'shold generate an li tag for each item in the collection' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag('form li fieldset ol li input[@type=checkbox]', :count => ::Author.find(:all).size)
+        output_buffer.should have_tag('form li fieldset ol li input[@type=checkbox]', :count => ::Author.all.size)
       end
 
       it 'should generate labels for each item' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
-        ::Author.find(:all).each do |author|
+        ::Author.all.each do |author|
           output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='project_author_id_#{author.id}']")
         end
@@ -140,7 +140,7 @@
 
       it 'should generate inputs for each item' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
-        ::Author.find(:all).each do |author|
+        ::Author.all.each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#project_author_id_#{author.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@type='checkbox']")
           output_buffer.should have_tag("form li fieldset ol li label input[@value='#{author.id}']")
@@ -171,19 +171,19 @@
       end
 
       it 'should have a checkbox input for each post' do
-        ::Post.find(:all).each do |post|
+        ::Post.all.each do |post|
           output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
-          output_buffer.should have_tag("form li fieldset ol li label input[@name='author[post_ids][]']", :count => ::Post.find(:all).length)
+          output_buffer.should have_tag("form li fieldset ol li label input[@name='author[post_ids][]']", :count => ::Post.all.length)
         end
       end
 
       it "should mark input as checked if it's the the existing choice" do
-        ::Post.find(:all).include?(@fred.posts.first).should be_true
+        ::Post.all.include?(@fred.posts.first).should be_true
         output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
       end
 
       it 'should not generate empty hidden inputs' do
-        output_buffer.should_not have_tag("form li fieldset ol li label input[@type='hidden'][@value='']", :count => ::Post.find(:all).length)
+        output_buffer.should_not have_tag("form li fieldset ol li label input[@type='hidden'][@value='']", :count => ::Post.all.length)
       end
     end
 
@@ -403,7 +403,7 @@
     it 'should render checkboxes' do
       # I'm aware these two lines test the same thing
       output_buffer.should have_tag('input[type="checkbox"]', :count => 2)
-      output_buffer.should have_tag('input[type="checkbox"]', :count => ::Author.find(:all).size)
+      output_buffer.should have_tag('input[type="checkbox"]', :count => ::Author.all.size)
     end
     
     it 'should only select checkboxes that are present in the association' do
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index e8a3f33e1..d0301fcbb 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -37,7 +37,7 @@
     it 'should generate an ordered list with a list item for each choice' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li fieldset ol')
-      output_buffer.should have_tag('form li fieldset ol li', :count => ::Author.find(:all).size)
+      output_buffer.should have_tag('form li fieldset ol li', :count => ::Author.all.size)
     end
 
     it 'should have one option with a "checked" attribute' do
@@ -49,7 +49,7 @@
 
       it 'should contain a label for the radio input with a nested input and label text' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
-        ::Author.find(:all).each do |author|
+        ::Author.all.each do |author|
           output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_id_#{author.id}']")
         end
@@ -57,14 +57,14 @@
 
       it 'should use values as li.class when value_as_class is true' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
-        ::Author.find(:all).each do |author|
+        ::Author.all.each do |author|
           output_buffer.should have_tag("form li fieldset ol li.author_#{author.id} label")
         end
       end
 
       it "should have a radio input" do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
-        ::Author.find(:all).each do |author|
+        ::Author.all.each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#post_author_id_#{author.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@type='radio']")
           output_buffer.should have_tag("form li fieldset ol li label input[@value='#{author.id}']")
@@ -101,7 +101,7 @@
       before(:each) do
         output_buffer.replace ''
         @form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
-          concat(builder.input(:author_id, :as => :radio, :collection => ::Author.find(:all)))
+          concat(builder.input(:author_id, :as => :radio, :collection => ::Author.all))
         end
       end
 
@@ -112,12 +112,12 @@
 
       it 'should generate an li tag for each item in the collection' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag('form li fieldset ol li', :count => ::Author.find(:all).size)
+        output_buffer.should have_tag('form li fieldset ol li', :count => ::Author.all.size)
       end
 
       it 'should generate labels for each item' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
-        ::Author.find(:all).each do |author|
+        ::Author.all.each do |author|
           output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='project_author_id_#{author.id}']")
         end
@@ -136,7 +136,7 @@
 
       it 'should generate inputs for each item' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
-        ::Author.find(:all).each do |author|
+        ::Author.all.each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#project_author_id_#{author.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@type='radio']")
           output_buffer.should have_tag("form li fieldset ol li label input[@value='#{author.id}']")
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 4e2249d5c..a934c1c76 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -141,8 +141,8 @@
 
     it 'should have a select option for each Author' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
-      output_buffer.should have_tag("form li select[@name='post[author_id]'] option", :count => ::Author.find(:all).size + 1)
-      ::Author.find(:all).each do |author|
+      output_buffer.should have_tag("form li select[@name='post[author_id]'] option", :count => ::Author.all.size + 1)
+      ::Author.all.each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
       end
     end
@@ -295,8 +295,8 @@
 
     it 'should have a select option for each Post' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
-      output_buffer.should have_tag('form li select option', :count => ::Post.find(:all).size)
-      ::Post.find(:all).each do |post|
+      output_buffer.should have_tag('form li select option', :count => ::Post.all.size)
+      ::Post.all.each do |post|
         output_buffer.should have_tag("form li select option[@value='#{post.id}']", /#{post.to_label}/)
       end
     end
@@ -340,8 +340,8 @@
 
     it 'should have a select option for each Author' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
-      output_buffer.should have_tag('form li select option', :count => ::Author.find(:all).size)
-      ::Author.find(:all).each do |author|
+      output_buffer.should have_tag('form li select option', :count => ::Author.all.size)
+      ::Author.all.each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
       end
     end
@@ -379,7 +379,7 @@
   describe 'when no object is given' do
     before(:each) do
       @form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
-        concat(builder.input(:author, :as => :select, :collection => ::Author.find(:all)))
+        concat(builder.input(:author, :as => :select, :collection => ::Author.all))
       end
     end
 
@@ -392,12 +392,12 @@
     it 'should generate select inputs' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li select#project_author')
-      output_buffer.should have_tag('form li select option', :count => ::Author.find(:all).size + 1)
+      output_buffer.should have_tag('form li select option', :count => ::Author.all.size + 1)
     end
 
     it 'should generate an option to each item' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
-      ::Author.find(:all).each do |author|
+      ::Author.all.each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
       end
     end
diff --git a/spec/support/custom_macros.rb b/spec/support/custom_macros.rb
index b4c5ff386..e7582e53d 100644
--- a/spec/support/custom_macros.rb
+++ b/spec/support/custom_macros.rb
@@ -255,7 +255,7 @@ def it_should_use_the_collection_when_provided(as, countable)
       describe 'when the :collection option is provided' do
 
         before do
-          @authors = ::Author.find(:all) * 2
+          @authors = ::Author.all * 2
           output_buffer.replace '' # clears the output_buffer from the before block, hax!
         end
 
@@ -407,7 +407,7 @@ def it_should_use_the_collection_when_provided(as, countable)
 
             it 'should have options with text content from the specified method' do
               output_buffer.concat(@form) if Formtastic::Util.rails3?
-              ::Author.find(:all).each do |author|
+              ::Author.all.each do |author|
                 output_buffer.should have_tag("form li.#{as}", /#{author.login}/)
               end
             end
@@ -422,7 +422,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             
             it 'should have options with the proc applied to each' do
               output_buffer.concat(@form) if Formtastic::Util.rails3?
-              ::Author.find(:all).each do |author|
+              ::Author.all.each do |author|
                 output_buffer.should have_tag("form li.#{as}", /#{author.login.reverse}/)
               end
             end
@@ -436,7 +436,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             describe "when the collection objects respond to #{label_method}" do
               before do
                 @fred.stub!(:respond_to?).and_return { |m| m.to_s == label_method || m.to_s == 'id' }
-                ::Author.find(:all).each { |a| a.stub!(label_method).and_return('The Label Text') }
+                ::Author.all.each { |a| a.stub!(label_method).and_return('The Label Text') }
 
                 @form = semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:author, :as => as))
@@ -445,7 +445,7 @@ def it_should_use_the_collection_when_provided(as, countable)
 
               it "should render the options with #{label_method} as the label" do
                 output_buffer.concat(@form) if Formtastic::Util.rails3?
-                ::Author.find(:all).each do |author|
+                ::Author.all.each do |author|
                   output_buffer.should have_tag("form li.#{as}", /The Label Text/)
                 end
               end
@@ -465,7 +465,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             
             it 'should have options with values from specified method' do
               output_buffer.concat(@form) if Formtastic::Util.rails3?
-              ::Author.find(:all).each do |author|
+              ::Author.all.each do |author|
                 output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login}']")
               end
             end
@@ -480,7 +480,7 @@ def it_should_use_the_collection_when_provided(as, countable)
 
             it 'should have options with the proc applied to each value' do
               output_buffer.concat(@form) if Formtastic::Util.rails3?
-              ::Author.find(:all).each do |author|
+              ::Author.all.each do |author|
                 output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login.reverse}']")
               end
             end

From 4283a2ab9b62f73ebbb17cfa374f76d5eba84b45 Mon Sep 17 00:00:00 2001
From: Mattias Pfeiffer <mattias@pfeiffer.dk>
Date: Sat, 28 Aug 2010 03:24:32 +0800
Subject: [PATCH 237/992] Respect :include_blank in has_many and HABTM select
 inputs

---
 lib/formtastic.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 14a514cb1..83f843f33 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -753,16 +753,16 @@ def hidden_input(method, options)
       #
       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
+          options[:include_blank]   ||= false
           html_options[:multiple] = true if html_options[:multiple].nil?
           html_options[:size]     ||= 5
         end
+        options = set_include_blank(options)
         options[:selected] = options[:selected].first if options[:selected].present? && html_options[:multiple] == false
         input_name = generate_association_input_name(method)
 

From d4abe337b48120372cd25539265397de3733888a Mon Sep 17 00:00:00 2001
From: Mattias Pfeiffer <mattias@pfeiffer.dk>
Date: Sat, 28 Aug 2010 03:29:39 +0800
Subject: [PATCH 238/992] Only respect :include_blank if :multiple == false

---
 lib/formtastic.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 83f843f33..466aec7e0 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -758,9 +758,14 @@ def select_input(method, options)
 
         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
+          
+          if html_options[:multiple]
+            options[:include_blank]   = false
+          else
+            options[:include_blank]   ||= false
+          end
         end
         options = set_include_blank(options)
         options[:selected] = options[:selected].first if options[:selected].present? && html_options[:multiple] == false

From fb39a8036a50d88b71676a84edcde249249afb85 Mon Sep 17 00:00:00 2001
From: Richard Smith <r.s@me.com>
Date: Thu, 4 Mar 2010 20:50:09 +0000
Subject: [PATCH 239/992] Allow for a custom form class to be set as the
 default

---
 lib/formtastic.rb        | 5 +++--
 spec/form_helper_spec.rb | 8 ++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 466aec7e0..d5a7bb513 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1865,7 +1865,8 @@ def escape_html_entities(string) #:nodoc:
   #   <% end %>
   module SemanticFormHelper
     @@builder = ::Formtastic::SemanticFormBuilder
-    mattr_accessor :builder
+    @@default_form_class = 'formtastic'
+    mattr_accessor :builder, :default_form_class
         
     # Override the default ActiveRecordHelper behaviour of wrapping the input.
     # This gets taken care of semantically by adding an error class to the LI tag
@@ -1903,7 +1904,7 @@ def semantic_#{meth}(record_or_name_or_array, *args, &proc)
           singularizer = defined?(ActiveModel::Naming.singular) ? ActiveModel::Naming.method(:singular) : ActionController::RecordIdentifier.method(:singular_class_name)
 
           class_names = options[:html][:class] ? options[:html][:class].split(" ") : []
-          class_names << "formtastic"
+          class_names << @@default_form_class
           class_names << case record_or_name_or_array
             when String, Symbol then record_or_name_or_array.to_s                                  # :post => "post"
             when Array then options[:as] || singularizer.call(record_or_name_or_array.last.class)  # [@post, @comment] # => "comment"
diff --git a/spec/form_helper_spec.rb b/spec/form_helper_spec.rb
index 550954985..4722e68fd 100644
--- a/spec/form_helper_spec.rb
+++ b/spec/form_helper_spec.rb
@@ -25,6 +25,14 @@
       output_buffer.should have_tag("form.formtastic")
     end
 
+    it 'adds a class of "xyz" to the generated form' do
+      ::Formtastic::SemanticFormHelper.default_form_class = 'xyz'
+      form = semantic_form_for(::Post.new, :as => :post, :url => '/hello') do |builder|
+      end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag("form.xyz")
+    end
+
     it 'adds class matching the object name to the generated form when a symbol is provided' do
       form = semantic_form_for(@new_post, :url => '/hello') do |builder|
       end

From 104c65c7d9a8dac0dde139d82e26320605283c07 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Mon, 27 Sep 2010 19:02:49 +0200
Subject: [PATCH 240/992] Tests for :include_blank option on HABTM and has_many
 associations

---
 spec/inputs/select_input_spec.rb | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index a934c1c76..827d73e8e 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -301,7 +301,25 @@
       end
     end
     
-    it 'should not have a blank option' do
+    it 'should not have a blank option by default' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.should_not have_tag("form li select option[@value='']")
+    end
+
+    it 'should respect the :include_blank option for single selects' do
+      @form = semantic_form_for(@fred) do |builder|
+        concat(builder.input(:posts, :as => :select, :multiple => false, :size => 1, :include_blank => true))
+      end
+
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag("form li select option[@value='']")
+    end
+
+    it 'should ignore the :include_blank option for multiple selects' do
+      @form = semantic_form_for(@fred) do |builder|
+        concat(builder.input(:posts, :as => :select, :multiple => true, :include_blank => true))
+      end
+
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should_not have_tag("form li select option[@value='']")
     end

From 39b1e423c31af8ed7d9783c70f082b0adb02c34a Mon Sep 17 00:00:00 2001
From: Szymon Nowak <szimek@gmail.com>
Date: Wed, 10 Feb 2010 20:20:02 +0100
Subject: [PATCH 241/992] Allow to pass an HTML string as a collection.

---
 lib/formtastic.rb                | 10 +++++++---
 spec/inputs/select_input_spec.rb | 16 ++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index d5a7bb513..31459fccf 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -686,9 +686,9 @@ def hidden_input(method, options)
       #   </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 all on it 
+      # You can customize the options available in the select by passing in a collection. A collection can be given
+      # as an Array, a Hash or as a String (containing pre-rendered HTML options). If not provided, the choices are
+      # found by inferring the parent's class name from the method name and simply calling all on it
       # (VehicleOwner.all in the example above).
       #
       # Examples:
@@ -698,6 +698,7 @@ def hidden_input(method, options)
       #   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"]
+      #   f.input :author, :collection => grouped_options_for_select(["North America",[["United States","US"],["Canada","CA"]]])
       #
       # The :label_method option allows you to customize the text label inside each option tag two ways:
       #
@@ -1478,6 +1479,9 @@ def default_input_type(method, options = {}) #:nodoc:
       def find_collection_for_column(column, options) #:nodoc:
         collection = find_raw_collection_for_column(column, options)
 
+        # Return if we have a plain string
+        return collection if collection.instance_of?(String)
+
         # 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) &&
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 827d73e8e..5f43a0e78 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -47,6 +47,22 @@
         end
       end
     end
+
+    describe 'using a string' do
+      before do
+        @string ="<option value='0'>0</option><option value='1'>1</option>"
+        @form = semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:title, :as => :select, :collection => @string))
+        end
+      end
+
+      it 'should render select options using provided HTML string' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        2.times do |v|
+          output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
+        end
+      end
+    end
   end
 
   describe 'for boolean columns' do

From 433dae255534795e1ac9cbd41c7a2752446af996 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Mon, 27 Sep 2010 19:20:04 +0200
Subject: [PATCH 242/992] Whitespace Cleanup

---
 formtastic.gemspec                            |   3 +-
 generators/form/form_generator.rb             |  32 ++---
 generators/formtastic/formtastic_generator.rb |  14 +-
 generators/formtastic/templates/formtastic.rb |   2 +
 install.rb                                    |   4 +-
 lib/formtastic.rb                             | 128 +++++++++---------
 lib/formtastic/i18n.rb                        |  14 +-
 lib/formtastic/layout_helper.rb               |  10 +-
 lib/formtastic/railtie.rb                     |   4 +-
 lib/formtastic/util.rb                        |   2 +
 .../formtastic/install/install_generator.rb   |   2 +-
 spec/buttons_spec.rb                          |   2 +-
 spec/commit_button_spec.rb                    |  42 +++---
 spec/custom_builder_spec.rb                   |  24 ++--
 spec/defaults_spec.rb                         |  14 +-
 spec/error_proc_spec.rb                       |  16 +--
 spec/errors_spec.rb                           |  36 ++---
 spec/form_helper_spec.rb                      |  12 +-
 spec/helpers/layout_helper_spec.rb            |  10 +-
 spec/i18n_spec.rb                             |  54 ++++----
 spec/include_blank_spec.rb                    |   4 +-
 spec/input_spec.rb                            |  36 ++---
 spec/inputs/boolean_input_spec.rb             |  10 +-
 spec/inputs/check_boxes_input_spec.rb         |  36 ++---
 spec/inputs/country_input_spec.rb             |  58 ++++----
 spec/inputs/datetime_input_spec.rb            |  80 +++++------
 spec/inputs/file_input_spec.rb                |   6 +-
 spec/inputs/hidden_input_spec.rb              |  18 +--
 spec/inputs/numeric_input_spec.rb             |  12 +-
 spec/inputs/password_input_spec.rb            |  10 +-
 spec/inputs/radio_input_spec.rb               |  28 ++--
 spec/inputs/select_input_spec.rb              |  54 ++++----
 spec/inputs/string_input_spec.rb              |  16 +--
 spec/inputs/text_input_spec.rb                |  12 +-
 spec/inputs/time_input_spec.rb                |  50 +++----
 spec/inputs/time_zone_input_spec.rb           |  16 +--
 spec/inputs_spec.rb                           |  34 ++---
 spec/label_spec.rb                            |   4 +-
 spec/semantic_fields_for_spec.rb              |   8 +-
 spec/spec_helper.rb                           |  40 +++---
 spec/support/custom_macros.rb                 |  88 ++++++------
 spec/support/output_buffer.rb                 |   2 +
 spec/support/test_environment.rb              |   2 +
 uninstall.rb                                  |   2 +
 44 files changed, 537 insertions(+), 514 deletions(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index ea599420c..53baac0df 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 Gem::Specification.new do |s|
   s.name = %q{formtastic}
   s.version = "1.1.0"
@@ -40,4 +42,3 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
 
 end
-
diff --git a/generators/form/form_generator.rb b/generators/form/form_generator.rb
index 96ba3ce55..9316b50f4 100644
--- a/generators/form/form_generator.rb
+++ b/generators/form/form_generator.rb
@@ -15,27 +15,27 @@
 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]
@@ -49,7 +49,7 @@ def manifest
         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"
@@ -62,9 +62,9 @@ def manifest
       end
     end
   end
-  
+
   protected
-    
+
     # Save to lipboard with multiple OS support.
     def save_to_clipboard(data)
       return unless data
@@ -83,38 +83,38 @@ def save_to_clipboard(data)
         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
\ No newline at end of file
+
+end
diff --git a/generators/formtastic/formtastic_generator.rb b/generators/formtastic/formtastic_generator.rb
index 43d69eb3f..663195cd4 100644
--- a/generators/formtastic/formtastic_generator.rb
+++ b/generators/formtastic/formtastic_generator.rb
@@ -1,9 +1,11 @@
+# encoding: utf-8
+
 class FormtasticGenerator < Rails::Generator::Base
-  
+
   def initialize(*runtime_args)
     super
   end
-  
+
   def manifest
     record do |m|
       m.directory File.join('config', 'initializers')
@@ -14,11 +16,11 @@ def manifest
       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
\ No newline at end of file
+
+end
diff --git a/generators/formtastic/templates/formtastic.rb b/generators/formtastic/templates/formtastic.rb
index 1010b25bc..266f78eae 100644
--- a/generators/formtastic/templates/formtastic.rb
+++ b/generators/formtastic/templates/formtastic.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # Set the default text field size when input is a string. Default is 50.
 # Formtastic::SemanticFormBuilder.default_text_field_size = 50
 
diff --git a/install.rb b/install.rb
index 079f44702..5660d791f 100644
--- a/install.rb
+++ b/install.rb
@@ -1,2 +1,4 @@
+# encoding: utf-8
+
 puts "Run `./script/generate formtastic` if you want (copies optional config file and some stylesheets into your app)"
-puts "Run `./script/generate form MODEL_NAME` to generate some semantic form markup for any existing model(s) (optional)"
\ No newline at end of file
+puts "Run `./script/generate form MODEL_NAME` to generate some semantic form markup for any existing model(s) (optional)"
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 31459fccf..bf5366cba 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -87,7 +87,7 @@ def input(method, options = {})
           "Please set default values in your models (using an after_initialize callback) or in your controller set-up. " <<
           "See http://api.rubyonrails.org/classes/ActiveRecord/Callbacks.html for more information.", caller)
       end
-      
+
       options[:required] = method_required?(method) unless options.key?(:required)
       options[:as]     ||= default_input_type(method, options)
 
@@ -264,7 +264,7 @@ def inputs(*args, &block)
       html_options = args.extract_options!
       html_options[:class] ||= "inputs"
       html_options[:name] = title
-      
+
       if html_options[:for] # Nested form
         inputs_for_nested_attributes(*(args << html_options), &block)
       elsif block_given?
@@ -279,7 +279,7 @@ def inputs(*args, &block)
         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
@@ -325,9 +325,9 @@ def commit_button(*args)
 
       if @object && @object.respond_to?(:new_record?)
         key = @object.new_record? ? :create : :update
-        
+
         # Deal with some complications with ActiveRecord::Base.human_name and two name models (eg UserPost)
-        # ActiveRecord::Base.human_name falls back to ActiveRecord::Base.name.humanize ("Userpost") 
+        # ActiveRecord::Base.human_name falls back to ActiveRecord::Base.name.humanize ("Userpost")
         # if there's no i18n, which is pretty crappy.  In this circumstance we want to detect this
         # fall back (human_name == name.humanize) and do our own thing name.underscore.humanize ("User Post")
         if @object.class.model_name.respond_to?(:human)
@@ -498,13 +498,13 @@ def association_columns(*by_associations) #:nodoc:
           []
         end
       end
-      
+
       # Returns nil, or a symbol like :belongs_to or :has_many
       def association_macro_for_method(method) #:nodoc:
         reflection = self.reflection_for(method)
         reflection.macro if reflection
       end
-      
+
       def association_primary_key(method)
         reflection = self.reflection_for(method)
         reflection.options[:foreign_key] if reflection && !reflection.options[:foreign_key].blank?
@@ -721,9 +721,9 @@ def hidden_input(method, options)
       #   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)
@@ -739,14 +739,14 @@ def hidden_input(method, options)
       # 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 
+      # 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 
+      #
+      # 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:
       #
@@ -761,7 +761,7 @@ def select_input(method, options)
         if reflection && [ :has_many, :has_and_belongs_to_many ].include?(reflection.macro)
           html_options[:multiple] = true if html_options[:multiple].nil?
           html_options[:size]     ||= 5
-          
+
           if html_options[:multiple]
             options[:include_blank]   = false
           else
@@ -773,7 +773,7 @@ def select_input(method, options)
         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 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)
@@ -785,7 +785,7 @@ def select_input(method, options)
           # Here comes the monster with 8 arguments
           self.grouped_collection_select(input_name, group_collection,
                                          group_association, group_label_method,
-                                         value, label, 
+                                         value, label,
                                          strip_formtastic_options(options), html_options)
         else
           collection = find_collection_for_column(method, options)
@@ -807,9 +807,9 @@ def select_input(method, options)
       # 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)
@@ -843,7 +843,7 @@ def time_zone_input(method, options)
       #     </ol>
       #   </fieldset>
       #
-      # You can customize the choices available in the radio button set by passing in a collection (an Array or 
+      # 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.all in the example above).
       #
@@ -873,7 +873,7 @@ def time_zone_input(method, options)
       #   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:
@@ -881,7 +881,7 @@ def time_zone_input(method, options)
       #   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 
+      # 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).
       #
@@ -911,7 +911,7 @@ def radio_input(method, options)
           li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
           template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
         end
-        
+
         template.content_tag(:fieldset,
           legend_tag(method, options) << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
         )
@@ -925,14 +925,14 @@ def radio_input(method, options)
       # 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
       #   f.input :created_at, :as => :date, :labels => { :year => "Year", :month => "Month", :day => "Day" }
       #
-      # Some of Rails' options for select_date are supported, but not everything yet, see 
+      # Some of Rails' options for select_date are supported, but not everything yet, see
       # documentation of date_or_datetime_input() for more information.
       def date_input(method, options)
         options = set_include_blank(options)
@@ -946,15 +946,15 @@ def date_input(method, options)
       # text as value.  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
       #   f.input :created_at, :as => :date, :labels => { :year => "Year", :month => "Month", :day => "Day",
       #                                                   :hour => "Hour", :minute => "Minute" }
       #
-      # Some of Rails' options for select_date are supported, but not everything yet, see 
+      # Some of Rails' options for select_date are supported, but not everything yet, see
       # documentation of date_or_datetime_input() for more information.
       def datetime_input(method, options)
         options = set_include_blank(options)
@@ -968,22 +968,22 @@ def datetime_input(method, options)
       # 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
       #   f.input :created_at, :as => :date, :labels => { :hour => "Hour", :minute => "Minute" }
       #
-      # Some of Rails' options for select_time are supported, but not everything yet, see 
+      # Some of Rails' options for select_time are supported, but not everything yet, see
       # documentation of date_or_datetime_input() for more information.
       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
-      
-      # Helper method used by :as => (:date|:datetime|:time).  Generates a fieldset containing a 
-      # legend (for what would normally be considered the label), and an ordered list of list items 
+
+      # Helper method used by :as => (:date|:datetime|:time).  Generates a fieldset containing a
+      # legend (for what would normally be considered the label), and an ordered list of list items
       # for year, month, day, hour, etc, each containing a label and a select.  Example:
       #
       # <fieldset>
@@ -1134,24 +1134,24 @@ def date_or_datetime_input(method, options)
       #   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
       #
       #
       # Formtastic works around a bug in rails handling of check box collections by
-      # not generating the hidden fields for state checking of the checkboxes 
+      # not generating the hidden fields for state checking of the checkboxes
       # The :hidden_fields option provides a way to re-enable these hidden inputs by
       # setting it to true.
       #
       #   f.input :authors, :as => :check_boxes, :hidden_fields => false
       #   f.input :authors, :as => :check_boxes, :hidden_fields => true
       #
-      # 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 
+      # 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)
@@ -1216,7 +1216,7 @@ def find_selected_values_for_column(method, options)
         selected_values = [*selected_values].compact
         selected_values
       end
-      
+
       # Outputs a custom hidden field for check_boxes
       def create_hidden_field_for_check_boxes(method, value_as_class) #:nodoc:
         options = value_as_class ? { :class => [method.to_s.singularize, 'default'].join('_') } : {}
@@ -1231,14 +1231,14 @@ def create_check_boxes(input_name, html_options = {}, checked_value = "1", unche
         self.check_box(input_name, html_options, checked_value, unchecked_value)
       end
 
-      # Outputs a country select input, wrapping around a regular country_select helper. 
+      # 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", 
+      # 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:
@@ -1260,9 +1260,9 @@ def country_input(method, options)
       # :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)
@@ -1446,7 +1446,7 @@ def default_input_type(method, options = {}) #:nodoc:
           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).
@@ -1553,16 +1553,16 @@ def detect_label_method(collection) #:nodoc:
       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. 
+        # eg.
         # class Project
         #   belongs_to :parent, :class_name => 'Project', :foreign_key => 'parent_id'
         #   belongs_to :customer
@@ -1572,9 +1572,9 @@ def detect_group_association(method, group_by)
         # 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. 
+        # eg.
         # class Project
         #   belongs_to :parent, :class_name => 'Project', :foreign_key => 'parent_id'
         #   belongs_to :customer
@@ -1584,9 +1584,9 @@ def detect_group_association(method, group_by)
         # 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
 
       # Returns a hash to be used by radio and select inputs when a boolean field
@@ -1637,7 +1637,7 @@ def column_for(method) #:nodoc:
       # found for the method.
       #
       # By default, the if/unless options of the validations are evaluated and only the validations
-      # that should be run for the current object state are returned. Pass :all to the last 
+      # that should be run for the current object state are returned. Pass :all to the last
       # parameter to return :all validations regardless of if/unless options.
       #
       # Requires the ValidationReflection plugin to be present or an ActiveModel. Returns an epmty
@@ -1757,13 +1757,13 @@ def humanized_attribute_name(method) #:nodoc:
       #   '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:
@@ -1857,7 +1857,7 @@ def escape_html_entities(string) #: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, as are forms with 
+  # 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| %>
@@ -1871,7 +1871,7 @@ module SemanticFormHelper
     @@builder = ::Formtastic::SemanticFormBuilder
     @@default_form_class = 'formtastic'
     mattr_accessor :builder, :default_form_class
-        
+
     # 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.
@@ -1879,7 +1879,7 @@ module SemanticFormHelper
     FIELD_ERROR_PROC = proc do |html_tag, instance_tag|
       html_tag
     end
-    
+
     def with_custom_field_error_proc(&block)
       default_field_error_proc = ::ActionView::Base.field_error_proc
       ::ActionView::Base.field_error_proc = FIELD_ERROR_PROC
@@ -1887,7 +1887,7 @@ def with_custom_field_error_proc(&block)
     ensure
       ::ActionView::Base.field_error_proc = default_field_error_proc
     end
-    
+
     def semantic_remote_form_for_wrapper(record_or_name_or_array, *args, &proc)
       options = args.extract_options!
       if self.respond_to? :remote_form_for
@@ -1915,7 +1915,7 @@ def semantic_#{meth}(record_or_name_or_array, *args, &proc)
             else options[:as] || singularizer.call(record_or_name_or_array.class)                  # @post => "post"
           end
           options[:html][:class] = class_names.join(" ")
-          
+
           with_custom_field_error_proc do
             #{meth}(record_or_name_or_array, *(args << options), &proc)
           end
@@ -1923,8 +1923,8 @@ def semantic_#{meth}(record_or_name_or_array, *args, &proc)
       END_SRC
     end
     alias :semantic_remote_form_for_real :semantic_remote_form_for
-    alias :semantic_remote_form_for :semantic_remote_form_for_wrapper    
+    alias :semantic_remote_form_for :semantic_remote_form_for_wrapper
     alias :semantic_form_remote_for :semantic_remote_form_for
-    
+
   end
 end
diff --git a/lib/formtastic/i18n.rb b/lib/formtastic/i18n.rb
index 5d917fdfb..a1834720f 100644
--- a/lib/formtastic/i18n.rb
+++ b/lib/formtastic/i18n.rb
@@ -1,6 +1,8 @@
+# encoding: utf-8
+
 module Formtastic
   module I18n
-    
+
     DEFAULT_SCOPE = [:formtastic].freeze
     DEFAULT_VALUES = {
         :required       => 'required',
@@ -17,9 +19,9 @@ module I18n
         '%{nested_model}.%{attribute}',
         '%{attribute}'
       ]
-      
+
     class << self
-      
+
       def translate(*args)
         key = args.shift.to_sym
         options = args.extract_options!
@@ -28,8 +30,8 @@ def translate(*args)
         ::I18n.translate(key, *(args << options))
       end
       alias :t :translate
-      
+
     end
-    
+
   end
-end
\ No newline at end of file
+end
diff --git a/lib/formtastic/layout_helper.rb b/lib/formtastic/layout_helper.rb
index daea784bc..e2a950694 100644
--- a/lib/formtastic/layout_helper.rb
+++ b/lib/formtastic/layout_helper.rb
@@ -1,10 +1,12 @@
+# encoding: utf-8
+
 module Formtastic
   module LayoutHelper
-    
+
     def formtastic_stylesheet_link_tag
-      stylesheet_link_tag("formtastic") + 
+      stylesheet_link_tag("formtastic") +
       stylesheet_link_tag("formtastic_changes")
     end
-  
+
   end
-end
\ No newline at end of file
+end
diff --git a/lib/formtastic/railtie.rb b/lib/formtastic/railtie.rb
index 4a7910240..2d116e47d 100644
--- a/lib/formtastic/railtie.rb
+++ b/lib/formtastic/railtie.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'formtastic'
 require 'formtastic/layout_helper'
 require 'rails'
@@ -9,4 +11,4 @@ class Railtie < Rails::Railtie
       ActionView::Base.send(:include, Formtastic::LayoutHelper)
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/formtastic/util.rb b/lib/formtastic/util.rb
index 301e39ddc..11e2e786f 100644
--- a/lib/formtastic/util.rb
+++ b/lib/formtastic/util.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # Adapted from the rails3 compatibility shim in Haml 2.2
 module Formtastic
   module Util
diff --git a/lib/generators/formtastic/install/install_generator.rb b/lib/generators/formtastic/install/install_generator.rb
index ddbb0bbe4..ecf781e60 100644
--- a/lib/generators/formtastic/install/install_generator.rb
+++ b/lib/generators/formtastic/install/install_generator.rb
@@ -7,7 +7,7 @@ def self.source_root
       # Set source directory for the templates to the rails2 generator template directory
       @source_root ||= File.expand_path(File.join('..', '..', '..', '..', 'generators', 'formtastic', 'templates'), File.dirname(__FILE__))
     end
-    
+
     def self.banner
       "rails generate formtastic:install [options]"
     end
diff --git a/spec/buttons_spec.rb b/spec/buttons_spec.rb
index cdd2221a0..c723d28b2 100644
--- a/spec/buttons_spec.rb
+++ b/spec/buttons_spec.rb
@@ -4,7 +4,7 @@
 describe 'SemanticFormBuilder#buttons' do
 
   include FormtasticSpecHelper
-  
+
   before do
     @output_buffer = ''
     mock_everything
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index 00531188c..ea5f4b5f4 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -4,7 +4,7 @@
 describe 'SemanticFormBuilder#commit_button' do
 
   include FormtasticSpecHelper
-  
+
   before do
     @output_buffer = ''
     mock_everything
@@ -44,11 +44,11 @@
       output_buffer.should have_tag('li.commit input#my_id')
       output_buffer.should have_tag('li.commit input.my_class')
     end
-    
+
   end
 
   describe "its accesskey" do
-  
+
     it 'should allow nil default' do
       with_config :default_commit_button_accesskey, nil do
         output_buffer.should_not have_tag('li.commit input[@accesskey]')
@@ -94,24 +94,24 @@
   end
 
   describe 'when the first option is a string and the second is a hash' do
-    
+
     before do
       @new_post.stub!(:new_record?).and_return(false)
       @form = semantic_form_for(@new_post) do |builder|
         concat(builder.commit_button("a string", :button_html => { :class => "pretty"}))
       end
     end
-    
+
     it "should render the string as the value of the button" do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('li input[@value="a string"]')
     end
-    
+
     it "should deal with the options hash" do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('li input.pretty')
     end
-    
+
   end
 
   describe 'when the first option is a hash' do
@@ -122,12 +122,12 @@
         concat(builder.commit_button(:button_html => { :class => "pretty"}))
       end
     end
-    
+
     it "should deal with the options hash" do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('li input.pretty')
     end
-    
+
   end
 
   describe 'label' do
@@ -149,11 +149,11 @@
           before do
             ::I18n.backend.store_translations :en, :formtastic => {:submit => 'Submit %{model}'}
           end
-          
+
           after do
             ::I18n.backend.reload!
           end
-          
+
           it 'should render an input with default I18n-localized label (fallback)' do
             form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
               concat(builder.commit_button)
@@ -251,7 +251,7 @@
                 }
             ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
           end
-          
+
           after do
             ::I18n.backend.reload!
           end
@@ -305,7 +305,7 @@
           before do
             ::I18n.backend.store_translations :en, :formtastic => {:update => 'Save %{model}'}
           end
-          
+
           after do
             ::I18n.backend.reload!
           end
@@ -334,7 +334,7 @@
           after do
             ::I18n.backend.reload!
           end
-          
+
           it 'should render an input with localized label (I18n)' do
             ::I18n.backend.store_translations :en,
               :formtastic => {
@@ -364,7 +364,7 @@
       end
     end
   end
-  
+
   describe 'when the model is two words' do
     before do
       output_buffer = ''
@@ -374,28 +374,28 @@ class ::UserPost
 
         def id
         end
-        
+
         def persisted?
         end
-        
+
         # Rails does crappy human_name
         def self.human_name
           "User post"
         end
       end
       @new_user_post = ::UserPost.new
-      
+
       @new_user_post.stub!(:new_record?).and_return(true)
       @form = semantic_form_for(@new_user_post, :url => '') do |builder|
         concat(builder.commit_button())
       end
     end
-    
+
     it "should render the string as the value of the button" do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('li input[@value="Create User post"]')
     end
-    
+
   end
-    
+
 end
diff --git a/spec/custom_builder_spec.rb b/spec/custom_builder_spec.rb
index 9934ba14f..0a20d5378 100644
--- a/spec/custom_builder_spec.rb
+++ b/spec/custom_builder_spec.rb
@@ -4,27 +4,27 @@
 describe 'Formtastic::SemanticFormHelper.builder' do
 
   include FormtasticSpecHelper
-  
+
   class MyCustomFormBuilder < ::Formtastic::SemanticFormBuilder
     def awesome_input(method, options)
       self.text_field(method)
     end
   end
-  
+
   before do
     @output_buffer = ''
     mock_everything
   end
-  
+
   it 'is the Formtastic::SemanticFormBuilder by default' do
     ::Formtastic::SemanticFormHelper.builder.should == ::Formtastic::SemanticFormBuilder
   end
-  
+
   it 'can be configured to use your own custom form builder' do
     # Set it to a custom builder class
     ::Formtastic::SemanticFormHelper.builder = MyCustomFormBuilder
     ::Formtastic::SemanticFormHelper.builder.should == MyCustomFormBuilder
-    
+
     # Reset it to the default
     ::Formtastic::SemanticFormHelper.builder = ::Formtastic::SemanticFormBuilder
     ::Formtastic::SemanticFormHelper.builder.should == ::Formtastic::SemanticFormBuilder
@@ -40,30 +40,30 @@ def awesome_input(method, options)
   end
 
   describe "when using a custom builder" do
-    
+
     before do
       @new_post.stub!(:title)
       ::Formtastic::SemanticFormHelper.builder = MyCustomFormBuilder
     end
-    
+
     after do
       ::Formtastic::SemanticFormHelper.builder = ::Formtastic::SemanticFormBuilder
     end
-    
+
     describe "semantic_form_for" do
-      
+
       it "should yield an instance of the custom builder" do
         semantic_form_for(@new_post) do |builder|
           builder.class.should == MyCustomFormBuilder
         end
       end
-      
+
       it "should allow me to call my custom input" do
         semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :awesome))
         end
       end
-    
+
     end
 
     describe "semantic_fields_for" do
@@ -77,7 +77,7 @@ def awesome_input(method, options)
       end
 
     end
-    
+
   end
 
   describe "when using a builder passed to form options" do
diff --git a/spec/defaults_spec.rb b/spec/defaults_spec.rb
index 2a2c1df00..140e24db2 100644
--- a/spec/defaults_spec.rb
+++ b/spec/defaults_spec.rb
@@ -2,19 +2,19 @@
 require 'spec_helper'
 
 describe 'Formtastic::SemanticFormBuilder-defaults' do
-  
+
   # Note: This spec might make better sense somewhere else. Just temporary.
-  
+
   describe "required string" do
-    
+
     it "should render proc with I18n correctly" do
       ::I18n.backend.store_translations :en, :formtastic => {:required => 'Haha!'}
-      
+
       required_string = Formtastic::SemanticFormBuilder.required_string
       required_string = required_string.is_a?(::Proc) ? required_string.call : required_string.to_s
       required_string.should == %{<abbr title="Haha!">*</abbr>}
     end
-    
+
   end
-  
-end
\ No newline at end of file
+
+end
diff --git a/spec/error_proc_spec.rb b/spec/error_proc_spec.rb
index 0f316f0c4..a499a437e 100644
--- a/spec/error_proc_spec.rb
+++ b/spec/error_proc_spec.rb
@@ -2,26 +2,26 @@
 require 'spec_helper'
 
 describe 'Rails field_error_proc' do
-  
+
   include FormtasticSpecHelper
-  
+
   before do
     @output_buffer = ''
     mock_everything
   end
-  
+
   it "should not be overridden globally for all form builders" do
     current_field_error_proc = ::ActionView::Base.field_error_proc
-    
+
     semantic_form_for(@new_post) do |builder|
       ::ActionView::Base.field_error_proc.should_not == current_field_error_proc
     end
-    
+
     ::ActionView::Base.field_error_proc.should == current_field_error_proc
-    
+
     form_for(@new_post) do |builder|
       ::ActionView::Base.field_error_proc.should == current_field_error_proc
     end
   end
-  
-end
\ No newline at end of file
+
+end
diff --git a/spec/errors_spec.rb b/spec/errors_spec.rb
index c5b9e8a76..0423792d8 100644
--- a/spec/errors_spec.rb
+++ b/spec/errors_spec.rb
@@ -2,9 +2,9 @@
 require 'spec_helper'
 
 describe 'SemanticFormBuilder#errors_on' do
-  
+
   include FormtasticSpecHelper
-  
+
   before do
     @output_buffer = ''
     mock_everything
@@ -12,19 +12,19 @@
     @errors = mock('errors')
     @new_post.stub!(:errors).and_return(@errors)
   end
-  
+
   describe 'when there are errors' do
     before do
       @errors.stub!(:[]).with(:title).and_return(@title_errors)
     end
-    
+
     it 'should render a paragraph with the errors joined into a sentence when inline_errors config is :sentence' do
       ::Formtastic::SemanticFormBuilder.inline_errors = :sentence
       semantic_form_for(@new_post) do |builder|
         builder.errors_on(:title).should have_tag('p.inline-errors', @title_errors.to_sentence)
       end
     end
-    
+
     it 'should render an unordered list with the class errors when inline_errors config is :list' do
       ::Formtastic::SemanticFormBuilder.inline_errors = :list
       semantic_form_for(@new_post) do |builder|
@@ -41,21 +41,21 @@
         builder.errors_on(:title).should have_tag('p.inline-errors', @title_errors.first)
       end
     end
-    
+
     it 'should return nil when inline_errors config is :none' do
       ::Formtastic::SemanticFormBuilder.inline_errors = :none
       semantic_form_for(@new_post) do |builder|
         builder.errors_on(:title).should be_nil
       end
     end
-    
+
   end
-  
+
   describe 'when there are no errors (nil)' do
     before do
       @errors.stub!(:[]).with(:title).and_return(nil)
     end
-    
+
     it 'should return nil when inline_errors config is :sentence, :list or :none' do
       [:sentence, :list, :none].each do |config|
         ::Formtastic::SemanticFormBuilder.inline_errors = config
@@ -65,12 +65,12 @@
       end
     end
   end
-  
+
   describe 'when there are no errors (empty array)' do
     before do
       @errors.stub!(:[]).with(:title).and_return([])
     end
-    
+
     it 'should return nil when inline_errors config is :sentence, :list or :none' do
       [:sentence, :list, :none].each do |config|
         ::Formtastic::SemanticFormBuilder.inline_errors = config
@@ -80,17 +80,17 @@
       end
     end
   end
-  
-  
+
+
   describe 'when there are errors on the association and column' do
-    
+
     it "should list all unique errors" do
       ::Formtastic::SemanticFormBuilder.inline_errors = :list
       ::Post.stub!(:reflections).and_return({:author => mock('reflection', :options => {}, :macro => :belongs_to)})
-      
+
       @errors.stub!(:[]).with(:author).and_return(['must not be blank'])
       @errors.stub!(:[]).with(:author_id).and_return(['is already taken', 'must not be blank']) # note the duplicate of association
-      
+
       form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author))
       end
@@ -98,8 +98,8 @@
       output_buffer.should have_tag("ul.errors li", /must not be blank/, :count => 1)
       output_buffer.should have_tag("ul.errors li", /is already taken/, :count => 1)
     end
-    
+
   end
-  
+
 end
 
diff --git a/spec/form_helper_spec.rb b/spec/form_helper_spec.rb
index 4722e68fd..63a50ef7a 100644
--- a/spec/form_helper_spec.rb
+++ b/spec/form_helper_spec.rb
@@ -2,14 +2,14 @@
 require 'spec_helper'
 
 describe 'SemanticFormHelper' do
-  
+
   include FormtasticSpecHelper
-  
+
   before do
     @output_buffer = ''
     mock_everything
   end
-  
+
   describe '#semantic_form_for' do
 
     it 'yields an instance of SemanticFormBuilder' do
@@ -99,7 +99,7 @@
         builder.object_name.should == "post"
       end
     end
-    
+
     it 'can be called with a generic style and instance variable' do
       if rails3?
         semantic_form_for(@new_post, :as => :post, :url => new_post_path) do |builder|
@@ -121,7 +121,7 @@
         builder.object_name.to_s.should == "post" # TODO: is this forced .to_s a bad assumption somewhere?
       end
     end
-    
+
     describe "with :builder option" do
       it "yields an instance of the given builder" do
         class MyAwesomeCustomBuilder < ::Formtastic::SemanticFormBuilder
@@ -131,7 +131,7 @@ class MyAwesomeCustomBuilder < ::Formtastic::SemanticFormBuilder
         end
       end
     end
-    
+
   end
 
   describe '#semantic_fields_for' do
diff --git a/spec/helpers/layout_helper_spec.rb b/spec/helpers/layout_helper_spec.rb
index e841c77ca..5430b1630 100644
--- a/spec/helpers/layout_helper_spec.rb
+++ b/spec/helpers/layout_helper_spec.rb
@@ -2,20 +2,20 @@
 require 'spec_helper'
 
 describe Formtastic::LayoutHelper do
-  
+
   include FormtasticSpecHelper
   include Formtastic::LayoutHelper
-  
+
   describe '#formtastic_stylesheet_link_tag' do
-    
+
     it 'should render a link to formtastic.css' do
       formtastic_stylesheet_link_tag.should have_tag("link[@href='/stylesheets/formtastic.css']")
     end
-    
+
     it 'should render a link to formtastic_changes.css' do
       formtastic_stylesheet_link_tag.should have_tag("link[@href='/stylesheets/formtastic_changes.css']")
     end
-    
+
   end
 end
 
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index 5893c03bb..3dba530a6 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -2,26 +2,26 @@
 require 'spec_helper'
 
 describe 'Formtastic::I18n' do
-  
+
   FORMTASTIC_KEYS = [:required, :yes, :no, :create, :update].freeze
-  
+
   it "should be defined" do
     lambda { ::Formtastic::I18n }.should_not raise_error(::NameError)
   end
-  
+
   describe "default translations" do
     it "should be defined" do
       lambda { ::Formtastic::I18n::DEFAULT_VALUES }.should_not raise_error(::NameError)
       ::Formtastic::I18n::DEFAULT_VALUES.is_a?(::Hash).should == true
     end
-    
+
     it "should exists for the core I18n lookup keys" do
       (::Formtastic::I18n::DEFAULT_VALUES.keys & FORMTASTIC_KEYS).size.should == FORMTASTIC_KEYS.size
     end
   end
-  
+
   describe "when I18n locales are available" do
-    
+
     before do
       @formtastic_strings = {
           :yes            => 'Default Yes',
@@ -39,7 +39,7 @@
     after do
       ::I18n.backend.reload!
     end
-    
+
     it "should translate core strings correctly" do
       ::I18n.backend.store_translations :en, {:formtastic => {:required => 'Default Required'}}
       ::Formtastic::I18n.t(:required).should  == "Default Required"
@@ -48,23 +48,23 @@
       ::Formtastic::I18n.t(:create, :model => 'Post').should == "Default Create Post"
       ::Formtastic::I18n.t(:update, :model => 'Post').should == "Default Update Post"
     end
-    
+
     it "should all belong to scope 'formtastic'" do
       ::Formtastic::I18n.t(:duck, :scope => [:custom_scope]).should == 'Duck'
     end
-    
+
     it "should override default I18n lookup args if these are specified" do
       ::Formtastic::I18n.t(:duck_pond, :scope => [:custom_scope], :ducks => 15).should == '15 ducks in a pond'
     end
-    
+
     it "should be possible to override default values" do
       ::Formtastic::I18n.t(:required, :default => 'Nothing found!').should == 'Nothing found!'
     end
-    
+
   end
-  
+
   describe "when no I18n locales are available" do
-    
+
     before do
       ::I18n.backend.reload!
     end
@@ -74,17 +74,17 @@
         ::Formtastic::I18n.t(key, :model => '%{model}').should == ::Formtastic::I18n::DEFAULT_VALUES[key]
       end
     end
-    
+
   end
-  
+
   describe "I18n string lookups" do
-    
+
     include FormtasticSpecHelper
-    
+
     before do
       @output_buffer = ''
       mock_everything
-      
+
       ::I18n.backend.store_translations :en, :formtastic => {
           :labels => {
               :title    => "Hello world!",
@@ -94,20 +94,20 @@
             }
         }
       ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
-      
+
       @new_post.stub!(:title)
       @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :string, :limit => 255))
     end
-    
+
     after do
       ::I18n.backend.reload!
       ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
     end
-    
+
     it "lookup scopes should be defined" do
       lambda { ::Formtastic::I18n::SCOPES }.should_not raise_error(::NameError)
     end
-    
+
     it "should be able to translate with namespaced object" do
       form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:title))
@@ -115,7 +115,7 @@
       output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form label", /Hello post!/)
     end
-    
+
     it "should be able to translate without form-object" do
       form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:title))
@@ -123,7 +123,7 @@
       output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form label", /Hello project!/)
     end
-    
+
     it 'should be able to translate nested objects with nested translations' do
       form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
         builder.semantic_fields_for(:task) do |f|
@@ -146,7 +146,7 @@
 
 
     # TODO: Add spec for namespaced models?
-    
+
   end
-  
-end
\ No newline at end of file
+
+end
diff --git a/spec/include_blank_spec.rb b/spec/include_blank_spec.rb
index 132b1a21a..1a1db5051 100644
--- a/spec/include_blank_spec.rb
+++ b/spec/include_blank_spec.rb
@@ -11,7 +11,7 @@
 
     @new_post.stub!(:author_id).and_return(nil)
     @new_post.stub!(:publish_at).and_return(nil)
-    
+
     @select_input_types = {
         :select => :author,
         :datetime => :publish_at,
@@ -71,4 +71,4 @@
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 44c0ab2ad..078ab673f 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -2,9 +2,9 @@
 require 'spec_helper'
 
 describe 'SemanticFormBuilder#input' do
-  
+
   include FormtasticSpecHelper
-  
+
   before do
     @output_buffer = ''
     mock_everything
@@ -462,7 +462,7 @@ def should_be_required(options)
           default_input_type(:float).should == :numeric
           default_input_type(:decimal).should == :numeric
         end
-        
+
         it 'should default to :country for :string columns named country' do
           default_input_type(:string, :country).should == :country
         end
@@ -512,7 +512,7 @@ def should_be_required(options)
     end
 
     describe ':label option' do
-      
+
       describe 'when provided' do
         it 'should be passed down to the label tag' do
           form = semantic_form_for(@new_post) do |builder|
@@ -541,19 +541,19 @@ def should_be_required(options)
       end
 
       describe 'when not provided' do
-        describe 'when localized label is provided' do 
-          describe 'and object is given' do 
+        describe 'when localized label is provided' do
+          describe 'and object is given' do
             describe 'and label_str_method not default' do
               it 'should render a label with localized label (I18n)' do
                 with_config :label_str_method, :capitalize do
                   @localized_label_text = 'Localized title'
                   @new_post.stub!(:meta_description)
                   @new_post.class.should_receive(:human_attribute_name).with('meta_description').and_return(@localized_label_text)
-                
+
                   form = semantic_form_for(@new_post) do |builder|
                     concat(builder.input(:meta_description))
                   end
-                
+
                   output_buffer.concat(form) if Formtastic::Util.rails3?
                   output_buffer.should have_tag('form li label', Regexp.new('^' + @localized_label_text))
                 end
@@ -561,7 +561,7 @@ def should_be_required(options)
             end
           end
         end
-        
+
         describe 'when localized label is NOT provided' do
           describe 'and object is not given' do
             it 'should default the humanized method name, passing it down to the label tag' do
@@ -589,23 +589,23 @@ def should_be_required(options)
               output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
             end
           end
-          
+
           describe 'and object is given with label_str_method set to :capitalize' do
             it 'should capitalize method name, passing it down to the label tag' do
               with_config :label_str_method, :capitalize do
                 @new_post.stub!(:meta_description)
-            
+
                 form = semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:meta_description))
                 end
-            
+
                 output_buffer.concat(form) if Formtastic::Util.rails3?
                 output_buffer.should have_tag("form li label", /#{'meta_description'.capitalize}/)
               end
             end
           end
         end
-        
+
         describe 'when localized label is provided' do
           before do
             @localized_label_text = 'Localized title'
@@ -652,7 +652,7 @@ def should_be_required(options)
           end
         end
       end
-      
+
     end
 
     describe ':hint option' do
@@ -702,7 +702,7 @@ def should_be_required(options)
               output_buffer.concat(form) if Formtastic::Util.rails3?
               output_buffer.should have_tag('form li p.inline-hints', @localized_hint_text)
             end
-            
+
             it 'should render a hint paragraph containing an optional localized hint (I18n) if first is not set' do
               form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => true))
@@ -711,7 +711,7 @@ def should_be_required(options)
               output_buffer.should have_tag('form li p.inline-hints', @default_localized_hint_text)
             end
           end
-          
+
           describe 'when provided value (label value) is set to FALSE' do
             it 'should not render a hint paragraph' do
               form = semantic_form_for(@new_post) do |builder|
@@ -722,7 +722,7 @@ def should_be_required(options)
             end
           end
         end
-        
+
         describe 'when localized hint (I18n) is a model with attribute hints' do
           it "should see the provided hash as a blank entry" do
             ::I18n.backend.store_translations :en,
@@ -739,7 +739,7 @@ def should_be_required(options)
             output_buffer.should_not have_tag('form li p.inline-hints', @localized_hint_text)
           end
         end
-        
+
         describe 'when localized hint (I18n) is not provided' do
           it 'should not render a hint paragraph' do
             form = semantic_form_for(@new_post) do |builder|
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index 83bdebedb..5621d86be 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -2,18 +2,18 @@
 require 'spec_helper'
 
 describe 'boolean input' do
-  
+
   include FormtasticSpecHelper
-  
+
   before do
     @output_buffer = ''
     mock_everything
-    
+
     @form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean))
     end
   end
-   
+
   it_should_have_input_wrapper_with_class("boolean")
   it_should_have_input_wrapper_with_id("post_allow_comments_input")
   it_should_apply_error_logic_for_input_type(:boolean)
@@ -86,7 +86,7 @@
     describe "selected" do
       before do
         @new_post.stub!(:allow_comments).and_return(false)
-        
+
         with_deprecation_silenced do
           @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:allow_comments, :as => :boolean, :selected => true))
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 05bc7e0f9..86b2abfc6 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -2,37 +2,37 @@
 require 'spec_helper'
 
 describe 'check_boxes input' do
-  
+
   include FormtasticSpecHelper
-  
+
   describe 'for a has_many association' do
     before do
       @output_buffer = ''
       mock_everything
-      
+
       @form = semantic_form_for(@fred) do |builder|
         concat(builder.input(:posts, :as => :check_boxes, :value_as_class => true))
       end
     end
-    
+
     it_should_have_input_wrapper_with_class("check_boxes")
     it_should_have_input_wrapper_with_id("author_posts_input")
     it_should_have_a_nested_fieldset
     it_should_apply_error_logic_for_input_type(:check_boxes)
     it_should_call_find_on_association_class_when_no_collection_is_provided(:check_boxes)
     it_should_use_the_collection_when_provided(:check_boxes, 'input[@type="checkbox"]')
-    
+
     it 'should generate a legend containing a label with text for the input' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li fieldset legend.label label')
       output_buffer.should have_tag('form li fieldset legend.label label', /Posts/)
     end
-    
+
     it 'should not link the label within the legend to any input' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should_not have_tag('form li fieldset legend label[@for^="author_post_ids_"]')
     end
-    
+
 
     it 'should generate an ordered list with a list item for each choice' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
@@ -167,7 +167,7 @@
         form = semantic_form_for(@fred) do |builder|
           concat(builder.input(:posts, :as => :check_boxes, :value_as_class => true, :hidden_fields => false))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?        
+        output_buffer.concat(form) if Formtastic::Util.rails3?
       end
 
       it 'should have a checkbox input for each post' do
@@ -231,7 +231,7 @@
       describe "multiple selected items" do
         before do
           @new_post.stub!(:author_ids).and_return(nil)
-          
+
           with_deprecation_silenced do
             @form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:authors, :as => :check_boxes, :selected => [@bob.id, @fred.id]))
@@ -250,7 +250,7 @@
       end
 
     end
-    
+
     it 'should warn about :selected deprecation' do
       with_deprecation_silenced do
         ::ActiveSupport::Deprecation.should_receive(:warn).any_number_of_times
@@ -259,7 +259,7 @@
         end
       end
     end
-    
+
 
     describe 'when :disabled is set' do
       before do
@@ -318,7 +318,7 @@
       end
 
     end
-    
+
     describe "with i18n of the legend label" do
 
       before do
@@ -379,7 +379,7 @@
           concat(builder.input(:authors, :as => :check_boxes, :required => true))
         end
       end
-  
+
       it "should output the correct label title" do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("legend.label label abbr")
@@ -389,29 +389,29 @@
   end
 
   describe 'for a has_and_belongs_to_many association' do
-    
+
     before do
       @output_buffer = ''
       mock_everything
-      
+
       @form = semantic_form_for(@freds_post) do |builder|
         concat(builder.input(:authors, :as => :check_boxes))
       end
       output_buffer.concat(@form) if Formtastic::Util.rails3?
     end
-    
+
     it 'should render checkboxes' do
       # I'm aware these two lines test the same thing
       output_buffer.should have_tag('input[type="checkbox"]', :count => 2)
       output_buffer.should have_tag('input[type="checkbox"]', :count => ::Author.all.size)
     end
-    
+
     it 'should only select checkboxes that are present in the association' do
       # I'm aware these two lines test the same thing
       output_buffer.should have_tag('input[checked="checked"]', :count => 1)
       output_buffer.should have_tag('input[checked="checked"]', :count => @freds_post.authors.size)
     end
-    
+
   end
 
   describe 'for an association when a :collection is provided' do
diff --git a/spec/inputs/country_input_spec.rb b/spec/inputs/country_input_spec.rb
index 7ed5e28f9..56108347c 100644
--- a/spec/inputs/country_input_spec.rb
+++ b/spec/inputs/country_input_spec.rb
@@ -2,38 +2,38 @@
 require 'spec_helper'
 
 describe 'country input' do
-  
+
   include FormtasticSpecHelper
-  
+
   before do
     @output_buffer = ''
     mock_everything
   end
 
   describe "when country_select is not available as a helper from a plugin" do
-    
+
     it "should raise an error, sugesting the author installs a plugin" do
-      lambda { 
+      lambda {
         semantic_form_for(@new_post) do |builder|
           concat(builder.input(:country, :as => :country))
         end
-      }.should raise_error  
+      }.should raise_error
     end
-    
+
   end
-  
+
   describe "when country_select is available as a helper (from a plugin)" do
-    
+
     before do
       @form = semantic_form_for(@new_post) do |builder|
         builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         concat(builder.input(:country, :as => :country))
       end
     end
-    
+
     it_should_have_input_wrapper_with_class("country")
     it_should_have_input_wrapper_with_id("post_country_input")
-    
+
     # TODO -- needs stubbing inside the builder block, tricky!
     #it_should_apply_error_logic_for_input_type(:country)
 
@@ -48,71 +48,71 @@
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form li select")
     end
-    
+
   end
-  
+
   describe ":priority_countries option" do
-      
+
     it "should be passed down to the country_select helper when provided" do
       priority_countries = ["Foo", "Bah"]
       semantic_form_for(@new_post) do |builder|
         builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         builder.should_receive(:country_select).with(:country, priority_countries, {}, {}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
-        
+
         concat(builder.input(:country, :as => :country, :priority_countries => priority_countries))
       end
     end
-      
-    it "should default to the @@priority_countries config when absent" do 
+
+    it "should default to the @@priority_countries config when absent" do
       priority_countries = ::Formtastic::SemanticFormBuilder.priority_countries
       priority_countries.should_not be_empty
       priority_countries.should_not be_nil
-      
+
       semantic_form_for(@new_post) do |builder|
         builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         builder.should_receive(:country_select).with(:country, priority_countries, {}, {}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
-        
+
         concat(builder.input(:country, :as => :country))
       end
     end
-    
+
   end
-  
+
   describe "matching" do
-    
+
     describe "when the attribute is 'country'" do
-      
+
       before do
         @form = semantic_form_for(@new_post) do |builder|
           builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
           concat(builder.input(:country))
         end
       end
-      
+
       it "should render a country input" do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag "form li.country"
       end
     end
-    
+
     describe "whent the attribute is 'country_something'" do
-      
+
       before do
         @form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:country_subdivision))
           concat(builder.input(:country_code))
         end
       end
-      
+
       it "should render a country input" do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag "form li.country"
         output_buffer.should have_tag "form li.string", :count => 2
       end
-      
+
     end
-    
+
   end
-  
+
 end
 
diff --git a/spec/inputs/datetime_input_spec.rb b/spec/inputs/datetime_input_spec.rb
index a22f8ea69..b53e4b1ce 100644
--- a/spec/inputs/datetime_input_spec.rb
+++ b/spec/inputs/datetime_input_spec.rb
@@ -2,49 +2,49 @@
 require 'spec_helper'
 
 describe 'datetime input' do
-  
+
   include FormtasticSpecHelper
-  
+
   before do
     @output_buffer = ''
     mock_everything
-    
+
     @new_post.should_receive(:publish_at=).any_number_of_times
     @new_post.should_receive(:created_at=).any_number_of_times
     @bob.should_receive(:created_at=).any_number_of_times
     @new_post.should_receive(:title=).any_number_of_times # Macro stuff forces this.
   end
-  
+
   describe "general" do
-    
+
     before do
       output_buffer.replace ''
       @form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:publish_at, :as => :datetime))
       end
     end
- 
+
     it_should_have_input_wrapper_with_class("datetime")
     it_should_have_input_wrapper_with_id("post_publish_at_input")
     it_should_have_a_nested_fieldset
     it_should_apply_error_logic_for_input_type(:datetime)
-    
+
     it 'should have a legend and label with the label text inside the fieldset' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset legend.label label', /Publish at/)
     end
-    
+
     it 'should associate the legend label with the first select' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset legend.label label[@for="post_publish_at_1i"]')
     end
-    
+
     it 'should have an ordered list of five items inside the fieldset' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset ol')
       output_buffer.should have_tag('form li.datetime fieldset ol li', :count => 5)
     end
-    
+
     it 'should have five labels for year, month, day, hour and minute' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => 5)
@@ -54,12 +54,12 @@
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /hour/i)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /minute/i)
     end
-    
+
     it 'should have five selects for year, month, day, hour and minute' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset ol li select', :count => 5)
     end
-    
+
     it 'should generate a sanitized label and matching ids for attribute' do
       form = semantic_form_for(@new_post) do |builder|
         fields = builder.semantic_fields_for(@bob, :index => 10) do |bob_builder|
@@ -68,7 +68,7 @@
         concat(fields)
       end
       output_buffer.concat(form) if Formtastic::Util.rails3?
-    
+
       1.upto(5) do |i|
         output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_10_created_at_#{i}i']")
         output_buffer.should have_tag("form li fieldset ol li #post_author_10_created_at_#{i}i")
@@ -82,12 +82,12 @@
       form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:publish_at, :as => :datetime, :discard_day => true))
       end
-  
+
       output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form li input[@type='hidden'][@value='27']")
     end
   end
-  
+
   describe 'inputs order' do
     it 'should have a default' do
       output_buffer.replace ''
@@ -98,7 +98,7 @@
         builder.input(:publish_at, :as => :datetime)
       end
     end
-  
+
     it 'should be specified with :order option' do
       ::I18n.backend.store_translations 'en', :date => { :order => [:month, :year, :day] }
       output_buffer.replace ''
@@ -110,7 +110,7 @@
         ::I18n.backend.store_translations 'en', :date => nil
       end
     end
-  
+
     it 'should be changed through I18n' do
       output_buffer.replace ''
       semantic_form_for(@new_post) do |builder|
@@ -121,7 +121,7 @@
       end
     end
   end
-  
+
   describe 'when the locale changes the label text' do
     before do
       ::I18n.backend.store_translations 'en', :datetime => {:prompts => {
@@ -133,14 +133,14 @@
         concat(builder.input(:publish_at, :as => :datetime))
       end
     end
-  
+
     after do
       ::I18n.backend.store_translations 'en', :formtastic => {
         :year => nil, :month => nil, :day => nil,
         :hour => nil, :minute => nil
       }
     end
-  
+
     it 'should have translated labels for year, month, day, hour and minute' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Year/)
@@ -150,7 +150,7 @@
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Minute/)
     end
   end
-  
+
   describe 'when no object is given' do
     before(:each) do
       output_buffer.replace ''
@@ -158,23 +158,23 @@
         concat(builder.input(:publish_at, :as => :datetime))
       end
     end
-  
+
     it 'should have fieldset with legend - classified as a label' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset legend.label', /Publish at/)
     end
-  
+
     it 'should have labels for each input' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => 5)
     end
-  
+
     it 'should have selects for each inputs' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset ol li select', :count => 5)
     end
   end
-  
+
   #describe 'when an object is given and the attribute value is nil' do
   #  before(:each) do
   #    @new_post.stub!(:publish_at).and_return(nil)
@@ -183,20 +183,20 @@
   #      concat(builder.input(:publish_at, :as => :datetime))
   #    end
   #  end
-  #  
+  #
   #  it 'should not select a value' do
   #    output_buffer.should_not have_tag('form li.datetime option[@selected]')
   #  end
-  #  
+  #
   #end
-  
+
   describe ':selected option' do
-    
+
     describe "when the object has a value" do
       it "should select the object value (ignoring :selected)" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => Time.mktime(2012))
-        with_deprecation_silenced do 
+        with_deprecation_silenced do
           @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:created_at, :as => :datetime, :selected => Time.mktime(1999)))
           end
@@ -206,7 +206,7 @@
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='2012'][@selected]", :count => 1)
       end
     end
-    
+
     describe 'when the object has no value' do
       it "should select the :selected if provided as a Date" do
         output_buffer.replace ''
@@ -220,7 +220,7 @@
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='1999'][@selected]", :count => 1)
       end
-      
+
       it "should select the :selected if provided as a Time" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
@@ -233,7 +233,7 @@
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='1999'][@selected]", :count => 1)
       end
-      
+
       it "should not select an option if the :selected is provided as nil" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
@@ -245,7 +245,7 @@
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li ol li select#post_created_at_1i option[@selected]")
       end
-      
+
       it "should select nothing if a :selected is not provided" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
@@ -256,7 +256,7 @@
         output_buffer.should_not have_tag("form li ol li select option[@selected]")
       end
     end
-    
+
     it 'should warn about :selected deprecation' do
       with_deprecation_silenced do
         ::ActiveSupport::Deprecation.should_receive(:warn).any_number_of_times
@@ -265,9 +265,9 @@
         end
       end
     end
-    
+
   end
-  
+
   describe ':labels option' do
     fields = [:year, :month, :day, :hour, :minute]
     fields.each do |field|
@@ -282,7 +282,7 @@
           output_buffer.should have_tag('form li.datetime fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
         end
       end
-  
+
       it "should not display the label for the #{field} field when :labels[:#{field}] is blank" do
         output_buffer.replace ''
         form = semantic_form_for(@new_post) do |builder|
@@ -296,7 +296,7 @@
       end
     end
   end
-  
+
   it 'should warn about :selected deprecation' do
     with_deprecation_silenced do
       ::ActiveSupport::Deprecation.should_receive(:warn).any_number_of_times
@@ -305,6 +305,6 @@
       end
     end
   end
-  
+
 end
 
diff --git a/spec/inputs/file_input_spec.rb b/spec/inputs/file_input_spec.rb
index c5610731d..71f98d5bb 100644
--- a/spec/inputs/file_input_spec.rb
+++ b/spec/inputs/file_input_spec.rb
@@ -2,13 +2,13 @@
 require 'spec_helper'
 
 describe 'file input' do
-  
+
   include FormtasticSpecHelper
-  
+
   before do
     @output_buffer = ''
     mock_everything
-    
+
     @form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:body, :as => :file))
     end
diff --git a/spec/inputs/hidden_input_spec.rb b/spec/inputs/hidden_input_spec.rb
index fd7837bad..d9f44fe91 100644
--- a/spec/inputs/hidden_input_spec.rb
+++ b/spec/inputs/hidden_input_spec.rb
@@ -2,13 +2,13 @@
 require 'spec_helper'
 
 describe 'hidden input' do
-  
+
   include FormtasticSpecHelper
-  
+
   before do
     @output_buffer = ''
     mock_everything
-    
+
     @form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:secret, :as => :hidden))
       concat(builder.input(:author_id, :as => :hidden, :value => 99))
@@ -28,12 +28,12 @@
     output_buffer.should have_tag("form li input#post_secret[@type=\"hidden\"]")
     output_buffer.should have_tag("form li input#post_secret[@name=\"post[secret]\"]")
   end
-  
+
   it "should pass any explicitly specified value - using :value" do
     output_buffer.concat(@form) if Formtastic::Util.rails3?
     output_buffer.should have_tag("form li input#post_author_id[@type=\"hidden\"][@value=\"99\"]")
   end
-  
+
   # Handle Formtastic :input_html options for consistency.
   it "should pass any explicitly specified value - using :input_html options" do
     output_buffer.concat(@form) if Formtastic::Util.rails3?
@@ -49,16 +49,16 @@
     output_buffer.concat(@form) if Formtastic::Util.rails3?
     output_buffer.should have_tag("form li input#post_author[@type=\"hidden\"][@value=\"formtastic_value\"]")
   end
-  
+
   it "should not render inline errors" do
     @errors = mock('errors')
     @errors.stub!(:[]).with(:secret).and_return(["foo", "bah"])
     @new_post.stub!(:errors).and_return(@errors)
-    
+
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:secret, :as => :hidden))
     end
-    
+
     output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should_not have_tag("form li p.inline-errors")
     output_buffer.should_not have_tag("form li ul.errors")
@@ -73,6 +73,6 @@
     output_buffer.should_not have_tag("form li p.inline-hints")
     output_buffer.should_not have_tag("form li ul.hints")
   end
-    
+
 end
 
diff --git a/spec/inputs/numeric_input_spec.rb b/spec/inputs/numeric_input_spec.rb
index 8fa1ebbf0..f0c9f090b 100644
--- a/spec/inputs/numeric_input_spec.rb
+++ b/spec/inputs/numeric_input_spec.rb
@@ -2,13 +2,13 @@
 require 'spec_helper'
 
 describe 'numeric input' do
-  
+
   include FormtasticSpecHelper
-  
+
   before do
     @output_buffer = ''
     mock_everything
-    
+
     @form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :numeric))
     end
@@ -25,20 +25,20 @@
   it_should_apply_custom_input_attributes_when_input_html_provided(:string)
   it_should_apply_custom_for_to_label_when_input_html_id_provided(:string)
   it_should_apply_error_logic_for_input_type(:numeric)
-  
+
   describe "when no object is provided" do
     before do
       @form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
         concat(builder.input(:title, :as => :numeric))
       end
     end
-    
+
     it_should_have_label_with_text(/Title/)
     it_should_have_label_for("project_title")
     it_should_have_input_with_id("project_title")
     it_should_have_input_with_type(:text)
     it_should_have_input_with_name("project[title]")
   end
-  
+
 end
 
diff --git a/spec/inputs/password_input_spec.rb b/spec/inputs/password_input_spec.rb
index b2d5d2db7..fa72487ad 100644
--- a/spec/inputs/password_input_spec.rb
+++ b/spec/inputs/password_input_spec.rb
@@ -2,13 +2,13 @@
 require 'spec_helper'
 
 describe 'password input' do
-  
+
   include FormtasticSpecHelper
-  
+
   before do
     @output_buffer = ''
     mock_everything
-    
+
     @form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :password))
     end
@@ -28,14 +28,14 @@
   it_should_apply_custom_input_attributes_when_input_html_provided(:string)
   it_should_apply_custom_for_to_label_when_input_html_id_provided(:string)
   it_should_apply_error_logic_for_input_type(:password)
-  
+
   describe "when no object is provided" do
     before do
       @form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
         concat(builder.input(:title, :as => :password))
       end
     end
-    
+
     it_should_have_label_with_text(/Title/)
     it_should_have_label_for("project_title")
     it_should_have_input_with_id("project_title")
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index d0301fcbb..a901e188d 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -2,9 +2,9 @@
 require 'spec_helper'
 
 describe 'radio input' do
-  
+
   include FormtasticSpecHelper
-  
+
   before do
     @output_buffer = ''
     mock_everything
@@ -16,13 +16,13 @@
         concat(builder.input(:author, :as => :radio, :value_as_class => true))
       end
     end
-    
+
     it_should_have_input_wrapper_with_class("radio")
     it_should_have_input_wrapper_with_id("post_author_input")
     it_should_have_a_nested_fieldset
     it_should_apply_error_logic_for_input_type(:radio)
     it_should_use_the_collection_when_provided(:radio, 'input')
-    
+
     it 'should generate a legend containing a label with text for the input' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li fieldset legend.label label')
@@ -84,17 +84,17 @@
         output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
       end
-      
+
       it "should not contain invalid HTML attributes" do
-        
+
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:author, :as => :radio))
         end
-        
+
         output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li fieldset ol li input[@find_options]")
       end
-      
+
     end
 
     describe 'and no object is given' do
@@ -154,7 +154,7 @@
     describe "no selected items" do
       before do
         @new_post.stub!(:author_ids).and_return(nil)
-        
+
         with_deprecation_silenced do
           @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:authors, :as => :radio, :selected => nil))
@@ -187,9 +187,9 @@
     end
 
   end
-  
+
   describe "with i18n of the legend label" do
-    
+
     before do
       ::I18n.backend.store_translations :en, :formtastic => { :labels => { :post => { :authors => "Translated!" }}}
 
@@ -199,17 +199,17 @@
         concat(builder.input(:authors, :as => :radio))
       end
     end
-    
+
     after do
       ::I18n.backend.reload!
       Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
     end
-    
+
     it "should do foo" do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("legend.label label", /Translated/)
     end
-    
+
   end
 
   describe "when :label option is set" do
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 5f43a0e78..da4b08a58 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -87,7 +87,7 @@
         output_buffer.should have_tag("form li select option[@value='false']", /^No$/)
       end
     end
-    
+
     describe 'custom locale' do
       before do
         @boolean_select_labels = {:yes => 'Yep', :no => 'Nope'}
@@ -181,7 +181,7 @@
       output_buffer.should have_tag('form li select#post_author_status_id')
     end
   end
-  
+
   describe "for a belongs_to association with :group_by => :author" do
     it "should call author.posts" do
       [@freds_post].each { |post| post.stub!(:to_label).and_return("Post - #{post.id}") }
@@ -231,13 +231,13 @@
       ::Continent.stub!(:reflect_on_all_associations).and_return {|macro| mock('reflection', :klass => Author) if macro == :has_many}
       ::Continent.stub!(:reflect_on_association).and_return {|column_name| mock('reflection', :klass => Author) if column_name == :authors}
       ::Author.stub!(:reflect_on_association).and_return { |column_name| mock('reflection', :options => {}, :klass => Continent, :macro => :belongs_to) if column_name == :continent }
-      
-      
-      @continents.each_with_index do |continent, i| 
+
+
+      @continents.each_with_index do |continent, i|
         continent.stub!(:to_label).and_return(@continent_names[i])
         continent.stub!(:authors).and_return([@authors[i]])
       end
-      
+
       @form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select, :group_by => :continent ) )
         concat(builder.input(:author, :as => :select, :group_by => :continent, :group_label_method => :id ) )
@@ -248,7 +248,7 @@
     it_should_have_input_wrapper_with_id("post_author_input")
     it_should_have_label_with_text(/Author/)
     it_should_have_label_for('post_author_id')
-    
+
     # TODO, need to find a way to repeat some of the specs and logic from the belongs_to specs without grouping
 
     0.upto(1) do |i|
@@ -267,13 +267,13 @@
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li select optgroup', :count => 4)
     end
-    
+
     it 'should sort the groups on the label method' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form li select optgroup[@label='Africa']")
       output_buffer.should have_tag("form li select optgroup[@label='99']")
     end
-    
+
     it 'should call find with :include for more optimized queries' do
       Author.should_receive(:all).with(:include => :continent)
 
@@ -316,7 +316,7 @@
         output_buffer.should have_tag("form li select option[@value='#{post.id}']", /#{post.to_label}/)
       end
     end
-    
+
     it 'should not have a blank option by default' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should_not have_tag("form li select option[@value='']")
@@ -352,7 +352,7 @@
         concat(builder.input(:authors, :as => :select))
       end
     end
-    
+
     it_should_have_input_wrapper_with_class("select")
     it_should_have_input_wrapper_with_id("post_authors_input")
     it_should_have_label_with_text(/Author/)
@@ -360,7 +360,7 @@
     it_should_apply_error_logic_for_input_type(:select)
     it_should_call_find_on_association_class_when_no_collection_is_provided(:select)
     it_should_use_the_collection_when_provided(:select, 'option')
-    
+
     it 'should have a select inside the wrapper' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li select')
@@ -379,7 +379,7 @@
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
       end
     end
-    
+
     it 'should not have a blank option' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should_not have_tag("form li select option[@value='']")
@@ -390,7 +390,7 @@
       output_buffer.should have_tag('form li select option[@selected]', :count => 1)
     end
   end
-  
+
   describe 'when :prompt => "choose something" is set' do
     before do
       @new_post.stub!(:author_id).and_return(nil)
@@ -436,7 +436,7 @@
       end
     end
   end
-  
+
   describe 'when :selected is set' do
     before do
       @output_buffer = ''
@@ -451,7 +451,7 @@
           end
         end
       end
-      
+
       it 'should not have any selected item(s)' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li select option[@selected='selected']")
@@ -481,7 +481,7 @@
       describe "when :multiple => false" do
         before do
           @new_post.stub!(:author_ids).and_return(nil)
-          
+
           with_deprecation_silenced do
             @form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:authors, :as => :select, :selected => [@bob.id, @fred.id], :multiple => false))
@@ -521,14 +521,14 @@
     end
 
   end
-  
+
   describe "enum" do
     before do
       @output_buffer = ''
       @some_meta_descriptions = ["One", "Two", "Three"]
       @new_post.stub!(:meta_description).any_number_of_times
     end
-  
+
     describe ":as is not set" do
       before do
         @form_new_post = semantic_form_for(@new_post) do |builder|
@@ -537,16 +537,16 @@
         @form_project = semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:meta_description, :collection => @some_meta_descriptions))
         end
-        
+
       end
-  
+
       it "should render a select field" do
         output_buffer.concat(@form_new_post) if Formtastic::Util.rails3?
         output_buffer.concat(@form_project) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li select", :count => 2)
       end
     end
-  
+
     describe ":as is set" do
       before do
         # Should not be a case, but just checking :as got highest priority in setting input type.
@@ -557,7 +557,7 @@
           concat(builder.input(:meta_description, :as => :string, :collection => @some_meta_descriptions))
         end
       end
-      
+
       it "should render a text field" do
         output_buffer.concat(@form_new_post) if Formtastic::Util.rails3?
         output_buffer.concat(@form_project) if Formtastic::Util.rails3?
@@ -565,7 +565,7 @@
       end
     end
   end
-  
+
   it 'should warn about :selected deprecation' do
     with_deprecation_silenced do
       ::ActiveSupport::Deprecation.should_receive(:warn).any_number_of_times
@@ -574,7 +574,7 @@
       end
     end
   end
-  
-  
-  
+
+
+
 end
diff --git a/spec/inputs/string_input_spec.rb b/spec/inputs/string_input_spec.rb
index 0b0b3f284..d42042fcc 100644
--- a/spec/inputs/string_input_spec.rb
+++ b/spec/inputs/string_input_spec.rb
@@ -2,14 +2,14 @@
 require 'spec_helper'
 
 describe 'string input' do
-  
+
   include FormtasticSpecHelper
-  
+
   before do
     @output_buffer = ''
     mock_everything
   end
-  
+
   describe "when object is provided" do
     before do
       @form = semantic_form_for(@new_post) do |builder|
@@ -138,33 +138,33 @@ def should_have_maxlength(maxlength, options)
       end
     end
   end
-  
+
   describe "when no object is provided" do
     before do
       @form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
         concat(builder.input(:title, :as => :string))
       end
     end
-    
+
     it_should_have_label_with_text(/Title/)
     it_should_have_label_for("project_title")
     it_should_have_input_with_id("project_title")
     it_should_have_input_with_type(:text)
     it_should_have_input_with_name("project[title]")
   end
-  
+
   describe "when size is nil" do
     before do
       @form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
         concat(builder.input(:title, :as => :string, :input_html => {:size => nil}))
       end
     end
-  
+
     it "should have no size attribute" do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should_not have_tag("input[@size]")
     end
   end
-  
+
 end
 
diff --git a/spec/inputs/text_input_spec.rb b/spec/inputs/text_input_spec.rb
index 47f3d894b..b3370ef92 100644
--- a/spec/inputs/text_input_spec.rb
+++ b/spec/inputs/text_input_spec.rb
@@ -2,18 +2,18 @@
 require 'spec_helper'
 
 describe 'text input' do
-  
+
   include FormtasticSpecHelper
-  
+
   before do
     @output_buffer = ''
     mock_everything
-    
+
     @form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:body, :as => :text))
     end
   end
-    
+
   it_should_have_input_wrapper_with_class("text")
   it_should_have_input_wrapper_with_id("post_body_input")
   it_should_have_label_with_text(/Body/)
@@ -21,7 +21,7 @@
   it_should_have_textarea_with_id("post_body")
   it_should_have_textarea_with_name("post[body]")
   it_should_apply_error_logic_for_input_type(:numeric)
-  
+
   it 'should use input_html to style inputs' do
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :class => 'myclass' }))
@@ -29,6 +29,6 @@
     output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should have_tag("form li textarea.myclass")
   end
-    
+
 end
 
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index eedb58d1b..2e8485af9 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -2,64 +2,64 @@
 require 'spec_helper'
 
 describe 'time input' do
-  
+
   include FormtasticSpecHelper
-  
+
   before do
     @output_buffer = ''
     mock_everything
   end
-  
+
   describe "general" do
     before do
       ::I18n.backend.reload!
       output_buffer.replace ''
     end
-    
+
     describe "with :ignore_date" do
       before do
         @form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:publish_at, :as => :time, :ignore_date => true))
         end
       end
-      
+
       it 'should not have an input for day, month and year' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag('#post_publish_at_1i')
         output_buffer.should_not have_tag('#post_publish_at_2i')
         output_buffer.should_not have_tag('#post_publish_at_3i')
       end
-      
+
       it 'should have an input for hour and minute' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('#post_publish_at_4i')
         output_buffer.should have_tag('#post_publish_at_5i')
       end
-      
+
     end
-    
+
     describe "without seconds" do
       before do
         @form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:publish_at, :as => :time))
         end
       end
-     
+
       it_should_have_input_wrapper_with_class("time")
       it_should_have_input_wrapper_with_id("post_publish_at_input")
       it_should_have_a_nested_fieldset
       it_should_apply_error_logic_for_input_type(:time)
-    
+
       it 'should have a legend and label with the label text inside the fieldset' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.time fieldset legend.label label', /Publish at/)
       end
-    
+
       it 'should associate the legend label with the first select' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.time fieldset legend.label label[@for="post_publish_at_1i"]')
       end
-    
+
       it 'should have an ordered list of two items inside the fieldset' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.time fieldset ol')
@@ -72,7 +72,7 @@
         output_buffer.should have_tag('form li.time fieldset ol li label', /hour/i)
         output_buffer.should have_tag('form li.time fieldset ol li label', /minute/i)
       end
-    
+
       it 'should have two selects for hour and minute' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
@@ -85,7 +85,7 @@
           concat(builder.input(:publish_at, :as => :time, :include_seconds => true))
         end
       end
-    
+
       it 'should have five labels for hour and minute' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => 3)
@@ -110,12 +110,12 @@
   end
 
   describe ':selected option' do
-    
+
     describe "when the object has a value" do
       it "should select the object value (ignoring :selected)" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => Time.mktime(2012, 11, 30, 21, 45))
-        with_deprecation_silenced do 
+        with_deprecation_silenced do
           @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:created_at, :as => :time, :selected => Time.mktime(1999, 12, 31, 22, 59)))
           end
@@ -125,7 +125,7 @@
         output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@value='21'][@selected]", :count => 1)
       end
     end
-    
+
     describe 'when the object has no value (nil)' do
       it "should select the :selected if provided as a Time" do
         output_buffer.replace ''
@@ -139,11 +139,11 @@
         output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@value='22'][@selected]", :count => 1)
       end
-      
+
       it "should not select an option if the :selected is provided as nil" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
-        with_deprecation_silenced do 
+        with_deprecation_silenced do
           @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:created_at, :as => :time, :selected => nil))
           end
@@ -151,7 +151,7 @@
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li ol li select#post_created_at_4i option[@selected]")
       end
-      
+
       it "should select nothing if a :selected is not provided" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
@@ -162,9 +162,9 @@
         output_buffer.should_not have_tag("form li ol li select option[@selected]")
       end
     end
-    
+
   end
-  
+
   describe ':labels option' do
     fields = [:hour, :minute, :second]
     fields.each do |field|
@@ -179,7 +179,7 @@
           output_buffer.should have_tag('form li.time fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
         end
       end
-  
+
       it "should not display the label for the #{field} field when :labels[:#{field}] is blank" do
         output_buffer.replace ''
         form = semantic_form_for(@new_post) do |builder|
@@ -193,7 +193,7 @@
       end
     end
   end
-  
+
   it 'should warn about :selected deprecation' do
     with_deprecation_silenced do
       ::ActiveSupport::Deprecation.should_receive(:warn).any_number_of_times
@@ -202,5 +202,5 @@
       end
     end
   end
-  
+
 end
diff --git a/spec/inputs/time_zone_input_spec.rb b/spec/inputs/time_zone_input_spec.rb
index fffca3544..4e79ce856 100644
--- a/spec/inputs/time_zone_input_spec.rb
+++ b/spec/inputs/time_zone_input_spec.rb
@@ -2,22 +2,22 @@
 require 'spec_helper'
 
 describe 'time_zone input' do
-  
+
   include FormtasticSpecHelper
-  
+
   before do
     @output_buffer = ''
     mock_everything
-    
+
     @form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:time_zone))
     end
   end
-    
+
   it_should_have_input_wrapper_with_class("time_zone")
   it_should_have_input_wrapper_with_id("post_time_zone_input")
   it_should_apply_error_logic_for_input_type(:time_zone)
-  
+
   it 'should generate a label for the input' do
     output_buffer.concat(@form) if Formtastic::Util.rails3?
     output_buffer.should have_tag('form li label')
@@ -61,7 +61,7 @@
       output_buffer.should have_tag("form li select[@name=\"project[time_zone]\"]")
     end
   end
-  
+
   describe 'when :selected is set' do
     before do
       @output_buffer = ''
@@ -73,12 +73,12 @@
     # describe "no selected items" do
     #   before do
     #     @new_post.stub!(:time_zone).and_return('Stockholm')
-    # 
+    #
     #     semantic_form_for(@new_post) do |builder|
     #       concat(builder.input(:time_zone, :as => :time_zone, :selected => nil))
     #     end
     #   end
-    # 
+    #
     #   it 'should not have any selected item(s)' do
     #     output_buffer.should_not have_tag("form li select option[@selected='selected']")
     #   end
diff --git a/spec/inputs_spec.rb b/spec/inputs_spec.rb
index 8f00d337a..293b3eb97 100644
--- a/spec/inputs_spec.rb
+++ b/spec/inputs_spec.rb
@@ -2,9 +2,9 @@
 require 'spec_helper'
 
 describe 'SemanticFormBuilder#inputs' do
-  
+
   include FormtasticSpecHelper
-  
+
   before do
     @output_buffer = ''
     mock_everything
@@ -61,12 +61,12 @@
     end
 
     describe 'when a :for option is provided' do
-      
+
       before do
         @new_post.stub!(:respond_to?).and_return(true, true)
         @new_post.stub!(:author).and_return(@bob)
       end
-      
+
       it 'should render nested inputs' do
         @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
 
@@ -100,7 +100,7 @@
       end
 
       describe "as a symbol representing the association name" do
-        
+
         it 'should nest the inputs with an _attributes suffix on the association name' do
           form = semantic_form_for(@new_post) do |post|
             inputs = post.inputs :for => :author do |author|
@@ -111,30 +111,30 @@
           output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form input[@name='post[author_attributes][login]']")
         end
-        
+
       end
-      
+
       describe "as a symbol representing a has_many association name" do
         before do
           @new_post.stub!(:authors).and_return([@bob, @fred])
           @new_post.stub!(:authors_attributes=)
         end
-        
+
         it 'should nest the inputs with a name input for each item' do
           form = semantic_form_for(@new_post) do |post|
             post.inputs :for => :authors do |author|
               concat(author.input(:login))
             end
           end
-          
+
           output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form input[@name='post[authors_attributes][0][login]']")
           output_buffer.should have_tag("form input[@name='post[authors_attributes][1][login]']")
         end
       end
-      
+
       describe 'as an array containing the a symbole for the association name and the associated object' do
-        
+
         it 'should nest the inputs with an _attributes suffix on the association name' do
           form = semantic_form_for(@new_post) do |post|
             inputs = post.inputs :for => [:author, @new_post.author] do |author|
@@ -145,11 +145,11 @@
           output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form input[@name='post[author_attributes][login]']")
         end
-        
+
       end
-        
+
       describe 'as an associated object' do
-        
+
         it 'should not nest the inputs with an _attributes suffix' do
           form = semantic_form_for(@new_post) do |post|
             inputs = post.inputs :for => @new_post.author do |author|
@@ -160,8 +160,8 @@
           output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form input[@name='post[author][login]']")
         end
-        
-      end 
+
+      end
 
       it 'should raise an error if :for and block with no argument is given' do
         semantic_form_for(@new_post) do |builder|
@@ -258,7 +258,7 @@
           output_buffer.should have_tag("form fieldset legend", /^#{@nested_forms_legend_text}$/)
         end
       end
-      
+
       describe 'and is a symbol' do
         before do
           @localized_legend_text = "Localized advanced options"
diff --git a/spec/label_spec.rb b/spec/label_spec.rb
index e9156b024..9951a7901 100644
--- a/spec/label_spec.rb
+++ b/spec/label_spec.rb
@@ -4,7 +4,7 @@
 describe 'SemanticFormBuilder#label' do
 
   include FormtasticSpecHelper
-  
+
   before do
     @output_buffer = ''
     mock_everything
@@ -84,6 +84,6 @@
     end
 
   end
-  
+
 end
 
diff --git a/spec/semantic_fields_for_spec.rb b/spec/semantic_fields_for_spec.rb
index 98a80beae..ffab31e61 100644
--- a/spec/semantic_fields_for_spec.rb
+++ b/spec/semantic_fields_for_spec.rb
@@ -4,21 +4,21 @@
 describe 'SemanticFormBuilder#semantic_fields_for' do
 
   include FormtasticSpecHelper
-  
+
   before do
     @output_buffer = ''
     mock_everything
     @new_post.stub!(:author).and_return(::Author.new)
   end
 
-  it 'yields an instance of SemanticFormHelper.builder' do  
+  it 'yields an instance of SemanticFormHelper.builder' do
     semantic_form_for(@new_post) do |builder|
       builder.semantic_fields_for(:author) do |nested_builder|
         nested_builder.class.should == ::Formtastic::SemanticFormHelper.builder
       end
     end
   end
-  
+
   it 'nests the object name' do
     semantic_form_for(@new_post) do |builder|
       builder.semantic_fields_for(@bob) do |nested_builder|
@@ -26,7 +26,7 @@
       end
     end
   end
-  
+
   it 'should sanitize html id for li tag' do
     @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
     form = semantic_form_for(@new_post) do |builder|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 8c45a54ca..b04c9ab14 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -31,9 +31,9 @@ module FormtasticSpecHelper
   include ActionView::Helpers::AssetTagHelper
   include ActiveSupport
   include ActionController::PolymorphicRoutes if defined?(ActionController::PolymorphicRoutes)
-  
+
   include Formtastic::SemanticFormHelper
-  
+
   def rails3?
     ActionPack::VERSION::MAJOR > 2
   end
@@ -41,7 +41,7 @@ def rails3?
   def rails2?
     ActionPack::VERSION::MAJOR == 2
   end
-  
+
   def default_input_type(column_type, column_name = :generic_column_name)
     @new_post.stub!(column_name)
     @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => column_type)) unless column_type.nil?
@@ -52,7 +52,7 @@ def default_input_type(column_type, column_name = :generic_column_name)
 
     return @default_type
   end
-  
+
   def active_model_validator(kind, attributes, options = {})
     validator = mock("ActiveModel::Validations::#{kind.to_s.titlecase}Validator", :attributes => attributes, :options => options)
     validator.stub!(:kind).and_return(kind)
@@ -104,9 +104,9 @@ class ::PostModel
     extend ActiveModel::Naming if defined?(ActiveModel::Naming)
     include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
   end
-  
+
   def mock_everything
-    
+
     # Resource-oriented styles like form_for(@post) will expect a path method for the object,
     # so we're defining some here.
     def post_models_path; "/postmodels/1"; end
@@ -118,7 +118,7 @@ def new_post_path; "/posts/new"; end
     def author_path(o); "/authors/1"; end
     def authors_path; "/authors"; end
     def new_author_path; "/authors/new"; end
-    
+
     @fred = mock('user')
     @fred.stub!(:to_ary)
     @fred.stub!(:class).and_return(::Author)
@@ -143,7 +143,7 @@ def new_author_path; "/authors/new"; end
     @bob.stub!(:errors).and_return(mock('errors', :[] => nil))
     @bob.stub!(:to_key).and_return(nil)
     @bob.stub!(:persisted?).and_return(nil)
-    
+
     @james = mock('user')
     @james.stub!(:to_ary)
     @james.stub!(:class).and_return(::Author)
@@ -156,7 +156,7 @@ def new_author_path; "/authors/new"; end
     @james.stub!(:errors).and_return(mock('errors', :[] => nil))
     @james.stub!(:to_key).and_return(nil)
     @james.stub!(:persisted?).and_return(nil)
-    
+
 
     ::Author.stub!(:find).and_return([@fred, @bob])
     ::Author.stub!(:all).and_return([@fred, @bob])
@@ -221,7 +221,7 @@ def new_author_path; "/authors/new"; end
       when :main_post
         mock('reflection', :options => {}, :klass => ::Post, :macro => :belongs_to)
       end
-      
+
     end
     ::Post.stub!(:find).and_return([@freds_post])
     ::Post.stub!(:all).and_return([@freds_post])
@@ -229,7 +229,7 @@ def new_author_path; "/authors/new"; end
     ::Post.stub!(:to_key).and_return(nil)
     ::Post.stub!(:persisted?).and_return(nil)
     ::Post.stub!(:to_ary)
-    
+
     @new_post.stub!(:title)
     @new_post.stub!(:to_ary)
     @new_post.stub!(:body)
@@ -254,7 +254,7 @@ def new_author_path; "/authors/new"; end
     @new_post.stub!(:column_for_attribute).with(:country).and_return(mock('column', :type => :string, :limit => 255))
     @new_post.stub!(:column_for_attribute).with(:country_subdivision).and_return(mock('column', :type => :string, :limit => 255))
     @new_post.stub!(:column_for_attribute).with(:country_code).and_return(mock('column', :type => :string, :limit => 255))
-    
+
     @new_post.stub!(:author).and_return(@bob)
     @new_post.stub!(:author_id).and_return(@bob.id)
 
@@ -264,34 +264,34 @@ def new_author_path; "/authors/new"; end
     @new_post.should_receive(:publish_at=).any_number_of_times
     @new_post.should_receive(:title=).any_number_of_times
     @new_post.stub!(:main_post_id).and_return(nil)
-        
+
   end
-  
+
   def self.included(base)
     base.class_eval do
-      
+
       attr_accessor :output_buffer
-      
+
       def protect_against_forgery?
         false
       end
-      
+
     end
   end
-  
+
   def with_config(config_method_name, value, &block)
     old_value = ::Formtastic::SemanticFormBuilder.send(config_method_name)
     ::Formtastic::SemanticFormBuilder.send(:"#{config_method_name}=", value)
     yield
     ::Formtastic::SemanticFormBuilder.send(:"#{config_method_name}=", old_value)
   end
-  
+
   def with_deprecation_silenced(&block)
     ::ActiveSupport::Deprecation.silenced = true
     yield
     ::ActiveSupport::Deprecation.silenced = false
   end
-  
+
 end
 
 ::ActiveSupport::Deprecation.silenced = false
diff --git a/spec/support/custom_macros.rb b/spec/support/custom_macros.rb
index e7582e53d..fd30120b1 100644
--- a/spec/support/custom_macros.rb
+++ b/spec/support/custom_macros.rb
@@ -1,92 +1,94 @@
+# encoding: utf-8
+
 module CustomMacros
-  
+
   def self.included(base)
-    base.extend(ClassMethods)    
+    base.extend(ClassMethods)
   end
-  
+
   module ClassMethods
-    
+
     def it_should_have_input_wrapper_with_class(class_name)
       it "should have input wrapper with class '#{class_name}'" do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag("form li.#{class_name}") 
+        output_buffer.should have_tag("form li.#{class_name}")
       end
     end
-    
+
     def it_should_have_input_wrapper_with_id(id_string)
       it "should have input wrapper with id '#{id_string}'" do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag("form li##{id_string}") 
+        output_buffer.should have_tag("form li##{id_string}")
       end
     end
-    
+
     def it_should_not_have_a_label
       it "should not have a label" do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should_not have_tag("form li label") 
+        output_buffer.should_not have_tag("form li label")
       end
     end
-    
+
     def it_should_have_a_nested_fieldset
       it "should have a nested_fieldset" do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag("form li fieldset") 
+        output_buffer.should have_tag("form li fieldset")
       end
     end
-    
+
     def it_should_have_label_with_text(string_or_regex)
       it "should have a label with text '#{string_or_regex}'" do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag("form li label", string_or_regex) 
+        output_buffer.should have_tag("form li label", string_or_regex)
       end
     end
-    
+
     def it_should_have_label_for(element_id)
       it "should have a label for ##{element_id}" do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li label[@for='#{element_id}']")
       end
     end
-    
+
     def it_should_have_input_with_id(element_id)
       it "should have an input with id '#{element_id}'" do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li input##{element_id}")
       end
     end
-    
+
     def it_should_have_input_with_type(input_type)
       it "should have a #{input_type} input" do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li input[@type=\"#{input_type}\"]")
       end
     end
-    
+
     def it_should_have_input_with_name(name)
       it "should have an input named #{name}" do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li input[@name=\"#{name}\"]")
       end
     end
-    
+
     def it_should_have_textarea_with_name(name)
       it "should have an input named #{name}" do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li textarea[@name=\"#{name}\"]")
       end
     end
-    
+
     def it_should_have_textarea_with_id(element_id)
       it "should have an input with id '#{element_id}'" do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li textarea##{element_id}")
       end
     end
-    
+
     def it_should_use_default_text_field_size_when_method_has_no_database_column(as)
       it 'should use default_text_field_size when method has no database column' do
         @new_post.stub!(:column_for_attribute).and_return(nil) # Return a nil column
-        
+
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as))
         end
@@ -94,7 +96,7 @@ def it_should_use_default_text_field_size_when_method_has_no_database_column(as)
         output_buffer.should have_tag("form li input[@size='#{Formtastic::SemanticFormBuilder.default_text_field_size}']")
       end
     end
-    
+
     def it_should_apply_custom_input_attributes_when_input_html_provided(as)
       it 'it should apply custom input attributes when input_html provided' do
         form = semantic_form_for(@new_post) do |builder|
@@ -104,7 +106,7 @@ def it_should_apply_custom_input_attributes_when_input_html_provided(as)
         output_buffer.should have_tag("form li input.myclass")
       end
     end
-    
+
     def it_should_apply_custom_for_to_label_when_input_html_id_provided(as)
       it 'it should apply custom for to label when input_html :id provided' do
         form = semantic_form_for(@new_post) do |builder|
@@ -114,7 +116,7 @@ def it_should_apply_custom_for_to_label_when_input_html_id_provided(as)
         output_buffer.should have_tag('form li label[@for="myid"]')
       end
     end
-    
+
     def it_should_have_maxlength_matching_column_limit
       it 'should have a maxlength matching column limit' do
         @new_post.column_for_attribute(:title).limit.should == 50
@@ -122,7 +124,7 @@ def it_should_have_maxlength_matching_column_limit
         output_buffer.should have_tag("form li input[@maxlength='50']")
       end
     end
-    
+
     def it_should_use_default_text_field_size_for_columns_longer_than_default_text_field_size(as)
       it 'should use default_text_field_size for columns longer than default_text_field_size' do
         default_size = Formtastic::SemanticFormBuilder.default_text_field_size
@@ -136,7 +138,7 @@ def it_should_use_default_text_field_size_for_columns_longer_than_default_text_f
         output_buffer.should have_tag("form li input[@size='#{default_size}']")
       end
     end
-    
+
     def it_should_use_column_size_for_columns_shorter_than_default_text_field_size(as)
       it 'should use the column size for columns shorter than default_text_field_size' do
         column_limit_shorted_than_default = 1
@@ -150,7 +152,7 @@ def it_should_use_column_size_for_columns_shorter_than_default_text_field_size(a
         output_buffer.should have_tag("form li input[@size='#{column_limit_shorted_than_default}']")
       end
     end
-    
+
     def it_should_apply_error_logic_for_input_type(type)
       describe 'when there are errors on the object for this method' do
         before do
@@ -241,7 +243,7 @@ def it_should_apply_error_logic_for_input_type(type)
         end
       end
     end
-    
+
     def it_should_call_find_on_association_class_when_no_collection_is_provided(as)
       it "should call find on the association class when no collection is provided" do
         ::Author.should_receive(:all)
@@ -339,25 +341,25 @@ def it_should_use_the_collection_when_provided(as, countable)
             end
           end
         end
-        
+
         if as == :radio
           describe 'and the :collection is an array of arrays with boolean values' do
             before do
               @choices = { 'Yeah' => true, 'Nah' => false }.to_a
             end
-        
+
             it "should use the first value as the label text and the last value as the value attribute for #{countable}" do
               form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:category_name, :as => as, :collection => @choices))
               end
               output_buffer.concat(form) if Formtastic::Util.rails3?
-              
+
               output_buffer.should have_tag("form li.#{as} #{countable}#post_category_name_true")
               output_buffer.should have_tag("form li.#{as} #{countable}#post_category_name_false")
             end
           end
         end
-        
+
         describe 'and the :collection is an array of symbols' do
           before do
             @categories = [ :General, :Design, :Development ]
@@ -376,7 +378,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             end
           end
         end
-        
+
         describe 'and the :collection is an OrderedHash of strings' do
           before do
             @categories = ActiveSupport::OrderedHash.new('General' => 'gen', 'Design' => 'des','Development' => 'dev')
@@ -393,11 +395,11 @@ def it_should_use_the_collection_when_provided(as, countable)
               output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{value}']")
             end
           end
-          
+
         end
-        
+
         describe 'when the :label_method option is provided' do
-          
+
           describe 'as a symbol' do
             before do
               @form = semantic_form_for(@new_post) do |builder|
@@ -412,14 +414,14 @@ def it_should_use_the_collection_when_provided(as, countable)
               end
             end
           end
-          
+
           describe 'as a proc' do
             before do
               @form  = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:author, :as => as, :label_method => Proc.new {|a| a.login.reverse }))
               end
             end
-            
+
             it 'should have options with the proc applied to each' do
               output_buffer.concat(@form) if Formtastic::Util.rails3?
               ::Author.all.each do |author|
@@ -427,7 +429,7 @@ def it_should_use_the_collection_when_provided(as, countable)
               end
             end
           end
-          
+
         end
 
         describe 'when the :label_method option is not provided' do
@@ -455,14 +457,14 @@ def it_should_use_the_collection_when_provided(as, countable)
         end
 
         describe 'when the :value_method option is provided' do
-          
+
           describe 'as a symbol' do
             before do
               @form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:author, :as => as, :value_method => :login))
               end
             end
-            
+
             it 'should have options with values from specified method' do
               output_buffer.concat(@form) if Formtastic::Util.rails3?
               ::Author.all.each do |author|
@@ -470,7 +472,7 @@ def it_should_use_the_collection_when_provided(as, countable)
               end
             end
           end
-          
+
           describe 'as a proc' do
             before do
               @form = semantic_form_for(@new_post) do |builder|
@@ -491,4 +493,4 @@ def it_should_use_the_collection_when_provided(as, countable)
     end
 
   end
-end
\ No newline at end of file
+end
diff --git a/spec/support/output_buffer.rb b/spec/support/output_buffer.rb
index b17ce95c3..9a1ba6819 100644
--- a/spec/support/output_buffer.rb
+++ b/spec/support/output_buffer.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module ActionView
   class OutputBuffer < Formtastic::Util.rails_safe_buffer_class
   end
diff --git a/spec/support/test_environment.rb b/spec/support/test_environment.rb
index 59e1d9db2..a23a5ea5f 100644
--- a/spec/support/test_environment.rb
+++ b/spec/support/test_environment.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 if Formtastic::Util.rails3?
   gem 'rspec', '~> 2.0.0.beta22'
   gem 'rspec-rails', '~> 2.0.0.beta22'
diff --git a/uninstall.rb b/uninstall.rb
index 973833346..a329d7baa 100644
--- a/uninstall.rb
+++ b/uninstall.rb
@@ -1 +1,3 @@
+# encoding: utf-8
+
 # Uninstall hook code here

From 0a59e0c04912d2450eae64b14142898776ec3210 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Mon, 27 Sep 2010 19:29:26 +0200
Subject: [PATCH 243/992] Always use # encoding: utf-8 declaration

---
 Rakefile                                               | 2 +-
 generators/form/form_generator.rb                      | 3 ++-
 init.rb                                                | 2 +-
 lib/formtastic.rb                                      | 2 +-
 lib/generators/formtastic/form/form_generator.rb       | 2 +-
 lib/generators/formtastic/install/install_generator.rb | 2 +-
 rails/init.rb                                          | 2 +-
 spec/buttons_spec.rb                                   | 2 +-
 spec/commit_button_spec.rb                             | 2 +-
 spec/custom_builder_spec.rb                            | 2 +-
 spec/defaults_spec.rb                                  | 2 +-
 spec/error_proc_spec.rb                                | 2 +-
 spec/errors_spec.rb                                    | 2 +-
 spec/form_helper_spec.rb                               | 2 +-
 spec/helpers/layout_helper_spec.rb                     | 2 +-
 spec/i18n_spec.rb                                      | 2 +-
 spec/include_blank_spec.rb                             | 2 +-
 spec/input_spec.rb                                     | 2 +-
 spec/inputs/boolean_input_spec.rb                      | 2 +-
 spec/inputs/check_boxes_input_spec.rb                  | 2 +-
 spec/inputs/country_input_spec.rb                      | 2 +-
 spec/inputs/date_input_spec.rb                         | 2 +-
 spec/inputs/datetime_input_spec.rb                     | 2 +-
 spec/inputs/file_input_spec.rb                         | 2 +-
 spec/inputs/hidden_input_spec.rb                       | 2 +-
 spec/inputs/numeric_input_spec.rb                      | 2 +-
 spec/inputs/password_input_spec.rb                     | 2 +-
 spec/inputs/radio_input_spec.rb                        | 2 +-
 spec/inputs/select_input_spec.rb                       | 2 +-
 spec/inputs/string_input_spec.rb                       | 2 +-
 spec/inputs/text_input_spec.rb                         | 2 +-
 spec/inputs/time_input_spec.rb                         | 2 +-
 spec/inputs/time_zone_input_spec.rb                    | 2 +-
 spec/inputs_spec.rb                                    | 2 +-
 spec/label_spec.rb                                     | 2 +-
 spec/semantic_errors_spec.rb                           | 2 +-
 spec/semantic_fields_for_spec.rb                       | 2 +-
 spec/spec_helper.rb                                    | 2 +-
 38 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/Rakefile b/Rakefile
index d4b5b4f73..d24bc610d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'rubygems'
 require 'rake'
 require 'rake/rdoctask'
diff --git a/generators/form/form_generator.rb b/generators/form/form_generator.rb
index 9316b50f4..c37506799 100644
--- a/generators/form/form_generator.rb
+++ b/generators/form/form_generator.rb
@@ -1,4 +1,5 @@
-# coding: utf-8
+# encoding: utf-8
+
 # Get current OS - needed for clipboard functionality
 case RUBY_PLATFORM
 when /darwin/ then
diff --git a/init.rb b/init.rb
index df91e4194..45896e266 100644
--- a/init.rb
+++ b/init.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'formtastic'
 require 'formtastic/layout_helper'
 ActionView::Base.send :include, Formtastic::SemanticFormHelper
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index bf5366cba..59b9c2693 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require File.join(File.dirname(__FILE__), *%w[formtastic i18n])
 require File.join(File.dirname(__FILE__), *%w[formtastic util])
 require File.join(File.dirname(__FILE__), *%w[formtastic railtie]) if defined?(::Rails::Railtie)
diff --git a/lib/generators/formtastic/form/form_generator.rb b/lib/generators/formtastic/form/form_generator.rb
index b0aca032e..ea7cd6a07 100644
--- a/lib/generators/formtastic/form/form_generator.rb
+++ b/lib/generators/formtastic/form/form_generator.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 module Formtastic
   class FormGenerator < Rails::Generators::NamedBase
     desc "Generates formtastic form code based on an existing model. By default the " <<
diff --git a/lib/generators/formtastic/install/install_generator.rb b/lib/generators/formtastic/install/install_generator.rb
index ecf781e60..1ee5a8420 100644
--- a/lib/generators/formtastic/install/install_generator.rb
+++ b/lib/generators/formtastic/install/install_generator.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 module Formtastic
   class InstallGenerator < Rails::Generators::Base
     desc "Copies formtastic.css and formtastic_changes.css to public/stylesheets/ and a config initializer to config/initializers/formtastic_config.rb"
diff --git a/rails/init.rb b/rails/init.rb
index 702edb564..35ff9fe5a 100644
--- a/rails/init.rb
+++ b/rails/init.rb
@@ -1,2 +1,2 @@
-# coding: utf-8
+# encoding: utf-8
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "init"))
diff --git a/spec/buttons_spec.rb b/spec/buttons_spec.rb
index c723d28b2..a96651043 100644
--- a/spec/buttons_spec.rb
+++ b/spec/buttons_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'SemanticFormBuilder#buttons' do
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index ea5f4b5f4..154657081 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'SemanticFormBuilder#commit_button' do
diff --git a/spec/custom_builder_spec.rb b/spec/custom_builder_spec.rb
index 0a20d5378..78799fb8a 100644
--- a/spec/custom_builder_spec.rb
+++ b/spec/custom_builder_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'Formtastic::SemanticFormHelper.builder' do
diff --git a/spec/defaults_spec.rb b/spec/defaults_spec.rb
index 140e24db2..eb7abd842 100644
--- a/spec/defaults_spec.rb
+++ b/spec/defaults_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'Formtastic::SemanticFormBuilder-defaults' do
diff --git a/spec/error_proc_spec.rb b/spec/error_proc_spec.rb
index a499a437e..e3aac989c 100644
--- a/spec/error_proc_spec.rb
+++ b/spec/error_proc_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'Rails field_error_proc' do
diff --git a/spec/errors_spec.rb b/spec/errors_spec.rb
index 0423792d8..6d09a0bd8 100644
--- a/spec/errors_spec.rb
+++ b/spec/errors_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'SemanticFormBuilder#errors_on' do
diff --git a/spec/form_helper_spec.rb b/spec/form_helper_spec.rb
index 63a50ef7a..d96f3a21d 100644
--- a/spec/form_helper_spec.rb
+++ b/spec/form_helper_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'SemanticFormHelper' do
diff --git a/spec/helpers/layout_helper_spec.rb b/spec/helpers/layout_helper_spec.rb
index 5430b1630..815af8c33 100644
--- a/spec/helpers/layout_helper_spec.rb
+++ b/spec/helpers/layout_helper_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe Formtastic::LayoutHelper do
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index 3dba530a6..72d225837 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'Formtastic::I18n' do
diff --git a/spec/include_blank_spec.rb b/spec/include_blank_spec.rb
index 1a1db5051..c24f81157 100644
--- a/spec/include_blank_spec.rb
+++ b/spec/include_blank_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe "*select: options[:include_blank]" do
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 078ab673f..9bbdf7548 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'SemanticFormBuilder#input' do
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index 5621d86be..0e7a79b4d 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'boolean input' do
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 86b2abfc6..33d201606 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'check_boxes input' do
diff --git a/spec/inputs/country_input_spec.rb b/spec/inputs/country_input_spec.rb
index 56108347c..70d8996dd 100644
--- a/spec/inputs/country_input_spec.rb
+++ b/spec/inputs/country_input_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'country input' do
diff --git a/spec/inputs/date_input_spec.rb b/spec/inputs/date_input_spec.rb
index 3da77f002..cbd530919 100644
--- a/spec/inputs/date_input_spec.rb
+++ b/spec/inputs/date_input_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'date input' do
diff --git a/spec/inputs/datetime_input_spec.rb b/spec/inputs/datetime_input_spec.rb
index b53e4b1ce..cd3585d22 100644
--- a/spec/inputs/datetime_input_spec.rb
+++ b/spec/inputs/datetime_input_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'datetime input' do
diff --git a/spec/inputs/file_input_spec.rb b/spec/inputs/file_input_spec.rb
index 71f98d5bb..a9cf52591 100644
--- a/spec/inputs/file_input_spec.rb
+++ b/spec/inputs/file_input_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'file input' do
diff --git a/spec/inputs/hidden_input_spec.rb b/spec/inputs/hidden_input_spec.rb
index d9f44fe91..9ffd79b3c 100644
--- a/spec/inputs/hidden_input_spec.rb
+++ b/spec/inputs/hidden_input_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'hidden input' do
diff --git a/spec/inputs/numeric_input_spec.rb b/spec/inputs/numeric_input_spec.rb
index f0c9f090b..055459d1f 100644
--- a/spec/inputs/numeric_input_spec.rb
+++ b/spec/inputs/numeric_input_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'numeric input' do
diff --git a/spec/inputs/password_input_spec.rb b/spec/inputs/password_input_spec.rb
index fa72487ad..34e6d43da 100644
--- a/spec/inputs/password_input_spec.rb
+++ b/spec/inputs/password_input_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'password input' do
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index a901e188d..b538d9cfc 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'radio input' do
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index da4b08a58..e83a03f8e 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'select input' do
diff --git a/spec/inputs/string_input_spec.rb b/spec/inputs/string_input_spec.rb
index d42042fcc..d3c7c848e 100644
--- a/spec/inputs/string_input_spec.rb
+++ b/spec/inputs/string_input_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'string input' do
diff --git a/spec/inputs/text_input_spec.rb b/spec/inputs/text_input_spec.rb
index b3370ef92..8836aaf33 100644
--- a/spec/inputs/text_input_spec.rb
+++ b/spec/inputs/text_input_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'text input' do
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index 2e8485af9..9c02f3a6d 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'time input' do
diff --git a/spec/inputs/time_zone_input_spec.rb b/spec/inputs/time_zone_input_spec.rb
index 4e79ce856..31920d2c6 100644
--- a/spec/inputs/time_zone_input_spec.rb
+++ b/spec/inputs/time_zone_input_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'time_zone input' do
diff --git a/spec/inputs_spec.rb b/spec/inputs_spec.rb
index 293b3eb97..8e963ee63 100644
--- a/spec/inputs_spec.rb
+++ b/spec/inputs_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'SemanticFormBuilder#inputs' do
diff --git a/spec/label_spec.rb b/spec/label_spec.rb
index 9951a7901..2c31be022 100644
--- a/spec/label_spec.rb
+++ b/spec/label_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'SemanticFormBuilder#label' do
diff --git a/spec/semantic_errors_spec.rb b/spec/semantic_errors_spec.rb
index 94fc37599..9fc812954 100644
--- a/spec/semantic_errors_spec.rb
+++ b/spec/semantic_errors_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'SemanticFormBuilder#semantic_errors' do
diff --git a/spec/semantic_fields_for_spec.rb b/spec/semantic_fields_for_spec.rb
index ffab31e61..cdbf22daa 100644
--- a/spec/semantic_fields_for_spec.rb
+++ b/spec/semantic_fields_for_spec.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'spec_helper'
 
 describe 'SemanticFormBuilder#semantic_fields_for' do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index b04c9ab14..c5e7a7e40 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 require 'rubygems'
 require 'active_support'
 require 'action_pack'

From 32440147ceda2c473ce1926ce90f63fb979dc48b Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Wed, 29 Sep 2010 14:41:31 +0530
Subject: [PATCH 244/992] make spec pass on rails3

---
 Gemfile.lock        | 58 ++++++++++++++++++++++++++++++++++++++++-----
 Rakefile            |  4 ++--
 formtastic.gemspec  |  3 ++-
 spec/spec_helper.rb |  2 +-
 4 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 22a84ebfd..62bc4cf00 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,6 +10,9 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
+    actionmailer (3.0.0)
+      actionpack (= 3.0.0)
+      mail (~> 2.2.5)
     actionpack (3.0.0)
       activemodel (= 3.0.0)
       activesupport (= 3.0.0)
@@ -24,24 +27,66 @@ GEM
       activesupport (= 3.0.0)
       builder (~> 2.1.2)
       i18n (~> 0.4.1)
+    activerecord (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+      arel (~> 1.0.0)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
     activesupport (3.0.0)
+    arel (1.0.1)
+      activesupport (~> 3.0.0)
     builder (2.1.2)
+    diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     i18n (0.4.1)
+    mail (2.2.6.1)
+      activesupport (>= 2.3.6)
+      mime-types
+      treetop (>= 1.4.5)
+    mime-types (1.16)
     nokogiri (1.4.3.1)
+    polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.5)
+    rack-test (0.5.6)
       rack (>= 1.0)
-    rspec (1.3.0)
-    rspec-rails (1.3.2)
-      rack (>= 1.0.0)
-      rspec (>= 1.3.0)
+    rails (3.0.0)
+      actionmailer (= 3.0.0)
+      actionpack (= 3.0.0)
+      activerecord (= 3.0.0)
+      activeresource (= 3.0.0)
+      activesupport (= 3.0.0)
+      bundler (~> 1.0.0)
+      railties (= 3.0.0)
+    railties (3.0.0)
+      actionpack (= 3.0.0)
+      activesupport (= 3.0.0)
+      rake (>= 0.8.4)
+      thor (~> 0.14.0)
+    rake (0.8.7)
+    rspec (2.0.0.beta.22)
+      rspec-core (= 2.0.0.beta.22)
+      rspec-expectations (= 2.0.0.beta.22)
+      rspec-mocks (= 2.0.0.beta.22)
+    rspec-core (2.0.0.beta.22)
+    rspec-expectations (2.0.0.beta.22)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0.beta.22)
+      rspec-core (= 2.0.0.beta.22)
+      rspec-expectations (= 2.0.0.beta.22)
+    rspec-rails (2.0.0.beta.22)
+      rspec (= 2.0.0.beta.22)
     rspec_tag_matchers (1.0.0)
       nokogiri (>= 1.4.0)
       rspec-rails (>= 1.2.6)
+    thor (0.14.2)
+    treetop (1.4.8)
+      polyglot (>= 0.3.1)
     tzinfo (0.3.23)
 
 PLATFORMS
@@ -52,5 +97,6 @@ DEPENDENCIES
   activesupport (>= 2.3.7)
   formtastic!
   i18n (>= 0.4.0)
-  rspec-rails (>= 1.2.6)
+  rails (= 3.0.0)
+  rspec-rails (~> 2.0.0.beta22)
   rspec_tag_matchers (>= 1.0.0)
diff --git a/Rakefile b/Rakefile
index d24bc610d..c54fe961c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,8 +4,8 @@ require 'rake'
 require 'rake/rdoctask'
 
 begin
-  gem 'rspec', '>= 1.2.6'
-  gem 'rspec-rails', '>= 1.2.6'
+  gem 'rspec', '~> 2.0.0.beta22'
+  gem 'rspec-rails', '~> 2.0.0.beta22'
   require 'spec'
   require 'spec/rake/spectask'
 rescue LoadError
diff --git a/formtastic.gemspec b/formtastic.gemspec
index 53baac0df..0c8a8d527 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -38,7 +38,8 @@ Gem::Specification.new do |s|
   s.add_dependency(%q<activesupport>, [">= 2.3.7"])
   s.add_dependency(%q<actionpack>, [">= 2.3.7"])
   s.add_dependency(%q<i18n>, [">= 0.4.0"])
-  s.add_development_dependency(%q<rspec-rails>, [">= 1.2.6"])
+  s.add_development_dependency(%q<rails>, ["= 3.0.0"])
+  s.add_development_dependency(%q<rspec-rails>, ["~> 2.0.0.beta22"])
   s.add_development_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
 
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c5e7a7e40..a16c5235a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -4,7 +4,7 @@
 require 'action_pack'
 require 'action_view'
 require 'action_controller'
-require 'action_mailer'
+#require 'action_mailer'
 
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic/util'))
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic'))

From 73e71b6d4104879369df3e7f29c101d5e338ce8c Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Wed, 29 Sep 2010 17:29:55 +0530
Subject: [PATCH 245/992] string type html defaults for newer fields

---
 lib/formtastic.rb                | 29 ++++++++++++++++++++++++++++-
 spec/inputs/email_input_spec.rb  | 31 +++++++++++++++++++++++++++++++
 spec/inputs/phone_input_spec.rb  | 31 +++++++++++++++++++++++++++++++
 spec/inputs/search_input_spec.rb | 31 +++++++++++++++++++++++++++++++
 spec/inputs/url_input_spec.rb    | 31 +++++++++++++++++++++++++++++++
 spec/spec_helper.rb              |  4 ++++
 6 files changed, 156 insertions(+), 1 deletion(-)
 create mode 100644 spec/inputs/email_input_spec.rb
 create mode 100644 spec/inputs/phone_input_spec.rb
 create mode 100644 spec/inputs/search_input_spec.rb
 create mode 100644 spec/inputs/url_input_spec.rb

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 59b9c2693..4bfcb8472 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -66,6 +66,11 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
     # * :string (a text field) - default for :string column types
     # * :numeric (a text field, like string) - default for :integer, :float and :decimal column types
     # * :country (a select menu of country names) - requires a country_select plugin to be installed
+    # * :email (an email input) - New in HTML5 - needs to be explicitly provided with :as => :email
+    # * :url (a url input) - New in HTML5 - needs to be explicitly provided with :as => :url
+    # * :phone (a tel input) - New in HTML5 - needs to be explicitly provided with :as => :phone
+    # * :search (a search input) - New in HTML5 - needs to be explicity provided with :as => :search
+    # * :country (a select menu of country names) - requires a country_select plugin to be installed
     # * :hidden (a hidden field) - creates a hidden field (added for compatibility)
     #
     # Example:
@@ -77,6 +82,8 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
     #       <%= 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" %>
+    #       <%= form.input :email, :as => :email %>
+    #       <%= form.input :website, :as => :url, :hint => "You may wish to omit the http://" %>
     #     <% end %>
     #   <% end %>
     #
@@ -605,7 +612,7 @@ def options_require_validation?(options) #nodoc
 
       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, :text].include?(type)
+        html_options = default_string_options(method, type).merge(html_options) if [:numeric, :string, :password, :text, :phone, :search, :url, :email].include?(type)
 
         self.label(method, options_for_label(options)) <<
         self.send(form_helper_method, method, html_options)
@@ -635,6 +642,26 @@ def text_input(method, options)
       def file_input(method, options)
         basic_input_helper(:file_field, :file, method, options)
       end
+      
+      # Outputs a label and a standard Rails email field inside the wrapper.
+      def email_input(method, options)
+        basic_input_helper(:email_field, :email, method, options)
+      end
+
+      # Outputs a label and a standard Rails phone field inside the wrapper.
+      def phone_input(method, options)
+        basic_input_helper(:phone_field, :phone, method, options)
+      end
+
+      # Outputs a label and a standard Rails url field inside the wrapper.
+      def url_input(method, options)
+        basic_input_helper(:url_field, :url, method, options)
+      end
+
+      # Outputs a label and a standard Rails search field inside the wrapper.
+      def search_input(method, options)
+        basic_input_helper(:search_field, :search, method, options)
+      end
 
       # Outputs a hidden field inside the wrapper, which should be hidden with CSS.
       # Additionals options can be given using :input_hml. Should :input_html not be
diff --git a/spec/inputs/email_input_spec.rb b/spec/inputs/email_input_spec.rb
new file mode 100644
index 000000000..5ff2fc18b
--- /dev/null
+++ b/spec/inputs/email_input_spec.rb
@@ -0,0 +1,31 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe 'email input' do
+
+  include FormtasticSpecHelper
+
+  before do
+    @output_buffer = ''
+    mock_everything
+  end
+
+  describe "when object is provided" do
+    before do
+      @form = semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:email, :as => :email))
+      end
+    end
+
+    it_should_have_input_wrapper_with_class(:email)
+    it_should_have_input_wrapper_with_id("post_email_input")
+    it_should_have_label_with_text(/Email/)
+    it_should_have_label_for("post_email")
+    it_should_have_input_with_id("post_email")
+    it_should_have_input_with_type(:email)
+    it_should_have_input_with_name("post[email]")
+    
+  end
+
+end
+
diff --git a/spec/inputs/phone_input_spec.rb b/spec/inputs/phone_input_spec.rb
new file mode 100644
index 000000000..09df8c33b
--- /dev/null
+++ b/spec/inputs/phone_input_spec.rb
@@ -0,0 +1,31 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe 'phone input' do
+
+  include FormtasticSpecHelper
+
+  before do
+    @output_buffer = ''
+    mock_everything
+  end
+
+  describe "when object is provided" do
+    before do
+      @form = semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:phone, :as => :phone))
+      end
+    end
+
+    it_should_have_input_wrapper_with_class(:phone)
+    it_should_have_input_wrapper_with_id("post_phone_input")
+    it_should_have_label_with_text(/Phone/)
+    it_should_have_label_for("post_phone")
+    it_should_have_input_with_id("post_phone")
+    it_should_have_input_with_type(:tel)
+    it_should_have_input_with_name("post[phone]")
+    
+  end
+
+end
+
diff --git a/spec/inputs/search_input_spec.rb b/spec/inputs/search_input_spec.rb
new file mode 100644
index 000000000..40ed73bfb
--- /dev/null
+++ b/spec/inputs/search_input_spec.rb
@@ -0,0 +1,31 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe 'search input' do
+
+  include FormtasticSpecHelper
+
+  before do
+    @output_buffer = ''
+    mock_everything
+  end
+
+  describe "when object is provided" do
+    before do
+      @form = semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:search, :as => :search))
+      end
+    end
+
+    it_should_have_input_wrapper_with_class(:search)
+    it_should_have_input_wrapper_with_id("post_search_input")
+    it_should_have_label_with_text(/Search/)
+    it_should_have_label_for("post_search")
+    it_should_have_input_with_id("post_search")
+    it_should_have_input_with_type(:search)
+    it_should_have_input_with_name("post[search]")
+    
+  end
+
+end
+
diff --git a/spec/inputs/url_input_spec.rb b/spec/inputs/url_input_spec.rb
new file mode 100644
index 000000000..14fa5e24f
--- /dev/null
+++ b/spec/inputs/url_input_spec.rb
@@ -0,0 +1,31 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe 'url input' do
+
+  include FormtasticSpecHelper
+
+  before do
+    @output_buffer = ''
+    mock_everything
+  end
+
+  describe "when object is provided" do
+    before do
+      @form = semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:url, :as => :url))
+      end
+    end
+
+    it_should_have_input_wrapper_with_class(:url)
+    it_should_have_input_wrapper_with_id("post_url_input")
+    it_should_have_label_with_text(/Url/)
+    it_should_have_label_for("post_url")
+    it_should_have_input_with_id("post_url")
+    it_should_have_input_with_type(:url)
+    it_should_have_input_with_name("post[url]")
+    
+  end
+
+end
+
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a16c5235a..e4955e84b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -231,6 +231,10 @@ def new_author_path; "/authors/new"; end
     ::Post.stub!(:to_ary)
 
     @new_post.stub!(:title)
+    @new_post.stub!(:email)
+    @new_post.stub!(:url)
+    @new_post.stub!(:phone)
+    @new_post.stub!(:search)
     @new_post.stub!(:to_ary)
     @new_post.stub!(:body)
     @new_post.stub!(:published)

From 26b0ba476f750c316825660b8a93946cf12dac56 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Wed, 29 Sep 2010 17:11:31 +0800
Subject: [PATCH 246/992] make spec pass on rails3

---
 Gemfile.lock        | 58 ++++++++++++++++++++++++++++++++++++++++-----
 Rakefile            |  4 ++--
 formtastic.gemspec  |  3 ++-
 spec/spec_helper.rb |  2 +-
 4 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 22a84ebfd..62bc4cf00 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,6 +10,9 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
+    actionmailer (3.0.0)
+      actionpack (= 3.0.0)
+      mail (~> 2.2.5)
     actionpack (3.0.0)
       activemodel (= 3.0.0)
       activesupport (= 3.0.0)
@@ -24,24 +27,66 @@ GEM
       activesupport (= 3.0.0)
       builder (~> 2.1.2)
       i18n (~> 0.4.1)
+    activerecord (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+      arel (~> 1.0.0)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
     activesupport (3.0.0)
+    arel (1.0.1)
+      activesupport (~> 3.0.0)
     builder (2.1.2)
+    diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     i18n (0.4.1)
+    mail (2.2.6.1)
+      activesupport (>= 2.3.6)
+      mime-types
+      treetop (>= 1.4.5)
+    mime-types (1.16)
     nokogiri (1.4.3.1)
+    polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.5)
+    rack-test (0.5.6)
       rack (>= 1.0)
-    rspec (1.3.0)
-    rspec-rails (1.3.2)
-      rack (>= 1.0.0)
-      rspec (>= 1.3.0)
+    rails (3.0.0)
+      actionmailer (= 3.0.0)
+      actionpack (= 3.0.0)
+      activerecord (= 3.0.0)
+      activeresource (= 3.0.0)
+      activesupport (= 3.0.0)
+      bundler (~> 1.0.0)
+      railties (= 3.0.0)
+    railties (3.0.0)
+      actionpack (= 3.0.0)
+      activesupport (= 3.0.0)
+      rake (>= 0.8.4)
+      thor (~> 0.14.0)
+    rake (0.8.7)
+    rspec (2.0.0.beta.22)
+      rspec-core (= 2.0.0.beta.22)
+      rspec-expectations (= 2.0.0.beta.22)
+      rspec-mocks (= 2.0.0.beta.22)
+    rspec-core (2.0.0.beta.22)
+    rspec-expectations (2.0.0.beta.22)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0.beta.22)
+      rspec-core (= 2.0.0.beta.22)
+      rspec-expectations (= 2.0.0.beta.22)
+    rspec-rails (2.0.0.beta.22)
+      rspec (= 2.0.0.beta.22)
     rspec_tag_matchers (1.0.0)
       nokogiri (>= 1.4.0)
       rspec-rails (>= 1.2.6)
+    thor (0.14.2)
+    treetop (1.4.8)
+      polyglot (>= 0.3.1)
     tzinfo (0.3.23)
 
 PLATFORMS
@@ -52,5 +97,6 @@ DEPENDENCIES
   activesupport (>= 2.3.7)
   formtastic!
   i18n (>= 0.4.0)
-  rspec-rails (>= 1.2.6)
+  rails (= 3.0.0)
+  rspec-rails (~> 2.0.0.beta22)
   rspec_tag_matchers (>= 1.0.0)
diff --git a/Rakefile b/Rakefile
index d24bc610d..c54fe961c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,8 +4,8 @@ require 'rake'
 require 'rake/rdoctask'
 
 begin
-  gem 'rspec', '>= 1.2.6'
-  gem 'rspec-rails', '>= 1.2.6'
+  gem 'rspec', '~> 2.0.0.beta22'
+  gem 'rspec-rails', '~> 2.0.0.beta22'
   require 'spec'
   require 'spec/rake/spectask'
 rescue LoadError
diff --git a/formtastic.gemspec b/formtastic.gemspec
index 53baac0df..0c8a8d527 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -38,7 +38,8 @@ Gem::Specification.new do |s|
   s.add_dependency(%q<activesupport>, [">= 2.3.7"])
   s.add_dependency(%q<actionpack>, [">= 2.3.7"])
   s.add_dependency(%q<i18n>, [">= 0.4.0"])
-  s.add_development_dependency(%q<rspec-rails>, [">= 1.2.6"])
+  s.add_development_dependency(%q<rails>, ["= 3.0.0"])
+  s.add_development_dependency(%q<rspec-rails>, ["~> 2.0.0.beta22"])
   s.add_development_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
 
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c5e7a7e40..a16c5235a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -4,7 +4,7 @@
 require 'action_pack'
 require 'action_view'
 require 'action_controller'
-require 'action_mailer'
+#require 'action_mailer'
 
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic/util'))
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic'))

From 34848c4a8ab1625eb69840b4f94dc3a5e0b89a3b Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Thu, 30 Sep 2010 20:07:31 -0300
Subject: [PATCH 247/992] Cleanup Rakefile

- Use Bundler
- Remove RSpec 1 support
---
 Rakefile | 63 +++++++++++++-------------------------------------------
 1 file changed, 14 insertions(+), 49 deletions(-)

diff --git a/Rakefile b/Rakefile
index c54fe961c..b37e5fc60 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,21 +1,9 @@
 # encoding: utf-8
 require 'rubygems'
+require 'bundler/setup'
 require 'rake'
 require 'rake/rdoctask'
-
-begin
-  gem 'rspec', '~> 2.0.0.beta22'
-  gem 'rspec-rails', '~> 2.0.0.beta22'
-  require 'spec'
-  require 'spec/rake/spectask'
-rescue LoadError
-  begin
-    require 'rspec/core/rake_task.rb'
-    require 'rspec/core/version'
-  rescue LoadError
-    puts "[formtastic:] RSpec - or one of it's dependencies - is not available. Install it with: sudo gem install rspec-rails"
-  end
-end
+require 'rspec/core/rake_task'
 
 desc 'Default: run unit specs.'
 task :default => :spec
@@ -29,42 +17,19 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-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
+desc 'Test the formtastic plugin.'
+RSpec::Core::RakeTask.new('spec') do |t|
+  t.pattern = FileList['spec/**/*_spec.rb']
 end
 
-if defined?(RSpec)
-  desc 'Test the formtastic plugin.'
-  RSpec::Core::RakeTask.new('spec') do |t|
-    t.pattern = FileList['spec/**/*_spec.rb']
-  end
-
-  desc 'Test the formtastic plugin with specdoc formatting and colors'
-  RSpec::Core::RakeTask.new('specdoc') do |t|
-    t.pattern = FileList['spec/**/*_spec.rb']
-  end
+desc 'Test the formtastic plugin with specdoc formatting and colors'
+RSpec::Core::RakeTask.new('specdoc') do |t|
+  t.pattern = FileList['spec/**/*_spec.rb']
+end
 
-  desc "Run all examples with RCov"
-  RSpec::Core::RakeTask.new('examples_with_rcov') do |t|
-    t.pattern = FileList['spec/**/*_spec.rb']
-    t.rcov = true
-    t.rcov_opts = ['--exclude', 'spec,Library']
-  end
+desc 'Run all examples with RCov'
+RSpec::Core::RakeTask.new('examples_with_rcov') do |t|
+  t.pattern = FileList['spec/**/*_spec.rb']
+  t.rcov = true
+  t.rcov_opts = ['--exclude', 'spec,Library']
 end

From 594b3b7eb9243c05f4ba4d1fdd15e6c4993c0efa Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Thu, 30 Sep 2010 21:51:49 -0300
Subject: [PATCH 248/992] Consider field with inclusion validation as required

---
 lib/formtastic.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 59b9c2693..4a5c7bad2 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -574,13 +574,13 @@ def method_required?(attribute) #:nodoc:
 
         if @object && @object.class.respond_to?(:reflect_on_validations_for)
           @object.class.reflect_on_validations_for(attribute_sym).any? do |validation|
-            validation.macro == :validates_presence_of &&
+            (validation.macro == :validates_presence_of || validation.macro == :validates_inclusion_of) &&
             validation.name == attribute_sym &&
             (validation.options.present? ? options_require_validation?(validation.options) : true)
           end
         else
           if @object && @object.class.respond_to?(:validators_on)
-            !@object.class.validators_on(attribute_sym).find{|validator| (validator.kind == :presence) && (validator.options.present? ? options_require_validation?(validator.options) : true)}.nil?
+            !@object.class.validators_on(attribute_sym).find{|validator| (validator.kind == :presence || validator.kind == :inclusion) && (validator.options.present? ? options_require_validation?(validator.options) : true)}.nil?
           else
             self.class.all_fields_required_by_default
           end

From e38a068c11b7698507a4892f212a79a6298e7c3a Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Thu, 30 Sep 2010 22:22:17 -0300
Subject: [PATCH 249/992] Spec for last commit

---
 spec/input_spec.rb  | 15 +++++++++++++++
 spec/spec_helper.rb |  4 ++++
 2 files changed, 19 insertions(+)

diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 9bbdf7548..b2a16b945 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -319,6 +319,21 @@ def should_be_required(options)
                end
             end
 
+            describe 'and validates_inclusion_of was called for the method' do
+              it 'should be required' do
+                @new_post.class.should_receive(:validators_on).with(:published).any_number_of_times.and_return([
+                  active_model_inclusion_validator([:published], {:in => [false, true]})
+                ])
+
+                form = semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:published))
+                end
+                output_buffer.concat(form) if Formtastic::Util.rails3?
+                output_buffer.should have_tag('form li.required')
+                output_buffer.should_not have_tag('form li.optional')
+              end
+            end
+
             # TODO make a matcher for this?
             def should_be_required(options)
               @new_post.class.should_receive(:validators_on).with(:body).at_least(2).and_return([
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a16c5235a..0990acb53 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -67,6 +67,10 @@ def active_model_length_validator(attributes, options = {})
     active_model_validator(:length, attributes, options)
   end
 
+  def active_model_inclusion_validator(attributes, options = {})
+    active_model_validator(:inclusion, attributes, options)
+  end
+
   class ::Post
     extend ActiveModel::Naming if defined?(ActiveModel::Naming)
     include ActiveModel::Conversion if defined?(ActiveModel::Conversion)

From 1b44ae911c3d7f084f23ee5d925c3fc8c6c5a3b4 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Thu, 30 Sep 2010 22:45:16 -0300
Subject: [PATCH 250/992] Remove :label option from form generator template

Closes #263
---
 generators/form/templates/view__form.html.erb  | 4 ++--
 generators/form/templates/view__form.html.haml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/generators/form/templates/view__form.html.erb b/generators/form/templates/view__form.html.erb
index 21daaabb5..1679580e0 100644
--- a/generators/form/templates/view__form.html.erb
+++ b/generators/form/templates/view__form.html.erb
@@ -1,5 +1,5 @@
 <%% f.inputs do %>
 <% attributes.each do |attribute| -%>
-  <%%= f.input :<%= attribute.name %>, :label => '<%= attribute.name.humanize %>' %>
+  <%%= f.input :<%= attribute.name %> %>
 <% end -%>
-<%% end %>
\ No newline at end of file
+<%% end %>
diff --git a/generators/form/templates/view__form.html.haml b/generators/form/templates/view__form.html.haml
index 5e06093a8..c83eb24b8 100644
--- a/generators/form/templates/view__form.html.haml
+++ b/generators/form/templates/view__form.html.haml
@@ -1,4 +1,4 @@
 - f.inputs do
 <% attributes.each do |attribute| -%>
-  = f.input :<%= attribute.name %>, :label => '<%= attribute.name.humanize %>'
-<% end -%>
\ No newline at end of file
+  = f.input :<%= attribute.name %>
+<% end -%>

From 9c0fd73d79b34e262a3484ecd907e8711fa34aea Mon Sep 17 00:00:00 2001
From: John Firebaugh <john_firebaugh@bigfix.com>
Date: Mon, 23 Aug 2010 14:28:16 -0700
Subject: [PATCH 251/992] Prefer persisted? to new_record?, so any
 ActiveModel-compliant object can be used.

---
 lib/formtastic.rb          |  8 ++++++--
 spec/commit_button_spec.rb | 39 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 4a5c7bad2..15a3c581a 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -323,8 +323,12 @@ def commit_button(*args)
       options = args.extract_options!
       text = options.delete(:label) || args.shift
 
-      if @object && @object.respond_to?(:new_record?)
-        key = @object.new_record? ? :create : :update
+      if @object && (@object.respond_to?(:persisted?) || @object.respond_to?(:new_record?))
+        if @object.respond_to?(:persisted?) # ActiveModel
+          key = @object.persisted? ? :update : :create
+        else # Rails 2
+          key = @object.new_record? ? :create : :update
+        end
 
         # Deal with some complications with ActiveRecord::Base.human_name and two name models (eg UserPost)
         # ActiveRecord::Base.human_name falls back to ActiveRecord::Base.name.humanize ("Userpost")
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index 154657081..bc7a24c00 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -10,6 +10,43 @@
     mock_everything
   end
 
+  describe 'when the object responds to :new_record? (Rails 2)' do
+    
+    before do
+      @new_post.stub(:respond_to?).with(:to_model).and_return("X")
+      @new_post.stub(:respond_to?).with(:persisted?).and_return(false)
+      @new_post.stub(:respond_to?).with(:new_record?).and_return(true)
+    end
+    
+    it 'should call :new_record?' do
+      @new_post.should_receive(:new_record?)
+      @new_post.should_not_receive(:persisted?)
+      semantic_form_for(@new_post) do |builder|
+        concat(builder.commit_button)
+      end
+    end
+    
+  end
+  
+  describe 'when the object responds to :persisted? (ActiveModel)' do
+    
+    before do
+      @new_post.stub(:respond_to?).with(:to_model).and_return("X")
+      @new_post.stub(:respond_to?).with(:persisted?).and_return(true)
+      @new_post.stub(:respond_to?).with(:new_record?).and_return(false)
+    end
+    
+    it 'should call :persisted?' do
+      @new_post.should_receive(:persisted?)
+      @new_post.should_not_receive(:new_record?)
+      semantic_form_for(@new_post) do |builder|
+        concat(builder.commit_button)
+      end
+    end
+    
+  end
+  
+
   describe 'when used on any record' do
 
     before do
@@ -287,7 +324,7 @@
     # Existing record
     describe 'when used on an existing record' do
       before do
-        @new_post.stub!(:new_record?).and_return(false)
+        @new_post.stub!(:persisted?).and_return(true)
       end
 
       describe 'when explicit label is provided' do

From b766ddc38ea79ca15e447df84e332e9efbb4e473 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 17 Sep 2010 22:23:12 +1000
Subject: [PATCH 252/992] string|numeric|password and other basic inputs no
 longer add a size attribute based of the column data -- the default config is
 applied, unless it's nil

---
 lib/formtastic.rb                  |  2 +-
 spec/inputs/numeric_input_spec.rb  |  3 +-
 spec/inputs/password_input_spec.rb |  5 ++--
 spec/inputs/string_input_spec.rb   |  5 ++--
 spec/support/custom_macros.rb      | 45 +++++++++++++++---------------
 5 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 15a3c581a..57466ebd8 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1694,7 +1694,7 @@ def get_maxlength_for(method)
             :size => self.class.default_text_field_size }
         else
           { :maxlength => validation_max_limit || column.limit,
-            :size => self.class.default_text_field_size && [column.limit, self.class.default_text_field_size].min }
+            :size => self.class.default_text_field_size }
         end
       end
 
diff --git a/spec/inputs/numeric_input_spec.rb b/spec/inputs/numeric_input_spec.rb
index 055459d1f..c18fe0768 100644
--- a/spec/inputs/numeric_input_spec.rb
+++ b/spec/inputs/numeric_input_spec.rb
@@ -21,7 +21,8 @@
   it_should_have_input_with_id("post_title")
   it_should_have_input_with_type(:text)
   it_should_have_input_with_name("post[title]")
-  it_should_use_default_text_field_size_when_method_has_no_database_column(:string)
+  it_should_use_default_text_field_size_when_not_nil(:string)
+  it_should_not_use_default_text_field_size_when_nil(:string)
   it_should_apply_custom_input_attributes_when_input_html_provided(:string)
   it_should_apply_custom_for_to_label_when_input_html_id_provided(:string)
   it_should_apply_error_logic_for_input_type(:numeric)
diff --git a/spec/inputs/password_input_spec.rb b/spec/inputs/password_input_spec.rb
index 34e6d43da..bf4940ab7 100644
--- a/spec/inputs/password_input_spec.rb
+++ b/spec/inputs/password_input_spec.rb
@@ -22,9 +22,8 @@
   it_should_have_input_with_type(:password)
   it_should_have_input_with_name("post[title]")
   it_should_have_maxlength_matching_column_limit
-  it_should_use_default_text_field_size_for_columns_longer_than_default_text_field_size(:string)
-  it_should_use_column_size_for_columns_shorter_than_default_text_field_size(:string)
-  it_should_use_default_text_field_size_when_method_has_no_database_column(:string)
+  it_should_use_default_text_field_size_when_not_nil(:string)
+  it_should_not_use_default_text_field_size_when_nil(:string)
   it_should_apply_custom_input_attributes_when_input_html_provided(:string)
   it_should_apply_custom_for_to_label_when_input_html_id_provided(:string)
   it_should_apply_error_logic_for_input_type(:password)
diff --git a/spec/inputs/string_input_spec.rb b/spec/inputs/string_input_spec.rb
index d3c7c848e..cf66ee06b 100644
--- a/spec/inputs/string_input_spec.rb
+++ b/spec/inputs/string_input_spec.rb
@@ -25,9 +25,8 @@
     it_should_have_input_with_type(:text)
     it_should_have_input_with_name("post[title]")
     it_should_have_maxlength_matching_column_limit
-    it_should_use_default_text_field_size_for_columns_longer_than_default_text_field_size(:string)
-    it_should_use_column_size_for_columns_shorter_than_default_text_field_size(:string)
-    it_should_use_default_text_field_size_when_method_has_no_database_column(:string)
+    it_should_use_default_text_field_size_when_not_nil(:string)
+    it_should_not_use_default_text_field_size_when_nil(:string)
     it_should_apply_custom_input_attributes_when_input_html_provided(:string)
     it_should_apply_custom_for_to_label_when_input_html_id_provided(:string)
     it_should_apply_error_logic_for_input_type(:string)
diff --git a/spec/support/custom_macros.rb b/spec/support/custom_macros.rb
index fd30120b1..5546f65c1 100644
--- a/spec/support/custom_macros.rb
+++ b/spec/support/custom_macros.rb
@@ -84,16 +84,29 @@ def it_should_have_textarea_with_id(element_id)
         output_buffer.should have_tag("form li textarea##{element_id}")
       end
     end
-
-    def it_should_use_default_text_field_size_when_method_has_no_database_column(as)
-      it 'should use default_text_field_size when method has no database column' do
-        @new_post.stub!(:column_for_attribute).and_return(nil) # Return a nil column
-
-        form = semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:title, :as => as))
+    
+    def it_should_use_default_text_field_size_when_not_nil(as)
+      it 'should use default_text_field_size when not nil' do
+        with_config :default_text_field_size, 30 do
+          form = semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:title, :as => as))
+          end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.should have_tag("form li input[@size='#{Formtastic::SemanticFormBuilder.default_text_field_size}']")
+        end
+      end
+    end
+    
+    def it_should_not_use_default_text_field_size_when_nil(as)
+      it 'should not use default_text_field_size when nil' do
+        with_config :default_text_field_size, nil do
+          form = semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:title, :as => as))
+          end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.should have_tag("form li input")
+          output_buffer.should_not have_tag("form li input[@size]")
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag("form li input[@size='#{Formtastic::SemanticFormBuilder.default_text_field_size}']")
       end
     end
 
@@ -125,20 +138,6 @@ def it_should_have_maxlength_matching_column_limit
       end
     end
 
-    def it_should_use_default_text_field_size_for_columns_longer_than_default_text_field_size(as)
-      it 'should use default_text_field_size for columns longer than default_text_field_size' do
-        default_size = Formtastic::SemanticFormBuilder.default_text_field_size
-        @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => as, :limit => default_size * 2))
-
-        form = semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:title, :as => as))
-        end
-
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag("form li input[@size='#{default_size}']")
-      end
-    end
-
     def it_should_use_column_size_for_columns_shorter_than_default_text_field_size(as)
       it 'should use the column size for columns shorter than default_text_field_size' do
         column_limit_shorted_than_default = 1

From 0c4ab6402ec163cbaf2602be577dffef7fe159e9 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 17 Sep 2010 22:27:17 +1000
Subject: [PATCH 253/992] default text field size is now nil instead of 50, in
 practice that means it will be ommitted from most inputs, which makes styling
 easier, and custom sizes with the size attribute more deliberate

---
 generators/formtastic/templates/formtastic.rb | 2 +-
 lib/formtastic.rb                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/generators/formtastic/templates/formtastic.rb b/generators/formtastic/templates/formtastic.rb
index 266f78eae..da6ea6e65 100644
--- a/generators/formtastic/templates/formtastic.rb
+++ b/generators/formtastic/templates/formtastic.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Set the default text field size when input is a string. Default is 50.
+# Set the default text field size when input is a string. Default is nil.
 # Formtastic::SemanticFormBuilder.default_text_field_size = 50
 
 # Set the default text area height when input is a text. Default is 20.
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 57466ebd8..c508ae701 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -11,7 +11,7 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
                    :inline_order, :custom_inline_order, :file_methods, :priority_countries, :i18n_lookups_by_default, :escape_html_entities_in_hints_and_labels,
                    :default_commit_button_accesskey, :instance_reader => false
 
-    self.default_text_field_size = 50
+    self.default_text_field_size = nil
     self.default_text_area_height = 20
     self.all_fields_required_by_default = true
     self.include_blank_for_select_by_default = true

From e65fc030e94579b1c559cfb2dbe8e40f67043c2c Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 17 Sep 2010 22:33:07 +1000
Subject: [PATCH 254/992] * style inputs with { width:75% } by default * style
 inputs with a size attribute with { width:auto; max-width:74%; } so that a
 small size attribute (eg 3) will make the box smaller, and a large size
 attribute (eg 255) won't bust a layout

---
 generators/formtastic/templates/formtastic.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/generators/formtastic/templates/formtastic.css b/generators/formtastic/templates/formtastic.css
index 83a934d40..184328314 100644
--- a/generators/formtastic/templates/formtastic.css
+++ b/generators/formtastic/templates/formtastic.css
@@ -79,7 +79,11 @@ form.formtastic fieldset > ol > li ul.errors li { padding:0; border:none; displa
 --------------------------------------------------------------------------------------------------*/
 form.formtastic fieldset > ol > li.string input, 
 form.formtastic fieldset > ol > li.password input, 
-form.formtastic fieldset > ol > li.numeric input { max-width:72%; }
+form.formtastic fieldset > ol > li.numeric input { width:72%; }
+
+form.formtastic fieldset > ol > li.string input[size], 
+form.formtastic fieldset > ol > li.password input[size], 
+form.formtastic fieldset > ol > li.numeric input[size] { width:auto; max-width:72%; }
 
 
 /* TEXTAREA OVERRIDES

From 678c8da165b9783f4d31c4b19c07e73193945703 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 17 Sep 2010 22:53:56 +1000
Subject: [PATCH 255/992] text inputs no longer include a default cols
 attribute, specify it with :input_html if you need it, but the value we were
 using was useless... also beefed up spec coverage

---
 lib/formtastic.rb              |  2 +-
 spec/inputs/text_input_spec.rb | 56 ++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index c508ae701..f46f23f94 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1688,7 +1688,7 @@ def get_maxlength_for(method)
         column = self.column_for(method)
 
         if type == :text
-          { :cols => self.class.default_text_field_size, :rows => self.class.default_text_area_height }
+          { :rows => self.class.default_text_area_height }
         elsif type == :numeric || column.nil? || column.limit.nil?
           { :maxlength => validation_max_limit,
             :size => self.class.default_text_field_size }
diff --git a/spec/inputs/text_input_spec.rb b/spec/inputs/text_input_spec.rb
index 8836aaf33..77793fb58 100644
--- a/spec/inputs/text_input_spec.rb
+++ b/spec/inputs/text_input_spec.rb
@@ -29,6 +29,62 @@
     output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should have_tag("form li textarea.myclass")
   end
+  
+  it "should have a cols attribute when :cols is specified in :input_html" do
+    form = semantic_form_for(@new_post) do |builder|
+      concat(builder.input(:title, :as => :text, :input_html => { :cols => 42 }))
+    end
+    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.should have_tag("form li textarea[@cols='42']")
+  end
+
+  it "should not have a cols attribute when :cols is missing in :input_html" do
+    form = semantic_form_for(@new_post) do |builder|
+      concat(builder.input(:title, :as => :text, :input_html => { :cols => nil }))
+    end
+    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.should_not have_tag("form li textarea[@cols]")
+  end
+  
+  it "should have a rows attribute when :rows is specified in :input_html as a number" do
+    form = semantic_form_for(@new_post) do |builder|
+      concat(builder.input(:title, :as => :text, :input_html => { :rows => 42 }))
+    end
+    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.should have_tag("form li textarea[@rows='42']")
+    
+  end
 
+  it "should not have a rows attribute when :rows is specified in :input_html as nil" do
+    form = semantic_form_for(@new_post) do |builder|
+      concat(builder.input(:title, :as => :text, :input_html => { :rows => nil }))
+    end
+    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.should_not have_tag("form li textarea[@rows]")
+  end
+  
+  context "when :rows is missing in :input_html" do
+    it "should have a rows attribute matching default_text_area_height if numeric" do
+      with_config :default_text_area_height, 12 do
+        form = semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:title, :as => :text))
+        end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag("form li textarea[@rows='12']")
+      end
+    end
+    
+    it "should not have a rows attribute if default_text_area_height is nil" do
+      with_config :default_text_area_height, nil do
+        form = semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:title, :as => :text))
+        end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.should_not have_tag("form li textarea[@rows]")
+      end
+      
+    end
+  end
+    
 end
 

From 9f5131011af0b6443c18ea06057c26635cf206a1 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 17 Sep 2010 23:05:07 +1000
Subject: [PATCH 256/992] text input css behaviour updated to be similar to
 string etc

---
 generators/formtastic/templates/formtastic.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/generators/formtastic/templates/formtastic.css b/generators/formtastic/templates/formtastic.css
index 184328314..fc4c4267d 100644
--- a/generators/formtastic/templates/formtastic.css
+++ b/generators/formtastic/templates/formtastic.css
@@ -89,6 +89,7 @@ form.formtastic fieldset > ol > li.numeric input[size] { width:auto; max-width:7
 /* TEXTAREA OVERRIDES
 --------------------------------------------------------------------------------------------------*/
 form.formtastic fieldset > ol > li.text textarea { width:72%; }
+form.formtastic fieldset > ol > li.text textarea[cols] { width:auto; max-width:72%; }
 
 
 /* HIDDEN OVERRIDES

From 8649b7455213014f2339f7e97961d618b248744a Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 7 Oct 2010 19:02:16 +1100
Subject: [PATCH 257/992] Removed code to handle deprecated :selected, :checked
 and :default options, resolves GH-295.

---
 lib/formtastic.rb                     | 110 +++-----------------------
 spec/inputs/boolean_input_spec.rb     |  40 ----------
 spec/inputs/check_boxes_input_spec.rb |  74 -----------------
 spec/inputs/date_input_spec.rb        |  79 ------------------
 spec/inputs/datetime_input_spec.rb    |  87 --------------------
 spec/inputs/radio_input_spec.rb       |  42 ----------
 spec/inputs/select_input_spec.rb      |  96 ----------------------
 spec/inputs/time_input_spec.rb        |  65 ---------------
 spec/inputs/time_zone_input_spec.rb   |  45 -----------
 9 files changed, 10 insertions(+), 628 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index f46f23f94..2b4ed6866 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -81,13 +81,6 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
     #   <% end %>
     #
     def input(method, options = {})
-      if options.key?(:selected) || options.key?(:checked) || options.key?(:default)
-        ::ActiveSupport::Deprecation.warn(
-          "The :selected, :checked (and :default) options are deprecated in Formtastic and will be removed from 1.0. " <<
-          "Please set default values in your models (using an after_initialize callback) or in your controller set-up. " <<
-          "See http://api.rubyonrails.org/classes/ActiveRecord/Callbacks.html for more information.", caller)
-      end
-
       options[:required] = method_required?(method) unless options.key?(:required)
       options[:as]     ||= default_input_type(method, options)
 
@@ -724,15 +717,6 @@ def hidden_input(method, options)
       #   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:
@@ -773,7 +757,6 @@ def select_input(method, options)
           end
         end
         options = set_include_blank(options)
-        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]
@@ -807,22 +790,12 @@ def select_input(method, options)
       # 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)
+          strip_formtastic_options(options), html_options)
       end
 
       # Outputs a fieldset containing a legend for the label text, and an ordered list (ol) of list
@@ -878,17 +851,9 @@ def time_zone_input(method, options)
       #   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) || {})
@@ -896,17 +861,13 @@ def radio_input(method, options)
         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,
             Formtastic::Util.html_safe("#{self.radio_button(input_name, value, html_options)} #{escape_html_entities(label)}"),
             :for => input_id
@@ -928,14 +889,6 @@ def radio_input(method, options)
       # :labels should be a hash with the field (e.g. day) as key and the label text as value.
       # 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
-      #   f.input :created_at, :as => :date, :labels => { :year => "Year", :month => "Month", :day => "Day" }
-      #
       # Some of Rails' options for select_date are supported, but not everything yet, see
       # documentation of date_or_datetime_input() for more information.
       def date_input(method, options)
@@ -949,15 +902,6 @@ def date_input(method, options)
       # the :labels option. :labels should be a hash with the field (e.g. day) as key and the label
       # text as value.  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
-      #   f.input :created_at, :as => :date, :labels => { :year => "Year", :month => "Month", :day => "Day",
-      #                                                   :hour => "Hour", :minute => "Minute" }
-      #
       # Some of Rails' options for select_date are supported, but not everything yet, see
       # documentation of date_or_datetime_input() for more information.
       def datetime_input(method, options)
@@ -971,14 +915,6 @@ def datetime_input(method, options)
       # :labels should be a hash with the field (e.g. day) as key and the label text as value.
       # 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
-      #   f.input :created_at, :as => :date, :labels => { :hour => "Hour", :minute => "Minute" }
-      #
       # Some of Rails' options for select_time are supported, but not everything yet, see
       # documentation of date_or_datetime_input() for more information.
       def time_input(method, options)
@@ -1026,9 +962,6 @@ def time_input(method, options)
       #
       #   * @:order => [:month, :day, :year]@
       #   * @:include_seconds@ => true@
-      #   * @:selected => Time.mktime(2008)@
-      #   * @:selected => Date.new(2008)@
-      #   * @:selected => nil@
       #   * @:discard_(year|month|day|hour|minute) => true@
       #   * @:include_blank => true@
       #   * @:labels => {}@
@@ -1046,8 +979,7 @@ def date_or_datetime_input(method, options)
         list_items_capture = ""
         hidden_fields_capture = ""
 
-        datetime = options[:selected]
-        datetime = @object.send(method) if @object && @object.send(method) # object value trumps :selected value
+        datetime = @object.send(method) if @object && @object.send(method)
 
         html_options = options.delete(:input_html) || {}
         input_ids    = []
@@ -1137,15 +1069,6 @@ def date_or_datetime_input(method, options)
       #   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
-      #
-      #
       # Formtastic works around a bug in rails handling of check box collections by
       # not generating the hidden fields for state checking of the checkboxes
       # The :hidden_fields option provides a way to re-enable these hidden inputs by
@@ -1200,25 +1123,19 @@ def check_boxes_input(method, options)
         template.content_tag(:fieldset, fieldset_content)
       end
 
-      # Used by check_boxes input. The selected values will be set either by:
-      #
-      # * Explicitly provided through :selected or :checked
-      # * Values retrieved through an association
+      # Used by check_boxes input. The selected values will be set by retrieving the value 
+      # through the association.
       #
       # If the collection is not a hash or an array of strings, fixnums or symbols,
       # we use value_method to retrieve an array with the values
-      #
       def find_selected_values_for_column(method, options)
-        selected_option_is_present = [:selected, :checked].any? { |k| options.key?(k) }
-        if selected_option_is_present
-          selected_values = (options.key?(:checked) ? options[:checked] : options[:selected])
-        elsif object.respond_to?(method)
+        if object.respond_to?(method)
           collection = [object.send(method)].compact.flatten
           label, value = detect_label_and_value_method!(collection, options)
-          selected_values = collection.map { |o| send_or_call(value, o) }
+          [*collection.map { |o| send_or_call(value, o) }].compact
+        else
+          []
         end
-        selected_values = [*selected_values].compact
-        selected_values
       end
 
       # Outputs a custom hidden field for check_boxes
@@ -1263,16 +1180,9 @@ def country_input(method, options)
       # 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
-      #
+      # TODO: doesn't look to the model value to set html_options[: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) }
         checked_value = options.delete(:checked_value) || '1'
         unchecked_value = options.delete(:unchecked_value) || '0'
 
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index 0e7a79b4d..df9d5b4d0 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -61,44 +61,4 @@
     output_buffer.should have_tag('form li label input[@name="project[allow_comments]"]')
   end
 
-  describe 'when :selected is set' do
-    before do
-      @output_buffer = ''
-    end
-
-    describe "not selected" do
-      before do
-        @new_post.stub!(:allow_comments).and_return(true)
-
-        with_deprecation_silenced do
-          @form = semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:allow_comments, :as => :boolean, :selected => false))
-          end
-        end
-      end
-
-      it 'should not be selected' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should_not have_tag("form li label input[@type='checkbox'][@checked='checked']")
-      end
-    end
-
-    describe "selected" do
-      before do
-        @new_post.stub!(:allow_comments).and_return(false)
-
-        with_deprecation_silenced do
-          @form = semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:allow_comments, :as => :boolean, :selected => true))
-          end
-        end
-      end
-
-      it 'should be selected' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag("form li label input[@type='checkbox'][@checked='checked']")
-      end
-    end
-  end
-
 end
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 33d201606..2e72e77db 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -187,80 +187,6 @@
       end
     end
 
-    describe 'when :selected is set' do
-      before do
-        @output_buffer = ''
-      end
-
-      describe "no selected items" do
-        before do
-          @new_post.stub!(:author_ids).and_return(nil)
-
-          with_deprecation_silenced do
-            @form = semantic_form_for(@new_post) do |builder|
-              concat(builder.input(:authors, :as => :check_boxes, :selected => nil))
-            end
-          end
-        end
-
-        it 'should not have any selected item(s)' do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
-          output_buffer.should_not have_tag("form li fieldset ol li label input[@checked='checked']")
-        end
-      end
-
-      describe "single selected item" do
-        before do
-          @new_post.stub!(:author_ids).and_return(nil)
-
-          with_deprecation_silenced do
-            @form = semantic_form_for(@new_post) do |builder|
-              concat(builder.input(:authors, :as => :check_boxes, :selected => @fred.id))
-            end
-          end
-        end
-
-        it "should have one item selected; the specified one" do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
-          output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']", :count => 1)
-          output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
-          output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked'][@value='#{@fred.id}']")
-        end
-      end
-
-      describe "multiple selected items" do
-        before do
-          @new_post.stub!(:author_ids).and_return(nil)
-
-          with_deprecation_silenced do
-            @form = semantic_form_for(@new_post) do |builder|
-              concat(builder.input(:authors, :as => :check_boxes, :selected => [@bob.id, @fred.id]))
-            end
-          end
-        end
-
-        it "should have multiple items selected; the specified ones" do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
-          output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']", :count => 2)
-          output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@bob.id}']", /bob/i)
-          output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked'][@value='#{@bob.id}']")
-          output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
-          output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked'][@value='#{@fred.id}']")
-        end
-      end
-
-    end
-
-    it 'should warn about :selected deprecation' do
-      with_deprecation_silenced do
-        ::ActiveSupport::Deprecation.should_receive(:warn).any_number_of_times
-        semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:authors, :as => :check_boxes, :selected => @bob.id))
-        end
-      end
-    end
-
-
     describe 'when :disabled is set' do
       before do
         @output_buffer = ''
diff --git a/spec/inputs/date_input_spec.rb b/spec/inputs/date_input_spec.rb
index cbd530919..157f2a2d1 100644
--- a/spec/inputs/date_input_spec.rb
+++ b/spec/inputs/date_input_spec.rb
@@ -57,76 +57,6 @@
     end
   end
 
-  describe ':selected option' do
-
-    describe "when the object has a value" do
-      it "should select the object value (ignoring :selected)" do
-        output_buffer.replace ''
-        @new_post.stub!(:created_at => Time.mktime(2012))
-        with_deprecation_silenced do
-          @form = semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:created_at, :as => :date, :selected => Time.mktime(1999)))
-          end
-        end
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
-        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='2012'][@selected]", :count => 1)
-      end
-    end
-
-    describe 'when the object has no value (nil)' do
-      it "should select the :selected if provided as a Date" do
-        output_buffer.replace ''
-        @new_post.stub!(:created_at => nil)
-        with_deprecation_silenced do
-          @form = semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:created_at, :as => :date, :selected => Date.new(1999)))
-          end
-        end
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
-        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='1999'][@selected]", :count => 1)
-      end
-
-      it "should select the :selected if provided as a Time" do
-        output_buffer.replace ''
-        @new_post.stub!(:created_at => nil)
-        with_deprecation_silenced do
-          @form = semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:created_at, :as => :date, :selected => Time.mktime(1999)))
-          end
-        end
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
-        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='1999'][@selected]", :count => 1)
-      end
-
-      it "should not select an option if the :selected is provided as nil" do
-        output_buffer.replace ''
-        @new_post.stub!(:created_at => nil)
-        with_deprecation_silenced do
-          @form = semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:created_at, :as => :date, :selected => nil))
-          end
-        end
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should_not have_tag("form li ol li select#post_created_at_1i option[@selected]")
-      end
-
-      it "should select nothing if a :selected is not provided" do
-        output_buffer.replace ''
-        @new_post.stub!(:created_at => nil)
-        form = semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:created_at, :as => :date))
-        end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
-        output_buffer.should_not have_tag("form li ol li select option[@selected]")
-
-      end
-    end
-
-  end
-
   describe ':labels option' do
     fields = [:year, :month, :day]
     fields.each do |field|
@@ -156,13 +86,4 @@
     end
   end
 
-  it 'should warn about :selected deprecation' do
-    with_deprecation_silenced do
-      ::ActiveSupport::Deprecation.should_receive(:warn).any_number_of_times
-      semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:created_at, :as => :date, :selected => Date.new(1999)))
-      end
-    end
-  end
-
 end
diff --git a/spec/inputs/datetime_input_spec.rb b/spec/inputs/datetime_input_spec.rb
index cd3585d22..9820c7dd9 100644
--- a/spec/inputs/datetime_input_spec.rb
+++ b/spec/inputs/datetime_input_spec.rb
@@ -190,84 +190,6 @@
   #
   #end
 
-  describe ':selected option' do
-
-    describe "when the object has a value" do
-      it "should select the object value (ignoring :selected)" do
-        output_buffer.replace ''
-        @new_post.stub!(:created_at => Time.mktime(2012))
-        with_deprecation_silenced do
-          @form = semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:created_at, :as => :datetime, :selected => Time.mktime(1999)))
-          end
-        end
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
-        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='2012'][@selected]", :count => 1)
-      end
-    end
-
-    describe 'when the object has no value' do
-      it "should select the :selected if provided as a Date" do
-        output_buffer.replace ''
-        @new_post.stub!(:created_at => nil)
-        with_deprecation_silenced do
-          @form = semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:created_at, :as => :datetime, :selected => Date.new(1999)))
-          end
-        end
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
-        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='1999'][@selected]", :count => 1)
-      end
-
-      it "should select the :selected if provided as a Time" do
-        output_buffer.replace ''
-        @new_post.stub!(:created_at => nil)
-        with_deprecation_silenced do
-          @form = semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:created_at, :as => :datetime, :selected => Time.mktime(1999)))
-          end
-        end
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
-        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='1999'][@selected]", :count => 1)
-      end
-
-      it "should not select an option if the :selected is provided as nil" do
-        output_buffer.replace ''
-        @new_post.stub!(:created_at => nil)
-        with_deprecation_silenced do
-          @form = semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:created_at, :as => :datetime, :selected => nil))
-          end
-        end
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should_not have_tag("form li ol li select#post_created_at_1i option[@selected]")
-      end
-
-      it "should select nothing if a :selected is not provided" do
-        output_buffer.replace ''
-        @new_post.stub!(:created_at => nil)
-        form = semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:created_at, :as => :datetime))
-        end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
-        output_buffer.should_not have_tag("form li ol li select option[@selected]")
-      end
-    end
-
-    it 'should warn about :selected deprecation' do
-      with_deprecation_silenced do
-        ::ActiveSupport::Deprecation.should_receive(:warn).any_number_of_times
-        semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:created_at, :as => :date, :selected => Time.mktime(1999)))
-        end
-      end
-    end
-
-  end
-
   describe ':labels option' do
     fields = [:year, :month, :day, :hour, :minute]
     fields.each do |field|
@@ -297,14 +219,5 @@
     end
   end
 
-  it 'should warn about :selected deprecation' do
-    with_deprecation_silenced do
-      ::ActiveSupport::Deprecation.should_receive(:warn).any_number_of_times
-      semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:created_at, :as => :datetime, :selected => Time.mktime(1999)))
-      end
-    end
-  end
-
 end
 
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index b538d9cfc..1bc99fe12 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -146,48 +146,6 @@
     end
   end
 
-  describe 'when :selected is set' do
-    before do
-      @output_buffer = ''
-    end
-
-    describe "no selected items" do
-      before do
-        @new_post.stub!(:author_ids).and_return(nil)
-
-        with_deprecation_silenced do
-          @form = semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:authors, :as => :radio, :selected => nil))
-          end
-        end
-      end
-
-      it 'should not have any selected item(s)' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should_not have_tag("form li fieldset ol li label input[@checked='checked']")
-      end
-    end
-
-    describe "single selected item" do
-      before do
-        @new_post.stub!(:author_ids).and_return(nil)
-        with_deprecation_silenced do
-          @form = semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:authors, :as => :radio, :selected => @fred.id))
-          end
-        end
-      end
-
-      it "should have one item selected; the specified one" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag("form li fieldset ol li label input[@type='radio'][@checked='checked']", :count => 1)
-        output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
-        output_buffer.should have_tag("form li fieldset ol li label input[@type='radio'][@checked='checked'][@value='#{@fred.id}']")
-      end
-    end
-
-  end
-
   describe "with i18n of the legend label" do
 
     before do
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index e83a03f8e..b66b2be36 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -437,91 +437,6 @@
     end
   end
 
-  describe 'when :selected is set' do
-    before do
-      @output_buffer = ''
-    end
-
-    describe "no selected items" do
-      before do
-        @new_post.stub!(:author_id).and_return(nil)
-        with_deprecation_silenced do
-          @form = semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:author, :as => :select, :selected => nil))
-          end
-        end
-      end
-
-      it 'should not have any selected item(s)' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should_not have_tag("form li select option[@selected='selected']")
-      end
-    end
-
-    describe "single selected item" do
-      before do
-        @new_post.stub!(:author_id).and_return(nil)
-        with_deprecation_silenced do
-          @form = semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:author, :as => :select, :selected => @bob.id))
-          end
-        end
-      end
-
-      it 'should have a selected item; the specified one' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag("form li select option[@selected='selected']", :count => 1)
-        output_buffer.should have_tag("form li select option[@selected='selected']", /bob/i)
-        output_buffer.should have_tag("form li select option[@selected='selected'][@value='#{@bob.id}']")
-      end
-    end
-
-    describe "multiple selected items" do
-
-      describe "when :multiple => false" do
-        before do
-          @new_post.stub!(:author_ids).and_return(nil)
-
-          with_deprecation_silenced do
-            @form = semantic_form_for(@new_post) do |builder|
-              concat(builder.input(:authors, :as => :select, :selected => [@bob.id, @fred.id], :multiple => false))
-            end
-          end
-        end
-
-        it "should only select the first value" do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
-          output_buffer.should have_tag("form li select option[@selected='selected']", :count => 1)
-          output_buffer.should have_tag("form li select:not([@multiple]) option[@selected='selected']", /bob/i)
-          output_buffer.should have_tag("form li select:not([@multiple]) option[@selected='selected'][@value='#{@bob.id}']")
-        end
-      end
-
-      describe "when :multiple => true" do
-        before do
-          @new_post.stub!(:author_ids).and_return(nil)
-
-          with_deprecation_silenced do
-            @form = semantic_form_for(@new_post) do |builder|
-              concat(builder.input(:authors, :as => :select, :selected => [@bob.id, @fred.id]))
-            end
-          end
-        end
-
-        it "should have multiple items selected; the specified ones" do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
-          output_buffer.should have_tag("form li select option[@selected='selected']", :count => 2)
-          output_buffer.should have_tag("form li select[@multiple] option[@selected='selected']", /bob/i)
-          output_buffer.should have_tag("form li select[@multiple] option[@selected='selected'][@value='#{@bob.id}']")
-          output_buffer.should have_tag("form li select[@multiple] option[@selected='selected']", /fred/i)
-          output_buffer.should have_tag("form li select[@multiple] option[@selected='selected'][@value='#{@fred.id}']")
-        end
-      end
-
-    end
-
-  end
-
   describe "enum" do
     before do
       @output_buffer = ''
@@ -566,15 +481,4 @@
     end
   end
 
-  it 'should warn about :selected deprecation' do
-    with_deprecation_silenced do
-      ::ActiveSupport::Deprecation.should_receive(:warn).any_number_of_times
-      semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:author_id, :as => :select, :selected => @bob.id))
-      end
-    end
-  end
-
-
-
 end
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index 9c02f3a6d..b67a2de6c 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -109,62 +109,6 @@
     end
   end
 
-  describe ':selected option' do
-
-    describe "when the object has a value" do
-      it "should select the object value (ignoring :selected)" do
-        output_buffer.replace ''
-        @new_post.stub!(:created_at => Time.mktime(2012, 11, 30, 21, 45))
-        with_deprecation_silenced do
-          @form = semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:created_at, :as => :time, :selected => Time.mktime(1999, 12, 31, 22, 59)))
-          end
-        end
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@selected]", :count => 1)
-        output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@value='21'][@selected]", :count => 1)
-      end
-    end
-
-    describe 'when the object has no value (nil)' do
-      it "should select the :selected if provided as a Time" do
-        output_buffer.replace ''
-        @new_post.stub!(:created_at => nil)
-        with_deprecation_silenced do
-          @form = semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:created_at, :as => :time, :selected => Time.mktime(1999, 12, 31, 22, 59)))
-          end
-        end
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@selected]", :count => 1)
-        output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@value='22'][@selected]", :count => 1)
-      end
-
-      it "should not select an option if the :selected is provided as nil" do
-        output_buffer.replace ''
-        @new_post.stub!(:created_at => nil)
-        with_deprecation_silenced do
-          @form = semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:created_at, :as => :time, :selected => nil))
-          end
-        end
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should_not have_tag("form li ol li select#post_created_at_4i option[@selected]")
-      end
-
-      it "should select nothing if a :selected is not provided" do
-        output_buffer.replace ''
-        @new_post.stub!(:created_at => nil)
-        form = semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:created_at, :as => :time))
-        end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
-        output_buffer.should_not have_tag("form li ol li select option[@selected]")
-      end
-    end
-
-  end
-
   describe ':labels option' do
     fields = [:hour, :minute, :second]
     fields.each do |field|
@@ -194,13 +138,4 @@
     end
   end
 
-  it 'should warn about :selected deprecation' do
-    with_deprecation_silenced do
-      ::ActiveSupport::Deprecation.should_receive(:warn).any_number_of_times
-      semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:created_at, :as => :time, :selected => Time.mktime(1999)))
-      end
-    end
-  end
-
 end
diff --git a/spec/inputs/time_zone_input_spec.rb b/spec/inputs/time_zone_input_spec.rb
index 31920d2c6..43110d430 100644
--- a/spec/inputs/time_zone_input_spec.rb
+++ b/spec/inputs/time_zone_input_spec.rb
@@ -62,49 +62,4 @@
     end
   end
 
-  describe 'when :selected is set' do
-    before do
-      @output_buffer = ''
-    end
-
-    # Note: Not possible to override default selected value for time_zone input
-    # without overriding Rails time_zone_select. This Rails helper works "a bit different". =/
-    #
-    # describe "no selected items" do
-    #   before do
-    #     @new_post.stub!(:time_zone).and_return('Stockholm')
-    #
-    #     semantic_form_for(@new_post) do |builder|
-    #       concat(builder.input(:time_zone, :as => :time_zone, :selected => nil))
-    #     end
-    #   end
-    #
-    #   it 'should not have any selected item(s)' do
-    #     output_buffer.should_not have_tag("form li select option[@selected='selected']")
-    #   end
-    # end
-
-    describe "single selected item" do
-      before do
-        # Note: See above...only works for the "attribute is nil" case.
-        # @new_post.stub!(:time_zone).and_return('Stockholm')
-        @new_post.stub!(:time_zone).and_return(nil)
-
-        with_deprecation_silenced do
-          @form = semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:time_zone, :as => :time_zone, :selected => 'Melbourne'))
-          end
-        end
-      end
-
-      it 'should have a selected item; the specified one' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag("form li select option[@selected='selected']", :count => 1)
-        output_buffer.should have_tag("form li select option[@selected='selected']", /Melbourne/i)
-        output_buffer.should have_tag("form li select option[@selected='selected'][@value='Melbourne']")
-      end
-    end
-
-  end
-
 end

From b810331207bf6bdcebb0621d562e5e12d5f5a926 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 7 Oct 2010 22:04:15 +1100
Subject: [PATCH 258/992] deprecate a bunch of aliased methods that i hope no
 one uses any more

---
 lib/formtastic.rb | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 2b4ed6866..6f9a3b0eb 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -276,7 +276,11 @@ def inputs(*args, &block)
         field_set_and_list_wrapping(*((args << html_options) << contents))
       end
     end
-    alias :input_field_set :inputs
+    
+    def input_field_set(*args, &block)
+      ::ActiveSupport::Deprecation.warn("input_field_set() is deprecated and will be removed in Formtastic 1.3 or later, use inputs() instead.", caller)
+      inputs(args, &block)
+    end
 
     # Creates a fieldset and ol tag wrapping for form buttons / actions as list items.
     # See inputs documentation for a full example.  The fieldset's default class attriute
@@ -295,7 +299,11 @@ def buttons(*args, &block)
         field_set_and_list_wrapping(html_options, contents)
       end
     end
-    alias :button_field_set :buttons
+    
+    def button_field_set(*args, &block)
+      ::ActiveSupport::Deprecation.warn("button_field_set() is deprecated and will be removed in Formtastic 1.3 or later, use inputs() instead.", caller)
+      buttons(args, &block)
+    end
 
     # Creates a submit input tag with the value "Save [model name]" (for existing records) or
     # "Create [model name]" (for new records) by default:
@@ -782,7 +790,11 @@ def select_input(method, options)
 
         self.label(method, options_for_label(options).merge(:input_name => input_name)) << select_html
       end
-      alias :boolean_select_input :select_input
+
+      def boolean_select_input(method, options)
+        ::ActiveSupport::Deprecation.warn(":as => :boolean_select is deprecated and will be removed in Formtastic 1.3 or later. Use :as => :select instead.", caller)
+        select_input(method, options)
+      end
 
       # Outputs a timezone select input as Rails' time_zone_select helper. You
       # can give priority zones as option.
@@ -881,7 +893,11 @@ def radio_input(method, options)
           legend_tag(method, options) << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
         )
       end
-      alias :boolean_radio_input :radio_input
+      
+      def boolean_radio_input(method, options)
+        ::ActiveSupport::Deprecation.warn(":as => :boolean_radio is deprecated and will be removed in Formtastic 1.3 or later. Use :as => :radio instead.", caller)
+        radio_input(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).  Each li contains a label

From 1bbe8ea472eed6e4630d231b16b0dbe895b7132b Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 8 Oct 2010 20:40:59 +1100
Subject: [PATCH 259/992] add the pledgie badge back in, GH don't show them any
 more?

---
 README.textile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.textile b/README.textile
index a9df54e0a..3d8f0f7cf 100644
--- a/README.textile
+++ b/README.textile
@@ -2,6 +2,8 @@ h1. Formtastic
 
 Formtastic is a Rails FormBuilder DSL (with some other goodies) to make it far easier to create beautiful, semantically rich, syntactically awesome, readily stylable and wonderfully accessible HTML forms in your Rails applications.
 
+<a href='http://www.pledgie.com/campaigns/2178'><img alt='Click here to lend your support to: formtastic and make a donation at www.pledgie.com !' src='http://www.pledgie.com/campaigns/2178.png?skin_name=chrome' border='0' /></a>
+
 h2. The Story
 
 One day, I finally had enough, so I opened up my text editor, and wrote a DSL for how I'd like to author forms:

From 4c7792f332871a466aa8e3ccbb8d3f3af6531901 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sat, 9 Oct 2010 12:09:26 -0300
Subject: [PATCH 260/992] Add support for default_text_area_width

Closes GH #266
---
 generators/formtastic/templates/formtastic.rb |  3 +++
 lib/formtastic.rb                             |  5 ++--
 spec/inputs/text_input_spec.rb                | 23 +++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/generators/formtastic/templates/formtastic.rb b/generators/formtastic/templates/formtastic.rb
index da6ea6e65..f9b80883a 100644
--- a/generators/formtastic/templates/formtastic.rb
+++ b/generators/formtastic/templates/formtastic.rb
@@ -6,6 +6,9 @@
 # Set the default text area height when input is a text. Default is 20.
 # Formtastic::SemanticFormBuilder.default_text_area_height = 5
 
+# Set the default text area width when input is a text. Default is 50.
+# Formtastic::SemanticFormBuilder.default_text_area_width = 10
+
 # Should all fields be considered "required" by default?
 # Rails 2 only, ignored by Rails 3 because it will never fall back to this default.
 # Defaults to true.
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 6f9a3b0eb..5c8b3aeb7 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -6,13 +6,14 @@
 module Formtastic #:nodoc:
 
   class SemanticFormBuilder < ActionView::Helpers::FormBuilder
-    class_inheritable_accessor :default_text_field_size, :default_text_area_height, :all_fields_required_by_default, :include_blank_for_select_by_default,
+    class_inheritable_accessor :default_text_field_size, :default_text_area_height, :default_text_area_width, :all_fields_required_by_default, :include_blank_for_select_by_default,
                    :required_string, :optional_string, :inline_errors, :label_str_method, :collection_value_methods, :collection_label_methods,
                    :inline_order, :custom_inline_order, :file_methods, :priority_countries, :i18n_lookups_by_default, :escape_html_entities_in_hints_and_labels,
                    :default_commit_button_accesskey, :instance_reader => false
 
     self.default_text_field_size = nil
     self.default_text_area_height = 20
+    self.default_text_area_width = 50
     self.all_fields_required_by_default = true
     self.include_blank_for_select_by_default = true
     self.required_string = proc { ::Formtastic::Util.html_safe(%{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>}) }
@@ -1614,7 +1615,7 @@ def get_maxlength_for(method)
         column = self.column_for(method)
 
         if type == :text
-          { :rows => self.class.default_text_area_height }
+          { :rows => self.class.default_text_area_height, :cols => self.class.default_text_area_width }
         elsif type == :numeric || column.nil? || column.limit.nil?
           { :maxlength => validation_max_limit,
             :size => self.class.default_text_field_size }
diff --git a/spec/inputs/text_input_spec.rb b/spec/inputs/text_input_spec.rb
index 77793fb58..c8f793d48 100644
--- a/spec/inputs/text_input_spec.rb
+++ b/spec/inputs/text_input_spec.rb
@@ -85,6 +85,29 @@
       
     end
   end
+
+  context "when :cols is missing in :input_html" do
+    it "should have a cols attribute matching default_text_area_width if numeric" do
+      with_config :default_text_area_width, 10 do
+        form = semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:title, :as => :text))
+        end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag("form li textarea[@cols='10']")
+      end
+    end
+    
+    it "should not have a cols attribute if default_text_area_width is nil" do
+      with_config :default_text_area_width, nil do
+        form = semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:title, :as => :text))
+        end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.should_not have_tag("form li textarea[@cols]")
+      end
+      
+    end
+  end
     
 end
 

From dd5b56ac10b97a2b8adc53fb4eefafe5142ec6cd Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sat, 9 Oct 2010 13:28:53 -0300
Subject: [PATCH 261/992] Refactoring on Formtastic::Util.rails3?

ActionPack::VERSION::MAJOR is always defined
---
 lib/formtastic/util.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/formtastic/util.rb b/lib/formtastic/util.rb
index 11e2e786f..8db6d1c65 100644
--- a/lib/formtastic/util.rb
+++ b/lib/formtastic/util.rb
@@ -28,11 +28,7 @@ def rails_safe_buffer_class
     end
 
     def rails3?
-      version=
-        if defined?(ActionPack::VERSION::MAJOR)
-          ActionPack::VERSION::MAJOR
-        end
-      !version.blank? && version >= 3
+      ActionPack::VERSION::MAJOR >= 3
     end
   end
 end

From f8e4100ef0e0c7d45b865fa1972a5743aa7144a3 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Wed, 29 Sep 2010 19:59:55 +0800
Subject: [PATCH 262/992] string type html defaults for newer fields

---
 lib/formtastic.rb                | 29 ++++++++++++++++++++++++++++-
 spec/inputs/email_input_spec.rb  | 31 +++++++++++++++++++++++++++++++
 spec/inputs/phone_input_spec.rb  | 31 +++++++++++++++++++++++++++++++
 spec/inputs/search_input_spec.rb | 31 +++++++++++++++++++++++++++++++
 spec/inputs/url_input_spec.rb    | 31 +++++++++++++++++++++++++++++++
 spec/spec_helper.rb              |  4 ++++
 6 files changed, 156 insertions(+), 1 deletion(-)
 create mode 100644 spec/inputs/email_input_spec.rb
 create mode 100644 spec/inputs/phone_input_spec.rb
 create mode 100644 spec/inputs/search_input_spec.rb
 create mode 100644 spec/inputs/url_input_spec.rb

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 5c8b3aeb7..bbf9f88eb 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -67,6 +67,11 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
     # * :string (a text field) - default for :string column types
     # * :numeric (a text field, like string) - default for :integer, :float and :decimal column types
     # * :country (a select menu of country names) - requires a country_select plugin to be installed
+    # * :email (an email input) - New in HTML5 - needs to be explicitly provided with :as => :email
+    # * :url (a url input) - New in HTML5 - needs to be explicitly provided with :as => :url
+    # * :phone (a tel input) - New in HTML5 - needs to be explicitly provided with :as => :phone
+    # * :search (a search input) - New in HTML5 - needs to be explicity provided with :as => :search
+    # * :country (a select menu of country names) - requires a country_select plugin to be installed
     # * :hidden (a hidden field) - creates a hidden field (added for compatibility)
     #
     # Example:
@@ -78,6 +83,8 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
     #       <%= 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" %>
+    #       <%= form.input :email, :as => :email %>
+    #       <%= form.input :website, :as => :url, :hint => "You may wish to omit the http://" %>
     #     <% end %>
     #   <% end %>
     #
@@ -611,7 +618,7 @@ def options_require_validation?(options) #nodoc
 
       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, :text].include?(type)
+        html_options = default_string_options(method, type).merge(html_options) if [:numeric, :string, :password, :text, :phone, :search, :url, :email].include?(type)
 
         self.label(method, options_for_label(options)) <<
         self.send(form_helper_method, method, html_options)
@@ -641,6 +648,26 @@ def text_input(method, options)
       def file_input(method, options)
         basic_input_helper(:file_field, :file, method, options)
       end
+      
+      # Outputs a label and a standard Rails email field inside the wrapper.
+      def email_input(method, options)
+        basic_input_helper(:email_field, :email, method, options)
+      end
+
+      # Outputs a label and a standard Rails phone field inside the wrapper.
+      def phone_input(method, options)
+        basic_input_helper(:phone_field, :phone, method, options)
+      end
+
+      # Outputs a label and a standard Rails url field inside the wrapper.
+      def url_input(method, options)
+        basic_input_helper(:url_field, :url, method, options)
+      end
+
+      # Outputs a label and a standard Rails search field inside the wrapper.
+      def search_input(method, options)
+        basic_input_helper(:search_field, :search, method, options)
+      end
 
       # Outputs a hidden field inside the wrapper, which should be hidden with CSS.
       # Additionals options can be given using :input_hml. Should :input_html not be
diff --git a/spec/inputs/email_input_spec.rb b/spec/inputs/email_input_spec.rb
new file mode 100644
index 000000000..5ff2fc18b
--- /dev/null
+++ b/spec/inputs/email_input_spec.rb
@@ -0,0 +1,31 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe 'email input' do
+
+  include FormtasticSpecHelper
+
+  before do
+    @output_buffer = ''
+    mock_everything
+  end
+
+  describe "when object is provided" do
+    before do
+      @form = semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:email, :as => :email))
+      end
+    end
+
+    it_should_have_input_wrapper_with_class(:email)
+    it_should_have_input_wrapper_with_id("post_email_input")
+    it_should_have_label_with_text(/Email/)
+    it_should_have_label_for("post_email")
+    it_should_have_input_with_id("post_email")
+    it_should_have_input_with_type(:email)
+    it_should_have_input_with_name("post[email]")
+    
+  end
+
+end
+
diff --git a/spec/inputs/phone_input_spec.rb b/spec/inputs/phone_input_spec.rb
new file mode 100644
index 000000000..09df8c33b
--- /dev/null
+++ b/spec/inputs/phone_input_spec.rb
@@ -0,0 +1,31 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe 'phone input' do
+
+  include FormtasticSpecHelper
+
+  before do
+    @output_buffer = ''
+    mock_everything
+  end
+
+  describe "when object is provided" do
+    before do
+      @form = semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:phone, :as => :phone))
+      end
+    end
+
+    it_should_have_input_wrapper_with_class(:phone)
+    it_should_have_input_wrapper_with_id("post_phone_input")
+    it_should_have_label_with_text(/Phone/)
+    it_should_have_label_for("post_phone")
+    it_should_have_input_with_id("post_phone")
+    it_should_have_input_with_type(:tel)
+    it_should_have_input_with_name("post[phone]")
+    
+  end
+
+end
+
diff --git a/spec/inputs/search_input_spec.rb b/spec/inputs/search_input_spec.rb
new file mode 100644
index 000000000..40ed73bfb
--- /dev/null
+++ b/spec/inputs/search_input_spec.rb
@@ -0,0 +1,31 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe 'search input' do
+
+  include FormtasticSpecHelper
+
+  before do
+    @output_buffer = ''
+    mock_everything
+  end
+
+  describe "when object is provided" do
+    before do
+      @form = semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:search, :as => :search))
+      end
+    end
+
+    it_should_have_input_wrapper_with_class(:search)
+    it_should_have_input_wrapper_with_id("post_search_input")
+    it_should_have_label_with_text(/Search/)
+    it_should_have_label_for("post_search")
+    it_should_have_input_with_id("post_search")
+    it_should_have_input_with_type(:search)
+    it_should_have_input_with_name("post[search]")
+    
+  end
+
+end
+
diff --git a/spec/inputs/url_input_spec.rb b/spec/inputs/url_input_spec.rb
new file mode 100644
index 000000000..14fa5e24f
--- /dev/null
+++ b/spec/inputs/url_input_spec.rb
@@ -0,0 +1,31 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe 'url input' do
+
+  include FormtasticSpecHelper
+
+  before do
+    @output_buffer = ''
+    mock_everything
+  end
+
+  describe "when object is provided" do
+    before do
+      @form = semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:url, :as => :url))
+      end
+    end
+
+    it_should_have_input_wrapper_with_class(:url)
+    it_should_have_input_wrapper_with_id("post_url_input")
+    it_should_have_label_with_text(/Url/)
+    it_should_have_label_for("post_url")
+    it_should_have_input_with_id("post_url")
+    it_should_have_input_with_type(:url)
+    it_should_have_input_with_name("post[url]")
+    
+  end
+
+end
+
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 0990acb53..dbb27a95a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -235,6 +235,10 @@ def new_author_path; "/authors/new"; end
     ::Post.stub!(:to_ary)
 
     @new_post.stub!(:title)
+    @new_post.stub!(:email)
+    @new_post.stub!(:url)
+    @new_post.stub!(:phone)
+    @new_post.stub!(:search)
     @new_post.stub!(:to_ary)
     @new_post.stub!(:body)
     @new_post.stub!(:published)

From e0a787476af934fa285d12a6a9208278daafd6e0 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Sun, 10 Oct 2010 13:36:06 +0530
Subject: [PATCH 263/992] Added auto-guessing and updated some docs

---
 README.textile                   |  4 ++++
 lib/formtastic.rb                | 15 +++++++++------
 spec/inputs/email_input_spec.rb  |  2 +-
 spec/inputs/phone_input_spec.rb  |  2 +-
 spec/inputs/search_input_spec.rb |  2 +-
 spec/inputs/url_input_spec.rb    |  2 +-
 spec/spec_helper.rb              | 12 ++++++++----
 7 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/README.textile b/README.textile
index a9df54e0a..ee9bf162e 100644
--- a/README.textile
+++ b/README.textile
@@ -275,6 +275,10 @@ The Formtastic input types:
 * @:numeric@ - a text field (just like string). Default for  column types: @:integer@, @:float@, and @:decimal@.
 * @:file@ - a file field. Default for file-attachment attributes matching: "paperclip":http://github.com/thoughtbot/paperclip or "attachment_fu":http://github.com/technoweenie/attachment_fu.
 * @:country@ - a select menu of country names. Default for column types: :string with name @"country"@ - requires a *country_select* plugin to be installed.
+* @:email@ - a text field (just like string). Default for columns with name matching @"email"@. New in HTML5. Works on some mobile browsers already.
+* @:url@ - a text field (just like string). Default for columns with name matching @"url"@. New in HTML5. Works on some mobile browsers already.
+* @:phone@ - a text field (just like string). Default for columns with name matching @"phone"@ or @"fax"@. New in HTML5.
+* @:search@ - a text field (just like string). Default for columns with name matching @"search"@. New in HTML5. Works on Safari.
 * @:hidden@ - a hidden field. Creates a hidden field (added for compatibility).
 
 The comments in the code are pretty good for each of these (what it does, what the output is, what the options are, etc.) so go check it out.
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 4bfcb8472..4ee46b442 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -65,11 +65,10 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
     # * :boolean (a checkbox) - default for :boolean column types (you can also have booleans as :select and :radio)
     # * :string (a text field) - default for :string column types
     # * :numeric (a text field, like string) - default for :integer, :float and :decimal column types
-    # * :country (a select menu of country names) - requires a country_select plugin to be installed
-    # * :email (an email input) - New in HTML5 - needs to be explicitly provided with :as => :email
-    # * :url (a url input) - New in HTML5 - needs to be explicitly provided with :as => :url
-    # * :phone (a tel input) - New in HTML5 - needs to be explicitly provided with :as => :phone
-    # * :search (a search input) - New in HTML5 - needs to be explicity provided with :as => :search
+    # * :email (an email input) - default for :string column types with 'email' as the method name.
+    # * :url (a url input) - default for :string column types with 'url' as the method name.
+    # * :phone (a tel input) - default for :string column types with 'phone' or 'fax' in the method name.
+    # * :search (a search input) - default for :string column types with 'search' as the method name.
     # * :country (a select menu of country names) - requires a country_select plugin to be installed
     # * :hidden (a hidden field) - creates a hidden field (added for compatibility)
     #
@@ -82,7 +81,7 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
     #       <%= 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" %>
-    #       <%= form.input :email, :as => :email %>
+    #       <%= form.input :email %>
     #       <%= form.input :website, :as => :url, :hint => "You may wish to omit the http://" %>
     #     <% end %>
     #   <% end %>
@@ -1465,6 +1464,10 @@ def default_input_type(method, options = {}) #:nodoc:
             return :password  if method.to_s =~ /password/
             return :country   if method.to_s =~ /country$/
             return :time_zone if method.to_s =~ /time_zone/
+            return :email     if method.to_s =~ /^email$/
+            return :url       if method.to_s =~ /^url$/
+            return :phone     if method.to_s =~ /(phone|fax)/
+            return :search    if method.to_s =~ /^search$/
           when :integer
             return :select    if method.to_s =~ /_id$/
             return :numeric
diff --git a/spec/inputs/email_input_spec.rb b/spec/inputs/email_input_spec.rb
index 5ff2fc18b..566685bc0 100644
--- a/spec/inputs/email_input_spec.rb
+++ b/spec/inputs/email_input_spec.rb
@@ -13,7 +13,7 @@
   describe "when object is provided" do
     before do
       @form = semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:email, :as => :email))
+        concat(builder.input(:email))
       end
     end
 
diff --git a/spec/inputs/phone_input_spec.rb b/spec/inputs/phone_input_spec.rb
index 09df8c33b..90b92038e 100644
--- a/spec/inputs/phone_input_spec.rb
+++ b/spec/inputs/phone_input_spec.rb
@@ -13,7 +13,7 @@
   describe "when object is provided" do
     before do
       @form = semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:phone, :as => :phone))
+        concat(builder.input(:phone))
       end
     end
 
diff --git a/spec/inputs/search_input_spec.rb b/spec/inputs/search_input_spec.rb
index 40ed73bfb..e82079e45 100644
--- a/spec/inputs/search_input_spec.rb
+++ b/spec/inputs/search_input_spec.rb
@@ -13,7 +13,7 @@
   describe "when object is provided" do
     before do
       @form = semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:search, :as => :search))
+        concat(builder.input(:search))
       end
     end
 
diff --git a/spec/inputs/url_input_spec.rb b/spec/inputs/url_input_spec.rb
index 14fa5e24f..3eafba89e 100644
--- a/spec/inputs/url_input_spec.rb
+++ b/spec/inputs/url_input_spec.rb
@@ -13,7 +13,7 @@
   describe "when object is provided" do
     before do
       @form = semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:url, :as => :url))
+        concat(builder.input(:url))
       end
     end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e4955e84b..59615c45a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -231,16 +231,16 @@ def new_author_path; "/authors/new"; end
     ::Post.stub!(:to_ary)
 
     @new_post.stub!(:title)
-    @new_post.stub!(:email)
-    @new_post.stub!(:url)
-    @new_post.stub!(:phone)
-    @new_post.stub!(:search)
     @new_post.stub!(:to_ary)
     @new_post.stub!(:body)
     @new_post.stub!(:published)
     @new_post.stub!(:publish_at)
     @new_post.stub!(:created_at)
     @new_post.stub!(:secret)
+    @new_post.stub!(:url)
+    @new_post.stub!(:email)
+    @new_post.stub!(:search)
+    @new_post.stub!(:phone)
     @new_post.stub!(:time_zone)
     @new_post.stub!(:category_name)
     @new_post.stub!(:allow_comments)
@@ -258,6 +258,10 @@ def new_author_path; "/authors/new"; end
     @new_post.stub!(:column_for_attribute).with(:country).and_return(mock('column', :type => :string, :limit => 255))
     @new_post.stub!(:column_for_attribute).with(:country_subdivision).and_return(mock('column', :type => :string, :limit => 255))
     @new_post.stub!(:column_for_attribute).with(:country_code).and_return(mock('column', :type => :string, :limit => 255))
+    @new_post.stub!(:column_for_attribute).with(:email).and_return(mock('column', :type => :string, :limit => 255))
+    @new_post.stub!(:column_for_attribute).with(:url).and_return(mock('column', :type => :string, :limit => 255))
+    @new_post.stub!(:column_for_attribute).with(:phone).and_return(mock('column', :type => :string, :limit => 255))
+    @new_post.stub!(:column_for_attribute).with(:search).and_return(mock('column', :type => :string, :limit => 255))
 
     @new_post.stub!(:author).and_return(@bob)
     @new_post.stub!(:author_id).and_return(@bob.id)

From 205cdaa5cad2da34e7ece58e1bb5c1006d5fa99f Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Mon, 11 Oct 2010 14:08:48 +0800
Subject: [PATCH 264/992] Making HTML5 helpers work in Rails2

---
 lib/formtastic.rb                | 2 +-
 spec/inputs/email_input_spec.rb  | 2 +-
 spec/inputs/phone_input_spec.rb  | 2 +-
 spec/inputs/search_input_spec.rb | 2 +-
 spec/inputs/url_input_spec.rb    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index cf294c652..b26f097d2 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -625,7 +625,7 @@ def basic_input_helper(form_helper_method, type, method, options) #:nodoc:
         html_options = default_string_options(method, type).merge(html_options) if [:numeric, :string, :password, :text, :phone, :search, :url, :email].include?(type)
 
         self.label(method, options_for_label(options)) <<
-        self.send(form_helper_method, method, html_options)
+        self.send(self.respond_to?(form_helper_method) ? form_helper_method : :text_field, method, html_options)
       end
 
       # Outputs a label and standard Rails text field inside the wrapper.
diff --git a/spec/inputs/email_input_spec.rb b/spec/inputs/email_input_spec.rb
index 566685bc0..c2ed0bbea 100644
--- a/spec/inputs/email_input_spec.rb
+++ b/spec/inputs/email_input_spec.rb
@@ -22,7 +22,7 @@
     it_should_have_label_with_text(/Email/)
     it_should_have_label_for("post_email")
     it_should_have_input_with_id("post_email")
-    it_should_have_input_with_type(:email)
+    it_should_have_input_with_type(Formtastic::Util.rails3? ? :email : :text)
     it_should_have_input_with_name("post[email]")
     
   end
diff --git a/spec/inputs/phone_input_spec.rb b/spec/inputs/phone_input_spec.rb
index 90b92038e..fd48d4a21 100644
--- a/spec/inputs/phone_input_spec.rb
+++ b/spec/inputs/phone_input_spec.rb
@@ -22,7 +22,7 @@
     it_should_have_label_with_text(/Phone/)
     it_should_have_label_for("post_phone")
     it_should_have_input_with_id("post_phone")
-    it_should_have_input_with_type(:tel)
+    it_should_have_input_with_type(Formtastic::Util.rails3? ? :tel : :text)
     it_should_have_input_with_name("post[phone]")
     
   end
diff --git a/spec/inputs/search_input_spec.rb b/spec/inputs/search_input_spec.rb
index e82079e45..772fcc6f0 100644
--- a/spec/inputs/search_input_spec.rb
+++ b/spec/inputs/search_input_spec.rb
@@ -22,7 +22,7 @@
     it_should_have_label_with_text(/Search/)
     it_should_have_label_for("post_search")
     it_should_have_input_with_id("post_search")
-    it_should_have_input_with_type(:search)
+    it_should_have_input_with_type(Formtastic::Util.rails3? ? :search : :text)
     it_should_have_input_with_name("post[search]")
     
   end
diff --git a/spec/inputs/url_input_spec.rb b/spec/inputs/url_input_spec.rb
index 3eafba89e..ded88cfa8 100644
--- a/spec/inputs/url_input_spec.rb
+++ b/spec/inputs/url_input_spec.rb
@@ -22,7 +22,7 @@
     it_should_have_label_with_text(/Url/)
     it_should_have_label_for("post_url")
     it_should_have_input_with_id("post_url")
-    it_should_have_input_with_type(:url)
+    it_should_have_input_with_type(Formtastic::Util.rails3? ? :url : :text)
     it_should_have_input_with_name("post[url]")
     
   end

From fed16091d90c952723448e63e4b0b20201688788 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Mon, 11 Oct 2010 14:19:06 +0800
Subject: [PATCH 265/992] Raise error in Rails 2 instead of falling back on
 text_field

---
 lib/formtastic.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index b26f097d2..d701b44af 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -624,8 +624,9 @@ 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, :text, :phone, :search, :url, :email].include?(type)
 
+        raise "This type of field is not supported by the Rails version you are currently using." unless self.respond_to?(form_helper_method)
         self.label(method, options_for_label(options)) <<
-        self.send(self.respond_to?(form_helper_method) ? form_helper_method : :text_field, method, html_options)
+        self.send(form_helper_method, method, html_options)
       end
 
       # Outputs a label and standard Rails text field inside the wrapper.
@@ -1400,10 +1401,10 @@ def default_input_type(method, options = {}) #:nodoc:
             return :password  if method.to_s =~ /password/
             return :country   if method.to_s =~ /country$/
             return :time_zone if method.to_s =~ /time_zone/
-            return :email     if method.to_s =~ /^email$/
-            return :url       if method.to_s =~ /^url$/
-            return :phone     if method.to_s =~ /(phone|fax)/
-            return :search    if method.to_s =~ /^search$/
+            return :email     if method.to_s =~ /^email$/ && Formtastic::Util.rails3?
+            return :url       if method.to_s =~ /^url$/ && Formtastic::Util.rails3?
+            return :phone     if method.to_s =~ /(phone|fax)/ && Formtastic::Util.rails3?
+            return :search    if method.to_s =~ /^search$/ && Formtastic::Util.rails3?
           when :integer
             return :select    if method.to_s =~ /_id$/
             return :numeric

From 133dc819d29c4946695e8bf4456397ef3875e3b3 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 11 Oct 2010 17:47:39 +1100
Subject: [PATCH 266/992] Attempt to get rspec 2 working with Rails 2 and Rails
 3. Had to ditch Gemfile/bundler for now.

---
 Gemfile                          |   4 --
 Gemfile.lock                     | 102 -------------------------------
 Rakefile                         |   1 -
 formtastic.gemspec               |   2 +-
 spec/support/test_environment.rb |  42 ++++++-------
 5 files changed, 18 insertions(+), 133 deletions(-)
 delete mode 100644 Gemfile
 delete mode 100644 Gemfile.lock

diff --git a/Gemfile b/Gemfile
deleted file mode 100644
index 1862678ee..000000000
--- a/Gemfile
+++ /dev/null
@@ -1,4 +0,0 @@
-source :rubygems
-
-# Include dependencies from gemspec.
-gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index 62bc4cf00..000000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,102 +0,0 @@
-PATH
-  remote: .
-  specs:
-    formtastic (1.1.0)
-      actionpack (>= 2.3.7)
-      activesupport (>= 2.3.7)
-      i18n (>= 0.4.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.0)
-      actionpack (= 3.0.0)
-      mail (~> 2.2.5)
-    actionpack (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      arel (~> 1.0.0)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.4.1)
-    mail (2.2.6.1)
-      activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
-    mime-types (1.16)
-    nokogiri (1.4.3.1)
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
-      rack (>= 1.0.0)
-    rack-test (0.5.6)
-      rack (>= 1.0)
-    rails (3.0.0)
-      actionmailer (= 3.0.0)
-      actionpack (= 3.0.0)
-      activerecord (= 3.0.0)
-      activeresource (= 3.0.0)
-      activesupport (= 3.0.0)
-      bundler (~> 1.0.0)
-      railties (= 3.0.0)
-    railties (3.0.0)
-      actionpack (= 3.0.0)
-      activesupport (= 3.0.0)
-      rake (>= 0.8.4)
-      thor (~> 0.14.0)
-    rake (0.8.7)
-    rspec (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-      rspec-mocks (= 2.0.0.beta.22)
-    rspec-core (2.0.0.beta.22)
-    rspec-expectations (2.0.0.beta.22)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-    rspec-rails (2.0.0.beta.22)
-      rspec (= 2.0.0.beta.22)
-    rspec_tag_matchers (1.0.0)
-      nokogiri (>= 1.4.0)
-      rspec-rails (>= 1.2.6)
-    thor (0.14.2)
-    treetop (1.4.8)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  actionpack (>= 2.3.7)
-  activesupport (>= 2.3.7)
-  formtastic!
-  i18n (>= 0.4.0)
-  rails (= 3.0.0)
-  rspec-rails (~> 2.0.0.beta22)
-  rspec_tag_matchers (>= 1.0.0)
diff --git a/Rakefile b/Rakefile
index b37e5fc60..050b3655f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,6 +1,5 @@
 # encoding: utf-8
 require 'rubygems'
-require 'bundler/setup'
 require 'rake'
 require 'rake/rdoctask'
 require 'rspec/core/rake_task'
diff --git a/formtastic.gemspec b/formtastic.gemspec
index 0c8a8d527..3e28b956f 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.add_dependency(%q<actionpack>, [">= 2.3.7"])
   s.add_dependency(%q<i18n>, [">= 0.4.0"])
   s.add_development_dependency(%q<rails>, ["= 3.0.0"])
-  s.add_development_dependency(%q<rspec-rails>, ["~> 2.0.0.beta22"])
+  s.add_development_dependency(%q<rspec-rails>, ["~> 2.0.0"])
   s.add_development_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
 
 end
diff --git a/spec/support/test_environment.rb b/spec/support/test_environment.rb
index a23a5ea5f..0820e9a22 100644
--- a/spec/support/test_environment.rb
+++ b/spec/support/test_environment.rb
@@ -1,12 +1,22 @@
 # encoding: utf-8
 
+require "rubygems"
+
+gem 'rspec', '~> 2.0.0'
+gem 'rspec-rails', '~> 2.0.0'
+gem 'rspec_tag_matchers'
+gem 'hpricot', '>= 0.6.1'
+
+require 'rspec_tag_matchers'
+
+RSpec.configure do |config|
+  config.include RspecTagMatchers
+  config.include CustomMacros
+  config.mock_with :rspec
+end
+
 if Formtastic::Util.rails3?
-  gem 'rspec', '~> 2.0.0.beta22'
-  gem 'rspec-rails', '~> 2.0.0.beta22'
-  gem 'rspec_tag_matchers'
-  gem 'i18n', '>= 0.4.0'
 
-  require "rubygems"
   require "action_controller/railtie"
   require "active_resource/railtie"
   require 'active_model'
@@ -21,27 +31,9 @@ class Application < Rails::Application
   end
   FormtasticTest::Application.initialize!
 
-  # Configure RSpec 2.0
-  require 'rspec/core'
   require 'rspec/rails'
-  require 'rspec_tag_matchers'
-  RSpec.configure do |config|
-    config.include RspecTagMatchers
-    config.include CustomMacros
-    config.mock_with :rspec
-  end
+end
+
 
-else
-  gem 'rspec', '>= 1.2.6'
-  gem 'rspec-rails', '>= 1.2.6'
-  gem 'rspec_tag_matchers'
-  gem 'hpricot', '>= 0.6.1'
-  gem 'i18n', '< 0.4.0'
 
-  require 'rspec_tag_matchers'
 
-  Spec::Runner.configure do |config|
-    config.include(RspecTagMatchers)
-    config.include(CustomMacros)
-  end
-end

From 2a187a7c36f569ae2deba916940d2610c692dfdc Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 11 Oct 2010 21:44:35 +1100
Subject: [PATCH 267/992] Revert "Raise error in Rails 2 instead of falling
 back on text_field"

This reverts commit fed16091d90c952723448e63e4b0b20201688788.
---
 lib/formtastic.rb | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index d701b44af..b26f097d2 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -624,9 +624,8 @@ 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, :text, :phone, :search, :url, :email].include?(type)
 
-        raise "This type of field is not supported by the Rails version you are currently using." unless self.respond_to?(form_helper_method)
         self.label(method, options_for_label(options)) <<
-        self.send(form_helper_method, method, html_options)
+        self.send(self.respond_to?(form_helper_method) ? form_helper_method : :text_field, method, html_options)
       end
 
       # Outputs a label and standard Rails text field inside the wrapper.
@@ -1401,10 +1400,10 @@ def default_input_type(method, options = {}) #:nodoc:
             return :password  if method.to_s =~ /password/
             return :country   if method.to_s =~ /country$/
             return :time_zone if method.to_s =~ /time_zone/
-            return :email     if method.to_s =~ /^email$/ && Formtastic::Util.rails3?
-            return :url       if method.to_s =~ /^url$/ && Formtastic::Util.rails3?
-            return :phone     if method.to_s =~ /(phone|fax)/ && Formtastic::Util.rails3?
-            return :search    if method.to_s =~ /^search$/ && Formtastic::Util.rails3?
+            return :email     if method.to_s =~ /^email$/
+            return :url       if method.to_s =~ /^url$/
+            return :phone     if method.to_s =~ /(phone|fax)/
+            return :search    if method.to_s =~ /^search$/
           when :integer
             return :select    if method.to_s =~ /_id$/
             return :numeric

From 40d9586edbbdb2b70a89d627b807df002ef7736a Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 11 Oct 2010 21:56:53 +1100
Subject: [PATCH 268/992] get text_input_spec passing under rails 2

---
 spec/inputs/text_input_spec.rb | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/spec/inputs/text_input_spec.rb b/spec/inputs/text_input_spec.rb
index c8f793d48..2c9267b82 100644
--- a/spec/inputs/text_input_spec.rb
+++ b/spec/inputs/text_input_spec.rb
@@ -23,6 +23,7 @@
   it_should_apply_error_logic_for_input_type(:numeric)
 
   it 'should use input_html to style inputs' do
+    output_buffer.replace ''
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :class => 'myclass' }))
     end
@@ -30,7 +31,8 @@
     output_buffer.should have_tag("form li textarea.myclass")
   end
   
-  it "should have a cols attribute when :cols is specified in :input_html" do
+  it "should have a cols attribute when :cols is a number in :input_html" do
+    output_buffer.replace ''
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :cols => 42 }))
     end
@@ -38,7 +40,8 @@
     output_buffer.should have_tag("form li textarea[@cols='42']")
   end
 
-  it "should not have a cols attribute when :cols is missing in :input_html" do
+  it "should not have a cols attribute when :cols is nil in :input_html" do
+    output_buffer.replace ''
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :cols => nil }))
     end
@@ -46,7 +49,8 @@
     output_buffer.should_not have_tag("form li textarea[@cols]")
   end
   
-  it "should have a rows attribute when :rows is specified in :input_html as a number" do
+  it "should have a rows attribute when :rows is a number in :input_html" do
+    output_buffer.replace ''
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :rows => 42 }))
     end
@@ -55,7 +59,8 @@
     
   end
 
-  it "should not have a rows attribute when :rows is specified in :input_html as nil" do
+  it "should not have a rows attribute when :rows is nil in :input_html" do
+    output_buffer.replace ''
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :rows => nil }))
     end
@@ -64,6 +69,10 @@
   end
   
   context "when :rows is missing in :input_html" do
+    before do 
+      output_buffer.replace ''
+    end
+    
     it "should have a rows attribute matching default_text_area_height if numeric" do
       with_config :default_text_area_height, 12 do
         form = semantic_form_for(@new_post) do |builder|
@@ -87,6 +96,10 @@
   end
 
   context "when :cols is missing in :input_html" do
+    before do 
+      output_buffer.replace ''
+    end
+    
     it "should have a cols attribute matching default_text_area_width if numeric" do
       with_config :default_text_area_width, 10 do
         form = semantic_form_for(@new_post) do |builder|

From 8a48904fd7599d3624375e13200acd5f31516aee Mon Sep 17 00:00:00 2001
From: nberger <nicoberger@gmail.com>
Date: Thu, 7 Oct 2010 16:45:46 -0300
Subject: [PATCH 269/992] Pass options to detect_label_and_value_method! in a
 select with grouping

This allows to use :label_method and :value_method options in a
select with grouping
---
 lib/formtastic.rb                |  2 +-
 spec/inputs/select_input_spec.rb | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index b26f097d2..fd68e7348 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -803,7 +803,7 @@ def select_input(method, options)
           # 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)
+          label, value = detect_label_and_value_method!(raw_collection, options)
           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) }
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index b66b2be36..39d47840c 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -241,6 +241,8 @@
       @form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select, :group_by => :continent ) )
         concat(builder.input(:author, :as => :select, :group_by => :continent, :group_label_method => :id ) )
+        concat(builder.input(:author, :as => :select, :group_by => :continent, :label_method => :login ) )
+        concat(builder.input(:author, :as => :select, :group_by => :continent, :label_method => :login, :group_label_method => :id ) )
       end
     end
 
@@ -261,11 +263,21 @@
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li select optgroup[@label='#{@continents[i].id}']", @authors[i].to_label)
       end
+
+      it 'should have custom author labels' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag("form li select optgroup[@label='#{@continent_names[i]}']", @authors[i].login)
+      end
+
+      it 'should have custom author and group labels' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag("form li select optgroup[@label='#{@continents[i].id}']", @authors[i].login)
+      end
     end
 
     it 'should have no duplicate groups' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
-      output_buffer.should have_tag('form li select optgroup', :count => 4)
+      output_buffer.should have_tag('form li select optgroup', :count => 8)
     end
 
     it 'should sort the groups on the label method' do

From a0206200e0a6bfa45687ec4386c44bea83673f15 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 12 Oct 2010 16:28:59 +1100
Subject: [PATCH 270/992] replicate the styles on string-like fields to the
 newer HTML5 fields like email and URL, as needed to close GH-387

---
 generators/formtastic/templates/formtastic.css | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/generators/formtastic/templates/formtastic.css b/generators/formtastic/templates/formtastic.css
index fc4c4267d..63e64c00b 100644
--- a/generators/formtastic/templates/formtastic.css
+++ b/generators/formtastic/templates/formtastic.css
@@ -75,15 +75,23 @@ form.formtastic fieldset > ol > li ul.errors { color:#cc0000; margin:0.5em 0 0 2
 form.formtastic fieldset > ol > li ul.errors li { padding:0; border:none; display:list-item; }
 
 
-/* STRING & NUMERIC OVERRIDES
+/* STRING, NUMERIC, PASSWORD, EMAIL, URL, PHONE & SEARCH OVERRIDES
 --------------------------------------------------------------------------------------------------*/
 form.formtastic fieldset > ol > li.string input, 
 form.formtastic fieldset > ol > li.password input, 
-form.formtastic fieldset > ol > li.numeric input { width:72%; }
+form.formtastic fieldset > ol > li.numeric input,
+form.formtastic fieldset > ol > li.email input,
+form.formtastic fieldset > ol > li.url input,
+form.formtastic fieldset > ol > li.phone input,
+form.formtastic fieldset > ol > li.search input { width:72%; }
 
 form.formtastic fieldset > ol > li.string input[size], 
 form.formtastic fieldset > ol > li.password input[size], 
-form.formtastic fieldset > ol > li.numeric input[size] { width:auto; max-width:72%; }
+form.formtastic fieldset > ol > li.numeric input[size],
+form.formtastic fieldset > ol > li.email input[size],
+form.formtastic fieldset > ol > li.url input[size],
+form.formtastic fieldset > ol > li.phone input[size],
+form.formtastic fieldset > ol > li.search input[size] { width:auto; max-width:72%; }
 
 
 /* TEXTAREA OVERRIDES

From 744406685031319179681aa04708e11526647d13 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Wed, 13 Oct 2010 10:03:14 +0200
Subject: [PATCH 271/992] Whitespace cleanup from HTML5 merge

---
 lib/formtastic.rb                | 12 ++++++------
 spec/commit_button_spec.rb       | 16 ++++++++--------
 spec/inputs/email_input_spec.rb  |  2 +-
 spec/inputs/phone_input_spec.rb  |  2 +-
 spec/inputs/search_input_spec.rb |  2 +-
 spec/inputs/text_input_spec.rb   | 26 +++++++++++++-------------
 spec/inputs/url_input_spec.rb    |  2 +-
 spec/support/custom_macros.rb    |  4 ++--
 8 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index fd68e7348..b275cd81a 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -288,7 +288,7 @@ def inputs(*args, &block)
         field_set_and_list_wrapping(*((args << html_options) << contents))
       end
     end
-    
+
     def input_field_set(*args, &block)
       ::ActiveSupport::Deprecation.warn("input_field_set() is deprecated and will be removed in Formtastic 1.3 or later, use inputs() instead.", caller)
       inputs(args, &block)
@@ -311,7 +311,7 @@ def buttons(*args, &block)
         field_set_and_list_wrapping(html_options, contents)
       end
     end
-    
+
     def button_field_set(*args, &block)
       ::ActiveSupport::Deprecation.warn("button_field_set() is deprecated and will be removed in Formtastic 1.3 or later, use inputs() instead.", caller)
       buttons(args, &block)
@@ -652,7 +652,7 @@ def text_input(method, options)
       def file_input(method, options)
         basic_input_helper(:file_field, :file, method, options)
       end
-      
+
       # Outputs a label and a standard Rails email field inside the wrapper.
       def email_input(method, options)
         basic_input_helper(:email_field, :email, method, options)
@@ -905,7 +905,7 @@ def radio_input(method, options)
         input_name = generate_association_input_name(method)
         value_as_class = options.delete(:value_as_class)
         input_ids = []
-        
+
         list_item_content = collection.map do |c|
           label = c.is_a?(Array) ? c.first : c
           value = c.is_a?(Array) ? c.last  : c
@@ -925,7 +925,7 @@ def radio_input(method, options)
           legend_tag(method, options) << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
         )
       end
-      
+
       def boolean_radio_input(method, options)
         ::ActiveSupport::Deprecation.warn(":as => :boolean_radio is deprecated and will be removed in Formtastic 1.3 or later. Use :as => :radio instead.", caller)
         radio_input(method, options)
@@ -1171,7 +1171,7 @@ def check_boxes_input(method, options)
         template.content_tag(:fieldset, fieldset_content)
       end
 
-      # Used by check_boxes input. The selected values will be set by retrieving the value 
+      # Used by check_boxes input. The selected values will be set by retrieving the value
       # through the association.
       #
       # If the collection is not a hash or an array of strings, fixnums or symbols,
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index bc7a24c00..f7a81bb1c 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -11,13 +11,13 @@
   end
 
   describe 'when the object responds to :new_record? (Rails 2)' do
-    
+
     before do
       @new_post.stub(:respond_to?).with(:to_model).and_return("X")
       @new_post.stub(:respond_to?).with(:persisted?).and_return(false)
       @new_post.stub(:respond_to?).with(:new_record?).and_return(true)
     end
-    
+
     it 'should call :new_record?' do
       @new_post.should_receive(:new_record?)
       @new_post.should_not_receive(:persisted?)
@@ -25,17 +25,17 @@
         concat(builder.commit_button)
       end
     end
-    
+
   end
-  
+
   describe 'when the object responds to :persisted? (ActiveModel)' do
-    
+
     before do
       @new_post.stub(:respond_to?).with(:to_model).and_return("X")
       @new_post.stub(:respond_to?).with(:persisted?).and_return(true)
       @new_post.stub(:respond_to?).with(:new_record?).and_return(false)
     end
-    
+
     it 'should call :persisted?' do
       @new_post.should_receive(:persisted?)
       @new_post.should_not_receive(:new_record?)
@@ -43,9 +43,9 @@
         concat(builder.commit_button)
       end
     end
-    
+
   end
-  
+
 
   describe 'when used on any record' do
 
diff --git a/spec/inputs/email_input_spec.rb b/spec/inputs/email_input_spec.rb
index c2ed0bbea..ba9fdd774 100644
--- a/spec/inputs/email_input_spec.rb
+++ b/spec/inputs/email_input_spec.rb
@@ -24,7 +24,7 @@
     it_should_have_input_with_id("post_email")
     it_should_have_input_with_type(Formtastic::Util.rails3? ? :email : :text)
     it_should_have_input_with_name("post[email]")
-    
+
   end
 
 end
diff --git a/spec/inputs/phone_input_spec.rb b/spec/inputs/phone_input_spec.rb
index fd48d4a21..d6d7eea8f 100644
--- a/spec/inputs/phone_input_spec.rb
+++ b/spec/inputs/phone_input_spec.rb
@@ -24,7 +24,7 @@
     it_should_have_input_with_id("post_phone")
     it_should_have_input_with_type(Formtastic::Util.rails3? ? :tel : :text)
     it_should_have_input_with_name("post[phone]")
-    
+
   end
 
 end
diff --git a/spec/inputs/search_input_spec.rb b/spec/inputs/search_input_spec.rb
index 772fcc6f0..0df79cc84 100644
--- a/spec/inputs/search_input_spec.rb
+++ b/spec/inputs/search_input_spec.rb
@@ -24,7 +24,7 @@
     it_should_have_input_with_id("post_search")
     it_should_have_input_with_type(Formtastic::Util.rails3? ? :search : :text)
     it_should_have_input_with_name("post[search]")
-    
+
   end
 
 end
diff --git a/spec/inputs/text_input_spec.rb b/spec/inputs/text_input_spec.rb
index 2c9267b82..37e9a5599 100644
--- a/spec/inputs/text_input_spec.rb
+++ b/spec/inputs/text_input_spec.rb
@@ -30,7 +30,7 @@
     output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should have_tag("form li textarea.myclass")
   end
-  
+
   it "should have a cols attribute when :cols is a number in :input_html" do
     output_buffer.replace ''
     form = semantic_form_for(@new_post) do |builder|
@@ -48,7 +48,7 @@
     output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should_not have_tag("form li textarea[@cols]")
   end
-  
+
   it "should have a rows attribute when :rows is a number in :input_html" do
     output_buffer.replace ''
     form = semantic_form_for(@new_post) do |builder|
@@ -56,7 +56,7 @@
     end
     output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should have_tag("form li textarea[@rows='42']")
-    
+
   end
 
   it "should not have a rows attribute when :rows is nil in :input_html" do
@@ -67,12 +67,12 @@
     output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should_not have_tag("form li textarea[@rows]")
   end
-  
+
   context "when :rows is missing in :input_html" do
-    before do 
+    before do
       output_buffer.replace ''
     end
-    
+
     it "should have a rows attribute matching default_text_area_height if numeric" do
       with_config :default_text_area_height, 12 do
         form = semantic_form_for(@new_post) do |builder|
@@ -82,7 +82,7 @@
         output_buffer.should have_tag("form li textarea[@rows='12']")
       end
     end
-    
+
     it "should not have a rows attribute if default_text_area_height is nil" do
       with_config :default_text_area_height, nil do
         form = semantic_form_for(@new_post) do |builder|
@@ -91,15 +91,15 @@
         output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li textarea[@rows]")
       end
-      
+
     end
   end
 
   context "when :cols is missing in :input_html" do
-    before do 
+    before do
       output_buffer.replace ''
     end
-    
+
     it "should have a cols attribute matching default_text_area_width if numeric" do
       with_config :default_text_area_width, 10 do
         form = semantic_form_for(@new_post) do |builder|
@@ -109,7 +109,7 @@
         output_buffer.should have_tag("form li textarea[@cols='10']")
       end
     end
-    
+
     it "should not have a cols attribute if default_text_area_width is nil" do
       with_config :default_text_area_width, nil do
         form = semantic_form_for(@new_post) do |builder|
@@ -118,9 +118,9 @@
         output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li textarea[@cols]")
       end
-      
+
     end
   end
-    
+
 end
 
diff --git a/spec/inputs/url_input_spec.rb b/spec/inputs/url_input_spec.rb
index ded88cfa8..4e596d747 100644
--- a/spec/inputs/url_input_spec.rb
+++ b/spec/inputs/url_input_spec.rb
@@ -24,7 +24,7 @@
     it_should_have_input_with_id("post_url")
     it_should_have_input_with_type(Formtastic::Util.rails3? ? :url : :text)
     it_should_have_input_with_name("post[url]")
-    
+
   end
 
 end
diff --git a/spec/support/custom_macros.rb b/spec/support/custom_macros.rb
index 5546f65c1..0de8d078b 100644
--- a/spec/support/custom_macros.rb
+++ b/spec/support/custom_macros.rb
@@ -84,7 +84,7 @@ def it_should_have_textarea_with_id(element_id)
         output_buffer.should have_tag("form li textarea##{element_id}")
       end
     end
-    
+
     def it_should_use_default_text_field_size_when_not_nil(as)
       it 'should use default_text_field_size when not nil' do
         with_config :default_text_field_size, 30 do
@@ -96,7 +96,7 @@ def it_should_use_default_text_field_size_when_not_nil(as)
         end
       end
     end
-    
+
     def it_should_not_use_default_text_field_size_when_nil(as)
       it 'should not use default_text_field_size when nil' do
         with_config :default_text_field_size, nil do

From 58bbf0a97ff9dc1e197379e01f09fa8e41eaf6b6 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <yabawock@gmail.com>
Date: Wed, 13 Oct 2010 10:03:22 +0200
Subject: [PATCH 272/992] Revert "Refactoring on Formtastic::Util.rails3?"

This reverts commit dd5b56ac10b97a2b8adc53fb4eefafe5142ec6cd.
---
 lib/formtastic/util.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/util.rb b/lib/formtastic/util.rb
index 8db6d1c65..11e2e786f 100644
--- a/lib/formtastic/util.rb
+++ b/lib/formtastic/util.rb
@@ -28,7 +28,11 @@ def rails_safe_buffer_class
     end
 
     def rails3?
-      ActionPack::VERSION::MAJOR >= 3
+      version=
+        if defined?(ActionPack::VERSION::MAJOR)
+          ActionPack::VERSION::MAJOR
+        end
+      !version.blank? && version >= 3
     end
   end
 end

From 1d3d2a1f1454d6bc32b861dabf0e1c5d63b38369 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Thu, 14 Oct 2010 01:33:58 +0530
Subject: [PATCH 273/992] more relaxed defaulting for url and email

---
 lib/formtastic.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index b275cd81a..09585729f 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1400,8 +1400,8 @@ def default_input_type(method, options = {}) #:nodoc:
             return :password  if method.to_s =~ /password/
             return :country   if method.to_s =~ /country$/
             return :time_zone if method.to_s =~ /time_zone/
-            return :email     if method.to_s =~ /^email$/
-            return :url       if method.to_s =~ /^url$/
+            return :email     if method.to_s =~ /email/
+            return :url       if method.to_s =~ /(url|website)/
             return :phone     if method.to_s =~ /(phone|fax)/
             return :search    if method.to_s =~ /^search$/
           when :integer

From 4c8a82920e6f9f0de41cffea5eec60193323b6c4 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Thu, 14 Oct 2010 02:16:24 +0530
Subject: [PATCH 274/992] adding test coverage and an alternate default for
 url/website matching

---
 lib/formtastic.rb  |  2 +-
 spec/input_spec.rb | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 09585729f..e91b62da3 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1401,7 +1401,7 @@ def default_input_type(method, options = {}) #:nodoc:
             return :country   if method.to_s =~ /country$/
             return :time_zone if method.to_s =~ /time_zone/
             return :email     if method.to_s =~ /email/
-            return :url       if method.to_s =~ /(url|website)/
+            return :url       if method.to_s =~ /^(url|website)$/
             return :phone     if method.to_s =~ /(phone|fax)/
             return :search    if method.to_s =~ /^search$/
           when :integer
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index b2a16b945..69684ff24 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -482,6 +482,26 @@ def should_be_required(options)
           default_input_type(:string, :country).should == :country
         end
 
+        it 'should default to :email for :string columns matching email' do
+          default_input_type(:string, :email).should == :email
+          default_input_type(:string, :customer_email).should == :email
+          default_input_type(:string, :email_work).should == :email
+        end
+
+        it 'should default to :url for :string columns named url or website' do
+          default_input_type(:string, :url).should == :url
+          default_input_type(:string, :website).should == :url
+        end
+
+        it 'should default to :phone for :string columns named phone or fax' do
+          default_input_type(:string, :phone).should == :phone
+          default_input_type(:string, :fax).should == :phone
+        end
+
+        it 'should default to :search for :string columns named search' do
+          default_input_type(:string, :search).should == :search
+        end
+
         describe 'defaulting to file column' do
           ::Formtastic::SemanticFormBuilder.file_methods.each do |method|
             it "should default to :file for attributes that respond to ##{method}" do

From 0385824182771f2c5467d69265bad35e41f8dfb9 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Thu, 14 Oct 2010 02:24:16 +0530
Subject: [PATCH 275/992] more juggling with url and more asserts in specs

---
 lib/formtastic.rb  | 2 +-
 spec/input_spec.rb | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index e91b62da3..2d4e97cf2 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1401,7 +1401,7 @@ def default_input_type(method, options = {}) #:nodoc:
             return :country   if method.to_s =~ /country$/
             return :time_zone if method.to_s =~ /time_zone/
             return :email     if method.to_s =~ /email/
-            return :url       if method.to_s =~ /^(url|website)$/
+            return :url       if method.to_s =~ /^url$|^website$|_url$/
             return :phone     if method.to_s =~ /(phone|fax)/
             return :search    if method.to_s =~ /^search$/
           when :integer
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 69684ff24..121df29e9 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -491,6 +491,8 @@ def should_be_required(options)
         it 'should default to :url for :string columns named url or website' do
           default_input_type(:string, :url).should == :url
           default_input_type(:string, :website).should == :url
+          default_input_type(:string, :my_url).should == :url
+          default_input_type(:string, :hurl).should_not == :url
         end
 
         it 'should default to :phone for :string columns named phone or fax' do

From 4963c215c3d46fd0eb3f28c139e19e1badd4feb1 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Wed, 13 Oct 2010 22:12:44 -0300
Subject: [PATCH 276/992] Only defaults input type to :select for associations

---
 lib/formtastic.rb  |  2 +-
 spec/input_spec.rb | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 2d4e97cf2..324157409 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1405,7 +1405,7 @@ def default_input_type(method, options = {}) #:nodoc:
             return :phone     if method.to_s =~ /(phone|fax)/
             return :search    if method.to_s =~ /^search$/
           when :integer
-            return :select    if method.to_s =~ /_id$/
+            return :select    if self.reflection_for(method)
             return :numeric
           when :float, :decimal
             return :numeric
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 121df29e9..006cab5f7 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -436,7 +436,15 @@ def should_be_required(options)
           default_input_type(nil, :password_method_without_a_database_column).should == :password
         end
 
-        it 'should default to :select for column names ending in "_id"' do
+        it 'should default to :numeric for "integer" column with name ending in "_id"' do
+          @new_post.stub!(:aws_instance_id)
+          @new_post.stub!(:column_for_attribute).with(:aws_instance_id).and_return(mock('column', :type => :integer))
+          default_input_type(:integer, :aws_instance_id).should == :numeric
+        end
+        
+        it 'should default to :select for associations' do
+          @new_post.class.stub!(:reflect_on_association).with(:user_id).and_return(mock('ActiveRecord::Reflection::AssociationReflection'))
+          @new_post.class.stub!(:reflect_on_association).with(:section_id).and_return(mock('ActiveRecord::Reflection::AssociationReflection'))
           default_input_type(:integer, :user_id).should == :select
           default_input_type(:integer, :section_id).should == :select
         end

From 7ef2cb1d23ed2729c08b323bb3c7aea9a914eb3f Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Tue, 12 Oct 2010 19:05:54 +0530
Subject: [PATCH 277/992] bugfix which was sending a bunch of invalid key
 defaults

---
 lib/formtastic.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 324157409..c4c9af51b 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1745,7 +1745,9 @@ def localized_string(key, value, type, options = {}) #:nodoc:
             action_name = template.params[:action].to_s rescue ''
             attribute_name = key.to_s
 
-            defaults = ::Formtastic::I18n::SCOPES.collect do |i18n_scope|
+            defaults = ::Formtastic::I18n::SCOPES.reject do |i18n_scope|
+              nested_model_name.nil? && i18n_scope.to_s.match(/\{nested_model\}/)
+            end.collect do |i18n_scope|
               i18n_path = i18n_scope.dup
               i18n_path.gsub!('%{action}', action_name)
               i18n_path.gsub!('%{model}', model_name)

From 41b7b3b1c1d0582e76b985cdfaeb6b6897d8a0a0 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Wed, 13 Oct 2010 16:49:42 +0530
Subject: [PATCH 278/992] fallback on helpers.label if formtastic i18n not
 found

---
 lib/formtastic.rb | 13 +++++++++++--
 spec/i18n_spec.rb | 17 ++++++++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index c4c9af51b..0c42f1a23 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1746,7 +1746,7 @@ def localized_string(key, value, type, options = {}) #:nodoc:
             attribute_name = key.to_s
 
             defaults = ::Formtastic::I18n::SCOPES.reject do |i18n_scope|
-              nested_model_name.nil? && i18n_scope.to_s.match(/\{nested_model\}/)
+              nested_model_name.nil? && i18n_scope.match(/nested_model/)
             end.collect do |i18n_scope|
               i18n_path = i18n_scope.dup
               i18n_path.gsub!('%{action}', action_name)
@@ -1758,8 +1758,17 @@ def localized_string(key, value, type, options = {}) #:nodoc:
             end
             defaults << ''
 
-            i18n_value = ::Formtastic::I18n.t(defaults.shift,
+            defaults.uniq!
+
+            default_key = defaults.shift
+            i18n_value = ::Formtastic::I18n.t(default_key,
               options.merge(:default => defaults, :scope => type.to_s.pluralize.to_sym))
+            if i18n_value.blank? && type == :label
+              # This is effectively what Rails label helper does for i18n lookup
+              options[:scope] = [:helpers, type]
+              options[:default] = defaults
+              i18n_value = ::I18n.t(default_key, options)
+            end
             i18n_value = escape_html_entities(i18n_value) if i18n_value.is_a?(::String)
             i18n_value.blank? ? nil : i18n_value
           end
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index 72d225837..7ca7ede9f 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -85,14 +85,18 @@
       @output_buffer = ''
       mock_everything
 
-      ::I18n.backend.store_translations :en, :formtastic => {
+      ::I18n.backend.store_translations :en, {:formtastic => {
           :labels => {
               :title    => "Hello world!",
               :post     => {:title => "Hello post!"},
               :project  => {:title => "Hello project!", :task => {:name => "Hello task name!"}},
               :line_item => {:name => "Hello line item name!"}
             }
-        }
+        }, :helpers => {
+          :label => {
+            :post => {:author => "Written by"}
+          }
+        }}
       ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
 
       @new_post.stub!(:title)
@@ -134,7 +138,7 @@
       output_buffer.should have_tag("form label", /Hello task name!/)
     end
 
-    it 'should be able to translated nested objects with top level translations' do
+    it 'should be able to translate nested objects with top level translations' do
       form = semantic_form_for(:order, :url => 'http://test.host') do |builder|
         builder.semantic_fields_for(:line_item) do |f|
           concat(f.input(:name))
@@ -144,6 +148,13 @@
       output_buffer.should have_tag("form label", /Hello line item name!/)
     end
 
+    it 'should be able to translate helper label as Rails does' do
+      form = semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:author))
+      end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag("form label", /Written by/)
+    end
 
     # TODO: Add spec for namespaced models?
 

From 0f88cb3a19f32b7c1dc123c083a269289170f6de Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 12 Oct 2010 22:39:20 +1100
Subject: [PATCH 279/992] Attempts to fix GH-264 by rendering our own
 hidden_field_tag outside the label.

We render our own check_box_tag inside the label as well, rather than leaning on Rails' check_box() helper which would render both inside the label, which is invalid HTML5
---
 lib/formtastic.rb                 | 14 +++++++++-----
 spec/inputs/boolean_input_spec.rb |  7 +++++--
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 0c42f1a23..5598b76b7 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1227,21 +1227,25 @@ def country_input(method, options)
       # 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.
-      #
-      # TODO: doesn't look to the model value to set html_options[:checked]
       def boolean_input(method, options)
         html_options = options.delete(:input_html) || {}
         checked_value = options.delete(:checked_value) || '1'
         unchecked_value = options.delete(:unchecked_value) || '0'
 
-        input = self.check_box(method, strip_formtastic_options(options).merge(html_options),
-                               checked_value, unchecked_value)
+        #input = self.check_box(method, strip_formtastic_options(options).merge(html_options),
+        #                       checked_value, unchecked_value)
+        input = template.check_box_tag(
+          "#{@object_name}[#{method}]", 
+          checked_value, 
+          (@object && @object.send(:"#{method}") == checked_value), 
+          :id => "#{@object_name}_#{method}"
+        )
         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)
+        template.hidden_field_tag(method, unchecked_value) << self.label(method, options)
       end
 
       # Generates an input for the given method using the type supplied with :as.
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index df9d5b4d0..ca2063cd4 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -23,7 +23,9 @@
     output_buffer.should have_tag('form li label', :count => 1)
     output_buffer.should have_tag('form li label[@for="post_allow_comments"]')
     output_buffer.should have_tag('form li label', /Allow comments/)
-    output_buffer.should have_tag('form li label input[@type="checkbox"]')
+    output_buffer.should have_tag('form li label input[@type="checkbox"]', :count => 1)
+    output_buffer.should have_tag('form li input[@type="hidden"]', :count => 1)
+    output_buffer.should_not have_tag('form li label input[@type="hidden"]', :count => 1) # invalid HTML5
   end
 
   it 'should generate a checkbox input' do
@@ -42,7 +44,8 @@
 
     output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should have_tag('form li label input[@type="checkbox"][@value="checked"]:not([@unchecked_value][@checked_value])')
-    output_buffer.should have_tag('form li label input[@type="hidden"][@value="unchecked"]')
+    output_buffer.should have_tag('form li input[@type="hidden"][@value="unchecked"]')
+    output_buffer.should_not have_tag('form li label input[@type="hidden"]') # invalid HTML5
   end
 
   it 'should generate a label and a checkbox even if no object is given' do

From bddfa740d5f9eb74e09a37c4ea0636884784a3d2 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Fri, 15 Oct 2010 14:20:52 +0530
Subject: [PATCH 280/992] corey haines id_prefix branch with more tests +
 slight refactoring in the generate_html_id method

---
 lib/formtastic.rb               | 19 +++++++++++--------
 spec/form_helper_spec.rb        |  8 ++++++++
 spec/inputs/radio_input_spec.rb | 11 +++++++++++
 spec/inputs/time_input_spec.rb  | 14 ++++++++++++++
 4 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 5598b76b7..99c64d78f 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -11,6 +11,8 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
                    :inline_order, :custom_inline_order, :file_methods, :priority_countries, :i18n_lookups_by_default, :escape_html_entities_in_hints_and_labels,
                    :default_commit_button_accesskey, :instance_reader => false
 
+    cattr_accessor :custom_id_prefix
+
     self.default_text_field_size = nil
     self.default_text_area_height = 20
     self.default_text_area_width = 50
@@ -1670,16 +1672,16 @@ def get_maxlength_for(method)
       # 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
+        index = if options.has_key?(:index)
+                  options[:index]
+                elsif defined?(@auto_index)
+                  @auto_index
+                else
+                  ""
+                end
         sanitized_method_name = method_name.to_s.gsub(/[\?\/\-]$/, '')
 
-        "#{sanitized_object_name}#{index}_#{sanitized_method_name}_#{value}"
+        [@@custom_id_prefix, sanitized_object_name, index, sanitized_method_name, value].reject{|x|x.blank?}.join('_')
       end
 
       # Gets the nested_child_index value from the parent builder. In Rails 2.3
@@ -1885,6 +1887,7 @@ def semantic_#{meth}(record_or_name_or_array, *args, &proc)
           options = args.extract_options!
           options[:builder] ||= @@builder
           options[:html] ||= {}
+          @@builder.custom_id_prefix = options[:id_prefix].to_s
 
           singularizer = defined?(ActiveModel::Naming.singular) ? ActiveModel::Naming.method(:singular) : ActionController::RecordIdentifier.method(:singular_class_name)
 
diff --git a/spec/form_helper_spec.rb b/spec/form_helper_spec.rb
index d96f3a21d..dc15fa43b 100644
--- a/spec/form_helper_spec.rb
+++ b/spec/form_helper_spec.rb
@@ -132,6 +132,14 @@ class MyAwesomeCustomBuilder < ::Formtastic::SemanticFormBuilder
       end
     end
 
+    describe 'with :id_prefix option' do
+      it "should set the custom_id_prefix" do
+        semantic_form_for(@new_post, :id_prefix => 'context2') do |builder|
+          builder.custom_id_prefix == 'context2'
+        end
+      end
+    end
+
   end
 
   describe '#semantic_fields_for' do
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 1bc99fe12..04f56ad97 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -213,4 +213,15 @@
     end
   end
 
+  describe "when :id_prefix is given on form" do
+    before do
+      @output_buffer = ''
+      @new_post.stub!(:author_ids).and_return(nil)
+      @form = semantic_form_for(@new_post, :id_prefix => "custom_prefix") do |builder|
+        concat(builder.input(:authors, :as => :radio, :label => ''))
+      end
+    end
+    it_should_have_input_wrapper_with_id("custom_prefix_post_authors_input")
+  end
+
 end
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index b67a2de6c..9b3b18103 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -138,4 +138,18 @@
     end
   end
 
+  describe ':id_prefix option' do
+    before do
+      @form = semantic_form_for(@new_post, :id_prefix => 'form2') do |builder|
+        concat(builder.input(:publish_at, :as => :time))
+      end
+    end
+
+    it 'should have a tag matching the id_prefix' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag('#form2_post_publish_at_4i')
+      output_buffer.should have_tag('#form2_post_publish_at_5i')
+    end
+  end
+
 end

From 18348b8a31c41ddfa6fbac75dfc669b3561ae48c Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Fri, 15 Oct 2010 14:22:12 +0530
Subject: [PATCH 281/992] fix development dependency on rails 3 to be >= 3.0.0

---
 formtastic.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 3e28b956f..fb6065e7b 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.add_dependency(%q<activesupport>, [">= 2.3.7"])
   s.add_dependency(%q<actionpack>, [">= 2.3.7"])
   s.add_dependency(%q<i18n>, [">= 0.4.0"])
-  s.add_development_dependency(%q<rails>, ["= 3.0.0"])
+  s.add_development_dependency(%q<rails>, [">= 3.0.0"])
   s.add_development_dependency(%q<rspec-rails>, ["~> 2.0.0"])
   s.add_development_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
 

From 53d9b3f360c5bb25c5171475c3af6c60a1da2014 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Fri, 15 Oct 2010 14:44:55 +0530
Subject: [PATCH 282/992] bugfixing the radio input; missed an important change
 there earlier; adding tests

---
 lib/formtastic.rb               | 2 ++
 spec/inputs/radio_input_spec.rb | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 99c64d78f..fa2bca447 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -914,6 +914,8 @@ def radio_input(method, options)
           input_id = generate_html_id(input_name, value.to_s.gsub(/\s/, '_').gsub(/\W/, '').downcase)
           input_ids << input_id
 
+          html_options[:id] = input_id
+
           li_content = template.content_tag(:label,
             Formtastic::Util.html_safe("#{self.radio_button(input_name, value, html_options)} #{escape_html_entities(label)}"),
             :for => input_id
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 04f56ad97..c77e888ba 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -220,6 +220,9 @@
       @form = semantic_form_for(@new_post, :id_prefix => "custom_prefix") do |builder|
         concat(builder.input(:authors, :as => :radio, :label => ''))
       end
+
+      @form.should match(/for="custom_prefix_post_author_ids_(\d+)"/)
+      @form.should match(/id="custom_prefix_post_author_ids_(\d+)"/)
     end
     it_should_have_input_wrapper_with_id("custom_prefix_post_authors_input")
   end

From 9300f05997c81fa8b52c853d37a77c861400930b Mon Sep 17 00:00:00 2001
From: adrianpike <adrian.pike@gmail.com>
Date: Fri, 1 Oct 2010 03:14:16 +0800
Subject: [PATCH 283/992] I'd like to be able to customize the hint class

---
 lib/formtastic.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 5598b76b7..af12eacfb 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1258,7 +1258,7 @@ def inline_input_for(method, options)
       def inline_hints_for(method, options) #:nodoc:
         options[:hint] = localized_string(method, options[:hint], :hint)
         return if options[:hint].blank? or options[:hint].kind_of? Hash
-        template.content_tag(:p, Formtastic::Util.html_safe(options[:hint]), :class => 'inline-hints')
+        template.content_tag(:p, Formtastic::Util.html_safe(options[:hint]), :class => (options[:hint_class] ? options[:hint_class] : 'inline-hints'))
       end
 
       # Creates an error sentence by calling to_sentence on the errors array.

From 6653c2dea5fa32a6a7647847439146a10f25afec Mon Sep 17 00:00:00 2001
From: adrianpike <adrian.pike@gmail.com>
Date: Thu, 14 Oct 2010 06:02:52 +0800
Subject: [PATCH 284/992] a few simple specs

---
 spec/input_spec.rb | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 006cab5f7..00f0f6412 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -711,6 +711,15 @@ def should_be_required(options)
           output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li p.inline-hints", hint_text)
         end
+
+				it 'should have a custom hint class if I ask for one' do
+          hint_text = "this is the title of the post"
+          form = semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:title, :hint => hint_text, :hint_class => 'custom-hint-class'))
+          end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.should have_tag("form li p.custom-hint-class", hint_text)
+				end
       end
 
       describe 'when not provided' do
@@ -748,6 +757,22 @@ def should_be_required(options)
               output_buffer.should have_tag('form li p.inline-hints', @localized_hint_text)
             end
 
+						it 'should render a hint paragraph containing a localized hint (I18n) with a custom hint class if i ask for one' do
+              ::I18n.backend.store_translations :en,
+              :formtastic => {
+                  :hints => {
+                    :post => {
+                      :title => @localized_hint_text
+                     }
+                   }
+                }
+              form = semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title, :hint => true, :hint_class => 'custom-hint-class'))
+              end
+              output_buffer.concat(form) if Formtastic::Util.rails3?
+              output_buffer.should have_tag('form li p.custom-hint-class', @localized_hint_text)
+            end
+
             it 'should render a hint paragraph containing an optional localized hint (I18n) if first is not set' do
               form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => true))

From 03ef4a1a55a818b0480dec28c98134acc5364335 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 17 Oct 2010 14:34:46 +1100
Subject: [PATCH 285/992] Spec coverage to confirm that a work-around exists
 for GH-398.

Rails will automatically render a hidden id input for each nested object unless a hidden id field has already been rendered. The hidden input Rails renders is invalid HTML in the context of ol and li tags. The work-around is to render your own f.input :id, :as => :hidden, which renders the correct mark-up.

TODO: Still need to try to render our own hidden field in the block WITHOUT requiring the author to implement this work-around.
---
 spec/semantic_fields_for_spec.rb | 27 +++++++++++++++++++++++++++
 spec/spec_helper.rb              |  1 +
 2 files changed, 28 insertions(+)

diff --git a/spec/semantic_fields_for_spec.rb b/spec/semantic_fields_for_spec.rb
index cdbf22daa..136eb5085 100644
--- a/spec/semantic_fields_for_spec.rb
+++ b/spec/semantic_fields_for_spec.rb
@@ -40,6 +40,33 @@
     output_buffer.should_not =~ /id="post\[author\]_1_login_input"/
     # <=> output_buffer.should_not have_tag('form fieldset.inputs #post[author]_1_login_input')
   end
+  
+  context "when I rendered my own hidden id input" do 
+    
+    before do
+      output_buffer.replace ''
+      
+      @fred.posts.size.should == 1
+      @fred.posts.first.stub!(:persisted?).and_return(true)
+      @fred.stub!(:posts_attributes=)
+
+      form = semantic_form_for(@fred) do |builder|
+        concat(builder.semantic_fields_for(:posts) do |nested_builder|
+          concat(nested_builder.input(:id, :as => :hidden))
+          concat(nested_builder.input(:title))
+        end)
+      end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
+    end
+  
+    it "should only render one hidden input (my one)" do
+      output_buffer.should have_tag 'input#author_posts_attributes_0_id', :count => 1
+    end
+    
+    it "should render the hidden input inside an li.hidden" do
+      output_buffer.should have_tag 'li.hidden input#author_posts_attributes_0_id'
+    end
+  end
 
 end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9e0b15395..c2743832a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -192,6 +192,7 @@ def new_author_path; "/authors/new"; end
     @freds_post.stub!(:class).and_return(::Post)
     @freds_post.stub!(:to_label).and_return('Fred Smith')
     @freds_post.stub!(:id).and_return(19)
+    @freds_post.stub!(:title).and_return("Hello World")
     @freds_post.stub!(:author).and_return(@fred)
     @freds_post.stub!(:author_id).and_return(@fred.id)
     @freds_post.stub!(:authors).and_return([@fred])

From 86ac719f3196516bb1cbb377c9f17c721c8641b7 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Fri, 15 Oct 2010 14:20:52 +0530
Subject: [PATCH 286/992] corey haines id_prefix branch with more tests +
 slight refactoring in the generate_html_id method

---
 lib/formtastic.rb               | 19 +++++++++++--------
 spec/form_helper_spec.rb        |  8 ++++++++
 spec/inputs/radio_input_spec.rb | 11 +++++++++++
 spec/inputs/time_input_spec.rb  | 14 ++++++++++++++
 4 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index af12eacfb..6577b4c23 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -11,6 +11,8 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
                    :inline_order, :custom_inline_order, :file_methods, :priority_countries, :i18n_lookups_by_default, :escape_html_entities_in_hints_and_labels,
                    :default_commit_button_accesskey, :instance_reader => false
 
+    cattr_accessor :custom_id_prefix
+
     self.default_text_field_size = nil
     self.default_text_area_height = 20
     self.default_text_area_width = 50
@@ -1670,16 +1672,16 @@ def get_maxlength_for(method)
       # 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
+        index = if options.has_key?(:index)
+                  options[:index]
+                elsif defined?(@auto_index)
+                  @auto_index
+                else
+                  ""
+                end
         sanitized_method_name = method_name.to_s.gsub(/[\?\/\-]$/, '')
 
-        "#{sanitized_object_name}#{index}_#{sanitized_method_name}_#{value}"
+        [@@custom_id_prefix, sanitized_object_name, index, sanitized_method_name, value].reject{|x|x.blank?}.join('_')
       end
 
       # Gets the nested_child_index value from the parent builder. In Rails 2.3
@@ -1885,6 +1887,7 @@ def semantic_#{meth}(record_or_name_or_array, *args, &proc)
           options = args.extract_options!
           options[:builder] ||= @@builder
           options[:html] ||= {}
+          @@builder.custom_id_prefix = options[:id_prefix].to_s
 
           singularizer = defined?(ActiveModel::Naming.singular) ? ActiveModel::Naming.method(:singular) : ActionController::RecordIdentifier.method(:singular_class_name)
 
diff --git a/spec/form_helper_spec.rb b/spec/form_helper_spec.rb
index d96f3a21d..dc15fa43b 100644
--- a/spec/form_helper_spec.rb
+++ b/spec/form_helper_spec.rb
@@ -132,6 +132,14 @@ class MyAwesomeCustomBuilder < ::Formtastic::SemanticFormBuilder
       end
     end
 
+    describe 'with :id_prefix option' do
+      it "should set the custom_id_prefix" do
+        semantic_form_for(@new_post, :id_prefix => 'context2') do |builder|
+          builder.custom_id_prefix == 'context2'
+        end
+      end
+    end
+
   end
 
   describe '#semantic_fields_for' do
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 1bc99fe12..04f56ad97 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -213,4 +213,15 @@
     end
   end
 
+  describe "when :id_prefix is given on form" do
+    before do
+      @output_buffer = ''
+      @new_post.stub!(:author_ids).and_return(nil)
+      @form = semantic_form_for(@new_post, :id_prefix => "custom_prefix") do |builder|
+        concat(builder.input(:authors, :as => :radio, :label => ''))
+      end
+    end
+    it_should_have_input_wrapper_with_id("custom_prefix_post_authors_input")
+  end
+
 end
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index b67a2de6c..9b3b18103 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -138,4 +138,18 @@
     end
   end
 
+  describe ':id_prefix option' do
+    before do
+      @form = semantic_form_for(@new_post, :id_prefix => 'form2') do |builder|
+        concat(builder.input(:publish_at, :as => :time))
+      end
+    end
+
+    it 'should have a tag matching the id_prefix' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag('#form2_post_publish_at_4i')
+      output_buffer.should have_tag('#form2_post_publish_at_5i')
+    end
+  end
+
 end

From 3759128df782a66fa2c69011966aeebcd14b6ed9 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Fri, 15 Oct 2010 14:44:55 +0530
Subject: [PATCH 287/992] bugfixing the radio input; missed an important change
 there earlier; adding tests

---
 lib/formtastic.rb               | 2 ++
 spec/inputs/radio_input_spec.rb | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 6577b4c23..43295fa73 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -914,6 +914,8 @@ def radio_input(method, options)
           input_id = generate_html_id(input_name, value.to_s.gsub(/\s/, '_').gsub(/\W/, '').downcase)
           input_ids << input_id
 
+          html_options[:id] = input_id
+
           li_content = template.content_tag(:label,
             Formtastic::Util.html_safe("#{self.radio_button(input_name, value, html_options)} #{escape_html_entities(label)}"),
             :for => input_id
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 04f56ad97..c77e888ba 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -220,6 +220,9 @@
       @form = semantic_form_for(@new_post, :id_prefix => "custom_prefix") do |builder|
         concat(builder.input(:authors, :as => :radio, :label => ''))
       end
+
+      @form.should match(/for="custom_prefix_post_author_ids_(\d+)"/)
+      @form.should match(/id="custom_prefix_post_author_ids_(\d+)"/)
     end
     it_should_have_input_wrapper_with_id("custom_prefix_post_authors_input")
   end

From 717d8e8bc0b5ce5dfa205b4b605d0b19db6cb7fc Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Sun, 17 Oct 2010 18:01:37 +0530
Subject: [PATCH 288/992] full(ish) implementation of namespacing a form's id
 prefix; more tests required

---
 lib/formtastic.rb                     | 31 +++++++++++++++++++++------
 spec/inputs/boolean_input_spec.rb     | 16 ++++++++++++++
 spec/inputs/check_boxes_input_spec.rb | 17 ++++++++++++++-
 spec/inputs/country_input_spec.rb     | 22 +++++++++++++++++--
 spec/inputs/date_input_spec.rb        | 16 ++++++++++++++
 spec/inputs/datetime_input_spec.rb    | 16 ++++++++++++++
 spec/inputs/email_input_spec.rb       | 13 +++++++++++
 spec/inputs/file_input_spec.rb        | 16 ++++++++++++++
 spec/inputs/hidden_input_spec.rb      | 26 ++++++++++++++++++++++
 spec/inputs/numeric_input_spec.rb     | 11 ++++++++++
 spec/inputs/password_input_spec.rb    | 13 +++++++++++
 spec/inputs/phone_input_spec.rb       | 13 +++++++++++
 spec/inputs/search_input_spec.rb      | 13 +++++++++++
 spec/inputs/select_input_spec.rb      | 11 ++++++++++
 spec/inputs/string_input_spec.rb      | 13 +++++++++++
 spec/inputs/text_input_spec.rb        | 17 +++++++++++++++
 spec/inputs/time_input_spec.rb        |  1 +
 spec/inputs/time_zone_input_spec.rb   | 17 +++++++++++++++
 spec/inputs/url_input_spec.rb         | 13 +++++++++++
 spec/semantic_fields_for_spec.rb      | 11 ++++++++++
 spec/support/custom_macros.rb         | 15 +++++++++++++
 21 files changed, 311 insertions(+), 10 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 43295fa73..bedb119ea 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -625,8 +625,11 @@ def options_require_validation?(options) #nodoc
       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, :text, :phone, :search, :url, :email].include?(type)
-
-        self.label(method, options_for_label(options)) <<
+        field_id = generate_html_id(method, "")
+        html_options[:id] ||= field_id
+        label_options = options_for_label(options)
+        label_options[:for] ||= html_options[:id]
+        self.label(method, label_options) <<
         self.send(self.respond_to?(form_helper_method) ? form_helper_method : :text_field, method, html_options)
       end
 
@@ -683,6 +686,7 @@ def search_input(method, options)
       def hidden_input(method, options)
         options ||= {}
         html_options = options.delete(:input_html) || strip_formtastic_options(options)
+        html_options[:id] ||= generate_html_id(method, "")
         self.hidden_field(method, html_options)
       end
 
@@ -800,6 +804,7 @@ def select_input(method, options)
         end
         options = set_include_blank(options)
         input_name = generate_association_input_name(method)
+        html_options[:id] ||= generate_html_id(input_name, "")
 
         select_html = if options[:group_by]
           # The grouped_options_select is a bit counter intuitive and not optimised (mostly due to ActiveRecord).
@@ -822,7 +827,9 @@ def select_input(method, options)
           self.select(input_name, collection, strip_formtastic_options(options), html_options)
         end
 
-        self.label(method, options_for_label(options).merge(:input_name => input_name)) << select_html
+        label_options = options_for_label(options).merge(:input_name => input_name)
+        label_options[:for] ||= html_options[:id]
+        self.label(method, label_options) << select_html
       end
 
       def boolean_select_input(method, options)
@@ -838,8 +845,11 @@ def boolean_select_input(method, options)
       #   f.input :time_zone, :as => :time_zone, :priority_zones => /Australia/
       def time_zone_input(method, options)
         html_options = options.delete(:input_html) || {}
-
-        self.label(method, options_for_label(options)) <<
+        field_id = generate_html_id(method, "")
+        html_options[:id] ||= field_id
+        label_options = options_for_label(options)
+        label_options[:for] ||= html_options[:id]
+        self.label(method, label_options) <<
         self.time_zone_select(method, options.delete(:priority_zones),
           strip_formtastic_options(options), html_options)
       end
@@ -1224,7 +1234,12 @@ def country_input(method, options)
         html_options = options.delete(:input_html) || {}
         priority_countries = options.delete(:priority_countries) || self.class.priority_countries
 
-        self.label(method, options_for_label(options)) <<
+        field_id = generate_html_id(method, "")
+        html_options[:id] ||= field_id
+        label_options = options_for_label(options)
+        label_options[:for] ||= html_options[:id]
+
+        self.label(method, label_options) <<
         self.country_select(method, priority_countries, strip_formtastic_options(options), html_options)
       end
 
@@ -1238,13 +1253,15 @@ def boolean_input(method, options)
 
         #input = self.check_box(method, strip_formtastic_options(options).merge(html_options),
         #                       checked_value, unchecked_value)
+        field_id = [@@custom_id_prefix,@object_name,method].reject{|x|x.blank?}.join("_")
         input = template.check_box_tag(
           "#{@object_name}[#{method}]", 
           checked_value, 
           (@object && @object.send(:"#{method}") == checked_value), 
-          :id => "#{@object_name}_#{method}"
+          :id => field_id
         )
         options = options_for_label(options)
+        options[:for] ||= field_id
 
         # the label() method will insert this nested input into the label at the last minute
         options[:label_prefix_for_nested_input] = input
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index ca2063cd4..ce072c525 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -64,4 +64,20 @@
     output_buffer.should have_tag('form li label input[@name="project[allow_comments]"]')
   end
 
+  describe "when id_prefix is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      @form = semantic_form_for(@new_post, :id_prefix => "context2") do |builder|
+        concat(builder.input(:allow_comments, :as => :boolean))
+      end
+    end
+
+    it_should_have_input_wrapper_with_id("context2_post_allow_comments_input")
+    it_should_have_label_for("context2_post_allow_comments")
+
+  end
+
 end
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 2e72e77db..a2d8d800d 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -33,7 +33,6 @@
       output_buffer.should_not have_tag('form li fieldset legend label[@for^="author_post_ids_"]')
     end
 
-
     it 'should generate an ordered list with a list item for each choice' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li fieldset ol')
@@ -363,5 +362,21 @@
     end
   end
 
+  describe "when id_prefix is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      @form = semantic_form_for(@fred, :id_prefix => "context2") do |builder|
+        concat(builder.input(:posts, :as => :check_boxes))
+      end
+    end
+
+    it_should_have_label_for('context2_author_post_ids_19')
+    it_should_have_input_with_id('context2_author_post_ids_19')
+    it_should_have_input_wrapper_with_id("context2_author_posts_input")
+  end
+
 end
 
diff --git a/spec/inputs/country_input_spec.rb b/spec/inputs/country_input_spec.rb
index 70d8996dd..8b0e6a141 100644
--- a/spec/inputs/country_input_spec.rb
+++ b/spec/inputs/country_input_spec.rb
@@ -57,7 +57,7 @@
       priority_countries = ["Foo", "Bah"]
       semantic_form_for(@new_post) do |builder|
         builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
-        builder.should_receive(:country_select).with(:country, priority_countries, {}, {}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        builder.should_receive(:country_select).with(:country, priority_countries, {}, {:id => "post_country"}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
 
         concat(builder.input(:country, :as => :country, :priority_countries => priority_countries))
       end
@@ -70,7 +70,7 @@
 
       semantic_form_for(@new_post) do |builder|
         builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
-        builder.should_receive(:country_select).with(:country, priority_countries, {}, {}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        builder.should_receive(:country_select).with(:country, priority_countries, {}, {:id => "post_country"}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
 
         concat(builder.input(:country, :as => :country))
       end
@@ -78,6 +78,24 @@
 
   end
 
+  describe "when id_prefix is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      @form = semantic_form_for(@new_post, :id_prefix => 'context2') do |builder|
+        builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        builder.should_receive(:country_select).with(:country, [], {}, {:id => "context2_post_country"}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        concat(builder.input(:country, :priority_countries => []))
+      end
+    end
+
+    it_should_have_input_wrapper_with_id("context2_post_country_input")
+    it_should_have_label_for("context2_post_country")
+
+  end
+
   describe "matching" do
 
     describe "when the attribute is 'country'" do
diff --git a/spec/inputs/date_input_spec.rb b/spec/inputs/date_input_spec.rb
index 157f2a2d1..cf9a3b8f6 100644
--- a/spec/inputs/date_input_spec.rb
+++ b/spec/inputs/date_input_spec.rb
@@ -57,6 +57,22 @@
     end
   end
 
+  describe "when id_prefix is provided" do
+
+    before do
+      output_buffer.replace ''
+      @form = semantic_form_for(@new_post, :id_prefix => "context2") do |builder|
+        concat(builder.input(:publish_at, :as => :date, :order => [:year, :month, :day]))
+      end
+    end
+
+    it_should_have_input_wrapper_with_id("context2_post_publish_at_input")
+    it_should_have_select_with_id("context2_post_publish_at_1i")
+    it_should_have_select_with_id("context2_post_publish_at_2i")
+    it_should_have_select_with_id("context2_post_publish_at_3i")
+
+  end
+
   describe ':labels option' do
     fields = [:year, :month, :day]
     fields.each do |field|
diff --git a/spec/inputs/datetime_input_spec.rb b/spec/inputs/datetime_input_spec.rb
index 9820c7dd9..fb6535a72 100644
--- a/spec/inputs/datetime_input_spec.rb
+++ b/spec/inputs/datetime_input_spec.rb
@@ -190,6 +190,22 @@
   #
   #end
 
+  describe "when id_prefix is provided" do
+
+    before do
+      output_buffer.replace ''
+      @form = semantic_form_for(@new_post, :id_prefix => "context2") do |builder|
+        concat(builder.input(:created_at, :as => :datetime, :include_seconds => true))
+      end
+    end
+
+    it_should_have_input_wrapper_with_id("context2_post_created_at_input")
+    (1..6).each do |i|
+      it_should_have_select_with_id("context2_post_created_at_#{i}i")
+    end
+
+  end
+
   describe ':labels option' do
     fields = [:year, :month, :day, :hour, :minute]
     fields.each do |field|
diff --git a/spec/inputs/email_input_spec.rb b/spec/inputs/email_input_spec.rb
index ba9fdd774..f6d4becf8 100644
--- a/spec/inputs/email_input_spec.rb
+++ b/spec/inputs/email_input_spec.rb
@@ -27,5 +27,18 @@
 
   end
 
+  describe "when id_prefix is provided" do
+
+    before do
+      @form = semantic_form_for(@new_post, :id_prefix => 'context2') do |builder|
+        concat(builder.input(:email))
+      end
+    end
+
+    it_should_have_input_wrapper_with_id("context2_post_email_input")
+    it_should_have_label_and_input_with_id("context2_post_email")
+
+  end
+
 end
 
diff --git a/spec/inputs/file_input_spec.rb b/spec/inputs/file_input_spec.rb
index a9cf52591..5484fa842 100644
--- a/spec/inputs/file_input_spec.rb
+++ b/spec/inputs/file_input_spec.rb
@@ -30,5 +30,21 @@
     output_buffer.should have_tag("form li input.myclass")
   end
 
+  describe "when id_prefix is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      @form = semantic_form_for(@new_post, :id_prefix => 'context2') do |builder|
+        concat(builder.input(:body, :as => :file))
+      end
+    end
+
+    it_should_have_input_wrapper_with_id("context2_post_body_input")
+    it_should_have_label_and_input_with_id("context2_post_body")
+
+  end
+
 end
 
diff --git a/spec/inputs/hidden_input_spec.rb b/spec/inputs/hidden_input_spec.rb
index 9ffd79b3c..5a771d9ae 100644
--- a/spec/inputs/hidden_input_spec.rb
+++ b/spec/inputs/hidden_input_spec.rb
@@ -74,5 +74,31 @@
     output_buffer.should_not have_tag("form li ul.hints")
   end
 
+  describe "when id_prefix is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      @form = semantic_form_for(@new_post, :id_prefix => 'context2') do |builder|
+        concat(builder.input(:secret, :as => :hidden))
+        concat(builder.input(:author_id, :as => :hidden, :value => 99))
+        concat(builder.input(:published, :as => :hidden, :input_html => {:value => true}))
+        concat(builder.input(:reviewer, :as => :hidden, :input_html => {:class => 'new_post_reviewer', :id => 'new_post_reviewer'}))
+        concat(builder.input(:author, :as => :hidden, :value => 'direct_value', :input_html => {:value => "formtastic_value"}))
+      end
+    end
+
+    attributes_to_check = [:secret, :author_id, :published, :reviewer, :author]
+    attributes_to_check.each do |a|
+      it_should_have_input_wrapper_with_id("context2_post_#{a}_input")
+    end
+
+    (attributes_to_check - [:reviewer]).each do |a|
+      it_should_have_input_with_id("context2_post_#{a}")
+    end
+
+  end
+
 end
 
diff --git a/spec/inputs/numeric_input_spec.rb b/spec/inputs/numeric_input_spec.rb
index c18fe0768..d7832f290 100644
--- a/spec/inputs/numeric_input_spec.rb
+++ b/spec/inputs/numeric_input_spec.rb
@@ -41,5 +41,16 @@
     it_should_have_input_with_name("project[title]")
   end
 
+  describe "when id_prefix provided" do
+    before do
+      @form = semantic_form_for(@new_post, :id_prefix => :context2) do |builder|
+        concat(builder.input(:title, :as => :numeric))
+      end
+    end
+
+    it_should_have_input_wrapper_with_id("context2_post_title_input")
+    it_should_have_label_and_input_with_id("context2_post_title")
+  end
+
 end
 
diff --git a/spec/inputs/password_input_spec.rb b/spec/inputs/password_input_spec.rb
index bf4940ab7..b28b37ea9 100644
--- a/spec/inputs/password_input_spec.rb
+++ b/spec/inputs/password_input_spec.rb
@@ -42,4 +42,17 @@
     it_should_have_input_with_name("project[title]")
   end
 
+  describe "when id_prefix is provided" do
+
+    before do
+      @form = semantic_form_for(@new_post, :id_prefix => "context2") do |builder|
+        concat(builder.input(:title, :as => :password))
+      end
+    end
+
+    it_should_have_input_wrapper_with_id("context2_post_title_input")
+    it_should_have_label_and_input_with_id("context2_post_title")
+
+  end
+
 end
diff --git a/spec/inputs/phone_input_spec.rb b/spec/inputs/phone_input_spec.rb
index d6d7eea8f..878b67b17 100644
--- a/spec/inputs/phone_input_spec.rb
+++ b/spec/inputs/phone_input_spec.rb
@@ -27,5 +27,18 @@
 
   end
 
+  describe "when id_prefix is provided" do
+
+    before do
+      @form = semantic_form_for(@new_post, :id_prefix => "context2") do |builder|
+        concat(builder.input(:phone))
+      end
+    end
+
+    it_should_have_input_wrapper_with_id("context2_post_phone_input")
+    it_should_have_label_and_input_with_id("context2_post_phone")
+
+  end
+
 end
 
diff --git a/spec/inputs/search_input_spec.rb b/spec/inputs/search_input_spec.rb
index 0df79cc84..1dbdd7861 100644
--- a/spec/inputs/search_input_spec.rb
+++ b/spec/inputs/search_input_spec.rb
@@ -27,5 +27,18 @@
 
   end
 
+  describe "when id_prefix is provided" do
+
+    before do
+      @form = semantic_form_for(@new_post, :id_prefix => "context2") do |builder|
+        concat(builder.input(:search))
+      end
+    end
+
+    it_should_have_input_wrapper_with_id("context2_post_search_input")
+    it_should_have_label_and_input_with_id("context2_post_search")
+
+  end
+
 end
 
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 39d47840c..294b1d776 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -493,4 +493,15 @@
     end
   end
 
+  describe 'when a id_prefix is provided' do
+    before do
+      @form = semantic_form_for(@freds_post, :id_prefix => 'context2') do |builder|
+        concat(builder.input(:authors, :as => :select))
+      end
+    end
+    it_should_have_input_wrapper_with_id("context2_post_authors_input")
+    it_should_have_select_with_id("context2_post_author_ids")
+    it_should_have_label_for("context2_post_author_ids")
+  end
+
 end
diff --git a/spec/inputs/string_input_spec.rb b/spec/inputs/string_input_spec.rb
index cf66ee06b..a039521d0 100644
--- a/spec/inputs/string_input_spec.rb
+++ b/spec/inputs/string_input_spec.rb
@@ -138,6 +138,19 @@ def should_have_maxlength(maxlength, options)
     end
   end
 
+  describe "when id_prefix is provided" do
+
+    before do
+      @form = semantic_form_for(@new_post, :id_prefix => 'context2') do |builder|
+        concat(builder.input(:title, :as => :string))
+      end
+    end
+
+    it_should_have_input_wrapper_with_id("context2_post_title_input")
+    it_should_have_label_and_input_with_id("context2_post_title")
+
+  end
+
   describe "when no object is provided" do
     before do
       @form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
diff --git a/spec/inputs/text_input_spec.rb b/spec/inputs/text_input_spec.rb
index 37e9a5599..8eb3b94b0 100644
--- a/spec/inputs/text_input_spec.rb
+++ b/spec/inputs/text_input_spec.rb
@@ -68,6 +68,23 @@
     output_buffer.should_not have_tag("form li textarea[@rows]")
   end
 
+  describe "when id_prefix is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      @form = semantic_form_for(@new_post, :id_prefix => 'context2') do |builder|
+        concat(builder.input(:body, :as => :text))
+      end
+    end
+
+    it_should_have_input_wrapper_with_id("context2_post_body_input")
+    it_should_have_textarea_with_id("context2_post_body")
+    it_should_have_label_for("context2_post_body")
+
+  end
+
   context "when :rows is missing in :input_html" do
     before do
       output_buffer.replace ''
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index 9b3b18103..fd51e6ae7 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -147,6 +147,7 @@
 
     it 'should have a tag matching the id_prefix' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag('#form2_post_publish_at_input')
       output_buffer.should have_tag('#form2_post_publish_at_4i')
       output_buffer.should have_tag('#form2_post_publish_at_5i')
     end
diff --git a/spec/inputs/time_zone_input_spec.rb b/spec/inputs/time_zone_input_spec.rb
index 43110d430..ea5ce7259 100644
--- a/spec/inputs/time_zone_input_spec.rb
+++ b/spec/inputs/time_zone_input_spec.rb
@@ -40,6 +40,23 @@
     output_buffer.should have_tag("form li select.myclass")
   end
 
+  describe "when id_prefix is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      @form = semantic_form_for(@new_post, :id_prefix => 'context2') do |builder|
+        concat(builder.input(:time_zone))
+      end
+    end
+
+    it_should_have_input_wrapper_with_id("context2_post_time_zone_input")
+    it_should_have_select_with_id("context2_post_time_zone")
+    it_should_have_label_for("context2_post_time_zone")
+
+  end
+
   describe 'when no object is given' do
     before(:each) do
       @form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
diff --git a/spec/inputs/url_input_spec.rb b/spec/inputs/url_input_spec.rb
index 4e596d747..6b5bc0934 100644
--- a/spec/inputs/url_input_spec.rb
+++ b/spec/inputs/url_input_spec.rb
@@ -27,5 +27,18 @@
 
   end
 
+  describe "when id_prefix is provided" do
+
+    before do
+      @form = semantic_form_for(@new_post, :id_prefix => "context2") do |builder|
+        concat(builder.input(:url))
+      end
+    end
+
+    it_should_have_input_wrapper_with_id("context2_post_url_input")
+    it_should_have_label_and_input_with_id("context2_post_url")
+
+  end
+
 end
 
diff --git a/spec/semantic_fields_for_spec.rb b/spec/semantic_fields_for_spec.rb
index 136eb5085..817a874e3 100644
--- a/spec/semantic_fields_for_spec.rb
+++ b/spec/semantic_fields_for_spec.rb
@@ -40,6 +40,17 @@
     output_buffer.should_not =~ /id="post\[author\]_1_login_input"/
     # <=> output_buffer.should_not have_tag('form fieldset.inputs #post[author]_1_login_input')
   end
+
+  it 'should use id_prefix provided in nested fields' do
+    @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
+    form = semantic_form_for(@new_post, :id_prefix => 'context2') do |builder|
+      concat(builder.semantic_fields_for(@bob, :index => 1) do |nested_builder|
+        concat(nested_builder.inputs(:login))
+      end)
+    end
+    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.should have_tag('form fieldset.inputs #context2_post_author_1_login_input')
+  end
   
   context "when I rendered my own hidden id input" do 
     
diff --git a/spec/support/custom_macros.rb b/spec/support/custom_macros.rb
index 0de8d078b..5370166c2 100644
--- a/spec/support/custom_macros.rb
+++ b/spec/support/custom_macros.rb
@@ -57,6 +57,13 @@ def it_should_have_input_with_id(element_id)
       end
     end
 
+    def it_should_have_select_with_id(element_id)
+      it "should have a select box with id '#{element_id}'" do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag("form li select##{element_id}")
+      end
+    end
+
     def it_should_have_input_with_type(input_type)
       it "should have a #{input_type} input" do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
@@ -85,6 +92,14 @@ def it_should_have_textarea_with_id(element_id)
       end
     end
 
+    def it_should_have_label_and_input_with_id(element_id)
+      it "should have an input with id '#{element_id}'" do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag("form li input##{element_id}")
+        output_buffer.should have_tag("form li label[@for='#{element_id}']")
+      end
+    end
+
     def it_should_use_default_text_field_size_when_not_nil(as)
       it 'should use default_text_field_size when not nil' do
         with_config :default_text_field_size, 30 do

From 7b453d00c38d4185be7489d98878a8827327f1d2 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Fri, 22 Oct 2010 20:40:36 +0530
Subject: [PATCH 289/992] ensure that if grouped_options from rails is used,
 then it is applied appropriately

---
 lib/formtastic.rb                |  2 +-
 spec/inputs/select_input_spec.rb | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index af12eacfb..d5c39a384 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1450,7 +1450,7 @@ def find_collection_for_column(column, options) #:nodoc:
         collection = find_raw_collection_for_column(column, options)
 
         # Return if we have a plain string
-        return collection if collection.instance_of?(String)
+        return collection if collection.instance_of?(String) || collection.instance_of?(::Formtastic::Util.rails_safe_buffer_class)
 
         # Return if we have an Array of strings, fixnums or arrays
         return collection if (collection.instance_of?(Array) || collection.instance_of?(Range)) &&
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 39d47840c..aa7180fdb 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -449,6 +449,28 @@
     end
   end
 
+  describe 'when a grouped collection collection is given' do
+    before(:each) do
+      @form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        @grouped_opts = [['one',   ['pencil', 'crayon', 'pen']],
+                         ['two',   ['eyes', 'hands', 'feet']],
+                         ['three', ['wickets', 'witches', 'blind mice']]]
+        concat(builder.input(:author, :as => :select, :collection => grouped_options_for_select(@grouped_opts, "hands")))
+      end
+    end
+
+    it 'should generate an option to each item' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      @grouped_opts.each do |opt_pair|
+        output_buffer.should have_tag("form li select optgroup[@label='#{opt_pair[0]}']")
+        opt_pair[1].each do |v|
+          output_buffer.should have_tag("form li select optgroup[@label='#{opt_pair[0]}'] option[@value='#{v}']")
+        end
+      end
+      output_buffer.should have_tag("form li select optgroup option[@selected]","hands")
+    end
+  end
+
   describe "enum" do
     before do
       @output_buffer = ''

From dae786dd56565a449c11ce3db86696cd6b7fa238 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Sat, 23 Oct 2010 23:30:43 +0800
Subject: [PATCH 290/992] error class can be overridden like hints

---
 lib/formtastic.rb   | 19 +++++++++++--------
 spec/errors_spec.rb | 24 ++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index d5c39a384..b431d337f 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -450,12 +450,12 @@ def label(method, options_or_text=nil, options=nil)
     #     f.errors_on(:body)
     #   end
     #
-    def inline_errors_for(method, options = nil) #:nodoc:
+    def inline_errors_for(method, options = {}) #:nodoc:
       if render_inline_errors?
         errors = [@object.errors[method.to_sym]]
         errors << [@object.errors[association_primary_key(method)]] if association_macro_for_method(method) == :belongs_to
         errors = errors.flatten.compact.uniq
-        send(:"error_#{self.class.inline_errors}", [*errors]) if errors.any?
+        send(:"error_#{self.class.inline_errors}", [*errors], options) if errors.any?
       else
         nil
       end
@@ -1263,24 +1263,27 @@ def inline_hints_for(method, options) #:nodoc:
 
       # Creates an error sentence by calling to_sentence on the errors array.
       #
-      def error_sentence(errors) #:nodoc:
-        template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.untaint), :class => 'inline-errors')
+      def error_sentence(errors, options = {}) #:nodoc:
+        error_class = (options[:error_class]) ? options[:error_class] : 'inline-errors'
+        template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.untaint), :class => error_class)
       end
 
       # Creates an error li list.
       #
-      def error_list(errors) #:nodoc:
+      def error_list(errors, options = {}) #:nodoc:
+        error_class = (options[:error_class]) ? options[:error_class] : 'errors'
         list_elements = []
         errors.each do |error|
           list_elements <<  template.content_tag(:li, Formtastic::Util.html_safe(error.untaint))
         end
-        template.content_tag(:ul, Formtastic::Util.html_safe(list_elements.join("\n")), :class => 'errors')
+        template.content_tag(:ul, Formtastic::Util.html_safe(list_elements.join("\n")), :class => error_class)
       end
 
       # Creates an error sentence containing only the first error
       #
-      def error_first(errors) #:nodoc:
-        template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => 'inline-errors')
+      def error_first(errors, options = {}) #:nodoc:
+        error_class = (options[:error_class]) ? options[:error_class] : 'inline-errors'
+        template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => error_class)
       end
 
       # Generates the required or optional string. If the value set is a proc,
diff --git a/spec/errors_spec.rb b/spec/errors_spec.rb
index 6d09a0bd8..4e964c71b 100644
--- a/spec/errors_spec.rb
+++ b/spec/errors_spec.rb
@@ -25,6 +25,13 @@
       end
     end
 
+    it 'should render a paragraph with the errors joined into a sentence when inline_errors config is :sentence with a customized error class' do
+      ::Formtastic::SemanticFormBuilder.inline_errors = :sentence
+      semantic_form_for(@new_post) do |builder|
+        builder.errors_on(:title, :error_class => 'better-errors').should have_tag('p.better-errors', @title_errors.to_sentence)
+      end
+    end
+
     it 'should render an unordered list with the class errors when inline_errors config is :list' do
       ::Formtastic::SemanticFormBuilder.inline_errors = :list
       semantic_form_for(@new_post) do |builder|
@@ -35,6 +42,16 @@
       end
     end
 
+    it 'should render an unordered list with the class errors when inline_errors config is :list with a customized error class' do
+      ::Formtastic::SemanticFormBuilder.inline_errors = :list
+      semantic_form_for(@new_post) do |builder|
+        builder.errors_on(:title, :error_class => 'better-errors').should have_tag('ul.better-errors')
+        @title_errors.each do |error|
+          builder.errors_on(:title, :error_class => 'better-errors').should have_tag('ul.better-errors li', error)
+        end
+      end
+    end
+
     it 'should render a paragraph with the first error when inline_errors config is :first' do
       ::Formtastic::SemanticFormBuilder.inline_errors = :first
       semantic_form_for(@new_post) do |builder|
@@ -42,6 +59,13 @@
       end
     end
 
+    it 'should render a paragraph with the first error when inline_errors config is :first with a customized error class' do
+      ::Formtastic::SemanticFormBuilder.inline_errors = :first
+      semantic_form_for(@new_post) do |builder|
+        builder.errors_on(:title, :error_class => 'better-errors').should have_tag('p.better-errors', @title_errors.first)
+      end
+    end
+
     it 'should return nil when inline_errors config is :none' do
       ::Formtastic::SemanticFormBuilder.inline_errors = :none
       semantic_form_for(@new_post) do |builder|

From c2b888d0d9560cf75e16b2880f2c01f04855aa70 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Sun, 24 Oct 2010 00:13:03 +0800
Subject: [PATCH 291/992] making error and hint classes as class defaults;
 adding tests; generator comments

---
 generators/formtastic/templates/formtastic.rb |  7 +++++-
 lib/formtastic.rb                             | 14 +++++++----
 spec/errors_spec.rb                           | 24 +++++++++++++++++++
 spec/input_spec.rb                            | 17 ++++++++++++-
 4 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/generators/formtastic/templates/formtastic.rb b/generators/formtastic/templates/formtastic.rb
index f9b80883a..2b937e423 100644
--- a/generators/formtastic/templates/formtastic.rb
+++ b/generators/formtastic/templates/formtastic.rb
@@ -32,6 +32,12 @@
 # Set the way inline errors will be displayed.
 # Defaults to :sentence, valid options are :sentence, :list, :first and :none
 # Formtastic::SemanticFormBuilder.inline_errors = :sentence
+# Formtastic uses the following classes as default for hints, inline_errors and error list
+
+# If you override the class here, please ensure to override it in your formtastic_changes.css stylesheet as well
+# Formtastic::SemanticFormBuilder.default_hint_class = "inline-hints"
+# Formtastic::SemanticFormBuilder.default_inline_error_class = "inline-errors"
+# Formtastic::SemanticFormBuilder.default_error_list_class = "errors"
 
 # Set the method to call on label text to transform or format it for human-friendly
 # reading when formtastic is used without object. Defaults to :humanize.
@@ -56,7 +62,6 @@
 # Formtastic::SemanticFormBuilder.custom_inline_order[:checkbox] = [:errors, :hints, :input]
 # Formtastic::SemanticFormBuilder.custom_inline_order[:select] = [:hints, :input, :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)
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index b431d337f..22626e252 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -9,7 +9,7 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
     class_inheritable_accessor :default_text_field_size, :default_text_area_height, :default_text_area_width, :all_fields_required_by_default, :include_blank_for_select_by_default,
                    :required_string, :optional_string, :inline_errors, :label_str_method, :collection_value_methods, :collection_label_methods,
                    :inline_order, :custom_inline_order, :file_methods, :priority_countries, :i18n_lookups_by_default, :escape_html_entities_in_hints_and_labels,
-                   :default_commit_button_accesskey, :instance_reader => false
+                   :default_commit_button_accesskey, :default_inline_error_class, :default_hint_class, :default_error_list_class, :instance_reader => false
 
     self.default_text_field_size = nil
     self.default_text_area_height = 20
@@ -29,6 +29,9 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
     self.i18n_lookups_by_default = false
     self.escape_html_entities_in_hints_and_labels = true
     self.default_commit_button_accesskey = nil
+    self.default_inline_error_class = 'inline-errors'
+    self.default_error_list_class = 'errors'
+    self.default_hint_class = 'inline-hints'
 
     RESERVED_COLUMNS = [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
 
@@ -1258,20 +1261,21 @@ def inline_input_for(method, options)
       def inline_hints_for(method, options) #:nodoc:
         options[:hint] = localized_string(method, options[:hint], :hint)
         return if options[:hint].blank? or options[:hint].kind_of? Hash
-        template.content_tag(:p, Formtastic::Util.html_safe(options[:hint]), :class => (options[:hint_class] ? options[:hint_class] : 'inline-hints'))
+        hint_class = options[:hint_class] || self.class.default_hint_class
+        template.content_tag(:p, Formtastic::Util.html_safe(options[:hint]), :class => hint_class)
       end
 
       # Creates an error sentence by calling to_sentence on the errors array.
       #
       def error_sentence(errors, options = {}) #:nodoc:
-        error_class = (options[:error_class]) ? options[:error_class] : 'inline-errors'
+        error_class = options[:error_class] || self.class.default_inline_error_class
         template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.untaint), :class => error_class)
       end
 
       # Creates an error li list.
       #
       def error_list(errors, options = {}) #:nodoc:
-        error_class = (options[:error_class]) ? options[:error_class] : 'errors'
+        error_class = options[:error_class] || self.class.default_error_list_class
         list_elements = []
         errors.each do |error|
           list_elements <<  template.content_tag(:li, Formtastic::Util.html_safe(error.untaint))
@@ -1282,7 +1286,7 @@ def error_list(errors, options = {}) #:nodoc:
       # Creates an error sentence containing only the first error
       #
       def error_first(errors, options = {}) #:nodoc:
-        error_class = (options[:error_class]) ? options[:error_class] : 'inline-errors'
+        error_class = options[:error_class] || self.class.default_inline_error_class
         template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => error_class)
       end
 
diff --git a/spec/errors_spec.rb b/spec/errors_spec.rb
index 4e964c71b..3ac5bdcfe 100644
--- a/spec/errors_spec.rb
+++ b/spec/errors_spec.rb
@@ -18,6 +18,11 @@
       @errors.stub!(:[]).with(:title).and_return(@title_errors)
     end
 
+    after do
+      ::Formtastic::SemanticFormBuilder.default_inline_error_class = 'inline-errors'
+      ::Formtastic::SemanticFormBuilder.default_error_list_class = 'errors'
+    end
+
     it 'should render a paragraph with the errors joined into a sentence when inline_errors config is :sentence' do
       ::Formtastic::SemanticFormBuilder.inline_errors = :sentence
       semantic_form_for(@new_post) do |builder|
@@ -25,6 +30,14 @@
       end
     end
 
+    it 'should render a paragraph with a overridden default class' do
+      ::Formtastic::SemanticFormBuilder.inline_errors = :sentence
+      ::Formtastic::SemanticFormBuilder.default_inline_error_class = 'better-errors'
+      semantic_form_for(@new_post) do |builder|
+        builder.errors_on(:title).should have_tag('p.better-errors', @title_errors.to_sentence)
+      end
+    end
+
     it 'should render a paragraph with the errors joined into a sentence when inline_errors config is :sentence with a customized error class' do
       ::Formtastic::SemanticFormBuilder.inline_errors = :sentence
       semantic_form_for(@new_post) do |builder|
@@ -42,6 +55,17 @@
       end
     end
 
+    it 'should render an unordered list with the class overridden default class' do
+      ::Formtastic::SemanticFormBuilder.inline_errors = :list
+      ::Formtastic::SemanticFormBuilder.default_error_list_class = "better-errors"
+      semantic_form_for(@new_post) do |builder|
+        builder.errors_on(:title).should have_tag('ul.better-errors')
+        @title_errors.each do |error|
+          builder.errors_on(:title).should have_tag('ul.better-errors li', error)
+        end
+      end
+    end
+
     it 'should render an unordered list with the class errors when inline_errors config is :list with a customized error class' do
       ::Formtastic::SemanticFormBuilder.inline_errors = :list
       semantic_form_for(@new_post) do |builder|
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 00f0f6412..cab49637a 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -703,6 +703,11 @@ def should_be_required(options)
     describe ':hint option' do
 
       describe 'when provided' do
+
+        after do
+          ::Formtastic::SemanticFormBuilder.default_hint_class = "inline-hints"
+        end
+
         it 'should be passed down to the paragraph tag' do
           hint_text = "this is the title of the post"
           form = semantic_form_for(@new_post) do |builder|
@@ -719,7 +724,17 @@ def should_be_required(options)
           end
           output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li p.custom-hint-class", hint_text)
-				end
+        end
+
+        it 'should have a custom hint class defaulted for all forms' do
+          hint_text = "this is the title of the post"
+          ::Formtastic::SemanticFormBuilder.default_hint_class = "custom-hint-class"
+          form = semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:title, :hint => hint_text))
+          end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.should have_tag("form li p.custom-hint-class", hint_text)
+        end
       end
 
       describe 'when not provided' do

From d174db043d893ecfd1c2dd005760699c02cc1856 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Sun, 24 Oct 2010 13:03:07 +0530
Subject: [PATCH 292/992] change id_prefix to namespace; added documentation in
 README

---
 README.textile                        | 23 +++++++++++++++++++++--
 lib/formtastic.rb                     |  8 ++++----
 spec/form_helper_spec.rb              |  8 ++++----
 spec/inputs/boolean_input_spec.rb     |  4 ++--
 spec/inputs/check_boxes_input_spec.rb |  4 ++--
 spec/inputs/country_input_spec.rb     |  4 ++--
 spec/inputs/date_input_spec.rb        |  4 ++--
 spec/inputs/datetime_input_spec.rb    |  4 ++--
 spec/inputs/email_input_spec.rb       |  4 ++--
 spec/inputs/file_input_spec.rb        |  4 ++--
 spec/inputs/hidden_input_spec.rb      |  4 ++--
 spec/inputs/numeric_input_spec.rb     |  4 ++--
 spec/inputs/password_input_spec.rb    |  4 ++--
 spec/inputs/phone_input_spec.rb       |  4 ++--
 spec/inputs/radio_input_spec.rb       |  4 ++--
 spec/inputs/search_input_spec.rb      |  4 ++--
 spec/inputs/select_input_spec.rb      |  4 ++--
 spec/inputs/string_input_spec.rb      |  4 ++--
 spec/inputs/text_input_spec.rb        |  4 ++--
 spec/inputs/time_input_spec.rb        |  6 +++---
 spec/inputs/time_zone_input_spec.rb   |  4 ++--
 spec/inputs/url_input_spec.rb         |  4 ++--
 spec/semantic_fields_for_spec.rb      |  4 ++--
 23 files changed, 70 insertions(+), 51 deletions(-)

diff --git a/README.textile b/README.textile
index 327f2d5d0..807294cce 100644
--- a/README.textile
+++ b/README.textile
@@ -165,7 +165,7 @@ If you want to customize the label text, or render some hint text below the fiel
     <% form.inputs :name => "Advanced Options", :id => "advanced" do %>
       <%= form.input :slug, :label => "URL Title", :hint => "Created automatically if left blank", :required => false %>
       <%= form.input :section, :as => :radio %>
-      <%= form.input :user, :label => "Author", :label_method => :full_name,  %>
+      <%= form.input :user, :label => "Author", :label_method => :full_name %>
       <%= form.input :categories, :required => false %>
       <%= form.input :created_at, :as => :string, :label => "Publication Date", :required => false %>
     <% end %>
@@ -207,6 +207,17 @@ When working in has many association, you can even supply @"%i"@ in your fieldse
   <% end %>
 </pre>
 
+If you have more than one form on the same page, it may lead to HTML invalidation because of the way HTML element id attributes are assigned. You can provide
+a namespace for your form to ensure uniqueness of id attributes on form elements. The namespace attribute will be prefixed with underscore on the generate html id. For example:
+
+<pre>
+  <% semantic_form_for(@post, :namespace => 'cat_form') do |form| %>
+  <%= form.input :title %>        # id="cat_form_post_title"
+  <%= form.input :body %>         # id="cat_form_post_body"
+  <%= form.input :created_at %>   # id="cat_form_post_created_at"
+  <%= form.buttons %>
+  <% end %>
+</pre>
 
 Customize HTML attributes for any input using the @:input_html@ option. Typically this is used to disable the input, change the size of a text field, change the rows in a textarea, or even to add a special class to an input to attach special behavior like "autogrow":http://plugins.jquery.com/project/autogrow textareas:
 
@@ -230,7 +241,7 @@ The same can be done for buttons with the @:button_html@ option:
   <% end %>
 </pre>
 
-Customize the HTML attributes for the @<li>@ wrapper around every input with the @:wrapper_html@ option hash. There's one special key in the hash (@:class@), which will actually _append_ your string of classes to the existing classes provided by Formtastic (like @"required string error"@)
+Customize the HTML attributes for the @<li>@ wrapper around every input with the @:wrapper_html@ option hash. There's one special key in the hash (@:class@), which will actually _append_ your string of classes to the existing classes provided by Formtastic (like @"required string error"@).
 
 <pre>
   <% semantic_form_for @post do |form| %>
@@ -241,6 +252,14 @@ Customize the HTML attributes for the @<li>@ wrapper around every input with the
   <% end %>
 </pre>
 
+Customize the default class used for hints on each attribute or globally in the @config/formtastic.rb@ file. Similarly you can customize the error classes on an attribute level or globally.
+
+<pre>
+  <% semantic_form_for @post do |form| %>
+    <%= form.input :title, :hint_class => 'custom-html-class', :error_class => 'custom-error-class' %>
+  <% end %>
+</pre>
+
 Many inputs provide a collection of options to choose from (like @:select@, @:radio@, @:check_boxes@, @:boolean@). In many cases, Formtastic can find choices through the model associations, but if you want to use your own set of choices, the @:collection@ option is what you want.  You can pass in an Array of objects, an array of Strings, a Hash... Throw almost anything at it! Examples:
 
 <pre>
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 45564ff3e..d50a67356 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -11,7 +11,7 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
                    :inline_order, :custom_inline_order, :file_methods, :priority_countries, :i18n_lookups_by_default, :escape_html_entities_in_hints_and_labels,
                    :default_commit_button_accesskey, :default_inline_error_class, :default_hint_class, :default_error_list_class, :instance_reader => false
 
-    cattr_accessor :custom_id_prefix
+    cattr_accessor :custom_namespace
 
     self.default_text_field_size = nil
     self.default_text_area_height = 20
@@ -1256,7 +1256,7 @@ def boolean_input(method, options)
 
         #input = self.check_box(method, strip_formtastic_options(options).merge(html_options),
         #                       checked_value, unchecked_value)
-        field_id = [@@custom_id_prefix,@object_name,method].reject{|x|x.blank?}.join("_")
+        field_id = [@@custom_namespace,@object_name,method].reject{|x|x.blank?}.join("_")
         input = template.check_box_tag(
           "#{@object_name}[#{method}]", 
           checked_value, 
@@ -1707,7 +1707,7 @@ def generate_html_id(method_name, value='input') #:nodoc:
                 end
         sanitized_method_name = method_name.to_s.gsub(/[\?\/\-]$/, '')
 
-        [@@custom_id_prefix, sanitized_object_name, index, sanitized_method_name, value].reject{|x|x.blank?}.join('_')
+        [@@custom_namespace, sanitized_object_name, index, sanitized_method_name, value].reject{|x|x.blank?}.join('_')
       end
 
       # Gets the nested_child_index value from the parent builder. In Rails 2.3
@@ -1913,7 +1913,7 @@ def semantic_#{meth}(record_or_name_or_array, *args, &proc)
           options = args.extract_options!
           options[:builder] ||= @@builder
           options[:html] ||= {}
-          @@builder.custom_id_prefix = options[:id_prefix].to_s
+          @@builder.custom_namespace = options[:namespace].to_s
 
           singularizer = defined?(ActiveModel::Naming.singular) ? ActiveModel::Naming.method(:singular) : ActionController::RecordIdentifier.method(:singular_class_name)
 
diff --git a/spec/form_helper_spec.rb b/spec/form_helper_spec.rb
index dc15fa43b..b27234ef2 100644
--- a/spec/form_helper_spec.rb
+++ b/spec/form_helper_spec.rb
@@ -132,10 +132,10 @@ class MyAwesomeCustomBuilder < ::Formtastic::SemanticFormBuilder
       end
     end
 
-    describe 'with :id_prefix option' do
-      it "should set the custom_id_prefix" do
-        semantic_form_for(@new_post, :id_prefix => 'context2') do |builder|
-          builder.custom_id_prefix == 'context2'
+    describe 'with :namespace option' do
+      it "should set the custom_namespace" do
+        semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+          builder.custom_namespace == 'context2'
         end
       end
     end
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index ce072c525..b17f15ef5 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -64,13 +64,13 @@
     output_buffer.should have_tag('form li label input[@name="project[allow_comments]"]')
   end
 
-  describe "when id_prefix is provided" do
+  describe "when namespace is provided" do
 
     before do
       @output_buffer = ''
       mock_everything
 
-      @form = semantic_form_for(@new_post, :id_prefix => "context2") do |builder|
+      @form = semantic_form_for(@new_post, :namespace => "context2") do |builder|
         concat(builder.input(:allow_comments, :as => :boolean))
       end
     end
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index a2d8d800d..ecca3b2d0 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -362,13 +362,13 @@
     end
   end
 
-  describe "when id_prefix is provided" do
+  describe "when namespace is provided" do
 
     before do
       @output_buffer = ''
       mock_everything
 
-      @form = semantic_form_for(@fred, :id_prefix => "context2") do |builder|
+      @form = semantic_form_for(@fred, :namespace => "context2") do |builder|
         concat(builder.input(:posts, :as => :check_boxes))
       end
     end
diff --git a/spec/inputs/country_input_spec.rb b/spec/inputs/country_input_spec.rb
index 8b0e6a141..4a13b6adb 100644
--- a/spec/inputs/country_input_spec.rb
+++ b/spec/inputs/country_input_spec.rb
@@ -78,13 +78,13 @@
 
   end
 
-  describe "when id_prefix is provided" do
+  describe "when namespace is provided" do
 
     before do
       @output_buffer = ''
       mock_everything
 
-      @form = semantic_form_for(@new_post, :id_prefix => 'context2') do |builder|
+      @form = semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         builder.should_receive(:country_select).with(:country, [], {}, {:id => "context2_post_country"}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         concat(builder.input(:country, :priority_countries => []))
diff --git a/spec/inputs/date_input_spec.rb b/spec/inputs/date_input_spec.rb
index cf9a3b8f6..6248f85f4 100644
--- a/spec/inputs/date_input_spec.rb
+++ b/spec/inputs/date_input_spec.rb
@@ -57,11 +57,11 @@
     end
   end
 
-  describe "when id_prefix is provided" do
+  describe "when namespace is provided" do
 
     before do
       output_buffer.replace ''
-      @form = semantic_form_for(@new_post, :id_prefix => "context2") do |builder|
+      @form = semantic_form_for(@new_post, :namespace => "context2") do |builder|
         concat(builder.input(:publish_at, :as => :date, :order => [:year, :month, :day]))
       end
     end
diff --git a/spec/inputs/datetime_input_spec.rb b/spec/inputs/datetime_input_spec.rb
index fb6535a72..3c8b0f225 100644
--- a/spec/inputs/datetime_input_spec.rb
+++ b/spec/inputs/datetime_input_spec.rb
@@ -190,11 +190,11 @@
   #
   #end
 
-  describe "when id_prefix is provided" do
+  describe "when namespace is provided" do
 
     before do
       output_buffer.replace ''
-      @form = semantic_form_for(@new_post, :id_prefix => "context2") do |builder|
+      @form = semantic_form_for(@new_post, :namespace => "context2") do |builder|
         concat(builder.input(:created_at, :as => :datetime, :include_seconds => true))
       end
     end
diff --git a/spec/inputs/email_input_spec.rb b/spec/inputs/email_input_spec.rb
index f6d4becf8..6ade6d68f 100644
--- a/spec/inputs/email_input_spec.rb
+++ b/spec/inputs/email_input_spec.rb
@@ -27,10 +27,10 @@
 
   end
 
-  describe "when id_prefix is provided" do
+  describe "when namespace is provided" do
 
     before do
-      @form = semantic_form_for(@new_post, :id_prefix => 'context2') do |builder|
+      @form = semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         concat(builder.input(:email))
       end
     end
diff --git a/spec/inputs/file_input_spec.rb b/spec/inputs/file_input_spec.rb
index 5484fa842..b4fbe49b4 100644
--- a/spec/inputs/file_input_spec.rb
+++ b/spec/inputs/file_input_spec.rb
@@ -30,13 +30,13 @@
     output_buffer.should have_tag("form li input.myclass")
   end
 
-  describe "when id_prefix is provided" do
+  describe "when namespace is provided" do
 
     before do
       @output_buffer = ''
       mock_everything
 
-      @form = semantic_form_for(@new_post, :id_prefix => 'context2') do |builder|
+      @form = semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         concat(builder.input(:body, :as => :file))
       end
     end
diff --git a/spec/inputs/hidden_input_spec.rb b/spec/inputs/hidden_input_spec.rb
index 5a771d9ae..38fefe988 100644
--- a/spec/inputs/hidden_input_spec.rb
+++ b/spec/inputs/hidden_input_spec.rb
@@ -74,13 +74,13 @@
     output_buffer.should_not have_tag("form li ul.hints")
   end
 
-  describe "when id_prefix is provided" do
+  describe "when namespace is provided" do
 
     before do
       @output_buffer = ''
       mock_everything
 
-      @form = semantic_form_for(@new_post, :id_prefix => 'context2') do |builder|
+      @form = semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         concat(builder.input(:secret, :as => :hidden))
         concat(builder.input(:author_id, :as => :hidden, :value => 99))
         concat(builder.input(:published, :as => :hidden, :input_html => {:value => true}))
diff --git a/spec/inputs/numeric_input_spec.rb b/spec/inputs/numeric_input_spec.rb
index d7832f290..ace93ffb8 100644
--- a/spec/inputs/numeric_input_spec.rb
+++ b/spec/inputs/numeric_input_spec.rb
@@ -41,9 +41,9 @@
     it_should_have_input_with_name("project[title]")
   end
 
-  describe "when id_prefix provided" do
+  describe "when namespace provided" do
     before do
-      @form = semantic_form_for(@new_post, :id_prefix => :context2) do |builder|
+      @form = semantic_form_for(@new_post, :namespace => :context2) do |builder|
         concat(builder.input(:title, :as => :numeric))
       end
     end
diff --git a/spec/inputs/password_input_spec.rb b/spec/inputs/password_input_spec.rb
index b28b37ea9..ee348f433 100644
--- a/spec/inputs/password_input_spec.rb
+++ b/spec/inputs/password_input_spec.rb
@@ -42,10 +42,10 @@
     it_should_have_input_with_name("project[title]")
   end
 
-  describe "when id_prefix is provided" do
+  describe "when namespace is provided" do
 
     before do
-      @form = semantic_form_for(@new_post, :id_prefix => "context2") do |builder|
+      @form = semantic_form_for(@new_post, :namespace => "context2") do |builder|
         concat(builder.input(:title, :as => :password))
       end
     end
diff --git a/spec/inputs/phone_input_spec.rb b/spec/inputs/phone_input_spec.rb
index 878b67b17..bc1663839 100644
--- a/spec/inputs/phone_input_spec.rb
+++ b/spec/inputs/phone_input_spec.rb
@@ -27,10 +27,10 @@
 
   end
 
-  describe "when id_prefix is provided" do
+  describe "when namespace is provided" do
 
     before do
-      @form = semantic_form_for(@new_post, :id_prefix => "context2") do |builder|
+      @form = semantic_form_for(@new_post, :namespace => "context2") do |builder|
         concat(builder.input(:phone))
       end
     end
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index c77e888ba..adfc025f9 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -213,11 +213,11 @@
     end
   end
 
-  describe "when :id_prefix is given on form" do
+  describe "when :namespace is given on form" do
     before do
       @output_buffer = ''
       @new_post.stub!(:author_ids).and_return(nil)
-      @form = semantic_form_for(@new_post, :id_prefix => "custom_prefix") do |builder|
+      @form = semantic_form_for(@new_post, :namespace => "custom_prefix") do |builder|
         concat(builder.input(:authors, :as => :radio, :label => ''))
       end
 
diff --git a/spec/inputs/search_input_spec.rb b/spec/inputs/search_input_spec.rb
index 1dbdd7861..d3ee2cd6e 100644
--- a/spec/inputs/search_input_spec.rb
+++ b/spec/inputs/search_input_spec.rb
@@ -27,10 +27,10 @@
 
   end
 
-  describe "when id_prefix is provided" do
+  describe "when namespace is provided" do
 
     before do
-      @form = semantic_form_for(@new_post, :id_prefix => "context2") do |builder|
+      @form = semantic_form_for(@new_post, :namespace => "context2") do |builder|
         concat(builder.input(:search))
       end
     end
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 2d99286c7..9e1ac040d 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -515,9 +515,9 @@
     end
   end
 
-  describe 'when a id_prefix is provided' do
+  describe 'when a namespace is provided' do
     before do
-      @form = semantic_form_for(@freds_post, :id_prefix => 'context2') do |builder|
+      @form = semantic_form_for(@freds_post, :namespace => 'context2') do |builder|
         concat(builder.input(:authors, :as => :select))
       end
     end
diff --git a/spec/inputs/string_input_spec.rb b/spec/inputs/string_input_spec.rb
index a039521d0..21313c7ce 100644
--- a/spec/inputs/string_input_spec.rb
+++ b/spec/inputs/string_input_spec.rb
@@ -138,10 +138,10 @@ def should_have_maxlength(maxlength, options)
     end
   end
 
-  describe "when id_prefix is provided" do
+  describe "when namespace is provided" do
 
     before do
-      @form = semantic_form_for(@new_post, :id_prefix => 'context2') do |builder|
+      @form = semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         concat(builder.input(:title, :as => :string))
       end
     end
diff --git a/spec/inputs/text_input_spec.rb b/spec/inputs/text_input_spec.rb
index 8eb3b94b0..d937089bc 100644
--- a/spec/inputs/text_input_spec.rb
+++ b/spec/inputs/text_input_spec.rb
@@ -68,13 +68,13 @@
     output_buffer.should_not have_tag("form li textarea[@rows]")
   end
 
-  describe "when id_prefix is provided" do
+  describe "when namespace is provided" do
 
     before do
       @output_buffer = ''
       mock_everything
 
-      @form = semantic_form_for(@new_post, :id_prefix => 'context2') do |builder|
+      @form = semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         concat(builder.input(:body, :as => :text))
       end
     end
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index fd51e6ae7..7ad220efa 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -138,14 +138,14 @@
     end
   end
 
-  describe ':id_prefix option' do
+  describe ':namespace option' do
     before do
-      @form = semantic_form_for(@new_post, :id_prefix => 'form2') do |builder|
+      @form = semantic_form_for(@new_post, :namespace => 'form2') do |builder|
         concat(builder.input(:publish_at, :as => :time))
       end
     end
 
-    it 'should have a tag matching the id_prefix' do
+    it 'should have a tag matching the namespace' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('#form2_post_publish_at_input')
       output_buffer.should have_tag('#form2_post_publish_at_4i')
diff --git a/spec/inputs/time_zone_input_spec.rb b/spec/inputs/time_zone_input_spec.rb
index ea5ce7259..d7f55a6b0 100644
--- a/spec/inputs/time_zone_input_spec.rb
+++ b/spec/inputs/time_zone_input_spec.rb
@@ -40,13 +40,13 @@
     output_buffer.should have_tag("form li select.myclass")
   end
 
-  describe "when id_prefix is provided" do
+  describe "when namespace is provided" do
 
     before do
       @output_buffer = ''
       mock_everything
 
-      @form = semantic_form_for(@new_post, :id_prefix => 'context2') do |builder|
+      @form = semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         concat(builder.input(:time_zone))
       end
     end
diff --git a/spec/inputs/url_input_spec.rb b/spec/inputs/url_input_spec.rb
index 6b5bc0934..4323a28ce 100644
--- a/spec/inputs/url_input_spec.rb
+++ b/spec/inputs/url_input_spec.rb
@@ -27,10 +27,10 @@
 
   end
 
-  describe "when id_prefix is provided" do
+  describe "when namespace is provided" do
 
     before do
-      @form = semantic_form_for(@new_post, :id_prefix => "context2") do |builder|
+      @form = semantic_form_for(@new_post, :namespace => "context2") do |builder|
         concat(builder.input(:url))
       end
     end
diff --git a/spec/semantic_fields_for_spec.rb b/spec/semantic_fields_for_spec.rb
index 817a874e3..9cb95bc83 100644
--- a/spec/semantic_fields_for_spec.rb
+++ b/spec/semantic_fields_for_spec.rb
@@ -41,9 +41,9 @@
     # <=> output_buffer.should_not have_tag('form fieldset.inputs #post[author]_1_login_input')
   end
 
-  it 'should use id_prefix provided in nested fields' do
+  it 'should use namespace provided in nested fields' do
     @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
-    form = semantic_form_for(@new_post, :id_prefix => 'context2') do |builder|
+    form = semantic_form_for(@new_post, :namespace => 'context2') do |builder|
       concat(builder.semantic_fields_for(@bob, :index => 1) do |nested_builder|
         concat(nested_builder.inputs(:login))
       end)

From c6ad17f3d2251c01f46752a1a0811aa67fcb9685 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 26 Oct 2010 18:08:20 +1100
Subject: [PATCH 293/992] bulking up coverage for check_boxes input to ensure
 no hidden inputs are rendered inside the labels (ref GH-264)

---
 spec/inputs/check_boxes_input_spec.rb | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index ecca3b2d0..b46916c3c 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -46,7 +46,18 @@
 
     it 'should not generate hidden inputs with default value blank' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
-      output_buffer.should_not have_tag("form li fieldset ol li label input[@type='hidden'][@value='']", :count => ::Post.all.size)
+      output_buffer.should_not have_tag("form li fieldset ol li label input[@type='hidden'][@value='']")
+    end
+    
+    it 'should not render hidden inputs inside the ol' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.should_not have_tag("form li fieldset ol li input[@type='hidden']")
+      puts output_buffer
+    end
+    
+    it 'should render one hidden input for each choice outside the ol' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag("form li fieldset > input[@type='hidden']", :count => 1)
     end
 
     describe "each choice" do

From bcd3ba9a7a03b1674cab0ac3cbc0bfd9680ff4ad Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 26 Oct 2010 20:03:52 +1100
Subject: [PATCH 294/992] some README updates

---
 README.textile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.textile b/README.textile
index 807294cce..0844c327f 100644
--- a/README.textile
+++ b/README.textile
@@ -46,7 +46,7 @@ h2. It's better than _SomeOtherFormBuilder_ because...
 
 * it can handle @belongs_to@ associations (like Post belongs_to :author), rendering a select or set of radio inputs with choices from the parent model.
 * it can handle @has_many@ and @has_and_belongs_to_many@ associations (like: Post has_many :tags), rendering a multi-select with choices from the child models.
-* it's Rails 2.3-ready (including nested forms).
+* it's Rails 2.x and 3.x compatible (including nested forms).
 * it has internationalization (I18n)!
 * it's _really_ quick to get started with a basic form in place (4 lines), then go back to add in more detail if you need it.
 * there's heaps of elements, id and class attributes for you to hook in your CSS and JS.
@@ -175,7 +175,7 @@ If you want to customize the label text, or render some hint text below the fiel
   <% end %>
 </pre>
 
-Nested forms (Rails 2.3) are also supported (don't forget your models need to be setup correctly with accepts_nested_attributes_for – search the Rails docs). You can do it in the Rails way:
+Nested forms are also supported (don't forget your models need to be setup correctly with @accepts_nested_attributes_for@). You can do it in the Rails way:
 
 <pre>
   <% semantic_form_for @post do |form| %>

From d4fd954c37a9abc1bba9bd7b0ec700750132bdf7 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Tue, 26 Oct 2010 14:29:05 +0530
Subject: [PATCH 295/992] add ability to include inline errors on other keys

---
 README.textile                        |  7 +++++
 lib/formtastic.rb                     | 20 +++++++++++---
 spec/errors_spec.rb                   | 38 +++++++++++++++++++++++++++
 spec/inputs/check_boxes_input_spec.rb |  1 -
 4 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/README.textile b/README.textile
index 0844c327f..c40a619df 100644
--- a/README.textile
+++ b/README.textile
@@ -478,6 +478,13 @@ You can show errors on base (by default) and any other attribute just passing it
   <% end %>
 </pre>
 
+If you want to include inline errors on fields including the original field (for e.g. Paperclip adds errors on @:document_file_name@@ and @:document_file_size@ and @:document_content_type@ instead of @:document@), provide one or more keys with @:errors_on@ option
+
+<pre>
+  <% semantic_form_for @post do |form| %>
+    <%= form.input :document, :errors_on => [:document_file_size, :document_file_name] %>
+  <% end %>
+</pre>
 
 h2. ValidationReflection plugin
 
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index d50a67356..9ddbe4bb4 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -102,7 +102,7 @@ def input(method, options = {})
       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].blank?
+      html_class << 'error' if has_errors?(method, options)
 
       wrapper_html = options.delete(:wrapper_html) || {}
       wrapper_html[:id]  ||= generate_html_id(method)
@@ -457,9 +457,7 @@ def label(method, options_or_text=nil, options=nil)
     #
     def inline_errors_for(method, options = {}) #:nodoc:
       if render_inline_errors?
-        errors = [@object.errors[method.to_sym]]
-        errors << [@object.errors[association_primary_key(method)]] if association_macro_for_method(method) == :belongs_to
-        errors = errors.flatten.compact.uniq
+        errors = error_keys(method, options).map{|x| @object.errors[x] }.flatten.compact.uniq
         send(:"error_#{self.class.inline_errors}", [*errors], options) if errors.any?
       else
         nil
@@ -495,6 +493,20 @@ def semantic_errors(*args)
 
     protected
 
+      def error_keys(method, options)
+        @method_errors ||= begin
+          @methods_for_error = [method.to_sym]
+          @methods_for_error << [options[:errors_on]].flatten.compact.map{|x|x.to_sym}
+          @methods_for_error << [association_primary_key(method)] if association_macro_for_method(method) == :belongs_to
+          @methods_for_error = @methods_for_error.flatten.compact.uniq
+        end
+      end
+
+      def has_errors?(method, options)
+        methods_for_error = error_keys(method,options)
+        @object && @object.respond_to?(:errors) && methods_for_error.any?{|error| !@object.errors[error].blank?}
+      end
+
       def render_inline_errors?
         @object && @object.respond_to?(:errors) && INLINE_ERROR_TYPES.include?(self.class.inline_errors)
       end
diff --git a/spec/errors_spec.rb b/spec/errors_spec.rb
index 3ac5bdcfe..5f397a9bc 100644
--- a/spec/errors_spec.rb
+++ b/spec/errors_spec.rb
@@ -129,6 +129,44 @@
     end
   end
 
+  describe "when error keys are specified as options" do
+    it "should show errors on specified key" do
+      @errors.stub!(:[]).with(:document_file_name).and_return(['must be provided'])
+      @errors.stub!(:[]).with(:title).and_return([])
+      ::Formtastic::SemanticFormBuilder.inline_errors = :sentence
+      form = semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :errors_on => :document_file_name)
+      end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag('p.inline-errors', (['must be provided']).to_sentence)
+      output_buffer.should have_tag("li[@class='string optional error']")
+    end
+
+    it "should show errors on original method" do
+      @errors.stub!(:[]).with(:document_file_name).and_return(['must be provided'])
+      @errors.stub!(:[]).with(:title).and_return(@title_errors)
+      ::Formtastic::SemanticFormBuilder.inline_errors = :sentence
+      form = semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :errors_on => :document_file_name)
+      end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag('p.inline-errors', (@title_errors+['must be provided']).to_sentence)
+      output_buffer.should have_tag("li[@class='string optional error']")
+    end
+
+    it "should show errors all specified keys" do
+      @errors.stub!(:[]).with(:document_file_name).and_return(['must be provided'])
+      @errors.stub!(:[]).with(:document_content_type).and_return(['must be an image file'])
+      @errors.stub!(:[]).with(:title).and_return(@title_errors)
+      ::Formtastic::SemanticFormBuilder.inline_errors = :sentence
+      form = semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :errors_on => [:document_file_name, :document_content_type])
+      end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag('p.inline-errors', (@title_errors+['must be provided', 'must be an image file']).to_sentence)
+      output_buffer.should have_tag("li[@class='string optional error']")
+    end
+  end
 
   describe 'when there are errors on the association and column' do
 
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index b46916c3c..c62679aea 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -52,7 +52,6 @@
     it 'should not render hidden inputs inside the ol' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should_not have_tag("form li fieldset ol li input[@type='hidden']")
-      puts output_buffer
     end
     
     it 'should render one hidden input for each choice outside the ol' do

From 17929f15efa2373b739d61b407858b401607f1c7 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Tue, 26 Oct 2010 15:00:26 +0530
Subject: [PATCH 296/992] make method memoization 0.001% cleaner

---
 lib/formtastic.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 9ddbe4bb4..5e35f442b 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -494,11 +494,11 @@ def semantic_errors(*args)
     protected
 
       def error_keys(method, options)
-        @method_errors ||= begin
+        @methods_for_error ||= begin
           @methods_for_error = [method.to_sym]
           @methods_for_error << [options[:errors_on]].flatten.compact.map{|x|x.to_sym}
           @methods_for_error << [association_primary_key(method)] if association_macro_for_method(method) == :belongs_to
-          @methods_for_error = @methods_for_error.flatten.compact.uniq
+          @methods_for_error.flatten.compact.uniq
         end
       end
 

From 3d339326cc1631b8fee826effd5830f83cca2810 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Tue, 26 Oct 2010 15:08:41 +0530
Subject: [PATCH 297/992] remove bad memoization

---
 lib/formtastic.rb | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 5e35f442b..4e34b6ac8 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -494,12 +494,10 @@ def semantic_errors(*args)
     protected
 
       def error_keys(method, options)
-        @methods_for_error ||= begin
-          @methods_for_error = [method.to_sym]
-          @methods_for_error << [options[:errors_on]].flatten.compact.map{|x|x.to_sym}
-          @methods_for_error << [association_primary_key(method)] if association_macro_for_method(method) == :belongs_to
-          @methods_for_error.flatten.compact.uniq
-        end
+        methods_for_error = [method.to_sym]
+        methods_for_error << [options[:errors_on]].flatten.compact.map{|x|x.to_sym}
+        methods_for_error << [association_primary_key(method)] if association_macro_for_method(method) == :belongs_to
+        methods_for_error.flatten.compact.uniq
       end
 
       def has_errors?(method, options)

From deb9f9b6434c9d5a9bda54dd7e446d730b46f4a5 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Thu, 28 Oct 2010 15:56:01 +0530
Subject: [PATCH 298/992] automatic deduction of errors related to file type
 fields

---
 README.textile                |  7 -------
 lib/formtastic.rb             | 25 ++++++++++++++++-------
 spec/errors_spec.rb           | 37 ++++++++---------------------------
 spec/spec_helper.rb           |  7 +++++++
 spec/support/custom_macros.rb |  3 +++
 5 files changed, 36 insertions(+), 43 deletions(-)

diff --git a/README.textile b/README.textile
index c40a619df..0844c327f 100644
--- a/README.textile
+++ b/README.textile
@@ -478,13 +478,6 @@ You can show errors on base (by default) and any other attribute just passing it
   <% end %>
 </pre>
 
-If you want to include inline errors on fields including the original field (for e.g. Paperclip adds errors on @:document_file_name@@ and @:document_file_size@ and @:document_content_type@ instead of @:document@), provide one or more keys with @:errors_on@ option
-
-<pre>
-  <% semantic_form_for @post do |form| %>
-    <%= form.input :document, :errors_on => [:document_file_size, :document_file_name] %>
-  <% end %>
-</pre>
 
 h2. ValidationReflection plugin
 
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 4e34b6ac8..fb72ac1cd 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -7,7 +7,7 @@ module Formtastic #:nodoc:
 
   class SemanticFormBuilder < ActionView::Helpers::FormBuilder
     class_inheritable_accessor :default_text_field_size, :default_text_area_height, :default_text_area_width, :all_fields_required_by_default, :include_blank_for_select_by_default,
-                   :required_string, :optional_string, :inline_errors, :label_str_method, :collection_value_methods, :collection_label_methods,
+                   :required_string, :optional_string, :inline_errors, :label_str_method, :collection_value_methods, :collection_label_methods, :file_metadata_suffixes,
                    :inline_order, :custom_inline_order, :file_methods, :priority_countries, :i18n_lookups_by_default, :escape_html_entities_in_hints_and_labels,
                    :default_commit_button_accesskey, :default_inline_error_class, :default_hint_class, :default_error_list_class, :instance_reader => false
 
@@ -27,6 +27,7 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
     self.inline_order = [ :input, :hints, :errors ]
     self.custom_inline_order = {}
     self.file_methods = [ :file?, :public_filename, :filename ]
+    self.file_metadata_suffixes = ['content_type', 'file_name', 'file_size']
     self.priority_countries = ["Australia", "Canada", "United Kingdom", "United States"]
     self.i18n_lookups_by_default = false
     self.escape_html_entities_in_hints_and_labels = true
@@ -494,10 +495,13 @@ def semantic_errors(*args)
     protected
 
       def error_keys(method, options)
-        methods_for_error = [method.to_sym]
-        methods_for_error << [options[:errors_on]].flatten.compact.map{|x|x.to_sym}
-        methods_for_error << [association_primary_key(method)] if association_macro_for_method(method) == :belongs_to
-        methods_for_error.flatten.compact.uniq
+        @methods_for_error ||= {}
+        @methods_for_error[method] ||= begin
+          methods_for_error = [method.to_sym]
+          methods_for_error << self.class.file_metadata_suffixes.map{|suffix| "#{method}_#{suffix}".to_sym} if is_file?(method, options)
+          methods_for_error << [association_primary_key(method)] if association_macro_for_method(method) == :belongs_to
+          methods_for_error.flatten.compact.uniq
+        end
       end
 
       def has_errors?(method, options)
@@ -1463,8 +1467,7 @@ def default_input_type(method, options = {}) #:nodoc:
           if @object
             return :select  if self.reflection_for(method)
 
-            file = @object.send(method) if @object.respond_to?(method)
-            return :file    if file && self.class.file_methods.any? { |m| file.respond_to?(m) }
+            return :file    if is_file?(method)
           end
 
           return :select    if options.key?(:collection)
@@ -1473,6 +1476,14 @@ def default_input_type(method, options = {}) #:nodoc:
         end
       end
 
+      def is_file?(method, options = {})
+        @files ||= {}
+        @files[method] ||= (options[:as].present? && options[:as] == :file) || begin
+          file = @object.send(method) if @object && @object.respond_to?(method)
+          file && self.class.file_methods.any?{|m| file.respond_to?(m)}
+        end
+      end
+
       # Used by select and radio inputs. The collection can be retrieved by
       # three ways:
       #
diff --git a/spec/errors_spec.rb b/spec/errors_spec.rb
index 5f397a9bc..aac672653 100644
--- a/spec/errors_spec.rb
+++ b/spec/errors_spec.rb
@@ -129,42 +129,21 @@
     end
   end
 
-  describe "when error keys are specified as options" do
-    it "should show errors on specified key" do
+  describe 'when file type columns have errors' do
+    it "should list errors added on metadata fields" do
       @errors.stub!(:[]).with(:document_file_name).and_return(['must be provided'])
-      @errors.stub!(:[]).with(:title).and_return([])
-      ::Formtastic::SemanticFormBuilder.inline_errors = :sentence
-      form = semantic_form_for(@new_post) do |builder|
-        builder.input(:title, :errors_on => :document_file_name)
-      end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
-      output_buffer.should have_tag('p.inline-errors', (['must be provided']).to_sentence)
-      output_buffer.should have_tag("li[@class='string optional error']")
-    end
+      @errors.stub!(:[]).with(:document_file_size).and_return(['must be less than 4mb'])
+      @errors.stub!(:[]).with(:document_content_type).and_return(['must be an image'])
+      @errors.stub!(:[]).with(:document).and_return(nil)
 
-    it "should show errors on original method" do
-      @errors.stub!(:[]).with(:document_file_name).and_return(['must be provided'])
-      @errors.stub!(:[]).with(:title).and_return(@title_errors)
       ::Formtastic::SemanticFormBuilder.inline_errors = :sentence
       form = semantic_form_for(@new_post) do |builder|
-        builder.input(:title, :errors_on => :document_file_name)
+        builder.input(:document)
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
-      output_buffer.should have_tag('p.inline-errors', (@title_errors+['must be provided']).to_sentence)
-      output_buffer.should have_tag("li[@class='string optional error']")
-    end
 
-    it "should show errors all specified keys" do
-      @errors.stub!(:[]).with(:document_file_name).and_return(['must be provided'])
-      @errors.stub!(:[]).with(:document_content_type).and_return(['must be an image file'])
-      @errors.stub!(:[]).with(:title).and_return(@title_errors)
-      ::Formtastic::SemanticFormBuilder.inline_errors = :sentence
-      form = semantic_form_for(@new_post) do |builder|
-        builder.input(:title, :errors_on => [:document_file_name, :document_content_type])
-      end
       output_buffer.concat(form) if Formtastic::Util.rails3?
-      output_buffer.should have_tag('p.inline-errors', (@title_errors+['must be provided', 'must be an image file']).to_sentence)
-      output_buffer.should have_tag("li[@class='string optional error']")
+      output_buffer.should have_tag("li[@class='file optional error']")
+      output_buffer.should have_tag('p.inline-errors', (['must be an image','must be provided', 'must be less than 4mb']).to_sentence)
     end
   end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c2743832a..62c4ff4d4 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -235,6 +235,11 @@ def new_author_path; "/authors/new"; end
     ::Post.stub!(:persisted?).and_return(nil)
     ::Post.stub!(:to_ary)
 
+    @mock_file = mock('file')
+    ::Formtastic::SemanticFormBuilder.file_methods.each do |method|
+      @mock_file.stub!(method).and_return(true)
+    end
+
     @new_post.stub!(:title)
     @new_post.stub!(:email)
     @new_post.stub!(:url)
@@ -256,6 +261,7 @@ def new_author_path; "/authors/new"; end
     @new_post.stub!(:country)
     @new_post.stub!(:country_subdivision)
     @new_post.stub!(:country_code)
+    @new_post.stub!(:document).and_return(@mock_file)
     @new_post.stub!(:column_for_attribute).with(:meta_description).and_return(mock('column', :type => :string, :limit => 255))
     @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :string, :limit => 50))
     @new_post.stub!(:column_for_attribute).with(:body).and_return(mock('column', :type => :text))
@@ -271,6 +277,7 @@ def new_author_path; "/authors/new"; end
     @new_post.stub!(:column_for_attribute).with(:url).and_return(mock('column', :type => :string, :limit => 255))
     @new_post.stub!(:column_for_attribute).with(:phone).and_return(mock('column', :type => :string, :limit => 255))
     @new_post.stub!(:column_for_attribute).with(:search).and_return(mock('column', :type => :string, :limit => 255))
+    @new_post.stub!(:column_for_attribute).with(:document).and_return(nil)
 
     @new_post.stub!(:author).and_return(@bob)
     @new_post.stub!(:author_id).and_return(@bob.id)
diff --git a/spec/support/custom_macros.rb b/spec/support/custom_macros.rb
index 5370166c2..65e40b6d3 100644
--- a/spec/support/custom_macros.rb
+++ b/spec/support/custom_macros.rb
@@ -173,6 +173,9 @@ def it_should_apply_error_logic_for_input_type(type)
           @title_errors = ['must not be blank', 'must be longer than 10 characters', 'must be awesome']
           @errors = mock('errors')
           @errors.stub!(:[]).with(:title).and_return(@title_errors)
+          ::Formtastic::SemanticFormBuilder.file_metadata_suffixes.each do |suffix|
+            @errors.stub!(:[]).with("title_#{suffix}".to_sym).and_return(nil)
+          end
           @new_post.stub!(:errors).and_return(@errors)
         end
 

From 6d81ebec4c028755f43dd084d8adfd255d323b45 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 29 Oct 2010 07:29:07 +1100
Subject: [PATCH 299/992] fix errors_spec under Rails 2

---
 spec/errors_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/errors_spec.rb b/spec/errors_spec.rb
index aac672653..4e316efb0 100644
--- a/spec/errors_spec.rb
+++ b/spec/errors_spec.rb
@@ -138,7 +138,7 @@
 
       ::Formtastic::SemanticFormBuilder.inline_errors = :sentence
       form = semantic_form_for(@new_post) do |builder|
-        builder.input(:document)
+        concat(builder.input(:document))
       end
 
       output_buffer.concat(form) if Formtastic::Util.rails3?

From c7ea4150842939608e29dd1df6ca16d019ff3be1 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 29 Oct 2010 07:33:45 +1100
Subject: [PATCH 300/992] update error_spec to use with_config blocks, to leave
 the configiuration in a known state

---
 spec/errors_spec.rb | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/spec/errors_spec.rb b/spec/errors_spec.rb
index 4e316efb0..794c8305d 100644
--- a/spec/errors_spec.rb
+++ b/spec/errors_spec.rb
@@ -106,9 +106,10 @@
 
     it 'should return nil when inline_errors config is :sentence, :list or :none' do
       [:sentence, :list, :none].each do |config|
-        ::Formtastic::SemanticFormBuilder.inline_errors = config
-        semantic_form_for(@new_post) do |builder|
-          builder.errors_on(:title).should be_nil
+        with_config :inline_errors, config do
+          semantic_form_for(@new_post) do |builder|
+            builder.errors_on(:title).should be_nil
+          end
         end
       end
     end
@@ -136,11 +137,11 @@
       @errors.stub!(:[]).with(:document_content_type).and_return(['must be an image'])
       @errors.stub!(:[]).with(:document).and_return(nil)
 
-      ::Formtastic::SemanticFormBuilder.inline_errors = :sentence
-      form = semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:document))
-      end
-
+      with_config :inline_errors, :sentence do
+        form = semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:document))
+        end
+      end 
       output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("li[@class='file optional error']")
       output_buffer.should have_tag('p.inline-errors', (['must be an image','must be provided', 'must be less than 4mb']).to_sentence)
@@ -150,14 +151,15 @@
   describe 'when there are errors on the association and column' do
 
     it "should list all unique errors" do
-      ::Formtastic::SemanticFormBuilder.inline_errors = :list
       ::Post.stub!(:reflections).and_return({:author => mock('reflection', :options => {}, :macro => :belongs_to)})
 
       @errors.stub!(:[]).with(:author).and_return(['must not be blank'])
       @errors.stub!(:[]).with(:author_id).and_return(['is already taken', 'must not be blank']) # note the duplicate of association
 
-      form = semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:author))
+      with_config :inline_errors, :list do
+        form = semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:author))
+        end
       end
       output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("ul.errors li", /must not be blank/, :count => 1)

From a3dde489df0ede2d6b0269be660f03176b2dd2d8 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 29 Oct 2010 11:34:14 +1100
Subject: [PATCH 301/992] CHANGELOG catch-up in preparation for 1.2.0.beta

---
 CHANGELOG | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0cfadccc9..ffe2c790c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,49 @@
-1.2.0
-
-* Added custom_inline_order to allow inline ordering per input type
+1.2.0.beta
+
+* New Stuff
+
+  * Added support for Paperclip's questionable use of multiple error keys on a single attribute, so errors on Paperclip :file inputs Just Work
+  * Added ability for the error and hint class to be overridden with :hint_class and :error_class, and configurable defaults app-wide
+  * Added basic support for multiple forms in the same document by allowing the element ids to be prefixed with the :namespace option on semantic_form_for
+  * Added a fallback to Rails' helpers.label key if Formtastic label translation are not found
+  * Added support for default_text_area_width
+  * Added support for #persisted? over #new_record? (ActiveModel)
+  * Added the 'required' logic to attributes with validates_inclusion_of validation, in addition to validates_presence_of 
+  * Added new HTML5 :as => :email input (Rails 3)
+  * Added new HTML5 :as => :phone input (Rails 3)
+  * Added new HTML5 :as => :search input (Rails 3)
+  * Added new HTML5 :as => :url input (Rails 3)
+  * Added the ability for the :collection option to accept a string of HTML (like the output from grouped_options_for_select), rather than just Arrays, Hashes, collections, etc.
+  * Added the ability to set your own form class, instead of 'formtastic'
+  * Added maxlength attributes to inputs if it can be determined via the ValidationReflection plugin or ActiveModel validation reflections
+  * Added the ability to override the form class (Post => "post") through an :as option on semantic_form_for option
+  * Added the ability to customize the order for specific types of inputs. This is configured on a type basis and if a type is not found it willfall back to the default order as defined by @@inline_order
+  * Added :first as a new rendering choice for the errors on each input
+  * Added custom_inline_order to allow inline ordering per input type
+
+* Fixes 
+
+  * Fixed invalid HTML generated by Rails' hidden inputs on checkboxes (by rendering our own hidden tag in a more deliberate place)
+  * Fixed a bunch of invalid i18n key defaults
+  * Fixed that 'required' classes and logic were not being applied to :check_boxes and :radio inputs
+  * Fixed CSS bugs around Firefox's quirks with form elements that resulted in overflow/scroll bar issues
+
+* Changes
+
+  * Changed that we were defaulting to a :select input for columns ending in _id, instead of columns with an appropriate associations
+  * Deprecated a bunch of aliased method names that should no longer be used
+  * Removed deprecated :selected, :checked and :default options
+  * Changed the width styling for string, numeric, password and other basic inputs, defaults to 75% unless the size attribute is present
+  * Changed string, numeric, password and other basic inputs' default text field size config to nil instead of 50, meaning the size attribute will be ommitted from most inputs, makeing styling easier, and custom sizes with the size attribute more deliberate
+  * Changed string, numeric, password and other basic inputs to no longer add the size attribute based on column information (the default config is applied, unless it's nil)
+  * Changed text input css behaviour updated to be similar to string etc
+  * Changed text inputs to no longer include a default cols attribute, specify it with :input_html if you need it, but the value we were using was useless... also beefed up spec coverage
+  * Removed :label calls from the generated ERB in the form generator (i18n is preferred)
+  * Changed that :select inputs for HABTM associations would ignore the :include_blank option
+  * Changed the default method on collections from Model.find(:all) to Model.all
+  * Removed the deprecated formtastic_stylesheets generator
+  * Changed the minimum Rails version to 2.3.7, which the earliest version which the specs pass with
+  * Changed :password inputs to be sized by percentage (like other string-ish inputs), rather then em-based
 
 1.1.0
 

From c063c7c6ebc65c8776f5f92b0bfe04d364b5046d Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 29 Oct 2010 20:45:45 -0700
Subject: [PATCH 302/992] CHANGELOG tweak

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index ffe2c790c..77acbd979 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -27,6 +27,7 @@
   * Fixed a bunch of invalid i18n key defaults
   * Fixed that 'required' classes and logic were not being applied to :check_boxes and :radio inputs
   * Fixed CSS bugs around Firefox's quirks with form elements that resulted in overflow/scroll bar issues
+  * Fixed that errors on fields with association were not marking the wrapping tag with the error class
 
 * Changes
 

From 7f3ff54851e5bab2931b02c9a4664f81ea4a6c12 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Fri, 29 Oct 2010 13:55:20 +0800
Subject: [PATCH 303/992] ensure is_file? is passing option; redundant here but
 added for completeness

---
 lib/formtastic.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index fb72ac1cd..b2891be80 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1467,7 +1467,7 @@ def default_input_type(method, options = {}) #:nodoc:
           if @object
             return :select  if self.reflection_for(method)
 
-            return :file    if is_file?(method)
+            return :file    if is_file?(method, options)
           end
 
           return :select    if options.key?(:collection)

From 29a9fc56872e32926e826307ee406a2408ec8874 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sat, 30 Oct 2010 18:54:43 -0200
Subject: [PATCH 304/992] Move form generator templates to
 lib/generators/templates

---
 lib/generators/formtastic/form/form_generator.rb       | 10 ++++------
 .../generators/templates/_form.html.erb                |  0
 .../generators/templates/_form.html.haml               |  0
 3 files changed, 4 insertions(+), 6 deletions(-)
 rename generators/form/templates/view__form.html.erb => lib/generators/templates/_form.html.erb (100%)
 rename generators/form/templates/view__form.html.haml => lib/generators/templates/_form.html.haml (100%)

diff --git a/lib/generators/formtastic/form/form_generator.rb b/lib/generators/formtastic/form/form_generator.rb
index ea7cd6a07..e1d21cd11 100644
--- a/lib/generators/formtastic/form/form_generator.rb
+++ b/lib/generators/formtastic/form/form_generator.rb
@@ -17,18 +17,16 @@ class FormGenerator < Rails::Generators::NamedBase
     class_option :controller, :type => :string, :default => false, :group => :formtastic,
                  :desc => 'Generate for custom controller/view path - in case model and controller namespace is different, i.e. "admin/posts"'
 
-    def self.source_root
-     # Set source directory for the templates to the rails2 generator template directory
-     @source_root ||= File.expand_path(File.join('..', '..', '..', '..', 'generators', 'form', 'templates'), File.dirname(__FILE__))
-    end
+    source_root File.expand_path('../../../templates', __FILE__)
 
     def create_or_show
       @attributes = self.columns if @attributes.empty?
+
       if options[:partial]
         empty_directory "app/views/#{controller_path}"
-        template "view__form.html.#{template_type}", "app/views/#{controller_path}/_form.html.#{template_type}"
+        template "_form.html.#{template_type}", "app/views/#{controller_path}/_form.html.#{template_type}"
       else
-        template = File.read("#{self.class.source_root}/view__form.html.#{template_type}")
+        template = File.read("#{self.class.source_root}/_form.html.#{template_type}")
         erb = ERB.new(template, nil, '-')
         generated_code = erb.result(binding).strip rescue nil
 
diff --git a/generators/form/templates/view__form.html.erb b/lib/generators/templates/_form.html.erb
similarity index 100%
rename from generators/form/templates/view__form.html.erb
rename to lib/generators/templates/_form.html.erb
diff --git a/generators/form/templates/view__form.html.haml b/lib/generators/templates/_form.html.haml
similarity index 100%
rename from generators/form/templates/view__form.html.haml
rename to lib/generators/templates/_form.html.haml

From 111b25cdbab7a7c1be335c5cdf8d905f7c02c85a Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sat, 30 Oct 2010 19:00:18 -0200
Subject: [PATCH 305/992] Rails already do this

---
 lib/generators/formtastic/install/install_generator.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/generators/formtastic/install/install_generator.rb b/lib/generators/formtastic/install/install_generator.rb
index 1ee5a8420..9cd00542d 100644
--- a/lib/generators/formtastic/install/install_generator.rb
+++ b/lib/generators/formtastic/install/install_generator.rb
@@ -8,10 +8,6 @@ def self.source_root
       @source_root ||= File.expand_path(File.join('..', '..', '..', '..', 'generators', 'formtastic', 'templates'), File.dirname(__FILE__))
     end
 
-    def self.banner
-      "rails generate formtastic:install [options]"
-    end
-
     def copy_files
       empty_directory 'config/initializers'
       template        'formtastic.rb', 'config/initializers/formtastic.rb'

From 97ad72953cbe946621c02f30495fa07af44182e6 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sat, 30 Oct 2010 19:01:08 -0200
Subject: [PATCH 306/992] Move install generator templates to
 lib/generators/templates

---
 lib/generators/formtastic/install/install_generator.rb       | 5 +----
 .../formtastic => lib/generators}/templates/formtastic.css   | 0
 .../formtastic => lib/generators}/templates/formtastic.rb    | 0
 .../generators}/templates/formtastic_changes.css             | 0
 4 files changed, 1 insertion(+), 4 deletions(-)
 rename {generators/formtastic => lib/generators}/templates/formtastic.css (100%)
 rename {generators/formtastic => lib/generators}/templates/formtastic.rb (100%)
 rename {generators/formtastic => lib/generators}/templates/formtastic_changes.css (100%)

diff --git a/lib/generators/formtastic/install/install_generator.rb b/lib/generators/formtastic/install/install_generator.rb
index 9cd00542d..618022074 100644
--- a/lib/generators/formtastic/install/install_generator.rb
+++ b/lib/generators/formtastic/install/install_generator.rb
@@ -3,10 +3,7 @@ module Formtastic
   class InstallGenerator < Rails::Generators::Base
     desc "Copies formtastic.css and formtastic_changes.css to public/stylesheets/ and a config initializer to config/initializers/formtastic_config.rb"
 
-    def self.source_root
-      # Set source directory for the templates to the rails2 generator template directory
-      @source_root ||= File.expand_path(File.join('..', '..', '..', '..', 'generators', 'formtastic', 'templates'), File.dirname(__FILE__))
-    end
+    source_root File.expand_path('../../../templates', __FILE__)
 
     def copy_files
       empty_directory 'config/initializers'
diff --git a/generators/formtastic/templates/formtastic.css b/lib/generators/templates/formtastic.css
similarity index 100%
rename from generators/formtastic/templates/formtastic.css
rename to lib/generators/templates/formtastic.css
diff --git a/generators/formtastic/templates/formtastic.rb b/lib/generators/templates/formtastic.rb
similarity index 100%
rename from generators/formtastic/templates/formtastic.rb
rename to lib/generators/templates/formtastic.rb
diff --git a/generators/formtastic/templates/formtastic_changes.css b/lib/generators/templates/formtastic_changes.css
similarity index 100%
rename from generators/formtastic/templates/formtastic_changes.css
rename to lib/generators/templates/formtastic_changes.css

From 7d8302c4767c00f731dc25cfd6d5d55b6276c190 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sat, 30 Oct 2010 19:02:37 -0200
Subject: [PATCH 307/992] This don't do anything

---
 generators/formtastic/formtastic_generator.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/generators/formtastic/formtastic_generator.rb b/generators/formtastic/formtastic_generator.rb
index 663195cd4..1f9936b87 100644
--- a/generators/formtastic/formtastic_generator.rb
+++ b/generators/formtastic/formtastic_generator.rb
@@ -2,10 +2,6 @@
 
 class FormtasticGenerator < Rails::Generator::Base
 
-  def initialize(*runtime_args)
-    super
-  end
-
   def manifest
     record do |m|
       m.directory File.join('config', 'initializers')

From fd4f872f74c9b0c633eeafc76e91b6d5a6fcfab6 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sat, 30 Oct 2010 19:32:53 -0200
Subject: [PATCH 308/992] Refactor save_to_clipboard method

---
 generators/form/form_generator.rb | 30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/generators/form/form_generator.rb b/generators/form/form_generator.rb
index c37506799..7bc72b0f5 100644
--- a/generators/form/form_generator.rb
+++ b/generators/form/form_generator.rb
@@ -1,20 +1,5 @@
 # encoding: 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,
@@ -66,19 +51,20 @@ def manifest
 
   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
+        case RUBY_PLATFORM
+        when /win32/
+          require 'win32/clipboard'
           ::Win32::Clipboard.data = data
-        else # :linux/:unix
+        when /darwin/ # mac
+          `echo "#{data}" | pbcopy`
+        else # linux/unix
           `echo "#{data}" | xsel --clipboard` || `echo "#{data}" | xclip`
         end
-      rescue
+      rescue LoadError
         false
       else
         true

From d28af0c0ac55249a39781b25fe2f5423036c586b Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sat, 30 Oct 2010 19:33:09 -0200
Subject: [PATCH 309/992] Remove unnecessary spaces

---
 generators/form/form_generator.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/generators/form/form_generator.rb b/generators/form/form_generator.rb
index 7bc72b0f5..248fb7f88 100644
--- a/generators/form/form_generator.rb
+++ b/generators/form/form_generator.rb
@@ -8,12 +8,12 @@ class FormGenerator < Rails::Generator::NamedBase
   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
+  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

From b872f9dcb4f8fc737b92cb3a2653f2885aebf039 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sat, 30 Oct 2010 19:37:48 -0200
Subject: [PATCH 310/992] Rails 2 generators should be on gem

---
 formtastic.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index fb6065e7b..4d8d411cb 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.summary = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.email = %q{justin@indent.com.au}
   s.extra_rdoc_files = ["README.textile"]
-  s.files = Dir.glob("lib/**/*") + %w(MIT-LICENSE README.textile)
+  s.files = Dir.glob("generators/**/*") + Dir.glob("lib/**/*") + %w(MIT-LICENSE README.textile)
   s.homepage = %q{http://github.com/justinfrench/formtastic/tree/master}
   s.post_install_message = %q{
   ========================================================================

From 32533cddf53ba8e2dae21e305dc137aaa8ebe909 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sat, 30 Oct 2010 19:39:57 -0200
Subject: [PATCH 311/992] Fix rails 2 form generator

---
 generators/form/form_generator.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/generators/form/form_generator.rb b/generators/form/form_generator.rb
index 248fb7f88..a58b6819c 100644
--- a/generators/form/form_generator.rb
+++ b/generators/form/form_generator.rb
@@ -29,10 +29,10 @@ def manifest
         # 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}")
+        m.template "_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}"))
+        template = File.read(File.join(source_root, "_form.html.#{template_type}"))
         erb = ERB.new(template, nil, '-')
         generated_code = erb.result(binding).strip rescue nil
 
@@ -44,7 +44,7 @@ def manifest
         puts generated_code || " Nothing could be generated - model exists?"
         puts
         puts "# ---------------------------------------------------------"
-        puts " Copied to clipboard - just paste it!" if save_to_clipboard(generated_code)
+        puts "Copied to clipboard - just paste it!" if save_to_clipboard(generated_code)
       end
     end
   end
@@ -103,5 +103,9 @@ def add_options!(opt)
     def banner
       "Usage: #{$0} form ExistingModelName [--haml] [--partial]"
     end
+    
+    def source_root
+      File.expand_path('../../../lib/generators/templates', __FILE__)
+    end
 
 end

From 22d669e12cd1da345106d47da06d8ddb84510a2c Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sat, 30 Oct 2010 19:40:33 -0200
Subject: [PATCH 312/992] Fix rails 2 formtastic generator

---
 generators/formtastic/formtastic_generator.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/generators/formtastic/formtastic_generator.rb b/generators/formtastic/formtastic_generator.rb
index 1f9936b87..b06c0758f 100644
--- a/generators/formtastic/formtastic_generator.rb
+++ b/generators/formtastic/formtastic_generator.rb
@@ -18,5 +18,9 @@ def manifest
   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
+  
+  def source_root
+    File.expand_path('../../../lib/generators/templates', __FILE__)
+  end
 
 end

From b6a636f307b0c484fc8c14e4938779f2da416155 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 1 Nov 2010 16:22:18 +1100
Subject: [PATCH 313/992] fix deprecations and failures in errors spec by
 converting form to @form, avoiding block spoping issues

---
 spec/errors_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/errors_spec.rb b/spec/errors_spec.rb
index 794c8305d..ff1721f7f 100644
--- a/spec/errors_spec.rb
+++ b/spec/errors_spec.rb
@@ -138,11 +138,11 @@
       @errors.stub!(:[]).with(:document).and_return(nil)
 
       with_config :inline_errors, :sentence do
-        form = semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:document))
         end
       end 
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("li[@class='file optional error']")
       output_buffer.should have_tag('p.inline-errors', (['must be an image','must be provided', 'must be less than 4mb']).to_sentence)
     end
@@ -157,11 +157,11 @@
       @errors.stub!(:[]).with(:author_id).and_return(['is already taken', 'must not be blank']) # note the duplicate of association
 
       with_config :inline_errors, :list do
-        form = semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:author))
         end
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("ul.errors li", /must not be blank/, :count => 1)
       output_buffer.should have_tag("ul.errors li", /is already taken/, :count => 1)
     end

From e5d6b88ea25936d083f4df5b76f63f231feff9e7 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 1 Nov 2010 16:26:13 +1100
Subject: [PATCH 314/992] Fixes for scoll bars appearing in FF .check_boxes
 inputs (and each item within them). As discussed in GH-410, probably resolves
 the issue, needs browser testing.

---
 lib/generators/templates/formtastic.css | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index 63e64c00b..91540c74b 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -113,8 +113,9 @@ form.formtastic fieldset > ol > li.boolean label input { margin:0 0.5em 0 0.2em;
 /* RADIO OVERRIDES
 --------------------------------------------------------------------------------------------------*/
 form.formtastic fieldset > ol > li.radio { }
-form.formtastic fieldset > ol > li.radio fieldset ol { margin-bottom:-0.6em; }
-form.formtastic fieldset > ol > li.radio fieldset ol li { margin:0.1em 0 0.5em 0; }
+form.formtastic fieldset > ol > li.radio fieldset { overflow:visible; }
+form.formtastic fieldset > ol > li.radio fieldset ol { margin-bottom:-0.5em; }
+form.formtastic fieldset > ol > li.radio fieldset ol li { margin:0.1em 0 0.5em 0; overflow:visible; }
 form.formtastic fieldset > ol > li.radio fieldset ol li label { float:none; width:100%; }
 form.formtastic fieldset > ol > li.radio fieldset ol li label input { margin-right:0.2em; }
 
@@ -122,13 +123,13 @@ form.formtastic fieldset > ol > li.radio fieldset ol li label input { margin-rig
 /* CHECK BOXES (COLLECTION) OVERRIDES
 --------------------------------------------------------------------------------------------------*/
 form.formtastic fieldset > ol > li.check_boxes { }
-form.formtastic fieldset > ol > li.check_boxes fieldset ol { margin-bottom:-0.6em; }
-form.formtastic fieldset > ol > li.check_boxes fieldset ol li { margin:0.1em 0 0.5em 0; }
+form.formtastic fieldset > ol > li.check_boxes fieldset { overflow:visible; }
+form.formtastic fieldset > ol > li.check_boxes fieldset ol { margin-bottom:-0.5em; }
+form.formtastic fieldset > ol > li.check_boxes fieldset ol li { margin:0.1em 0 0.5em 0; overflow:visible; }
 form.formtastic fieldset > ol > li.check_boxes fieldset ol li label { float:none; width:100%; }
 form.formtastic fieldset > ol > li.check_boxes fieldset ol li label input { margin-right:0.2em; }
 
 
-
 /* DATE & TIME OVERRIDES
 --------------------------------------------------------------------------------------------------*/
 form.formtastic fieldset > ol > li.date fieldset ol li,

From 3bfb2e1cf92636faa3500b5785f064331df75e46 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 1 Nov 2010 16:55:38 +1100
Subject: [PATCH 315/992] fix Spec deprecation warning under rails 2

---
 spec/inputs/check_boxes_input_spec.rb | 254 +++++++++++++-------------
 1 file changed, 131 insertions(+), 123 deletions(-)

diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index c62679aea..2b856174f 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -9,41 +9,45 @@
     before do
       @output_buffer = ''
       mock_everything
-
+  
       @form = semantic_form_for(@fred) do |builder|
         concat(builder.input(:posts, :as => :check_boxes, :value_as_class => true))
       end
     end
-
+    
+    it 'should be true' do 
+      true.should be_true
+    end
+    
     it_should_have_input_wrapper_with_class("check_boxes")
     it_should_have_input_wrapper_with_id("author_posts_input")
     it_should_have_a_nested_fieldset
     it_should_apply_error_logic_for_input_type(:check_boxes)
     it_should_call_find_on_association_class_when_no_collection_is_provided(:check_boxes)
     it_should_use_the_collection_when_provided(:check_boxes, 'input[@type="checkbox"]')
-
+  
     it 'should generate a legend containing a label with text for the input' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li fieldset legend.label label')
       output_buffer.should have_tag('form li fieldset legend.label label', /Posts/)
     end
-
+    
     it 'should not link the label within the legend to any input' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should_not have_tag('form li fieldset legend label[@for^="author_post_ids_"]')
     end
-
+    
     it 'should generate an ordered list with a list item for each choice' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li fieldset ol')
       output_buffer.should have_tag('form li fieldset ol li input[@type=checkbox]', :count => ::Post.all.size)
     end
-
+    
     it 'should have one option with a "checked" attribute' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li input[@checked]', :count => 1)
     end
-
+    
     it 'should not generate hidden inputs with default value blank' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should_not have_tag("form li fieldset ol li label input[@type='hidden'][@value='']")
@@ -58,9 +62,9 @@
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form li fieldset > input[@type='hidden']", :count => 1)
     end
-
+    
     describe "each choice" do
-
+    
       it 'should contain a label for the radio input with a nested input and label text' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Post.all.each do |post|
@@ -68,14 +72,14 @@
           output_buffer.should have_tag("form li fieldset ol li label[@for='author_post_ids_#{post.id}']")
         end
       end
-
+    
       it 'should use values as li.class when value_as_class is true' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Post.all.each do |post|
           output_buffer.should have_tag("form li fieldset ol li.post_#{post.id} label")
         end
       end
-
+    
       it 'should have a checkbox input but no hidden field for each post' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Post.all.each do |post|
@@ -83,44 +87,44 @@
           output_buffer.should have_tag("form li fieldset ol li label input[@name='author[post_ids][]']", :count => 1)
         end
       end
-
+    
       it 'should have a hidden field with an empty array value for the collection to allow clearing of all checkboxes' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li fieldset > input[@type=hidden][@name='author[post_ids][]'][@value='']", :count => 1)
       end
-
+    
       it 'the hidden field with an empty array value should be followed by the ol' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li fieldset > input[@type=hidden][@name='author[post_ids][]'][@value=''] + ol", :count => 1)
       end
-
+    
       it 'should not have a hidden field with an empty string value for the collection' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li fieldset > input[@type=hidden][@name='author[post_ids]'][@value='']", :count => 1)
       end
-
+    
       it 'should have a checkbox and a hidden field for each post with :hidden_field => true' do
         output_buffer.replace ''
-
+    
         form = semantic_form_for(@fred) do |builder|
           concat(builder.input(:posts, :as => :check_boxes, :hidden_fields => true, :value_as_class => true))
         end
         output_buffer.concat(form) if Formtastic::Util.rails3?
-
+    
         ::Post.all.each do |post|
           output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@name='author[post_ids][]']", :count => 2)
         end
-
+    
       end
-
+    
       it "should mark input as checked if it's the the existing choice" do
         ::Post.all.include?(@fred.posts.first).should be_true
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
       end
     end
-
+  
     describe 'and no object is given' do
       before(:each) do
         output_buffer.replace ''
@@ -128,17 +132,17 @@
           concat(builder.input(:author_id, :as => :check_boxes, :collection => ::Author.all))
         end
       end
-
+    
       it 'should generate a fieldset with legend' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li fieldset legend', /Author/)
       end
-
+      
       it 'shold generate an li tag for each item in the collection' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li fieldset ol li input[@type=checkbox]', :count => ::Author.all.size)
       end
-
+      
       it 'should generate labels for each item' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Author.all.each do |author|
@@ -146,7 +150,7 @@
           output_buffer.should have_tag("form li fieldset ol li label[@for='project_author_id_#{author.id}']")
         end
       end
-
+      
       it 'should generate inputs for each item' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Author.all.each do |author|
@@ -156,75 +160,79 @@
           output_buffer.should have_tag("form li fieldset ol li label input[@name='project[author_id][]']")
         end
       end
-
+    
       it 'should html escape the label string' do
         form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:author_id, :as => :check_boxes, :collection => [["<b>Item 1</b>", 1], ["<b>Item 2</b>", 2]]))
         end
         output_buffer.concat(form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag('form li fieldset ol li label') do |label|
-          label.body.should match /&lt;b&gt;Item [12]&lt;\/b&gt;$/
-        end
+        
+        ## This should work, but it's emits deprecation warnings under Rails 2
+        ## TODO: revisit in 2.0 when we drop Rails 2. Simpler test follows.
+        #output_buffer.should have_tag('form li fieldset ol li label') do |label|
+        #  label.body.should match /&lt;b&gt;Item [12]&lt;\/b&gt;$/
+        #end
+        output_buffer.should  =~ /&lt;b&gt;Item [12]&lt;\/b&gt;/
       end
     end
-
+    
     describe 'when :hidden_fields is set to false' do
       before do
         @output_buffer = ''
         mock_everything
-
+    
         form = semantic_form_for(@fred) do |builder|
           concat(builder.input(:posts, :as => :check_boxes, :value_as_class => true, :hidden_fields => false))
         end
         output_buffer.concat(form) if Formtastic::Util.rails3?
       end
-
+    
       it 'should have a checkbox input for each post' do
         ::Post.all.each do |post|
           output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@name='author[post_ids][]']", :count => ::Post.all.length)
         end
       end
-
+    
       it "should mark input as checked if it's the the existing choice" do
         ::Post.all.include?(@fred.posts.first).should be_true
         output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
       end
-
+    
       it 'should not generate empty hidden inputs' do
         output_buffer.should_not have_tag("form li fieldset ol li label input[@type='hidden'][@value='']", :count => ::Post.all.length)
       end
     end
-
+    
     describe 'when :disabled is set' do
       before do
         @output_buffer = ''
       end
-
+    
       describe "no disabled items" do
         before do
           @new_post.stub!(:author_ids).and_return(nil)
-
+    
           @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:authors, :as => :check_boxes, :disabled => nil))
           end
         end
-
+    
         it 'should not have any disabled item(s)' do
           output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should_not have_tag("form li fieldset ol li label input[@disabled='disabled']")
         end
       end
-
+    
       describe "single disabled item" do
         before do
           @new_post.stub!(:author_ids).and_return(nil)
-
+    
           @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:authors, :as => :check_boxes, :disabled => @fred.id))
           end
         end
-
+    
         it "should have one item disabled; the specified one" do
           output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 1)
@@ -232,16 +240,16 @@
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@fred.id}']")
         end
       end
-
+    
       describe "multiple disabled items" do
         before do
           @new_post.stub!(:author_ids).and_return(nil)
-
+    
           @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:authors, :as => :check_boxes, :disabled => [@bob.id, @fred.id]))
           end
         end
-
+    
         it "should have multiple items disabled; the specified ones" do
           output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 2)
@@ -251,33 +259,33 @@
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@fred.id}']")
         end
       end
-
+    
     end
-
+    
     describe "with i18n of the legend label" do
-
+    
       before do
         ::I18n.backend.store_translations :en, :formtastic => { :labels => { :post => { :authors => "Translated!" }}}
         Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
-
+    
         @new_post.stub!(:author_ids).and_return(nil)
         @form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:authors, :as => :check_boxes))
         end
       end
-
+    
       after do
         ::I18n.backend.reload!
         Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
       end
-
+    
       it "should do foo" do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("legend.label label", /Translated/)
       end
-
+    
     end
-
+    
     describe "when :label option is set" do
       before do
         @new_post.stub!(:author_ids).and_return(nil)
@@ -285,13 +293,13 @@
           concat(builder.input(:authors, :as => :check_boxes, :label => 'The authors'))
         end
       end
-
+    
       it "should output the correct label title" do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("legend.label label", /The authors/)
       end
     end
-
+    
     describe "when :label option is false" do
       before do
         @output_buffer = ''
@@ -300,13 +308,13 @@
           concat(builder.input(:authors, :as => :check_boxes, :label => false))
         end
       end
-
+    
       it "should not output the legend" do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("legend.label")
       end
     end
-
+    
     describe "when :required option is true" do
       before do
         @new_post.stub!(:author_ids).and_return(nil)
@@ -314,79 +322,79 @@
           concat(builder.input(:authors, :as => :check_boxes, :required => true))
         end
       end
-
+    
       it "should output the correct label title" do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("legend.label label abbr")
       end
     end
-
+  
   end
-
-  describe 'for a has_and_belongs_to_many association' do
-
-    before do
-      @output_buffer = ''
-      mock_everything
-
-      @form = semantic_form_for(@freds_post) do |builder|
-        concat(builder.input(:authors, :as => :check_boxes))
-      end
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
-    end
-
-    it 'should render checkboxes' do
-      # I'm aware these two lines test the same thing
-      output_buffer.should have_tag('input[type="checkbox"]', :count => 2)
-      output_buffer.should have_tag('input[type="checkbox"]', :count => ::Author.all.size)
-    end
-
-    it 'should only select checkboxes that are present in the association' do
-      # I'm aware these two lines test the same thing
-      output_buffer.should have_tag('input[checked="checked"]', :count => 1)
-      output_buffer.should have_tag('input[checked="checked"]', :count => @freds_post.authors.size)
-    end
-
-  end
-
-  describe 'for an association when a :collection is provided' do
-    describe 'it should use the specified :value_method option' do
-      before do
-        @output_buffer = ''
-        mock_everything
-      end
-
-      it 'to set the right input value' do
-        item = mock('item')
-        item.should_not_receive(:id)
-        item.stub!(:custom_value).and_return('custom_value')
-        item.should_receive(:custom_value).exactly(3).times
-        @new_post.author.should_receive(:custom_value)
-        @form = semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:author, :as => :check_boxes, :value_method => :custom_value, :collection => [item, item, item]))
-        end
-
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag('input[@type=checkbox][@value="custom_value"]', :count => 3)
-      end
-    end
-  end
-
-  describe "when namespace is provided" do
-
-    before do
-      @output_buffer = ''
-      mock_everything
-
-      @form = semantic_form_for(@fred, :namespace => "context2") do |builder|
-        concat(builder.input(:posts, :as => :check_boxes))
-      end
-    end
-
-    it_should_have_label_for('context2_author_post_ids_19')
-    it_should_have_input_with_id('context2_author_post_ids_19')
-    it_should_have_input_wrapper_with_id("context2_author_posts_input")
-  end
-
+  
+  #describe 'for a has_and_belongs_to_many association' do
+  #
+  #  before do
+  #    @output_buffer = ''
+  #    mock_everything
+  #
+  #    @form = semantic_form_for(@freds_post) do |builder|
+  #      concat(builder.input(:authors, :as => :check_boxes))
+  #    end
+  #    output_buffer.concat(@form) if Formtastic::Util.rails3?
+  #  end
+  #
+  #  it 'should render checkboxes' do
+  #    # I'm aware these two lines test the same thing
+  #    output_buffer.should have_tag('input[type="checkbox"]', :count => 2)
+  #    output_buffer.should have_tag('input[type="checkbox"]', :count => ::Author.all.size)
+  #  end
+  #
+  #  it 'should only select checkboxes that are present in the association' do
+  #    # I'm aware these two lines test the same thing
+  #    output_buffer.should have_tag('input[checked="checked"]', :count => 1)
+  #    output_buffer.should have_tag('input[checked="checked"]', :count => @freds_post.authors.size)
+  #  end
+  #
+  #end
+  #
+  #describe 'for an association when a :collection is provided' do
+  #  describe 'it should use the specified :value_method option' do
+  #    before do
+  #      @output_buffer = ''
+  #      mock_everything
+  #    end
+  #
+  #    it 'to set the right input value' do
+  #      item = mock('item')
+  #      item.should_not_receive(:id)
+  #      item.stub!(:custom_value).and_return('custom_value')
+  #      item.should_receive(:custom_value).exactly(3).times
+  #      @new_post.author.should_receive(:custom_value)
+  #      @form = semantic_form_for(@new_post) do |builder|
+  #        concat(builder.input(:author, :as => :check_boxes, :value_method => :custom_value, :collection => [item, item, item]))
+  #      end
+  #
+  #      output_buffer.concat(@form) if Formtastic::Util.rails3?
+  #      output_buffer.should have_tag('input[@type=checkbox][@value="custom_value"]', :count => 3)
+  #    end
+  #  end
+  #end
+  #
+  #describe "when namespace is provided" do
+  #
+  #  before do
+  #    @output_buffer = ''
+  #    mock_everything
+  #
+  #    @form = semantic_form_for(@fred, :namespace => "context2") do |builder|
+  #      concat(builder.input(:posts, :as => :check_boxes))
+  #    end
+  #  end
+  #
+  #  it_should_have_label_for('context2_author_post_ids_19')
+  #  it_should_have_input_with_id('context2_author_post_ids_19')
+  #  it_should_have_input_wrapper_with_id("context2_author_posts_input")
+  #end
+  #
 end
 

From 89df25c49b1dc6de3dfed55fae385a56dd7bc923 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 1 Nov 2010 21:56:25 +1100
Subject: [PATCH 316/992] cleaning up my last commit. was I drunk?

---
 spec/inputs/check_boxes_input_spec.rb | 134 +++++++++++++-------------
 1 file changed, 65 insertions(+), 69 deletions(-)

diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 2b856174f..acb783d82 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -15,10 +15,6 @@
       end
     end
     
-    it 'should be true' do 
-      true.should be_true
-    end
-    
     it_should_have_input_wrapper_with_class("check_boxes")
     it_should_have_input_wrapper_with_id("author_posts_input")
     it_should_have_a_nested_fieldset
@@ -331,70 +327,70 @@
   
   end
   
-  #describe 'for a has_and_belongs_to_many association' do
-  #
-  #  before do
-  #    @output_buffer = ''
-  #    mock_everything
-  #
-  #    @form = semantic_form_for(@freds_post) do |builder|
-  #      concat(builder.input(:authors, :as => :check_boxes))
-  #    end
-  #    output_buffer.concat(@form) if Formtastic::Util.rails3?
-  #  end
-  #
-  #  it 'should render checkboxes' do
-  #    # I'm aware these two lines test the same thing
-  #    output_buffer.should have_tag('input[type="checkbox"]', :count => 2)
-  #    output_buffer.should have_tag('input[type="checkbox"]', :count => ::Author.all.size)
-  #  end
-  #
-  #  it 'should only select checkboxes that are present in the association' do
-  #    # I'm aware these two lines test the same thing
-  #    output_buffer.should have_tag('input[checked="checked"]', :count => 1)
-  #    output_buffer.should have_tag('input[checked="checked"]', :count => @freds_post.authors.size)
-  #  end
-  #
-  #end
-  #
-  #describe 'for an association when a :collection is provided' do
-  #  describe 'it should use the specified :value_method option' do
-  #    before do
-  #      @output_buffer = ''
-  #      mock_everything
-  #    end
-  #
-  #    it 'to set the right input value' do
-  #      item = mock('item')
-  #      item.should_not_receive(:id)
-  #      item.stub!(:custom_value).and_return('custom_value')
-  #      item.should_receive(:custom_value).exactly(3).times
-  #      @new_post.author.should_receive(:custom_value)
-  #      @form = semantic_form_for(@new_post) do |builder|
-  #        concat(builder.input(:author, :as => :check_boxes, :value_method => :custom_value, :collection => [item, item, item]))
-  #      end
-  #
-  #      output_buffer.concat(@form) if Formtastic::Util.rails3?
-  #      output_buffer.should have_tag('input[@type=checkbox][@value="custom_value"]', :count => 3)
-  #    end
-  #  end
-  #end
-  #
-  #describe "when namespace is provided" do
-  #
-  #  before do
-  #    @output_buffer = ''
-  #    mock_everything
-  #
-  #    @form = semantic_form_for(@fred, :namespace => "context2") do |builder|
-  #      concat(builder.input(:posts, :as => :check_boxes))
-  #    end
-  #  end
-  #
-  #  it_should_have_label_for('context2_author_post_ids_19')
-  #  it_should_have_input_with_id('context2_author_post_ids_19')
-  #  it_should_have_input_wrapper_with_id("context2_author_posts_input")
-  #end
-  #
+  describe 'for a has_and_belongs_to_many association' do
+  
+    before do
+      @output_buffer = ''
+      mock_everything
+  
+      @form = semantic_form_for(@freds_post) do |builder|
+        concat(builder.input(:authors, :as => :check_boxes))
+      end
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
+    end
+  
+    it 'should render checkboxes' do
+      # I'm aware these two lines test the same thing
+      output_buffer.should have_tag('input[type="checkbox"]', :count => 2)
+      output_buffer.should have_tag('input[type="checkbox"]', :count => ::Author.all.size)
+    end
+  
+    it 'should only select checkboxes that are present in the association' do
+      # I'm aware these two lines test the same thing
+      output_buffer.should have_tag('input[checked="checked"]', :count => 1)
+      output_buffer.should have_tag('input[checked="checked"]', :count => @freds_post.authors.size)
+    end
+  
+  end
+  
+  describe 'for an association when a :collection is provided' do
+    describe 'it should use the specified :value_method option' do
+      before do
+        @output_buffer = ''
+        mock_everything
+      end
+  
+      it 'to set the right input value' do
+        item = mock('item')
+        item.should_not_receive(:id)
+        item.stub!(:custom_value).and_return('custom_value')
+        item.should_receive(:custom_value).exactly(3).times
+        @new_post.author.should_receive(:custom_value)
+        @form = semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:author, :as => :check_boxes, :value_method => :custom_value, :collection => [item, item, item]))
+        end
+  
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag('input[@type=checkbox][@value="custom_value"]', :count => 3)
+      end
+    end
+  end
+  
+  describe "when namespace is provided" do
+  
+    before do
+      @output_buffer = ''
+      mock_everything
+  
+      @form = semantic_form_for(@fred, :namespace => "context2") do |builder|
+        concat(builder.input(:posts, :as => :check_boxes))
+      end
+    end
+  
+    it_should_have_label_for('context2_author_post_ids_19')
+    it_should_have_input_with_id('context2_author_post_ids_19')
+    it_should_have_input_wrapper_with_id("context2_author_posts_input")
+  end
+  
 end
 

From 9fde5cad4da73ee9f60dec3f8c6e73298097a10f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 1 Nov 2010 22:36:08 +1100
Subject: [PATCH 317/992] CHANGELOG catch-up

---
 CHANGELOG | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 77acbd979..479afb0a9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,6 +20,7 @@
   * Added the ability to customize the order for specific types of inputs. This is configured on a type basis and if a type is not found it willfall back to the default order as defined by @@inline_order
   * Added :first as a new rendering choice for the errors on each input
   * Added custom_inline_order to allow inline ordering per input type
+  * Added the ability to override the generator templates in Rails 3
 
 * Fixes 
 
@@ -28,7 +29,8 @@
   * Fixed that 'required' classes and logic were not being applied to :check_boxes and :radio inputs
   * Fixed CSS bugs around Firefox's quirks with form elements that resulted in overflow/scroll bar issues
   * Fixed that errors on fields with association were not marking the wrapping tag with the error class
-
+  * Fixed CSS where FF was displaying extra scroll bars on .check_boxes and .radio inputs (and the choices within them)
+  
 * Changes
 
   * Changed that we were defaulting to a :select input for columns ending in _id, instead of columns with an appropriate associations

From a8489e937bc3d17bad522dd1bf15bbd82616b0b8 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 1 Nov 2010 22:42:55 +1100
Subject: [PATCH 318/992] whitepace

---
 spec/inputs/check_boxes_input_spec.rb | 142 +++++++++++++-------------
 1 file changed, 71 insertions(+), 71 deletions(-)

diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index acb783d82..0a886a665 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -9,58 +9,58 @@
     before do
       @output_buffer = ''
       mock_everything
-  
+
       @form = semantic_form_for(@fred) do |builder|
         concat(builder.input(:posts, :as => :check_boxes, :value_as_class => true))
       end
     end
-    
+
     it_should_have_input_wrapper_with_class("check_boxes")
     it_should_have_input_wrapper_with_id("author_posts_input")
     it_should_have_a_nested_fieldset
     it_should_apply_error_logic_for_input_type(:check_boxes)
     it_should_call_find_on_association_class_when_no_collection_is_provided(:check_boxes)
     it_should_use_the_collection_when_provided(:check_boxes, 'input[@type="checkbox"]')
-  
+
     it 'should generate a legend containing a label with text for the input' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li fieldset legend.label label')
       output_buffer.should have_tag('form li fieldset legend.label label', /Posts/)
     end
-    
+
     it 'should not link the label within the legend to any input' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should_not have_tag('form li fieldset legend label[@for^="author_post_ids_"]')
     end
-    
+
     it 'should generate an ordered list with a list item for each choice' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li fieldset ol')
       output_buffer.should have_tag('form li fieldset ol li input[@type=checkbox]', :count => ::Post.all.size)
     end
-    
+
     it 'should have one option with a "checked" attribute' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li input[@checked]', :count => 1)
     end
-    
+
     it 'should not generate hidden inputs with default value blank' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should_not have_tag("form li fieldset ol li label input[@type='hidden'][@value='']")
     end
-    
+
     it 'should not render hidden inputs inside the ol' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should_not have_tag("form li fieldset ol li input[@type='hidden']")
     end
-    
+
     it 'should render one hidden input for each choice outside the ol' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form li fieldset > input[@type='hidden']", :count => 1)
     end
-    
+
     describe "each choice" do
-    
+
       it 'should contain a label for the radio input with a nested input and label text' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Post.all.each do |post|
@@ -68,14 +68,14 @@
           output_buffer.should have_tag("form li fieldset ol li label[@for='author_post_ids_#{post.id}']")
         end
       end
-    
+
       it 'should use values as li.class when value_as_class is true' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Post.all.each do |post|
           output_buffer.should have_tag("form li fieldset ol li.post_#{post.id} label")
         end
       end
-    
+
       it 'should have a checkbox input but no hidden field for each post' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Post.all.each do |post|
@@ -83,44 +83,44 @@
           output_buffer.should have_tag("form li fieldset ol li label input[@name='author[post_ids][]']", :count => 1)
         end
       end
-    
+
       it 'should have a hidden field with an empty array value for the collection to allow clearing of all checkboxes' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li fieldset > input[@type=hidden][@name='author[post_ids][]'][@value='']", :count => 1)
       end
-    
+
       it 'the hidden field with an empty array value should be followed by the ol' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li fieldset > input[@type=hidden][@name='author[post_ids][]'][@value=''] + ol", :count => 1)
       end
-    
+
       it 'should not have a hidden field with an empty string value for the collection' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li fieldset > input[@type=hidden][@name='author[post_ids]'][@value='']", :count => 1)
       end
-    
+
       it 'should have a checkbox and a hidden field for each post with :hidden_field => true' do
         output_buffer.replace ''
-    
+
         form = semantic_form_for(@fred) do |builder|
           concat(builder.input(:posts, :as => :check_boxes, :hidden_fields => true, :value_as_class => true))
         end
         output_buffer.concat(form) if Formtastic::Util.rails3?
-    
+
         ::Post.all.each do |post|
           output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@name='author[post_ids][]']", :count => 2)
         end
-    
+
       end
-    
+
       it "should mark input as checked if it's the the existing choice" do
         ::Post.all.include?(@fred.posts.first).should be_true
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
       end
     end
-  
+
     describe 'and no object is given' do
       before(:each) do
         output_buffer.replace ''
@@ -128,17 +128,17 @@
           concat(builder.input(:author_id, :as => :check_boxes, :collection => ::Author.all))
         end
       end
-    
+
       it 'should generate a fieldset with legend' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li fieldset legend', /Author/)
       end
-      
+
       it 'shold generate an li tag for each item in the collection' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li fieldset ol li input[@type=checkbox]', :count => ::Author.all.size)
       end
-      
+
       it 'should generate labels for each item' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Author.all.each do |author|
@@ -146,7 +146,7 @@
           output_buffer.should have_tag("form li fieldset ol li label[@for='project_author_id_#{author.id}']")
         end
       end
-      
+
       it 'should generate inputs for each item' do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Author.all.each do |author|
@@ -156,13 +156,13 @@
           output_buffer.should have_tag("form li fieldset ol li label input[@name='project[author_id][]']")
         end
       end
-    
+
       it 'should html escape the label string' do
         form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:author_id, :as => :check_boxes, :collection => [["<b>Item 1</b>", 1], ["<b>Item 2</b>", 2]]))
         end
         output_buffer.concat(form) if Formtastic::Util.rails3?
-        
+
         ## This should work, but it's emits deprecation warnings under Rails 2
         ## TODO: revisit in 2.0 when we drop Rails 2. Simpler test follows.
         #output_buffer.should have_tag('form li fieldset ol li label') do |label|
@@ -171,64 +171,64 @@
         output_buffer.should  =~ /&lt;b&gt;Item [12]&lt;\/b&gt;/
       end
     end
-    
+
     describe 'when :hidden_fields is set to false' do
       before do
         @output_buffer = ''
         mock_everything
-    
+
         form = semantic_form_for(@fred) do |builder|
           concat(builder.input(:posts, :as => :check_boxes, :value_as_class => true, :hidden_fields => false))
         end
         output_buffer.concat(form) if Formtastic::Util.rails3?
       end
-    
+
       it 'should have a checkbox input for each post' do
         ::Post.all.each do |post|
           output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@name='author[post_ids][]']", :count => ::Post.all.length)
         end
       end
-    
+
       it "should mark input as checked if it's the the existing choice" do
         ::Post.all.include?(@fred.posts.first).should be_true
         output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
       end
-    
+
       it 'should not generate empty hidden inputs' do
         output_buffer.should_not have_tag("form li fieldset ol li label input[@type='hidden'][@value='']", :count => ::Post.all.length)
       end
     end
-    
+
     describe 'when :disabled is set' do
       before do
         @output_buffer = ''
       end
-    
+
       describe "no disabled items" do
         before do
           @new_post.stub!(:author_ids).and_return(nil)
-    
+
           @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:authors, :as => :check_boxes, :disabled => nil))
           end
         end
-    
+
         it 'should not have any disabled item(s)' do
           output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should_not have_tag("form li fieldset ol li label input[@disabled='disabled']")
         end
       end
-    
+
       describe "single disabled item" do
         before do
           @new_post.stub!(:author_ids).and_return(nil)
-    
+
           @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:authors, :as => :check_boxes, :disabled => @fred.id))
           end
         end
-    
+
         it "should have one item disabled; the specified one" do
           output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 1)
@@ -236,16 +236,16 @@
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@fred.id}']")
         end
       end
-    
+
       describe "multiple disabled items" do
         before do
           @new_post.stub!(:author_ids).and_return(nil)
-    
+
           @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:authors, :as => :check_boxes, :disabled => [@bob.id, @fred.id]))
           end
         end
-    
+
         it "should have multiple items disabled; the specified ones" do
           output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 2)
@@ -255,33 +255,33 @@
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@fred.id}']")
         end
       end
-    
+
     end
-    
+
     describe "with i18n of the legend label" do
-    
+
       before do
         ::I18n.backend.store_translations :en, :formtastic => { :labels => { :post => { :authors => "Translated!" }}}
         Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
-    
+
         @new_post.stub!(:author_ids).and_return(nil)
         @form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:authors, :as => :check_boxes))
         end
       end
-    
+
       after do
         ::I18n.backend.reload!
         Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
       end
-    
+
       it "should do foo" do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("legend.label label", /Translated/)
       end
-    
+
     end
-    
+
     describe "when :label option is set" do
       before do
         @new_post.stub!(:author_ids).and_return(nil)
@@ -289,13 +289,13 @@
           concat(builder.input(:authors, :as => :check_boxes, :label => 'The authors'))
         end
       end
-    
+
       it "should output the correct label title" do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("legend.label label", /The authors/)
       end
     end
-    
+
     describe "when :label option is false" do
       before do
         @output_buffer = ''
@@ -304,13 +304,13 @@
           concat(builder.input(:authors, :as => :check_boxes, :label => false))
         end
       end
-    
+
       it "should not output the legend" do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("legend.label")
       end
     end
-    
+
     describe "when :required option is true" do
       before do
         @new_post.stub!(:author_ids).and_return(nil)
@@ -318,48 +318,48 @@
           concat(builder.input(:authors, :as => :check_boxes, :required => true))
         end
       end
-    
+
       it "should output the correct label title" do
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("legend.label label abbr")
       end
     end
-  
+
   end
-  
+
   describe 'for a has_and_belongs_to_many association' do
-  
+
     before do
       @output_buffer = ''
       mock_everything
-  
+
       @form = semantic_form_for(@freds_post) do |builder|
         concat(builder.input(:authors, :as => :check_boxes))
       end
       output_buffer.concat(@form) if Formtastic::Util.rails3?
     end
-  
+
     it 'should render checkboxes' do
       # I'm aware these two lines test the same thing
       output_buffer.should have_tag('input[type="checkbox"]', :count => 2)
       output_buffer.should have_tag('input[type="checkbox"]', :count => ::Author.all.size)
     end
-  
+
     it 'should only select checkboxes that are present in the association' do
       # I'm aware these two lines test the same thing
       output_buffer.should have_tag('input[checked="checked"]', :count => 1)
       output_buffer.should have_tag('input[checked="checked"]', :count => @freds_post.authors.size)
     end
-  
+
   end
-  
+
   describe 'for an association when a :collection is provided' do
     describe 'it should use the specified :value_method option' do
       before do
         @output_buffer = ''
         mock_everything
       end
-  
+
       it 'to set the right input value' do
         item = mock('item')
         item.should_not_receive(:id)
@@ -369,28 +369,28 @@
         @form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:author, :as => :check_boxes, :value_method => :custom_value, :collection => [item, item, item]))
         end
-  
+
         output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('input[@type=checkbox][@value="custom_value"]', :count => 3)
       end
     end
   end
-  
+
   describe "when namespace is provided" do
-  
+
     before do
       @output_buffer = ''
       mock_everything
-  
+
       @form = semantic_form_for(@fred, :namespace => "context2") do |builder|
         concat(builder.input(:posts, :as => :check_boxes))
       end
     end
-  
+
     it_should_have_label_for('context2_author_post_ids_19')
     it_should_have_input_with_id('context2_author_post_ids_19')
     it_should_have_input_wrapper_with_id("context2_author_posts_input")
   end
-  
+
 end
 

From 8d5fdc88b4d03cb63a8cad22b08d2a70e6c80dcd Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 1 Nov 2010 22:46:07 +1100
Subject: [PATCH 319/992] bumped to 1.2.0.beta, new gemspec

---
 formtastic.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 4d8d411cb..357d66e33 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formtastic}
-  s.version = "1.1.0"
+  s.version = "1.2.0.beta"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin French"]

From 28bb57f33b59aaca9bccd66d59ae3cedf685531b Mon Sep 17 00:00:00 2001
From: Robert Pankowecki <robert.pankowecki@gmail.com>
Date: Tue, 2 Nov 2010 14:15:56 -0700
Subject: [PATCH 320/992] Resolves
 http://github.com/justinfrench/formtastic/issues/#issue/409

---
 README.textile | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/README.textile b/README.textile
index a620af903..e5f00e158 100644
--- a/README.textile
+++ b/README.textile
@@ -517,7 +517,24 @@ If you want to add your own input types to encapsulate your own logic or interfa
 
 @Formtastic::SemanticFormHelper.builder = MyCustomBuilder@
 
+Be aware that you should either set the options on custom builder or require it after setting options on formtastic default builder.
 
+<pre>
+# OK
+Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
+require 'formtastic/my_custom_builder'
+Formtastic::SemanticFormHelper.builder = Formtastic::MyCustomBuilder
+
+# OK
+require 'formtastic/my_custom_builder'
+Formtastic::SemanticFormHelper.builder = Formtastic::MyCustomBuilder
+Formtastic::ExtendedFormBuilder.i18n_lookups_by_default = true
+
+# WRONG!
+require 'formtastic/my_custom_builder'
+Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
+Formtastic::SemanticFormHelper.builder = Formtastic::MyCustomBuilder
+</pre>
 
 
 h2. Status

From 3d328526493e32f94e4d59ce882bbeb58216f0ab Mon Sep 17 00:00:00 2001
From: Robert Pankowecki <robert.pankowecki@gmail.com>
Date: Tue, 2 Nov 2010 14:17:21 -0700
Subject: [PATCH 321/992] Doc fix

---
 README.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.textile b/README.textile
index e5f00e158..432f57056 100644
--- a/README.textile
+++ b/README.textile
@@ -528,7 +528,7 @@ Formtastic::SemanticFormHelper.builder = Formtastic::MyCustomBuilder
 # OK
 require 'formtastic/my_custom_builder'
 Formtastic::SemanticFormHelper.builder = Formtastic::MyCustomBuilder
-Formtastic::ExtendedFormBuilder.i18n_lookups_by_default = true
+Formtastic::MyCustomBuilder.i18n_lookups_by_default = true
 
 # WRONG!
 require 'formtastic/my_custom_builder'

From 5018ed04d820f0ac414f61b42749e2a69c042e7e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 5 Nov 2010 11:35:54 +1100
Subject: [PATCH 322/992] clarified the differences in Rails 2 and 3 ERB
 blocks, and some other stuff

---
 README.textile | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/README.textile b/README.textile
index e6ad9e7d1..12a16d85f 100644
--- a/README.textile
+++ b/README.textile
@@ -115,6 +115,30 @@ A proof-of-concept stylesheet is provided which you can include in your layout.
 </pre>
 
 
+h2. Syntax
+
+*Please note:* Formtastic makes use of a lot of ERB blocks and currently supports both Rails 2 and Rails 3, which means the syntax in these examples will differ depending on which version of Rails you're using.
+
+The difference is subtle, with most blocks in Rails 3 requiring the addition of an equals sign:
+
+<pre>
+  <!-- Rails 2 -->
+  <% semantic_form_for @user do |form| %>
+    <% form.inputs do %>
+      ...
+    <% end %>
+  <% end %>
+  
+  <!-- Rails 3 -->
+  <%= semantic_form_for @user do |form| %>
+    <%= form.inputs do %>
+      ...
+    <% end %>
+  <% end %>
+  
+This README is currently documenting the Rails 2 way only. If you're using Rails 3 and your forms aren't rendering everything as expected, try changing @<%@ to @<%=@.
+
+
 h2. Usage
 
 Forms are really boring to code... you want to get onto the good stuff as fast as possible.
@@ -128,7 +152,9 @@ This renders a set of inputs (one for _most_ columns in the database table, and
   <% end %>
 </pre>
 
-If you want to specify the order of the fields, skip some of the fields or even add in fields that Formtastic couldn't detect, you can pass in a list of field names to @inputs@ and list of button names to @buttons@:
+This is a great way to get something up fast, but like scaffolding, it's not recommended for production.
+
+You probably want to specify the order of the fields, skip some of the fields or even add in fields that Formtastic couldn't detect, you can pass in a list of field names to @inputs@ and list of button names to @buttons@:
 
 <pre>
   <% semantic_form_for @user do |form| %>
@@ -137,7 +163,7 @@ If you want to specify the order of the fields, skip some of the fields or even
   <% end %>
 </pre>
 
-If you want control over the input type Formtastic uses for each field, you can expand the @inputs@ and @buttons@ blocks. This specifies the @:section@ input should be a set of radio buttons (rather than the default select box), and that the @:created_at@ field should be a string (rather than the default datetime selects):
+You probably want control over the input type Formtastic uses for each field, you can expand the @inputs@ and @buttons@ blocks. This specifies the @:section@ input should be a set of radio buttons (rather than the default select box), and that the @:created_at@ field should be a string (rather than the default datetime selects):
 
 <pre>
   <% semantic_form_for @post do |form| %>

From f53d440147b71e50440319f5ad45c0fb507a2946 Mon Sep 17 00:00:00 2001
From: David Backeus <duztdruid@gmail.com>
Date: Fri, 5 Nov 2010 13:31:23 +0100
Subject: [PATCH 323/992] Add hpricot as development dependency.

---
 formtastic.gemspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 357d66e33..75fe26da7 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -41,5 +41,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<rails>, [">= 3.0.0"])
   s.add_development_dependency(%q<rspec-rails>, ["~> 2.0.0"])
   s.add_development_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
+  s.add_development_dependency(%q<hpricot>, ["~> 0.8.3"])
 
 end

From da1fe0ed33a89a28df2d09e6d49ee3959044d355 Mon Sep 17 00:00:00 2001
From: David Backeus <duztdruid@gmail.com>
Date: Fri, 5 Nov 2010 13:32:17 +0100
Subject: [PATCH 324/992] Have I18n load default values from en.yml file.

---
 lib/formtastic/i18n.rb | 8 +-------
 lib/locale/en.yml      | 7 +++----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/lib/formtastic/i18n.rb b/lib/formtastic/i18n.rb
index a1834720f..d12ef44b7 100644
--- a/lib/formtastic/i18n.rb
+++ b/lib/formtastic/i18n.rb
@@ -4,13 +4,7 @@ module Formtastic
   module I18n
 
     DEFAULT_SCOPE = [:formtastic].freeze
-    DEFAULT_VALUES = {
-        :required       => 'required',
-        :yes            => 'Yes',
-        :no             => 'No',
-        :create         => 'Create %{model}',
-        :update         => 'Update %{model}'
-      }.freeze
+    DEFAULT_VALUES = YAML.load_file(File.expand_path("../../locale/en.yml", __FILE__))["en"]["formtastic"].freeze
     SCOPES = [
         '%{model}.%{nested_model}.%{action}.%{attribute}',
         '%{model}.%{action}.%{attribute}',
diff --git a/lib/locale/en.yml b/lib/locale/en.yml
index cea06a09d..147db7692 100644
--- a/lib/locale/en.yml
+++ b/lib/locale/en.yml
@@ -2,7 +2,6 @@ en:
   formtastic:
     :yes: 'Yes'
     :no: 'No'
-    create: 'Create'
-    save: 'Save'
-    submit: 'Submit'
-    required: 'Required'
+    :create: 'Create %{model}'
+    :update: 'Update %{model}'
+    :required: 'required'

From 4b1ba5f42cb7a7c7a288dfeffebb3fe016f08f68 Mon Sep 17 00:00:00 2001
From: David Backeus <duztdruid@gmail.com>
Date: Fri, 5 Nov 2010 13:33:22 +0100
Subject: [PATCH 325/992] Updated expected commit_button text in README.

---
 README.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.textile b/README.textile
index 12a16d85f..e9907a0d4 100644
--- a/README.textile
+++ b/README.textile
@@ -454,7 +454,7 @@ If I18n-lookups is disabled, i.e.:
       <%= form.input :section, :label => true %>    # => :label => I18n.t('activerecord.attributes.user.section')  or 'Section'
     <% end %>
     <% form.buttons do %>
-      <%= form.commit_button true %>                # => "Save changes" (if we are in edit that is...)
+      <%= form.commit_button true %>                # => "Update %{model}" (if we are in edit that is...)
     <% end %>
   <% end %>
 </pre>

From eed0029b03e47a47762c5bc7bfda0641c768876d Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 9 Nov 2010 06:39:01 +1100
Subject: [PATCH 326/992] Added :wrapper_html option functionality to
 commit_button().

Deprecated the more succinct, but ultimately more suprising functionality that allowed the :class option to be passed down to the button wrapper.
---
 lib/formtastic.rb          | 10 ++++--
 spec/commit_button_spec.rb | 71 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index b2891be80..5faa93e29 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -340,7 +340,9 @@ def button_field_set(*args, &block)
     #
     def commit_button(*args)
       options = args.extract_options!
+      ::ActiveSupport::Deprecation.warn(":class => 'whatever' is deprecated on commit button, use :wrapper_html => { :class => 'whatever' } instead.", caller) if options.key?(:class)
       text = options.delete(:label) || args.shift
+      
 
       if @object && (@object.respond_to?(:persisted?) || @object.respond_to?(:new_record?))
         if @object.respond_to?(:persisted?) # ActiveModel
@@ -371,10 +373,14 @@ def commit_button(*args)
 
       button_html = options.delete(:button_html) || {}
       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.
+
+      wrapper_html_class = ['commit', options.delete(:class)].compact # TODO: Add class reflecting on form action.
+      wrapper_html = options.delete(:wrapper_html) || {}
+      wrapper_html[:class] = (wrapper_html_class << wrapper_html[:class] << button_html[:class]).flatten.compact.join(' ')
+
       accesskey = (options.delete(:accesskey) || self.class.default_commit_button_accesskey) unless button_html.has_key?(:accesskey)
       button_html = button_html.merge(:accesskey => accesskey) if accesskey
-      template.content_tag(:li, Formtastic::Util.html_safe(self.submit(text, button_html)), :class => element_class)
+      template.content_tag(:li, Formtastic::Util.html_safe(self.submit(text, button_html)), wrapper_html)
     end
 
     # A thin wrapper around #fields_for to set :builder => Formtastic::SemanticFormBuilder
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index f7a81bb1c..6948fc82c 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -434,5 +434,76 @@ def self.human_name
     end
 
   end
+  
+  describe ':wrapper_html option' do
 
+    describe 'when provided' do
+      it 'should be passed down to the li tag' do
+        form = semantic_form_for(@new_post) do |builder|
+          concat(builder.commit_button('text', :wrapper_html => {:id => :another_id}))
+        end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag("form li#another_id")
+      end
+
+      it 'should append given classes to li default classes' do
+        form = semantic_form_for(@new_post) do |builder|
+          concat(builder.commit_button('text', :wrapper_html => {:class => :another_class}))
+        end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag("form li.commit")
+        output_buffer.should have_tag("form li.another_class")
+      end
+
+      it 'should allow classes to be an array' do
+        form = semantic_form_for(@new_post) do |builder|
+          concat(builder.commit_button('text', :wrapper_html => {:class => [ :my_class, :another_class ]}))
+        end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag("form li.commit")
+        output_buffer.should have_tag("form li.my_class")
+        output_buffer.should have_tag("form li.another_class")
+      end
+      
+      it 'should merge in classes applied using the :class option' do
+        with_deprecation_silenced do
+          form = semantic_form_for(@new_post) do |builder|
+            concat(builder.commit_button('text', :class => 'from_button_html', :wrapper_html => {:class => 'from_wrapper_html'}))
+          end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.should have_tag("form li.commit")
+          output_buffer.should have_tag("form li.from_button_html")
+          output_buffer.should have_tag("form li.from_wrapper_html")
+        end
+      end
+      
+      it 'should warn that :class is a deprecated option' do
+        with_deprecation_silenced do
+          ::ActiveSupport::Deprecation.should_receive(:warn).any_number_of_times
+          @form = semantic_form_for(@new_post) do |builder|
+            concat(builder.commit_button('text', :class => 'from_button_html', :wrapper_html => {:class => 'from_wrapper_html'}))
+          end
+        end
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag("form li.commit")
+        output_buffer.should have_tag("form li.from_button_html")
+        output_buffer.should have_tag("form li.from_wrapper_html")
+      end
+    end
+
+    describe 'when not provided' do
+      it 'should use default id and class' do
+        form = semantic_form_for(@new_post) do |builder|
+          concat(builder.commit_button('text'))
+        end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag("form li.commit")
+      end
+    end
+
+  end
+
+  
+  
+  
 end

From 6642d5a8b325d2b81e3bb7b258d93cf0d182eb7f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 9 Nov 2010 06:43:57 +1100
Subject: [PATCH 327/992] CHANGLEOG catch-up

---
 CHANGELOG | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 479afb0a9..f48bc2c50 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+1.2.0.beta2
+
+* Added :wrapper_html functionality to commit_button() to match what input() does
+* Deprecated the :class option on commit_button(), use :wrapper_html instead
+* Added hpricot as missing development dependency
+* Improved documentation
+
 1.2.0.beta
 
 * New Stuff

From 3ed3c08cb17acfc6c847b372ab337abf12c0a489 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 9 Nov 2010 06:50:33 +1100
Subject: [PATCH 328/992] new gemspec

---
 formtastic.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 75fe26da7..0a62e7d25 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formtastic}
-  s.version = "1.2.0.beta"
+  s.version = "1.2.0.beta2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin French"]

From 90282e3f5bc6761297c06eb4bca460c1eaf3253f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 9 Nov 2010 06:59:07 +1100
Subject: [PATCH 329/992] added twitter account to the readme

---
 README.textile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.textile b/README.textile
index e9907a0d4..8d39e1125 100644
--- a/README.textile
+++ b/README.textile
@@ -642,10 +642,12 @@ Formtastic is maintained by "Justin French":http://github.com/justinfrench, "Mor
 @git shortlog -n -s --no-merges@
 
 
-h2. Google Group
+h2. Google Group, Twitter, etc
 
 Please join the "Formtastic Google Group":http://groups.google.com.au/group/formtastic, especially if you'd like to talk about a new feature, or report a bug.
 
+You can also "follow @formtastic on Twitter":http://twitter.com/formtastic for announcements, tutorials and awesome Formtastic links.
+
 
 h2. Project Info
 

From 4033f27052a49013c6175fe0d155fde5adf9478a Mon Sep 17 00:00:00 2001
From: Nathan Long <nathanmlong@gmail.com>
Date: Thu, 11 Nov 2010 10:51:45 +0800
Subject: [PATCH 330/992] Small addition to documentation

---
 README.textile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.textile b/README.textile
index 8d39e1125..db0643e56 100644
--- a/README.textile
+++ b/README.textile
@@ -201,6 +201,12 @@ If you want to customize the label text, or render some hint text below the fiel
   <% end %>
 </pre>
 
+You can create forms for nested resources:
+
+<pre>
+	<% semantic_form_for [@author, @post] do |form| %>
+</pre>
+
 Nested forms are also supported (don't forget your models need to be setup correctly with @accepts_nested_attributes_for@). You can do it in the Rails way:
 
 <pre>

From 0a0ef7226fc9e1cc2da60bf9d9a0a7cbd2d6c1e3 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 13 Nov 2010 15:03:20 +1100
Subject: [PATCH 331/992] change default_text_area_width to nil, like
 default_text_field_size, missed this before when we re-jigged the input
 widths/css

---
 lib/formtastic.rb                      | 2 +-
 lib/generators/templates/formtastic.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 5faa93e29..32beaa58a 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -15,7 +15,7 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
 
     self.default_text_field_size = nil
     self.default_text_area_height = 20
-    self.default_text_area_width = 50
+    self.default_text_area_width = nil
     self.all_fields_required_by_default = true
     self.include_blank_for_select_by_default = true
     self.required_string = proc { ::Formtastic::Util.html_safe(%{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>}) }
diff --git a/lib/generators/templates/formtastic.rb b/lib/generators/templates/formtastic.rb
index 2b937e423..50bedbcbc 100644
--- a/lib/generators/templates/formtastic.rb
+++ b/lib/generators/templates/formtastic.rb
@@ -6,8 +6,8 @@
 # Set the default text area height when input is a text. Default is 20.
 # Formtastic::SemanticFormBuilder.default_text_area_height = 5
 
-# Set the default text area width when input is a text. Default is 50.
-# Formtastic::SemanticFormBuilder.default_text_area_width = 10
+# Set the default text area width when input is a text. Default is nil.
+# Formtastic::SemanticFormBuilder.default_text_area_width = 50
 
 # Should all fields be considered "required" by default?
 # Rails 2 only, ignored by Rails 3 because it will never fall back to this default.

From b5e9ada78312997e38e633fc36fccfc1aec1d12a Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 13 Nov 2010 17:12:45 +1100
Subject: [PATCH 332/992] CHANGELOG update

---
 CHANGELOG | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index f48bc2c50..93d6bbb47 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+1.2.0
+
+* Changed default_text_area_width to nil, overlooked in recent CSS/width changes
+* Improved documentation
+
 1.2.0.beta2
 
 * Added :wrapper_html functionality to commit_button() to match what input() does

From b73dc40855d98dd6e539e733c22b35d67e617fe2 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 13 Nov 2010 17:13:52 +1100
Subject: [PATCH 333/992] version nump to 1.2.0

---
 formtastic.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 0a62e7d25..6e9d3207e 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formtastic}
-  s.version = "1.2.0.beta2"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin French"]

From ec8b9283b562f7c808c4289d33266f79cf789386 Mon Sep 17 00:00:00 2001
From: Evgeny Lapin <lev@openteam.ru>
Date: Sat, 13 Nov 2010 18:10:22 +0600
Subject: [PATCH 334/992] generate valid field_id for boolean_input

---
 lib/formtastic.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 32beaa58a..6d7df2ca5 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -342,7 +342,7 @@ def commit_button(*args)
       options = args.extract_options!
       ::ActiveSupport::Deprecation.warn(":class => 'whatever' is deprecated on commit button, use :wrapper_html => { :class => 'whatever' } instead.", caller) if options.key?(:class)
       text = options.delete(:label) || args.shift
-      
+
 
       if @object && (@object.respond_to?(:persisted?) || @object.respond_to?(:new_record?))
         if @object.respond_to?(:persisted?) # ActiveModel
@@ -1276,11 +1276,11 @@ def boolean_input(method, options)
 
         #input = self.check_box(method, strip_formtastic_options(options).merge(html_options),
         #                       checked_value, unchecked_value)
-        field_id = [@@custom_namespace,@object_name,method].reject{|x|x.blank?}.join("_")
+        field_id = generate_html_id(method, "")
         input = template.check_box_tag(
-          "#{@object_name}[#{method}]", 
-          checked_value, 
-          (@object && @object.send(:"#{method}") == checked_value), 
+          "#{@object_name}[#{method}]",
+          checked_value,
+          (@object && @object.send(:"#{method}") == checked_value),
           :id => field_id
         )
         options = options_for_label(options)
@@ -1965,3 +1965,4 @@ def semantic_#{meth}(record_or_name_or_array, *args, &proc)
 
   end
 end
+

From 77ae6ad2f522d60e23625be51e795c8d9918ff74 Mon Sep 17 00:00:00 2001
From: Larry Sprock <larry@lucidbleu.com>
Date: Sun, 14 Nov 2010 08:02:18 +0800
Subject: [PATCH 335/992] [Fix] Input boolean checked values do not reflect
 database values

---
 lib/formtastic.rb                 | 3 ++-
 spec/inputs/boolean_input_spec.rb | 9 +++++++++
 spec/spec_helper.rb               | 2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 32beaa58a..29562aa1c 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1280,9 +1280,10 @@ def boolean_input(method, options)
         input = template.check_box_tag(
           "#{@object_name}[#{method}]", 
           checked_value, 
-          (@object && @object.send(:"#{method}") == checked_value), 
+          (@object && @object.send(:"#{method}")), 
           :id => field_id
         )
+        
         options = options_for_label(options)
         options[:for] ||= field_id
 
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index b17f15ef5..5e892af8d 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -36,6 +36,15 @@
     output_buffer.should have_tag('form li label input[@name="post[allow_comments]"]')
     output_buffer.should have_tag('form li label input[@type="checkbox"][@value="1"]')
   end
+  
+  it 'should generate a checked checkbox input if object and object.method is true' do
+    form = semantic_form_for(@new_post) do |builder|
+      concat(builder.input(:allow_comments, :as => :boolean))
+    end
+
+    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.should have_tag('form li label input[@checked="checked"]')
+  end
 
   it 'should allow checked and unchecked values to be sent' do
     form = semantic_form_for(@new_post) do |builder|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 62c4ff4d4..947577f59 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -257,7 +257,7 @@ def new_author_path; "/authors/new"; end
     @new_post.stub!(:phone)
     @new_post.stub!(:time_zone)
     @new_post.stub!(:category_name)
-    @new_post.stub!(:allow_comments)
+    @new_post.stub!(:allow_comments).and_return(true)
     @new_post.stub!(:country)
     @new_post.stub!(:country_subdivision)
     @new_post.stub!(:country_code)

From 05c209ba57a2a7b3d745ebf859c79598ab474302 Mon Sep 17 00:00:00 2001
From: Larry Sprock <larry@lucidbleu.com>
Date: Sun, 14 Nov 2010 08:32:31 +0800
Subject: [PATCH 336/992] [Fix] Boolean input will not update database column
 to false if unchecked

---
 lib/formtastic.rb                 |  2 +-
 spec/inputs/boolean_input_spec.rb | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 29562aa1c..4dc1440a4 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1290,7 +1290,7 @@ def boolean_input(method, options)
         # the label() method will insert this nested input into the label at the last minute
         options[:label_prefix_for_nested_input] = input
 
-        template.hidden_field_tag(method, unchecked_value) << self.label(method, options)
+        template.hidden_field_tag("#{@object_name}[#{method}]", unchecked_value, :id => nil) << self.label(method, options)
       end
 
       # Generates an input for the given method using the type supplied with :as.
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index 5e892af8d..cf6ca8ba4 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -45,6 +45,16 @@
     output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should have_tag('form li label input[@checked="checked"]')
   end
+  
+  it 'should generate a checked checkbox input if object and object.method is true' do
+    form = semantic_form_for(@new_post) do |builder|
+      concat(builder.input(:allow_comments, :as => :boolean))
+    end
+
+    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.should have_tag('form li input[@name="post[allow_comments]"]', :count => 2)
+    output_buffer.should have_tag('form li input#post_allow_comments', :count => 1)
+  end
 
   it 'should allow checked and unchecked values to be sent' do
     form = semantic_form_for(@new_post) do |builder|

From 1e80a659a09143177fa1f8ce9b6a1e5c7ae106d9 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 14 Nov 2010 17:19:19 +1100
Subject: [PATCH 337/992] changelog catch-up

---
 CHANGELOG | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 93d6bbb47..3774dedf7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+1.2.1
+
+* Fixed that unchecking :boolean inputs would not send the correct params (and not persist the change the the DB)
+* Fixed that :boolean inputs checked state was not reflecting the database/model value
+
 1.2.0
 
 * Changed default_text_area_width to nil, overlooked in recent CSS/width changes

From 4490068323940bfc547ab6b70bedffc830f784b0 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 16 Nov 2010 20:22:48 +1100
Subject: [PATCH 338/992] added init.rb and rails/* to the files included in
 the gem (#439, #433)

---
 formtastic.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 6e9d3207e..40ba09fb2 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.summary = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.email = %q{justin@indent.com.au}
   s.extra_rdoc_files = ["README.textile"]
-  s.files = Dir.glob("generators/**/*") + Dir.glob("lib/**/*") + %w(MIT-LICENSE README.textile)
+  s.files = Dir.glob("generators/**/*") + Dir.glob("lib/**/*") + Dir.glob("rails/*") + %w(MIT-LICENSE README.textile init.rb)
   s.homepage = %q{http://github.com/justinfrench/formtastic/tree/master}
   s.post_install_message = %q{
   ========================================================================

From 1aef3d76dcaf86617a84f7aaef49a9c54b180bc1 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 16 Nov 2010 20:34:16 +1100
Subject: [PATCH 339/992] remove install.rb and uninstall.rb, which are for
 plugins, not gems

---
 install.rb   | 4 ----
 uninstall.rb | 3 ---
 2 files changed, 7 deletions(-)
 delete mode 100644 install.rb
 delete mode 100644 uninstall.rb

diff --git a/install.rb b/install.rb
deleted file mode 100644
index 5660d791f..000000000
--- a/install.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# encoding: utf-8
-
-puts "Run `./script/generate formtastic` if you want (copies optional config file and some stylesheets into your app)"
-puts "Run `./script/generate form MODEL_NAME` to generate some semantic form markup for any existing model(s) (optional)"
diff --git a/uninstall.rb b/uninstall.rb
deleted file mode 100644
index a329d7baa..000000000
--- a/uninstall.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# encoding: utf-8
-
-# Uninstall hook code here

From 84e196ce373c718ab45f2e2436a45aa35dd8dddd Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 16 Nov 2010 20:40:51 +1100
Subject: [PATCH 340/992] changelog update

---
 CHANGELOG | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3774dedf7..33bd00626 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,8 @@
-1.2.1
+1.2.1.beta
 
 * Fixed that unchecking :boolean inputs would not send the correct params (and not persist the change the the DB)
 * Fixed that :boolean inputs checked state was not reflecting the database/model value
+* Fixed that init.rb and rails/init.rb were not included in the gem (affecting Rails 2)
 
 1.2.0
 

From 219bdcbbf8364fed48e61d3915c8745c51d284b9 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 16 Nov 2010 20:41:09 +1100
Subject: [PATCH 341/992] reminder to myself

---
 RELEASE_PROCESS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE_PROCESS b/RELEASE_PROCESS
index 2f03c4e79..afdadb1a2 100644
--- a/RELEASE_PROCESS
+++ b/RELEASE_PROCESS
@@ -1,4 +1,4 @@
-# edit gemspec version number, etc
+# edit gemspec version number, date
 git ci formtastic.gemspec -m "new gemspec" # stage changes
 git tag X.X.X                              # tag the new version in the code base too
 gem build formtastic.gemspec               # build the gem

From 6862ff80333c9709b4e04e505377ac7e560793d6 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 16 Nov 2010 20:41:43 +1100
Subject: [PATCH 342/992] version bump

---
 formtastic.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 40ba09fb2..8a3154374 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formtastic}
-  s.version = "1.2.0"
+  s.version = "1.2.1.beta"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin French"]
-  s.date = %q{2010-09-08}
+  s.date = %q{2010-11-16}
   s.description = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.summary = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.email = %q{justin@indent.com.au}

From d62a04a93d68df8f7820e7a7cbe6b6959c34496f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 16 Nov 2010 20:43:29 +1100
Subject: [PATCH 343/992] shift date up near version to remind myself to change
 both

---
 formtastic.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 8a3154374..47e106a69 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -3,10 +3,10 @@
 Gem::Specification.new do |s|
   s.name = %q{formtastic}
   s.version = "1.2.1.beta"
+  s.date = %q{2010-11-16}
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin French"]
-  s.date = %q{2010-11-16}
   s.description = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.summary = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.email = %q{justin@indent.com.au}

From 114fc36596caae4f800e037623ecb590022596c7 Mon Sep 17 00:00:00 2001
From: Hunter Gillane <pair+hunter@reeebootin.com>
Date: Tue, 16 Nov 2010 08:34:46 +0800
Subject: [PATCH 344/992] fix typos in post install message

---
 formtastic.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 47e106a69..be3cee67d 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   ------------------------------------------------------------------------
   You can now (optionally) run the generator to copy some stylesheets and
   a config initializer into your application:
-    rails generator formastic:install # Rails 3
+    rails generate formtastic:install # Rails 3
     ./script/generate formtastic      # Rails 2
 
   To generate some semantic form markup for your existing models, just run:

From 3eb1db1280d0e5234342ac5b7be24436f4a02401 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 16 Nov 2010 21:06:42 +1100
Subject: [PATCH 345/992] changelog

---
 CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 33bd00626..21d152c05 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+1.2.1.beta2
+
+* Fixed typos in gemspec post-install message
+
 1.2.1.beta
 
 * Fixed that unchecking :boolean inputs would not send the correct params (and not persist the change the the DB)

From e085d96d8c4245a58279927045c96a2e3424babe Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 16 Nov 2010 21:09:32 +1100
Subject: [PATCH 346/992] remove commented out code

---
 lib/formtastic.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 33a8f950c..d625d91db 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1274,8 +1274,6 @@ def boolean_input(method, options)
         checked_value = options.delete(:checked_value) || '1'
         unchecked_value = options.delete(:unchecked_value) || '0'
 
-        #input = self.check_box(method, strip_formtastic_options(options).merge(html_options),
-        #                       checked_value, unchecked_value)
         field_id = generate_html_id(method, "")
         input = template.check_box_tag(
           "#{@object_name}[#{method}]",

From 7084cb57ce16d6df533fd9e400dd0ba98fab88b0 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 16 Nov 2010 21:49:31 +1100
Subject: [PATCH 347/992] version bump

---
 formtastic.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index be3cee67d..73b3f0a91 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formtastic}
-  s.version = "1.2.1.beta"
+  s.version = "1.2.1.beta2"
   s.date = %q{2010-11-16}
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=

From d50afc42a0467fdfcef0189d33156b9fe7487292 Mon Sep 17 00:00:00 2001
From: Larry Sprock <larry@lucidbleu.com>
Date: Wed, 17 Nov 2010 23:59:40 +0800
Subject: [PATCH 348/992] [Fix] Conflict that overwrote f3e3c9a

---
 lib/formtastic.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index d625d91db..448d03d54 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1278,7 +1278,7 @@ def boolean_input(method, options)
         input = template.check_box_tag(
           "#{@object_name}[#{method}]",
           checked_value,
-          (@object && @object.send(:"#{method}") == checked_value),
+          (@object && @object.send(:"#{method}")),
           :id => field_id
         )
         

From b4b9353698705f8afc064928cc4ce271652c7cce Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 18 Nov 2010 08:26:27 +1100
Subject: [PATCH 349/992] relax version requirements for rspec in the
 test_environment.rb to allow rspec 2.1 through

---
 spec/support/test_environment.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/support/test_environment.rb b/spec/support/test_environment.rb
index 0820e9a22..c641c48bf 100644
--- a/spec/support/test_environment.rb
+++ b/spec/support/test_environment.rb
@@ -2,8 +2,8 @@
 
 require "rubygems"
 
-gem 'rspec', '~> 2.0.0'
-gem 'rspec-rails', '~> 2.0.0'
+gem 'rspec', '~> 2.0'
+gem 'rspec-rails', '~> 2.0'
 gem 'rspec_tag_matchers'
 gem 'hpricot', '>= 0.6.1'
 

From bc44a59629e922be174e54cc79ef76131d9d35df Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 18 Nov 2010 08:28:11 +1100
Subject: [PATCH 350/992] the beginnings of a DEVELOPER_INSTALLATION
 instructions to help contributors quickly get a new gemset up and running
 with the specs passing, need to flesh out Rails 2, etc still

---
 DEVELOPER_INSTALLATION | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 DEVELOPER_INSTALLATION

diff --git a/DEVELOPER_INSTALLATION b/DEVELOPER_INSTALLATION
new file mode 100644
index 000000000..03fc37498
--- /dev/null
+++ b/DEVELOPER_INSTALLATION
@@ -0,0 +1,4 @@
+rvm gemset create formtastic-rails-3
+rvm gemset use formtastic-rails-3 
+gem install rails rspec rspec-rails rspec_tag_matchers hpricot
+rake spec
\ No newline at end of file

From 6768c127fe16998040f6e97356487c7175a065f0 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 18 Nov 2010 08:30:46 +1100
Subject: [PATCH 351/992] changelog

---
 CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 21d152c05..3b4f55bf2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+1.2.1.beta3
+
+* Fixed bad merge related to :boolean inputs in 1.2.1.beta
+
 1.2.1.beta2
 
 * Fixed typos in gemspec post-install message

From 37d91b106743344f8e074759e2c425dd5b39791b Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 18 Nov 2010 08:31:01 +1100
Subject: [PATCH 352/992] version bump to 1.2.1.beta3

---
 formtastic.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 73b3f0a91..d67143ff0 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formtastic}
-  s.version = "1.2.1.beta2"
-  s.date = %q{2010-11-16}
+  s.version = "1.2.1.beta3"
+  s.date = %q{2010-11-18}
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin French"]

From 5bf8723a7765ea41970702771ee0034f75d028b4 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 18 Nov 2010 08:32:59 +1100
Subject: [PATCH 353/992] correct RELEASE_PROCESS comment

---
 RELEASE_PROCESS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE_PROCESS b/RELEASE_PROCESS
index afdadb1a2..1c9a6a2d3 100644
--- a/RELEASE_PROCESS
+++ b/RELEASE_PROCESS
@@ -1,5 +1,5 @@
 # edit gemspec version number, date
-git ci formtastic.gemspec -m "new gemspec" # stage changes
+git ci formtastic.gemspec -m "new gemspec" # commit changes
 git tag X.X.X                              # tag the new version in the code base too
 gem build formtastic.gemspec               # build the gem
 gem push formtastic-X.X.X.gem              # publish the gem

From cd0a1bacf6854a36beffefa93c9fe67fba625985 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 17 Nov 2010 14:18:03 -0800
Subject: [PATCH 354/992] pledgie image URL is a redirect, so here's the real
 URL

---
 README.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.textile b/README.textile
index db0643e56..5942a338c 100644
--- a/README.textile
+++ b/README.textile
@@ -2,7 +2,7 @@ h1. Formtastic
 
 Formtastic is a Rails FormBuilder DSL (with some other goodies) to make it far easier to create beautiful, semantically rich, syntactically awesome, readily stylable and wonderfully accessible HTML forms in your Rails applications.
 
-<a href='http://www.pledgie.com/campaigns/2178'><img alt='Click here to lend your support to: formtastic and make a donation at www.pledgie.com !' src='http://www.pledgie.com/campaigns/2178.png?skin_name=chrome' border='0' /></a>
+<a href='http://www.pledgie.com/campaigns/2178'><img alt='Click here to lend your support to: formtastic and make a donation at www.pledgie.com !' src='http://pledgie.com/campaigns/2178.png?skin_name=chrome' border='0' /></a>
 
 h2. The Story
 

From 3bffd3e1a36f55c915e1b55db57b7e4defe1ca66 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Thu, 18 Nov 2010 15:28:18 +0800
Subject: [PATCH 355/992] bob should not respond to to_ary

---
 spec/spec_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 947577f59..99f05cb39 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -135,7 +135,7 @@ def new_author_path; "/authors/new"; end
     @fred.stub!(:persisted?).and_return(nil)
 
     @bob = mock('user')
-    @bob.stub!(:to_ary)
+    #@bob.stub!(:to_ary)
     @bob.stub!(:class).and_return(::Author)
     @bob.stub!(:to_label).and_return('Bob Rock')
     @bob.stub!(:login).and_return('bob')

From 9f6db140f79bb25d3e27ead3fc3c7fae63c5cb5b Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 18 Nov 2010 21:53:29 +1100
Subject: [PATCH 356/992] remove to_ary stubs

---
 spec/spec_helper.rb | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 99f05cb39..504d624cf 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -124,7 +124,6 @@ def authors_path; "/authors"; end
     def new_author_path; "/authors/new"; end
 
     @fred = mock('user')
-    @fred.stub!(:to_ary)
     @fred.stub!(:class).and_return(::Author)
     @fred.stub!(:to_label).and_return('Fred Smith')
     @fred.stub!(:login).and_return('fred_smith')
@@ -135,7 +134,6 @@ def new_author_path; "/authors/new"; end
     @fred.stub!(:persisted?).and_return(nil)
 
     @bob = mock('user')
-    #@bob.stub!(:to_ary)
     @bob.stub!(:class).and_return(::Author)
     @bob.stub!(:to_label).and_return('Bob Rock')
     @bob.stub!(:login).and_return('bob')
@@ -149,7 +147,6 @@ def new_author_path; "/authors/new"; end
     @bob.stub!(:persisted?).and_return(nil)
 
     @james = mock('user')
-    @james.stub!(:to_ary)
     @james.stub!(:class).and_return(::Author)
     @james.stub!(:to_label).and_return('James Shock')
     @james.stub!(:login).and_return('james')
@@ -164,7 +161,6 @@ def new_author_path; "/authors/new"; end
 
     ::Author.stub!(:find).and_return([@fred, @bob])
     ::Author.stub!(:all).and_return([@fred, @bob])
-    ::Author.stub!(:to_ary)
     ::Author.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     ::Author.stub!(:human_name).and_return('::Author')
     ::Author.stub!(:reflect_on_association).and_return { |column_name| mock('reflection', :options => {}, :klass => Post, :macro => :has_many) if column_name == :posts }
@@ -174,7 +170,6 @@ def new_author_path; "/authors/new"; end
 
     # Sometimes we need a mock @post object and some Authors for belongs_to
     @new_post = mock('post')
-    @new_post.stub!(:to_ary)
     @new_post.stub!(:class).and_return(::Post)
     @new_post.stub!(:id).and_return(nil)
     @new_post.stub!(:new_record?).and_return(true)
@@ -188,7 +183,6 @@ def new_author_path; "/authors/new"; end
     @new_post.stub!(:persisted?).and_return(nil)
 
     @freds_post = mock('post')
-    @freds_post.stub!(:to_ary)
     @freds_post.stub!(:class).and_return(::Post)
     @freds_post.stub!(:to_label).and_return('Fred Smith')
     @freds_post.stub!(:id).and_return(19)
@@ -233,7 +227,6 @@ def new_author_path; "/authors/new"; end
     ::Post.stub!(:content_columns).and_return([mock('column', :name => 'title'), mock('column', :name => 'body'), mock('column', :name => 'created_at')])
     ::Post.stub!(:to_key).and_return(nil)
     ::Post.stub!(:persisted?).and_return(nil)
-    ::Post.stub!(:to_ary)
 
     @mock_file = mock('file')
     ::Formtastic::SemanticFormBuilder.file_methods.each do |method|
@@ -245,7 +238,6 @@ def new_author_path; "/authors/new"; end
     @new_post.stub!(:url)
     @new_post.stub!(:phone)
     @new_post.stub!(:search)
-    @new_post.stub!(:to_ary)
     @new_post.stub!(:body)
     @new_post.stub!(:published)
     @new_post.stub!(:publish_at)

From a5f9cb698cdcf4c4e6b2fddcfea7bba227c99f8f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 22 Nov 2010 09:22:56 +1100
Subject: [PATCH 357/992] changelog updates

---
 CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 3b4f55bf2..0ad1345e3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+1.2.1
+
+* test suite compatibilities with Rails 3.0.3
+
 1.2.1.beta3
 
 * Fixed bad merge related to :boolean inputs in 1.2.1.beta

From 67ff7e6875d2502db608b7f1484575084aa82553 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 22 Nov 2010 09:23:54 +1100
Subject: [PATCH 358/992] version bump to 1.2.1

---
 formtastic.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index d67143ff0..d28eea153 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formtastic}
-  s.version = "1.2.1.beta3"
-  s.date = %q{2010-11-18}
+  s.version = "1.2.1"
+  s.date = %q{2010-11-22}
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin French"]

From b8f1390d8b4929074d32454be251219f973fe317 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 23 Nov 2010 06:44:30 +1100
Subject: [PATCH 359/992] Resolves #446 by not forcing :include_blank to be
 false on multi selects. Also added a heap of extra coverage.

---
 lib/formtastic.rb                |  7 +------
 spec/inputs/select_input_spec.rb | 26 ++++++++++++++++++++++----
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 448d03d54..aefef0959 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -818,12 +818,7 @@ def select_input(method, options)
         if reflection && [ :has_many, :has_and_belongs_to_many ].include?(reflection.macro)
           html_options[:multiple] = true if html_options[:multiple].nil?
           html_options[:size]     ||= 5
-
-          if html_options[:multiple]
-            options[:include_blank]   = false
-          else
-            options[:include_blank]   ||= false
-          end
+          options[:include_blank] ||= false
         end
         options = set_include_blank(options)
         input_name = generate_association_input_name(method)
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 9e1ac040d..a06af0f56 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -336,20 +336,20 @@
 
     it 'should respect the :include_blank option for single selects' do
       @form = semantic_form_for(@fred) do |builder|
-        concat(builder.input(:posts, :as => :select, :multiple => false, :size => 1, :include_blank => true))
+        concat(builder.input(:posts, :as => :select, :multiple => false, :include_blank => true))
       end
 
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form li select option[@value='']")
     end
 
-    it 'should ignore the :include_blank option for multiple selects' do
+    it 'should respect the :include_blank option for multiple selects' do
       @form = semantic_form_for(@fred) do |builder|
         concat(builder.input(:posts, :as => :select, :multiple => true, :include_blank => true))
       end
 
       output_buffer.concat(@form) if Formtastic::Util.rails3?
-      output_buffer.should_not have_tag("form li select option[@value='']")
+      output_buffer.should have_tag("form li select option[@value='']")
     end
 
     it 'should have one option with a "selected" attribute' do
@@ -392,11 +392,29 @@
       end
     end
 
-    it 'should not have a blank option' do
+    it 'should not have a blank option by default' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should_not have_tag("form li select option[@value='']")
     end
 
+    it 'should respect the :include_blank option for single selects' do
+      @form = semantic_form_for(@freds_post) do |builder|
+        concat(builder.input(:authors, :as => :select, :multiple => false, :include_blank => true))
+      end
+
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag("form li select option[@value='']")
+    end
+
+    it 'should respect the :include_blank option for multiple selects' do
+      @form = semantic_form_for(@freds_post) do |builder|
+        concat(builder.input(:authors, :as => :select, :multiple => true, :include_blank => true))
+      end
+
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag("form li select option[@value='']")
+    end
+
     it 'should have one option with a "selected" attribute' do
       output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li select option[@selected]', :count => 1)

From 80c11aebeedc0cd3ec1f542da74186b0e59b1979 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 23 Nov 2010 06:55:10 +1100
Subject: [PATCH 360/992] resolves #442 by not merging the button_html class
 into the wrapper_html class

---
 lib/formtastic.rb          | 2 +-
 spec/commit_button_spec.rb | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index aefef0959..76eeb6cff 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -376,7 +376,7 @@ def commit_button(*args)
 
       wrapper_html_class = ['commit', options.delete(:class)].compact # TODO: Add class reflecting on form action.
       wrapper_html = options.delete(:wrapper_html) || {}
-      wrapper_html[:class] = (wrapper_html_class << wrapper_html[:class] << button_html[:class]).flatten.compact.join(' ')
+      wrapper_html[:class] = (wrapper_html_class << wrapper_html[:class]).flatten.compact.join(' ')
 
       accesskey = (options.delete(:accesskey) || self.class.default_commit_button_accesskey) unless button_html.has_key?(:accesskey)
       button_html = button_html.merge(:accesskey => accesskey) if accesskey
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index 6948fc82c..92301684f 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -468,12 +468,14 @@ def self.human_name
       it 'should merge in classes applied using the :class option' do
         with_deprecation_silenced do
           form = semantic_form_for(@new_post) do |builder|
-            concat(builder.commit_button('text', :class => 'from_button_html', :wrapper_html => {:class => 'from_wrapper_html'}))
+            concat(builder.commit_button('text', :class => 'from_class_option', :wrapper_html => {:class => 'from_wrapper_html'}, :button_html => { :class => 'from_button_html'}))
           end
           output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li.commit")
-          output_buffer.should have_tag("form li.from_button_html")
           output_buffer.should have_tag("form li.from_wrapper_html")
+          output_buffer.should have_tag("form li.from_class_option")
+          output_buffer.should have_tag("form li input.from_button_html")
+          output_buffer.should_not have_tag("form li.from_button_html")
         end
       end
       

From 7f06da5be6034c9b2ea00ac66b7f8e73e47c6c1b Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 23 Nov 2010 06:59:09 +1100
Subject: [PATCH 361/992] changelog catch-up

---
 CHANGELOG | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 0ad1345e3..5392e4bfc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+[master]
+
+* Fixed that classes in :button_html were being merged into :wrapper_html
+* Fixed that :include_blank was being ignored (always false) for multi selects 
+
 1.2.1
 
 * test suite compatibilities with Rails 3.0.3

From aac0564a6b51408afd5701b0f7f761c0ef7dc19e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 23 Nov 2010 09:01:39 +1100
Subject: [PATCH 362/992] removed a bunch of deprecated methods and options

---
 lib/formtastic.rb          | 30 +++---------------------------
 spec/commit_button_spec.rb | 27 ---------------------------
 2 files changed, 3 insertions(+), 54 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 76eeb6cff..e09401e83 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -295,11 +295,6 @@ def inputs(*args, &block)
       end
     end
 
-    def input_field_set(*args, &block)
-      ::ActiveSupport::Deprecation.warn("input_field_set() is deprecated and will be removed in Formtastic 1.3 or later, use inputs() instead.", caller)
-      inputs(args, &block)
-    end
-
     # Creates a fieldset and ol tag wrapping for form buttons / actions as list items.
     # See inputs documentation for a full example.  The fieldset's default class attriute
     # is set to "buttons".
@@ -318,11 +313,6 @@ def buttons(*args, &block)
       end
     end
 
-    def button_field_set(*args, &block)
-      ::ActiveSupport::Deprecation.warn("button_field_set() is deprecated and will be removed in Formtastic 1.3 or later, use inputs() instead.", caller)
-      buttons(args, &block)
-    end
-
     # Creates a submit input tag with the value "Save [model name]" (for existing records) or
     # "Create [model name]" (for new records) by default:
     #
@@ -335,15 +325,11 @@ def button_field_set(*args, &block)
     #
     # 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" class="{create|update|submit}" />
-    #  <%= form.commit_button :class => "pretty" %> => <input name="commit" type="submit" value="Save Post" class="pretty {create|update|submit}" />
-    #
+    #  <%= form.commit_button :button_html => { :class => "pretty" } %> => <input name="commit" type="submit" value="Save Post" class="pretty {create|update|submit}" />
     def commit_button(*args)
       options = args.extract_options!
-      ::ActiveSupport::Deprecation.warn(":class => 'whatever' is deprecated on commit button, use :wrapper_html => { :class => 'whatever' } instead.", caller) if options.key?(:class)
       text = options.delete(:label) || args.shift
 
-
       if @object && (@object.respond_to?(:persisted?) || @object.respond_to?(:new_record?))
         if @object.respond_to?(:persisted?) # ActiveModel
           key = @object.persisted? ? :update : :create
@@ -374,7 +360,7 @@ def commit_button(*args)
       button_html = options.delete(:button_html) || {}
       button_html.merge!(:class => [button_html[:class], key].compact.join(' '))
 
-      wrapper_html_class = ['commit', options.delete(:class)].compact # TODO: Add class reflecting on form action.
+      wrapper_html_class = ['commit'] # TODO: Add class reflecting on form action.
       wrapper_html = options.delete(:wrapper_html) || {}
       wrapper_html[:class] = (wrapper_html_class << wrapper_html[:class]).flatten.compact.join(' ')
 
@@ -594,7 +580,7 @@ def inputs_for_nested_attributes(*args, &block) #:nodoc:
       #
       def strip_formtastic_options(options) #:nodoc:
         options.except(:value_method, :label_method, :collection, :required, :label,
-                       :as, :hint, :input_html, :label_html, :value_as_class, :find_options)
+                       :as, :hint, :input_html, :label_html, :value_as_class, :find_options, :class)
       end
 
       # Determins if the attribute (eg :title) should be considered required or not.
@@ -850,11 +836,6 @@ def select_input(method, options)
         self.label(method, label_options) << select_html
       end
 
-      def boolean_select_input(method, options)
-        ::ActiveSupport::Deprecation.warn(":as => :boolean_select is deprecated and will be removed in Formtastic 1.3 or later. Use :as => :select instead.", caller)
-        select_input(method, options)
-      end
-
       # Outputs a timezone select input as Rails' time_zone_select helper. You
       # can give priority zones as option.
       #
@@ -958,11 +939,6 @@ def radio_input(method, options)
         )
       end
 
-      def boolean_radio_input(method, options)
-        ::ActiveSupport::Deprecation.warn(":as => :boolean_radio is deprecated and will be removed in Formtastic 1.3 or later. Use :as => :radio instead.", caller)
-        radio_input(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).  Each li contains a label
       # (eg "Year") and a select box. Overwriting the label is possible by adding the :labels option.
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index 92301684f..2f8b2c6e8 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -464,33 +464,6 @@ def self.human_name
         output_buffer.should have_tag("form li.my_class")
         output_buffer.should have_tag("form li.another_class")
       end
-      
-      it 'should merge in classes applied using the :class option' do
-        with_deprecation_silenced do
-          form = semantic_form_for(@new_post) do |builder|
-            concat(builder.commit_button('text', :class => 'from_class_option', :wrapper_html => {:class => 'from_wrapper_html'}, :button_html => { :class => 'from_button_html'}))
-          end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
-          output_buffer.should have_tag("form li.commit")
-          output_buffer.should have_tag("form li.from_wrapper_html")
-          output_buffer.should have_tag("form li.from_class_option")
-          output_buffer.should have_tag("form li input.from_button_html")
-          output_buffer.should_not have_tag("form li.from_button_html")
-        end
-      end
-      
-      it 'should warn that :class is a deprecated option' do
-        with_deprecation_silenced do
-          ::ActiveSupport::Deprecation.should_receive(:warn).any_number_of_times
-          @form = semantic_form_for(@new_post) do |builder|
-            concat(builder.commit_button('text', :class => 'from_button_html', :wrapper_html => {:class => 'from_wrapper_html'}))
-          end
-        end
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
-        output_buffer.should have_tag("form li.commit")
-        output_buffer.should have_tag("form li.from_button_html")
-        output_buffer.should have_tag("form li.from_wrapper_html")
-      end
     end
 
     describe 'when not provided' do

From 8f75fc71c3c8e8d5041825c7e2d3c3ac44ec7b6c Mon Sep 17 00:00:00 2001
From: Larry Sprock <larry@lucidbleu.com>
Date: Tue, 23 Nov 2010 10:33:20 +0800
Subject: [PATCH 363/992] input_html should be passed to checkbox_tag

---
 lib/formtastic.rb                 |  8 ++++----
 spec/inputs/boolean_input_spec.rb | 30 +++++++++++++++++++++++++-----
 spec/spec_helper.rb               |  1 +
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index e09401e83..6fbd827f4 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1241,20 +1241,20 @@ def country_input(method, options)
       # 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) || {}
+        html_options  = options.delete(:input_html) || {}
         checked_value = options.delete(:checked_value) || '1'
         unchecked_value = options.delete(:unchecked_value) || '0'
 
-        field_id = generate_html_id(method, "")
+        html_options[:id] = html_options[:id] || generate_html_id(method, "")
         input = template.check_box_tag(
           "#{@object_name}[#{method}]",
           checked_value,
           (@object && @object.send(:"#{method}")),
-          :id => field_id
+          html_options
         )
         
         options = options_for_label(options)
-        options[:for] ||= field_id
+        options[:for] ||= html_options[:id]
 
         # the label() method will insert this nested input into the label at the last minute
         options[:label_prefix_for_nested_input] = input
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index cf6ca8ba4..c964e6245 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -37,23 +37,43 @@
     output_buffer.should have_tag('form li label input[@type="checkbox"][@value="1"]')
   end
   
-  it 'should generate a checked checkbox input if object and object.method is true' do
+  it 'should generate a checked input if object.method returns true' do
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean))
     end
 
     output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should have_tag('form li label input[@checked="checked"]')
+    output_buffer.should have_tag('form li input[@name="post[allow_comments]"]', :count => 2)
+    output_buffer.should have_tag('form li input#post_allow_comments', :count => 1)
   end
   
-  it 'should generate a checked checkbox input if object and object.method is true' do
+  it 'should generate a checked input if :input_html is passed :checked => checked' do
     form = semantic_form_for(@new_post) do |builder|
-      concat(builder.input(:allow_comments, :as => :boolean))
+      concat(builder.input(:answer_comments, :as => :boolean, :input_html => {:checked => 'checked'}))
     end
 
     output_buffer.concat(form) if Formtastic::Util.rails3?
-    output_buffer.should have_tag('form li input[@name="post[allow_comments]"]', :count => 2)
-    output_buffer.should have_tag('form li input#post_allow_comments', :count => 1)
+    output_buffer.should have_tag('form li label input[@checked="checked"]')
+  end
+  
+  it "should generate a disabled input if :input_html is passed :disabled => 'disabled' " do
+    form = semantic_form_for(@new_post) do |builder|
+      concat(builder.input(:allow_comments, :as => :boolean, :input_html => {:disabled => 'disabled'}))
+    end
+    
+    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.should have_tag('form li label input[@disabled="disabled"]')
+  end
+  
+  it 'should generate an input[id] with matching label[for] when id passed in :input_html' do
+    form = semantic_form_for(@new_post) do |builder|
+      concat(builder.input(:allow_comments, :as => :boolean, :input_html => {:id => 'custom_id'}))
+    end
+    
+    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.should have_tag('form li label input[@id="custom_id"]')
+    output_buffer.should have_tag('form li label[@for="custom_id"]')
   end
 
   it 'should allow checked and unchecked values to be sent' do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 504d624cf..4c95657c1 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -250,6 +250,7 @@ def new_author_path; "/authors/new"; end
     @new_post.stub!(:time_zone)
     @new_post.stub!(:category_name)
     @new_post.stub!(:allow_comments).and_return(true)
+    @new_post.stub!(:answer_comments)
     @new_post.stub!(:country)
     @new_post.stub!(:country_subdivision)
     @new_post.stub!(:country_code)

From 9b00e070a6f15ff074b63a020cb5e74da44b33ce Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Fri, 26 Nov 2010 16:23:14 +0800
Subject: [PATCH 364/992] reflect on allow_blank option to determine required
 status

---
 lib/formtastic.rb  |  2 ++
 spec/input_spec.rb | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 6fbd827f4..0326df408 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -617,6 +617,8 @@ def method_required?(attribute) #:nodoc:
 
       # Determines whether the given options evaluate to true
       def options_require_validation?(options) #nodoc
+        allow_blank = options[:allow_blank]
+        return !allow_blank unless allow_blank.nil?
         if_condition = !options[:if].nil?
         condition = if_condition ? options[:if] : options[:unless]
 
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index cab49637a..e3d8f1d0f 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -332,6 +332,19 @@ def should_be_required(options)
                 output_buffer.should have_tag('form li.required')
                 output_buffer.should_not have_tag('form li.optional')
               end
+              
+              it 'should not be required if allow_blank is true' do
+                @new_post.class.should_receive(:validators_on).with(:published).any_number_of_times.and_return([
+                  active_model_inclusion_validator([:published], {:in => [false, true], :allow_blank => true})
+                ])
+
+                form = semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:published))
+                end
+                output_buffer.concat(form) if Formtastic::Util.rails3?
+                output_buffer.should_not have_tag('form li.required')
+                output_buffer.should have_tag('form li.optional')
+              end
             end
 
             # TODO make a matcher for this?

From 4fcd1e8bbfa80ed24b4635c928a6c58582175fe4 Mon Sep 17 00:00:00 2001
From: Larry Sprock <larry@lucidbleu.com>
Date: Fri, 26 Nov 2010 00:25:31 +0800
Subject: [PATCH 365/992] Use real object to get specs passing in ruby 192

---
 spec/spec_helper.rb | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 4c95657c1..2acf8e8f0 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -122,8 +122,8 @@ def new_post_path; "/posts/new"; end
     def author_path(o); "/authors/1"; end
     def authors_path; "/authors"; end
     def new_author_path; "/authors/new"; end
-
-    @fred = mock('user')
+    
+    @fred = ::Author.new
     @fred.stub!(:class).and_return(::Author)
     @fred.stub!(:to_label).and_return('Fred Smith')
     @fred.stub!(:login).and_return('fred_smith')
@@ -133,8 +133,7 @@ def new_author_path; "/authors/new"; end
     @fred.stub!(:to_key).and_return(nil)
     @fred.stub!(:persisted?).and_return(nil)
 
-    @bob = mock('user')
-    @bob.stub!(:class).and_return(::Author)
+    @bob = ::Author.new
     @bob.stub!(:to_label).and_return('Bob Rock')
     @bob.stub!(:login).and_return('bob')
     @bob.stub!(:created_at)
@@ -146,8 +145,7 @@ def new_author_path; "/authors/new"; end
     @bob.stub!(:to_key).and_return(nil)
     @bob.stub!(:persisted?).and_return(nil)
 
-    @james = mock('user')
-    @james.stub!(:class).and_return(::Author)
+    @james = ::Author.new
     @james.stub!(:to_label).and_return('James Shock')
     @james.stub!(:login).and_return('james')
     @james.stub!(:id).and_return(75)
@@ -183,6 +181,7 @@ def new_author_path; "/authors/new"; end
     @new_post.stub!(:persisted?).and_return(nil)
 
     @freds_post = mock('post')
+    @freds_post.stub!(:to_ary)
     @freds_post.stub!(:class).and_return(::Post)
     @freds_post.stub!(:to_label).and_return('Fred Smith')
     @freds_post.stub!(:id).and_return(19)
@@ -227,6 +226,7 @@ def new_author_path; "/authors/new"; end
     ::Post.stub!(:content_columns).and_return([mock('column', :name => 'title'), mock('column', :name => 'body'), mock('column', :name => 'created_at')])
     ::Post.stub!(:to_key).and_return(nil)
     ::Post.stub!(:persisted?).and_return(nil)
+    ::Post.stub!(:to_ary)
 
     @mock_file = mock('file')
     ::Formtastic::SemanticFormBuilder.file_methods.each do |method|
@@ -238,6 +238,7 @@ def new_author_path; "/authors/new"; end
     @new_post.stub!(:url)
     @new_post.stub!(:phone)
     @new_post.stub!(:search)
+    @new_post.stub!(:to_ary)
     @new_post.stub!(:body)
     @new_post.stub!(:published)
     @new_post.stub!(:publish_at)

From 1aecc63a95c2e55a21dca546eff7dbef1360bdbf Mon Sep 17 00:00:00 2001
From: Larry Sprock <larry@lucidbleu.com>
Date: Sun, 28 Nov 2010 05:53:53 +0800
Subject: [PATCH 366/992] Input spec failing in 2.3.x because form was in
 output_buffer twice...

---
 spec/inputs/boolean_input_spec.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index c964e6245..3ded0a0a3 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -38,11 +38,7 @@
   end
   
   it 'should generate a checked input if object.method returns true' do
-    form = semantic_form_for(@new_post) do |builder|
-      concat(builder.input(:allow_comments, :as => :boolean))
-    end
-
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(@form) if Formtastic::Util.rails3?
     output_buffer.should have_tag('form li label input[@checked="checked"]')
     output_buffer.should have_tag('form li input[@name="post[allow_comments]"]', :count => 2)
     output_buffer.should have_tag('form li input#post_allow_comments', :count => 1)

From 249dba1f517d9902c98f95a364c996428159500d Mon Sep 17 00:00:00 2001
From: Larry Sprock <larry@lucidbleu.com>
Date: Thu, 18 Nov 2010 01:52:18 +0800
Subject: [PATCH 367/992] Add bundler for easier development setup Add support
 to switch between rails versions in dev

Usage:
  bundle install                    # Initial bundle command to build Gemfile.lock
  RAILS_2=true bundle update rails  # Updates gemfile to run agains rails 2
  RAILS_2=true rake                 # Run tests against rails 2
  bundle update rails               # Updates gemfile to run agains rails 3
  rake                              # Run tests against rails 3
---
 .gitignore          | 1 +
 Gemfile             | 3 +++
 formtastic.gemspec  | 7 ++++++-
 spec/spec_helper.rb | 3 +++
 4 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 Gemfile

diff --git a/.gitignore b/.gitignore
index 1564d2ecc..268b57907 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ pkg
 log/*
 .rvmrc
 .bundle
+Gemfile.lock
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 000000000..a1b93f3ed
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,3 @@
+source :rubygems
+
+gemspec
diff --git a/formtastic.gemspec b/formtastic.gemspec
index d28eea153..9da69d98d 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -38,7 +38,12 @@ Gem::Specification.new do |s|
   s.add_dependency(%q<activesupport>, [">= 2.3.7"])
   s.add_dependency(%q<actionpack>, [">= 2.3.7"])
   s.add_dependency(%q<i18n>, [">= 0.4.0"])
-  s.add_development_dependency(%q<rails>, [">= 3.0.0"])
+  
+  if ENV['RAILS_2']
+    s.add_development_dependency(%q<rails>, ["~> 2.3.8"])
+  else
+    s.add_development_dependency(%q<rails>, [">= 3.0.0"])
+  end
   s.add_development_dependency(%q<rspec-rails>, ["~> 2.0.0"])
   s.add_development_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
   s.add_development_dependency(%q<hpricot>, ["~> 0.8.3"])
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 2acf8e8f0..df17d175d 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,5 +1,8 @@
 # encoding: utf-8
 require 'rubygems'
+require 'bundler'
+Bundler.setup
+
 require 'active_support'
 require 'action_pack'
 require 'action_view'

From d952753ce1c89e557156e8f00612c72e13f4e958 Mon Sep 17 00:00:00 2001
From: Larry Sprock <larry@lucidbleu.com>
Date: Sun, 28 Nov 2010 05:35:08 +0800
Subject: [PATCH 368/992] Remove unnecessary gem method, now handled by bundler

---
 spec/support/test_environment.rb | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/spec/support/test_environment.rb b/spec/support/test_environment.rb
index c641c48bf..665aac524 100644
--- a/spec/support/test_environment.rb
+++ b/spec/support/test_environment.rb
@@ -1,12 +1,4 @@
 # encoding: utf-8
-
-require "rubygems"
-
-gem 'rspec', '~> 2.0'
-gem 'rspec-rails', '~> 2.0'
-gem 'rspec_tag_matchers'
-gem 'hpricot', '>= 0.6.1'
-
 require 'rspec_tag_matchers'
 
 RSpec.configure do |config|

From 533c086f4101b0fc3d8eb540cbfd2c61e385e708 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 28 Nov 2010 21:41:26 +1100
Subject: [PATCH 369/992] added a section to the README on getting a dev
 environment up and running

---
 DEVELOPER_INSTALLATION |  4 ----
 README.textile         | 27 ++++++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 5 deletions(-)
 delete mode 100644 DEVELOPER_INSTALLATION

diff --git a/DEVELOPER_INSTALLATION b/DEVELOPER_INSTALLATION
deleted file mode 100644
index 03fc37498..000000000
--- a/DEVELOPER_INSTALLATION
+++ /dev/null
@@ -1,4 +0,0 @@
-rvm gemset create formtastic-rails-3
-rvm gemset use formtastic-rails-3 
-gem install rails rspec rspec-rails rspec_tag_matchers hpricot
-rake spec
\ No newline at end of file
diff --git a/README.textile b/README.textile
index 5942a338c..5330bec83 100644
--- a/README.textile
+++ b/README.textile
@@ -634,12 +634,37 @@ h2. Compatibility
 
 h2. How to contribute
 
-Please ensure that you provide appropriate spec/test coverage and ensure the documentation is up-to-date.  Bonus points if you perform your changes in a clean topic branch rather than master, and if you create an issue on GH for us to discuss your changes. Pull requests tend to get lost.
+Please ensure that you provide appropriate spec/test coverage and ensure the documentation is up-to-date.  Bonus points if you perform your changes in a clean topic branch rather than master, and if you create a pull request for your changes to be discussed and reviewed.
 
 Please also keep your commits *atomic* so that they are more likely to apply cleanly.  That means that each commit should contain the smallest possible logical change.  Don't commit two features at once, don't update the gemspec at the same time you add a feature, don't fix a whole bunch of whitespace in a file at the same time you change a few lines, etc, etc.
 
 For significant changes, you may wish to discuss your idea on the Formtastic Google group before coding to ensure that your change is likely to be accepted.  Formtastic relies heavily on i18n, so if you're unsure of the impact this has on your changes, please discuss them with the group.
 
+See below for installation of a development environment.
+
+
+h2. Development Environment
+
+We currently support both Rails 2 and Rails 3, under Ruby 1.8.7-ish (and 1.9.2-ish). That means, at a bare minimum, you'll want to set-up two rvm gemsets to run your specs against. So, fork the project on Github, clone it, make some gemsets, run bundler, run your specs and then finally set-up an .rvmrc file that specifies Rails 3 as your default gemset and cd back into that directory to load in the .rvmrc file. Something like this:
+
+<pre>
+  $ cd ~/code/formtastic
+  $ rvm gemset create formtastic-rails3
+  $ rvm gemset use formtastic-rails3
+  $ gem install bundler
+  $ bundle install
+  $ rake spec
+  $ rm Gemfile.lock
+  $ rvm gemset create formtastic-rails2
+  $ rvm gemset use formtastic-rails2
+  $ gem install bundler
+  $ RAILS_2=true bundle install
+  $ rake spec
+  $ touch .rvmrc
+  $ echo "rvm gemset use formtastic-rails-3" > .rvmrc
+  $ cd ~/code/formtastic
+</pre>
+
 
 h2. Maintainers & Contributors
 

From b6e580d1d1e5bb44f9ae29ced9d16ea88ada80ae Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Mon, 29 Nov 2010 16:39:41 +0800
Subject: [PATCH 370/992] fixing rails 2 development instruction

---
 README.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.textile b/README.textile
index 5330bec83..bc216daa1 100644
--- a/README.textile
+++ b/README.textile
@@ -659,7 +659,7 @@ We currently support both Rails 2 and Rails 3, under Ruby 1.8.7-ish (and 1.9.2-i
   $ rvm gemset use formtastic-rails2
   $ gem install bundler
   $ RAILS_2=true bundle install
-  $ rake spec
+  $ RAILS_2=true rake spec
   $ touch .rvmrc
   $ echo "rvm gemset use formtastic-rails-3" > .rvmrc
   $ cd ~/code/formtastic

From 5a73707afdef8291a6281b668d68b4403f27e087 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sun, 12 Dec 2010 10:38:13 -0800
Subject: [PATCH 371/992] Fixes Issue #468 -
 https://github.com/justinfrench/formtastic/issues/#issue/468 - where the
 directories config/initializers and public/stylesheets are removed on running
 the destroy generator, regardless of other files that they contain.

---
 lib/generators/formtastic/install/install_generator.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/generators/formtastic/install/install_generator.rb b/lib/generators/formtastic/install/install_generator.rb
index 618022074..5be5c17af 100644
--- a/lib/generators/formtastic/install/install_generator.rb
+++ b/lib/generators/formtastic/install/install_generator.rb
@@ -6,10 +6,8 @@ class InstallGenerator < Rails::Generators::Base
     source_root File.expand_path('../../../templates', __FILE__)
 
     def copy_files
-      empty_directory 'config/initializers'
       template        'formtastic.rb', 'config/initializers/formtastic.rb'
 
-      empty_directory 'public/stylesheets'
       template        'formtastic.css',         'public/stylesheets/formtastic.css'
       template        'formtastic_changes.css', 'public/stylesheets/formtastic_changes.css'
     end

From e6aba2389f1ed5cc4c2f3f433793310356fe21a4 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 13 Dec 2010 07:28:51 +1100
Subject: [PATCH 372/992] corrected documentation on how to override a value

---
 lib/formtastic.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 0326df408..783a16955 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -88,9 +88,9 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
     #
     #   <% semantic_form_for @employee do |form| %>
     #     <% form.inputs do -%>
-    #       <%= form.input :secret, :value => "Hello" %>
     #       <%= form.input :name, :label => "Full Name" %>
-    #       <%= form.input :manager_id, :as => :radio %>
+    #       <%= form.input :manager, :as => :radio %>
+    #       <%= form.input :secret, :as => :password, :input_html => { :value => "xxxx" } %>
     #       <%= form.input :hired_at, :as => :date, :label => "Date Hired" %>
     #       <%= form.input :phone, :required => false, :hint => "Eg: +1 555 1234" %>
     #       <%= form.input :email %>

From 3ba44859be62f9190eb230f5f9159d83ffe3d6f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=BCrlimann=20=28CyT=29?=
 <simon.huerlimann@cyt.ch>
Date: Tue, 14 Dec 2010 15:45:01 +0800
Subject: [PATCH 373/992] Add missing </pre> to README.

---
 README.textile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.textile b/README.textile
index bc216daa1..f0b2c5a8f 100644
--- a/README.textile
+++ b/README.textile
@@ -135,6 +135,7 @@ The difference is subtle, with most blocks in Rails 3 requiring the addition of
       ...
     <% end %>
   <% end %>
+</pre>
   
 This README is currently documenting the Rails 2 way only. If you're using Rails 3 and your forms aren't rendering everything as expected, try changing @<%@ to @<%=@.
 

From 65e7e2d4558a6d45859c78e2f93a45da1b948d46 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 17 Dec 2010 13:52:36 +1100
Subject: [PATCH 374/992] Rails 2 & 3 compatible form generator templates
 (GH-472):

* updated Rails 3 generator templates to use = for outputing blocks
* created alternate Rails 2 templates with old block syntax
* pointed Rails 2 generator at appropriate templates
---
 generators/form/form_generator.rb               | 2 +-
 lib/generators/templates/_form.html.erb         | 2 +-
 lib/generators/templates/_form.html.haml        | 2 +-
 lib/generators/templates/rails2/_form.html.erb  | 5 +++++
 lib/generators/templates/rails2/_form.html.haml | 4 ++++
 5 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 lib/generators/templates/rails2/_form.html.erb
 create mode 100644 lib/generators/templates/rails2/_form.html.haml

diff --git a/generators/form/form_generator.rb b/generators/form/form_generator.rb
index a58b6819c..7eba7b408 100644
--- a/generators/form/form_generator.rb
+++ b/generators/form/form_generator.rb
@@ -105,7 +105,7 @@ def banner
     end
     
     def source_root
-      File.expand_path('../../../lib/generators/templates', __FILE__)
+      File.expand_path('../../../lib/generators/templates/rails2', __FILE__)
     end
 
 end
diff --git a/lib/generators/templates/_form.html.erb b/lib/generators/templates/_form.html.erb
index 1679580e0..7f102a7b2 100644
--- a/lib/generators/templates/_form.html.erb
+++ b/lib/generators/templates/_form.html.erb
@@ -1,4 +1,4 @@
-<%% f.inputs do %>
+<%%= f.inputs do %>
 <% attributes.each do |attribute| -%>
   <%%= f.input :<%= attribute.name %> %>
 <% end -%>
diff --git a/lib/generators/templates/_form.html.haml b/lib/generators/templates/_form.html.haml
index c83eb24b8..7e7b48b05 100644
--- a/lib/generators/templates/_form.html.haml
+++ b/lib/generators/templates/_form.html.haml
@@ -1,4 +1,4 @@
-- f.inputs do
+= f.inputs do
 <% attributes.each do |attribute| -%>
   = f.input :<%= attribute.name %>
 <% end -%>
diff --git a/lib/generators/templates/rails2/_form.html.erb b/lib/generators/templates/rails2/_form.html.erb
new file mode 100644
index 000000000..1679580e0
--- /dev/null
+++ b/lib/generators/templates/rails2/_form.html.erb
@@ -0,0 +1,5 @@
+<%% f.inputs do %>
+<% attributes.each do |attribute| -%>
+  <%%= f.input :<%= attribute.name %> %>
+<% end -%>
+<%% end %>
diff --git a/lib/generators/templates/rails2/_form.html.haml b/lib/generators/templates/rails2/_form.html.haml
new file mode 100644
index 000000000..c83eb24b8
--- /dev/null
+++ b/lib/generators/templates/rails2/_form.html.haml
@@ -0,0 +1,4 @@
+- f.inputs do
+<% attributes.each do |attribute| -%>
+  = f.input :<%= attribute.name %>
+<% end -%>

From 3fb94d1dceb95909853ec7972b94b3b17be8ce64 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 20 Dec 2010 08:10:38 +1100
Subject: [PATCH 375/992] use class_attribute instead of
 class_inheritable_accessor if defined

---
 lib/formtastic.rb | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 783a16955..980a5a5c4 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -6,11 +6,20 @@
 module Formtastic #:nodoc:
 
   class SemanticFormBuilder < ActionView::Helpers::FormBuilder
-    class_inheritable_accessor :default_text_field_size, :default_text_area_height, :default_text_area_width, :all_fields_required_by_default, :include_blank_for_select_by_default,
-                   :required_string, :optional_string, :inline_errors, :label_str_method, :collection_value_methods, :collection_label_methods, :file_metadata_suffixes,
-                   :inline_order, :custom_inline_order, :file_methods, :priority_countries, :i18n_lookups_by_default, :escape_html_entities_in_hints_and_labels,
-                   :default_commit_button_accesskey, :default_inline_error_class, :default_hint_class, :default_error_list_class, :instance_reader => false
-
+    
+    configurables = [
+      :default_text_field_size, :default_text_area_height, :default_text_area_width, :all_fields_required_by_default, :include_blank_for_select_by_default,
+      :required_string, :optional_string, :inline_errors, :label_str_method, :collection_value_methods, :collection_label_methods, :file_metadata_suffixes,
+      :inline_order, :custom_inline_order, :file_methods, :priority_countries, :i18n_lookups_by_default, :escape_html_entities_in_hints_and_labels,
+      :default_commit_button_accesskey, :default_inline_error_class, :default_hint_class, :default_error_list_class
+    ]
+    
+    if defined?(:class_inheritable_attribute)
+      class_inheritable_accessor *configurables
+    else
+      class_attribute *configurables
+    end
+    
     cattr_accessor :custom_namespace
 
     self.default_text_field_size = nil

From 3b4080f728e40a883c3a6f214a721ff650299ca3 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 20 Dec 2010 08:12:07 +1100
Subject: [PATCH 376/992] CHANGELOG catch-up

---
 CHANGELOG | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5392e4bfc..be7b4010e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,26 @@
-[master]
+1.2.3
 
+* Removed deprecated methods input_field_set, button_field_set, boolean_select_input, boolean_radio_input and boolean_radio_input
+* Removed deprecated :class option on commit_button (use :input_html instead)
+* Fixed that stylesheets and initializers directories would be removed on uninstalling
+* Fixed some documentation and formatting
+* Fixed test coverage issues under Ruby 192 and Rails 2
+* Fixed that input_html options were not being passed down to checkbox tags
+* Added Rails 3 compatible form generator templates in addition to existing Rails 2 support
+* Added reflection on allow_blank option when determining the 'required' status of an input
+
+
+1.2.2
+
+* Removed deprecated aliased input names (:as => :boolean_select, :as => :boolean_radio_input
+* Removed deprecated aliased method names (input_field_set, button_field_set)
+* Removed deprecated :class => 'whatever' on commit_button
 * Fixed that classes in :button_html were being merged into :wrapper_html
 * Fixed that :include_blank was being ignored (always false) for multi selects 
+* Fixed that we should reflect on allow_blank option to determine required status with validates_inclusion_of
+* Added the ability to pass :input_html options be passed to the checkbox on a boolean input
+* Developers: Added bundler support to for developer/contribution
+* Developers: Fixed spec coverage under Rails 2 and Ruby 1.9.2
 
 1.2.1
 

From 88c55521095a5bd34a85871c41aa5ffa480e017a Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 20 Dec 2010 08:24:04 +1100
Subject: [PATCH 377/992] adding a note/warning about subclassing in the
 initializer template

---
 lib/generators/templates/formtastic.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/generators/templates/formtastic.rb b/lib/generators/templates/formtastic.rb
index 50bedbcbc..3372c6fa5 100644
--- a/lib/generators/templates/formtastic.rb
+++ b/lib/generators/templates/formtastic.rb
@@ -1,5 +1,13 @@
 # encoding: utf-8
 
+# --------------------------------------------------------------------------------------------------
+# Please note: If you're subclassing Formtastic::SemanticFormBuilder in a Rails 3 project, 
+# Formtastic uses class_attribute for these configuration attributes instead of the deprecated 
+# class_inheritable_attribute. The behaviour is slightly different with subclasses (especially 
+# around attributes with Hash or Array) values, so make sure you understand what's happening. 
+# See the documentation for class_attribute in ActiveSupport for more information.
+# --------------------------------------------------------------------------------------------------
+
 # Set the default text field size when input is a string. Default is nil.
 # Formtastic::SemanticFormBuilder.default_text_field_size = 50
 

From d7b9390f044811bc559985fc652007e6c8f8fa15 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 20 Dec 2010 22:05:23 +1100
Subject: [PATCH 378/992] .dup options hash before we fiddle with it so that
 the same hash can be re-used in views between inputs (GH-474)

---
 lib/formtastic.rb  |  4 +++-
 spec/input_spec.rb | 20 +++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 783a16955..ce1efccd4 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -99,6 +99,8 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
     #   <% end %>
     #
     def input(method, options = {})
+      options = options.dup # Allow options to be shared without being tainted by Formtastic
+      
       options[:required] = method_required?(method) unless options.key?(:required)
       options[:as]     ||= default_input_type(method, options)
 
@@ -1682,7 +1684,7 @@ def get_maxlength_for(method)
 
         if type == :text
           { :rows => self.class.default_text_area_height, :cols => self.class.default_text_area_width }
-        elsif type == :numeric || column.nil? || column.limit.nil?
+        elsif (type == :numeric) || !column.respond_to?(:limit) || column.nil? || column.limit.nil?
           { :maxlength => validation_max_limit,
             :size => self.class.default_text_field_size }
         else
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index e3d8f1d0f..53b2eade2 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -896,6 +896,24 @@ def should_be_required(options)
 
     end
   end
-
+  
+  describe 'options re-use' do
+    
+    it 'should retain :as option when re-using the same options hash' do
+      my_options = { :as => :string }
+      output = ''
+      
+      @form = semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:title, my_options))
+        concat(builder.input(:publish_at, my_options))
+      end
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      
+      output_buffer.should have_tag 'li.string', :count => 2
+    end
+    
+    
+  end
+  
 end
 

From 58a91b5085bd68aca4ed1ba5c5235f1066bb4ee2 Mon Sep 17 00:00:00 2001
From: Adam Meehan <adam.meehan@gmail.com>
Date: Mon, 20 Dec 2010 17:36:11 +0800
Subject: [PATCH 379/992] use class_attribute as the priority over
 class_inheritable_accesssor

---
 lib/formtastic.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 980a5a5c4..14015975d 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -14,10 +14,10 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
       :default_commit_button_accesskey, :default_inline_error_class, :default_hint_class, :default_error_list_class
     ]
     
-    if defined?(:class_inheritable_attribute)
-      class_inheritable_accessor *configurables
-    else
+    if respond_to?(:class_attribute)
       class_attribute *configurables
+    else
+      class_inheritable_accessor *configurables
     end
     
     cattr_accessor :custom_namespace

From 0a8fe2d17d36e6f37936a1739f527f0732b5ed8f Mon Sep 17 00:00:00 2001
From: Adam Meehan <adam.meehan@gmail.com>
Date: Mon, 20 Dec 2010 17:42:37 +0800
Subject: [PATCH 380/992] Use class_attribute configuration instance methods

---
 lib/formtastic.rb | 48 +++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 14015975d..5a2c2f424 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -123,7 +123,7 @@ def input(method, options = {})
         options[:label_html][:for] ||= options[:input_html][:id]
       end
 
-      input_parts = (self.class.custom_inline_order[options[:as]] || self.class.inline_order).dup
+      input_parts = (custom_inline_order[options[:as]] || inline_order).dup
       input_parts = input_parts - [:errors, :hints] if options[:as] == :hidden
 
       list_item_content = input_parts.map do |type|
@@ -360,7 +360,7 @@ def commit_button(*args)
         end
       else
         key = :submit
-        object_name = @object_name.to_s.send(self.class.label_str_method)
+        object_name = @object_name.to_s.send(label_str_method)
       end
 
       text = (self.localized_string(key, text, :action, :model => object_name) ||
@@ -373,7 +373,7 @@ def commit_button(*args)
       wrapper_html = options.delete(:wrapper_html) || {}
       wrapper_html[:class] = (wrapper_html_class << wrapper_html[:class]).flatten.compact.join(' ')
 
-      accesskey = (options.delete(:accesskey) || self.class.default_commit_button_accesskey) unless button_html.has_key?(:accesskey)
+      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, Formtastic::Util.html_safe(self.submit(text, button_html)), wrapper_html)
     end
@@ -460,7 +460,7 @@ def label(method, options_or_text=nil, options=nil)
     def inline_errors_for(method, options = {}) #:nodoc:
       if render_inline_errors?
         errors = error_keys(method, options).map{|x| @object.errors[x] }.flatten.compact.uniq
-        send(:"error_#{self.class.inline_errors}", [*errors], options) if errors.any?
+        send(:"error_#{inline_errors}", [*errors], options) if errors.any?
       else
         nil
       end
@@ -499,7 +499,7 @@ def error_keys(method, options)
         @methods_for_error ||= {}
         @methods_for_error[method] ||= begin
           methods_for_error = [method.to_sym]
-          methods_for_error << self.class.file_metadata_suffixes.map{|suffix| "#{method}_#{suffix}".to_sym} if is_file?(method, options)
+          methods_for_error << file_metadata_suffixes.map{|suffix| "#{method}_#{suffix}".to_sym} if is_file?(method, options)
           methods_for_error << [association_primary_key(method)] if association_macro_for_method(method) == :belongs_to
           methods_for_error.flatten.compact.uniq
         end
@@ -511,7 +511,7 @@ def has_errors?(method, options)
       end
 
       def render_inline_errors?
-        @object && @object.respond_to?(:errors) && INLINE_ERROR_TYPES.include?(self.class.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.
@@ -619,7 +619,7 @@ def method_required?(attribute) #:nodoc:
           if @object && @object.class.respond_to?(:validators_on)
             !@object.class.validators_on(attribute_sym).find{|validator| (validator.kind == :presence || validator.kind == :inclusion) && (validator.options.present? ? options_require_validation?(validator.options) : true)}.nil?
           else
-            self.class.all_fields_required_by_default
+            all_fields_required_by_default
           end
         end
       end
@@ -1283,21 +1283,21 @@ def inline_input_for(method, options)
       def inline_hints_for(method, options) #:nodoc:
         options[:hint] = localized_string(method, options[:hint], :hint)
         return if options[:hint].blank? or options[:hint].kind_of? Hash
-        hint_class = options[:hint_class] || self.class.default_hint_class
+        hint_class = options[:hint_class] || default_hint_class
         template.content_tag(:p, Formtastic::Util.html_safe(options[:hint]), :class => hint_class)
       end
 
       # Creates an error sentence by calling to_sentence on the errors array.
       #
       def error_sentence(errors, options = {}) #:nodoc:
-        error_class = options[:error_class] || self.class.default_inline_error_class
+        error_class = options[:error_class] || default_inline_error_class
         template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.untaint), :class => error_class)
       end
 
       # Creates an error li list.
       #
       def error_list(errors, options = {}) #:nodoc:
-        error_class = options[:error_class] || self.class.default_error_list_class
+        error_class = options[:error_class] || default_error_list_class
         list_elements = []
         errors.each do |error|
           list_elements <<  template.content_tag(:li, Formtastic::Util.html_safe(error.untaint))
@@ -1308,7 +1308,7 @@ def error_list(errors, options = {}) #:nodoc:
       # Creates an error sentence containing only the first error
       #
       def error_first(errors, options = {}) #:nodoc:
-        error_class = options[:error_class] || self.class.default_inline_error_class
+        error_class = options[:error_class] || default_inline_error_class
         template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => error_class)
       end
 
@@ -1318,9 +1318,9 @@ def error_first(errors, options = {}) #:nodoc:
       def required_or_optional_string(required) #:nodoc:
         string_or_proc = case required
           when true
-            self.class.required_string
+            required_string
           when false
-            self.class.optional_string
+            optional_string
           else
             required
         end
@@ -1467,7 +1467,7 @@ def is_file?(method, options = {})
         @files ||= {}
         @files[method] ||= (options[:as].present? && options[:as] == :file) || begin
           file = @object.send(method) if @object && @object.respond_to?(method)
-          file && self.class.file_methods.any?{|m| file.respond_to?(m)}
+          file && file_methods.any?{|m| file.respond_to?(m)}
         end
       end
 
@@ -1541,8 +1541,8 @@ def detect_label_and_value_method!(collection, options = {})
         end
 
         # Order of preference: user supplied method, class defaults, auto-detect
-        label = options[:label_method] || label || self.class.collection_label_methods.find { |m| sample.respond_to?(m) }
-        value = options[:value_method] || value || self.class.collection_value_methods.find { |m| sample.respond_to?(m) }
+        label = options[:label_method] || label || collection_label_methods.find { |m| sample.respond_to?(m) }
+        value = options[:value_method] || value || collection_value_methods.find { |m| sample.respond_to?(m) }
 
         [label, value]
       end
@@ -1690,13 +1690,13 @@ def get_maxlength_for(method)
         column = self.column_for(method)
 
         if type == :text
-          { :rows => self.class.default_text_area_height, :cols => self.class.default_text_area_width }
+          { :rows => default_text_area_height, :cols => default_text_area_width }
         elsif type == :numeric || column.nil? || column.limit.nil?
           { :maxlength => validation_max_limit,
-            :size => self.class.default_text_field_size }
+            :size => default_text_field_size }
         else
           { :maxlength => validation_max_limit || column.limit,
-            :size => self.class.default_text_field_size }
+            :size => default_text_field_size }
         end
       end
 
@@ -1742,12 +1742,12 @@ def humanized_attribute_name(method) #:nodoc:
         if @object && @object.class.respond_to?(:human_attribute_name)
           humanized_name = @object.class.human_attribute_name(method.to_s)
           if humanized_name == method.to_s.send(:humanize)
-            method.to_s.send(self.class.label_str_method)
+            method.to_s.send(label_str_method)
           else
             humanized_name
           end
         else
-          method.to_s.send(self.class.label_str_method)
+          method.to_s.send(label_str_method)
         end
       end
 
@@ -1778,7 +1778,7 @@ def localized_string(key, value, type, options = {}) #:nodoc:
         if value.is_a?(::String)
           escape_html_entities(value)
         else
-          use_i18n = value.nil? ? self.class.i18n_lookups_by_default : (value != false)
+          use_i18n = value.nil? ? i18n_lookups_by_default : (value != false)
 
           if use_i18n
             model_name, nested_model_name  = normalize_model_name(self.model_name.underscore)
@@ -1837,13 +1837,13 @@ def send_or_call(duck, object)
 
       def set_include_blank(options)
         unless options.key?(:include_blank) || options.key?(:prompt)
-          options[:include_blank] = self.class.include_blank_for_select_by_default
+          options[:include_blank] = include_blank_for_select_by_default
         end
         options
       end
 
       def escape_html_entities(string) #:nodoc:
-        if self.class.escape_html_entities_in_hints_and_labels
+        if escape_html_entities_in_hints_and_labels
           # Acceppt html_safe flag as indicator to skip escaping
           string = template.escape_once(string) unless string.respond_to?(:html_safe?) && string.html_safe? == true
         end

From 1b12feb5bd17525db09017c6bda32c1f7e20ac9a Mon Sep 17 00:00:00 2001
From: Adam Meehan <adam.meehan@gmail.com>
Date: Mon, 20 Dec 2010 17:43:01 +0800
Subject: [PATCH 381/992] Stylistic change to remove self. prefix on method
 calls

---
 lib/formtastic.rb | 70 +++++++++++++++++++++++------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 5a2c2f424..300dcbaae 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -291,8 +291,8 @@ def inputs(*args, &block)
         field_set_and_list_wrapping(*(args << html_options), &block)
       else
         if @object && args.empty?
-          args  = self.association_columns(:belongs_to)
-          args += self.content_columns
+          args  = association_columns(:belongs_to)
+          args += content_columns
           args -= RESERVED_COLUMNS
           args.compact!
         end
@@ -363,7 +363,7 @@ def commit_button(*args)
         object_name = @object_name.to_s.send(label_str_method)
       end
 
-      text = (self.localized_string(key, text, :action, :model => object_name) ||
+      text = (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) || {}
@@ -375,7 +375,7 @@ def commit_button(*args)
 
       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, Formtastic::Util.html_safe(self.submit(text, button_html)), wrapper_html)
+      template.content_tag(:li, Formtastic::Util.html_safe(submit(text, button_html)), wrapper_html)
     end
 
     # A thin wrapper around #fields_for to set :builder => Formtastic::SemanticFormBuilder
@@ -517,7 +517,7 @@ def render_inline_errors?
       # 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 []
+        model_name.constantize.content_columns.collect { |c| c.name.to_sym }.compact rescue []
       end
 
       # Collects association columns (relation columns) for the current form object class.
@@ -538,12 +538,12 @@ def association_columns(*by_associations) #:nodoc:
 
       # Returns nil, or a symbol like :belongs_to or :has_many
       def association_macro_for_method(method) #:nodoc:
-        reflection = self.reflection_for(method)
+        reflection = reflection_for(method)
         reflection.macro if reflection
       end
 
       def association_primary_key(method)
-        reflection = self.reflection_for(method)
+        reflection = reflection_for(method)
         reflection.options[:foreign_key] if reflection && !reflection.options[:foreign_key].blank?
         :"#{method}_id"
       end
@@ -649,8 +649,8 @@ def basic_input_helper(form_helper_method, type, method, options) #:nodoc:
         html_options[:id] ||= field_id
         label_options = options_for_label(options)
         label_options[:for] ||= html_options[:id]
-        self.label(method, label_options) <<
-        self.send(self.respond_to?(form_helper_method) ? form_helper_method : :text_field, method, html_options)
+        label(method, label_options) <<
+          send(respond_to?(form_helper_method) ? form_helper_method : :text_field, method, html_options)
       end
 
       # Outputs a label and standard Rails text field inside the wrapper.
@@ -707,7 +707,7 @@ def hidden_input(method, options)
         options ||= {}
         html_options = options.delete(:input_html) || strip_formtastic_options(options)
         html_options[:id] ||= generate_html_id(method, "")
-        self.hidden_field(method, html_options)
+        hidden_field(method, html_options)
       end
 
       # Outputs a label and a select box containing options from the parent
@@ -811,7 +811,7 @@ def select_input(method, options)
         html_options[:multiple] = html_options[:multiple] || options.delete(:multiple)
         html_options.delete(:multiple) if html_options[:multiple].nil?
 
-        reflection = self.reflection_for(method)
+        reflection = reflection_for(method)
         if reflection && [ :has_many, :has_and_belongs_to_many ].include?(reflection.macro)
           html_options[:multiple] = true if html_options[:multiple].nil?
           html_options[:size]     ||= 5
@@ -832,19 +832,19 @@ def select_input(method, options)
           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,
+          grouped_collection_select(input_name, group_collection,
                                          group_association, group_label_method,
                                          value, label,
                                          strip_formtastic_options(options), html_options)
         else
           collection = find_collection_for_column(method, options)
 
-          self.select(input_name, collection, strip_formtastic_options(options), html_options)
+          select(input_name, collection, strip_formtastic_options(options), html_options)
         end
 
         label_options = options_for_label(options).merge(:input_name => input_name)
         label_options[:for] ||= html_options[:id]
-        self.label(method, label_options) << select_html
+        label(method, label_options) << select_html
       end
 
       # Outputs a timezone select input as Rails' time_zone_select helper. You
@@ -859,8 +859,8 @@ def time_zone_input(method, options)
         html_options[:id] ||= field_id
         label_options = options_for_label(options)
         label_options[:for] ||= html_options[:id]
-        self.label(method, label_options) <<
-        self.time_zone_select(method, options.delete(:priority_zones),
+        label(method, label_options) <<
+        time_zone_select(method, options.delete(:priority_zones),
           strip_formtastic_options(options), html_options)
       end
 
@@ -937,7 +937,7 @@ def radio_input(method, options)
           html_options[:id] = input_id
 
           li_content = template.content_tag(:label,
-            Formtastic::Util.html_safe("#{self.radio_button(input_name, value, html_options)} #{escape_html_entities(label)}"),
+            Formtastic::Util.html_safe("#{radio_button(input_name, value, html_options)} #{escape_html_entities(label)}"),
             :for => input_id
           )
 
@@ -1176,7 +1176,7 @@ def check_boxes_input(method, options)
           html_options[:id] = input_id
 
           li_content = template.content_tag(:label,
-            Formtastic::Util.html_safe("#{self.create_check_boxes(input_name, html_options, value, unchecked_value, hidden_fields)} #{escape_html_entities(label)}"),
+            Formtastic::Util.html_safe("#{create_check_boxes(input_name, html_options, value, unchecked_value, hidden_fields)} #{escape_html_entities(label)}"),
             :for => input_id
           )
 
@@ -1185,7 +1185,7 @@ def check_boxes_input(method, options)
         end
 
         fieldset_content = legend_tag(method, options)
-        fieldset_content << self.create_hidden_field_for_check_boxes(input_name, value_as_class) unless hidden_fields
+        fieldset_content << create_hidden_field_for_check_boxes(input_name, value_as_class) unless hidden_fields
         fieldset_content << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
         template.content_tag(:fieldset, fieldset_content)
       end
@@ -1216,7 +1216,7 @@ def create_hidden_field_for_check_boxes(method, value_as_class) #:nodoc:
       # otherwise the helper uses the output generated by the rails check_box method.
       def create_check_boxes(input_name, html_options = {}, checked_value = "1", unchecked_value = "0", hidden_fields = false) #:nodoc:
         return template.check_box_tag(input_name, checked_value, html_options[:checked], html_options) unless hidden_fields == true
-        self.check_box(input_name, html_options, checked_value, unchecked_value)
+        check_box(input_name, html_options, checked_value, unchecked_value)
       end
 
       # Outputs a country select input, wrapping around a regular country_select helper.
@@ -1234,18 +1234,18 @@ def create_check_boxes(input_name, html_options = {}, checked_value = "1", unche
       #   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)
+        raise "To use the :country input, please install a country_select plugin, like this one: http://github.com/rails/iso-3166-country-select" unless respond_to?(:country_select)
 
         html_options = options.delete(:input_html) || {}
-        priority_countries = options.delete(:priority_countries) || self.class.priority_countries
+        priority_countries = options.delete(:priority_countries) || self.priority_countries
 
         field_id = generate_html_id(method, "")
         html_options[:id] ||= field_id
         label_options = options_for_label(options)
         label_options[:for] ||= html_options[:id]
 
-        self.label(method, label_options) <<
-        self.country_select(method, priority_countries, strip_formtastic_options(options), html_options)
+        label(method, label_options) <<
+        country_select(method, priority_countries, strip_formtastic_options(options), html_options)
       end
 
       # Outputs a label containing a checkbox and the label text. The label defaults
@@ -1270,7 +1270,7 @@ def boolean_input(method, options)
         # the label() method will insert this nested input into the label at the last minute
         options[:label_prefix_for_nested_input] = input
 
-        template.hidden_field_tag("#{@object_name}[#{method}]", unchecked_value, :id => nil) << self.label(method, options)
+        template.hidden_field_tag("#{@object_name}[#{method}]", unchecked_value, :id => nil) << label(method, options)
       end
 
       # Generates an input for the given method using the type supplied with :as.
@@ -1384,7 +1384,7 @@ def field_set_title_from_args(*args) #:nodoc:
 
         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))
+          valid_name_classes.delete(::Symbol) if !block_given? && (args.first.is_a?(::Symbol) && 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)
@@ -1399,7 +1399,7 @@ def field_set_and_list_wrapping_for_method(method, options, contents) #:nodoc:
 
         template.content_tag(:fieldset,
             template.content_tag(:legend,
-                self.label(method, options_for_label(options).merge(:for => options.delete(:label_for))), :class => 'label'
+                label(method, options_for_label(options).merge(:for => options.delete(:label_for))), :class => 'label'
               ) <<
             template.content_tag(:ol, Formtastic::Util.html_safe(contents))
           )
@@ -1426,7 +1426,7 @@ def legend_tag(method, options = {})
       # default is a :string, a similar behaviour to Rails' scaffolding.
       #
       def default_input_type(method, options = {}) #:nodoc:
-        if column = self.column_for(method)
+        if column = column_for(method)
           # Special cases where the column type doesn't map to an input method.
           case column.type
           when :string
@@ -1438,7 +1438,7 @@ def default_input_type(method, options = {}) #:nodoc:
             return :phone     if method.to_s =~ /(phone|fax)/
             return :search    if method.to_s =~ /^search$/
           when :integer
-            return :select    if self.reflection_for(method)
+            return :select    if reflection_for(method)
             return :numeric
           when :float, :decimal
             return :numeric
@@ -1452,7 +1452,7 @@ def default_input_type(method, options = {}) #:nodoc:
           return column.type
         else
           if @object
-            return :select  if self.reflection_for(method)
+            return :select  if reflection_for(method)
 
             return :file    if is_file?(method, options)
           end
@@ -1502,7 +1502,7 @@ def find_collection_for_column(column, options) #:nodoc:
       def find_raw_collection_for_column(column, options) #:nodoc:
         collection = if options[:collection]
           options.delete(:collection)
-        elsif reflection = self.reflection_for(column)
+        elsif reflection = reflection_for(column)
           options[:find_options] ||= {}
 
           if conditions = reflection.options[:conditions]
@@ -1557,7 +1557,7 @@ def detect_label_method(collection) #:nodoc:
       # 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)
+        object_to_method_reflection = reflection_for(method)
         method_class = object_to_method_reflection.klass
 
         method_to_group_association = method_class.reflect_on_association(group_by)
@@ -1615,7 +1615,7 @@ def create_boolean_collection(options) #:nodoc:
       #   has_and_belongs_to_many will act like has_many
       #
       def generate_association_input_name(method) #:nodoc:
-        if reflection = self.reflection_for(method)
+        if reflection = reflection_for(method)
           if [:has_and_belongs_to_many, :has_many].include?(reflection.macro)
             "#{method.to_s.singularize}_ids"
           else
@@ -1687,7 +1687,7 @@ def get_maxlength_for(method)
         end
 
         validation_max_limit = get_maxlength_for(method)
-        column = self.column_for(method)
+        column = column_for(method)
 
         if type == :text
           { :rows => default_text_area_height, :cols => default_text_area_width }
@@ -1907,7 +1907,7 @@ def with_custom_field_error_proc(&block)
 
     def semantic_remote_form_for_wrapper(record_or_name_or_array, *args, &proc)
       options = args.extract_options!
-      if self.respond_to? :remote_form_for
+      if respond_to? :remote_form_for
         semantic_remote_form_for_real(record_or_name_or_array, *(args << options), &proc)
       else
         options[:remote] = true

From f7deceebe2803c664aa482859023e3831db11747 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 20 Dec 2010 22:28:36 +1100
Subject: [PATCH 382/992] CHANGELOG catch-up

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index be7b4010e..bbd0887c6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,8 @@
 * Fixed some documentation and formatting
 * Fixed test coverage issues under Ruby 192 and Rails 2
 * Fixed that input_html options were not being passed down to checkbox tags
+* Changed internal duplication of the options hash so that the same options hash can be re-used over multiple inputs without being altered
+* Changed internal configuration to use class_attribute when available (Rails 3) to avoid deprecation warnings
 * Added Rails 3 compatible form generator templates in addition to existing Rails 2 support
 * Added reflection on allow_blank option when determining the 'required' status of an input
 

From f2a9ff4bab40659496471eb52161388e90463656 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 21 Dec 2010 10:49:56 +1100
Subject: [PATCH 383/992] fixing a bad merge

Conflicts:

	lib/formtastic.rb
---
 lib/formtastic.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 85990ae55..2ce73a472 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1694,7 +1694,7 @@ def get_maxlength_for(method)
         if type == :text
           { :rows => default_text_area_height, 
             :cols => default_text_area_width }
-        elsif (type == :numeric) || !column.respond_to?(:limit) || column.nil? || column.limit.nil?
+        elsif type == :numeric || column.nil? || !column.respond_to?(:limit) || column.limit.nil?
           { :maxlength => validation_max_limit,
             :size => default_text_field_size }
         else

From caaa980ca1ab2ec045ee547594a17611f530b4bb Mon Sep 17 00:00:00 2001
From: Rahul Trikha <rahul@katalyst.com.au>
Date: Fri, 24 Dec 2010 16:08:21 +1030
Subject: [PATCH 384/992] Changed formastic to formtastic in README

---
 README.textile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.textile b/README.textile
index f0b2c5a8f..0c0bc3dec 100644
--- a/README.textile
+++ b/README.textile
@@ -563,7 +563,7 @@ h3. Generating a partial with @--partial@
 You can also ask Formtastic to *generate a partial* with the @--partial@ option, placing it in the correct location inside your @app/views@ directory:
 
 <pre>
-  $ rails generate formastic:form Post --partial
+  $ rails generate formtastic:form Post --partial
       exists  app/views/posts
       create  app/views/posts/_form.html.erb
 </pre>
@@ -571,7 +571,7 @@ You can also ask Formtastic to *generate a partial* with the @--partial@ option,
 h3. Specifying HAML instead of ERB with @--haml@
 
 <pre>
-  $ rails generate formastic:form Post --haml
+  $ rails generate formtastic:form Post --haml
       exists  app/views/admin/posts
       create  app/views/admin/posts/_form.html.haml
 </pre>
@@ -579,7 +579,7 @@ h3. Specifying HAML instead of ERB with @--haml@
 h3. Specifying controller namespace with @--controller@
 
 <pre>
-  $ rails generate formastic:form Post --partial --controller admin/posts
+  $ rails generate formtastic:form Post --partial --controller admin/posts
       exists  app/views/admin/posts
       create  app/views/admin/posts/_form.html.erb
 </pre>

From f7e2c87d94bc0ae72cc8b1837814aaa07ba9d6f7 Mon Sep 17 00:00:00 2001
From: Rahul Trikha <rahul@katalyst.com.au>
Date: Fri, 24 Dec 2010 13:38:21 +0800
Subject: [PATCH 385/992] Changed formastic to formtastic in README

---
 README.textile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.textile b/README.textile
index f0b2c5a8f..0c0bc3dec 100644
--- a/README.textile
+++ b/README.textile
@@ -563,7 +563,7 @@ h3. Generating a partial with @--partial@
 You can also ask Formtastic to *generate a partial* with the @--partial@ option, placing it in the correct location inside your @app/views@ directory:
 
 <pre>
-  $ rails generate formastic:form Post --partial
+  $ rails generate formtastic:form Post --partial
       exists  app/views/posts
       create  app/views/posts/_form.html.erb
 </pre>
@@ -571,7 +571,7 @@ You can also ask Formtastic to *generate a partial* with the @--partial@ option,
 h3. Specifying HAML instead of ERB with @--haml@
 
 <pre>
-  $ rails generate formastic:form Post --haml
+  $ rails generate formtastic:form Post --haml
       exists  app/views/admin/posts
       create  app/views/admin/posts/_form.html.haml
 </pre>
@@ -579,7 +579,7 @@ h3. Specifying HAML instead of ERB with @--haml@
 h3. Specifying controller namespace with @--controller@
 
 <pre>
-  $ rails generate formastic:form Post --partial --controller admin/posts
+  $ rails generate formtastic:form Post --partial --controller admin/posts
       exists  app/views/admin/posts
       create  app/views/admin/posts/_form.html.erb
 </pre>

From 3fc58a4fb26ed19c8f48a7c4f0259dc47b0d5985 Mon Sep 17 00:00:00 2001
From: Alex Sharp <ajsharp@gmail.com>
Date: Tue, 4 Jan 2011 14:43:18 -0800
Subject: [PATCH 386/992] depend on i18n ~> 0.4

i18n >= 0.5.0 is incompatible with rails 2.3.5
---
 formtastic.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 9da69d98d..ada3309f3 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency(%q<activesupport>, [">= 2.3.7"])
   s.add_dependency(%q<actionpack>, [">= 2.3.7"])
-  s.add_dependency(%q<i18n>, [">= 0.4.0"])
+  s.add_dependency(%q<i18n>, ["~> 0.4"])
   
   if ENV['RAILS_2']
     s.add_development_dependency(%q<rails>, ["~> 2.3.8"])

From f9984c3c2041d354f79f8d796064cc5e525c150e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 21 Dec 2010 10:48:07 +1100
Subject: [PATCH 387/992] updated developer instructions

---
 README.textile | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/README.textile b/README.textile
index 0c0bc3dec..035a398c7 100644
--- a/README.textile
+++ b/README.textile
@@ -650,20 +650,13 @@ We currently support both Rails 2 and Rails 3, under Ruby 1.8.7-ish (and 1.9.2-i
 
 <pre>
   $ cd ~/code/formtastic
-  $ rvm gemset create formtastic-rails3
-  $ rvm gemset use formtastic-rails3
-  $ gem install bundler
-  $ bundle install
-  $ rake spec
-  $ rm Gemfile.lock
-  $ rvm gemset create formtastic-rails2
-  $ rvm gemset use formtastic-rails2
-  $ gem install bundler
-  $ RAILS_2=true bundle install
-  $ RAILS_2=true rake spec
-  $ touch .rvmrc
-  $ echo "rvm gemset use formtastic-rails-3" > .rvmrc
-  $ cd ~/code/formtastic
+  $ rvm gemset create formtastic      # If that's your thing
+  $ rvm gemset use formtastic         # Add that to your .rvmrc too
+  $ bundle install                    # Initial bundle command to build Gemfile.lock
+  $ RAILS_2=true bundle update rails  # Updates gemfile to run agains rails 2
+  $ RAILS_2=true rake                 # Run tests against rails 2
+  $ bundle update rails               # Updates gemfile to run agains rails 3
+  $ rake                              # Run tests against rails 3
 </pre>
 
 

From a986b88f40c640487020c309c1dc2799e408fb3d Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 7 Jan 2011 09:28:55 +1100
Subject: [PATCH 388/992] version bump

---
 formtastic.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index ada3309f3..2e76e45af 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formtastic}
-  s.version = "1.2.1"
-  s.date = %q{2010-11-22}
+  s.version = "1.2.3"
+  s.date = %q{2011-01-07}
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin French"]

From 540f23b794eb50d356e96040715cd9f36b54939f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 7 Jan 2011 12:15:23 +1100
Subject: [PATCH 389/992] added a very rough HTML page for visually testing CSS
 changes. Very rough, very WIP.

---
 stylesheet_tests/basic_inputs.html | 123 +++++++++++++++++++++++++++++
 1 file changed, 123 insertions(+)
 create mode 100644 stylesheet_tests/basic_inputs.html

diff --git a/stylesheet_tests/basic_inputs.html b/stylesheet_tests/basic_inputs.html
new file mode 100644
index 000000000..c83644410
--- /dev/null
+++ b/stylesheet_tests/basic_inputs.html
@@ -0,0 +1,123 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+   "http://www.w3.org/TR/html4/strict.dtd">
+
+<html lang="en">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>index</title>
+	<link rel="stylesheet" href="../lib/generators/templates/formtastic.css" type="text/css">
+	<style>
+	  body { font-family:helvetica, arial; }
+	</style>
+</head>
+<body>
+  
+  <form class='formtastic'>
+    <fieldset>
+      <ol>
+        
+        <li class="string">
+          <label>String</label>
+          <input type="text" value="value" size="5" maxlength="2">
+        </li>
+        
+        <li class="url">
+          <label>URL</label>
+          <input type="url" value="value">
+        </li>
+        
+        <li class="password">
+          <label>Password</label>
+          <input type="password" value="value">
+        </li>
+        
+        <li class="numeric">
+          <label>Numeric</label>
+          <input type="numeric" value="value">
+        </li>
+        
+        <li class="file">
+          <label>File</label>
+          <input type="file" value="value">
+        </li>
+        
+        <li class="email">
+          <label>Email</label>
+          <input type="email" value="value">
+        </li>
+        
+        <li class="phone">
+          <label>Phone</label>
+          <input type="phone" value="value">
+        </li>
+        
+        <li class="search">
+          <label>Search</label>
+          <input type="search" value="value">
+        </li>
+        
+        <li class="text">
+          <label>Text</label>
+          <textarea>value</textarea>
+        </li>
+        
+        <li class="date">
+          <fieldset>
+            <legend class="label"><label>Date</label></legend>
+            <ol>
+              <li>
+                <label>Year</label>
+                <select>
+                  <option>Foo</option>
+                </select>
+              </li>
+              <li>
+                <label>Month</label>
+                <select>
+                  <option>Foo</option>
+                </select>
+              </li>
+              <li>
+                <label>Day</label>
+                <select>
+                  <option>Foo</option>
+                </select>
+              </li>
+            </ol>
+          </fieldset>
+        </li>
+        
+        <li class="radio">
+          <fieldset>
+            <legend class="label"><label>Radio</label></legend>
+            <ol>
+              <li>
+                <label><input type="radio"> Foo</label></label>
+              </li>
+              <li>
+                <label><input type="radio"> Bah</label></label>
+              </li>
+            </ol>
+          </fieldset>
+        </li>
+        
+        <li class="check_boxes">
+          <fieldset>
+            <legend class="label"><label>Radio</label></legend>
+            <ol>
+              <li>
+                <label><input type="checkbox"> Foo</label></label>
+              </li>
+              <li>
+                <label><input type="checkbox"> Bah</label></label>
+              </li>
+            </ol>
+          </fieldset>
+        </li>
+
+      </ol>
+    </fieldset>
+  </form>
+
+</body>
+</html>

From 53323288f1193a29f9042c104131fc508e5a0166 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 7 Jan 2011 12:38:26 +1100
Subject: [PATCH 390/992] fix for GH-477 where tiny scroll bars were appearing
 on legends in date/time/radio/cbheckboxes fielsets

---
 lib/generators/templates/formtastic.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index 91540c74b..988487835 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -56,7 +56,7 @@ form.formtastic fieldset > ol > li > li label input { line-height:100%; vertical
 /* NESTED FIELDSETS AND LEGENDS (radio, check boxes and date/time inputs use nested fieldsets)
 --------------------------------------------------------------------------------------------------*/
 form.formtastic fieldset > ol > li fieldset { position:relative; }
-form.formtastic fieldset > ol > li fieldset legend { position:absolute; width:95%; padding-top:0.1em; left: 0px; }
+form.formtastic fieldset > ol > li fieldset legend { position:absolute; width:95%; left: 0px; }
 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%; }

From 1614ebdb0045c2bfd437ca17c3008db1e4c01b16 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 10 Jan 2011 07:03:39 +1100
Subject: [PATCH 391/992] shift with_deprecation_silenced method out to a
 spec/support file

---
 spec/spec_helper.rb         | 6 ------
 spec/support/deprecation.rb | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 spec/support/deprecation.rb

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index df17d175d..01d63ea8b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -307,12 +307,6 @@ def with_config(config_method_name, value, &block)
     ::Formtastic::SemanticFormBuilder.send(:"#{config_method_name}=", old_value)
   end
 
-  def with_deprecation_silenced(&block)
-    ::ActiveSupport::Deprecation.silenced = true
-    yield
-    ::ActiveSupport::Deprecation.silenced = false
-  end
-
 end
 
 ::ActiveSupport::Deprecation.silenced = false
diff --git a/spec/support/deprecation.rb b/spec/support/deprecation.rb
new file mode 100644
index 000000000..a795aaae6
--- /dev/null
+++ b/spec/support/deprecation.rb
@@ -0,0 +1,6 @@
+def with_deprecation_silenced(&block)
+  ::ActiveSupport::Deprecation.silenced = true
+  yield
+  ::ActiveSupport::Deprecation.silenced = false
+end
+

From adfd744de9e2ce7f9a2aed4a3b4a2e9c08bcffff Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 10 Jan 2011 07:35:11 +1100
Subject: [PATCH 392/992] with_deprecation_silenced now remembers previous
 state, rather than assuming it was true

---
 spec/support/deprecation.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/support/deprecation.rb b/spec/support/deprecation.rb
index a795aaae6..878af0d76 100644
--- a/spec/support/deprecation.rb
+++ b/spec/support/deprecation.rb
@@ -1,6 +1,7 @@
 def with_deprecation_silenced(&block)
+  previous_value = ::ActiveSupport::Deprecation.silenced
   ::ActiveSupport::Deprecation.silenced = true
   yield
-  ::ActiveSupport::Deprecation.silenced = false
+  ::ActiveSupport::Deprecation.silenced = previous_value
 end
 

From 38bc4dd154e03c981a4d8a118abbb2fd683c53c8 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 12 Jan 2011 21:25:03 +1100
Subject: [PATCH 393/992] Remove Rails 2 stuff from README

---
 README.textile | 67 +++++---------------------------------------------
 1 file changed, 6 insertions(+), 61 deletions(-)

diff --git a/README.textile b/README.textile
index 035a398c7..5229a4b09 100644
--- a/README.textile
+++ b/README.textile
@@ -46,7 +46,7 @@ h2. It's better than _SomeOtherFormBuilder_ because...
 
 * it can handle @belongs_to@ associations (like Post belongs_to :author), rendering a select or set of radio inputs with choices from the parent model.
 * it can handle @has_many@ and @has_and_belongs_to_many@ associations (like: Post has_many :tags), rendering a multi-select with choices from the child models.
-* it's Rails 2.x and 3.x compatible (including nested forms).
+* it's Rails 3 compatible (including nested forms).
 * it has internationalization (I18n)!
 * it's _really_ quick to get started with a basic form in place (4 lines), then go back to add in more detail if you need it.
 * there's heaps of elements, id and class attributes for you to hook in your CSS and JS.
@@ -81,24 +81,18 @@ RDoc documentation _should_ be automatically generated after each commit and mad
 
 h2. Installation
 
-Formtastic is now compatible with both Rails 2 and Rails 3, and the gem is "hosted":http://rubygems.org/gems/formtastic on RubyGems.org.
-
-*You'll need to use Bundler (yes, even under Rails 2, due to the many ways gem dependencies suck). Follow "this tutorial":http://gembundler.com/rails23.html.*
+Formtastic 2 compatible with Rails 3 only, and the gem is "hosted":http://rubygems.org/gems/formtastic on RubyGems.org.
 
 Simply add Formtastic to your Gemfile and bundle it up:
 
 <pre>
-  gem 'formtastic', '~> 1.1.0'
+  gem 'formtastic', '~> 2.0.0'
 </pre>
 
 Optionally, run the generator to copy some stylesheets and a configuration initializer into your application:
 
 <pre>
-  # Rails 3:
   $ rails generate formtastic:install 
-  
-  # Or Rails 2:
-  $ ./script/generate formtastic 
 </pre>
 
 
@@ -115,31 +109,6 @@ A proof-of-concept stylesheet is provided which you can include in your layout.
 </pre>
 
 
-h2. Syntax
-
-*Please note:* Formtastic makes use of a lot of ERB blocks and currently supports both Rails 2 and Rails 3, which means the syntax in these examples will differ depending on which version of Rails you're using.
-
-The difference is subtle, with most blocks in Rails 3 requiring the addition of an equals sign:
-
-<pre>
-  <!-- Rails 2 -->
-  <% semantic_form_for @user do |form| %>
-    <% form.inputs do %>
-      ...
-    <% end %>
-  <% end %>
-  
-  <!-- Rails 3 -->
-  <%= semantic_form_for @user do |form| %>
-    <%= form.inputs do %>
-      ...
-    <% end %>
-  <% end %>
-</pre>
-  
-This README is currently documenting the Rails 2 way only. If you're using Rails 3 and your forms aren't rendering everything as expected, try changing @<%@ to @<%=@.
-
-
 h2. Usage
 
 Forms are really boring to code... you want to get onto the good stuff as fast as possible.
@@ -519,7 +488,7 @@ If you have the "ValidationReflection":http://github.com/redinger/validation_ref
 
 h2. Configuration
 
-Run @rails generate formtastic:install@ (Rails 3) or @./script/generate formtastic@ (Rails 2) to copy a commented out config file into @config/initializers/formtastic.rb@. You can "view the configuration file on GitHub":http://github.com/justinfrench/formtastic/blob/master/generators/formtastic/templates/formtastic.rb
+Run @rails generate formtastic:install@ to copy a commented out config file into @config/initializers/formtastic.rb@. You can "view the configuration file on GitHub":http://github.com/justinfrench/formtastic/blob/master/generators/formtastic/templates/formtastic.rb
 
 
 h2. Form Generator
@@ -528,18 +497,10 @@ There's a Formtastic form code generator to make your transition to Formtastic e
 
 h3. Basic usage
 
-Rails 3:
-
 <pre>
   $ rails generate formtastic:form ModelName
 </pre>
 
-Rails 2:
-
-<pre>
-  $ ./script/generate form ModelName
-</pre>
-
 The results are something like this, with the ERB code printed out to the terminal 
 
 <pre>
@@ -629,8 +590,8 @@ There are none, but...
 
 h2. Compatibility
 
-* We're only testing Formtastic with the latest Rails 2.x and 3.x stable releases. Patches are welcome to allow backwards compatibility with older versions of Rails, of course.
-* Formtastic, much like Rails 2, is very ActiveRecord-centric. Many people are using Formtastic (especially the rails3 branch) successfully with other ActiveModel-like ORMs and classes (DataMapper, MongoMapper, Mongoid, Authlogic, Devise...) but we're not guaranteeing anything at this stage. Patches are welcome, but it's not our core focus right now.
+* We're only testing Formtastic with the latest Rails stable release. Patches are welcome to allow backwards compatibility with previous versions of Rails, of course, but we've dropped support for Rails 2. Formtastic 1.x is compatible with Rails 2, and is being maintained for bug fixes only. See the README in the "1.2-stable branch":https://github.com/justinfrench/formtastic/tree/1.2-stable.
+* Formtastic, much like Rails, is very ActiveRecord-centric. Many people are using Formtastic successfully with other ActiveModel-like ORMs and classes (DataMapper, MongoMapper, Mongoid, Authlogic, Devise...) but we're not guaranteeing full compatibility at this stage. Patches are welcome.
  
 
 h2. How to contribute
@@ -644,22 +605,6 @@ For significant changes, you may wish to discuss your idea on the Formtastic Goo
 See below for installation of a development environment.
 
 
-h2. Development Environment
-
-We currently support both Rails 2 and Rails 3, under Ruby 1.8.7-ish (and 1.9.2-ish). That means, at a bare minimum, you'll want to set-up two rvm gemsets to run your specs against. So, fork the project on Github, clone it, make some gemsets, run bundler, run your specs and then finally set-up an .rvmrc file that specifies Rails 3 as your default gemset and cd back into that directory to load in the .rvmrc file. Something like this:
-
-<pre>
-  $ cd ~/code/formtastic
-  $ rvm gemset create formtastic      # If that's your thing
-  $ rvm gemset use formtastic         # Add that to your .rvmrc too
-  $ bundle install                    # Initial bundle command to build Gemfile.lock
-  $ RAILS_2=true bundle update rails  # Updates gemfile to run agains rails 2
-  $ RAILS_2=true rake                 # Run tests against rails 2
-  $ bundle update rails               # Updates gemfile to run agains rails 3
-  $ rake                              # Run tests against rails 3
-</pre>
-
-
 h2. Maintainers & Contributors
 
 Formtastic is maintained by "Justin French":http://github.com/justinfrench, "Morton Jonuschat":http://github.com/yabawock and "Gabriel Sobrinho":http://github.com/sobrinho. "Denis Major":http://github.com/denismajor1 is doing some amazing documentation work in the wiki, and we very much appreciate the past efforts of "José Valim":http://github.com/josevalim and "Jonas Grimfelt":http://github.com/grimen and over 40 other contributors.

From f4e9da2575273dbe2018cd64555be61c64ec5b46 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 12 Jan 2011 22:24:35 +1100
Subject: [PATCH 394/992] removed rails2? and rails3? methods

---
 spec/form_helper_spec.rb | 14 +++-----------
 spec/spec_helper.rb      |  8 --------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/spec/form_helper_spec.rb b/spec/form_helper_spec.rb
index b27234ef2..1a27ba6bf 100644
--- a/spec/form_helper_spec.rb
+++ b/spec/form_helper_spec.rb
@@ -101,17 +101,9 @@
     end
 
     it 'can be called with a generic style and instance variable' do
-      if rails3?
-        semantic_form_for(@new_post, :as => :post, :url => new_post_path) do |builder|
-          builder.object.class.should == ::Post
-          builder.object_name.to_s.should == "post" # TODO: is this forced .to_s a bad assumption somewhere?
-        end
-      end
-      if rails2?
-        semantic_form_for(:post, @new_post, :url => new_post_path) do |builder|
-          builder.object.class.should == ::Post
-          builder.object_name.to_s.should == "post" # TODO: is this forced .to_s a bad assumption somewhere?
-        end
+      semantic_form_for(@new_post, :as => :post, :url => new_post_path) do |builder|
+        builder.object.class.should == ::Post
+        builder.object_name.to_s.should == "post" # TODO: is this forced .to_s a bad assumption somewhere?
       end
     end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 01d63ea8b..f4c724cf9 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -37,14 +37,6 @@ module FormtasticSpecHelper
 
   include Formtastic::SemanticFormHelper
 
-  def rails3?
-    ActionPack::VERSION::MAJOR > 2
-  end
-
-  def rails2?
-    ActionPack::VERSION::MAJOR == 2
-  end
-
   def default_input_type(column_type, column_name = :generic_column_name)
     @new_post.stub!(column_name)
     @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => column_type)) unless column_type.nil?

From c5a26ad31760088aaeea2df26f279a5a988aa8ab Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 12 Jan 2011 22:28:23 +1100
Subject: [PATCH 395/992] remove Rails 2 from gemspec

---
 formtastic.gemspec | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 2e76e45af..2ab6e37b6 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -19,12 +19,10 @@ Gem::Specification.new do |s|
   ------------------------------------------------------------------------
   You can now (optionally) run the generator to copy some stylesheets and
   a config initializer into your application:
-    rails generate formtastic:install # Rails 3
-    ./script/generate formtastic      # Rails 2
+    rails generate formtastic:install
 
   To generate some semantic form markup for your existing models, just run:
-    rails generate formtastic:form MODEL_NAME # Rails 3
-    ./script/generate form MODEL_NAME         # Rails 2
+    rails generate formtastic:form MODEL_NAME
 
   Find out more and get involved:
     http://github.com/justinfrench/formtastic
@@ -35,15 +33,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}
 
-  s.add_dependency(%q<activesupport>, [">= 2.3.7"])
-  s.add_dependency(%q<actionpack>, [">= 2.3.7"])
-  s.add_dependency(%q<i18n>, ["~> 0.4"])
-  
-  if ENV['RAILS_2']
-    s.add_development_dependency(%q<rails>, ["~> 2.3.8"])
-  else
-    s.add_development_dependency(%q<rails>, [">= 3.0.0"])
-  end
+  s.add_dependency(%q<rails>, ["~> 3.0.0"])
+
   s.add_development_dependency(%q<rspec-rails>, ["~> 2.0.0"])
   s.add_development_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
   s.add_development_dependency(%q<hpricot>, ["~> 0.8.3"])

From 5457247b392301d8a54a3b502ab0dc3b60c3d87a Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 12 Jan 2011 22:29:25 +1100
Subject: [PATCH 396/992] added twitter to gem install welcome note

---
 formtastic.gemspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 2ab6e37b6..011db2f9b 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
   Find out more and get involved:
     http://github.com/justinfrench/formtastic
     http://groups.google.com.au/group/formtastic
+    http://twitter.com/formtastic
   ========================================================================
   }
   s.rdoc_options = ["--charset=UTF-8"]

From bbe47ad7a5cb738dbf1c4010737affb61b26e481 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 12 Jan 2011 22:30:53 +1100
Subject: [PATCH 397/992] removed Rails 2 generators

---
 generators/form/USAGE                         |  16 ---
 generators/form/form_generator.rb             | 111 ------------------
 generators/formtastic/formtastic_generator.rb |  26 ----
 3 files changed, 153 deletions(-)
 delete mode 100644 generators/form/USAGE
 delete mode 100644 generators/form/form_generator.rb
 delete mode 100644 generators/formtastic/formtastic_generator.rb

diff --git a/generators/form/USAGE b/generators/form/USAGE
deleted file mode 100644
index 09e6bb4a0..000000000
--- a/generators/form/USAGE
+++ /dev/null
@@ -1,16 +0,0 @@
-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]
\ No newline at end of file
diff --git a/generators/form/form_generator.rb b/generators/form/form_generator.rb
deleted file mode 100644
index 7eba7b408..000000000
--- a/generators/form/form_generator.rb
+++ /dev/null
@@ -1,111 +0,0 @@
-# encoding: utf-8
-
-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 "_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, "_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
-
-    def save_to_clipboard(data)
-      return unless data
-
-      begin
-        case RUBY_PLATFORM
-        when /win32/
-          require 'win32/clipboard'
-          ::Win32::Clipboard.data = data
-        when /darwin/ # mac
-          `echo "#{data}" | pbcopy`
-        else # linux/unix
-          `echo "#{data}" | xsel --clipboard` || `echo "#{data}" | xclip`
-        end
-      rescue LoadError
-        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
-    
-    def source_root
-      File.expand_path('../../../lib/generators/templates/rails2', __FILE__)
-    end
-
-end
diff --git a/generators/formtastic/formtastic_generator.rb b/generators/formtastic/formtastic_generator.rb
deleted file mode 100644
index b06c0758f..000000000
--- a/generators/formtastic/formtastic_generator.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# encoding: utf-8
-
-class FormtasticGenerator < Rails::Generator::Base
-
-  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
-  
-  def source_root
-    File.expand_path('../../../lib/generators/templates', __FILE__)
-  end
-
-end

From 3ce50b15d27f9f62921e5436477c75e4600bdaa9 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 12 Jan 2011 22:32:37 +1100
Subject: [PATCH 398/992] it's always Rails 3 now

---
 lib/generators/templates/formtastic.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/generators/templates/formtastic.rb b/lib/generators/templates/formtastic.rb
index 3372c6fa5..78e21e358 100644
--- a/lib/generators/templates/formtastic.rb
+++ b/lib/generators/templates/formtastic.rb
@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 # --------------------------------------------------------------------------------------------------
-# Please note: If you're subclassing Formtastic::SemanticFormBuilder in a Rails 3 project, 
-# Formtastic uses class_attribute for these configuration attributes instead of the deprecated 
+# Please note: If you're subclassing Formtastic::SemanticFormBuilder, Formtastic uses 
+# class_attribute for these configuration attributes instead of the deprecated 
 # class_inheritable_attribute. The behaviour is slightly different with subclasses (especially 
 # around attributes with Hash or Array) values, so make sure you understand what's happening. 
 # See the documentation for class_attribute in ActiveSupport for more information.

From 6c74c46a68ef04b5a61cf6a6f56da8868ef8fcbe Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 12 Jan 2011 22:34:37 +1100
Subject: [PATCH 399/992] append to generators

---
 lib/generators/templates/rails2/_form.html.erb  | 5 -----
 lib/generators/templates/rails2/_form.html.haml | 4 ----
 2 files changed, 9 deletions(-)
 delete mode 100644 lib/generators/templates/rails2/_form.html.erb
 delete mode 100644 lib/generators/templates/rails2/_form.html.haml

diff --git a/lib/generators/templates/rails2/_form.html.erb b/lib/generators/templates/rails2/_form.html.erb
deleted file mode 100644
index 1679580e0..000000000
--- a/lib/generators/templates/rails2/_form.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<%% f.inputs do %>
-<% attributes.each do |attribute| -%>
-  <%%= f.input :<%= attribute.name %> %>
-<% end -%>
-<%% end %>
diff --git a/lib/generators/templates/rails2/_form.html.haml b/lib/generators/templates/rails2/_form.html.haml
deleted file mode 100644
index c83eb24b8..000000000
--- a/lib/generators/templates/rails2/_form.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-- f.inputs do
-<% attributes.each do |attribute| -%>
-  = f.input :<%= attribute.name %>
-<% end -%>

From 69febcb5349186875901843d39d79e93fd54f44a Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 12 Jan 2011 22:35:55 +1100
Subject: [PATCH 400/992] remove rails/init.rb, which is Rails 2

---
 rails/init.rb | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 rails/init.rb

diff --git a/rails/init.rb b/rails/init.rb
deleted file mode 100644
index 35ff9fe5a..000000000
--- a/rails/init.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-# encoding: utf-8
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "init"))

From 7de6b2d12dc2792e2022008e564bda0526936edb Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 12 Jan 2011 22:41:00 +1100
Subject: [PATCH 401/992] removed some Rails 2 stuff from formtastic/util.rb

---
 lib/formtastic/util.rb | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/formtastic/util.rb b/lib/formtastic/util.rb
index 11e2e786f..ee4ba0185 100644
--- a/lib/formtastic/util.rb
+++ b/lib/formtastic/util.rb
@@ -14,17 +14,12 @@ module Util
     # @return [String] `text`, marked as HTML-safe
     def html_safe(text)
       return text if text.nil?
-      return text.html_safe if defined?(ActiveSupport::SafeBuffer)
-      return text.html_safe! if text.respond_to?(:html_safe!)
+      return text.html_safe
       text
     end
 
     def rails_safe_buffer_class
-      # It's important that we check ActiveSupport first,
-      # because in Rails 2.3.6 ActionView::SafeBuffer exists
-      # but is a deprecated proxy object.
-      return ActiveSupport::SafeBuffer if defined?(ActiveSupport::SafeBuffer)
-      return ActionView::SafeBuffer
+      return ActiveSupport::SafeBuffer
     end
 
     def rails3?

From 3b98c4295e92a19442c988bd63cfb337a0e25893 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 12 Jan 2011 23:13:20 +1100
Subject: [PATCH 402/992] first pass removing rails 2 or conditional rails 3
 logic from formtastic.rb, including one rails 2 centric spec

---
 lib/formtastic.rb          | 36 ++++++++++++------------------------
 spec/commit_button_spec.rb | 18 ------------------
 2 files changed, 12 insertions(+), 42 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 2ce73a472..d35943f2c 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -342,11 +342,7 @@ def commit_button(*args)
       text = options.delete(:label) || args.shift
 
       if @object && (@object.respond_to?(:persisted?) || @object.respond_to?(:new_record?))
-        if @object.respond_to?(:persisted?) # ActiveModel
-          key = @object.persisted? ? :update : :create
-        else # Rails 2
-          key = @object.new_record? ? :create : :update
-        end
+        key = @object.persisted? ? :update : :create
 
         # Deal with some complications with ActiveRecord::Base.human_name and two name models (eg UserPost)
         # ActiveRecord::Base.human_name falls back to ActiveRecord::Base.name.humanize ("Userpost")
@@ -572,14 +568,14 @@ def inputs_for_nested_attributes(*args, &block) #:nodoc:
 
           lambda do |f|
             contents = f.inputs(*args){ block.call(f) }
-            template.concat(contents) if ::Formtastic::Util.rails3?
-            contents
+            template.concat(contents)
+            contents # TODO: needed in Rails 3?
           end
         else
           lambda do |f|
             contents = f.inputs(*args)
-            template.concat(contents) if ::Formtastic::Util.rails3?
-            contents
+            template.concat(contents)
+            contents # TODO: needed in Rails 3?
           end
         end
 
@@ -1335,8 +1331,7 @@ def required_or_optional_string(required) #:nodoc:
       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:
+      # with nested attributes, it allows %i as interpolation option in :name. So you can do:
       #
       #   f.inputs :name => 'Task #%i', :for => :tasks
       #
@@ -1375,7 +1370,6 @@ def field_set_and_list_wrapping(*args, &block) #:nodoc:
           html_options.except(:builder, :parent)
         )
 
-        template.concat(fieldset) if block_given? && !Formtastic::Util.rails3?
         fieldset
       end
 
@@ -1677,8 +1671,8 @@ def validations_for(method, mode = :active)
       def default_string_options(method, type) #:nodoc:
         def get_maxlength_for(method)
           validation = validations_for(method).find do |validation|
-            (validation.respond_to?(:macro) && validation.macro == :validates_length_of) || # Rails 2 validation
-            (validation.respond_to?(:kind) && validation.kind == :length) # Rails 3 validator
+            (validation.respond_to?(:macro) && validation.macro == :validates_length_of) || # Rails 2 + 3 style validation
+            (validation.respond_to?(:kind) && validation.kind == :length) # Rails 3 style validator
           end
 
           if validation
@@ -1721,20 +1715,14 @@ def generate_html_id(method_name, value='input') #:nodoc:
         [@@custom_namespace, sanitized_object_name, index, sanitized_method_name, value].reject{|x|x.blank?}.join('_')
       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
+      # Gets the nested_child_index value from the parent builder. 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
+        child = parent[:for]
+        child = child.first if child.respond_to?(:first)
+        duck[child].to_i + 1
       end
 
       def sanitized_object_name #:nodoc:
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index 2f8b2c6e8..89c8f806e 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -10,24 +10,6 @@
     mock_everything
   end
 
-  describe 'when the object responds to :new_record? (Rails 2)' do
-
-    before do
-      @new_post.stub(:respond_to?).with(:to_model).and_return("X")
-      @new_post.stub(:respond_to?).with(:persisted?).and_return(false)
-      @new_post.stub(:respond_to?).with(:new_record?).and_return(true)
-    end
-
-    it 'should call :new_record?' do
-      @new_post.should_receive(:new_record?)
-      @new_post.should_not_receive(:persisted?)
-      semantic_form_for(@new_post) do |builder|
-        concat(builder.commit_button)
-      end
-    end
-
-  end
-
   describe 'when the object responds to :persisted? (ActiveModel)' do
 
     before do

From b9c834f792192a1031a43016d17a3b22a01aa48b Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 12 Jan 2011 23:21:06 +1100
Subject: [PATCH 403/992] remove rails 3 conditional stuff from specs and spec
 support

---
 spec/buttons_spec.rb                  | 32 +++++-----
 spec/commit_button_spec.rb            | 54 ++++++++---------
 spec/errors_spec.rb                   |  4 +-
 spec/form_helper_spec.rb              | 22 +++----
 spec/i18n_spec.rb                     | 10 ++--
 spec/include_blank_spec.rb            |  8 +--
 spec/input_spec.rb                    | 76 +++++++++++------------
 spec/inputs/boolean_input_spec.rb     | 16 ++---
 spec/inputs/check_boxes_input_spec.rb | 60 +++++++++----------
 spec/inputs/country_input_spec.rb     |  8 +--
 spec/inputs/date_input_spec.rb        | 14 ++---
 spec/inputs/datetime_input_spec.rb    | 26 ++++----
 spec/inputs/email_input_spec.rb       |  2 +-
 spec/inputs/file_input_spec.rb        |  2 +-
 spec/inputs/hidden_input_spec.rb      | 14 ++---
 spec/inputs/phone_input_spec.rb       |  2 +-
 spec/inputs/radio_input_spec.rb       | 36 +++++------
 spec/inputs/search_input_spec.rb      |  2 +-
 spec/inputs/select_input_spec.rb      | 86 +++++++++++++--------------
 spec/inputs/string_input_spec.rb      |  6 +-
 spec/inputs/text_input_spec.rb        | 18 +++---
 spec/inputs/time_input_spec.rb        | 26 ++++----
 spec/inputs/time_zone_input_spec.rb   | 10 ++--
 spec/inputs/url_input_spec.rb         |  2 +-
 spec/inputs_spec.rb                   | 73 +++++++++++------------
 spec/label_spec.rb                    |  4 +-
 spec/semantic_fields_for_spec.rb      |  6 +-
 spec/support/custom_macros.rb         | 84 +++++++++++++-------------
 spec/support/test_environment.rb      | 31 ++++------
 29 files changed, 363 insertions(+), 371 deletions(-)

diff --git a/spec/buttons_spec.rb b/spec/buttons_spec.rb
index a96651043..23aa11258 100644
--- a/spec/buttons_spec.rb
+++ b/spec/buttons_spec.rb
@@ -22,22 +22,22 @@
       end
 
       it 'should render a fieldset inside the form, with a class of "inputs"' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset.buttons")
       end
 
       it 'should render an ol inside the fieldset' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset.buttons ol")
       end
 
       it 'should render the contents of the block inside the ol' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset.buttons ol", /hello/)
       end
 
       it 'should not render a legend inside the fieldset' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should_not have_tag("form fieldset.buttons legend")
       end
     end
@@ -52,7 +52,7 @@
         end
       end
       it 'should render a fieldset inside the form' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset legend", /#{@legend_text}/)
       end
     end
@@ -68,7 +68,7 @@
         end
       end
       it 'should pass the options into the fieldset tag as attributes' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset##{@id_option}")
         output_buffer.should have_tag("form fieldset.#{@class_option}")
       end
@@ -87,32 +87,32 @@
       end
 
       it 'should render a form' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form')
       end
 
       it 'should render a buttons fieldset inside the form' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form fieldset.buttons')
       end
 
       it 'should not render a legend in the fieldset' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should_not have_tag('form fieldset.buttons legend')
       end
 
       it 'should render an ol in the fieldset' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form fieldset.buttons ol')
       end
 
       it 'should render a list item in the ol for each default button' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form fieldset.buttons ol li', :count => 1)
       end
 
       it 'should render a commit list item for the commit button' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form fieldset.buttons ol li.commit')
       end
 
@@ -127,7 +127,7 @@
       end
 
       it 'should render a form with a fieldset containing a list item for each button arg' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.buttons > ol > li', :count => 1)
         output_buffer.should have_tag('form > fieldset.buttons > ol > li.commit')
       end
@@ -143,18 +143,18 @@
       end
 
       it 'should render a form with a fieldset containing a list item for each button arg' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.buttons > ol > li', :count => 1)
         output_buffer.should have_tag('form > fieldset.buttons > ol > li.commit', :count => 1)
       end
 
       it 'should pass the options down to the fieldset' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset#my-id.buttons')
       end
 
       it 'should use the special :name option as a text for the legend tag' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset#my-id.buttons > legend', /Now click a button/)
       end
 
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index 89c8f806e..700040167 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -39,17 +39,17 @@
     end
 
     it 'should render a commit li' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('li.commit')
     end
 
     it 'should render an input with a type attribute of "submit"' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('li.commit input[@type="submit"]')
     end
 
     it 'should render an input with a name attribute of "commit"' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('li.commit input[@name="commit"]')
     end
 
@@ -59,7 +59,7 @@
         concat(builder.commit_button('text', :button_html => {:class => 'my_class', :id => 'my_id'}))
       end
 
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag('li.commit input#my_id')
       output_buffer.should have_tag('li.commit input.my_class')
     end
@@ -80,7 +80,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :button_html => {}))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag('li.commit input[@accesskey="s"]')
       end
     end
@@ -91,7 +91,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :accesskey => 'o'))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should_not have_tag('li.commit input[@accesskey="s"]')
         output_buffer.should have_tag('li.commit input[@accesskey="o"]')
       end
@@ -103,7 +103,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :accesskey => 'o', :button_html => {:accesskey => 't'}))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should_not have_tag('li.commit input[@accesskey="s"]')
         output_buffer.should_not have_tag('li.commit input[@accesskey="o"]')
         output_buffer.should have_tag('li.commit input[@accesskey="t"]')
@@ -122,12 +122,12 @@
     end
 
     it "should render the string as the value of the button" do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('li input[@value="a string"]')
     end
 
     it "should deal with the options hash" do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('li input.pretty')
     end
 
@@ -143,7 +143,7 @@
     end
 
     it "should deal with the options hash" do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('li input.pretty')
     end
 
@@ -158,7 +158,7 @@
           form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
             concat(builder.commit_button("Click!"))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag('li.commit input[@value="Click!"][@class~="submit"]')
         end
       end
@@ -177,7 +177,7 @@
             form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
             output_buffer.should have_tag('li.commit input[@value="Submit Post"][@class~="submit"]')
           end
         end
@@ -209,7 +209,7 @@
            form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
              concat(builder.commit_button)
            end
-           output_buffer.concat(form) if Formtastic::Util.rails3?
+           output_buffer.concat(form)
            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit Post"][@class~="submit"]})
          end
 
@@ -217,7 +217,7 @@
            form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
              concat(builder.commit_button)
            end
-           output_buffer.concat(form) if Formtastic::Util.rails3?
+           output_buffer.concat(form)
            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit"][@class~="submit"]})
          end
 
@@ -236,7 +236,7 @@
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.commit_button("Click!"))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag('li.commit input[@value="Click!"][@class~="create"]')
         end
       end
@@ -255,7 +255,7 @@
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
             output_buffer.should have_tag('li.commit input[@value="Create Post"][@class~="create"]')
           end
         end
@@ -287,7 +287,7 @@
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create Post"][@class~="create"]})
           end
 
@@ -295,7 +295,7 @@
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create"][@class~="create"]})
           end
 
@@ -314,7 +314,7 @@
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.commit_button("Click!"))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag('li.commit input[@value="Click!"][@class~="update"]')
         end
       end
@@ -333,7 +333,7 @@
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
             output_buffer.should have_tag('li.commit input[@value="Save Post"][@class~="update"]')
           end
         end
@@ -366,7 +366,7 @@
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save Post"][@class~="update"]})
           end
 
@@ -374,7 +374,7 @@
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save"][@class~="update"]})
             ::I18n.backend.store_translations :en, :formtastic => {}
           end
@@ -411,7 +411,7 @@ def self.human_name
     end
 
     it "should render the string as the value of the button" do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('li input[@value="Create User post"]')
     end
 
@@ -424,7 +424,7 @@ def self.human_name
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :wrapper_html => {:id => :another_id}))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form li#another_id")
       end
 
@@ -432,7 +432,7 @@ def self.human_name
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :wrapper_html => {:class => :another_class}))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form li.commit")
         output_buffer.should have_tag("form li.another_class")
       end
@@ -441,7 +441,7 @@ def self.human_name
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :wrapper_html => {:class => [ :my_class, :another_class ]}))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form li.commit")
         output_buffer.should have_tag("form li.my_class")
         output_buffer.should have_tag("form li.another_class")
@@ -453,7 +453,7 @@ def self.human_name
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text'))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form li.commit")
       end
     end
diff --git a/spec/errors_spec.rb b/spec/errors_spec.rb
index ff1721f7f..3961d83a1 100644
--- a/spec/errors_spec.rb
+++ b/spec/errors_spec.rb
@@ -142,7 +142,7 @@
           concat(builder.input(:document))
         end
       end 
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("li[@class='file optional error']")
       output_buffer.should have_tag('p.inline-errors', (['must be an image','must be provided', 'must be less than 4mb']).to_sentence)
     end
@@ -161,7 +161,7 @@
           concat(builder.input(:author))
         end
       end
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("ul.errors li", /must not be blank/, :count => 1)
       output_buffer.should have_tag("ul.errors li", /is already taken/, :count => 1)
     end
diff --git a/spec/form_helper_spec.rb b/spec/form_helper_spec.rb
index 1a27ba6bf..1bf37e754 100644
--- a/spec/form_helper_spec.rb
+++ b/spec/form_helper_spec.rb
@@ -21,7 +21,7 @@
     it 'adds a class of "formtastic" to the generated form' do
       form = semantic_form_for(@new_post, :url => '/hello') do |builder|
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form.formtastic")
     end
 
@@ -29,45 +29,45 @@
       ::Formtastic::SemanticFormHelper.default_form_class = 'xyz'
       form = semantic_form_for(::Post.new, :as => :post, :url => '/hello') do |builder|
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form.xyz")
     end
 
     it 'adds class matching the object name to the generated form when a symbol is provided' do
       form = semantic_form_for(@new_post, :url => '/hello') do |builder|
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form.post")
 
       form = semantic_form_for(:project, :url => '/hello') do |builder|
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form.project")
     end
 
     it 'adds class matching the :as option when provided' do
       form = semantic_form_for(@new_post, :as => :message, :url => '/hello') do |builder|
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form.message")
 
       form = semantic_form_for([:admins, @new_post], :as => :message, :url => '/hello') do |builder|
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form.message")
     end
 
     it 'adds class matching the object\'s class to the generated form when an object is provided' do
       form = semantic_form_for(@new_post) do |builder|
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form.post")
     end
 
     it 'adds a namespaced class to the generated form' do
       form = semantic_form_for(::Namespaced::Post.new, :url => '/hello') do |builder|
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form.namespaced_post")
     end
 
@@ -78,17 +78,17 @@
       end
 
       it 'to add a id of "something-special" to generated form' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form#something-special")
       end
 
       it 'to add a class of "something-extra" to generated form' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form.something-extra")
       end
 
       it 'to add enctype="multipart/form-data"' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form[@enctype="multipart/form-data"]')
       end
     end
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index 7ca7ede9f..48d06abbb 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -116,7 +116,7 @@
       form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:title))
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form label", /Hello post!/)
     end
 
@@ -124,7 +124,7 @@
       form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:title))
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form label", /Hello project!/)
     end
 
@@ -134,7 +134,7 @@
           concat(f.input(:name))
         end
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form label", /Hello task name!/)
     end
 
@@ -144,7 +144,7 @@
           concat(f.input(:name))
         end
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form label", /Hello line item name!/)
     end
 
@@ -152,7 +152,7 @@
       form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author))
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form label", /Written by/)
     end
 
diff --git a/spec/include_blank_spec.rb b/spec/include_blank_spec.rb
index c24f81157..c854d7b47 100644
--- a/spec/include_blank_spec.rb
+++ b/spec/include_blank_spec.rb
@@ -27,7 +27,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form li select option[@value='']", "")
       end
     end
@@ -38,7 +38,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should_not have_tag("form li select option[@value='']", "")
       end
     end
@@ -54,7 +54,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as, :include_blank => false))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should_not have_tag("form li select option[@value='']", "")
       end
     end
@@ -66,7 +66,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as, :include_blank => true))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form li select option[@value='']", "")
       end
     end
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 53b2eade2..422dde47b 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -79,7 +79,7 @@
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => true))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should_not have_tag('form li.optional')
           output_buffer.should have_tag('form li.required')
         end
@@ -88,7 +88,7 @@
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => true))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag('form li.required label', /#{@new_string}$/)
         end
 
@@ -109,7 +109,7 @@
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => false))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should_not have_tag('form li.required')
           output_buffer.should have_tag('form li.optional')
         end
@@ -118,7 +118,7 @@
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => false))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag('form li.optional label', /#{@string}$/)
         end
 
@@ -135,7 +135,7 @@
             form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
               concat(builder.input(:title))
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
             output_buffer.should_not have_tag('form li.required')
             output_buffer.should have_tag('form li.optional')
 
@@ -166,7 +166,7 @@
                   concat(builder.input(:title))
                   concat(builder.input(:body))
                 end
-                output_buffer.concat(form) if Formtastic::Util.rails3?
+                output_buffer.concat(form)
                 output_buffer.should have_tag('form li.required')
                 output_buffer.should_not have_tag('form li.optional')
               end
@@ -222,7 +222,7 @@ def should_be_required(options)
                 concat(builder.input(:body))
               end
 
-              output_buffer.concat(form) if Formtastic::Util.rails3?
+              output_buffer.concat(form)
 
               if options[:required]
                 output_buffer.should_not have_tag('form li.optional')
@@ -242,7 +242,7 @@ def should_be_required(options)
                 form = semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:title))
                 end
-                output_buffer.concat(form) if Formtastic::Util.rails3?
+                output_buffer.concat(form)
                 output_buffer.should_not have_tag('form li.required')
                 output_buffer.should have_tag('form li.optional')
               end
@@ -273,7 +273,7 @@ def should_be_required(options)
                   concat(builder.input(:title))
                   concat(builder.input(:body))
                 end
-                output_buffer.concat(form) if Formtastic::Util.rails3?
+                output_buffer.concat(form)
                 output_buffer.should have_tag('form li.required')
                 output_buffer.should_not have_tag('form li.optional')
               end
@@ -328,7 +328,7 @@ def should_be_required(options)
                 form = semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:published))
                 end
-                output_buffer.concat(form) if Formtastic::Util.rails3?
+                output_buffer.concat(form)
                 output_buffer.should have_tag('form li.required')
                 output_buffer.should_not have_tag('form li.optional')
               end
@@ -341,7 +341,7 @@ def should_be_required(options)
                 form = semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:published))
                 end
-                output_buffer.concat(form) if Formtastic::Util.rails3?
+                output_buffer.concat(form)
                 output_buffer.should_not have_tag('form li.required')
                 output_buffer.should have_tag('form li.optional')
               end
@@ -357,7 +357,7 @@ def should_be_required(options)
                 concat(builder.input(:body))
               end
 
-              output_buffer.concat(form) if Formtastic::Util.rails3?
+              output_buffer.concat(form)
 
               if options[:required]
                 output_buffer.should_not have_tag('form li.optional')
@@ -377,7 +377,7 @@ def should_be_required(options)
                 form = semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:title))
                 end
-                output_buffer.concat(form) if Formtastic::Util.rails3?
+                output_buffer.concat(form)
                 output_buffer.should_not have_tag('form li.required')
                 output_buffer.should have_tag('form li.optional')
               end
@@ -394,7 +394,7 @@ def should_be_required(options)
               form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title))
               end
-              output_buffer.concat(form) if Formtastic::Util.rails3?
+              output_buffer.concat(form)
               output_buffer.should_not have_tag('form li.required')
               output_buffer.should have_tag('form li.optional')
 
@@ -417,7 +417,7 @@ def should_be_required(options)
           form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
             concat(builder.input(:anything))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag('form li.string')
         end
 
@@ -427,7 +427,7 @@ def should_be_required(options)
             concat(builder.input(:password_confirmation))
             concat(builder.input(:confirm_password))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag('form li.password', :count => 3)
         end
 
@@ -577,7 +577,7 @@ def should_be_required(options)
             concat(builder.input(:title, :label => "Kustom"))
           end
 
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li label", /Kustom/)
         end
 
@@ -585,7 +585,7 @@ def should_be_required(options)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :label => false))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should_not have_tag("form li label")
         end
 
@@ -593,7 +593,7 @@ def should_be_required(options)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :label => "Kustom".freeze))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li label", /Kustom/)
         end
       end
@@ -612,7 +612,7 @@ def should_be_required(options)
                     concat(builder.input(:meta_description))
                   end
 
-                  output_buffer.concat(form) if Formtastic::Util.rails3?
+                  output_buffer.concat(form)
                   output_buffer.should have_tag('form li label', Regexp.new('^' + @localized_label_text))
                 end
               end
@@ -629,7 +629,7 @@ def should_be_required(options)
                 concat(builder.input(:meta_description))
               end
 
-              output_buffer.concat(form) if Formtastic::Util.rails3?
+              output_buffer.concat(form)
               output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
             end
           end
@@ -643,7 +643,7 @@ def should_be_required(options)
                 concat(builder.input(:meta_description))
               end
 
-              output_buffer.concat(form) if Formtastic::Util.rails3?
+              output_buffer.concat(form)
               output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
             end
           end
@@ -657,7 +657,7 @@ def should_be_required(options)
                   concat(builder.input(:meta_description))
                 end
 
-                output_buffer.concat(form) if Formtastic::Util.rails3?
+                output_buffer.concat(form)
                 output_buffer.should have_tag("form li label", /#{'meta_description'.capitalize}/)
               end
             end
@@ -687,7 +687,7 @@ def should_be_required(options)
               concat(builder.input(:title, :label => true))
               concat(builder.input(:published, :as => :boolean, :label => true))
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
             output_buffer.should have_tag('form li label', Regexp.new('^' + @localized_label_text))
           end
 
@@ -705,7 +705,7 @@ def should_be_required(options)
               concat(builder.input(:title, :label => true))
               concat(builder.input(:published, :as => :boolean, :label => true))
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
             output_buffer.should have_tag('form li label', Regexp.new('^' + @default_localized_label_text))
           end
         end
@@ -726,7 +726,7 @@ def should_be_required(options)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :hint => hint_text))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li p.inline-hints", hint_text)
         end
 
@@ -735,7 +735,7 @@ def should_be_required(options)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :hint => hint_text, :hint_class => 'custom-hint-class'))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li p.custom-hint-class", hint_text)
         end
 
@@ -745,7 +745,7 @@ def should_be_required(options)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :hint => hint_text))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li p.custom-hint-class", hint_text)
         end
       end
@@ -781,7 +781,7 @@ def should_be_required(options)
               form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => true))
               end
-              output_buffer.concat(form) if Formtastic::Util.rails3?
+              output_buffer.concat(form)
               output_buffer.should have_tag('form li p.inline-hints', @localized_hint_text)
             end
 
@@ -797,7 +797,7 @@ def should_be_required(options)
               form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => true, :hint_class => 'custom-hint-class'))
               end
-              output_buffer.concat(form) if Formtastic::Util.rails3?
+              output_buffer.concat(form)
               output_buffer.should have_tag('form li p.custom-hint-class', @localized_hint_text)
             end
 
@@ -805,7 +805,7 @@ def should_be_required(options)
               form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => true))
               end
-              output_buffer.concat(form) if Formtastic::Util.rails3?
+              output_buffer.concat(form)
               output_buffer.should have_tag('form li p.inline-hints', @default_localized_hint_text)
             end
           end
@@ -815,7 +815,7 @@ def should_be_required(options)
               form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => false))
               end
-              output_buffer.concat(form) if Formtastic::Util.rails3?
+              output_buffer.concat(form)
               output_buffer.should_not have_tag('form li p.inline-hints', @localized_hint_text)
             end
           end
@@ -843,7 +843,7 @@ def should_be_required(options)
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:title))
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
             output_buffer.should_not have_tag('form li p.inline-hints')
           end
         end
@@ -858,7 +858,7 @@ def should_be_required(options)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :wrapper_html => {:id => :another_id}))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li#another_id")
         end
 
@@ -866,7 +866,7 @@ def should_be_required(options)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :wrapper_html => {:class => :another_class}, :required => true))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li.string")
           output_buffer.should have_tag("form li.required")
           output_buffer.should have_tag("form li.another_class")
@@ -876,7 +876,7 @@ def should_be_required(options)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :wrapper_html => {:class => [ :my_class, :another_class ]}))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li.string")
           output_buffer.should have_tag("form li.my_class")
           output_buffer.should have_tag("form li.another_class")
@@ -888,7 +888,7 @@ def should_be_required(options)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li#post_title_input")
           output_buffer.should have_tag("form li.string")
         end
@@ -907,7 +907,7 @@ def should_be_required(options)
         concat(builder.input(:title, my_options))
         concat(builder.input(:publish_at, my_options))
       end
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       
       output_buffer.should have_tag 'li.string', :count => 2
     end
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index 3ded0a0a3..c6840b68f 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -19,7 +19,7 @@
   it_should_apply_error_logic_for_input_type(:boolean)
 
   it 'should generate a label containing the input' do
-    output_buffer.concat(@form) if Formtastic::Util.rails3?
+    output_buffer.concat(@form)
     output_buffer.should have_tag('form li label', :count => 1)
     output_buffer.should have_tag('form li label[@for="post_allow_comments"]')
     output_buffer.should have_tag('form li label', /Allow comments/)
@@ -29,7 +29,7 @@
   end
 
   it 'should generate a checkbox input' do
-    output_buffer.concat(@form) if Formtastic::Util.rails3?
+    output_buffer.concat(@form)
     output_buffer.should have_tag('form li label input')
     output_buffer.should have_tag('form li label input#post_allow_comments')
     output_buffer.should have_tag('form li label input[@type="checkbox"]')
@@ -38,7 +38,7 @@
   end
   
   it 'should generate a checked input if object.method returns true' do
-    output_buffer.concat(@form) if Formtastic::Util.rails3?
+    output_buffer.concat(@form)
     output_buffer.should have_tag('form li label input[@checked="checked"]')
     output_buffer.should have_tag('form li input[@name="post[allow_comments]"]', :count => 2)
     output_buffer.should have_tag('form li input#post_allow_comments', :count => 1)
@@ -49,7 +49,7 @@
       concat(builder.input(:answer_comments, :as => :boolean, :input_html => {:checked => 'checked'}))
     end
 
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should have_tag('form li label input[@checked="checked"]')
   end
   
@@ -58,7 +58,7 @@
       concat(builder.input(:allow_comments, :as => :boolean, :input_html => {:disabled => 'disabled'}))
     end
     
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should have_tag('form li label input[@disabled="disabled"]')
   end
   
@@ -67,7 +67,7 @@
       concat(builder.input(:allow_comments, :as => :boolean, :input_html => {:id => 'custom_id'}))
     end
     
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should have_tag('form li label input[@id="custom_id"]')
     output_buffer.should have_tag('form li label[@for="custom_id"]')
   end
@@ -77,7 +77,7 @@
       concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'checked', :unchecked_value => 'unchecked'))
     end
 
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should have_tag('form li label input[@type="checkbox"][@value="checked"]:not([@unchecked_value][@checked_value])')
     output_buffer.should have_tag('form li input[@type="hidden"][@value="unchecked"]')
     output_buffer.should_not have_tag('form li label input[@type="hidden"]') # invalid HTML5
@@ -88,7 +88,7 @@
       concat(builder.input(:allow_comments, :as => :boolean))
     end
 
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
 
     output_buffer.should have_tag('form li label[@for="project_allow_comments"]')
     output_buffer.should have_tag('form li label', /Allow comments/)
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 0a886a665..de9a3aa02 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -23,46 +23,46 @@
     it_should_use_the_collection_when_provided(:check_boxes, 'input[@type="checkbox"]')
 
     it 'should generate a legend containing a label with text for the input' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li fieldset legend.label label')
       output_buffer.should have_tag('form li fieldset legend.label label', /Posts/)
     end
 
     it 'should not link the label within the legend to any input' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should_not have_tag('form li fieldset legend label[@for^="author_post_ids_"]')
     end
 
     it 'should generate an ordered list with a list item for each choice' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li fieldset ol')
       output_buffer.should have_tag('form li fieldset ol li input[@type=checkbox]', :count => ::Post.all.size)
     end
 
     it 'should have one option with a "checked" attribute' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li input[@checked]', :count => 1)
     end
 
     it 'should not generate hidden inputs with default value blank' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should_not have_tag("form li fieldset ol li label input[@type='hidden'][@value='']")
     end
 
     it 'should not render hidden inputs inside the ol' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should_not have_tag("form li fieldset ol li input[@type='hidden']")
     end
 
     it 'should render one hidden input for each choice outside the ol' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li fieldset > input[@type='hidden']", :count => 1)
     end
 
     describe "each choice" do
 
       it 'should contain a label for the radio input with a nested input and label text' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         ::Post.all.each do |post|
           output_buffer.should have_tag('form li fieldset ol li label', /#{post.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='author_post_ids_#{post.id}']")
@@ -70,14 +70,14 @@
       end
 
       it 'should use values as li.class when value_as_class is true' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         ::Post.all.each do |post|
           output_buffer.should have_tag("form li fieldset ol li.post_#{post.id} label")
         end
       end
 
       it 'should have a checkbox input but no hidden field for each post' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         ::Post.all.each do |post|
           output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@name='author[post_ids][]']", :count => 1)
@@ -85,17 +85,17 @@
       end
 
       it 'should have a hidden field with an empty array value for the collection to allow clearing of all checkboxes' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li fieldset > input[@type=hidden][@name='author[post_ids][]'][@value='']", :count => 1)
       end
 
       it 'the hidden field with an empty array value should be followed by the ol' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li fieldset > input[@type=hidden][@name='author[post_ids][]'][@value=''] + ol", :count => 1)
       end
 
       it 'should not have a hidden field with an empty string value for the collection' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should_not have_tag("form li fieldset > input[@type=hidden][@name='author[post_ids]'][@value='']", :count => 1)
       end
 
@@ -105,7 +105,7 @@
         form = semantic_form_for(@fred) do |builder|
           concat(builder.input(:posts, :as => :check_boxes, :hidden_fields => true, :value_as_class => true))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
 
         ::Post.all.each do |post|
           output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
@@ -116,7 +116,7 @@
 
       it "should mark input as checked if it's the the existing choice" do
         ::Post.all.include?(@fred.posts.first).should be_true
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
       end
     end
@@ -130,17 +130,17 @@
       end
 
       it 'should generate a fieldset with legend' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form li fieldset legend', /Author/)
       end
 
       it 'shold generate an li tag for each item in the collection' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form li fieldset ol li input[@type=checkbox]', :count => ::Author.all.size)
       end
 
       it 'should generate labels for each item' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='project_author_id_#{author.id}']")
@@ -148,7 +148,7 @@
       end
 
       it 'should generate inputs for each item' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#project_author_id_#{author.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@type='checkbox']")
@@ -161,7 +161,7 @@
         form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:author_id, :as => :check_boxes, :collection => [["<b>Item 1</b>", 1], ["<b>Item 2</b>", 2]]))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
 
         ## This should work, but it's emits deprecation warnings under Rails 2
         ## TODO: revisit in 2.0 when we drop Rails 2. Simpler test follows.
@@ -180,7 +180,7 @@
         form = semantic_form_for(@fred) do |builder|
           concat(builder.input(:posts, :as => :check_boxes, :value_as_class => true, :hidden_fields => false))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
       end
 
       it 'should have a checkbox input for each post' do
@@ -215,7 +215,7 @@
         end
 
         it 'should not have any disabled item(s)' do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.concat(@form)
           output_buffer.should_not have_tag("form li fieldset ol li label input[@disabled='disabled']")
         end
       end
@@ -230,7 +230,7 @@
         end
 
         it "should have one item disabled; the specified one" do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.concat(@form)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 1)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@fred.id}']")
@@ -247,7 +247,7 @@
         end
 
         it "should have multiple items disabled; the specified ones" do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.concat(@form)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 2)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@bob.id}']", /bob/i)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@bob.id}']")
@@ -276,7 +276,7 @@
       end
 
       it "should do foo" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("legend.label label", /Translated/)
       end
 
@@ -291,7 +291,7 @@
       end
 
       it "should output the correct label title" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("legend.label label", /The authors/)
       end
     end
@@ -306,7 +306,7 @@
       end
 
       it "should not output the legend" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should_not have_tag("legend.label")
       end
     end
@@ -320,7 +320,7 @@
       end
 
       it "should output the correct label title" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("legend.label label abbr")
       end
     end
@@ -336,7 +336,7 @@
       @form = semantic_form_for(@freds_post) do |builder|
         concat(builder.input(:authors, :as => :check_boxes))
       end
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
     end
 
     it 'should render checkboxes' do
@@ -370,7 +370,7 @@
           concat(builder.input(:author, :as => :check_boxes, :value_method => :custom_value, :collection => [item, item, item]))
         end
 
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('input[@type=checkbox][@value="custom_value"]', :count => 3)
       end
     end
diff --git a/spec/inputs/country_input_spec.rb b/spec/inputs/country_input_spec.rb
index 4a13b6adb..cb5d54eb6 100644
--- a/spec/inputs/country_input_spec.rb
+++ b/spec/inputs/country_input_spec.rb
@@ -38,14 +38,14 @@
     #it_should_apply_error_logic_for_input_type(:country)
 
     it 'should generate a label for the input' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li label')
       output_buffer.should have_tag('form li label[@for="post_country"]')
       output_buffer.should have_tag('form li label', /Country/)
     end
 
     it "should generate a select" do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select")
     end
 
@@ -108,7 +108,7 @@
       end
 
       it "should render a country input" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag "form li.country"
       end
     end
@@ -123,7 +123,7 @@
       end
 
       it "should render a country input" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should_not have_tag "form li.country"
         output_buffer.should have_tag "form li.string", :count => 2
       end
diff --git a/spec/inputs/date_input_spec.rb b/spec/inputs/date_input_spec.rb
index 6248f85f4..e01094fcb 100644
--- a/spec/inputs/date_input_spec.rb
+++ b/spec/inputs/date_input_spec.rb
@@ -25,12 +25,12 @@
     it_should_apply_error_logic_for_input_type(:date)
 
     it 'should have a legend and label with the label text inside the fieldset' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.date fieldset legend.label label', /Publish at/)
     end
 
     it 'should associate the legend label with the first select' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.date fieldset legend.label')
       output_buffer.should have_tag('form li.date fieldset legend.label label')
       output_buffer.should have_tag('form li.date fieldset legend.label label[@for]')
@@ -38,13 +38,13 @@
     end
 
     it 'should have an ordered list of three items inside the fieldset' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.date fieldset ol')
       output_buffer.should have_tag('form li.date fieldset ol li', :count => 3)
     end
 
     it 'should have three labels for year, month and day' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.date fieldset ol li label', :count => 3)
       output_buffer.should have_tag('form li.date fieldset ol li label', /year/i)
       output_buffer.should have_tag('form li.date fieldset ol li label', /month/i)
@@ -52,7 +52,7 @@
     end
 
     it 'should have three selects for year, month and day' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.date fieldset ol li select', :count => 3)
     end
   end
@@ -81,7 +81,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :date, :labels => { field => "another #{field} label" }))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag('form li.date fieldset ol li label', :count => fields.length)
         fields.each do |f|
           output_buffer.should have_tag('form li.date fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
@@ -93,7 +93,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :date, :labels => { field => "" }))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag('form li.date fieldset ol li label', :count => fields.length-1)
         fields.each do |f|
           output_buffer.should have_tag('form li.date fieldset ol li label', /#{f}/i) unless field == f
diff --git a/spec/inputs/datetime_input_spec.rb b/spec/inputs/datetime_input_spec.rb
index 3c8b0f225..8495bb827 100644
--- a/spec/inputs/datetime_input_spec.rb
+++ b/spec/inputs/datetime_input_spec.rb
@@ -30,23 +30,23 @@
     it_should_apply_error_logic_for_input_type(:datetime)
 
     it 'should have a legend and label with the label text inside the fieldset' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.datetime fieldset legend.label label', /Publish at/)
     end
 
     it 'should associate the legend label with the first select' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.datetime fieldset legend.label label[@for="post_publish_at_1i"]')
     end
 
     it 'should have an ordered list of five items inside the fieldset' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.datetime fieldset ol')
       output_buffer.should have_tag('form li.datetime fieldset ol li', :count => 5)
     end
 
     it 'should have five labels for year, month, day, hour and minute' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => 5)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /year/i)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /month/i)
@@ -56,7 +56,7 @@
     end
 
     it 'should have five selects for year, month, day, hour and minute' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.datetime fieldset ol li select', :count => 5)
     end
 
@@ -67,7 +67,7 @@
         end
         concat(fields)
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
 
       1.upto(5) do |i|
         output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_10_created_at_#{i}i']")
@@ -83,7 +83,7 @@
         concat(builder.input(:publish_at, :as => :datetime, :discard_day => true))
       end
 
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form li input[@type='hidden'][@value='27']")
     end
   end
@@ -142,7 +142,7 @@
     end
 
     it 'should have translated labels for year, month, day, hour and minute' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Year/)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Month/)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Day/)
@@ -160,17 +160,17 @@
     end
 
     it 'should have fieldset with legend - classified as a label' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.datetime fieldset legend.label', /Publish at/)
     end
 
     it 'should have labels for each input' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => 5)
     end
 
     it 'should have selects for each inputs' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.datetime fieldset ol li select', :count => 5)
     end
   end
@@ -214,7 +214,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :datetime, :labels => { field => "another #{field} label" }))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => fields.length)
         fields.each do |f|
           output_buffer.should have_tag('form li.datetime fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
@@ -226,7 +226,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :datetime, :labels => { field => "" }))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => fields.length-1)
         fields.each do |f|
           output_buffer.should have_tag('form li.datetime fieldset ol li label', /#{f}/i) unless field == f
diff --git a/spec/inputs/email_input_spec.rb b/spec/inputs/email_input_spec.rb
index 6ade6d68f..c7a6368f1 100644
--- a/spec/inputs/email_input_spec.rb
+++ b/spec/inputs/email_input_spec.rb
@@ -22,7 +22,7 @@
     it_should_have_label_with_text(/Email/)
     it_should_have_label_for("post_email")
     it_should_have_input_with_id("post_email")
-    it_should_have_input_with_type(Formtastic::Util.rails3? ? :email : :text)
+    it_should_have_input_with_type(:email)
     it_should_have_input_with_name("post[email]")
 
   end
diff --git a/spec/inputs/file_input_spec.rb b/spec/inputs/file_input_spec.rb
index b4fbe49b4..e65e3b8c7 100644
--- a/spec/inputs/file_input_spec.rb
+++ b/spec/inputs/file_input_spec.rb
@@ -26,7 +26,7 @@
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :file, :input_html => { :class => 'myclass' }))
     end
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should have_tag("form li input.myclass")
   end
 
diff --git a/spec/inputs/hidden_input_spec.rb b/spec/inputs/hidden_input_spec.rb
index 38fefe988..5ab5bc824 100644
--- a/spec/inputs/hidden_input_spec.rb
+++ b/spec/inputs/hidden_input_spec.rb
@@ -23,30 +23,30 @@
   it_should_not_have_a_label
 
   it "should generate a input field" do
-    output_buffer.concat(@form) if Formtastic::Util.rails3?
+    output_buffer.concat(@form)
     output_buffer.should have_tag("form li input#post_secret")
     output_buffer.should have_tag("form li input#post_secret[@type=\"hidden\"]")
     output_buffer.should have_tag("form li input#post_secret[@name=\"post[secret]\"]")
   end
 
   it "should pass any explicitly specified value - using :value" do
-    output_buffer.concat(@form) if Formtastic::Util.rails3?
+    output_buffer.concat(@form)
     output_buffer.should have_tag("form li input#post_author_id[@type=\"hidden\"][@value=\"99\"]")
   end
 
   # Handle Formtastic :input_html options for consistency.
   it "should pass any explicitly specified value - using :input_html options" do
-    output_buffer.concat(@form) if Formtastic::Util.rails3?
+    output_buffer.concat(@form)
     output_buffer.should have_tag("form li input#post_published[@type=\"hidden\"][@value=\"true\"]")
   end
 
   it "should pass any option specified using :input_html" do
-    output_buffer.concat(@form) if Formtastic::Util.rails3?
+    output_buffer.concat(@form)
     output_buffer.should have_tag("form li input#new_post_reviewer[@type=\"hidden\"][@class=\"new_post_reviewer\"]")
   end
 
   it "should prefer :input_html over directly supplied options" do
-    output_buffer.concat(@form) if Formtastic::Util.rails3?
+    output_buffer.concat(@form)
     output_buffer.should have_tag("form li input#post_author[@type=\"hidden\"][@value=\"formtastic_value\"]")
   end
 
@@ -59,7 +59,7 @@
       concat(builder.input(:secret, :as => :hidden))
     end
 
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should_not have_tag("form li p.inline-errors")
     output_buffer.should_not have_tag("form li ul.errors")
   end
@@ -69,7 +69,7 @@
       concat(builder.input(:secret, :as => :hidden, :hint => "all your base are belong to use"))
     end
 
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should_not have_tag("form li p.inline-hints")
     output_buffer.should_not have_tag("form li ul.hints")
   end
diff --git a/spec/inputs/phone_input_spec.rb b/spec/inputs/phone_input_spec.rb
index bc1663839..b7bfd39c5 100644
--- a/spec/inputs/phone_input_spec.rb
+++ b/spec/inputs/phone_input_spec.rb
@@ -22,7 +22,7 @@
     it_should_have_label_with_text(/Phone/)
     it_should_have_label_for("post_phone")
     it_should_have_input_with_id("post_phone")
-    it_should_have_input_with_type(Formtastic::Util.rails3? ? :tel : :text)
+    it_should_have_input_with_type(:tel)
     it_should_have_input_with_name("post[phone]")
 
   end
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index adfc025f9..593e6588f 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -24,31 +24,31 @@
     it_should_use_the_collection_when_provided(:radio, 'input')
 
     it 'should generate a legend containing a label with text for the input' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li fieldset legend.label label')
       output_buffer.should have_tag('form li fieldset legend.label label', /Author/)
     end
 
     it 'should not link the label within the legend to any input' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should_not have_tag('form li fieldset legend label[@for]')
     end
 
     it 'should generate an ordered list with a list item for each choice' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li fieldset ol')
       output_buffer.should have_tag('form li fieldset ol li', :count => ::Author.all.size)
     end
 
     it 'should have one option with a "checked" attribute' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li input[@checked]', :count => 1)
     end
 
     describe "each choice" do
 
       it 'should contain a label for the radio input with a nested input and label text' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_id_#{author.id}']")
@@ -56,14 +56,14 @@
       end
 
       it 'should use values as li.class when value_as_class is true' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag("form li fieldset ol li.author_#{author.id} label")
         end
       end
 
       it "should have a radio input" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#post_author_id_#{author.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@type='radio']")
@@ -81,7 +81,7 @@
           concat(builder.input(:author, :as => :radio))
         end
 
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
       end
 
@@ -91,7 +91,7 @@
           concat(builder.input(:author, :as => :radio))
         end
 
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should_not have_tag("form li fieldset ol li input[@find_options]")
       end
 
@@ -106,17 +106,17 @@
       end
 
       it 'should generate a fieldset with legend' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form li fieldset legend', /Author/)
       end
 
       it 'should generate an li tag for each item in the collection' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form li fieldset ol li', :count => ::Author.all.size)
       end
 
       it 'should generate labels for each item' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='project_author_id_#{author.id}']")
@@ -128,14 +128,14 @@
         form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:author_id, :as => :radio, :collection => [["<b>Item 1</b>", 1], ["<b>Item 2</b>", 2]]))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag('form li fieldset ol li label') do |label|
           label.body.should match /&lt;b&gt;Item [12]&lt;\/b&gt;$/
         end
       end
 
       it 'should generate inputs for each item' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#project_author_id_#{author.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@type='radio']")
@@ -164,7 +164,7 @@
     end
 
     it "should do foo" do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("legend.label label", /Translated/)
     end
 
@@ -179,7 +179,7 @@
     end
 
     it "should output the correct label title" do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("legend.label label", /The authors/)
     end
   end
@@ -194,7 +194,7 @@
     end
 
     it "should not output the legend" do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should_not have_tag("legend.label")
     end
   end
@@ -208,7 +208,7 @@
     end
 
     it "should output the correct label title" do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("legend.label label abbr")
     end
   end
diff --git a/spec/inputs/search_input_spec.rb b/spec/inputs/search_input_spec.rb
index d3ee2cd6e..a7ab3ef09 100644
--- a/spec/inputs/search_input_spec.rb
+++ b/spec/inputs/search_input_spec.rb
@@ -22,7 +22,7 @@
     it_should_have_label_with_text(/Search/)
     it_should_have_label_for("post_search")
     it_should_have_input_with_id("post_search")
-    it_should_have_input_with_type(Formtastic::Util.rails3? ? :search : :text)
+    it_should_have_input_with_type(:search)
     it_should_have_input_with_name("post[search]")
 
   end
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index a06af0f56..28a7ced0b 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -22,7 +22,7 @@
       end
 
       it 'should have a option for each key and/or value' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         @array_with_values.each do |v|
           output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
         end
@@ -41,7 +41,7 @@
       end
 
       it 'should have an option for each value' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         @range_with_values.each do |v|
           output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
         end
@@ -57,7 +57,7 @@
       end
 
       it 'should render select options using provided HTML string' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         2.times do |v|
           output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
         end
@@ -82,7 +82,7 @@
       end
 
       it 'should render a select with at least options: true/false' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select option[@value='true']", /^Yes$/)
         output_buffer.should have_tag("form li select option[@value='false']", /^No$/)
       end
@@ -103,7 +103,7 @@
       end
 
       it 'should render a select with at least options: true/false' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select option[@value='true']", /#{@boolean_select_labels[:yes]}/)
         output_buffer.should have_tag("form li select option[@value='false']", /#{@boolean_select_labels[:no]}/)
       end
@@ -127,36 +127,36 @@
     it_should_use_the_collection_when_provided(:select, 'option')
 
     it 'should have a select inside the wrapper' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#post_author_id')
       output_buffer.should have_tag('form li select#post_reviewer_id')
     end
 
     it 'should have a valid name' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select[@name='post[author_id]']")
       output_buffer.should_not have_tag("form li select[@name='post[author_id][]']")
       output_buffer.should_not have_tag("form li select[@name='post[reviewer_id][]']")
     end
 
     it 'should not create a multi-select' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should_not have_tag('form li select[@multiple]')
     end
 
     it 'should create a select without size' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should_not have_tag('form li select[@size]')
     end
 
     it 'should have a blank option' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select option[@value='']")
     end
 
     it 'should have a select option for each Author' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select[@name='post[author_id]'] option", :count => ::Author.all.size + 1)
       ::Author.all.each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
@@ -164,7 +164,7 @@
     end
 
     it 'should have one option with a "selected" attribute' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select[@name='post[author_id]'] option[@selected]", :count => 1)
     end
 
@@ -177,7 +177,7 @@
         concat(builder.input(:author_status, :as => :select))
       end
 
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag('form li select#post_author_status_id')
     end
   end
@@ -255,33 +255,33 @@
 
     0.upto(1) do |i|
       it 'should have all option groups and the right values' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select optgroup[@label='#{@continent_names[i]}']", @authors[i].to_label)
       end
 
       it 'should have custom group labels' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select optgroup[@label='#{@continents[i].id}']", @authors[i].to_label)
       end
 
       it 'should have custom author labels' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select optgroup[@label='#{@continent_names[i]}']", @authors[i].login)
       end
 
       it 'should have custom author and group labels' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select optgroup[@label='#{@continents[i].id}']", @authors[i].login)
       end
     end
 
     it 'should have no duplicate groups' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select optgroup', :count => 8)
     end
 
     it 'should sort the groups on the label method' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select optgroup[@label='Africa']")
       output_buffer.should have_tag("form li select optgroup[@label='99']")
     end
@@ -311,18 +311,18 @@
     it_should_use_the_collection_when_provided(:select, 'option')
 
     it 'should have a select inside the wrapper' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#author_post_ids')
     end
 
     it 'should have a multi-select select' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select[@multiple="multiple"]')
     end
 
     it 'should have a select option for each Post' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select option', :count => ::Post.all.size)
       ::Post.all.each do |post|
         output_buffer.should have_tag("form li select option[@value='#{post.id}']", /#{post.to_label}/)
@@ -330,7 +330,7 @@
     end
 
     it 'should not have a blank option by default' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should_not have_tag("form li select option[@value='']")
     end
 
@@ -339,7 +339,7 @@
         concat(builder.input(:posts, :as => :select, :multiple => false, :include_blank => true))
       end
 
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select option[@value='']")
     end
 
@@ -348,12 +348,12 @@
         concat(builder.input(:posts, :as => :select, :multiple => true, :include_blank => true))
       end
 
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select option[@value='']")
     end
 
     it 'should have one option with a "selected" attribute' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select option[@selected]', :count => 1)
     end
   end
@@ -374,18 +374,18 @@
     it_should_use_the_collection_when_provided(:select, 'option')
 
     it 'should have a select inside the wrapper' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#post_author_ids')
     end
 
     it 'should have a multi-select select' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select[@multiple="multiple"]')
     end
 
     it 'should have a select option for each Author' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select option', :count => ::Author.all.size)
       ::Author.all.each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
@@ -393,7 +393,7 @@
     end
 
     it 'should not have a blank option by default' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should_not have_tag("form li select option[@value='']")
     end
 
@@ -402,7 +402,7 @@
         concat(builder.input(:authors, :as => :select, :multiple => false, :include_blank => true))
       end
 
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select option[@value='']")
     end
 
@@ -411,12 +411,12 @@
         concat(builder.input(:authors, :as => :select, :multiple => true, :include_blank => true))
       end
 
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select option[@value='']")
     end
 
     it 'should have one option with a "selected" attribute' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select option[@selected]', :count => 1)
     end
   end
@@ -430,12 +430,12 @@
     end
 
     it 'should have a select with prompt' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select option[@value='']", /choose author/)
     end
 
     it 'should not have a blank select option' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should_not have_tag("form li select option[@value='']", "")
     end
   end
@@ -448,19 +448,19 @@
     end
 
     it 'should generate label' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li label', /Author/)
       output_buffer.should have_tag("form li label[@for='project_author']")
     end
 
     it 'should generate select inputs' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select#project_author')
       output_buffer.should have_tag('form li select option', :count => ::Author.all.size + 1)
     end
 
     it 'should generate an option to each item' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       ::Author.all.each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
       end
@@ -478,7 +478,7 @@
     end
 
     it 'should generate an option to each item' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       @grouped_opts.each do |opt_pair|
         output_buffer.should have_tag("form li select optgroup[@label='#{opt_pair[0]}']")
         opt_pair[1].each do |v|
@@ -508,8 +508,8 @@
       end
 
       it "should render a select field" do
-        output_buffer.concat(@form_new_post) if Formtastic::Util.rails3?
-        output_buffer.concat(@form_project) if Formtastic::Util.rails3?
+        output_buffer.concat(@form_new_post)
+        output_buffer.concat(@form_project)
         output_buffer.should have_tag("form li select", :count => 2)
       end
     end
@@ -526,8 +526,8 @@
       end
 
       it "should render a text field" do
-        output_buffer.concat(@form_new_post) if Formtastic::Util.rails3?
-        output_buffer.concat(@form_project) if Formtastic::Util.rails3?
+        output_buffer.concat(@form_new_post)
+        output_buffer.concat(@form_project)
         output_buffer.should have_tag("form li input[@type='text']", :count => 2)
       end
     end
diff --git a/spec/inputs/string_input_spec.rb b/spec/inputs/string_input_spec.rb
index 21313c7ce..c0d293cf6 100644
--- a/spec/inputs/string_input_spec.rb
+++ b/spec/inputs/string_input_spec.rb
@@ -35,7 +35,7 @@ def input_field_for_method_should_have_maxlength(method, maxlength)
       form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(method))
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form li input[@maxlength='#{maxlength}']")
     end
 
@@ -87,7 +87,7 @@ def should_have_maxlength(maxlength, options)
             concat(builder.input(:title))
           end
 
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li input##{@new_post.class.name.underscore}_title[@maxlength='#{maxlength}']")
         end
 
@@ -173,7 +173,7 @@ def should_have_maxlength(maxlength, options)
     end
 
     it "should have no size attribute" do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should_not have_tag("input[@size]")
     end
   end
diff --git a/spec/inputs/text_input_spec.rb b/spec/inputs/text_input_spec.rb
index d937089bc..e390e66d8 100644
--- a/spec/inputs/text_input_spec.rb
+++ b/spec/inputs/text_input_spec.rb
@@ -27,7 +27,7 @@
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :class => 'myclass' }))
     end
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should have_tag("form li textarea.myclass")
   end
 
@@ -36,7 +36,7 @@
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :cols => 42 }))
     end
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should have_tag("form li textarea[@cols='42']")
   end
 
@@ -45,7 +45,7 @@
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :cols => nil }))
     end
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should_not have_tag("form li textarea[@cols]")
   end
 
@@ -54,7 +54,7 @@
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :rows => 42 }))
     end
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should have_tag("form li textarea[@rows='42']")
 
   end
@@ -64,7 +64,7 @@
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :rows => nil }))
     end
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should_not have_tag("form li textarea[@rows]")
   end
 
@@ -95,7 +95,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :text))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form li textarea[@rows='12']")
       end
     end
@@ -105,7 +105,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :text))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should_not have_tag("form li textarea[@rows]")
       end
 
@@ -122,7 +122,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :text))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form li textarea[@cols='10']")
       end
     end
@@ -132,7 +132,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :text))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should_not have_tag("form li textarea[@cols]")
       end
 
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index 7ad220efa..c073e2f91 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -24,14 +24,14 @@
       end
 
       it 'should not have an input for day, month and year' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should_not have_tag('#post_publish_at_1i')
         output_buffer.should_not have_tag('#post_publish_at_2i')
         output_buffer.should_not have_tag('#post_publish_at_3i')
       end
 
       it 'should have an input for hour and minute' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('#post_publish_at_4i')
         output_buffer.should have_tag('#post_publish_at_5i')
       end
@@ -51,30 +51,30 @@
       it_should_apply_error_logic_for_input_type(:time)
 
       it 'should have a legend and label with the label text inside the fieldset' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset legend.label label', /Publish at/)
       end
 
       it 'should associate the legend label with the first select' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset legend.label label[@for="post_publish_at_1i"]')
       end
 
       it 'should have an ordered list of two items inside the fieldset' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset ol')
         output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
       end
 
       it 'should have five labels for hour and minute' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => 2)
         output_buffer.should have_tag('form li.time fieldset ol li label', /hour/i)
         output_buffer.should have_tag('form li.time fieldset ol li label', /minute/i)
       end
 
       it 'should have two selects for hour and minute' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
       end
     end
@@ -87,7 +87,7 @@
       end
 
       it 'should have five labels for hour and minute' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => 3)
         output_buffer.should have_tag('form li.time fieldset ol li label', /hour/i)
         output_buffer.should have_tag('form li.time fieldset ol li label', /minute/i)
@@ -95,12 +95,12 @@
       end
 
       it 'should have three selects for hour, minute and seconds' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset ol li', :count => 3)
       end
 
       it 'should generate a sanitized label and matching ids for attribute' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         4.upto(6) do |i|
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_publish_at_#{i}i']")
           output_buffer.should have_tag("form li fieldset ol li #post_publish_at_#{i}i")
@@ -117,7 +117,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :time, :include_seconds => true, :labels => { field => "another #{field} label" }))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => fields.length)
         fields.each do |f|
           output_buffer.should have_tag('form li.time fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
@@ -129,7 +129,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :time, :include_seconds => true, :labels => { field => "" }))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => fields.length-1)
         fields.each do |f|
           output_buffer.should have_tag('form li.time fieldset ol li label', /#{f}/i) unless field == f
@@ -146,7 +146,7 @@
     end
 
     it 'should have a tag matching the namespace' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('#form2_post_publish_at_input')
       output_buffer.should have_tag('#form2_post_publish_at_4i')
       output_buffer.should have_tag('#form2_post_publish_at_5i')
diff --git a/spec/inputs/time_zone_input_spec.rb b/spec/inputs/time_zone_input_spec.rb
index d7f55a6b0..fdf61de88 100644
--- a/spec/inputs/time_zone_input_spec.rb
+++ b/spec/inputs/time_zone_input_spec.rb
@@ -19,14 +19,14 @@
   it_should_apply_error_logic_for_input_type(:time_zone)
 
   it 'should generate a label for the input' do
-    output_buffer.concat(@form) if Formtastic::Util.rails3?
+    output_buffer.concat(@form)
     output_buffer.should have_tag('form li label')
     output_buffer.should have_tag('form li label[@for="post_time_zone"]')
     output_buffer.should have_tag('form li label', /Time zone/)
   end
 
   it "should generate a select" do
-    output_buffer.concat(@form) if Formtastic::Util.rails3?
+    output_buffer.concat(@form)
     output_buffer.should have_tag("form li select")
     output_buffer.should have_tag("form li select#post_time_zone")
     output_buffer.should have_tag("form li select[@name=\"post[time_zone]\"]")
@@ -36,7 +36,7 @@
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:time_zone, :input_html => { :class => 'myclass' }))
     end
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should have_tag("form li select.myclass")
   end
 
@@ -65,14 +65,14 @@
     end
 
     it 'should generate labels' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li label')
       output_buffer.should have_tag('form li label[@for="project_time_zone"]')
       output_buffer.should have_tag('form li label', /Time zone/)
     end
 
     it 'should generate select inputs' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select")
       output_buffer.should have_tag("form li select#project_time_zone")
       output_buffer.should have_tag("form li select[@name=\"project[time_zone]\"]")
diff --git a/spec/inputs/url_input_spec.rb b/spec/inputs/url_input_spec.rb
index 4323a28ce..aae30275c 100644
--- a/spec/inputs/url_input_spec.rb
+++ b/spec/inputs/url_input_spec.rb
@@ -22,7 +22,7 @@
     it_should_have_label_with_text(/Url/)
     it_should_have_label_for("post_url")
     it_should_have_input_with_id("post_url")
-    it_should_have_input_with_type(Formtastic::Util.rails3? ? :url : :text)
+    it_should_have_input_with_type(:url)
     it_should_have_input_with_name("post[url]")
 
   end
diff --git a/spec/inputs_spec.rb b/spec/inputs_spec.rb
index 8e963ee63..6fb309424 100644
--- a/spec/inputs_spec.rb
+++ b/spec/inputs_spec.rb
@@ -23,28 +23,28 @@
       end
 
       it 'should output just the content wrapped in inputs, not the whole template' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should      =~ /before_builder/
         @inputs_output.should_not =~ /before_builder/
       end
 
       it 'should render a fieldset inside the form, with a class of "inputs"' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset.inputs")
       end
 
       it 'should render an ol inside the fieldset' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset.inputs ol")
       end
 
       it 'should render the contents of the block inside the ol' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset.inputs ol", /hello/)
       end
 
       it 'should not render a legend inside the fieldset' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should_not have_tag("form fieldset.inputs legend")
       end
 
@@ -55,7 +55,7 @@
           end
         end
 
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form fieldset.inputs ol", /bye/)
       end
     end
@@ -77,15 +77,14 @@
           concat(inputs)
         end
 
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form fieldset.inputs #post_author_attributes_login")
         output_buffer.should_not have_tag("form fieldset.inputs #author_login")
 
       end
 
-      it 'should concat rendered nested inputs to the template under rails3' do
+      it 'should concat rendered nested inputs to the template' do
         @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
-        ::Formtastic::Util.stub!(:rails3?).and_return(true)
 
         form = semantic_form_for(@new_post) do |builder|
           builder.inputs :for => [:author, @bob] do |bob_builder|
@@ -93,7 +92,7 @@
           end
         end
 
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form fieldset.inputs #post_author_attributes_login")
         output_buffer.should_not have_tag("form fieldset.inputs #author_login")
 
@@ -108,7 +107,7 @@
             end
             concat(inputs)
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form input[@name='post[author_attributes][login]']")
         end
 
@@ -127,7 +126,7 @@
             end
           end
 
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form input[@name='post[authors_attributes][0][login]']")
           output_buffer.should have_tag("form input[@name='post[authors_attributes][1][login]']")
         end
@@ -142,7 +141,7 @@
             end
             concat(inputs)
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form input[@name='post[author_attributes][login]']")
         end
 
@@ -157,7 +156,7 @@
             end
             concat(inputs)
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form input[@name='post[author][login]']")
         end
 
@@ -184,7 +183,7 @@
           concat(inputs)
         end
 
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag('form fieldset ol li #post_author_attributes_10_login')
       end
 
@@ -196,7 +195,7 @@
           concat(inputs)
         end
 
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should_not have_tag('fieldset[@builder="Formtastic::SemanticFormHelper"]')
       end
 
@@ -209,7 +208,7 @@
           concat(inputs)
         end
 
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag('fieldset legend', 'Author #1')
       end
 
@@ -222,7 +221,7 @@
           concat(inputs)
         end
 
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag('fieldset legend', 'Author #11')
       end
     end
@@ -251,7 +250,7 @@
         end
 
         it 'should render a fieldset with a legend inside the form' do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.concat(@form)
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text_using_name}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text_using_title}$/)
@@ -292,7 +291,7 @@
         end
 
         it 'should render a fieldset with a localized legend inside the form' do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.concat(@form)
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text_using_name}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text_using_title}$/)
@@ -313,7 +312,7 @@
       end
 
       it 'should pass the options into the fieldset tag as attributes' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset##{@id_option}")
         output_buffer.should have_tag("form fieldset.#{@class_option}")
       end
@@ -346,49 +345,49 @@
       end
 
       it 'should render a form' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form')
       end
 
       it 'should render a fieldset inside the form' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs')
       end
 
       it 'should not render a legend in the fieldset' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should_not have_tag('form > fieldset.inputs > legend')
       end
 
       it 'should render an ol in the fieldset' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs > ol')
       end
 
       it 'should render a list item in the ol for each column and reflection' do
         # Remove the :has_many macro and :created_at column
         count = ::Post.content_columns.size + ::Post.reflections.size - 2
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => count)
       end
 
       it 'should render a string list item for title' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs > ol > li.string')
       end
 
       it 'should render a text list item for body' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs > ol > li.text')
       end
 
       it 'should render a select list item for author_id' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs > ol > li.select', :count => 1)
       end
 
       it 'should not render timestamps inputs by default' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should_not have_tag('form > fieldset.inputs > ol > li.datetime')
       end
     end
@@ -400,7 +399,7 @@
             concat(builder.inputs(:title, :body))
           end
 
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => 2)
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.string')
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.text')
@@ -413,7 +412,7 @@
             concat(builder.inputs(:title, :body))
           end
 
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.string', :count => 2)
         end
       end
@@ -427,7 +426,7 @@
             concat(builder.inputs(:login, :for => @bob))
           end
 
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form fieldset.inputs #post_author_login")
           output_buffer.should_not have_tag("form fieldset.inputs #author_login")
         end
@@ -438,7 +437,7 @@
           form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
             concat(builder.inputs(:login, :for => @bob))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form fieldset.inputs #project_author_login")
           output_buffer.should_not have_tag("form fieldset.inputs #project_login")
         end
@@ -456,17 +455,17 @@
       end
 
       it 'should render a form with a fieldset containing two list items' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => 4)
       end
 
       it 'should pass the options down to the fieldset' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset#my-id.inputs')
       end
 
       it 'should use the special :name option as a text for the legend tag' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset#my-id.inputs > legend', /^#{@legend_text_using_option}$/)
         output_buffer.should have_tag('form > fieldset#my-id-2.inputs > legend', /^#{@legend_text_using_arg}$/)
       end
diff --git a/spec/label_spec.rb b/spec/label_spec.rb
index 2c31be022..b536340e1 100644
--- a/spec/label_spec.rb
+++ b/spec/label_spec.rb
@@ -35,7 +35,7 @@
       form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :value_method => :to_s, :label_method => proc {|f| ('Label_%s' % [f])}))
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag('form li fieldset ol li label', :with => /Label_[abc]/, :count => 3)
     end
 
@@ -43,7 +43,7 @@
       form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :value_method => proc {|f| ('Value_%s' % [f.to_s])}))
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag('form li fieldset ol li label input[value="Value_a"]')
       output_buffer.should have_tag('form li fieldset ol li label input[value="Value_b"]')
       output_buffer.should have_tag('form li fieldset ol li label input[value="Value_c"]')
diff --git a/spec/semantic_fields_for_spec.rb b/spec/semantic_fields_for_spec.rb
index 9cb95bc83..4cfe27d76 100644
--- a/spec/semantic_fields_for_spec.rb
+++ b/spec/semantic_fields_for_spec.rb
@@ -34,7 +34,7 @@
         concat(nested_builder.inputs(:login))
       end)
     end
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should have_tag('form fieldset.inputs #post_author_1_login_input')
     # Not valid selector, so using good ol' regex
     output_buffer.should_not =~ /id="post\[author\]_1_login_input"/
@@ -48,7 +48,7 @@
         concat(nested_builder.inputs(:login))
       end)
     end
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should have_tag('form fieldset.inputs #context2_post_author_1_login_input')
   end
   
@@ -67,7 +67,7 @@
           concat(nested_builder.input(:title))
         end)
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
     end
   
     it "should only render one hidden input (my one)" do
diff --git a/spec/support/custom_macros.rb b/spec/support/custom_macros.rb
index 65e40b6d3..0b9e757cb 100644
--- a/spec/support/custom_macros.rb
+++ b/spec/support/custom_macros.rb
@@ -10,91 +10,91 @@ module ClassMethods
 
     def it_should_have_input_wrapper_with_class(class_name)
       it "should have input wrapper with class '#{class_name}'" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li.#{class_name}")
       end
     end
 
     def it_should_have_input_wrapper_with_id(id_string)
       it "should have input wrapper with id '#{id_string}'" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li##{id_string}")
       end
     end
 
     def it_should_not_have_a_label
       it "should not have a label" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should_not have_tag("form li label")
       end
     end
 
     def it_should_have_a_nested_fieldset
       it "should have a nested_fieldset" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li fieldset")
       end
     end
 
     def it_should_have_label_with_text(string_or_regex)
       it "should have a label with text '#{string_or_regex}'" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li label", string_or_regex)
       end
     end
 
     def it_should_have_label_for(element_id)
       it "should have a label for ##{element_id}" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li label[@for='#{element_id}']")
       end
     end
 
     def it_should_have_input_with_id(element_id)
       it "should have an input with id '#{element_id}'" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li input##{element_id}")
       end
     end
 
     def it_should_have_select_with_id(element_id)
       it "should have a select box with id '#{element_id}'" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select##{element_id}")
       end
     end
 
     def it_should_have_input_with_type(input_type)
       it "should have a #{input_type} input" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li input[@type=\"#{input_type}\"]")
       end
     end
 
     def it_should_have_input_with_name(name)
       it "should have an input named #{name}" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li input[@name=\"#{name}\"]")
       end
     end
 
     def it_should_have_textarea_with_name(name)
       it "should have an input named #{name}" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li textarea[@name=\"#{name}\"]")
       end
     end
 
     def it_should_have_textarea_with_id(element_id)
       it "should have an input with id '#{element_id}'" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li textarea##{element_id}")
       end
     end
 
     def it_should_have_label_and_input_with_id(element_id)
       it "should have an input with id '#{element_id}'" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li input##{element_id}")
         output_buffer.should have_tag("form li label[@for='#{element_id}']")
       end
@@ -106,7 +106,7 @@ def it_should_use_default_text_field_size_when_not_nil(as)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => as))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li input[@size='#{Formtastic::SemanticFormBuilder.default_text_field_size}']")
         end
       end
@@ -118,7 +118,7 @@ def it_should_not_use_default_text_field_size_when_nil(as)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => as))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li input")
           output_buffer.should_not have_tag("form li input[@size]")
         end
@@ -130,7 +130,7 @@ def it_should_apply_custom_input_attributes_when_input_html_provided(as)
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as, :input_html => { :class => 'myclass' }))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form li input.myclass")
       end
     end
@@ -140,7 +140,7 @@ def it_should_apply_custom_for_to_label_when_input_html_id_provided(as)
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as, :input_html => { :id => 'myid' }))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag('form li label[@for="myid"]')
       end
     end
@@ -148,7 +148,7 @@ def it_should_apply_custom_for_to_label_when_input_html_id_provided(as)
     def it_should_have_maxlength_matching_column_limit
       it 'should have a maxlength matching column limit' do
         @new_post.column_for_attribute(:title).limit.should == 50
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li input[@maxlength='50']")
       end
     end
@@ -162,7 +162,7 @@ def it_should_use_column_size_for_columns_shorter_than_default_text_field_size(a
           concat(builder.input(:title, :as => as))
         end
 
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form li input[@size='#{column_limit_shorted_than_default}']")
       end
     end
@@ -183,7 +183,7 @@ def it_should_apply_error_logic_for_input_type(type)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag('form li.error')
         end
 
@@ -191,7 +191,7 @@ def it_should_apply_error_logic_for_input_type(type)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should_not have_tag('div.fieldWithErrors')
         end
 
@@ -200,7 +200,7 @@ def it_should_apply_error_logic_for_input_type(type)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag('form li.error p.inline-errors')
         end
 
@@ -209,7 +209,7 @@ def it_should_apply_error_logic_for_input_type(type)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag('form li.error ul.errors')
         end
       end
@@ -222,17 +222,17 @@ def it_should_apply_error_logic_for_input_type(type)
         end
 
         it 'should not apply an errors class to the list item' do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.concat(@form)
           output_buffer.should_not have_tag('form li.error')
         end
 
         it 'should not render a paragraph for the errors' do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.concat(@form)
           output_buffer.should_not have_tag('form li.error p.inline-errors')
         end
 
         it 'should not display an error list' do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.concat(@form)
           output_buffer.should_not have_tag('form li.error ul.errors')
         end
       end
@@ -245,17 +245,17 @@ def it_should_apply_error_logic_for_input_type(type)
         end
 
         it 'should not apply an errors class to the list item' do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.concat(@form)
           output_buffer.should_not have_tag('form li.error')
         end
 
         it 'should not render a paragraph for the errors' do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.concat(@form)
           output_buffer.should_not have_tag('form li.error p.inline-errors')
         end
 
         it 'should not display an error list' do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.concat(@form)
           output_buffer.should_not have_tag('form li.error ul.errors')
         end
       end
@@ -282,7 +282,7 @@ def it_should_use_the_collection_when_provided(as, countable)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:author, :as => as, :collection => @authors))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li.#{as} #{countable}", :count => @authors.size + (as == :select ? 1 : 0))
         end
 
@@ -295,7 +295,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
 
             @categories.each do |value|
               output_buffer.should have_tag("form li.#{as}", /#{value}/)
@@ -312,7 +312,7 @@ def it_should_use_the_collection_when_provided(as, countable)
                 end
                 concat(fields)
               end
-              output_buffer.concat(form) if Formtastic::Util.rails3?
+              output_buffer.concat(form)
               output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_general']")
               output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_design']")
               output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_development']")
@@ -330,7 +330,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
 
             @categories.each do |label, value|
               output_buffer.should have_tag("form li.#{as}", /#{label}/)
@@ -348,7 +348,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
 
             @categories.each do |text, value|
               label = as == :select ? :option : :label
@@ -369,7 +369,7 @@ def it_should_use_the_collection_when_provided(as, countable)
               form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:category_name, :as => as, :collection => @choices))
               end
-              output_buffer.concat(form) if Formtastic::Util.rails3?
+              output_buffer.concat(form)
 
               output_buffer.should have_tag("form li.#{as} #{countable}#post_category_name_true")
               output_buffer.should have_tag("form li.#{as} #{countable}#post_category_name_false")
@@ -386,7 +386,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
 
             @categories.each do |value|
               label = as == :select ? :option : :label
@@ -405,7 +405,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
 
             @categories.each do |label, value|
               output_buffer.should have_tag("form li.#{as}", /#{label}/)
@@ -425,7 +425,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             end
 
             it 'should have options with text content from the specified method' do
-              output_buffer.concat(@form) if Formtastic::Util.rails3?
+              output_buffer.concat(@form)
               ::Author.all.each do |author|
                 output_buffer.should have_tag("form li.#{as}", /#{author.login}/)
               end
@@ -440,7 +440,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             end
 
             it 'should have options with the proc applied to each' do
-              output_buffer.concat(@form) if Formtastic::Util.rails3?
+              output_buffer.concat(@form)
               ::Author.all.each do |author|
                 output_buffer.should have_tag("form li.#{as}", /#{author.login.reverse}/)
               end
@@ -463,7 +463,7 @@ def it_should_use_the_collection_when_provided(as, countable)
               end
 
               it "should render the options with #{label_method} as the label" do
-                output_buffer.concat(@form) if Formtastic::Util.rails3?
+                output_buffer.concat(@form)
                 ::Author.all.each do |author|
                   output_buffer.should have_tag("form li.#{as}", /The Label Text/)
                 end
@@ -483,7 +483,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             end
 
             it 'should have options with values from specified method' do
-              output_buffer.concat(@form) if Formtastic::Util.rails3?
+              output_buffer.concat(@form)
               ::Author.all.each do |author|
                 output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login}']")
               end
@@ -498,7 +498,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             end
 
             it 'should have options with the proc applied to each value' do
-              output_buffer.concat(@form) if Formtastic::Util.rails3?
+              output_buffer.concat(@form)
               ::Author.all.each do |author|
                 output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login.reverse}']")
               end
diff --git a/spec/support/test_environment.rb b/spec/support/test_environment.rb
index 665aac524..abd650d15 100644
--- a/spec/support/test_environment.rb
+++ b/spec/support/test_environment.rb
@@ -7,25 +7,18 @@
   config.mock_with :rspec
 end
 
-if Formtastic::Util.rails3?
-
-  require "action_controller/railtie"
-  require "active_resource/railtie"
-  require 'active_model'
-
-  # Create a simple rails application for use in testing the viewhelper
-  module FormtasticTest
-    class Application < Rails::Application
-      # Configure the default encoding used in templates for Ruby 1.9.
-      config.encoding = "utf-8"
-      config.active_support.deprecation = :stderr
-    end
+require "action_controller/railtie"
+require "active_resource/railtie"
+require 'active_model'
+
+# Create a simple rails application for use in testing the viewhelper
+module FormtasticTest
+  class Application < Rails::Application
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+    config.active_support.deprecation = :stderr
   end
-  FormtasticTest::Application.initialize!
-
-  require 'rspec/rails'
 end
+FormtasticTest::Application.initialize!
 
-
-
-
+require 'rspec/rails'

From e1cd7c19396feb055cb3c1d8fe52f732c4823af2 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 12 Jan 2011 23:24:24 +1100
Subject: [PATCH 404/992] uncomment a test that was failing under rails 2

---
 spec/inputs/check_boxes_input_spec.rb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index de9a3aa02..dfdc1a1aa 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -163,12 +163,9 @@
         end
         output_buffer.concat(form)
 
-        ## This should work, but it's emits deprecation warnings under Rails 2
-        ## TODO: revisit in 2.0 when we drop Rails 2. Simpler test follows.
-        #output_buffer.should have_tag('form li fieldset ol li label') do |label|
-        #  label.body.should match /&lt;b&gt;Item [12]&lt;\/b&gt;$/
-        #end
-        output_buffer.should  =~ /&lt;b&gt;Item [12]&lt;\/b&gt;/
+        output_buffer.should have_tag('form li fieldset ol li label') do |label|
+          label.body.should match /&lt;b&gt;Item [12]&lt;\/b&gt;$/
+        end
       end
     end
 

From e1c9ee98c6d6ab8ea97846d09dd24934e1cd0356 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 13 Jan 2011 07:03:41 +1100
Subject: [PATCH 405/992] pretty sure we don't need these in Rails 3

---
 lib/formtastic.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index d35943f2c..e9c1a4d0e 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -569,13 +569,11 @@ def inputs_for_nested_attributes(*args, &block) #:nodoc:
           lambda do |f|
             contents = f.inputs(*args){ block.call(f) }
             template.concat(contents)
-            contents # TODO: needed in Rails 3?
           end
         else
           lambda do |f|
             contents = f.inputs(*args)
             template.concat(contents)
-            contents # TODO: needed in Rails 3?
           end
         end
 

From a998ec5a59b7a7055fedb753142f40667e1305e4 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 13 Jan 2011 07:12:26 +1100
Subject: [PATCH 406/992] moved compatibility note in README further up

---
 README.textile | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/README.textile b/README.textile
index 5229a4b09..499277a48 100644
--- a/README.textile
+++ b/README.textile
@@ -4,6 +4,15 @@ Formtastic is a Rails FormBuilder DSL (with some other goodies) to make it far e
 
 <a href='http://www.pledgie.com/campaigns/2178'><img alt='Click here to lend your support to: formtastic and make a donation at www.pledgie.com !' src='http://pledgie.com/campaigns/2178.png?skin_name=chrome' border='0' /></a>
 
+
+h2. Compatibility
+
+* Formtastic 1.x is compatible with both Rails 2 and 3, and is being maintained for bug fixes in the the "1.2-stable branch":https://github.com/justinfrench/formtastic/tree/1.2-stable.
+* Formtastic 2.0 will be Rails 3.x compatible only
+* If you're bundling Formtastic from edge/master, get ready for a bumpy ride. Try the "1.2-stable branch":https://github.com/justinfrench/formtastic/tree/1.2-stable.
+* Formtastic, much like Rails, is very ActiveRecord-centric. Many are successfully using other ActiveModel-like ORMs and objects (DataMapper, MongoMapper, Mongoid, Authlogic, Devise...) but we're not guaranteeing full compatibility at this stage. Patches are welcome!
+ 
+
 h2. The Story
 
 One day, I finally had enough, so I opened up my text editor, and wrote a DSL for how I'd like to author forms:
@@ -81,7 +90,7 @@ RDoc documentation _should_ be automatically generated after each commit and mad
 
 h2. Installation
 
-Formtastic 2 compatible with Rails 3 only, and the gem is "hosted":http://rubygems.org/gems/formtastic on RubyGems.org.
+Formtastic edge (2.0) will be compatible with Rails 3 only, and the gem is "hosted":http://rubygems.org/gems/formtastic on RubyGems.org.
 
 Simply add Formtastic to your Gemfile and bundle it up:
 
@@ -588,12 +597,6 @@ There are none, but...
 * "rspec":http://github.com/dchelimsky/rspec/, "rspec_hpricot_matchers":http://rubyforge.org/projects/rspec-hpricot/ and "rcov":http://github.com/relevance/rcov gems (plus any of their own dependencies) are required for the test suite.
 
 
-h2. Compatibility
-
-* We're only testing Formtastic with the latest Rails stable release. Patches are welcome to allow backwards compatibility with previous versions of Rails, of course, but we've dropped support for Rails 2. Formtastic 1.x is compatible with Rails 2, and is being maintained for bug fixes only. See the README in the "1.2-stable branch":https://github.com/justinfrench/formtastic/tree/1.2-stable.
-* Formtastic, much like Rails, is very ActiveRecord-centric. Many people are using Formtastic successfully with other ActiveModel-like ORMs and classes (DataMapper, MongoMapper, Mongoid, Authlogic, Devise...) but we're not guaranteeing full compatibility at this stage. Patches are welcome.
- 
-
 h2. How to contribute
 
 Please ensure that you provide appropriate spec/test coverage and ensure the documentation is up-to-date.  Bonus points if you perform your changes in a clean topic branch rather than master, and if you create a pull request for your changes to be discussed and reviewed.

From 2d8a53efa001476cfc4b2ac78900a100aded4427 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 13 Jan 2011 17:04:05 +1100
Subject: [PATCH 407/992] we can just use ::ActiveSupport::Deprecation.silence
 instead

---
 spec/support/deprecation.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/spec/support/deprecation.rb b/spec/support/deprecation.rb
index 878af0d76..e21242b7a 100644
--- a/spec/support/deprecation.rb
+++ b/spec/support/deprecation.rb
@@ -1,7 +1,6 @@
 def with_deprecation_silenced(&block)
-  previous_value = ::ActiveSupport::Deprecation.silenced
-  ::ActiveSupport::Deprecation.silenced = true
-  yield
-  ::ActiveSupport::Deprecation.silenced = previous_value
+  ::ActiveSupport::Deprecation.silence do
+    yield
+  end
 end
 

From 44a9cc3cf19a268420c04f170bc94f1077bd3dba Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 13 Jan 2011 17:31:54 +1100
Subject: [PATCH 408/992] dup the html_options before deleting stuff from it,
 resolves GH-480

---
 lib/formtastic.rb   | 5 ++---
 spec/inputs_spec.rb | 6 ++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 2ce73a472..381b22f5f 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -286,7 +286,7 @@ def inputs(*args, &block)
       html_options = args.extract_options!
       html_options[:class] ||= "inputs"
       html_options[:name] = title
-
+      
       if html_options[:for] # Nested form
         inputs_for_nested_attributes(*(args << html_options), &block)
       elsif block_given?
@@ -569,7 +569,6 @@ def inputs_for_nested_attributes(*args, &block) #:nodoc:
         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
-
           lambda do |f|
             contents = f.inputs(*args){ block.call(f) }
             template.concat(contents) if ::Formtastic::Util.rails3?
@@ -1356,7 +1355,7 @@ 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  = html_options.dup.delete(:name).to_s
         legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
         legend  = template.content_tag(:legend, template.content_tag(:span, Formtastic::Util.html_safe(legend))) unless legend.blank?
 
diff --git a/spec/inputs_spec.rb b/spec/inputs_spec.rb
index 8e963ee63..4896ad0d4 100644
--- a/spec/inputs_spec.rb
+++ b/spec/inputs_spec.rb
@@ -120,14 +120,16 @@
           @new_post.stub!(:authors_attributes=)
         end
 
-        it 'should nest the inputs with a name input for each item' do
+        it 'should nest the inputs with a fieldset, legend and :name input for each item' do
           form = semantic_form_for(@new_post) do |post|
-            post.inputs :for => :authors do |author|
+            post.inputs :for => :authors, :name => '%i' do |author|
               concat(author.input(:login))
             end
           end
 
           output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.should have_tag("form fieldset.inputs", :count => 2)
+          output_buffer.should have_tag("form fieldset.inputs legend", :count => 2)
           output_buffer.should have_tag("form input[@name='post[authors_attributes][0][login]']")
           output_buffer.should have_tag("form input[@name='post[authors_attributes][1][login]']")
         end

From a2d6a09fe6b5be2f98a99f8bc70df8f7db3d36d7 Mon Sep 17 00:00:00 2001
From: eugenebolshakov <eugene.bolshakov@gmail.com>
Date: Fri, 14 Jan 2011 13:16:05 +0300
Subject: [PATCH 409/992] Use check_box_checked? from Rails for boolean inputs

---
 lib/formtastic.rb                 |  3 ++-
 spec/inputs/boolean_input_spec.rb | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 381b22f5f..9e2dc0d8c 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1256,12 +1256,13 @@ def boolean_input(method, options)
         html_options  = options.delete(:input_html) || {}
         checked_value = options.delete(:checked_value) || '1'
         unchecked_value = options.delete(:unchecked_value) || '0'
+        checked = @object && ActionView::Helpers::InstanceTag.check_box_checked?(@object.send(:"#{method}"), checked_value)
 
         html_options[:id] = html_options[:id] || generate_html_id(method, "")
         input = template.check_box_tag(
           "#{@object_name}[#{method}]",
           checked_value,
-          (@object && @object.send(:"#{method}")),
+          checked,
           html_options
         )
         
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index 3ded0a0a3..e31a8eb6e 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -83,6 +83,28 @@
     output_buffer.should_not have_tag('form li label input[@type="hidden"]') # invalid HTML5
   end
 
+  it 'should generate a checked input if object.method returns checked value' do
+    @new_post.stub!(:allow_comments).and_return('yes')
+
+    form = semantic_form_for(@new_post) do |builder|
+      concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'yes', :unchecked_value => 'no'))
+    end
+
+    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.should have_tag('form li label input[@type="checkbox"][@value="yes"][@checked="checked"]')
+  end
+
+  it 'should not generate a checked input if object.method returns unchecked value' do
+    @new_post.stub!(:allow_comments).and_return('no')
+
+    form = semantic_form_for(@new_post) do |builder|
+      concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'yes', :unchecked_value => 'no'))
+    end
+
+    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.should have_tag('form li label input[@type="checkbox"][@value="yes"]:not([@checked])')
+  end
+
   it 'should generate a label and a checkbox even if no object is given' do
     form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
       concat(builder.input(:allow_comments, :as => :boolean))

From a13e7672419b498014cb893858ca29ac9084bce7 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 14 Jan 2011 22:53:41 +1100
Subject: [PATCH 410/992] No need for output_buffer.concat(form) any more now
 that we're only supporting the Rails 3 block styles.

---
 spec/buttons_spec.rb                  |  40 ++---
 spec/commit_button_spec.rb            | 123 ++++++-------
 spec/errors_spec.rb                   |  10 +-
 spec/form_helper_spec.rb              |  47 ++---
 spec/i18n_spec.rb                     |  25 ++-
 spec/include_blank_spec.rb            |  20 +--
 spec/input_spec.rb                    | 202 +++++++++-------------
 spec/inputs/boolean_input_spec.rb     |  41 ++---
 spec/inputs/check_boxes_input_spec.rb |  91 ++++------
 spec/inputs/country_input_spec.rb     |  20 +--
 spec/inputs/date_input_spec.rb        |  23 +--
 spec/inputs/datetime_input_spec.rb    | 239 --------------------------
 spec/inputs/email_input_spec.rb       |   8 +-
 spec/inputs/file_input_spec.rb        |  13 +-
 spec/inputs/hidden_input_spec.rb      |  23 +--
 spec/inputs/numeric_input_spec.rb     |  12 +-
 spec/inputs/password_input_spec.rb    |  12 +-
 spec/inputs/phone_input_spec.rb       |   8 +-
 spec/inputs/radio_input_spec.rb       |  63 +++----
 spec/inputs/search_input_spec.rb      |   8 +-
 spec/inputs/select_input_spec.rb      | 136 +++++----------
 spec/inputs/string_input_spec.rb      |  27 ++-
 spec/inputs/text_input_spec.rb        |  53 +++---
 spec/inputs/time_input_spec.rb        |  37 ++--
 spec/inputs/time_zone_input_spec.rb   |  21 +--
 spec/inputs/url_input_spec.rb         |   8 +-
 spec/inputs_spec.rb                   | 122 +++++--------
 spec/label_spec.rb                    |  10 +-
 spec/semantic_fields_for_spec.rb      |  15 +-
 spec/support/custom_macros.rb         | 140 ++++++---------
 spec/support/test_environment.rb      |   5 +
 31 files changed, 508 insertions(+), 1094 deletions(-)
 delete mode 100644 spec/inputs/datetime_input_spec.rb

diff --git a/spec/buttons_spec.rb b/spec/buttons_spec.rb
index 23aa11258..a52c89127 100644
--- a/spec/buttons_spec.rb
+++ b/spec/buttons_spec.rb
@@ -13,31 +13,27 @@
   describe 'with a block' do
     describe 'when no options are provided' do
       before do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           buttons = builder.buttons do
             concat('hello')
           end
           concat(buttons)
-        end
+        end)
       end
 
       it 'should render a fieldset inside the form, with a class of "inputs"' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset.buttons")
       end
 
       it 'should render an ol inside the fieldset' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset.buttons ol")
       end
 
       it 'should render the contents of the block inside the ol' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset.buttons ol", /hello/)
       end
 
       it 'should not render a legend inside the fieldset' do
-        output_buffer.concat(@form)
         output_buffer.should_not have_tag("form fieldset.buttons legend")
       end
     end
@@ -46,13 +42,12 @@
       before do
         @legend_text = "Advanced options"
 
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           builder.buttons :name => @legend_text do
           end
-        end
+        end)
       end
       it 'should render a fieldset inside the form' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset legend", /#{@legend_text}/)
       end
     end
@@ -62,13 +57,12 @@
         @id_option = 'advanced'
         @class_option = 'wide'
 
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           builder.buttons :id => @id_option, :class => @class_option do
           end
-        end
+        end)
       end
       it 'should pass the options into the fieldset tag as attributes' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset##{@id_option}")
         output_buffer.should have_tag("form fieldset.#{@class_option}")
       end
@@ -81,38 +75,32 @@
     describe 'with no args (default buttons)' do
 
       before do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.buttons)
-        end
+        end)
       end
 
       it 'should render a form' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form')
       end
 
       it 'should render a buttons fieldset inside the form' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form fieldset.buttons')
       end
 
       it 'should not render a legend in the fieldset' do
-        output_buffer.concat(@form)
         output_buffer.should_not have_tag('form fieldset.buttons legend')
       end
 
       it 'should render an ol in the fieldset' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form fieldset.buttons ol')
       end
 
       it 'should render a list item in the ol for each default button' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form fieldset.buttons ol li', :count => 1)
       end
 
       it 'should render a commit list item for the commit button' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form fieldset.buttons ol li.commit')
       end
 
@@ -121,13 +109,12 @@
     describe 'with button names as args' do
 
       before do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.buttons(:commit))
-        end
+        end)
       end
 
       it 'should render a form with a fieldset containing a list item for each button arg' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.buttons > ol > li', :count => 1)
         output_buffer.should have_tag('form > fieldset.buttons > ol > li.commit')
       end
@@ -137,24 +124,21 @@
     describe 'with button names as args and an options hash' do
 
       before do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.buttons(:commit, :name => "Now click a button", :id => "my-id"))
-        end
+        end)
       end
 
       it 'should render a form with a fieldset containing a list item for each button arg' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.buttons > ol > li', :count => 1)
         output_buffer.should have_tag('form > fieldset.buttons > ol > li.commit', :count => 1)
       end
 
       it 'should pass the options down to the fieldset' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset#my-id.buttons')
       end
 
       it 'should use the special :name option as a text for the legend tag' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset#my-id.buttons > legend', /Now click a button/)
       end
 
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index 700040167..866d2a7b9 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -33,33 +33,29 @@
 
     before do
       @new_post.stub!(:new_record?).and_return(false)
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.commit_button)
-      end
+      end)
     end
 
     it 'should render a commit li' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('li.commit')
     end
 
     it 'should render an input with a type attribute of "submit"' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('li.commit input[@type="submit"]')
     end
 
     it 'should render an input with a name attribute of "commit"' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('li.commit input[@name="commit"]')
     end
 
     it 'should pass options given in :button_html to the button' do
       @new_post.stub!(:new_record?).and_return(false)
-      form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.commit_button('text', :button_html => {:class => 'my_class', :id => 'my_id'}))
-      end
+      end)
 
-      output_buffer.concat(form)
       output_buffer.should have_tag('li.commit input#my_id')
       output_buffer.should have_tag('li.commit input.my_class')
     end
@@ -77,10 +73,9 @@
     it 'should use the default if set' do
       with_config :default_commit_button_accesskey, 's' do
         @new_post.stub!(:new_record?).and_return(false)
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :button_html => {}))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag('li.commit input[@accesskey="s"]')
       end
     end
@@ -88,10 +83,9 @@
     it 'should use the value set in options over the default' do
       with_config :default_commit_button_accesskey, 's' do
         @new_post.stub!(:new_record?).and_return(false)
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :accesskey => 'o'))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should_not have_tag('li.commit input[@accesskey="s"]')
         output_buffer.should have_tag('li.commit input[@accesskey="o"]')
       end
@@ -100,10 +94,9 @@
     it 'should use the value set in button_html over options' do
       with_config :default_commit_button_accesskey, 's' do
         @new_post.stub!(:new_record?).and_return(false)
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :accesskey => 'o', :button_html => {:accesskey => 't'}))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should_not have_tag('li.commit input[@accesskey="s"]')
         output_buffer.should_not have_tag('li.commit input[@accesskey="o"]')
         output_buffer.should have_tag('li.commit input[@accesskey="t"]')
@@ -116,18 +109,16 @@
 
     before do
       @new_post.stub!(:new_record?).and_return(false)
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.commit_button("a string", :button_html => { :class => "pretty"}))
-      end
+      end)
     end
 
     it "should render the string as the value of the button" do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('li input[@value="a string"]')
     end
 
     it "should deal with the options hash" do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('li input.pretty')
     end
 
@@ -137,13 +128,12 @@
 
     before do
       @new_post.stub!(:new_record?).and_return(false)
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.commit_button(:button_html => { :class => "pretty"}))
-      end
+      end)
     end
 
     it "should deal with the options hash" do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('li input.pretty')
     end
 
@@ -155,10 +145,9 @@
     describe 'when used without object' do
       describe 'when explicit label is provided' do
         it 'should render an input with the explicitly specified label' do
-          form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
+          concat(semantic_form_for(:post, :url => 'http://example.com') do |builder|
             concat(builder.commit_button("Click!"))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag('li.commit input[@value="Click!"][@class~="submit"]')
         end
       end
@@ -174,10 +163,9 @@
           end
 
           it 'should render an input with default I18n-localized label (fallback)' do
-            form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
+            concat(semantic_form_for(:post, :url => 'http://example.com') do |builder|
               concat(builder.commit_button)
-            end
-            output_buffer.concat(form)
+            end)
             output_buffer.should have_tag('li.commit input[@value="Submit Post"][@class~="submit"]')
           end
         end
@@ -206,18 +194,16 @@
                     }
                   }
                }
-           form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
+           concat(semantic_form_for(:post, :url => 'http://example.com') do |builder|
              concat(builder.commit_button)
-           end
-           output_buffer.concat(form)
+           end)
            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit Post"][@class~="submit"]})
          end
 
          it 'should render an input with anoptional localized label (I18n) - if first is not set' do
-           form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
+           concat(semantic_form_for(:post, :url => 'http://example.com') do |builder|
              concat(builder.commit_button)
-           end
-           output_buffer.concat(form)
+           end)
            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit"][@class~="submit"]})
          end
 
@@ -233,10 +219,9 @@
 
       describe 'when explicit label is provided' do
         it 'should render an input with the explicitly specified label' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.commit_button("Click!"))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag('li.commit input[@value="Click!"][@class~="create"]')
         end
       end
@@ -252,10 +237,9 @@
           end
 
           it 'should render an input with default I18n-localized label (fallback)' do
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
-            end
-            output_buffer.concat(form)
+            end)
             output_buffer.should have_tag('li.commit input[@value="Create Post"][@class~="create"]')
           end
         end
@@ -284,18 +268,16 @@
                      }
                    }
                 }
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
-            end
-            output_buffer.concat(form)
+            end)
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create Post"][@class~="create"]})
           end
 
           it 'should render an input with anoptional localized label (I18n) - if first is not set' do
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
-            end
-            output_buffer.concat(form)
+            end)
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create"][@class~="create"]})
           end
 
@@ -311,10 +293,9 @@
 
       describe 'when explicit label is provided' do
         it 'should render an input with the explicitly specified label' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.commit_button("Click!"))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag('li.commit input[@value="Click!"][@class~="update"]')
         end
       end
@@ -330,10 +311,9 @@
           end
 
           it 'should render an input with default I18n-localized label (fallback)' do
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
-            end
-            output_buffer.concat(form)
+            end)
             output_buffer.should have_tag('li.commit input[@value="Save Post"][@class~="update"]')
           end
         end
@@ -363,18 +343,16 @@
                      }
                    }
                 }
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
-            end
-            output_buffer.concat(form)
+            end)
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save Post"][@class~="update"]})
           end
 
           it 'should render an input with anoptional localized label (I18n) - if first is not set' do
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
-            end
-            output_buffer.concat(form)
+            end)
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save"][@class~="update"]})
             ::I18n.backend.store_translations :en, :formtastic => {}
           end
@@ -405,13 +383,12 @@ def self.human_name
       @new_user_post = ::UserPost.new
 
       @new_user_post.stub!(:new_record?).and_return(true)
-      @form = semantic_form_for(@new_user_post, :url => '') do |builder|
+      concat(semantic_form_for(@new_user_post, :url => '') do |builder|
         concat(builder.commit_button())
-      end
+      end)
     end
 
     it "should render the string as the value of the button" do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('li input[@value="Create User post"]')
     end
 
@@ -421,27 +398,24 @@ def self.human_name
 
     describe 'when provided' do
       it 'should be passed down to the li tag' do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :wrapper_html => {:id => :another_id}))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag("form li#another_id")
       end
 
       it 'should append given classes to li default classes' do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :wrapper_html => {:class => :another_class}))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag("form li.commit")
         output_buffer.should have_tag("form li.another_class")
       end
 
       it 'should allow classes to be an array' do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :wrapper_html => {:class => [ :my_class, :another_class ]}))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag("form li.commit")
         output_buffer.should have_tag("form li.my_class")
         output_buffer.should have_tag("form li.another_class")
@@ -450,10 +424,9 @@ def self.human_name
 
     describe 'when not provided' do
       it 'should use default id and class' do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text'))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag("form li.commit")
       end
     end
diff --git a/spec/errors_spec.rb b/spec/errors_spec.rb
index 3961d83a1..63d033d8f 100644
--- a/spec/errors_spec.rb
+++ b/spec/errors_spec.rb
@@ -138,11 +138,10 @@
       @errors.stub!(:[]).with(:document).and_return(nil)
 
       with_config :inline_errors, :sentence do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:document))
-        end
+        end)
       end 
-      output_buffer.concat(@form)
       output_buffer.should have_tag("li[@class='file optional error']")
       output_buffer.should have_tag('p.inline-errors', (['must be an image','must be provided', 'must be less than 4mb']).to_sentence)
     end
@@ -157,11 +156,10 @@
       @errors.stub!(:[]).with(:author_id).and_return(['is already taken', 'must not be blank']) # note the duplicate of association
 
       with_config :inline_errors, :list do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:author))
-        end
+        end)
       end
-      output_buffer.concat(@form)
       output_buffer.should have_tag("ul.errors li", /must not be blank/, :count => 1)
       output_buffer.should have_tag("ul.errors li", /is already taken/, :count => 1)
     end
diff --git a/spec/form_helper_spec.rb b/spec/form_helper_spec.rb
index 1bf37e754..ec9a87cce 100644
--- a/spec/form_helper_spec.rb
+++ b/spec/form_helper_spec.rb
@@ -19,76 +19,65 @@
     end
 
     it 'adds a class of "formtastic" to the generated form' do
-      form = semantic_form_for(@new_post, :url => '/hello') do |builder|
-      end
-      output_buffer.concat(form)
+      concat(semantic_form_for(@new_post, :url => '/hello') do |builder|
+      end)
       output_buffer.should have_tag("form.formtastic")
     end
 
     it 'adds a class of "xyz" to the generated form' do
       ::Formtastic::SemanticFormHelper.default_form_class = 'xyz'
-      form = semantic_form_for(::Post.new, :as => :post, :url => '/hello') do |builder|
-      end
-      output_buffer.concat(form)
+      concat(semantic_form_for(::Post.new, :as => :post, :url => '/hello') do |builder|
+      end)
       output_buffer.should have_tag("form.xyz")
     end
 
     it 'adds class matching the object name to the generated form when a symbol is provided' do
-      form = semantic_form_for(@new_post, :url => '/hello') do |builder|
-      end
-      output_buffer.concat(form)
+      concat(semantic_form_for(@new_post, :url => '/hello') do |builder|
+      end)
       output_buffer.should have_tag("form.post")
 
-      form = semantic_form_for(:project, :url => '/hello') do |builder|
-      end
-      output_buffer.concat(form)
+      concat(semantic_form_for(:project, :url => '/hello') do |builder|
+      end)
       output_buffer.should have_tag("form.project")
     end
 
     it 'adds class matching the :as option when provided' do
-      form = semantic_form_for(@new_post, :as => :message, :url => '/hello') do |builder|
-      end
-      output_buffer.concat(form)
+      concat(semantic_form_for(@new_post, :as => :message, :url => '/hello') do |builder|
+      end)
       output_buffer.should have_tag("form.message")
 
-      form = semantic_form_for([:admins, @new_post], :as => :message, :url => '/hello') do |builder|
-      end
-      output_buffer.concat(form)
+      concat(semantic_form_for([:admins, @new_post], :as => :message, :url => '/hello') do |builder|
+      end)
       output_buffer.should have_tag("form.message")
     end
 
     it 'adds class matching the object\'s class to the generated form when an object is provided' do
-      form = semantic_form_for(@new_post) do |builder|
-      end
-      output_buffer.concat(form)
+      concat(semantic_form_for(@new_post) do |builder|
+      end)
       output_buffer.should have_tag("form.post")
     end
 
     it 'adds a namespaced class to the generated form' do
-      form = semantic_form_for(::Namespaced::Post.new, :url => '/hello') do |builder|
-      end
-      output_buffer.concat(form)
+      concat(semantic_form_for(::Namespaced::Post.new, :url => '/hello') do |builder|
+      end)
       output_buffer.should have_tag("form.namespaced_post")
     end
 
     describe 'allows :html options' do
       before(:each) do
-         @form = semantic_form_for(@new_post, :url => '/hello', :html => { :id => "something-special", :class => "something-extra", :multipart => true }) do |builder|
-        end
+        concat(semantic_form_for(@new_post, :url => '/hello', :html => { :id => "something-special", :class => "something-extra", :multipart => true }) do |builder|
+        end)
       end
 
       it 'to add a id of "something-special" to generated form' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form#something-special")
       end
 
       it 'to add a class of "something-extra" to generated form' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form.something-extra")
       end
 
       it 'to add enctype="multipart/form-data"' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form[@enctype="multipart/form-data"]')
       end
     end
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index 48d06abbb..cd4ecfd07 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -113,46 +113,41 @@
     end
 
     it "should be able to translate with namespaced object" do
-      form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:title))
-      end
-      output_buffer.concat(form)
+      end)
       output_buffer.should have_tag("form label", /Hello post!/)
     end
 
     it "should be able to translate without form-object" do
-      form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+      concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:title))
-      end
-      output_buffer.concat(form)
+      end)
       output_buffer.should have_tag("form label", /Hello project!/)
     end
 
     it 'should be able to translate nested objects with nested translations' do
-      form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+      concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
         builder.semantic_fields_for(:task) do |f|
           concat(f.input(:name))
         end
-      end
-      output_buffer.concat(form)
+      end)
       output_buffer.should have_tag("form label", /Hello task name!/)
     end
 
     it 'should be able to translate nested objects with top level translations' do
-      form = semantic_form_for(:order, :url => 'http://test.host') do |builder|
+      concat(semantic_form_for(:order, :url => 'http://test.host') do |builder|
         builder.semantic_fields_for(:line_item) do |f|
           concat(f.input(:name))
         end
-      end
-      output_buffer.concat(form)
+      end)
       output_buffer.should have_tag("form label", /Hello line item name!/)
     end
 
     it 'should be able to translate helper label as Rails does' do
-      form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author))
-      end
-      output_buffer.concat(form)
+      end)
       output_buffer.should have_tag("form label", /Written by/)
     end
 
diff --git a/spec/include_blank_spec.rb b/spec/include_blank_spec.rb
index c854d7b47..5c68efb4f 100644
--- a/spec/include_blank_spec.rb
+++ b/spec/include_blank_spec.rb
@@ -24,10 +24,9 @@
     it 'blank value should be included if the default value specified in config is true' do
       ::Formtastic::SemanticFormBuilder.include_blank_for_select_by_default = true
       @select_input_types.each do |as, attribute|
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag("form li select option[@value='']", "")
       end
     end
@@ -35,10 +34,9 @@
     it 'blank value should not be included if the default value specified in config is false' do
       ::Formtastic::SemanticFormBuilder.include_blank_for_select_by_default = false
       @select_input_types.each do |as, attribute|
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should_not have_tag("form li select option[@value='']", "")
       end
     end
@@ -51,10 +49,9 @@
   describe 'when :include_blank is set to false' do
     it 'should not have a blank option' do
       @select_input_types.each do |as, attribute|
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as, :include_blank => false))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should_not have_tag("form li select option[@value='']", "")
       end
     end
@@ -63,10 +60,9 @@
   describe 'when :include_blank => true is set' do
     it 'should have a blank select option' do
       @select_input_types.each do |as, attribute|
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as, :include_blank => true))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag("form li select option[@value='']", "")
       end
     end
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 422dde47b..4ce014391 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -55,9 +55,9 @@
 
     it 'should require the first argument (the method on form\'s object)' do
       lambda {
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input()) # no args passed in at all
-        end
+        end)
       }.should raise_error(ArgumentError)
     end
 
@@ -76,19 +76,17 @@
         end
 
         it 'should set a "required" class' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => true))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should_not have_tag('form li.optional')
           output_buffer.should have_tag('form li.required')
         end
 
         it 'should append the "required" string to the label' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => true))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag('form li.required label', /#{@new_string}$/)
         end
 
@@ -106,19 +104,17 @@
         end
 
         it 'should set an "optional" class' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => false))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should_not have_tag('form li.required')
           output_buffer.should have_tag('form li.optional')
         end
 
         it 'should append the "optional" string to the label' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => false))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag('form li.optional label', /#{@string}$/)
         end
 
@@ -132,10 +128,9 @@
             ::Formtastic::SemanticFormBuilder.all_fields_required_by_default.should == true
             ::Formtastic::SemanticFormBuilder.all_fields_required_by_default = false
 
-            form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+            concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
               concat(builder.input(:title))
-            end
-            output_buffer.concat(form)
+            end)
             output_buffer.should_not have_tag('form li.required')
             output_buffer.should have_tag('form li.optional')
 
@@ -162,11 +157,10 @@
                   mock('MacroReflection', :macro => :validates_presence_of, :name => :body, :options => {:if => true})
                 ])
 
-                form = semantic_form_for(@new_post) do |builder|
+                concat(semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:title))
                   concat(builder.input(:body))
-                end
-                output_buffer.concat(form)
+                end)
                 output_buffer.should have_tag('form li.required')
                 output_buffer.should_not have_tag('form li.optional')
               end
@@ -218,11 +212,9 @@ def should_be_required(options)
                 mock('MacroReflection', :macro => :validates_presence_of, :name => :body, :options => options[:options])
               ])
 
-              form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:body))
-              end
-
-              output_buffer.concat(form)
+              end)
 
               if options[:required]
                 output_buffer.should_not have_tag('form li.optional')
@@ -239,10 +231,9 @@ def should_be_required(options)
               end
 
               it 'should not be required' do
-                form = semantic_form_for(@new_post) do |builder|
+                concat(semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:title))
-                end
-                output_buffer.concat(form)
+                end)
                 output_buffer.should_not have_tag('form li.required')
                 output_buffer.should have_tag('form li.optional')
               end
@@ -269,11 +260,10 @@ def should_be_required(options)
                   active_model_presence_validator([:body], {:if => true})
                 ])
 
-                form = semantic_form_for(@new_post) do |builder|
+                concat(semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:title))
                   concat(builder.input(:body))
-                end
-                output_buffer.concat(form)
+                end)
                 output_buffer.should have_tag('form li.required')
                 output_buffer.should_not have_tag('form li.optional')
               end
@@ -325,10 +315,9 @@ def should_be_required(options)
                   active_model_inclusion_validator([:published], {:in => [false, true]})
                 ])
 
-                form = semantic_form_for(@new_post) do |builder|
+                concat(semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:published))
-                end
-                output_buffer.concat(form)
+                end)
                 output_buffer.should have_tag('form li.required')
                 output_buffer.should_not have_tag('form li.optional')
               end
@@ -338,10 +327,9 @@ def should_be_required(options)
                   active_model_inclusion_validator([:published], {:in => [false, true], :allow_blank => true})
                 ])
 
-                form = semantic_form_for(@new_post) do |builder|
+                concat(semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:published))
-                end
-                output_buffer.concat(form)
+                end)
                 output_buffer.should_not have_tag('form li.required')
                 output_buffer.should have_tag('form li.optional')
               end
@@ -353,11 +341,9 @@ def should_be_required(options)
                 active_model_presence_validator([:body], options[:options])
               ])
 
-              form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:body))
-              end
-
-              output_buffer.concat(form)
+              end)
 
               if options[:required]
                 output_buffer.should_not have_tag('form li.optional')
@@ -374,10 +360,9 @@ def should_be_required(options)
               end
 
               it 'should not be required' do
-                form = semantic_form_for(@new_post) do |builder|
+                concat(semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:title))
-                end
-                output_buffer.concat(form)
+                end)
                 output_buffer.should_not have_tag('form li.required')
                 output_buffer.should have_tag('form li.optional')
               end
@@ -391,10 +376,9 @@ def should_be_required(options)
               ::Formtastic::SemanticFormBuilder.all_fields_required_by_default.should == true
               ::Formtastic::SemanticFormBuilder.all_fields_required_by_default = false
 
-              form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title))
-              end
-              output_buffer.concat(form)
+              end)
               output_buffer.should_not have_tag('form li.required')
               output_buffer.should have_tag('form li.optional')
 
@@ -414,20 +398,18 @@ def should_be_required(options)
       describe 'when not provided' do
 
         it 'should default to a string for forms without objects unless column is password' do
-          form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
             concat(builder.input(:anything))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag('form li.string')
         end
 
         it 'should default to password for forms without objects if column is password' do
-          form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
             concat(builder.input(:password))
             concat(builder.input(:password_confirmation))
             concat(builder.input(:confirm_password))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag('form li.password', :count => 3)
         end
 
@@ -573,27 +555,23 @@ def should_be_required(options)
 
       describe 'when provided' do
         it 'should be passed down to the label tag' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :label => "Kustom"))
-          end
-
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form li label", /Kustom/)
         end
 
         it 'should not generate a label if false' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :label => false))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should_not have_tag("form li label")
         end
 
         it 'should be dupped if frozen' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :label => "Kustom".freeze))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form li label", /Kustom/)
         end
       end
@@ -608,11 +586,9 @@ def should_be_required(options)
                   @new_post.stub!(:meta_description)
                   @new_post.class.should_receive(:human_attribute_name).with('meta_description').and_return(@localized_label_text)
 
-                  form = semantic_form_for(@new_post) do |builder|
+                  concat(semantic_form_for(@new_post) do |builder|
                     concat(builder.input(:meta_description))
-                  end
-
-                  output_buffer.concat(form)
+                  end)
                   output_buffer.should have_tag('form li label', Regexp.new('^' + @localized_label_text))
                 end
               end
@@ -625,11 +601,9 @@ def should_be_required(options)
             it 'should default the humanized method name, passing it down to the label tag' do
               ::Formtastic::SemanticFormBuilder.label_str_method = :humanize
 
-              form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+              concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
                 concat(builder.input(:meta_description))
-              end
-
-              output_buffer.concat(form)
+              end)
               output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
             end
           end
@@ -639,11 +613,9 @@ def should_be_required(options)
               @new_post.stub!(:meta_description) # a two word method name
               @new_post.class.should_receive(:human_attribute_name).with('meta_description').and_return('meta_description'.humanize)
 
-              form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:meta_description))
-              end
-
-              output_buffer.concat(form)
+              end)
               output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
             end
           end
@@ -653,11 +625,9 @@ def should_be_required(options)
               with_config :label_str_method, :capitalize do
                 @new_post.stub!(:meta_description)
 
-                form = semantic_form_for(@new_post) do |builder|
+                concat(semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:meta_description))
-                end
-
-                output_buffer.concat(form)
+                end)
                 output_buffer.should have_tag("form li label", /#{'meta_description'.capitalize}/)
               end
             end
@@ -683,11 +653,10 @@ def should_be_required(options)
           end
 
           it 'should render a label with localized label (I18n)' do
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.input(:title, :label => true))
               concat(builder.input(:published, :as => :boolean, :label => true))
-            end
-            output_buffer.concat(form)
+            end)
             output_buffer.should have_tag('form li label', Regexp.new('^' + @localized_label_text))
           end
 
@@ -701,11 +670,10 @@ def should_be_required(options)
                      }
                    }
                 }
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.input(:title, :label => true))
               concat(builder.input(:published, :as => :boolean, :label => true))
-            end
-            output_buffer.concat(form)
+            end)
             output_buffer.should have_tag('form li label', Regexp.new('^' + @default_localized_label_text))
           end
         end
@@ -723,29 +691,26 @@ def should_be_required(options)
 
         it 'should be passed down to the paragraph tag' do
           hint_text = "this is the title of the post"
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :hint => hint_text))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form li p.inline-hints", hint_text)
         end
 
 				it 'should have a custom hint class if I ask for one' do
           hint_text = "this is the title of the post"
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :hint => hint_text, :hint_class => 'custom-hint-class'))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form li p.custom-hint-class", hint_text)
         end
 
         it 'should have a custom hint class defaulted for all forms' do
           hint_text = "this is the title of the post"
           ::Formtastic::SemanticFormBuilder.default_hint_class = "custom-hint-class"
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :hint => hint_text))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form li p.custom-hint-class", hint_text)
         end
       end
@@ -778,10 +743,9 @@ def should_be_required(options)
                      }
                    }
                 }
-              form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => true))
-              end
-              output_buffer.concat(form)
+              end)
               output_buffer.should have_tag('form li p.inline-hints', @localized_hint_text)
             end
 
@@ -794,28 +758,25 @@ def should_be_required(options)
                      }
                    }
                 }
-              form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => true, :hint_class => 'custom-hint-class'))
-              end
-              output_buffer.concat(form)
+              end)
               output_buffer.should have_tag('form li p.custom-hint-class', @localized_hint_text)
             end
 
             it 'should render a hint paragraph containing an optional localized hint (I18n) if first is not set' do
-              form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => true))
-              end
-              output_buffer.concat(form)
+              end)
               output_buffer.should have_tag('form li p.inline-hints', @default_localized_hint_text)
             end
           end
 
           describe 'when provided value (label value) is set to FALSE' do
             it 'should not render a hint paragraph' do
-              form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => false))
-              end
-              output_buffer.concat(form)
+              end)
               output_buffer.should_not have_tag('form li p.inline-hints', @localized_hint_text)
             end
           end
@@ -840,10 +801,9 @@ def should_be_required(options)
 
         describe 'when localized hint (I18n) is not provided' do
           it 'should not render a hint paragraph' do
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.input(:title))
-            end
-            output_buffer.concat(form)
+            end)
             output_buffer.should_not have_tag('form li p.inline-hints')
           end
         end
@@ -855,28 +815,25 @@ def should_be_required(options)
 
       describe 'when provided' do
         it 'should be passed down to the li tag' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :wrapper_html => {:id => :another_id}))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form li#another_id")
         end
 
         it 'should append given classes to li default classes' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :wrapper_html => {:class => :another_class}, :required => true))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form li.string")
           output_buffer.should have_tag("form li.required")
           output_buffer.should have_tag("form li.another_class")
         end
 
         it 'should allow classes to be an array' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :wrapper_html => {:class => [ :my_class, :another_class ]}))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form li.string")
           output_buffer.should have_tag("form li.my_class")
           output_buffer.should have_tag("form li.another_class")
@@ -885,10 +842,9 @@ def should_be_required(options)
 
       describe 'when not provided' do
         it 'should use default id and class' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form li#post_title_input")
           output_buffer.should have_tag("form li.string")
         end
@@ -903,12 +859,10 @@ def should_be_required(options)
       my_options = { :as => :string }
       output = ''
       
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:title, my_options))
         concat(builder.input(:publish_at, my_options))
-      end
-      output_buffer.concat(@form)
-      
+      end)
       output_buffer.should have_tag 'li.string', :count => 2
     end
     
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index c6840b68f..d6fae56bd 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -9,9 +9,9 @@
     @output_buffer = ''
     mock_everything
 
-    @form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean))
-    end
+    end)
   end
 
   it_should_have_input_wrapper_with_class("boolean")
@@ -19,7 +19,6 @@
   it_should_apply_error_logic_for_input_type(:boolean)
 
   it 'should generate a label containing the input' do
-    output_buffer.concat(@form)
     output_buffer.should have_tag('form li label', :count => 1)
     output_buffer.should have_tag('form li label[@for="post_allow_comments"]')
     output_buffer.should have_tag('form li label', /Allow comments/)
@@ -29,7 +28,6 @@
   end
 
   it 'should generate a checkbox input' do
-    output_buffer.concat(@form)
     output_buffer.should have_tag('form li label input')
     output_buffer.should have_tag('form li label input#post_allow_comments')
     output_buffer.should have_tag('form li label input[@type="checkbox"]')
@@ -38,57 +36,46 @@
   end
   
   it 'should generate a checked input if object.method returns true' do
-    output_buffer.concat(@form)
     output_buffer.should have_tag('form li label input[@checked="checked"]')
     output_buffer.should have_tag('form li input[@name="post[allow_comments]"]', :count => 2)
     output_buffer.should have_tag('form li input#post_allow_comments', :count => 1)
   end
   
   it 'should generate a checked input if :input_html is passed :checked => checked' do
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:answer_comments, :as => :boolean, :input_html => {:checked => 'checked'}))
-    end
-
-    output_buffer.concat(form)
+    end)
     output_buffer.should have_tag('form li label input[@checked="checked"]')
   end
   
   it "should generate a disabled input if :input_html is passed :disabled => 'disabled' " do
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :input_html => {:disabled => 'disabled'}))
-    end
-    
-    output_buffer.concat(form)
+    end)
     output_buffer.should have_tag('form li label input[@disabled="disabled"]')
   end
   
   it 'should generate an input[id] with matching label[for] when id passed in :input_html' do
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :input_html => {:id => 'custom_id'}))
-    end
-    
-    output_buffer.concat(form)
+    end)
     output_buffer.should have_tag('form li label input[@id="custom_id"]')
     output_buffer.should have_tag('form li label[@for="custom_id"]')
   end
 
   it 'should allow checked and unchecked values to be sent' do
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'checked', :unchecked_value => 'unchecked'))
-    end
-
-    output_buffer.concat(form)
+    end)
     output_buffer.should have_tag('form li label input[@type="checkbox"][@value="checked"]:not([@unchecked_value][@checked_value])')
     output_buffer.should have_tag('form li input[@type="hidden"][@value="unchecked"]')
     output_buffer.should_not have_tag('form li label input[@type="hidden"]') # invalid HTML5
   end
 
   it 'should generate a label and a checkbox even if no object is given' do
-    form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+    concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
       concat(builder.input(:allow_comments, :as => :boolean))
-    end
-
-    output_buffer.concat(form)
+    end)
 
     output_buffer.should have_tag('form li label[@for="project_allow_comments"]')
     output_buffer.should have_tag('form li label', /Allow comments/)
@@ -105,9 +92,9 @@
       @output_buffer = ''
       mock_everything
 
-      @form = semantic_form_for(@new_post, :namespace => "context2") do |builder|
+      concat(semantic_form_for(@new_post, :namespace => "context2") do |builder|
         concat(builder.input(:allow_comments, :as => :boolean))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_allow_comments_input")
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index dfdc1a1aa..fac7a3d3d 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -10,9 +10,9 @@
       @output_buffer = ''
       mock_everything
 
-      @form = semantic_form_for(@fred) do |builder|
+      concat(semantic_form_for(@fred) do |builder|
         concat(builder.input(:posts, :as => :check_boxes, :value_as_class => true))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class("check_boxes")
@@ -23,46 +23,38 @@
     it_should_use_the_collection_when_provided(:check_boxes, 'input[@type="checkbox"]')
 
     it 'should generate a legend containing a label with text for the input' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li fieldset legend.label label')
       output_buffer.should have_tag('form li fieldset legend.label label', /Posts/)
     end
 
     it 'should not link the label within the legend to any input' do
-      output_buffer.concat(@form)
       output_buffer.should_not have_tag('form li fieldset legend label[@for^="author_post_ids_"]')
     end
 
     it 'should generate an ordered list with a list item for each choice' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li fieldset ol')
       output_buffer.should have_tag('form li fieldset ol li input[@type=checkbox]', :count => ::Post.all.size)
     end
 
     it 'should have one option with a "checked" attribute' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li input[@checked]', :count => 1)
     end
 
     it 'should not generate hidden inputs with default value blank' do
-      output_buffer.concat(@form)
       output_buffer.should_not have_tag("form li fieldset ol li label input[@type='hidden'][@value='']")
     end
 
     it 'should not render hidden inputs inside the ol' do
-      output_buffer.concat(@form)
       output_buffer.should_not have_tag("form li fieldset ol li input[@type='hidden']")
     end
 
     it 'should render one hidden input for each choice outside the ol' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li fieldset > input[@type='hidden']", :count => 1)
     end
 
     describe "each choice" do
 
       it 'should contain a label for the radio input with a nested input and label text' do
-        output_buffer.concat(@form)
         ::Post.all.each do |post|
           output_buffer.should have_tag('form li fieldset ol li label', /#{post.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='author_post_ids_#{post.id}']")
@@ -70,14 +62,12 @@
       end
 
       it 'should use values as li.class when value_as_class is true' do
-        output_buffer.concat(@form)
         ::Post.all.each do |post|
           output_buffer.should have_tag("form li fieldset ol li.post_#{post.id} label")
         end
       end
 
       it 'should have a checkbox input but no hidden field for each post' do
-        output_buffer.concat(@form)
         ::Post.all.each do |post|
           output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@name='author[post_ids][]']", :count => 1)
@@ -85,27 +75,23 @@
       end
 
       it 'should have a hidden field with an empty array value for the collection to allow clearing of all checkboxes' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li fieldset > input[@type=hidden][@name='author[post_ids][]'][@value='']", :count => 1)
       end
 
       it 'the hidden field with an empty array value should be followed by the ol' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li fieldset > input[@type=hidden][@name='author[post_ids][]'][@value=''] + ol", :count => 1)
       end
 
       it 'should not have a hidden field with an empty string value for the collection' do
-        output_buffer.concat(@form)
         output_buffer.should_not have_tag("form li fieldset > input[@type=hidden][@name='author[post_ids]'][@value='']", :count => 1)
       end
 
       it 'should have a checkbox and a hidden field for each post with :hidden_field => true' do
         output_buffer.replace ''
 
-        form = semantic_form_for(@fred) do |builder|
+        concat(semantic_form_for(@fred) do |builder|
           concat(builder.input(:posts, :as => :check_boxes, :hidden_fields => true, :value_as_class => true))
-        end
-        output_buffer.concat(form)
+        end)
 
         ::Post.all.each do |post|
           output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
@@ -116,7 +102,6 @@
 
       it "should mark input as checked if it's the the existing choice" do
         ::Post.all.include?(@fred.posts.first).should be_true
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
       end
     end
@@ -124,23 +109,20 @@
     describe 'and no object is given' do
       before(:each) do
         output_buffer.replace ''
-        @form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:author_id, :as => :check_boxes, :collection => ::Author.all))
-        end
+        end)
       end
 
       it 'should generate a fieldset with legend' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form li fieldset legend', /Author/)
       end
 
       it 'shold generate an li tag for each item in the collection' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form li fieldset ol li input[@type=checkbox]', :count => ::Author.all.size)
       end
 
       it 'should generate labels for each item' do
-        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='project_author_id_#{author.id}']")
@@ -148,7 +130,6 @@
       end
 
       it 'should generate inputs for each item' do
-        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#project_author_id_#{author.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@type='checkbox']")
@@ -158,10 +139,9 @@
       end
 
       it 'should html escape the label string' do
-        form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:author_id, :as => :check_boxes, :collection => [["<b>Item 1</b>", 1], ["<b>Item 2</b>", 2]]))
-        end
-        output_buffer.concat(form)
+        end)
 
         output_buffer.should have_tag('form li fieldset ol li label') do |label|
           label.body.should match /&lt;b&gt;Item [12]&lt;\/b&gt;$/
@@ -174,10 +154,9 @@
         @output_buffer = ''
         mock_everything
 
-        form = semantic_form_for(@fred) do |builder|
+        concat(semantic_form_for(@fred) do |builder|
           concat(builder.input(:posts, :as => :check_boxes, :value_as_class => true, :hidden_fields => false))
-        end
-        output_buffer.concat(form)
+        end)
       end
 
       it 'should have a checkbox input for each post' do
@@ -206,13 +185,12 @@
         before do
           @new_post.stub!(:author_ids).and_return(nil)
 
-          @form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:authors, :as => :check_boxes, :disabled => nil))
-          end
+          end)
         end
 
         it 'should not have any disabled item(s)' do
-          output_buffer.concat(@form)
           output_buffer.should_not have_tag("form li fieldset ol li label input[@disabled='disabled']")
         end
       end
@@ -221,13 +199,12 @@
         before do
           @new_post.stub!(:author_ids).and_return(nil)
 
-          @form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:authors, :as => :check_boxes, :disabled => @fred.id))
-          end
+          end)
         end
 
         it "should have one item disabled; the specified one" do
-          output_buffer.concat(@form)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 1)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@fred.id}']")
@@ -238,13 +215,12 @@
         before do
           @new_post.stub!(:author_ids).and_return(nil)
 
-          @form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:authors, :as => :check_boxes, :disabled => [@bob.id, @fred.id]))
-          end
+          end)
         end
 
         it "should have multiple items disabled; the specified ones" do
-          output_buffer.concat(@form)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 2)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@bob.id}']", /bob/i)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@bob.id}']")
@@ -262,9 +238,9 @@
         Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
 
         @new_post.stub!(:author_ids).and_return(nil)
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:authors, :as => :check_boxes))
-        end
+        end)
       end
 
       after do
@@ -273,7 +249,6 @@
       end
 
       it "should do foo" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("legend.label label", /Translated/)
       end
 
@@ -282,13 +257,12 @@
     describe "when :label option is set" do
       before do
         @new_post.stub!(:author_ids).and_return(nil)
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:authors, :as => :check_boxes, :label => 'The authors'))
-        end
+        end)
       end
 
       it "should output the correct label title" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("legend.label label", /The authors/)
       end
     end
@@ -297,13 +271,12 @@
       before do
         @output_buffer = ''
         @new_post.stub!(:author_ids).and_return(nil)
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:authors, :as => :check_boxes, :label => false))
-        end
+        end)
       end
 
       it "should not output the legend" do
-        output_buffer.concat(@form)
         output_buffer.should_not have_tag("legend.label")
       end
     end
@@ -311,13 +284,12 @@
     describe "when :required option is true" do
       before do
         @new_post.stub!(:author_ids).and_return(nil)
-        semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:authors, :as => :check_boxes, :required => true))
-        end
+        end)
       end
 
       it "should output the correct label title" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("legend.label label abbr")
       end
     end
@@ -330,10 +302,9 @@
       @output_buffer = ''
       mock_everything
 
-      @form = semantic_form_for(@freds_post) do |builder|
+      concat(semantic_form_for(@freds_post) do |builder|
         concat(builder.input(:authors, :as => :check_boxes))
-      end
-      output_buffer.concat(@form)
+      end)
     end
 
     it 'should render checkboxes' do
@@ -363,11 +334,9 @@
         item.stub!(:custom_value).and_return('custom_value')
         item.should_receive(:custom_value).exactly(3).times
         @new_post.author.should_receive(:custom_value)
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:author, :as => :check_boxes, :value_method => :custom_value, :collection => [item, item, item]))
-        end
-
-        output_buffer.concat(@form)
+        end)
         output_buffer.should have_tag('input[@type=checkbox][@value="custom_value"]', :count => 3)
       end
     end
@@ -379,9 +348,9 @@
       @output_buffer = ''
       mock_everything
 
-      @form = semantic_form_for(@fred, :namespace => "context2") do |builder|
+      concat(semantic_form_for(@fred, :namespace => "context2") do |builder|
         concat(builder.input(:posts, :as => :check_boxes))
-      end
+      end)
     end
 
     it_should_have_label_for('context2_author_post_ids_19')
diff --git a/spec/inputs/country_input_spec.rb b/spec/inputs/country_input_spec.rb
index cb5d54eb6..dc39b0849 100644
--- a/spec/inputs/country_input_spec.rb
+++ b/spec/inputs/country_input_spec.rb
@@ -25,10 +25,10 @@
   describe "when country_select is available as a helper (from a plugin)" do
 
     before do
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         concat(builder.input(:country, :as => :country))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class("country")
@@ -38,14 +38,12 @@
     #it_should_apply_error_logic_for_input_type(:country)
 
     it 'should generate a label for the input' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li label')
       output_buffer.should have_tag('form li label[@for="post_country"]')
       output_buffer.should have_tag('form li label', /Country/)
     end
 
     it "should generate a select" do
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select")
     end
 
@@ -84,11 +82,11 @@
       @output_buffer = ''
       mock_everything
 
-      @form = semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+      concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         builder.should_receive(:country_select).with(:country, [], {}, {:id => "context2_post_country"}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         concat(builder.input(:country, :priority_countries => []))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_country_input")
@@ -101,14 +99,13 @@
     describe "when the attribute is 'country'" do
 
       before do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
           concat(builder.input(:country))
-        end
+        end)
       end
 
       it "should render a country input" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag "form li.country"
       end
     end
@@ -116,14 +113,13 @@
     describe "whent the attribute is 'country_something'" do
 
       before do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:country_subdivision))
           concat(builder.input(:country_code))
-        end
+        end)
       end
 
       it "should render a country input" do
-        output_buffer.concat(@form)
         output_buffer.should_not have_tag "form li.country"
         output_buffer.should have_tag "form li.string", :count => 2
       end
diff --git a/spec/inputs/date_input_spec.rb b/spec/inputs/date_input_spec.rb
index e01094fcb..d9171927a 100644
--- a/spec/inputs/date_input_spec.rb
+++ b/spec/inputs/date_input_spec.rb
@@ -14,9 +14,9 @@
 
     before do
       output_buffer.replace ''
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:publish_at, :as => :date, :order => [:year, :month, :day]))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class("date")
@@ -25,12 +25,10 @@
     it_should_apply_error_logic_for_input_type(:date)
 
     it 'should have a legend and label with the label text inside the fieldset' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.date fieldset legend.label label', /Publish at/)
     end
 
     it 'should associate the legend label with the first select' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.date fieldset legend.label')
       output_buffer.should have_tag('form li.date fieldset legend.label label')
       output_buffer.should have_tag('form li.date fieldset legend.label label[@for]')
@@ -38,13 +36,11 @@
     end
 
     it 'should have an ordered list of three items inside the fieldset' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.date fieldset ol')
       output_buffer.should have_tag('form li.date fieldset ol li', :count => 3)
     end
 
     it 'should have three labels for year, month and day' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.date fieldset ol li label', :count => 3)
       output_buffer.should have_tag('form li.date fieldset ol li label', /year/i)
       output_buffer.should have_tag('form li.date fieldset ol li label', /month/i)
@@ -52,7 +48,6 @@
     end
 
     it 'should have three selects for year, month and day' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.date fieldset ol li select', :count => 3)
     end
   end
@@ -61,9 +56,9 @@
 
     before do
       output_buffer.replace ''
-      @form = semantic_form_for(@new_post, :namespace => "context2") do |builder|
+      concat(semantic_form_for(@new_post, :namespace => "context2") do |builder|
         concat(builder.input(:publish_at, :as => :date, :order => [:year, :month, :day]))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_publish_at_input")
@@ -78,10 +73,9 @@
     fields.each do |field|
       it "should replace the #{field} label with the specified text if :labels[:#{field}] is set" do
         output_buffer.replace ''
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :date, :labels => { field => "another #{field} label" }))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag('form li.date fieldset ol li label', :count => fields.length)
         fields.each do |f|
           output_buffer.should have_tag('form li.date fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
@@ -90,10 +84,9 @@
 
       it "should not display the label for the #{field} field when :labels[:#{field}] is blank" do
         output_buffer.replace ''
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :date, :labels => { field => "" }))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag('form li.date fieldset ol li label', :count => fields.length-1)
         fields.each do |f|
           output_buffer.should have_tag('form li.date fieldset ol li label', /#{f}/i) unless field == f
diff --git a/spec/inputs/datetime_input_spec.rb b/spec/inputs/datetime_input_spec.rb
deleted file mode 100644
index 8495bb827..000000000
--- a/spec/inputs/datetime_input_spec.rb
+++ /dev/null
@@ -1,239 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-
-describe 'datetime input' do
-
-  include FormtasticSpecHelper
-
-  before do
-    @output_buffer = ''
-    mock_everything
-
-    @new_post.should_receive(:publish_at=).any_number_of_times
-    @new_post.should_receive(:created_at=).any_number_of_times
-    @bob.should_receive(:created_at=).any_number_of_times
-    @new_post.should_receive(:title=).any_number_of_times # Macro stuff forces this.
-  end
-
-  describe "general" do
-
-    before do
-      output_buffer.replace ''
-      @form = semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:publish_at, :as => :datetime))
-      end
-    end
-
-    it_should_have_input_wrapper_with_class("datetime")
-    it_should_have_input_wrapper_with_id("post_publish_at_input")
-    it_should_have_a_nested_fieldset
-    it_should_apply_error_logic_for_input_type(:datetime)
-
-    it 'should have a legend and label with the label text inside the fieldset' do
-      output_buffer.concat(@form)
-      output_buffer.should have_tag('form li.datetime fieldset legend.label label', /Publish at/)
-    end
-
-    it 'should associate the legend label with the first select' do
-      output_buffer.concat(@form)
-      output_buffer.should have_tag('form li.datetime fieldset legend.label label[@for="post_publish_at_1i"]')
-    end
-
-    it 'should have an ordered list of five items inside the fieldset' do
-      output_buffer.concat(@form)
-      output_buffer.should have_tag('form li.datetime fieldset ol')
-      output_buffer.should have_tag('form li.datetime fieldset ol li', :count => 5)
-    end
-
-    it 'should have five labels for year, month, day, hour and minute' do
-      output_buffer.concat(@form)
-      output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => 5)
-      output_buffer.should have_tag('form li.datetime fieldset ol li label', /year/i)
-      output_buffer.should have_tag('form li.datetime fieldset ol li label', /month/i)
-      output_buffer.should have_tag('form li.datetime fieldset ol li label', /day/i)
-      output_buffer.should have_tag('form li.datetime fieldset ol li label', /hour/i)
-      output_buffer.should have_tag('form li.datetime fieldset ol li label', /minute/i)
-    end
-
-    it 'should have five selects for year, month, day, hour and minute' do
-      output_buffer.concat(@form)
-      output_buffer.should have_tag('form li.datetime fieldset ol li select', :count => 5)
-    end
-
-    it 'should generate a sanitized label and matching ids for attribute' do
-      form = semantic_form_for(@new_post) do |builder|
-        fields = builder.semantic_fields_for(@bob, :index => 10) do |bob_builder|
-          concat(bob_builder.input(:created_at, :as => :datetime))
-        end
-        concat(fields)
-      end
-      output_buffer.concat(form)
-
-      1.upto(5) do |i|
-        output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_10_created_at_#{i}i']")
-        output_buffer.should have_tag("form li fieldset ol li #post_author_10_created_at_#{i}i")
-      end
-    end
-  end
-
-  describe 'when :discard_input => true is set' do
-    it 'should use default attribute value when it is not nil' do
-      @new_post.stub!(:publish_at).and_return(Date.new(2007,12,27))
-      form = semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:publish_at, :as => :datetime, :discard_day => true))
-      end
-
-      output_buffer.concat(form)
-      output_buffer.should have_tag("form li input[@type='hidden'][@value='27']")
-    end
-  end
-
-  describe 'inputs order' do
-    it 'should have a default' do
-      output_buffer.replace ''
-      semantic_form_for(@new_post) do |builder|
-        self.should_receive(:select_year).once.ordered.and_return('')
-        self.should_receive(:select_month).once.ordered.and_return('')
-        self.should_receive(:select_day).once.ordered.and_return('')
-        builder.input(:publish_at, :as => :datetime)
-      end
-    end
-
-    it 'should be specified with :order option' do
-      ::I18n.backend.store_translations 'en', :date => { :order => [:month, :year, :day] }
-      output_buffer.replace ''
-      semantic_form_for(@new_post) do |builder|
-        self.should_receive(:select_month).once.ordered.and_return('')
-        self.should_receive(:select_year).once.ordered.and_return('')
-        self.should_receive(:select_day).once.ordered.and_return('')
-        builder.input(:publish_at, :as => :datetime)
-        ::I18n.backend.store_translations 'en', :date => nil
-      end
-    end
-
-    it 'should be changed through I18n' do
-      output_buffer.replace ''
-      semantic_form_for(@new_post) do |builder|
-        self.should_receive(:select_day).once.ordered.and_return('')
-        self.should_receive(:select_month).once.ordered.and_return('')
-        self.should_receive(:select_year).once.ordered.and_return('')
-        builder.input(:publish_at, :as => :datetime, :order => [:day, :month, :year])
-      end
-    end
-  end
-
-  describe 'when the locale changes the label text' do
-    before do
-      ::I18n.backend.store_translations 'en', :datetime => {:prompts => {
-        :year => 'The Year', :month => 'The Month', :day => 'The Day',
-        :hour => 'The Hour', :minute => 'The Minute'
-      }}
-      output_buffer.replace ''
-      @form = semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:publish_at, :as => :datetime))
-      end
-    end
-
-    after do
-      ::I18n.backend.store_translations 'en', :formtastic => {
-        :year => nil, :month => nil, :day => nil,
-        :hour => nil, :minute => nil
-      }
-    end
-
-    it 'should have translated labels for year, month, day, hour and minute' do
-      output_buffer.concat(@form)
-      output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Year/)
-      output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Month/)
-      output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Day/)
-      output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Hour/)
-      output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Minute/)
-    end
-  end
-
-  describe 'when no object is given' do
-    before(:each) do
-      output_buffer.replace ''
-      @form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
-        concat(builder.input(:publish_at, :as => :datetime))
-      end
-    end
-
-    it 'should have fieldset with legend - classified as a label' do
-      output_buffer.concat(@form)
-      output_buffer.should have_tag('form li.datetime fieldset legend.label', /Publish at/)
-    end
-
-    it 'should have labels for each input' do
-      output_buffer.concat(@form)
-      output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => 5)
-    end
-
-    it 'should have selects for each inputs' do
-      output_buffer.concat(@form)
-      output_buffer.should have_tag('form li.datetime fieldset ol li select', :count => 5)
-    end
-  end
-
-  #describe 'when an object is given and the attribute value is nil' do
-  #  before(:each) do
-  #    @new_post.stub!(:publish_at).and_return(nil)
-  #    output_buffer.replace ''
-  #    semantic_form_for(@new_post) do |builder|
-  #      concat(builder.input(:publish_at, :as => :datetime))
-  #    end
-  #  end
-  #
-  #  it 'should not select a value' do
-  #    output_buffer.should_not have_tag('form li.datetime option[@selected]')
-  #  end
-  #
-  #end
-
-  describe "when namespace is provided" do
-
-    before do
-      output_buffer.replace ''
-      @form = semantic_form_for(@new_post, :namespace => "context2") do |builder|
-        concat(builder.input(:created_at, :as => :datetime, :include_seconds => true))
-      end
-    end
-
-    it_should_have_input_wrapper_with_id("context2_post_created_at_input")
-    (1..6).each do |i|
-      it_should_have_select_with_id("context2_post_created_at_#{i}i")
-    end
-
-  end
-
-  describe ':labels option' do
-    fields = [:year, :month, :day, :hour, :minute]
-    fields.each do |field|
-      it "should replace the #{field} label with the specified text if :labels[:#{field}] is set" do
-        output_buffer.replace ''
-        form = semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:created_at, :as => :datetime, :labels => { field => "another #{field} label" }))
-        end
-        output_buffer.concat(form)
-        output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => fields.length)
-        fields.each do |f|
-          output_buffer.should have_tag('form li.datetime fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
-        end
-      end
-
-      it "should not display the label for the #{field} field when :labels[:#{field}] is blank" do
-        output_buffer.replace ''
-        form = semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:created_at, :as => :datetime, :labels => { field => "" }))
-        end
-        output_buffer.concat(form)
-        output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => fields.length-1)
-        fields.each do |f|
-          output_buffer.should have_tag('form li.datetime fieldset ol li label', /#{f}/i) unless field == f
-        end
-      end
-    end
-  end
-
-end
-
diff --git a/spec/inputs/email_input_spec.rb b/spec/inputs/email_input_spec.rb
index c7a6368f1..4c664f8a9 100644
--- a/spec/inputs/email_input_spec.rb
+++ b/spec/inputs/email_input_spec.rb
@@ -12,9 +12,9 @@
 
   describe "when object is provided" do
     before do
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:email))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class(:email)
@@ -30,9 +30,9 @@
   describe "when namespace is provided" do
 
     before do
-      @form = semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+      concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         concat(builder.input(:email))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_email_input")
diff --git a/spec/inputs/file_input_spec.rb b/spec/inputs/file_input_spec.rb
index e65e3b8c7..d95f5d0c5 100644
--- a/spec/inputs/file_input_spec.rb
+++ b/spec/inputs/file_input_spec.rb
@@ -9,9 +9,9 @@
     @output_buffer = ''
     mock_everything
 
-    @form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:body, :as => :file))
-    end
+    end)
   end
 
   it_should_have_input_wrapper_with_class("file")
@@ -23,10 +23,9 @@
   it_should_apply_error_logic_for_input_type(:file)
 
   it 'should use input_html to style inputs' do
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :file, :input_html => { :class => 'myclass' }))
-    end
-    output_buffer.concat(form)
+    end)
     output_buffer.should have_tag("form li input.myclass")
   end
 
@@ -36,9 +35,9 @@
       @output_buffer = ''
       mock_everything
 
-      @form = semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+      concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         concat(builder.input(:body, :as => :file))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_body_input")
diff --git a/spec/inputs/hidden_input_spec.rb b/spec/inputs/hidden_input_spec.rb
index 5ab5bc824..f8914edc7 100644
--- a/spec/inputs/hidden_input_spec.rb
+++ b/spec/inputs/hidden_input_spec.rb
@@ -9,13 +9,13 @@
     @output_buffer = ''
     mock_everything
 
-    @form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:secret, :as => :hidden))
       concat(builder.input(:author_id, :as => :hidden, :value => 99))
       concat(builder.input(:published, :as => :hidden, :input_html => {:value => true}))
       concat(builder.input(:reviewer, :as => :hidden, :input_html => {:class => 'new_post_reviewer', :id => 'new_post_reviewer'}))
       concat(builder.input(:author, :as => :hidden, :value => 'direct_value', :input_html => {:value => "formtastic_value"}))
-    end
+    end)
   end
 
   it_should_have_input_wrapper_with_class("hidden")
@@ -23,30 +23,25 @@
   it_should_not_have_a_label
 
   it "should generate a input field" do
-    output_buffer.concat(@form)
     output_buffer.should have_tag("form li input#post_secret")
     output_buffer.should have_tag("form li input#post_secret[@type=\"hidden\"]")
     output_buffer.should have_tag("form li input#post_secret[@name=\"post[secret]\"]")
   end
 
   it "should pass any explicitly specified value - using :value" do
-    output_buffer.concat(@form)
     output_buffer.should have_tag("form li input#post_author_id[@type=\"hidden\"][@value=\"99\"]")
   end
 
   # Handle Formtastic :input_html options for consistency.
   it "should pass any explicitly specified value - using :input_html options" do
-    output_buffer.concat(@form)
     output_buffer.should have_tag("form li input#post_published[@type=\"hidden\"][@value=\"true\"]")
   end
 
   it "should pass any option specified using :input_html" do
-    output_buffer.concat(@form)
     output_buffer.should have_tag("form li input#new_post_reviewer[@type=\"hidden\"][@class=\"new_post_reviewer\"]")
   end
 
   it "should prefer :input_html over directly supplied options" do
-    output_buffer.concat(@form)
     output_buffer.should have_tag("form li input#post_author[@type=\"hidden\"][@value=\"formtastic_value\"]")
   end
 
@@ -55,21 +50,19 @@
     @errors.stub!(:[]).with(:secret).and_return(["foo", "bah"])
     @new_post.stub!(:errors).and_return(@errors)
 
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:secret, :as => :hidden))
-    end
+    end)
 
-    output_buffer.concat(form)
     output_buffer.should_not have_tag("form li p.inline-errors")
     output_buffer.should_not have_tag("form li ul.errors")
   end
 
   it "should not render inline hints" do
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:secret, :as => :hidden, :hint => "all your base are belong to use"))
-    end
+    end)
 
-    output_buffer.concat(form)
     output_buffer.should_not have_tag("form li p.inline-hints")
     output_buffer.should_not have_tag("form li ul.hints")
   end
@@ -80,13 +73,13 @@
       @output_buffer = ''
       mock_everything
 
-      @form = semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+      concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         concat(builder.input(:secret, :as => :hidden))
         concat(builder.input(:author_id, :as => :hidden, :value => 99))
         concat(builder.input(:published, :as => :hidden, :input_html => {:value => true}))
         concat(builder.input(:reviewer, :as => :hidden, :input_html => {:class => 'new_post_reviewer', :id => 'new_post_reviewer'}))
         concat(builder.input(:author, :as => :hidden, :value => 'direct_value', :input_html => {:value => "formtastic_value"}))
-      end
+      end)
     end
 
     attributes_to_check = [:secret, :author_id, :published, :reviewer, :author]
diff --git a/spec/inputs/numeric_input_spec.rb b/spec/inputs/numeric_input_spec.rb
index ace93ffb8..ede943aff 100644
--- a/spec/inputs/numeric_input_spec.rb
+++ b/spec/inputs/numeric_input_spec.rb
@@ -9,9 +9,9 @@
     @output_buffer = ''
     mock_everything
 
-    @form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :numeric))
-    end
+    end)
   end
 
   it_should_have_input_wrapper_with_class(:numeric)
@@ -29,9 +29,9 @@
 
   describe "when no object is provided" do
     before do
-      @form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+      concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
         concat(builder.input(:title, :as => :numeric))
-      end
+      end)
     end
 
     it_should_have_label_with_text(/Title/)
@@ -43,9 +43,9 @@
 
   describe "when namespace provided" do
     before do
-      @form = semantic_form_for(@new_post, :namespace => :context2) do |builder|
+      concat(semantic_form_for(@new_post, :namespace => :context2) do |builder|
         concat(builder.input(:title, :as => :numeric))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_title_input")
diff --git a/spec/inputs/password_input_spec.rb b/spec/inputs/password_input_spec.rb
index ee348f433..7516b8abb 100644
--- a/spec/inputs/password_input_spec.rb
+++ b/spec/inputs/password_input_spec.rb
@@ -9,9 +9,9 @@
     @output_buffer = ''
     mock_everything
 
-    @form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :password))
-    end
+    end)
   end
 
   it_should_have_input_wrapper_with_class(:password)
@@ -30,9 +30,9 @@
 
   describe "when no object is provided" do
     before do
-      @form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+      concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
         concat(builder.input(:title, :as => :password))
-      end
+      end)
     end
 
     it_should_have_label_with_text(/Title/)
@@ -45,9 +45,9 @@
   describe "when namespace is provided" do
 
     before do
-      @form = semantic_form_for(@new_post, :namespace => "context2") do |builder|
+      concat(semantic_form_for(@new_post, :namespace => "context2") do |builder|
         concat(builder.input(:title, :as => :password))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_title_input")
diff --git a/spec/inputs/phone_input_spec.rb b/spec/inputs/phone_input_spec.rb
index b7bfd39c5..f48897e2d 100644
--- a/spec/inputs/phone_input_spec.rb
+++ b/spec/inputs/phone_input_spec.rb
@@ -12,9 +12,9 @@
 
   describe "when object is provided" do
     before do
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:phone))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class(:phone)
@@ -30,9 +30,9 @@
   describe "when namespace is provided" do
 
     before do
-      @form = semantic_form_for(@new_post, :namespace => "context2") do |builder|
+      concat(semantic_form_for(@new_post, :namespace => "context2") do |builder|
         concat(builder.input(:phone))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_phone_input")
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 593e6588f..48a9a7132 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -12,9 +12,9 @@
 
   describe 'for belongs_to association' do
     before do
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :radio, :value_as_class => true))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class("radio")
@@ -24,31 +24,26 @@
     it_should_use_the_collection_when_provided(:radio, 'input')
 
     it 'should generate a legend containing a label with text for the input' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li fieldset legend.label label')
       output_buffer.should have_tag('form li fieldset legend.label label', /Author/)
     end
 
     it 'should not link the label within the legend to any input' do
-      output_buffer.concat(@form)
       output_buffer.should_not have_tag('form li fieldset legend label[@for]')
     end
 
     it 'should generate an ordered list with a list item for each choice' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li fieldset ol')
       output_buffer.should have_tag('form li fieldset ol li', :count => ::Author.all.size)
     end
 
     it 'should have one option with a "checked" attribute' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li input[@checked]', :count => 1)
     end
 
     describe "each choice" do
 
       it 'should contain a label for the radio input with a nested input and label text' do
-        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_id_#{author.id}']")
@@ -56,14 +51,12 @@
       end
 
       it 'should use values as li.class when value_as_class is true' do
-        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag("form li fieldset ol li.author_#{author.id} label")
         end
       end
 
       it "should have a radio input" do
-        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#post_author_id_#{author.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@type='radio']")
@@ -77,21 +70,19 @@
         @new_post.author.id.should == @bob.id
         @new_post.author.should == @bob
 
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:author, :as => :radio))
-        end
+        end)
 
-        output_buffer.concat(form)
         output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
       end
 
       it "should not contain invalid HTML attributes" do
 
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:author, :as => :radio))
-        end
+        end)
 
-        output_buffer.concat(form)
         output_buffer.should_not have_tag("form li fieldset ol li input[@find_options]")
       end
 
@@ -100,23 +91,20 @@
     describe 'and no object is given' do
       before(:each) do
         output_buffer.replace ''
-        @form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:author_id, :as => :radio, :collection => ::Author.all))
-        end
+        end)
       end
 
       it 'should generate a fieldset with legend' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form li fieldset legend', /Author/)
       end
 
       it 'should generate an li tag for each item in the collection' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form li fieldset ol li', :count => ::Author.all.size)
       end
 
       it 'should generate labels for each item' do
-        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='project_author_id_#{author.id}']")
@@ -124,18 +112,15 @@
       end
 
       it 'should html escape the label string' do
-        output_buffer.replace ''
-        form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:author_id, :as => :radio, :collection => [["<b>Item 1</b>", 1], ["<b>Item 2</b>", 2]]))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag('form li fieldset ol li label') do |label|
           label.body.should match /&lt;b&gt;Item [12]&lt;\/b&gt;$/
         end
       end
 
       it 'should generate inputs for each item' do
-        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#project_author_id_#{author.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@type='radio']")
@@ -153,9 +138,9 @@
 
       Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
       @new_post.stub!(:author_ids).and_return(nil)
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:authors, :as => :radio))
-      end
+      end)
     end
 
     after do
@@ -164,7 +149,6 @@
     end
 
     it "should do foo" do
-      output_buffer.concat(@form)
       output_buffer.should have_tag("legend.label label", /Translated/)
     end
 
@@ -173,13 +157,12 @@
   describe "when :label option is set" do
     before do
       @new_post.stub!(:author_ids).and_return(nil)
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:authors, :as => :radio, :label => 'The authors'))
-      end
+      end)
     end
 
     it "should output the correct label title" do
-      output_buffer.concat(@form)
       output_buffer.should have_tag("legend.label label", /The authors/)
     end
   end
@@ -188,13 +171,12 @@
     before do
       @output_buffer = ''
       @new_post.stub!(:author_ids).and_return(nil)
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:authors, :as => :radio, :label => false))
-      end
+      end)
     end
 
     it "should not output the legend" do
-      output_buffer.concat(@form)
       output_buffer.should_not have_tag("legend.label")
     end
   end
@@ -202,13 +184,12 @@
   describe "when :required option is true" do
     before do
       @new_post.stub!(:author_ids).and_return(nil)
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:authors, :as => :radio, :required => true))
-      end
+      end)
     end
 
     it "should output the correct label title" do
-      output_buffer.concat(@form)
       output_buffer.should have_tag("legend.label label abbr")
     end
   end
@@ -217,12 +198,12 @@
     before do
       @output_buffer = ''
       @new_post.stub!(:author_ids).and_return(nil)
-      @form = semantic_form_for(@new_post, :namespace => "custom_prefix") do |builder|
+      concat(semantic_form_for(@new_post, :namespace => "custom_prefix") do |builder|
         concat(builder.input(:authors, :as => :radio, :label => ''))
-      end
+      end)
 
-      @form.should match(/for="custom_prefix_post_author_ids_(\d+)"/)
-      @form.should match(/id="custom_prefix_post_author_ids_(\d+)"/)
+      output_buffer.should match(/for="custom_prefix_post_author_ids_(\d+)"/)
+      output_buffer.should match(/id="custom_prefix_post_author_ids_(\d+)"/)
     end
     it_should_have_input_wrapper_with_id("custom_prefix_post_authors_input")
   end
diff --git a/spec/inputs/search_input_spec.rb b/spec/inputs/search_input_spec.rb
index a7ab3ef09..68800d3d3 100644
--- a/spec/inputs/search_input_spec.rb
+++ b/spec/inputs/search_input_spec.rb
@@ -12,9 +12,9 @@
 
   describe "when object is provided" do
     before do
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:search))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class(:search)
@@ -30,9 +30,9 @@
   describe "when namespace is provided" do
 
     before do
-      @form = semantic_form_for(@new_post, :namespace => "context2") do |builder|
+      concat(semantic_form_for(@new_post, :namespace => "context2") do |builder|
         concat(builder.input(:search))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_search_input")
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 28a7ced0b..b3e88734a 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -15,14 +15,13 @@
       before do
         @array_with_values = ["Title A", "Title B", "Title C"]
         @array_with_keys_and_values = [["Title D", 1], ["Title E", 2], ["Title F", 3]]
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :select, :collection => @array_with_values))
           concat(builder.input(:title, :as => :select, :collection => @array_with_keys_and_values))
-        end
+        end)
       end
 
       it 'should have a option for each key and/or value' do
-        output_buffer.concat(@form)
         @array_with_values.each do |v|
           output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
         end
@@ -35,13 +34,12 @@
     describe 'using a range' do
       before do
         @range_with_values = 1..5
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :select, :collection => @range_with_values))
-        end
+        end)
       end
 
       it 'should have an option for each value' do
-        output_buffer.concat(@form)
         @range_with_values.each do |v|
           output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
         end
@@ -51,13 +49,12 @@
     describe 'using a string' do
       before do
         @string ="<option value='0'>0</option><option value='1'>1</option>"
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :select, :collection => @string))
-        end
+        end)
       end
 
       it 'should render select options using provided HTML string' do
-        output_buffer.concat(@form)
         2.times do |v|
           output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
         end
@@ -72,9 +69,9 @@
         ::I18n.load_path = [File.join(File.dirname(__FILE__), *%w[.. .. lib locale en.yml])]
         ::I18n.backend.send(:init_translations)
 
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:published, :as => :select))
-        end
+        end)
       end
 
       after do
@@ -82,7 +79,6 @@
       end
 
       it 'should render a select with at least options: true/false' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select option[@value='true']", /^Yes$/)
         output_buffer.should have_tag("form li select option[@value='false']", /^No$/)
       end
@@ -93,9 +89,9 @@
         @boolean_select_labels = {:yes => 'Yep', :no => 'Nope'}
         ::I18n.backend.store_translations :en, :formtastic => @boolean_select_labels
 
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:published, :as => :select))
-        end
+        end)
       end
 
       after do
@@ -103,7 +99,6 @@
       end
 
       it 'should render a select with at least options: true/false' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select option[@value='true']", /#{@boolean_select_labels[:yes]}/)
         output_buffer.should have_tag("form li select option[@value='false']", /#{@boolean_select_labels[:no]}/)
       end
@@ -112,10 +107,10 @@
 
   describe 'for a belongs_to association' do
     before do
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select))
         concat(builder.input(:reviewer, :as => :select))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class("select")
@@ -127,36 +122,30 @@
     it_should_use_the_collection_when_provided(:select, 'option')
 
     it 'should have a select inside the wrapper' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#post_author_id')
       output_buffer.should have_tag('form li select#post_reviewer_id')
     end
 
     it 'should have a valid name' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select[@name='post[author_id]']")
       output_buffer.should_not have_tag("form li select[@name='post[author_id][]']")
       output_buffer.should_not have_tag("form li select[@name='post[reviewer_id][]']")
     end
 
     it 'should not create a multi-select' do
-      output_buffer.concat(@form)
       output_buffer.should_not have_tag('form li select[@multiple]')
     end
 
     it 'should create a select without size' do
-      output_buffer.concat(@form)
       output_buffer.should_not have_tag('form li select[@size]')
     end
 
     it 'should have a blank option' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select option[@value='']")
     end
 
     it 'should have a select option for each Author' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select[@name='post[author_id]'] option", :count => ::Author.all.size + 1)
       ::Author.all.each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
@@ -164,7 +153,6 @@
     end
 
     it 'should have one option with a "selected" attribute' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select[@name='post[author_id]'] option[@selected]", :count => 1)
     end
 
@@ -173,11 +161,10 @@
       @new_post.stub!(:author_status_id).and_return(@bob.id)
       @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => :integer, :limit => 255))
 
-      form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author_status, :as => :select))
-      end
+      end)
 
-      output_buffer.concat(form)
       output_buffer.should have_tag('form li select#post_author_status_id')
     end
   end
@@ -187,9 +174,9 @@
       [@freds_post].each { |post| post.stub!(:to_label).and_return("Post - #{post.id}") }
       @fred.should_receive(:posts)
 
-      semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:main_post, :as => :select, :group_by => :author ) )
-      end
+      end)
     end
   end
 
@@ -238,12 +225,12 @@
         continent.stub!(:authors).and_return([@authors[i]])
       end
 
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select, :group_by => :continent ) )
         concat(builder.input(:author, :as => :select, :group_by => :continent, :group_label_method => :id ) )
         concat(builder.input(:author, :as => :select, :group_by => :continent, :label_method => :login ) )
         concat(builder.input(:author, :as => :select, :group_by => :continent, :label_method => :login, :group_label_method => :id ) )
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class("select")
@@ -255,33 +242,27 @@
 
     0.upto(1) do |i|
       it 'should have all option groups and the right values' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select optgroup[@label='#{@continent_names[i]}']", @authors[i].to_label)
       end
 
       it 'should have custom group labels' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select optgroup[@label='#{@continents[i].id}']", @authors[i].to_label)
       end
 
       it 'should have custom author labels' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select optgroup[@label='#{@continent_names[i]}']", @authors[i].login)
       end
 
       it 'should have custom author and group labels' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select optgroup[@label='#{@continents[i].id}']", @authors[i].login)
       end
     end
 
     it 'should have no duplicate groups' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select optgroup', :count => 8)
     end
 
     it 'should sort the groups on the label method' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select optgroup[@label='Africa']")
       output_buffer.should have_tag("form li select optgroup[@label='99']")
     end
@@ -297,9 +278,9 @@
 
   describe 'for a has_many association' do
     before do
-      @form = semantic_form_for(@fred) do |builder|
+      concat(semantic_form_for(@fred) do |builder|
         concat(builder.input(:posts, :as => :select))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class("select")
@@ -311,18 +292,15 @@
     it_should_use_the_collection_when_provided(:select, 'option')
 
     it 'should have a select inside the wrapper' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#author_post_ids')
     end
 
     it 'should have a multi-select select' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select[@multiple="multiple"]')
     end
 
     it 'should have a select option for each Post' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select option', :count => ::Post.all.size)
       ::Post.all.each do |post|
         output_buffer.should have_tag("form li select option[@value='#{post.id}']", /#{post.to_label}/)
@@ -330,39 +308,35 @@
     end
 
     it 'should not have a blank option by default' do
-      output_buffer.concat(@form)
       output_buffer.should_not have_tag("form li select option[@value='']")
     end
 
     it 'should respect the :include_blank option for single selects' do
-      @form = semantic_form_for(@fred) do |builder|
+      concat(semantic_form_for(@fred) do |builder|
         concat(builder.input(:posts, :as => :select, :multiple => false, :include_blank => true))
-      end
+      end)
 
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select option[@value='']")
     end
 
     it 'should respect the :include_blank option for multiple selects' do
-      @form = semantic_form_for(@fred) do |builder|
+      concat(semantic_form_for(@fred) do |builder|
         concat(builder.input(:posts, :as => :select, :multiple => true, :include_blank => true))
-      end
+      end)
 
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select option[@value='']")
     end
 
     it 'should have one option with a "selected" attribute' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select option[@selected]', :count => 1)
     end
   end
 
   describe 'for a has_and_belongs_to_many association' do
     before do
-      @form = semantic_form_for(@freds_post) do |builder|
+      concat(semantic_form_for(@freds_post) do |builder|
         concat(builder.input(:authors, :as => :select))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class("select")
@@ -374,18 +348,15 @@
     it_should_use_the_collection_when_provided(:select, 'option')
 
     it 'should have a select inside the wrapper' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#post_author_ids')
     end
 
     it 'should have a multi-select select' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select[@multiple="multiple"]')
     end
 
     it 'should have a select option for each Author' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select option', :count => ::Author.all.size)
       ::Author.all.each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
@@ -393,30 +364,26 @@
     end
 
     it 'should not have a blank option by default' do
-      output_buffer.concat(@form)
       output_buffer.should_not have_tag("form li select option[@value='']")
     end
 
     it 'should respect the :include_blank option for single selects' do
-      @form = semantic_form_for(@freds_post) do |builder|
+      concat(semantic_form_for(@freds_post) do |builder|
         concat(builder.input(:authors, :as => :select, :multiple => false, :include_blank => true))
-      end
+      end)
 
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select option[@value='']")
     end
 
     it 'should respect the :include_blank option for multiple selects' do
-      @form = semantic_form_for(@freds_post) do |builder|
+      concat(semantic_form_for(@freds_post) do |builder|
         concat(builder.input(:authors, :as => :select, :multiple => true, :include_blank => true))
-      end
+      end)
 
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select option[@value='']")
     end
 
     it 'should have one option with a "selected" attribute' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select option[@selected]', :count => 1)
     end
   end
@@ -424,43 +391,38 @@
   describe 'when :prompt => "choose something" is set' do
     before do
       @new_post.stub!(:author_id).and_return(nil)
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select, :prompt => "choose author"))
-      end
+      end)
     end
 
     it 'should have a select with prompt' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select option[@value='']", /choose author/)
     end
 
     it 'should not have a blank select option' do
-      output_buffer.concat(@form)
       output_buffer.should_not have_tag("form li select option[@value='']", "")
     end
   end
 
   describe 'when no object is given' do
     before(:each) do
-      @form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+      concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:author, :as => :select, :collection => ::Author.all))
-      end
+      end)
     end
 
     it 'should generate label' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li label', /Author/)
       output_buffer.should have_tag("form li label[@for='project_author']")
     end
 
     it 'should generate select inputs' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select#project_author')
       output_buffer.should have_tag('form li select option', :count => ::Author.all.size + 1)
     end
 
     it 'should generate an option to each item' do
-      output_buffer.concat(@form)
       ::Author.all.each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
       end
@@ -469,16 +431,15 @@
 
   describe 'when a grouped collection collection is given' do
     before(:each) do
-      @form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+      concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
         @grouped_opts = [['one',   ['pencil', 'crayon', 'pen']],
                          ['two',   ['eyes', 'hands', 'feet']],
                          ['three', ['wickets', 'witches', 'blind mice']]]
         concat(builder.input(:author, :as => :select, :collection => grouped_options_for_select(@grouped_opts, "hands")))
-      end
+      end)
     end
 
     it 'should generate an option to each item' do
-      output_buffer.concat(@form)
       @grouped_opts.each do |opt_pair|
         output_buffer.should have_tag("form li select optgroup[@label='#{opt_pair[0]}']")
         opt_pair[1].each do |v|
@@ -498,18 +459,15 @@
 
     describe ":as is not set" do
       before do
-        @form_new_post = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:meta_description, :collection => @some_meta_descriptions))
-        end
-        @form_project = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        end)
+        concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:meta_description, :collection => @some_meta_descriptions))
-        end
-
+        end)
       end
 
       it "should render a select field" do
-        output_buffer.concat(@form_new_post)
-        output_buffer.concat(@form_project)
         output_buffer.should have_tag("form li select", :count => 2)
       end
     end
@@ -517,17 +475,15 @@
     describe ":as is set" do
       before do
         # Should not be a case, but just checking :as got highest priority in setting input type.
-        @form_new_post = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:meta_description, :as => :string, :collection => @some_meta_descriptions))
-        end
-        @form_project = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        end)
+        concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:meta_description, :as => :string, :collection => @some_meta_descriptions))
-        end
+        end)
       end
 
       it "should render a text field" do
-        output_buffer.concat(@form_new_post)
-        output_buffer.concat(@form_project)
         output_buffer.should have_tag("form li input[@type='text']", :count => 2)
       end
     end
@@ -535,9 +491,9 @@
 
   describe 'when a namespace is provided' do
     before do
-      @form = semantic_form_for(@freds_post, :namespace => 'context2') do |builder|
+      concat(semantic_form_for(@freds_post, :namespace => 'context2') do |builder|
         concat(builder.input(:authors, :as => :select))
-      end
+      end)
     end
     it_should_have_input_wrapper_with_id("context2_post_authors_input")
     it_should_have_select_with_id("context2_post_author_ids")
diff --git a/spec/inputs/string_input_spec.rb b/spec/inputs/string_input_spec.rb
index c0d293cf6..5b0d7ae59 100644
--- a/spec/inputs/string_input_spec.rb
+++ b/spec/inputs/string_input_spec.rb
@@ -12,9 +12,9 @@
 
   describe "when object is provided" do
     before do
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:title, :as => :string))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class(:string)
@@ -32,10 +32,9 @@
     it_should_apply_error_logic_for_input_type(:string)
 
     def input_field_for_method_should_have_maxlength(method, maxlength)
-      form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(method))
-      end
-      output_buffer.concat(form)
+      end)
       output_buffer.should have_tag("form li input[@maxlength='#{maxlength}']")
     end
 
@@ -83,11 +82,10 @@ def should_have_maxlength(maxlength, options)
             active_model_length_validator([:title], options[:options])
           ])
 
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title))
-          end
+          end)
 
-          output_buffer.concat(form)
           output_buffer.should have_tag("form li input##{@new_post.class.name.underscore}_title[@maxlength='#{maxlength}']")
         end
 
@@ -141,9 +139,9 @@ def should_have_maxlength(maxlength, options)
   describe "when namespace is provided" do
 
     before do
-      @form = semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+      concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         concat(builder.input(:title, :as => :string))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_title_input")
@@ -153,9 +151,9 @@ def should_have_maxlength(maxlength, options)
 
   describe "when no object is provided" do
     before do
-      @form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+      concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
         concat(builder.input(:title, :as => :string))
-      end
+      end)
     end
 
     it_should_have_label_with_text(/Title/)
@@ -167,13 +165,12 @@ def should_have_maxlength(maxlength, options)
 
   describe "when size is nil" do
     before do
-      @form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+      concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
         concat(builder.input(:title, :as => :string, :input_html => {:size => nil}))
-      end
+      end)
     end
 
     it "should have no size attribute" do
-      output_buffer.concat(@form)
       output_buffer.should_not have_tag("input[@size]")
     end
   end
diff --git a/spec/inputs/text_input_spec.rb b/spec/inputs/text_input_spec.rb
index e390e66d8..f02e50a36 100644
--- a/spec/inputs/text_input_spec.rb
+++ b/spec/inputs/text_input_spec.rb
@@ -9,9 +9,9 @@
     @output_buffer = ''
     mock_everything
 
-    @form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:body, :as => :text))
-    end
+    end)
   end
 
   it_should_have_input_wrapper_with_class("text")
@@ -24,47 +24,42 @@
 
   it 'should use input_html to style inputs' do
     output_buffer.replace ''
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :class => 'myclass' }))
-    end
-    output_buffer.concat(form)
+    end)
     output_buffer.should have_tag("form li textarea.myclass")
   end
 
   it "should have a cols attribute when :cols is a number in :input_html" do
     output_buffer.replace ''
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :cols => 42 }))
-    end
-    output_buffer.concat(form)
+    end)
     output_buffer.should have_tag("form li textarea[@cols='42']")
   end
 
   it "should not have a cols attribute when :cols is nil in :input_html" do
     output_buffer.replace ''
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :cols => nil }))
-    end
-    output_buffer.concat(form)
+    end)
     output_buffer.should_not have_tag("form li textarea[@cols]")
   end
 
   it "should have a rows attribute when :rows is a number in :input_html" do
     output_buffer.replace ''
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :rows => 42 }))
-    end
-    output_buffer.concat(form)
+    end)
     output_buffer.should have_tag("form li textarea[@rows='42']")
 
   end
 
   it "should not have a rows attribute when :rows is nil in :input_html" do
     output_buffer.replace ''
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :rows => nil }))
-    end
-    output_buffer.concat(form)
+    end)
     output_buffer.should_not have_tag("form li textarea[@rows]")
   end
 
@@ -74,9 +69,9 @@
       @output_buffer = ''
       mock_everything
 
-      @form = semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+      concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         concat(builder.input(:body, :as => :text))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_body_input")
@@ -92,20 +87,18 @@
 
     it "should have a rows attribute matching default_text_area_height if numeric" do
       with_config :default_text_area_height, 12 do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :text))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag("form li textarea[@rows='12']")
       end
     end
 
     it "should not have a rows attribute if default_text_area_height is nil" do
       with_config :default_text_area_height, nil do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :text))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should_not have_tag("form li textarea[@rows]")
       end
 
@@ -119,20 +112,18 @@
 
     it "should have a cols attribute matching default_text_area_width if numeric" do
       with_config :default_text_area_width, 10 do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :text))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag("form li textarea[@cols='10']")
       end
     end
 
     it "should not have a cols attribute if default_text_area_width is nil" do
       with_config :default_text_area_width, nil do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :text))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should_not have_tag("form li textarea[@cols]")
       end
 
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index c073e2f91..716721fe5 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -18,20 +18,18 @@
 
     describe "with :ignore_date" do
       before do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:publish_at, :as => :time, :ignore_date => true))
-        end
+        end)
       end
 
       it 'should not have an input for day, month and year' do
-        output_buffer.concat(@form)
         output_buffer.should_not have_tag('#post_publish_at_1i')
         output_buffer.should_not have_tag('#post_publish_at_2i')
         output_buffer.should_not have_tag('#post_publish_at_3i')
       end
 
       it 'should have an input for hour and minute' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('#post_publish_at_4i')
         output_buffer.should have_tag('#post_publish_at_5i')
       end
@@ -40,9 +38,9 @@
 
     describe "without seconds" do
       before do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:publish_at, :as => :time))
-        end
+        end)
       end
 
       it_should_have_input_wrapper_with_class("time")
@@ -51,43 +49,37 @@
       it_should_apply_error_logic_for_input_type(:time)
 
       it 'should have a legend and label with the label text inside the fieldset' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset legend.label label', /Publish at/)
       end
 
       it 'should associate the legend label with the first select' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset legend.label label[@for="post_publish_at_1i"]')
       end
 
       it 'should have an ordered list of two items inside the fieldset' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset ol')
         output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
       end
 
       it 'should have five labels for hour and minute' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => 2)
         output_buffer.should have_tag('form li.time fieldset ol li label', /hour/i)
         output_buffer.should have_tag('form li.time fieldset ol li label', /minute/i)
       end
 
       it 'should have two selects for hour and minute' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
       end
     end
 
     describe "with seconds" do
       before do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:publish_at, :as => :time, :include_seconds => true))
-        end
+        end)
       end
 
       it 'should have five labels for hour and minute' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => 3)
         output_buffer.should have_tag('form li.time fieldset ol li label', /hour/i)
         output_buffer.should have_tag('form li.time fieldset ol li label', /minute/i)
@@ -95,12 +87,10 @@
       end
 
       it 'should have three selects for hour, minute and seconds' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset ol li', :count => 3)
       end
 
       it 'should generate a sanitized label and matching ids for attribute' do
-        output_buffer.concat(@form)
         4.upto(6) do |i|
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_publish_at_#{i}i']")
           output_buffer.should have_tag("form li fieldset ol li #post_publish_at_#{i}i")
@@ -114,10 +104,9 @@
     fields.each do |field|
       it "should replace the #{field} label with the specified text if :labels[:#{field}] is set" do
         output_buffer.replace ''
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :time, :include_seconds => true, :labels => { field => "another #{field} label" }))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => fields.length)
         fields.each do |f|
           output_buffer.should have_tag('form li.time fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
@@ -126,10 +115,9 @@
 
       it "should not display the label for the #{field} field when :labels[:#{field}] is blank" do
         output_buffer.replace ''
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :time, :include_seconds => true, :labels => { field => "" }))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => fields.length-1)
         fields.each do |f|
           output_buffer.should have_tag('form li.time fieldset ol li label', /#{f}/i) unless field == f
@@ -140,13 +128,12 @@
 
   describe ':namespace option' do
     before do
-      @form = semantic_form_for(@new_post, :namespace => 'form2') do |builder|
+      concat(semantic_form_for(@new_post, :namespace => 'form2') do |builder|
         concat(builder.input(:publish_at, :as => :time))
-      end
+      end)
     end
 
     it 'should have a tag matching the namespace' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('#form2_post_publish_at_input')
       output_buffer.should have_tag('#form2_post_publish_at_4i')
       output_buffer.should have_tag('#form2_post_publish_at_5i')
diff --git a/spec/inputs/time_zone_input_spec.rb b/spec/inputs/time_zone_input_spec.rb
index fdf61de88..f7b9d811a 100644
--- a/spec/inputs/time_zone_input_spec.rb
+++ b/spec/inputs/time_zone_input_spec.rb
@@ -9,9 +9,9 @@
     @output_buffer = ''
     mock_everything
 
-    @form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:time_zone))
-    end
+    end)
   end
 
   it_should_have_input_wrapper_with_class("time_zone")
@@ -19,24 +19,21 @@
   it_should_apply_error_logic_for_input_type(:time_zone)
 
   it 'should generate a label for the input' do
-    output_buffer.concat(@form)
     output_buffer.should have_tag('form li label')
     output_buffer.should have_tag('form li label[@for="post_time_zone"]')
     output_buffer.should have_tag('form li label', /Time zone/)
   end
 
   it "should generate a select" do
-    output_buffer.concat(@form)
     output_buffer.should have_tag("form li select")
     output_buffer.should have_tag("form li select#post_time_zone")
     output_buffer.should have_tag("form li select[@name=\"post[time_zone]\"]")
   end
 
   it 'should use input_html to style inputs' do
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:time_zone, :input_html => { :class => 'myclass' }))
-    end
-    output_buffer.concat(form)
+    end)
     output_buffer.should have_tag("form li select.myclass")
   end
 
@@ -46,9 +43,9 @@
       @output_buffer = ''
       mock_everything
 
-      @form = semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+      concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         concat(builder.input(:time_zone))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_time_zone_input")
@@ -59,20 +56,18 @@
 
   describe 'when no object is given' do
     before(:each) do
-      @form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+      concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
         concat(builder.input(:time_zone, :as => :time_zone))
-      end
+      end)
     end
 
     it 'should generate labels' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li label')
       output_buffer.should have_tag('form li label[@for="project_time_zone"]')
       output_buffer.should have_tag('form li label', /Time zone/)
     end
 
     it 'should generate select inputs' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select")
       output_buffer.should have_tag("form li select#project_time_zone")
       output_buffer.should have_tag("form li select[@name=\"project[time_zone]\"]")
diff --git a/spec/inputs/url_input_spec.rb b/spec/inputs/url_input_spec.rb
index aae30275c..077286589 100644
--- a/spec/inputs/url_input_spec.rb
+++ b/spec/inputs/url_input_spec.rb
@@ -12,9 +12,9 @@
 
   describe "when object is provided" do
     before do
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:url))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class(:url)
@@ -30,9 +30,9 @@
   describe "when namespace is provided" do
 
     before do
-      @form = semantic_form_for(@new_post, :namespace => "context2") do |builder|
+      concat(semantic_form_for(@new_post, :namespace => "context2") do |builder|
         concat(builder.input(:url))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_url_input")
diff --git a/spec/inputs_spec.rb b/spec/inputs_spec.rb
index 8dffc630a..57f0be8c7 100644
--- a/spec/inputs_spec.rb
+++ b/spec/inputs_spec.rb
@@ -15,47 +15,40 @@
     describe 'when no options are provided' do
       before do
         output_buffer.replace 'before_builder' # clear the output buffer and sets before_builder
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           @inputs_output = builder.inputs do
             concat('hello')
           end
-        end
+        end)
       end
 
       it 'should output just the content wrapped in inputs, not the whole template' do
-        output_buffer.concat(@form)
         output_buffer.should      =~ /before_builder/
         @inputs_output.should_not =~ /before_builder/
       end
 
       it 'should render a fieldset inside the form, with a class of "inputs"' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset.inputs")
       end
 
       it 'should render an ol inside the fieldset' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset.inputs ol")
       end
 
       it 'should render the contents of the block inside the ol' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset.inputs ol", /hello/)
       end
 
       it 'should not render a legend inside the fieldset' do
-        output_buffer.concat(@form)
         output_buffer.should_not have_tag("form fieldset.inputs legend")
       end
 
       it 'should render a fieldset even if no object is given' do
-        form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+        concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
           @inputs_output = builder.inputs do
             concat('bye')
           end
-        end
-
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag("form fieldset.inputs ol", /bye/)
       end
     end
@@ -70,29 +63,25 @@
       it 'should render nested inputs' do
         @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
 
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           inputs = builder.inputs :for => [:author, @bob] do |bob_builder|
             concat(bob_builder.input(:login))
           end
           concat(inputs)
-        end
-
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag("form fieldset.inputs #post_author_attributes_login")
         output_buffer.should_not have_tag("form fieldset.inputs #author_login")
-
       end
 
       it 'should concat rendered nested inputs to the template' do
         @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
 
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           builder.inputs :for => [:author, @bob] do |bob_builder|
             concat(bob_builder.input(:login))
           end
-        end
+        end)
 
-        output_buffer.concat(form)
         output_buffer.should have_tag("form fieldset.inputs #post_author_attributes_login")
         output_buffer.should_not have_tag("form fieldset.inputs #author_login")
 
@@ -101,13 +90,12 @@
       describe "as a symbol representing the association name" do
 
         it 'should nest the inputs with an _attributes suffix on the association name' do
-          form = semantic_form_for(@new_post) do |post|
+          concat(semantic_form_for(@new_post) do |post|
             inputs = post.inputs :for => :author do |author|
               concat(author.input(:login))
             end
             concat(inputs)
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form input[@name='post[author_attributes][login]']")
         end
 
@@ -120,13 +108,12 @@
         end
 
         it 'should nest the inputs with a fieldset, legend and :name input for each item' do
-          form = semantic_form_for(@new_post) do |post|
+          concat(semantic_form_for(@new_post) do |post|
             post.inputs :for => :authors, :name => '%i' do |author|
               concat(author.input(:login))
             end
-          end
+          end)
 
-          output_buffer.concat(form)
           output_buffer.should have_tag("form fieldset.inputs", :count => 2)
           output_buffer.should have_tag("form fieldset.inputs legend", :count => 2)
           output_buffer.should have_tag("form input[@name='post[authors_attributes][0][login]']")
@@ -137,13 +124,12 @@
       describe 'as an array containing the a symbole for the association name and the associated object' do
 
         it 'should nest the inputs with an _attributes suffix on the association name' do
-          form = semantic_form_for(@new_post) do |post|
+          concat(semantic_form_for(@new_post) do |post|
             inputs = post.inputs :for => [:author, @new_post.author] do |author|
               concat(author.input(:login))
             end
             concat(inputs)
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form input[@name='post[author_attributes][login]']")
         end
 
@@ -152,13 +138,12 @@
       describe 'as an associated object' do
 
         it 'should not nest the inputs with an _attributes suffix' do
-          form = semantic_form_for(@new_post) do |post|
+          concat(semantic_form_for(@new_post) do |post|
             inputs = post.inputs :for => @new_post.author do |author|
               concat(author.input(:login))
             end
             concat(inputs)
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form input[@name='post[author][login]']")
         end
 
@@ -178,52 +163,48 @@
       it 'should pass options down to semantic_fields_for' do
         @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
 
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           inputs = builder.inputs :for => [:author, @bob], :for_options => { :index => 10 } do |bob_builder|
             concat(bob_builder.input(:login))
           end
           concat(inputs)
-        end
+        end)
 
-        output_buffer.concat(form)
         output_buffer.should have_tag('form fieldset ol li #post_author_attributes_10_login')
       end
 
       it 'should not add builder as a fieldset attribute tag' do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           inputs = builder.inputs :for => [:author, @bob], :for_options => { :index => 10 } do |bob_builder|
             concat('input')
           end
           concat(inputs)
-        end
+        end)
 
-        output_buffer.concat(form)
         output_buffer.should_not have_tag('fieldset[@builder="Formtastic::SemanticFormHelper"]')
       end
 
       it 'should send parent_builder as an option to allow child index interpolation' do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           builder.instance_variable_set('@nested_child_index', 0)
           inputs = builder.inputs :for => [:author, @bob], :name => 'Author #%i' do |bob_builder|
             concat('input')
           end
           concat(inputs)
-        end
+        end)
 
-        output_buffer.concat(form)
         output_buffer.should have_tag('fieldset legend', 'Author #1')
       end
 
       it 'should also provide child index interpolation when nested child index is a hash' do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           builder.instance_variable_set('@nested_child_index', :author => 10)
           inputs = builder.inputs :for => [:author, @bob], :name => 'Author #%i' do |bob_builder|
             concat('input')
           end
           concat(inputs)
-        end
+        end)
 
-        output_buffer.concat(form)
         output_buffer.should have_tag('fieldset legend', 'Author #11')
       end
     end
@@ -235,7 +216,7 @@
           @legend_text_using_name = "Advanced options 2"
           @legend_text_using_title = "Advanced options 3"
           @nested_forms_legend_text = "This is a nested form title"
-          @form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             inputs = builder.inputs @legend_text do
             end
             concat(inputs)
@@ -248,11 +229,10 @@
             inputs = builder.inputs @nested_forms_legend_text, :for => :authors do |nf|
             end
             concat(inputs)
-          end
+          end)
         end
 
         it 'should render a fieldset with a legend inside the form' do
-          output_buffer.concat(@form)
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text_using_name}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text_using_title}$/)
@@ -276,7 +256,7 @@
                     }
                 }
             }
-          @form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             inputs = builder.inputs :advanced_options do
             end
             concat(inputs)
@@ -289,11 +269,10 @@
             inputs = builder.inputs :nested_forms_title, :for => :authors do |nf|
             end
             concat(inputs)
-          end
+          end)
         end
 
         it 'should render a fieldset with a localized legend inside the form' do
-          output_buffer.concat(@form)
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text_using_name}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text_using_title}$/)
@@ -307,14 +286,13 @@
         @id_option = 'advanced'
         @class_option = 'wide'
 
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           builder.inputs :id => @id_option, :class => @class_option do
           end
-        end
+        end)
       end
 
       it 'should pass the options into the fieldset tag as attributes' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset##{@id_option}")
         output_buffer.should have_tag("form fieldset.#{@class_option}")
       end
@@ -341,55 +319,46 @@
 
     describe 'with no args' do
       before do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.inputs)
-        end
+        end)
       end
 
       it 'should render a form' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form')
       end
 
       it 'should render a fieldset inside the form' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs')
       end
 
       it 'should not render a legend in the fieldset' do
-        output_buffer.concat(@form)
         output_buffer.should_not have_tag('form > fieldset.inputs > legend')
       end
 
       it 'should render an ol in the fieldset' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs > ol')
       end
 
       it 'should render a list item in the ol for each column and reflection' do
         # Remove the :has_many macro and :created_at column
         count = ::Post.content_columns.size + ::Post.reflections.size - 2
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => count)
       end
 
       it 'should render a string list item for title' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs > ol > li.string')
       end
 
       it 'should render a text list item for body' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs > ol > li.text')
       end
 
       it 'should render a select list item for author_id' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs > ol > li.select', :count => 1)
       end
 
       it 'should not render timestamps inputs by default' do
-        output_buffer.concat(@form)
         output_buffer.should_not have_tag('form > fieldset.inputs > ol > li.datetime')
       end
     end
@@ -397,11 +366,10 @@
     describe 'with column names as args' do
       describe 'and an object is given' do
         it 'should render a form with a fieldset containing two list items' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.inputs(:title, :body))
-          end
+          end)
 
-          output_buffer.concat(form)
           output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => 2)
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.string')
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.text')
@@ -410,11 +378,10 @@
 
       describe 'and no object is given' do
         it 'should render a form with a fieldset containing two list items' do
-          form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
             concat(builder.inputs(:title, :body))
-          end
+          end)
 
-          output_buffer.concat(form)
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.string', :count => 2)
         end
       end
@@ -424,11 +391,10 @@
       describe 'and an object is given' do
         it 'should render nested inputs' do
           @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.inputs(:login, :for => @bob))
-          end
+          end)
 
-          output_buffer.concat(form)
           output_buffer.should have_tag("form fieldset.inputs #post_author_login")
           output_buffer.should_not have_tag("form fieldset.inputs #author_login")
         end
@@ -436,10 +402,9 @@
 
       describe 'and no object is given' do
         it 'should render nested inputs' do
-          form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+          concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
             concat(builder.inputs(:login, :for => @bob))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form fieldset.inputs #project_author_login")
           output_buffer.should_not have_tag("form fieldset.inputs #project_login")
         end
@@ -448,26 +413,23 @@
 
     describe 'with column names and an options hash as args' do
       before do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           @legend_text_using_option = "Legendary Legend Text"
           @legend_text_using_arg = "Legendary Legend Text 2"
           concat(builder.inputs(:title, :body, :name => @legend_text_using_option, :id => "my-id"))
           concat(builder.inputs(@legend_text_using_arg, :title, :body, :id => "my-id-2"))
-        end
+        end)
       end
 
       it 'should render a form with a fieldset containing two list items' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => 4)
       end
 
       it 'should pass the options down to the fieldset' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset#my-id.inputs')
       end
 
       it 'should use the special :name option as a text for the legend tag' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset#my-id.inputs > legend', /^#{@legend_text_using_option}$/)
         output_buffer.should have_tag('form > fieldset#my-id-2.inputs > legend', /^#{@legend_text_using_arg}$/)
       end
diff --git a/spec/label_spec.rb b/spec/label_spec.rb
index b536340e1..9e97e3f77 100644
--- a/spec/label_spec.rb
+++ b/spec/label_spec.rb
@@ -32,18 +32,16 @@
 
   describe 'when a collection is given' do
     it 'should use a supplied label_method for simple collections' do
-      form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+      concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :value_method => :to_s, :label_method => proc {|f| ('Label_%s' % [f])}))
-      end
-      output_buffer.concat(form)
+      end)
       output_buffer.should have_tag('form li fieldset ol li label', :with => /Label_[abc]/, :count => 3)
     end
 
     it 'should use a supplied value_method for simple collections' do
-      form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+      concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :value_method => proc {|f| ('Value_%s' % [f.to_s])}))
-      end
-      output_buffer.concat(form)
+      end)
       output_buffer.should have_tag('form li fieldset ol li label input[value="Value_a"]')
       output_buffer.should have_tag('form li fieldset ol li label input[value="Value_b"]')
       output_buffer.should have_tag('form li fieldset ol li label input[value="Value_c"]')
diff --git a/spec/semantic_fields_for_spec.rb b/spec/semantic_fields_for_spec.rb
index 4cfe27d76..74ef5ddc5 100644
--- a/spec/semantic_fields_for_spec.rb
+++ b/spec/semantic_fields_for_spec.rb
@@ -29,12 +29,11 @@
 
   it 'should sanitize html id for li tag' do
     @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.semantic_fields_for(@bob, :index => 1) do |nested_builder|
         concat(nested_builder.inputs(:login))
       end)
-    end
-    output_buffer.concat(form)
+    end)
     output_buffer.should have_tag('form fieldset.inputs #post_author_1_login_input')
     # Not valid selector, so using good ol' regex
     output_buffer.should_not =~ /id="post\[author\]_1_login_input"/
@@ -43,12 +42,11 @@
 
   it 'should use namespace provided in nested fields' do
     @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
-    form = semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+    concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
       concat(builder.semantic_fields_for(@bob, :index => 1) do |nested_builder|
         concat(nested_builder.inputs(:login))
       end)
-    end
-    output_buffer.concat(form)
+    end)
     output_buffer.should have_tag('form fieldset.inputs #context2_post_author_1_login_input')
   end
   
@@ -61,13 +59,12 @@
       @fred.posts.first.stub!(:persisted?).and_return(true)
       @fred.stub!(:posts_attributes=)
 
-      form = semantic_form_for(@fred) do |builder|
+      concat(semantic_form_for(@fred) do |builder|
         concat(builder.semantic_fields_for(:posts) do |nested_builder|
           concat(nested_builder.input(:id, :as => :hidden))
           concat(nested_builder.input(:title))
         end)
-      end
-      output_buffer.concat(form)
+      end)
     end
   
     it "should only render one hidden input (my one)" do
diff --git a/spec/support/custom_macros.rb b/spec/support/custom_macros.rb
index 0b9e757cb..b7ec8be26 100644
--- a/spec/support/custom_macros.rb
+++ b/spec/support/custom_macros.rb
@@ -10,91 +10,78 @@ module ClassMethods
 
     def it_should_have_input_wrapper_with_class(class_name)
       it "should have input wrapper with class '#{class_name}'" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li.#{class_name}")
       end
     end
 
     def it_should_have_input_wrapper_with_id(id_string)
       it "should have input wrapper with id '#{id_string}'" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li##{id_string}")
       end
     end
 
     def it_should_not_have_a_label
       it "should not have a label" do
-        output_buffer.concat(@form)
         output_buffer.should_not have_tag("form li label")
       end
     end
 
     def it_should_have_a_nested_fieldset
       it "should have a nested_fieldset" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li fieldset")
       end
     end
 
     def it_should_have_label_with_text(string_or_regex)
       it "should have a label with text '#{string_or_regex}'" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li label", string_or_regex)
       end
     end
 
     def it_should_have_label_for(element_id)
       it "should have a label for ##{element_id}" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li label[@for='#{element_id}']")
       end
     end
 
     def it_should_have_input_with_id(element_id)
       it "should have an input with id '#{element_id}'" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li input##{element_id}")
       end
     end
 
     def it_should_have_select_with_id(element_id)
       it "should have a select box with id '#{element_id}'" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select##{element_id}")
       end
     end
 
     def it_should_have_input_with_type(input_type)
       it "should have a #{input_type} input" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li input[@type=\"#{input_type}\"]")
       end
     end
 
     def it_should_have_input_with_name(name)
       it "should have an input named #{name}" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li input[@name=\"#{name}\"]")
       end
     end
 
     def it_should_have_textarea_with_name(name)
       it "should have an input named #{name}" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li textarea[@name=\"#{name}\"]")
       end
     end
 
     def it_should_have_textarea_with_id(element_id)
       it "should have an input with id '#{element_id}'" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li textarea##{element_id}")
       end
     end
 
     def it_should_have_label_and_input_with_id(element_id)
       it "should have an input with id '#{element_id}'" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li input##{element_id}")
         output_buffer.should have_tag("form li label[@for='#{element_id}']")
       end
@@ -103,10 +90,9 @@ def it_should_have_label_and_input_with_id(element_id)
     def it_should_use_default_text_field_size_when_not_nil(as)
       it 'should use default_text_field_size when not nil' do
         with_config :default_text_field_size, 30 do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => as))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form li input[@size='#{Formtastic::SemanticFormBuilder.default_text_field_size}']")
         end
       end
@@ -115,10 +101,9 @@ def it_should_use_default_text_field_size_when_not_nil(as)
     def it_should_not_use_default_text_field_size_when_nil(as)
       it 'should not use default_text_field_size when nil' do
         with_config :default_text_field_size, nil do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => as))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form li input")
           output_buffer.should_not have_tag("form li input[@size]")
         end
@@ -127,20 +112,18 @@ def it_should_not_use_default_text_field_size_when_nil(as)
 
     def it_should_apply_custom_input_attributes_when_input_html_provided(as)
       it 'it should apply custom input attributes when input_html provided' do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as, :input_html => { :class => 'myclass' }))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag("form li input.myclass")
       end
     end
 
     def it_should_apply_custom_for_to_label_when_input_html_id_provided(as)
       it 'it should apply custom for to label when input_html :id provided' do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as, :input_html => { :id => 'myid' }))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag('form li label[@for="myid"]')
       end
     end
@@ -148,7 +131,6 @@ def it_should_apply_custom_for_to_label_when_input_html_id_provided(as)
     def it_should_have_maxlength_matching_column_limit
       it 'should have a maxlength matching column limit' do
         @new_post.column_for_attribute(:title).limit.should == 50
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li input[@maxlength='50']")
       end
     end
@@ -158,11 +140,10 @@ def it_should_use_column_size_for_columns_shorter_than_default_text_field_size(a
         column_limit_shorted_than_default = 1
         @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => as, :limit => column_limit_shorted_than_default))
 
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as))
-        end
+        end)
 
-        output_buffer.concat(form)
         output_buffer.should have_tag("form li input[@size='#{column_limit_shorted_than_default}']")
       end
     end
@@ -180,36 +161,32 @@ def it_should_apply_error_logic_for_input_type(type)
         end
 
         it 'should apply an errors class to the list item' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag('form li.error')
         end
 
         it 'should not wrap the input with the Rails default error wrapping' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should_not have_tag('div.fieldWithErrors')
         end
 
         it 'should render a paragraph for the errors' do
           ::Formtastic::SemanticFormBuilder.inline_errors = :sentence
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag('form li.error p.inline-errors')
         end
 
         it 'should not display an error list' do
           ::Formtastic::SemanticFormBuilder.inline_errors = :list
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag('form li.error ul.errors')
         end
       end
@@ -222,40 +199,34 @@ def it_should_apply_error_logic_for_input_type(type)
         end
 
         it 'should not apply an errors class to the list item' do
-          output_buffer.concat(@form)
           output_buffer.should_not have_tag('form li.error')
         end
 
         it 'should not render a paragraph for the errors' do
-          output_buffer.concat(@form)
           output_buffer.should_not have_tag('form li.error p.inline-errors')
         end
 
         it 'should not display an error list' do
-          output_buffer.concat(@form)
           output_buffer.should_not have_tag('form li.error ul.errors')
         end
       end
 
       describe 'when no object is provided' do
         before do
-          @form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
             concat(builder.input(:title, :as => type))
-          end
+          end)
         end
 
         it 'should not apply an errors class to the list item' do
-          output_buffer.concat(@form)
           output_buffer.should_not have_tag('form li.error')
         end
 
         it 'should not render a paragraph for the errors' do
-          output_buffer.concat(@form)
           output_buffer.should_not have_tag('form li.error p.inline-errors')
         end
 
         it 'should not display an error list' do
-          output_buffer.concat(@form)
           output_buffer.should_not have_tag('form li.error ul.errors')
         end
       end
@@ -264,9 +235,9 @@ def it_should_apply_error_logic_for_input_type(type)
     def it_should_call_find_on_association_class_when_no_collection_is_provided(as)
       it "should call find on the association class when no collection is provided" do
         ::Author.should_receive(:all)
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:author, :as => as))
-        end
+        end)
       end
     end
 
@@ -275,14 +246,13 @@ def it_should_use_the_collection_when_provided(as, countable)
 
         before do
           @authors = ::Author.all * 2
-          output_buffer.replace '' # clears the output_buffer from the before block, hax!
+          output_buffer.replace ''
         end
 
         it 'should use the provided collection' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:author, :as => as, :collection => @authors))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form li.#{as} #{countable}", :count => @authors.size + (as == :select ? 1 : 0))
         end
 
@@ -292,10 +262,9 @@ def it_should_use_the_collection_when_provided(as, countable)
           end
 
           it "should use the string as the label text and value for each #{countable}" do
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
-            end
-            output_buffer.concat(form)
+            end)
 
             @categories.each do |value|
               output_buffer.should have_tag("form li.#{as}", /#{value}/)
@@ -306,13 +275,12 @@ def it_should_use_the_collection_when_provided(as, countable)
           if as == :radio
             it 'should generate a sanitized label for attribute' do
               @bob.stub!(:category_name).and_return(@categories)
-              form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 fields = builder.semantic_fields_for(@bob) do |bob_builder|
                   concat(bob_builder.input(:category_name, :as => as, :collection => @categories))
                 end
                 concat(fields)
-              end
-              output_buffer.concat(form)
+              end)
               output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_general']")
               output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_design']")
               output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_development']")
@@ -327,10 +295,9 @@ def it_should_use_the_collection_when_provided(as, countable)
           end
 
           it "should use the key as the label text and the hash value as the value attribute for each #{countable}" do
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
-            end
-            output_buffer.concat(form)
+            end)
 
             @categories.each do |label, value|
               output_buffer.should have_tag("form li.#{as}", /#{label}/)
@@ -345,10 +312,9 @@ def it_should_use_the_collection_when_provided(as, countable)
           end
 
           it "should use the first value as the label text and the last value as the value attribute for #{countable}" do
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
-            end
-            output_buffer.concat(form)
+            end)
 
             @categories.each do |text, value|
               label = as == :select ? :option : :label
@@ -366,10 +332,9 @@ def it_should_use_the_collection_when_provided(as, countable)
             end
 
             it "should use the first value as the label text and the last value as the value attribute for #{countable}" do
-              form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:category_name, :as => as, :collection => @choices))
-              end
-              output_buffer.concat(form)
+              end)
 
               output_buffer.should have_tag("form li.#{as} #{countable}#post_category_name_true")
               output_buffer.should have_tag("form li.#{as} #{countable}#post_category_name_false")
@@ -383,10 +348,9 @@ def it_should_use_the_collection_when_provided(as, countable)
           end
 
           it "should use the symbol as the label text and value for each #{countable}" do
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
-            end
-            output_buffer.concat(form)
+            end)
 
             @categories.each do |value|
               label = as == :select ? :option : :label
@@ -402,10 +366,9 @@ def it_should_use_the_collection_when_provided(as, countable)
           end
 
           it "should use the key as the label text and the hash value as the value attribute for each #{countable}" do
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
-            end
-            output_buffer.concat(form)
+            end)
 
             @categories.each do |label, value|
               output_buffer.should have_tag("form li.#{as}", /#{label}/)
@@ -419,13 +382,12 @@ def it_should_use_the_collection_when_provided(as, countable)
 
           describe 'as a symbol' do
             before do
-              @form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:author, :as => as, :label_method => :login))
-              end
+              end)
             end
 
             it 'should have options with text content from the specified method' do
-              output_buffer.concat(@form)
               ::Author.all.each do |author|
                 output_buffer.should have_tag("form li.#{as}", /#{author.login}/)
               end
@@ -434,13 +396,12 @@ def it_should_use_the_collection_when_provided(as, countable)
 
           describe 'as a proc' do
             before do
-              @form  = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:author, :as => as, :label_method => Proc.new {|a| a.login.reverse }))
-              end
+              end)
             end
 
             it 'should have options with the proc applied to each' do
-              output_buffer.concat(@form)
               ::Author.all.each do |author|
                 output_buffer.should have_tag("form li.#{as}", /#{author.login.reverse}/)
               end
@@ -457,13 +418,12 @@ def it_should_use_the_collection_when_provided(as, countable)
                 @fred.stub!(:respond_to?).and_return { |m| m.to_s == label_method || m.to_s == 'id' }
                 ::Author.all.each { |a| a.stub!(label_method).and_return('The Label Text') }
 
-                @form = semantic_form_for(@new_post) do |builder|
+                concat(semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:author, :as => as))
-                end
+                end)
               end
 
               it "should render the options with #{label_method} as the label" do
-                output_buffer.concat(@form)
                 ::Author.all.each do |author|
                   output_buffer.should have_tag("form li.#{as}", /The Label Text/)
                 end
@@ -477,13 +437,12 @@ def it_should_use_the_collection_when_provided(as, countable)
 
           describe 'as a symbol' do
             before do
-              @form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:author, :as => as, :value_method => :login))
-              end
+              end)
             end
 
             it 'should have options with values from specified method' do
-              output_buffer.concat(@form)
               ::Author.all.each do |author|
                 output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login}']")
               end
@@ -492,13 +451,12 @@ def it_should_use_the_collection_when_provided(as, countable)
 
           describe 'as a proc' do
             before do
-              @form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:author, :as => as, :value_method => Proc.new {|a| a.login.reverse }))
-              end
+              end)
             end
 
             it 'should have options with the proc applied to each value' do
-              output_buffer.concat(@form)
               ::Author.all.each do |author|
                 output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login.reverse}']")
               end
diff --git a/spec/support/test_environment.rb b/spec/support/test_environment.rb
index abd650d15..7d77d7afa 100644
--- a/spec/support/test_environment.rb
+++ b/spec/support/test_environment.rb
@@ -22,3 +22,8 @@ class Application < Rails::Application
 FormtasticTest::Application.initialize!
 
 require 'rspec/rails'
+
+# Quick hack to avoid the 'Spec' deprecation warnings from rspec_tag_matchers
+module Spec
+  include Rspec
+end

From b52fb9e91a4b8bad6fbe93185d75d861f45592e7 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Tue, 18 Jan 2011 22:45:58 -0200
Subject: [PATCH 411/992] Drop Formtasticc::Util.rails_safe_buffer_class which
 was used to support rails 2 and 3

---
 lib/formtastic.rb             | 2 +-
 lib/formtastic/util.rb        | 4 ----
 spec/support/output_buffer.rb | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 99998eb08..69476ace5 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1479,7 +1479,7 @@ def find_collection_for_column(column, options) #:nodoc:
         collection = find_raw_collection_for_column(column, options)
 
         # Return if we have a plain string
-        return collection if collection.instance_of?(String) || collection.instance_of?(::Formtastic::Util.rails_safe_buffer_class)
+        return collection if collection.instance_of?(String) || collection.instance_of?(::ActiveSupport::SafeBuffer)
 
         # Return if we have an Array of strings, fixnums or arrays
         return collection if (collection.instance_of?(Array) || collection.instance_of?(Range)) &&
diff --git a/lib/formtastic/util.rb b/lib/formtastic/util.rb
index ee4ba0185..82a8c169c 100644
--- a/lib/formtastic/util.rb
+++ b/lib/formtastic/util.rb
@@ -18,10 +18,6 @@ def html_safe(text)
       text
     end
 
-    def rails_safe_buffer_class
-      return ActiveSupport::SafeBuffer
-    end
-
     def rails3?
       version=
         if defined?(ActionPack::VERSION::MAJOR)
diff --git a/spec/support/output_buffer.rb b/spec/support/output_buffer.rb
index 9a1ba6819..9c2166326 100644
--- a/spec/support/output_buffer.rb
+++ b/spec/support/output_buffer.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
 module ActionView
-  class OutputBuffer < Formtastic::Util.rails_safe_buffer_class
+  class OutputBuffer < ActiveSupport::SafeBuffer
   end
 end

From f9def906d5edb775518bed127501219829a9c888 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Tue, 18 Jan 2011 22:47:33 -0200
Subject: [PATCH 412/992] Remove Formtastic::Util.rails3?

---
 lib/formtastic/util.rb | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/lib/formtastic/util.rb b/lib/formtastic/util.rb
index 82a8c169c..3ee9d77f9 100644
--- a/lib/formtastic/util.rb
+++ b/lib/formtastic/util.rb
@@ -17,13 +17,5 @@ def html_safe(text)
       return text.html_safe
       text
     end
-
-    def rails3?
-      version=
-        if defined?(ActionPack::VERSION::MAJOR)
-          ActionPack::VERSION::MAJOR
-        end
-      !version.blank? && version >= 3
-    end
   end
 end

From 877133264cdfb8eac9fe2ce5cc03666115ba4918 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Tue, 18 Jan 2011 22:49:26 -0200
Subject: [PATCH 413/992] ActionView::OutputBuffer is not used

---
 spec/support/output_buffer.rb | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 spec/support/output_buffer.rb

diff --git a/spec/support/output_buffer.rb b/spec/support/output_buffer.rb
deleted file mode 100644
index 9c2166326..000000000
--- a/spec/support/output_buffer.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# encoding: utf-8
-
-module ActionView
-  class OutputBuffer < ActiveSupport::SafeBuffer
-  end
-end

From 9e47897685fabbfe111f001fea6f9d60daf96453 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Tue, 18 Jan 2011 22:55:52 -0200
Subject: [PATCH 414/992] Refactoring on Formtastic::Util.html_safe

---
 lib/formtastic/util.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic/util.rb b/lib/formtastic/util.rb
index 3ee9d77f9..924eea769 100644
--- a/lib/formtastic/util.rb
+++ b/lib/formtastic/util.rb
@@ -13,9 +13,11 @@ module Util
     # @param text [String]
     # @return [String] `text`, marked as HTML-safe
     def html_safe(text)
-      return text if text.nil?
-      return text.html_safe
-      text
+      if text.respond_to?(:html_safe)
+        text.html_safe
+      else
+        text
+      end
     end
   end
 end

From 3340c5357d688a663d8dbf15df89a05d343918e7 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 12 Jan 2011 21:25:03 +1100
Subject: [PATCH 415/992] Remove Rails 2 stuff from README

---
 README.textile | 67 +++++---------------------------------------------
 1 file changed, 6 insertions(+), 61 deletions(-)

diff --git a/README.textile b/README.textile
index 035a398c7..5229a4b09 100644
--- a/README.textile
+++ b/README.textile
@@ -46,7 +46,7 @@ h2. It's better than _SomeOtherFormBuilder_ because...
 
 * it can handle @belongs_to@ associations (like Post belongs_to :author), rendering a select or set of radio inputs with choices from the parent model.
 * it can handle @has_many@ and @has_and_belongs_to_many@ associations (like: Post has_many :tags), rendering a multi-select with choices from the child models.
-* it's Rails 2.x and 3.x compatible (including nested forms).
+* it's Rails 3 compatible (including nested forms).
 * it has internationalization (I18n)!
 * it's _really_ quick to get started with a basic form in place (4 lines), then go back to add in more detail if you need it.
 * there's heaps of elements, id and class attributes for you to hook in your CSS and JS.
@@ -81,24 +81,18 @@ RDoc documentation _should_ be automatically generated after each commit and mad
 
 h2. Installation
 
-Formtastic is now compatible with both Rails 2 and Rails 3, and the gem is "hosted":http://rubygems.org/gems/formtastic on RubyGems.org.
-
-*You'll need to use Bundler (yes, even under Rails 2, due to the many ways gem dependencies suck). Follow "this tutorial":http://gembundler.com/rails23.html.*
+Formtastic 2 compatible with Rails 3 only, and the gem is "hosted":http://rubygems.org/gems/formtastic on RubyGems.org.
 
 Simply add Formtastic to your Gemfile and bundle it up:
 
 <pre>
-  gem 'formtastic', '~> 1.1.0'
+  gem 'formtastic', '~> 2.0.0'
 </pre>
 
 Optionally, run the generator to copy some stylesheets and a configuration initializer into your application:
 
 <pre>
-  # Rails 3:
   $ rails generate formtastic:install 
-  
-  # Or Rails 2:
-  $ ./script/generate formtastic 
 </pre>
 
 
@@ -115,31 +109,6 @@ A proof-of-concept stylesheet is provided which you can include in your layout.
 </pre>
 
 
-h2. Syntax
-
-*Please note:* Formtastic makes use of a lot of ERB blocks and currently supports both Rails 2 and Rails 3, which means the syntax in these examples will differ depending on which version of Rails you're using.
-
-The difference is subtle, with most blocks in Rails 3 requiring the addition of an equals sign:
-
-<pre>
-  <!-- Rails 2 -->
-  <% semantic_form_for @user do |form| %>
-    <% form.inputs do %>
-      ...
-    <% end %>
-  <% end %>
-  
-  <!-- Rails 3 -->
-  <%= semantic_form_for @user do |form| %>
-    <%= form.inputs do %>
-      ...
-    <% end %>
-  <% end %>
-</pre>
-  
-This README is currently documenting the Rails 2 way only. If you're using Rails 3 and your forms aren't rendering everything as expected, try changing @<%@ to @<%=@.
-
-
 h2. Usage
 
 Forms are really boring to code... you want to get onto the good stuff as fast as possible.
@@ -519,7 +488,7 @@ If you have the "ValidationReflection":http://github.com/redinger/validation_ref
 
 h2. Configuration
 
-Run @rails generate formtastic:install@ (Rails 3) or @./script/generate formtastic@ (Rails 2) to copy a commented out config file into @config/initializers/formtastic.rb@. You can "view the configuration file on GitHub":http://github.com/justinfrench/formtastic/blob/master/generators/formtastic/templates/formtastic.rb
+Run @rails generate formtastic:install@ to copy a commented out config file into @config/initializers/formtastic.rb@. You can "view the configuration file on GitHub":http://github.com/justinfrench/formtastic/blob/master/generators/formtastic/templates/formtastic.rb
 
 
 h2. Form Generator
@@ -528,18 +497,10 @@ There's a Formtastic form code generator to make your transition to Formtastic e
 
 h3. Basic usage
 
-Rails 3:
-
 <pre>
   $ rails generate formtastic:form ModelName
 </pre>
 
-Rails 2:
-
-<pre>
-  $ ./script/generate form ModelName
-</pre>
-
 The results are something like this, with the ERB code printed out to the terminal 
 
 <pre>
@@ -629,8 +590,8 @@ There are none, but...
 
 h2. Compatibility
 
-* We're only testing Formtastic with the latest Rails 2.x and 3.x stable releases. Patches are welcome to allow backwards compatibility with older versions of Rails, of course.
-* Formtastic, much like Rails 2, is very ActiveRecord-centric. Many people are using Formtastic (especially the rails3 branch) successfully with other ActiveModel-like ORMs and classes (DataMapper, MongoMapper, Mongoid, Authlogic, Devise...) but we're not guaranteeing anything at this stage. Patches are welcome, but it's not our core focus right now.
+* We're only testing Formtastic with the latest Rails stable release. Patches are welcome to allow backwards compatibility with previous versions of Rails, of course, but we've dropped support for Rails 2. Formtastic 1.x is compatible with Rails 2, and is being maintained for bug fixes only. See the README in the "1.2-stable branch":https://github.com/justinfrench/formtastic/tree/1.2-stable.
+* Formtastic, much like Rails, is very ActiveRecord-centric. Many people are using Formtastic successfully with other ActiveModel-like ORMs and classes (DataMapper, MongoMapper, Mongoid, Authlogic, Devise...) but we're not guaranteeing full compatibility at this stage. Patches are welcome.
  
 
 h2. How to contribute
@@ -644,22 +605,6 @@ For significant changes, you may wish to discuss your idea on the Formtastic Goo
 See below for installation of a development environment.
 
 
-h2. Development Environment
-
-We currently support both Rails 2 and Rails 3, under Ruby 1.8.7-ish (and 1.9.2-ish). That means, at a bare minimum, you'll want to set-up two rvm gemsets to run your specs against. So, fork the project on Github, clone it, make some gemsets, run bundler, run your specs and then finally set-up an .rvmrc file that specifies Rails 3 as your default gemset and cd back into that directory to load in the .rvmrc file. Something like this:
-
-<pre>
-  $ cd ~/code/formtastic
-  $ rvm gemset create formtastic      # If that's your thing
-  $ rvm gemset use formtastic         # Add that to your .rvmrc too
-  $ bundle install                    # Initial bundle command to build Gemfile.lock
-  $ RAILS_2=true bundle update rails  # Updates gemfile to run agains rails 2
-  $ RAILS_2=true rake                 # Run tests against rails 2
-  $ bundle update rails               # Updates gemfile to run agains rails 3
-  $ rake                              # Run tests against rails 3
-</pre>
-
-
 h2. Maintainers & Contributors
 
 Formtastic is maintained by "Justin French":http://github.com/justinfrench, "Morton Jonuschat":http://github.com/yabawock and "Gabriel Sobrinho":http://github.com/sobrinho. "Denis Major":http://github.com/denismajor1 is doing some amazing documentation work in the wiki, and we very much appreciate the past efforts of "José Valim":http://github.com/josevalim and "Jonas Grimfelt":http://github.com/grimen and over 40 other contributors.

From 6bc6ce75fc5fe3845468cac7df57fd5362cd200e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 12 Jan 2011 22:24:35 +1100
Subject: [PATCH 416/992] removed rails2? and rails3? methods

---
 spec/form_helper_spec.rb | 14 +++-----------
 spec/spec_helper.rb      |  8 --------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/spec/form_helper_spec.rb b/spec/form_helper_spec.rb
index b27234ef2..1a27ba6bf 100644
--- a/spec/form_helper_spec.rb
+++ b/spec/form_helper_spec.rb
@@ -101,17 +101,9 @@
     end
 
     it 'can be called with a generic style and instance variable' do
-      if rails3?
-        semantic_form_for(@new_post, :as => :post, :url => new_post_path) do |builder|
-          builder.object.class.should == ::Post
-          builder.object_name.to_s.should == "post" # TODO: is this forced .to_s a bad assumption somewhere?
-        end
-      end
-      if rails2?
-        semantic_form_for(:post, @new_post, :url => new_post_path) do |builder|
-          builder.object.class.should == ::Post
-          builder.object_name.to_s.should == "post" # TODO: is this forced .to_s a bad assumption somewhere?
-        end
+      semantic_form_for(@new_post, :as => :post, :url => new_post_path) do |builder|
+        builder.object.class.should == ::Post
+        builder.object_name.to_s.should == "post" # TODO: is this forced .to_s a bad assumption somewhere?
       end
     end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 01d63ea8b..f4c724cf9 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -37,14 +37,6 @@ module FormtasticSpecHelper
 
   include Formtastic::SemanticFormHelper
 
-  def rails3?
-    ActionPack::VERSION::MAJOR > 2
-  end
-
-  def rails2?
-    ActionPack::VERSION::MAJOR == 2
-  end
-
   def default_input_type(column_type, column_name = :generic_column_name)
     @new_post.stub!(column_name)
     @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => column_type)) unless column_type.nil?

From 59cc0d8e9211982967629d5775694643f1c2270f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 12 Jan 2011 22:28:23 +1100
Subject: [PATCH 417/992] remove Rails 2 from gemspec

---
 formtastic.gemspec | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 2e76e45af..2ab6e37b6 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -19,12 +19,10 @@ Gem::Specification.new do |s|
   ------------------------------------------------------------------------
   You can now (optionally) run the generator to copy some stylesheets and
   a config initializer into your application:
-    rails generate formtastic:install # Rails 3
-    ./script/generate formtastic      # Rails 2
+    rails generate formtastic:install
 
   To generate some semantic form markup for your existing models, just run:
-    rails generate formtastic:form MODEL_NAME # Rails 3
-    ./script/generate form MODEL_NAME         # Rails 2
+    rails generate formtastic:form MODEL_NAME
 
   Find out more and get involved:
     http://github.com/justinfrench/formtastic
@@ -35,15 +33,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}
 
-  s.add_dependency(%q<activesupport>, [">= 2.3.7"])
-  s.add_dependency(%q<actionpack>, [">= 2.3.7"])
-  s.add_dependency(%q<i18n>, ["~> 0.4"])
-  
-  if ENV['RAILS_2']
-    s.add_development_dependency(%q<rails>, ["~> 2.3.8"])
-  else
-    s.add_development_dependency(%q<rails>, [">= 3.0.0"])
-  end
+  s.add_dependency(%q<rails>, ["~> 3.0.0"])
+
   s.add_development_dependency(%q<rspec-rails>, ["~> 2.0.0"])
   s.add_development_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
   s.add_development_dependency(%q<hpricot>, ["~> 0.8.3"])

From 77bc8795e21a854853c1fd937fbd29690b2de6d7 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 12 Jan 2011 22:29:25 +1100
Subject: [PATCH 418/992] added twitter to gem install welcome note

---
 formtastic.gemspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 2ab6e37b6..011db2f9b 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
   Find out more and get involved:
     http://github.com/justinfrench/formtastic
     http://groups.google.com.au/group/formtastic
+    http://twitter.com/formtastic
   ========================================================================
   }
   s.rdoc_options = ["--charset=UTF-8"]

From 6ebc1703d1ed04227c64f2efa9e23697287c5411 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 12 Jan 2011 22:30:53 +1100
Subject: [PATCH 419/992] removed Rails 2 generators

---
 generators/form/USAGE                         |  16 ---
 generators/form/form_generator.rb             | 111 ------------------
 generators/formtastic/formtastic_generator.rb |  26 ----
 .../templates/rails2/_form.html.erb           |   5 -
 .../templates/rails2/_form.html.haml          |   4 -
 5 files changed, 162 deletions(-)
 delete mode 100644 generators/form/USAGE
 delete mode 100644 generators/form/form_generator.rb
 delete mode 100644 generators/formtastic/formtastic_generator.rb
 delete mode 100644 lib/generators/templates/rails2/_form.html.erb
 delete mode 100644 lib/generators/templates/rails2/_form.html.haml

diff --git a/generators/form/USAGE b/generators/form/USAGE
deleted file mode 100644
index 09e6bb4a0..000000000
--- a/generators/form/USAGE
+++ /dev/null
@@ -1,16 +0,0 @@
-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]
\ No newline at end of file
diff --git a/generators/form/form_generator.rb b/generators/form/form_generator.rb
deleted file mode 100644
index 7eba7b408..000000000
--- a/generators/form/form_generator.rb
+++ /dev/null
@@ -1,111 +0,0 @@
-# encoding: utf-8
-
-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 "_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, "_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
-
-    def save_to_clipboard(data)
-      return unless data
-
-      begin
-        case RUBY_PLATFORM
-        when /win32/
-          require 'win32/clipboard'
-          ::Win32::Clipboard.data = data
-        when /darwin/ # mac
-          `echo "#{data}" | pbcopy`
-        else # linux/unix
-          `echo "#{data}" | xsel --clipboard` || `echo "#{data}" | xclip`
-        end
-      rescue LoadError
-        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
-    
-    def source_root
-      File.expand_path('../../../lib/generators/templates/rails2', __FILE__)
-    end
-
-end
diff --git a/generators/formtastic/formtastic_generator.rb b/generators/formtastic/formtastic_generator.rb
deleted file mode 100644
index b06c0758f..000000000
--- a/generators/formtastic/formtastic_generator.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# encoding: utf-8
-
-class FormtasticGenerator < Rails::Generator::Base
-
-  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
-  
-  def source_root
-    File.expand_path('../../../lib/generators/templates', __FILE__)
-  end
-
-end
diff --git a/lib/generators/templates/rails2/_form.html.erb b/lib/generators/templates/rails2/_form.html.erb
deleted file mode 100644
index 1679580e0..000000000
--- a/lib/generators/templates/rails2/_form.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<%% f.inputs do %>
-<% attributes.each do |attribute| -%>
-  <%%= f.input :<%= attribute.name %> %>
-<% end -%>
-<%% end %>
diff --git a/lib/generators/templates/rails2/_form.html.haml b/lib/generators/templates/rails2/_form.html.haml
deleted file mode 100644
index c83eb24b8..000000000
--- a/lib/generators/templates/rails2/_form.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-- f.inputs do
-<% attributes.each do |attribute| -%>
-  = f.input :<%= attribute.name %>
-<% end -%>

From f232b75c42aebab8751de06fa9146b09f8372229 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 12 Jan 2011 22:32:37 +1100
Subject: [PATCH 420/992] it's always Rails 3 now

---
 lib/generators/templates/formtastic.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/generators/templates/formtastic.rb b/lib/generators/templates/formtastic.rb
index 3372c6fa5..78e21e358 100644
--- a/lib/generators/templates/formtastic.rb
+++ b/lib/generators/templates/formtastic.rb
@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 # --------------------------------------------------------------------------------------------------
-# Please note: If you're subclassing Formtastic::SemanticFormBuilder in a Rails 3 project, 
-# Formtastic uses class_attribute for these configuration attributes instead of the deprecated 
+# Please note: If you're subclassing Formtastic::SemanticFormBuilder, Formtastic uses 
+# class_attribute for these configuration attributes instead of the deprecated 
 # class_inheritable_attribute. The behaviour is slightly different with subclasses (especially 
 # around attributes with Hash or Array) values, so make sure you understand what's happening. 
 # See the documentation for class_attribute in ActiveSupport for more information.

From 96432878181b9b9cc79073667d97e08380df1b95 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 12 Jan 2011 22:35:55 +1100
Subject: [PATCH 421/992] remove rails/init.rb, which is Rails 2

---
 rails/init.rb | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 rails/init.rb

diff --git a/rails/init.rb b/rails/init.rb
deleted file mode 100644
index 35ff9fe5a..000000000
--- a/rails/init.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-# encoding: utf-8
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "init"))

From 2d3f08eeddb918b2491a4b3d93595f6f72e17127 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 12 Jan 2011 22:41:00 +1100
Subject: [PATCH 422/992] removed some Rails 2 stuff from formtastic/util.rb

---
 lib/formtastic/util.rb | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/formtastic/util.rb b/lib/formtastic/util.rb
index 11e2e786f..ee4ba0185 100644
--- a/lib/formtastic/util.rb
+++ b/lib/formtastic/util.rb
@@ -14,17 +14,12 @@ module Util
     # @return [String] `text`, marked as HTML-safe
     def html_safe(text)
       return text if text.nil?
-      return text.html_safe if defined?(ActiveSupport::SafeBuffer)
-      return text.html_safe! if text.respond_to?(:html_safe!)
+      return text.html_safe
       text
     end
 
     def rails_safe_buffer_class
-      # It's important that we check ActiveSupport first,
-      # because in Rails 2.3.6 ActionView::SafeBuffer exists
-      # but is a deprecated proxy object.
-      return ActiveSupport::SafeBuffer if defined?(ActiveSupport::SafeBuffer)
-      return ActionView::SafeBuffer
+      return ActiveSupport::SafeBuffer
     end
 
     def rails3?

From 8a0068267b2c36c9c27ef5dc946bb1a6be5f8460 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 12 Jan 2011 23:13:20 +1100
Subject: [PATCH 423/992] first pass removing rails 2 or conditional rails 3
 logic from formtastic.rb, including one rails 2 centric spec

---
 lib/formtastic.rb          | 36 ++++++++++++------------------------
 spec/commit_button_spec.rb | 18 ------------------
 2 files changed, 12 insertions(+), 42 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 381b22f5f..2ade8337b 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -342,11 +342,7 @@ def commit_button(*args)
       text = options.delete(:label) || args.shift
 
       if @object && (@object.respond_to?(:persisted?) || @object.respond_to?(:new_record?))
-        if @object.respond_to?(:persisted?) # ActiveModel
-          key = @object.persisted? ? :update : :create
-        else # Rails 2
-          key = @object.new_record? ? :create : :update
-        end
+        key = @object.persisted? ? :update : :create
 
         # Deal with some complications with ActiveRecord::Base.human_name and two name models (eg UserPost)
         # ActiveRecord::Base.human_name falls back to ActiveRecord::Base.name.humanize ("Userpost")
@@ -571,14 +567,14 @@ def inputs_for_nested_attributes(*args, &block) #:nodoc:
                                'but the block does not accept any argument.' if block.arity <= 0
           lambda do |f|
             contents = f.inputs(*args){ block.call(f) }
-            template.concat(contents) if ::Formtastic::Util.rails3?
-            contents
+            template.concat(contents)
+            contents # TODO: needed in Rails 3?
           end
         else
           lambda do |f|
             contents = f.inputs(*args)
-            template.concat(contents) if ::Formtastic::Util.rails3?
-            contents
+            template.concat(contents)
+            contents # TODO: needed in Rails 3?
           end
         end
 
@@ -1334,8 +1330,7 @@ def required_or_optional_string(required) #:nodoc:
       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:
+      # with nested attributes, it allows %i as interpolation option in :name. So you can do:
       #
       #   f.inputs :name => 'Task #%i', :for => :tasks
       #
@@ -1374,7 +1369,6 @@ def field_set_and_list_wrapping(*args, &block) #:nodoc:
           html_options.except(:builder, :parent)
         )
 
-        template.concat(fieldset) if block_given? && !Formtastic::Util.rails3?
         fieldset
       end
 
@@ -1676,8 +1670,8 @@ def validations_for(method, mode = :active)
       def default_string_options(method, type) #:nodoc:
         def get_maxlength_for(method)
           validation = validations_for(method).find do |validation|
-            (validation.respond_to?(:macro) && validation.macro == :validates_length_of) || # Rails 2 validation
-            (validation.respond_to?(:kind) && validation.kind == :length) # Rails 3 validator
+            (validation.respond_to?(:macro) && validation.macro == :validates_length_of) || # Rails 2 + 3 style validation
+            (validation.respond_to?(:kind) && validation.kind == :length) # Rails 3 style validator
           end
 
           if validation
@@ -1720,20 +1714,14 @@ def generate_html_id(method_name, value='input') #:nodoc:
         [@@custom_namespace, sanitized_object_name, index, sanitized_method_name, value].reject{|x|x.blank?}.join('_')
       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
+      # Gets the nested_child_index value from the parent builder. 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
+        child = parent[:for]
+        child = child.first if child.respond_to?(:first)
+        duck[child].to_i + 1
       end
 
       def sanitized_object_name #:nodoc:
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index 2f8b2c6e8..89c8f806e 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -10,24 +10,6 @@
     mock_everything
   end
 
-  describe 'when the object responds to :new_record? (Rails 2)' do
-
-    before do
-      @new_post.stub(:respond_to?).with(:to_model).and_return("X")
-      @new_post.stub(:respond_to?).with(:persisted?).and_return(false)
-      @new_post.stub(:respond_to?).with(:new_record?).and_return(true)
-    end
-
-    it 'should call :new_record?' do
-      @new_post.should_receive(:new_record?)
-      @new_post.should_not_receive(:persisted?)
-      semantic_form_for(@new_post) do |builder|
-        concat(builder.commit_button)
-      end
-    end
-
-  end
-
   describe 'when the object responds to :persisted? (ActiveModel)' do
 
     before do

From 7a473880f2c646ab4f55c20775a64a07c3ea8c7b Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 12 Jan 2011 23:21:06 +1100
Subject: [PATCH 424/992] remove rails 3 conditional stuff from specs and spec
 support

---
 spec/buttons_spec.rb                  | 32 +++++-----
 spec/commit_button_spec.rb            | 54 ++++++++---------
 spec/errors_spec.rb                   |  4 +-
 spec/form_helper_spec.rb              | 22 +++----
 spec/i18n_spec.rb                     | 10 ++--
 spec/include_blank_spec.rb            |  8 +--
 spec/input_spec.rb                    | 76 +++++++++++------------
 spec/inputs/boolean_input_spec.rb     | 16 ++---
 spec/inputs/check_boxes_input_spec.rb | 60 +++++++++----------
 spec/inputs/country_input_spec.rb     |  8 +--
 spec/inputs/date_input_spec.rb        | 14 ++---
 spec/inputs/datetime_input_spec.rb    | 26 ++++----
 spec/inputs/email_input_spec.rb       |  2 +-
 spec/inputs/file_input_spec.rb        |  2 +-
 spec/inputs/hidden_input_spec.rb      | 14 ++---
 spec/inputs/phone_input_spec.rb       |  2 +-
 spec/inputs/radio_input_spec.rb       | 36 +++++------
 spec/inputs/search_input_spec.rb      |  2 +-
 spec/inputs/select_input_spec.rb      | 86 +++++++++++++--------------
 spec/inputs/string_input_spec.rb      |  6 +-
 spec/inputs/text_input_spec.rb        | 18 +++---
 spec/inputs/time_input_spec.rb        | 26 ++++----
 spec/inputs/time_zone_input_spec.rb   | 10 ++--
 spec/inputs/url_input_spec.rb         |  2 +-
 spec/inputs_spec.rb                   | 73 +++++++++++------------
 spec/label_spec.rb                    |  4 +-
 spec/semantic_fields_for_spec.rb      |  6 +-
 spec/support/custom_macros.rb         | 84 +++++++++++++-------------
 spec/support/test_environment.rb      | 31 ++++------
 29 files changed, 363 insertions(+), 371 deletions(-)

diff --git a/spec/buttons_spec.rb b/spec/buttons_spec.rb
index a96651043..23aa11258 100644
--- a/spec/buttons_spec.rb
+++ b/spec/buttons_spec.rb
@@ -22,22 +22,22 @@
       end
 
       it 'should render a fieldset inside the form, with a class of "inputs"' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset.buttons")
       end
 
       it 'should render an ol inside the fieldset' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset.buttons ol")
       end
 
       it 'should render the contents of the block inside the ol' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset.buttons ol", /hello/)
       end
 
       it 'should not render a legend inside the fieldset' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should_not have_tag("form fieldset.buttons legend")
       end
     end
@@ -52,7 +52,7 @@
         end
       end
       it 'should render a fieldset inside the form' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset legend", /#{@legend_text}/)
       end
     end
@@ -68,7 +68,7 @@
         end
       end
       it 'should pass the options into the fieldset tag as attributes' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset##{@id_option}")
         output_buffer.should have_tag("form fieldset.#{@class_option}")
       end
@@ -87,32 +87,32 @@
       end
 
       it 'should render a form' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form')
       end
 
       it 'should render a buttons fieldset inside the form' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form fieldset.buttons')
       end
 
       it 'should not render a legend in the fieldset' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should_not have_tag('form fieldset.buttons legend')
       end
 
       it 'should render an ol in the fieldset' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form fieldset.buttons ol')
       end
 
       it 'should render a list item in the ol for each default button' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form fieldset.buttons ol li', :count => 1)
       end
 
       it 'should render a commit list item for the commit button' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form fieldset.buttons ol li.commit')
       end
 
@@ -127,7 +127,7 @@
       end
 
       it 'should render a form with a fieldset containing a list item for each button arg' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.buttons > ol > li', :count => 1)
         output_buffer.should have_tag('form > fieldset.buttons > ol > li.commit')
       end
@@ -143,18 +143,18 @@
       end
 
       it 'should render a form with a fieldset containing a list item for each button arg' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.buttons > ol > li', :count => 1)
         output_buffer.should have_tag('form > fieldset.buttons > ol > li.commit', :count => 1)
       end
 
       it 'should pass the options down to the fieldset' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset#my-id.buttons')
       end
 
       it 'should use the special :name option as a text for the legend tag' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset#my-id.buttons > legend', /Now click a button/)
       end
 
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index 89c8f806e..700040167 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -39,17 +39,17 @@
     end
 
     it 'should render a commit li' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('li.commit')
     end
 
     it 'should render an input with a type attribute of "submit"' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('li.commit input[@type="submit"]')
     end
 
     it 'should render an input with a name attribute of "commit"' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('li.commit input[@name="commit"]')
     end
 
@@ -59,7 +59,7 @@
         concat(builder.commit_button('text', :button_html => {:class => 'my_class', :id => 'my_id'}))
       end
 
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag('li.commit input#my_id')
       output_buffer.should have_tag('li.commit input.my_class')
     end
@@ -80,7 +80,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :button_html => {}))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag('li.commit input[@accesskey="s"]')
       end
     end
@@ -91,7 +91,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :accesskey => 'o'))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should_not have_tag('li.commit input[@accesskey="s"]')
         output_buffer.should have_tag('li.commit input[@accesskey="o"]')
       end
@@ -103,7 +103,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :accesskey => 'o', :button_html => {:accesskey => 't'}))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should_not have_tag('li.commit input[@accesskey="s"]')
         output_buffer.should_not have_tag('li.commit input[@accesskey="o"]')
         output_buffer.should have_tag('li.commit input[@accesskey="t"]')
@@ -122,12 +122,12 @@
     end
 
     it "should render the string as the value of the button" do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('li input[@value="a string"]')
     end
 
     it "should deal with the options hash" do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('li input.pretty')
     end
 
@@ -143,7 +143,7 @@
     end
 
     it "should deal with the options hash" do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('li input.pretty')
     end
 
@@ -158,7 +158,7 @@
           form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
             concat(builder.commit_button("Click!"))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag('li.commit input[@value="Click!"][@class~="submit"]')
         end
       end
@@ -177,7 +177,7 @@
             form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
             output_buffer.should have_tag('li.commit input[@value="Submit Post"][@class~="submit"]')
           end
         end
@@ -209,7 +209,7 @@
            form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
              concat(builder.commit_button)
            end
-           output_buffer.concat(form) if Formtastic::Util.rails3?
+           output_buffer.concat(form)
            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit Post"][@class~="submit"]})
          end
 
@@ -217,7 +217,7 @@
            form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
              concat(builder.commit_button)
            end
-           output_buffer.concat(form) if Formtastic::Util.rails3?
+           output_buffer.concat(form)
            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit"][@class~="submit"]})
          end
 
@@ -236,7 +236,7 @@
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.commit_button("Click!"))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag('li.commit input[@value="Click!"][@class~="create"]')
         end
       end
@@ -255,7 +255,7 @@
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
             output_buffer.should have_tag('li.commit input[@value="Create Post"][@class~="create"]')
           end
         end
@@ -287,7 +287,7 @@
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create Post"][@class~="create"]})
           end
 
@@ -295,7 +295,7 @@
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create"][@class~="create"]})
           end
 
@@ -314,7 +314,7 @@
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.commit_button("Click!"))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag('li.commit input[@value="Click!"][@class~="update"]')
         end
       end
@@ -333,7 +333,7 @@
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
             output_buffer.should have_tag('li.commit input[@value="Save Post"][@class~="update"]')
           end
         end
@@ -366,7 +366,7 @@
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save Post"][@class~="update"]})
           end
 
@@ -374,7 +374,7 @@
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save"][@class~="update"]})
             ::I18n.backend.store_translations :en, :formtastic => {}
           end
@@ -411,7 +411,7 @@ def self.human_name
     end
 
     it "should render the string as the value of the button" do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('li input[@value="Create User post"]')
     end
 
@@ -424,7 +424,7 @@ def self.human_name
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :wrapper_html => {:id => :another_id}))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form li#another_id")
       end
 
@@ -432,7 +432,7 @@ def self.human_name
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :wrapper_html => {:class => :another_class}))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form li.commit")
         output_buffer.should have_tag("form li.another_class")
       end
@@ -441,7 +441,7 @@ def self.human_name
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :wrapper_html => {:class => [ :my_class, :another_class ]}))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form li.commit")
         output_buffer.should have_tag("form li.my_class")
         output_buffer.should have_tag("form li.another_class")
@@ -453,7 +453,7 @@ def self.human_name
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text'))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form li.commit")
       end
     end
diff --git a/spec/errors_spec.rb b/spec/errors_spec.rb
index ff1721f7f..3961d83a1 100644
--- a/spec/errors_spec.rb
+++ b/spec/errors_spec.rb
@@ -142,7 +142,7 @@
           concat(builder.input(:document))
         end
       end 
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("li[@class='file optional error']")
       output_buffer.should have_tag('p.inline-errors', (['must be an image','must be provided', 'must be less than 4mb']).to_sentence)
     end
@@ -161,7 +161,7 @@
           concat(builder.input(:author))
         end
       end
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("ul.errors li", /must not be blank/, :count => 1)
       output_buffer.should have_tag("ul.errors li", /is already taken/, :count => 1)
     end
diff --git a/spec/form_helper_spec.rb b/spec/form_helper_spec.rb
index 1a27ba6bf..1bf37e754 100644
--- a/spec/form_helper_spec.rb
+++ b/spec/form_helper_spec.rb
@@ -21,7 +21,7 @@
     it 'adds a class of "formtastic" to the generated form' do
       form = semantic_form_for(@new_post, :url => '/hello') do |builder|
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form.formtastic")
     end
 
@@ -29,45 +29,45 @@
       ::Formtastic::SemanticFormHelper.default_form_class = 'xyz'
       form = semantic_form_for(::Post.new, :as => :post, :url => '/hello') do |builder|
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form.xyz")
     end
 
     it 'adds class matching the object name to the generated form when a symbol is provided' do
       form = semantic_form_for(@new_post, :url => '/hello') do |builder|
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form.post")
 
       form = semantic_form_for(:project, :url => '/hello') do |builder|
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form.project")
     end
 
     it 'adds class matching the :as option when provided' do
       form = semantic_form_for(@new_post, :as => :message, :url => '/hello') do |builder|
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form.message")
 
       form = semantic_form_for([:admins, @new_post], :as => :message, :url => '/hello') do |builder|
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form.message")
     end
 
     it 'adds class matching the object\'s class to the generated form when an object is provided' do
       form = semantic_form_for(@new_post) do |builder|
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form.post")
     end
 
     it 'adds a namespaced class to the generated form' do
       form = semantic_form_for(::Namespaced::Post.new, :url => '/hello') do |builder|
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form.namespaced_post")
     end
 
@@ -78,17 +78,17 @@
       end
 
       it 'to add a id of "something-special" to generated form' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form#something-special")
       end
 
       it 'to add a class of "something-extra" to generated form' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form.something-extra")
       end
 
       it 'to add enctype="multipart/form-data"' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form[@enctype="multipart/form-data"]')
       end
     end
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index 7ca7ede9f..48d06abbb 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -116,7 +116,7 @@
       form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:title))
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form label", /Hello post!/)
     end
 
@@ -124,7 +124,7 @@
       form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:title))
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form label", /Hello project!/)
     end
 
@@ -134,7 +134,7 @@
           concat(f.input(:name))
         end
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form label", /Hello task name!/)
     end
 
@@ -144,7 +144,7 @@
           concat(f.input(:name))
         end
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form label", /Hello line item name!/)
     end
 
@@ -152,7 +152,7 @@
       form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author))
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form label", /Written by/)
     end
 
diff --git a/spec/include_blank_spec.rb b/spec/include_blank_spec.rb
index c24f81157..c854d7b47 100644
--- a/spec/include_blank_spec.rb
+++ b/spec/include_blank_spec.rb
@@ -27,7 +27,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form li select option[@value='']", "")
       end
     end
@@ -38,7 +38,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should_not have_tag("form li select option[@value='']", "")
       end
     end
@@ -54,7 +54,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as, :include_blank => false))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should_not have_tag("form li select option[@value='']", "")
       end
     end
@@ -66,7 +66,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as, :include_blank => true))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form li select option[@value='']", "")
       end
     end
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 53b2eade2..422dde47b 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -79,7 +79,7 @@
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => true))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should_not have_tag('form li.optional')
           output_buffer.should have_tag('form li.required')
         end
@@ -88,7 +88,7 @@
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => true))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag('form li.required label', /#{@new_string}$/)
         end
 
@@ -109,7 +109,7 @@
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => false))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should_not have_tag('form li.required')
           output_buffer.should have_tag('form li.optional')
         end
@@ -118,7 +118,7 @@
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => false))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag('form li.optional label', /#{@string}$/)
         end
 
@@ -135,7 +135,7 @@
             form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
               concat(builder.input(:title))
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
             output_buffer.should_not have_tag('form li.required')
             output_buffer.should have_tag('form li.optional')
 
@@ -166,7 +166,7 @@
                   concat(builder.input(:title))
                   concat(builder.input(:body))
                 end
-                output_buffer.concat(form) if Formtastic::Util.rails3?
+                output_buffer.concat(form)
                 output_buffer.should have_tag('form li.required')
                 output_buffer.should_not have_tag('form li.optional')
               end
@@ -222,7 +222,7 @@ def should_be_required(options)
                 concat(builder.input(:body))
               end
 
-              output_buffer.concat(form) if Formtastic::Util.rails3?
+              output_buffer.concat(form)
 
               if options[:required]
                 output_buffer.should_not have_tag('form li.optional')
@@ -242,7 +242,7 @@ def should_be_required(options)
                 form = semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:title))
                 end
-                output_buffer.concat(form) if Formtastic::Util.rails3?
+                output_buffer.concat(form)
                 output_buffer.should_not have_tag('form li.required')
                 output_buffer.should have_tag('form li.optional')
               end
@@ -273,7 +273,7 @@ def should_be_required(options)
                   concat(builder.input(:title))
                   concat(builder.input(:body))
                 end
-                output_buffer.concat(form) if Formtastic::Util.rails3?
+                output_buffer.concat(form)
                 output_buffer.should have_tag('form li.required')
                 output_buffer.should_not have_tag('form li.optional')
               end
@@ -328,7 +328,7 @@ def should_be_required(options)
                 form = semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:published))
                 end
-                output_buffer.concat(form) if Formtastic::Util.rails3?
+                output_buffer.concat(form)
                 output_buffer.should have_tag('form li.required')
                 output_buffer.should_not have_tag('form li.optional')
               end
@@ -341,7 +341,7 @@ def should_be_required(options)
                 form = semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:published))
                 end
-                output_buffer.concat(form) if Formtastic::Util.rails3?
+                output_buffer.concat(form)
                 output_buffer.should_not have_tag('form li.required')
                 output_buffer.should have_tag('form li.optional')
               end
@@ -357,7 +357,7 @@ def should_be_required(options)
                 concat(builder.input(:body))
               end
 
-              output_buffer.concat(form) if Formtastic::Util.rails3?
+              output_buffer.concat(form)
 
               if options[:required]
                 output_buffer.should_not have_tag('form li.optional')
@@ -377,7 +377,7 @@ def should_be_required(options)
                 form = semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:title))
                 end
-                output_buffer.concat(form) if Formtastic::Util.rails3?
+                output_buffer.concat(form)
                 output_buffer.should_not have_tag('form li.required')
                 output_buffer.should have_tag('form li.optional')
               end
@@ -394,7 +394,7 @@ def should_be_required(options)
               form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title))
               end
-              output_buffer.concat(form) if Formtastic::Util.rails3?
+              output_buffer.concat(form)
               output_buffer.should_not have_tag('form li.required')
               output_buffer.should have_tag('form li.optional')
 
@@ -417,7 +417,7 @@ def should_be_required(options)
           form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
             concat(builder.input(:anything))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag('form li.string')
         end
 
@@ -427,7 +427,7 @@ def should_be_required(options)
             concat(builder.input(:password_confirmation))
             concat(builder.input(:confirm_password))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag('form li.password', :count => 3)
         end
 
@@ -577,7 +577,7 @@ def should_be_required(options)
             concat(builder.input(:title, :label => "Kustom"))
           end
 
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li label", /Kustom/)
         end
 
@@ -585,7 +585,7 @@ def should_be_required(options)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :label => false))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should_not have_tag("form li label")
         end
 
@@ -593,7 +593,7 @@ def should_be_required(options)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :label => "Kustom".freeze))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li label", /Kustom/)
         end
       end
@@ -612,7 +612,7 @@ def should_be_required(options)
                     concat(builder.input(:meta_description))
                   end
 
-                  output_buffer.concat(form) if Formtastic::Util.rails3?
+                  output_buffer.concat(form)
                   output_buffer.should have_tag('form li label', Regexp.new('^' + @localized_label_text))
                 end
               end
@@ -629,7 +629,7 @@ def should_be_required(options)
                 concat(builder.input(:meta_description))
               end
 
-              output_buffer.concat(form) if Formtastic::Util.rails3?
+              output_buffer.concat(form)
               output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
             end
           end
@@ -643,7 +643,7 @@ def should_be_required(options)
                 concat(builder.input(:meta_description))
               end
 
-              output_buffer.concat(form) if Formtastic::Util.rails3?
+              output_buffer.concat(form)
               output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
             end
           end
@@ -657,7 +657,7 @@ def should_be_required(options)
                   concat(builder.input(:meta_description))
                 end
 
-                output_buffer.concat(form) if Formtastic::Util.rails3?
+                output_buffer.concat(form)
                 output_buffer.should have_tag("form li label", /#{'meta_description'.capitalize}/)
               end
             end
@@ -687,7 +687,7 @@ def should_be_required(options)
               concat(builder.input(:title, :label => true))
               concat(builder.input(:published, :as => :boolean, :label => true))
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
             output_buffer.should have_tag('form li label', Regexp.new('^' + @localized_label_text))
           end
 
@@ -705,7 +705,7 @@ def should_be_required(options)
               concat(builder.input(:title, :label => true))
               concat(builder.input(:published, :as => :boolean, :label => true))
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
             output_buffer.should have_tag('form li label', Regexp.new('^' + @default_localized_label_text))
           end
         end
@@ -726,7 +726,7 @@ def should_be_required(options)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :hint => hint_text))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li p.inline-hints", hint_text)
         end
 
@@ -735,7 +735,7 @@ def should_be_required(options)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :hint => hint_text, :hint_class => 'custom-hint-class'))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li p.custom-hint-class", hint_text)
         end
 
@@ -745,7 +745,7 @@ def should_be_required(options)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :hint => hint_text))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li p.custom-hint-class", hint_text)
         end
       end
@@ -781,7 +781,7 @@ def should_be_required(options)
               form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => true))
               end
-              output_buffer.concat(form) if Formtastic::Util.rails3?
+              output_buffer.concat(form)
               output_buffer.should have_tag('form li p.inline-hints', @localized_hint_text)
             end
 
@@ -797,7 +797,7 @@ def should_be_required(options)
               form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => true, :hint_class => 'custom-hint-class'))
               end
-              output_buffer.concat(form) if Formtastic::Util.rails3?
+              output_buffer.concat(form)
               output_buffer.should have_tag('form li p.custom-hint-class', @localized_hint_text)
             end
 
@@ -805,7 +805,7 @@ def should_be_required(options)
               form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => true))
               end
-              output_buffer.concat(form) if Formtastic::Util.rails3?
+              output_buffer.concat(form)
               output_buffer.should have_tag('form li p.inline-hints', @default_localized_hint_text)
             end
           end
@@ -815,7 +815,7 @@ def should_be_required(options)
               form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => false))
               end
-              output_buffer.concat(form) if Formtastic::Util.rails3?
+              output_buffer.concat(form)
               output_buffer.should_not have_tag('form li p.inline-hints', @localized_hint_text)
             end
           end
@@ -843,7 +843,7 @@ def should_be_required(options)
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:title))
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
             output_buffer.should_not have_tag('form li p.inline-hints')
           end
         end
@@ -858,7 +858,7 @@ def should_be_required(options)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :wrapper_html => {:id => :another_id}))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li#another_id")
         end
 
@@ -866,7 +866,7 @@ def should_be_required(options)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :wrapper_html => {:class => :another_class}, :required => true))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li.string")
           output_buffer.should have_tag("form li.required")
           output_buffer.should have_tag("form li.another_class")
@@ -876,7 +876,7 @@ def should_be_required(options)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :wrapper_html => {:class => [ :my_class, :another_class ]}))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li.string")
           output_buffer.should have_tag("form li.my_class")
           output_buffer.should have_tag("form li.another_class")
@@ -888,7 +888,7 @@ def should_be_required(options)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li#post_title_input")
           output_buffer.should have_tag("form li.string")
         end
@@ -907,7 +907,7 @@ def should_be_required(options)
         concat(builder.input(:title, my_options))
         concat(builder.input(:publish_at, my_options))
       end
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       
       output_buffer.should have_tag 'li.string', :count => 2
     end
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index 3ded0a0a3..c6840b68f 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -19,7 +19,7 @@
   it_should_apply_error_logic_for_input_type(:boolean)
 
   it 'should generate a label containing the input' do
-    output_buffer.concat(@form) if Formtastic::Util.rails3?
+    output_buffer.concat(@form)
     output_buffer.should have_tag('form li label', :count => 1)
     output_buffer.should have_tag('form li label[@for="post_allow_comments"]')
     output_buffer.should have_tag('form li label', /Allow comments/)
@@ -29,7 +29,7 @@
   end
 
   it 'should generate a checkbox input' do
-    output_buffer.concat(@form) if Formtastic::Util.rails3?
+    output_buffer.concat(@form)
     output_buffer.should have_tag('form li label input')
     output_buffer.should have_tag('form li label input#post_allow_comments')
     output_buffer.should have_tag('form li label input[@type="checkbox"]')
@@ -38,7 +38,7 @@
   end
   
   it 'should generate a checked input if object.method returns true' do
-    output_buffer.concat(@form) if Formtastic::Util.rails3?
+    output_buffer.concat(@form)
     output_buffer.should have_tag('form li label input[@checked="checked"]')
     output_buffer.should have_tag('form li input[@name="post[allow_comments]"]', :count => 2)
     output_buffer.should have_tag('form li input#post_allow_comments', :count => 1)
@@ -49,7 +49,7 @@
       concat(builder.input(:answer_comments, :as => :boolean, :input_html => {:checked => 'checked'}))
     end
 
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should have_tag('form li label input[@checked="checked"]')
   end
   
@@ -58,7 +58,7 @@
       concat(builder.input(:allow_comments, :as => :boolean, :input_html => {:disabled => 'disabled'}))
     end
     
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should have_tag('form li label input[@disabled="disabled"]')
   end
   
@@ -67,7 +67,7 @@
       concat(builder.input(:allow_comments, :as => :boolean, :input_html => {:id => 'custom_id'}))
     end
     
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should have_tag('form li label input[@id="custom_id"]')
     output_buffer.should have_tag('form li label[@for="custom_id"]')
   end
@@ -77,7 +77,7 @@
       concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'checked', :unchecked_value => 'unchecked'))
     end
 
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should have_tag('form li label input[@type="checkbox"][@value="checked"]:not([@unchecked_value][@checked_value])')
     output_buffer.should have_tag('form li input[@type="hidden"][@value="unchecked"]')
     output_buffer.should_not have_tag('form li label input[@type="hidden"]') # invalid HTML5
@@ -88,7 +88,7 @@
       concat(builder.input(:allow_comments, :as => :boolean))
     end
 
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
 
     output_buffer.should have_tag('form li label[@for="project_allow_comments"]')
     output_buffer.should have_tag('form li label', /Allow comments/)
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 0a886a665..de9a3aa02 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -23,46 +23,46 @@
     it_should_use_the_collection_when_provided(:check_boxes, 'input[@type="checkbox"]')
 
     it 'should generate a legend containing a label with text for the input' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li fieldset legend.label label')
       output_buffer.should have_tag('form li fieldset legend.label label', /Posts/)
     end
 
     it 'should not link the label within the legend to any input' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should_not have_tag('form li fieldset legend label[@for^="author_post_ids_"]')
     end
 
     it 'should generate an ordered list with a list item for each choice' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li fieldset ol')
       output_buffer.should have_tag('form li fieldset ol li input[@type=checkbox]', :count => ::Post.all.size)
     end
 
     it 'should have one option with a "checked" attribute' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li input[@checked]', :count => 1)
     end
 
     it 'should not generate hidden inputs with default value blank' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should_not have_tag("form li fieldset ol li label input[@type='hidden'][@value='']")
     end
 
     it 'should not render hidden inputs inside the ol' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should_not have_tag("form li fieldset ol li input[@type='hidden']")
     end
 
     it 'should render one hidden input for each choice outside the ol' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li fieldset > input[@type='hidden']", :count => 1)
     end
 
     describe "each choice" do
 
       it 'should contain a label for the radio input with a nested input and label text' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         ::Post.all.each do |post|
           output_buffer.should have_tag('form li fieldset ol li label', /#{post.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='author_post_ids_#{post.id}']")
@@ -70,14 +70,14 @@
       end
 
       it 'should use values as li.class when value_as_class is true' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         ::Post.all.each do |post|
           output_buffer.should have_tag("form li fieldset ol li.post_#{post.id} label")
         end
       end
 
       it 'should have a checkbox input but no hidden field for each post' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         ::Post.all.each do |post|
           output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@name='author[post_ids][]']", :count => 1)
@@ -85,17 +85,17 @@
       end
 
       it 'should have a hidden field with an empty array value for the collection to allow clearing of all checkboxes' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li fieldset > input[@type=hidden][@name='author[post_ids][]'][@value='']", :count => 1)
       end
 
       it 'the hidden field with an empty array value should be followed by the ol' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li fieldset > input[@type=hidden][@name='author[post_ids][]'][@value=''] + ol", :count => 1)
       end
 
       it 'should not have a hidden field with an empty string value for the collection' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should_not have_tag("form li fieldset > input[@type=hidden][@name='author[post_ids]'][@value='']", :count => 1)
       end
 
@@ -105,7 +105,7 @@
         form = semantic_form_for(@fred) do |builder|
           concat(builder.input(:posts, :as => :check_boxes, :hidden_fields => true, :value_as_class => true))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
 
         ::Post.all.each do |post|
           output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
@@ -116,7 +116,7 @@
 
       it "should mark input as checked if it's the the existing choice" do
         ::Post.all.include?(@fred.posts.first).should be_true
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
       end
     end
@@ -130,17 +130,17 @@
       end
 
       it 'should generate a fieldset with legend' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form li fieldset legend', /Author/)
       end
 
       it 'shold generate an li tag for each item in the collection' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form li fieldset ol li input[@type=checkbox]', :count => ::Author.all.size)
       end
 
       it 'should generate labels for each item' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='project_author_id_#{author.id}']")
@@ -148,7 +148,7 @@
       end
 
       it 'should generate inputs for each item' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#project_author_id_#{author.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@type='checkbox']")
@@ -161,7 +161,7 @@
         form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:author_id, :as => :check_boxes, :collection => [["<b>Item 1</b>", 1], ["<b>Item 2</b>", 2]]))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
 
         ## This should work, but it's emits deprecation warnings under Rails 2
         ## TODO: revisit in 2.0 when we drop Rails 2. Simpler test follows.
@@ -180,7 +180,7 @@
         form = semantic_form_for(@fred) do |builder|
           concat(builder.input(:posts, :as => :check_boxes, :value_as_class => true, :hidden_fields => false))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
       end
 
       it 'should have a checkbox input for each post' do
@@ -215,7 +215,7 @@
         end
 
         it 'should not have any disabled item(s)' do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.concat(@form)
           output_buffer.should_not have_tag("form li fieldset ol li label input[@disabled='disabled']")
         end
       end
@@ -230,7 +230,7 @@
         end
 
         it "should have one item disabled; the specified one" do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.concat(@form)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 1)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@fred.id}']")
@@ -247,7 +247,7 @@
         end
 
         it "should have multiple items disabled; the specified ones" do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.concat(@form)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 2)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@bob.id}']", /bob/i)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@bob.id}']")
@@ -276,7 +276,7 @@
       end
 
       it "should do foo" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("legend.label label", /Translated/)
       end
 
@@ -291,7 +291,7 @@
       end
 
       it "should output the correct label title" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("legend.label label", /The authors/)
       end
     end
@@ -306,7 +306,7 @@
       end
 
       it "should not output the legend" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should_not have_tag("legend.label")
       end
     end
@@ -320,7 +320,7 @@
       end
 
       it "should output the correct label title" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("legend.label label abbr")
       end
     end
@@ -336,7 +336,7 @@
       @form = semantic_form_for(@freds_post) do |builder|
         concat(builder.input(:authors, :as => :check_boxes))
       end
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
     end
 
     it 'should render checkboxes' do
@@ -370,7 +370,7 @@
           concat(builder.input(:author, :as => :check_boxes, :value_method => :custom_value, :collection => [item, item, item]))
         end
 
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('input[@type=checkbox][@value="custom_value"]', :count => 3)
       end
     end
diff --git a/spec/inputs/country_input_spec.rb b/spec/inputs/country_input_spec.rb
index 4a13b6adb..cb5d54eb6 100644
--- a/spec/inputs/country_input_spec.rb
+++ b/spec/inputs/country_input_spec.rb
@@ -38,14 +38,14 @@
     #it_should_apply_error_logic_for_input_type(:country)
 
     it 'should generate a label for the input' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li label')
       output_buffer.should have_tag('form li label[@for="post_country"]')
       output_buffer.should have_tag('form li label', /Country/)
     end
 
     it "should generate a select" do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select")
     end
 
@@ -108,7 +108,7 @@
       end
 
       it "should render a country input" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag "form li.country"
       end
     end
@@ -123,7 +123,7 @@
       end
 
       it "should render a country input" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should_not have_tag "form li.country"
         output_buffer.should have_tag "form li.string", :count => 2
       end
diff --git a/spec/inputs/date_input_spec.rb b/spec/inputs/date_input_spec.rb
index 6248f85f4..e01094fcb 100644
--- a/spec/inputs/date_input_spec.rb
+++ b/spec/inputs/date_input_spec.rb
@@ -25,12 +25,12 @@
     it_should_apply_error_logic_for_input_type(:date)
 
     it 'should have a legend and label with the label text inside the fieldset' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.date fieldset legend.label label', /Publish at/)
     end
 
     it 'should associate the legend label with the first select' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.date fieldset legend.label')
       output_buffer.should have_tag('form li.date fieldset legend.label label')
       output_buffer.should have_tag('form li.date fieldset legend.label label[@for]')
@@ -38,13 +38,13 @@
     end
 
     it 'should have an ordered list of three items inside the fieldset' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.date fieldset ol')
       output_buffer.should have_tag('form li.date fieldset ol li', :count => 3)
     end
 
     it 'should have three labels for year, month and day' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.date fieldset ol li label', :count => 3)
       output_buffer.should have_tag('form li.date fieldset ol li label', /year/i)
       output_buffer.should have_tag('form li.date fieldset ol li label', /month/i)
@@ -52,7 +52,7 @@
     end
 
     it 'should have three selects for year, month and day' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.date fieldset ol li select', :count => 3)
     end
   end
@@ -81,7 +81,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :date, :labels => { field => "another #{field} label" }))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag('form li.date fieldset ol li label', :count => fields.length)
         fields.each do |f|
           output_buffer.should have_tag('form li.date fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
@@ -93,7 +93,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :date, :labels => { field => "" }))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag('form li.date fieldset ol li label', :count => fields.length-1)
         fields.each do |f|
           output_buffer.should have_tag('form li.date fieldset ol li label', /#{f}/i) unless field == f
diff --git a/spec/inputs/datetime_input_spec.rb b/spec/inputs/datetime_input_spec.rb
index 3c8b0f225..8495bb827 100644
--- a/spec/inputs/datetime_input_spec.rb
+++ b/spec/inputs/datetime_input_spec.rb
@@ -30,23 +30,23 @@
     it_should_apply_error_logic_for_input_type(:datetime)
 
     it 'should have a legend and label with the label text inside the fieldset' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.datetime fieldset legend.label label', /Publish at/)
     end
 
     it 'should associate the legend label with the first select' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.datetime fieldset legend.label label[@for="post_publish_at_1i"]')
     end
 
     it 'should have an ordered list of five items inside the fieldset' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.datetime fieldset ol')
       output_buffer.should have_tag('form li.datetime fieldset ol li', :count => 5)
     end
 
     it 'should have five labels for year, month, day, hour and minute' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => 5)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /year/i)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /month/i)
@@ -56,7 +56,7 @@
     end
 
     it 'should have five selects for year, month, day, hour and minute' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.datetime fieldset ol li select', :count => 5)
     end
 
@@ -67,7 +67,7 @@
         end
         concat(fields)
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
 
       1.upto(5) do |i|
         output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_10_created_at_#{i}i']")
@@ -83,7 +83,7 @@
         concat(builder.input(:publish_at, :as => :datetime, :discard_day => true))
       end
 
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form li input[@type='hidden'][@value='27']")
     end
   end
@@ -142,7 +142,7 @@
     end
 
     it 'should have translated labels for year, month, day, hour and minute' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Year/)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Month/)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Day/)
@@ -160,17 +160,17 @@
     end
 
     it 'should have fieldset with legend - classified as a label' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.datetime fieldset legend.label', /Publish at/)
     end
 
     it 'should have labels for each input' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => 5)
     end
 
     it 'should have selects for each inputs' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.datetime fieldset ol li select', :count => 5)
     end
   end
@@ -214,7 +214,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :datetime, :labels => { field => "another #{field} label" }))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => fields.length)
         fields.each do |f|
           output_buffer.should have_tag('form li.datetime fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
@@ -226,7 +226,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :datetime, :labels => { field => "" }))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => fields.length-1)
         fields.each do |f|
           output_buffer.should have_tag('form li.datetime fieldset ol li label', /#{f}/i) unless field == f
diff --git a/spec/inputs/email_input_spec.rb b/spec/inputs/email_input_spec.rb
index 6ade6d68f..c7a6368f1 100644
--- a/spec/inputs/email_input_spec.rb
+++ b/spec/inputs/email_input_spec.rb
@@ -22,7 +22,7 @@
     it_should_have_label_with_text(/Email/)
     it_should_have_label_for("post_email")
     it_should_have_input_with_id("post_email")
-    it_should_have_input_with_type(Formtastic::Util.rails3? ? :email : :text)
+    it_should_have_input_with_type(:email)
     it_should_have_input_with_name("post[email]")
 
   end
diff --git a/spec/inputs/file_input_spec.rb b/spec/inputs/file_input_spec.rb
index b4fbe49b4..e65e3b8c7 100644
--- a/spec/inputs/file_input_spec.rb
+++ b/spec/inputs/file_input_spec.rb
@@ -26,7 +26,7 @@
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :file, :input_html => { :class => 'myclass' }))
     end
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should have_tag("form li input.myclass")
   end
 
diff --git a/spec/inputs/hidden_input_spec.rb b/spec/inputs/hidden_input_spec.rb
index 38fefe988..5ab5bc824 100644
--- a/spec/inputs/hidden_input_spec.rb
+++ b/spec/inputs/hidden_input_spec.rb
@@ -23,30 +23,30 @@
   it_should_not_have_a_label
 
   it "should generate a input field" do
-    output_buffer.concat(@form) if Formtastic::Util.rails3?
+    output_buffer.concat(@form)
     output_buffer.should have_tag("form li input#post_secret")
     output_buffer.should have_tag("form li input#post_secret[@type=\"hidden\"]")
     output_buffer.should have_tag("form li input#post_secret[@name=\"post[secret]\"]")
   end
 
   it "should pass any explicitly specified value - using :value" do
-    output_buffer.concat(@form) if Formtastic::Util.rails3?
+    output_buffer.concat(@form)
     output_buffer.should have_tag("form li input#post_author_id[@type=\"hidden\"][@value=\"99\"]")
   end
 
   # Handle Formtastic :input_html options for consistency.
   it "should pass any explicitly specified value - using :input_html options" do
-    output_buffer.concat(@form) if Formtastic::Util.rails3?
+    output_buffer.concat(@form)
     output_buffer.should have_tag("form li input#post_published[@type=\"hidden\"][@value=\"true\"]")
   end
 
   it "should pass any option specified using :input_html" do
-    output_buffer.concat(@form) if Formtastic::Util.rails3?
+    output_buffer.concat(@form)
     output_buffer.should have_tag("form li input#new_post_reviewer[@type=\"hidden\"][@class=\"new_post_reviewer\"]")
   end
 
   it "should prefer :input_html over directly supplied options" do
-    output_buffer.concat(@form) if Formtastic::Util.rails3?
+    output_buffer.concat(@form)
     output_buffer.should have_tag("form li input#post_author[@type=\"hidden\"][@value=\"formtastic_value\"]")
   end
 
@@ -59,7 +59,7 @@
       concat(builder.input(:secret, :as => :hidden))
     end
 
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should_not have_tag("form li p.inline-errors")
     output_buffer.should_not have_tag("form li ul.errors")
   end
@@ -69,7 +69,7 @@
       concat(builder.input(:secret, :as => :hidden, :hint => "all your base are belong to use"))
     end
 
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should_not have_tag("form li p.inline-hints")
     output_buffer.should_not have_tag("form li ul.hints")
   end
diff --git a/spec/inputs/phone_input_spec.rb b/spec/inputs/phone_input_spec.rb
index bc1663839..b7bfd39c5 100644
--- a/spec/inputs/phone_input_spec.rb
+++ b/spec/inputs/phone_input_spec.rb
@@ -22,7 +22,7 @@
     it_should_have_label_with_text(/Phone/)
     it_should_have_label_for("post_phone")
     it_should_have_input_with_id("post_phone")
-    it_should_have_input_with_type(Formtastic::Util.rails3? ? :tel : :text)
+    it_should_have_input_with_type(:tel)
     it_should_have_input_with_name("post[phone]")
 
   end
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index adfc025f9..593e6588f 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -24,31 +24,31 @@
     it_should_use_the_collection_when_provided(:radio, 'input')
 
     it 'should generate a legend containing a label with text for the input' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li fieldset legend.label label')
       output_buffer.should have_tag('form li fieldset legend.label label', /Author/)
     end
 
     it 'should not link the label within the legend to any input' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should_not have_tag('form li fieldset legend label[@for]')
     end
 
     it 'should generate an ordered list with a list item for each choice' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li fieldset ol')
       output_buffer.should have_tag('form li fieldset ol li', :count => ::Author.all.size)
     end
 
     it 'should have one option with a "checked" attribute' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li input[@checked]', :count => 1)
     end
 
     describe "each choice" do
 
       it 'should contain a label for the radio input with a nested input and label text' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_id_#{author.id}']")
@@ -56,14 +56,14 @@
       end
 
       it 'should use values as li.class when value_as_class is true' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag("form li fieldset ol li.author_#{author.id} label")
         end
       end
 
       it "should have a radio input" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#post_author_id_#{author.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@type='radio']")
@@ -81,7 +81,7 @@
           concat(builder.input(:author, :as => :radio))
         end
 
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
       end
 
@@ -91,7 +91,7 @@
           concat(builder.input(:author, :as => :radio))
         end
 
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should_not have_tag("form li fieldset ol li input[@find_options]")
       end
 
@@ -106,17 +106,17 @@
       end
 
       it 'should generate a fieldset with legend' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form li fieldset legend', /Author/)
       end
 
       it 'should generate an li tag for each item in the collection' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form li fieldset ol li', :count => ::Author.all.size)
       end
 
       it 'should generate labels for each item' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='project_author_id_#{author.id}']")
@@ -128,14 +128,14 @@
         form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:author_id, :as => :radio, :collection => [["<b>Item 1</b>", 1], ["<b>Item 2</b>", 2]]))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag('form li fieldset ol li label') do |label|
           label.body.should match /&lt;b&gt;Item [12]&lt;\/b&gt;$/
         end
       end
 
       it 'should generate inputs for each item' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#project_author_id_#{author.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@type='radio']")
@@ -164,7 +164,7 @@
     end
 
     it "should do foo" do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("legend.label label", /Translated/)
     end
 
@@ -179,7 +179,7 @@
     end
 
     it "should output the correct label title" do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("legend.label label", /The authors/)
     end
   end
@@ -194,7 +194,7 @@
     end
 
     it "should not output the legend" do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should_not have_tag("legend.label")
     end
   end
@@ -208,7 +208,7 @@
     end
 
     it "should output the correct label title" do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("legend.label label abbr")
     end
   end
diff --git a/spec/inputs/search_input_spec.rb b/spec/inputs/search_input_spec.rb
index d3ee2cd6e..a7ab3ef09 100644
--- a/spec/inputs/search_input_spec.rb
+++ b/spec/inputs/search_input_spec.rb
@@ -22,7 +22,7 @@
     it_should_have_label_with_text(/Search/)
     it_should_have_label_for("post_search")
     it_should_have_input_with_id("post_search")
-    it_should_have_input_with_type(Formtastic::Util.rails3? ? :search : :text)
+    it_should_have_input_with_type(:search)
     it_should_have_input_with_name("post[search]")
 
   end
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index a06af0f56..28a7ced0b 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -22,7 +22,7 @@
       end
 
       it 'should have a option for each key and/or value' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         @array_with_values.each do |v|
           output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
         end
@@ -41,7 +41,7 @@
       end
 
       it 'should have an option for each value' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         @range_with_values.each do |v|
           output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
         end
@@ -57,7 +57,7 @@
       end
 
       it 'should render select options using provided HTML string' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         2.times do |v|
           output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
         end
@@ -82,7 +82,7 @@
       end
 
       it 'should render a select with at least options: true/false' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select option[@value='true']", /^Yes$/)
         output_buffer.should have_tag("form li select option[@value='false']", /^No$/)
       end
@@ -103,7 +103,7 @@
       end
 
       it 'should render a select with at least options: true/false' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select option[@value='true']", /#{@boolean_select_labels[:yes]}/)
         output_buffer.should have_tag("form li select option[@value='false']", /#{@boolean_select_labels[:no]}/)
       end
@@ -127,36 +127,36 @@
     it_should_use_the_collection_when_provided(:select, 'option')
 
     it 'should have a select inside the wrapper' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#post_author_id')
       output_buffer.should have_tag('form li select#post_reviewer_id')
     end
 
     it 'should have a valid name' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select[@name='post[author_id]']")
       output_buffer.should_not have_tag("form li select[@name='post[author_id][]']")
       output_buffer.should_not have_tag("form li select[@name='post[reviewer_id][]']")
     end
 
     it 'should not create a multi-select' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should_not have_tag('form li select[@multiple]')
     end
 
     it 'should create a select without size' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should_not have_tag('form li select[@size]')
     end
 
     it 'should have a blank option' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select option[@value='']")
     end
 
     it 'should have a select option for each Author' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select[@name='post[author_id]'] option", :count => ::Author.all.size + 1)
       ::Author.all.each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
@@ -164,7 +164,7 @@
     end
 
     it 'should have one option with a "selected" attribute' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select[@name='post[author_id]'] option[@selected]", :count => 1)
     end
 
@@ -177,7 +177,7 @@
         concat(builder.input(:author_status, :as => :select))
       end
 
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag('form li select#post_author_status_id')
     end
   end
@@ -255,33 +255,33 @@
 
     0.upto(1) do |i|
       it 'should have all option groups and the right values' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select optgroup[@label='#{@continent_names[i]}']", @authors[i].to_label)
       end
 
       it 'should have custom group labels' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select optgroup[@label='#{@continents[i].id}']", @authors[i].to_label)
       end
 
       it 'should have custom author labels' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select optgroup[@label='#{@continent_names[i]}']", @authors[i].login)
       end
 
       it 'should have custom author and group labels' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select optgroup[@label='#{@continents[i].id}']", @authors[i].login)
       end
     end
 
     it 'should have no duplicate groups' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select optgroup', :count => 8)
     end
 
     it 'should sort the groups on the label method' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select optgroup[@label='Africa']")
       output_buffer.should have_tag("form li select optgroup[@label='99']")
     end
@@ -311,18 +311,18 @@
     it_should_use_the_collection_when_provided(:select, 'option')
 
     it 'should have a select inside the wrapper' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#author_post_ids')
     end
 
     it 'should have a multi-select select' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select[@multiple="multiple"]')
     end
 
     it 'should have a select option for each Post' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select option', :count => ::Post.all.size)
       ::Post.all.each do |post|
         output_buffer.should have_tag("form li select option[@value='#{post.id}']", /#{post.to_label}/)
@@ -330,7 +330,7 @@
     end
 
     it 'should not have a blank option by default' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should_not have_tag("form li select option[@value='']")
     end
 
@@ -339,7 +339,7 @@
         concat(builder.input(:posts, :as => :select, :multiple => false, :include_blank => true))
       end
 
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select option[@value='']")
     end
 
@@ -348,12 +348,12 @@
         concat(builder.input(:posts, :as => :select, :multiple => true, :include_blank => true))
       end
 
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select option[@value='']")
     end
 
     it 'should have one option with a "selected" attribute' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select option[@selected]', :count => 1)
     end
   end
@@ -374,18 +374,18 @@
     it_should_use_the_collection_when_provided(:select, 'option')
 
     it 'should have a select inside the wrapper' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#post_author_ids')
     end
 
     it 'should have a multi-select select' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select[@multiple="multiple"]')
     end
 
     it 'should have a select option for each Author' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select option', :count => ::Author.all.size)
       ::Author.all.each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
@@ -393,7 +393,7 @@
     end
 
     it 'should not have a blank option by default' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should_not have_tag("form li select option[@value='']")
     end
 
@@ -402,7 +402,7 @@
         concat(builder.input(:authors, :as => :select, :multiple => false, :include_blank => true))
       end
 
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select option[@value='']")
     end
 
@@ -411,12 +411,12 @@
         concat(builder.input(:authors, :as => :select, :multiple => true, :include_blank => true))
       end
 
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select option[@value='']")
     end
 
     it 'should have one option with a "selected" attribute' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select option[@selected]', :count => 1)
     end
   end
@@ -430,12 +430,12 @@
     end
 
     it 'should have a select with prompt' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select option[@value='']", /choose author/)
     end
 
     it 'should not have a blank select option' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should_not have_tag("form li select option[@value='']", "")
     end
   end
@@ -448,19 +448,19 @@
     end
 
     it 'should generate label' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li label', /Author/)
       output_buffer.should have_tag("form li label[@for='project_author']")
     end
 
     it 'should generate select inputs' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select#project_author')
       output_buffer.should have_tag('form li select option', :count => ::Author.all.size + 1)
     end
 
     it 'should generate an option to each item' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       ::Author.all.each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
       end
@@ -478,7 +478,7 @@
     end
 
     it 'should generate an option to each item' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       @grouped_opts.each do |opt_pair|
         output_buffer.should have_tag("form li select optgroup[@label='#{opt_pair[0]}']")
         opt_pair[1].each do |v|
@@ -508,8 +508,8 @@
       end
 
       it "should render a select field" do
-        output_buffer.concat(@form_new_post) if Formtastic::Util.rails3?
-        output_buffer.concat(@form_project) if Formtastic::Util.rails3?
+        output_buffer.concat(@form_new_post)
+        output_buffer.concat(@form_project)
         output_buffer.should have_tag("form li select", :count => 2)
       end
     end
@@ -526,8 +526,8 @@
       end
 
       it "should render a text field" do
-        output_buffer.concat(@form_new_post) if Formtastic::Util.rails3?
-        output_buffer.concat(@form_project) if Formtastic::Util.rails3?
+        output_buffer.concat(@form_new_post)
+        output_buffer.concat(@form_project)
         output_buffer.should have_tag("form li input[@type='text']", :count => 2)
       end
     end
diff --git a/spec/inputs/string_input_spec.rb b/spec/inputs/string_input_spec.rb
index 21313c7ce..c0d293cf6 100644
--- a/spec/inputs/string_input_spec.rb
+++ b/spec/inputs/string_input_spec.rb
@@ -35,7 +35,7 @@ def input_field_for_method_should_have_maxlength(method, maxlength)
       form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(method))
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag("form li input[@maxlength='#{maxlength}']")
     end
 
@@ -87,7 +87,7 @@ def should_have_maxlength(maxlength, options)
             concat(builder.input(:title))
           end
 
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li input##{@new_post.class.name.underscore}_title[@maxlength='#{maxlength}']")
         end
 
@@ -173,7 +173,7 @@ def should_have_maxlength(maxlength, options)
     end
 
     it "should have no size attribute" do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should_not have_tag("input[@size]")
     end
   end
diff --git a/spec/inputs/text_input_spec.rb b/spec/inputs/text_input_spec.rb
index d937089bc..e390e66d8 100644
--- a/spec/inputs/text_input_spec.rb
+++ b/spec/inputs/text_input_spec.rb
@@ -27,7 +27,7 @@
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :class => 'myclass' }))
     end
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should have_tag("form li textarea.myclass")
   end
 
@@ -36,7 +36,7 @@
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :cols => 42 }))
     end
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should have_tag("form li textarea[@cols='42']")
   end
 
@@ -45,7 +45,7 @@
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :cols => nil }))
     end
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should_not have_tag("form li textarea[@cols]")
   end
 
@@ -54,7 +54,7 @@
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :rows => 42 }))
     end
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should have_tag("form li textarea[@rows='42']")
 
   end
@@ -64,7 +64,7 @@
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :rows => nil }))
     end
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should_not have_tag("form li textarea[@rows]")
   end
 
@@ -95,7 +95,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :text))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form li textarea[@rows='12']")
       end
     end
@@ -105,7 +105,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :text))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should_not have_tag("form li textarea[@rows]")
       end
 
@@ -122,7 +122,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :text))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form li textarea[@cols='10']")
       end
     end
@@ -132,7 +132,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :text))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should_not have_tag("form li textarea[@cols]")
       end
 
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index 7ad220efa..c073e2f91 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -24,14 +24,14 @@
       end
 
       it 'should not have an input for day, month and year' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should_not have_tag('#post_publish_at_1i')
         output_buffer.should_not have_tag('#post_publish_at_2i')
         output_buffer.should_not have_tag('#post_publish_at_3i')
       end
 
       it 'should have an input for hour and minute' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('#post_publish_at_4i')
         output_buffer.should have_tag('#post_publish_at_5i')
       end
@@ -51,30 +51,30 @@
       it_should_apply_error_logic_for_input_type(:time)
 
       it 'should have a legend and label with the label text inside the fieldset' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset legend.label label', /Publish at/)
       end
 
       it 'should associate the legend label with the first select' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset legend.label label[@for="post_publish_at_1i"]')
       end
 
       it 'should have an ordered list of two items inside the fieldset' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset ol')
         output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
       end
 
       it 'should have five labels for hour and minute' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => 2)
         output_buffer.should have_tag('form li.time fieldset ol li label', /hour/i)
         output_buffer.should have_tag('form li.time fieldset ol li label', /minute/i)
       end
 
       it 'should have two selects for hour and minute' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
       end
     end
@@ -87,7 +87,7 @@
       end
 
       it 'should have five labels for hour and minute' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => 3)
         output_buffer.should have_tag('form li.time fieldset ol li label', /hour/i)
         output_buffer.should have_tag('form li.time fieldset ol li label', /minute/i)
@@ -95,12 +95,12 @@
       end
 
       it 'should have three selects for hour, minute and seconds' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset ol li', :count => 3)
       end
 
       it 'should generate a sanitized label and matching ids for attribute' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         4.upto(6) do |i|
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_publish_at_#{i}i']")
           output_buffer.should have_tag("form li fieldset ol li #post_publish_at_#{i}i")
@@ -117,7 +117,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :time, :include_seconds => true, :labels => { field => "another #{field} label" }))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => fields.length)
         fields.each do |f|
           output_buffer.should have_tag('form li.time fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
@@ -129,7 +129,7 @@
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :time, :include_seconds => true, :labels => { field => "" }))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => fields.length-1)
         fields.each do |f|
           output_buffer.should have_tag('form li.time fieldset ol li label', /#{f}/i) unless field == f
@@ -146,7 +146,7 @@
     end
 
     it 'should have a tag matching the namespace' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('#form2_post_publish_at_input')
       output_buffer.should have_tag('#form2_post_publish_at_4i')
       output_buffer.should have_tag('#form2_post_publish_at_5i')
diff --git a/spec/inputs/time_zone_input_spec.rb b/spec/inputs/time_zone_input_spec.rb
index d7f55a6b0..fdf61de88 100644
--- a/spec/inputs/time_zone_input_spec.rb
+++ b/spec/inputs/time_zone_input_spec.rb
@@ -19,14 +19,14 @@
   it_should_apply_error_logic_for_input_type(:time_zone)
 
   it 'should generate a label for the input' do
-    output_buffer.concat(@form) if Formtastic::Util.rails3?
+    output_buffer.concat(@form)
     output_buffer.should have_tag('form li label')
     output_buffer.should have_tag('form li label[@for="post_time_zone"]')
     output_buffer.should have_tag('form li label', /Time zone/)
   end
 
   it "should generate a select" do
-    output_buffer.concat(@form) if Formtastic::Util.rails3?
+    output_buffer.concat(@form)
     output_buffer.should have_tag("form li select")
     output_buffer.should have_tag("form li select#post_time_zone")
     output_buffer.should have_tag("form li select[@name=\"post[time_zone]\"]")
@@ -36,7 +36,7 @@
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:time_zone, :input_html => { :class => 'myclass' }))
     end
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should have_tag("form li select.myclass")
   end
 
@@ -65,14 +65,14 @@
     end
 
     it 'should generate labels' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag('form li label')
       output_buffer.should have_tag('form li label[@for="project_time_zone"]')
       output_buffer.should have_tag('form li label', /Time zone/)
     end
 
     it 'should generate select inputs' do
-      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select")
       output_buffer.should have_tag("form li select#project_time_zone")
       output_buffer.should have_tag("form li select[@name=\"project[time_zone]\"]")
diff --git a/spec/inputs/url_input_spec.rb b/spec/inputs/url_input_spec.rb
index 4323a28ce..aae30275c 100644
--- a/spec/inputs/url_input_spec.rb
+++ b/spec/inputs/url_input_spec.rb
@@ -22,7 +22,7 @@
     it_should_have_label_with_text(/Url/)
     it_should_have_label_for("post_url")
     it_should_have_input_with_id("post_url")
-    it_should_have_input_with_type(Formtastic::Util.rails3? ? :url : :text)
+    it_should_have_input_with_type(:url)
     it_should_have_input_with_name("post[url]")
 
   end
diff --git a/spec/inputs_spec.rb b/spec/inputs_spec.rb
index 4896ad0d4..8dffc630a 100644
--- a/spec/inputs_spec.rb
+++ b/spec/inputs_spec.rb
@@ -23,28 +23,28 @@
       end
 
       it 'should output just the content wrapped in inputs, not the whole template' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should      =~ /before_builder/
         @inputs_output.should_not =~ /before_builder/
       end
 
       it 'should render a fieldset inside the form, with a class of "inputs"' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset.inputs")
       end
 
       it 'should render an ol inside the fieldset' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset.inputs ol")
       end
 
       it 'should render the contents of the block inside the ol' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset.inputs ol", /hello/)
       end
 
       it 'should not render a legend inside the fieldset' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should_not have_tag("form fieldset.inputs legend")
       end
 
@@ -55,7 +55,7 @@
           end
         end
 
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form fieldset.inputs ol", /bye/)
       end
     end
@@ -77,15 +77,14 @@
           concat(inputs)
         end
 
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form fieldset.inputs #post_author_attributes_login")
         output_buffer.should_not have_tag("form fieldset.inputs #author_login")
 
       end
 
-      it 'should concat rendered nested inputs to the template under rails3' do
+      it 'should concat rendered nested inputs to the template' do
         @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
-        ::Formtastic::Util.stub!(:rails3?).and_return(true)
 
         form = semantic_form_for(@new_post) do |builder|
           builder.inputs :for => [:author, @bob] do |bob_builder|
@@ -93,7 +92,7 @@
           end
         end
 
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form fieldset.inputs #post_author_attributes_login")
         output_buffer.should_not have_tag("form fieldset.inputs #author_login")
 
@@ -108,7 +107,7 @@
             end
             concat(inputs)
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form input[@name='post[author_attributes][login]']")
         end
 
@@ -127,7 +126,7 @@
             end
           end
 
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form fieldset.inputs", :count => 2)
           output_buffer.should have_tag("form fieldset.inputs legend", :count => 2)
           output_buffer.should have_tag("form input[@name='post[authors_attributes][0][login]']")
@@ -144,7 +143,7 @@
             end
             concat(inputs)
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form input[@name='post[author_attributes][login]']")
         end
 
@@ -159,7 +158,7 @@
             end
             concat(inputs)
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form input[@name='post[author][login]']")
         end
 
@@ -186,7 +185,7 @@
           concat(inputs)
         end
 
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag('form fieldset ol li #post_author_attributes_10_login')
       end
 
@@ -198,7 +197,7 @@
           concat(inputs)
         end
 
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should_not have_tag('fieldset[@builder="Formtastic::SemanticFormHelper"]')
       end
 
@@ -211,7 +210,7 @@
           concat(inputs)
         end
 
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag('fieldset legend', 'Author #1')
       end
 
@@ -224,7 +223,7 @@
           concat(inputs)
         end
 
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag('fieldset legend', 'Author #11')
       end
     end
@@ -253,7 +252,7 @@
         end
 
         it 'should render a fieldset with a legend inside the form' do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.concat(@form)
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text_using_name}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text_using_title}$/)
@@ -294,7 +293,7 @@
         end
 
         it 'should render a fieldset with a localized legend inside the form' do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.concat(@form)
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text_using_name}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text_using_title}$/)
@@ -315,7 +314,7 @@
       end
 
       it 'should pass the options into the fieldset tag as attributes' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset##{@id_option}")
         output_buffer.should have_tag("form fieldset.#{@class_option}")
       end
@@ -348,49 +347,49 @@
       end
 
       it 'should render a form' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form')
       end
 
       it 'should render a fieldset inside the form' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs')
       end
 
       it 'should not render a legend in the fieldset' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should_not have_tag('form > fieldset.inputs > legend')
       end
 
       it 'should render an ol in the fieldset' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs > ol')
       end
 
       it 'should render a list item in the ol for each column and reflection' do
         # Remove the :has_many macro and :created_at column
         count = ::Post.content_columns.size + ::Post.reflections.size - 2
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => count)
       end
 
       it 'should render a string list item for title' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs > ol > li.string')
       end
 
       it 'should render a text list item for body' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs > ol > li.text')
       end
 
       it 'should render a select list item for author_id' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs > ol > li.select', :count => 1)
       end
 
       it 'should not render timestamps inputs by default' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should_not have_tag('form > fieldset.inputs > ol > li.datetime')
       end
     end
@@ -402,7 +401,7 @@
             concat(builder.inputs(:title, :body))
           end
 
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => 2)
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.string')
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.text')
@@ -415,7 +414,7 @@
             concat(builder.inputs(:title, :body))
           end
 
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.string', :count => 2)
         end
       end
@@ -429,7 +428,7 @@
             concat(builder.inputs(:login, :for => @bob))
           end
 
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form fieldset.inputs #post_author_login")
           output_buffer.should_not have_tag("form fieldset.inputs #author_login")
         end
@@ -440,7 +439,7 @@
           form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
             concat(builder.inputs(:login, :for => @bob))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form fieldset.inputs #project_author_login")
           output_buffer.should_not have_tag("form fieldset.inputs #project_login")
         end
@@ -458,17 +457,17 @@
       end
 
       it 'should render a form with a fieldset containing two list items' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => 4)
       end
 
       it 'should pass the options down to the fieldset' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset#my-id.inputs')
       end
 
       it 'should use the special :name option as a text for the legend tag' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset#my-id.inputs > legend', /^#{@legend_text_using_option}$/)
         output_buffer.should have_tag('form > fieldset#my-id-2.inputs > legend', /^#{@legend_text_using_arg}$/)
       end
diff --git a/spec/label_spec.rb b/spec/label_spec.rb
index 2c31be022..b536340e1 100644
--- a/spec/label_spec.rb
+++ b/spec/label_spec.rb
@@ -35,7 +35,7 @@
       form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :value_method => :to_s, :label_method => proc {|f| ('Label_%s' % [f])}))
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag('form li fieldset ol li label', :with => /Label_[abc]/, :count => 3)
     end
 
@@ -43,7 +43,7 @@
       form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :value_method => proc {|f| ('Value_%s' % [f.to_s])}))
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
       output_buffer.should have_tag('form li fieldset ol li label input[value="Value_a"]')
       output_buffer.should have_tag('form li fieldset ol li label input[value="Value_b"]')
       output_buffer.should have_tag('form li fieldset ol li label input[value="Value_c"]')
diff --git a/spec/semantic_fields_for_spec.rb b/spec/semantic_fields_for_spec.rb
index 9cb95bc83..4cfe27d76 100644
--- a/spec/semantic_fields_for_spec.rb
+++ b/spec/semantic_fields_for_spec.rb
@@ -34,7 +34,7 @@
         concat(nested_builder.inputs(:login))
       end)
     end
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should have_tag('form fieldset.inputs #post_author_1_login_input')
     # Not valid selector, so using good ol' regex
     output_buffer.should_not =~ /id="post\[author\]_1_login_input"/
@@ -48,7 +48,7 @@
         concat(nested_builder.inputs(:login))
       end)
     end
-    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.concat(form)
     output_buffer.should have_tag('form fieldset.inputs #context2_post_author_1_login_input')
   end
   
@@ -67,7 +67,7 @@
           concat(nested_builder.input(:title))
         end)
       end
-      output_buffer.concat(form) if Formtastic::Util.rails3?
+      output_buffer.concat(form)
     end
   
     it "should only render one hidden input (my one)" do
diff --git a/spec/support/custom_macros.rb b/spec/support/custom_macros.rb
index 65e40b6d3..0b9e757cb 100644
--- a/spec/support/custom_macros.rb
+++ b/spec/support/custom_macros.rb
@@ -10,91 +10,91 @@ module ClassMethods
 
     def it_should_have_input_wrapper_with_class(class_name)
       it "should have input wrapper with class '#{class_name}'" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li.#{class_name}")
       end
     end
 
     def it_should_have_input_wrapper_with_id(id_string)
       it "should have input wrapper with id '#{id_string}'" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li##{id_string}")
       end
     end
 
     def it_should_not_have_a_label
       it "should not have a label" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should_not have_tag("form li label")
       end
     end
 
     def it_should_have_a_nested_fieldset
       it "should have a nested_fieldset" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li fieldset")
       end
     end
 
     def it_should_have_label_with_text(string_or_regex)
       it "should have a label with text '#{string_or_regex}'" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li label", string_or_regex)
       end
     end
 
     def it_should_have_label_for(element_id)
       it "should have a label for ##{element_id}" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li label[@for='#{element_id}']")
       end
     end
 
     def it_should_have_input_with_id(element_id)
       it "should have an input with id '#{element_id}'" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li input##{element_id}")
       end
     end
 
     def it_should_have_select_with_id(element_id)
       it "should have a select box with id '#{element_id}'" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select##{element_id}")
       end
     end
 
     def it_should_have_input_with_type(input_type)
       it "should have a #{input_type} input" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li input[@type=\"#{input_type}\"]")
       end
     end
 
     def it_should_have_input_with_name(name)
       it "should have an input named #{name}" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li input[@name=\"#{name}\"]")
       end
     end
 
     def it_should_have_textarea_with_name(name)
       it "should have an input named #{name}" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li textarea[@name=\"#{name}\"]")
       end
     end
 
     def it_should_have_textarea_with_id(element_id)
       it "should have an input with id '#{element_id}'" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li textarea##{element_id}")
       end
     end
 
     def it_should_have_label_and_input_with_id(element_id)
       it "should have an input with id '#{element_id}'" do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li input##{element_id}")
         output_buffer.should have_tag("form li label[@for='#{element_id}']")
       end
@@ -106,7 +106,7 @@ def it_should_use_default_text_field_size_when_not_nil(as)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => as))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li input[@size='#{Formtastic::SemanticFormBuilder.default_text_field_size}']")
         end
       end
@@ -118,7 +118,7 @@ def it_should_not_use_default_text_field_size_when_nil(as)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => as))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li input")
           output_buffer.should_not have_tag("form li input[@size]")
         end
@@ -130,7 +130,7 @@ def it_should_apply_custom_input_attributes_when_input_html_provided(as)
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as, :input_html => { :class => 'myclass' }))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form li input.myclass")
       end
     end
@@ -140,7 +140,7 @@ def it_should_apply_custom_for_to_label_when_input_html_id_provided(as)
         form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as, :input_html => { :id => 'myid' }))
         end
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag('form li label[@for="myid"]')
       end
     end
@@ -148,7 +148,7 @@ def it_should_apply_custom_for_to_label_when_input_html_id_provided(as)
     def it_should_have_maxlength_matching_column_limit
       it 'should have a maxlength matching column limit' do
         @new_post.column_for_attribute(:title).limit.should == 50
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.concat(@form)
         output_buffer.should have_tag("form li input[@maxlength='50']")
       end
     end
@@ -162,7 +162,7 @@ def it_should_use_column_size_for_columns_shorter_than_default_text_field_size(a
           concat(builder.input(:title, :as => as))
         end
 
-        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.concat(form)
         output_buffer.should have_tag("form li input[@size='#{column_limit_shorted_than_default}']")
       end
     end
@@ -183,7 +183,7 @@ def it_should_apply_error_logic_for_input_type(type)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag('form li.error')
         end
 
@@ -191,7 +191,7 @@ def it_should_apply_error_logic_for_input_type(type)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should_not have_tag('div.fieldWithErrors')
         end
 
@@ -200,7 +200,7 @@ def it_should_apply_error_logic_for_input_type(type)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag('form li.error p.inline-errors')
         end
 
@@ -209,7 +209,7 @@ def it_should_apply_error_logic_for_input_type(type)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag('form li.error ul.errors')
         end
       end
@@ -222,17 +222,17 @@ def it_should_apply_error_logic_for_input_type(type)
         end
 
         it 'should not apply an errors class to the list item' do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.concat(@form)
           output_buffer.should_not have_tag('form li.error')
         end
 
         it 'should not render a paragraph for the errors' do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.concat(@form)
           output_buffer.should_not have_tag('form li.error p.inline-errors')
         end
 
         it 'should not display an error list' do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.concat(@form)
           output_buffer.should_not have_tag('form li.error ul.errors')
         end
       end
@@ -245,17 +245,17 @@ def it_should_apply_error_logic_for_input_type(type)
         end
 
         it 'should not apply an errors class to the list item' do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.concat(@form)
           output_buffer.should_not have_tag('form li.error')
         end
 
         it 'should not render a paragraph for the errors' do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.concat(@form)
           output_buffer.should_not have_tag('form li.error p.inline-errors')
         end
 
         it 'should not display an error list' do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.concat(@form)
           output_buffer.should_not have_tag('form li.error ul.errors')
         end
       end
@@ -282,7 +282,7 @@ def it_should_use_the_collection_when_provided(as, countable)
           form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:author, :as => as, :collection => @authors))
           end
-          output_buffer.concat(form) if Formtastic::Util.rails3?
+          output_buffer.concat(form)
           output_buffer.should have_tag("form li.#{as} #{countable}", :count => @authors.size + (as == :select ? 1 : 0))
         end
 
@@ -295,7 +295,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
 
             @categories.each do |value|
               output_buffer.should have_tag("form li.#{as}", /#{value}/)
@@ -312,7 +312,7 @@ def it_should_use_the_collection_when_provided(as, countable)
                 end
                 concat(fields)
               end
-              output_buffer.concat(form) if Formtastic::Util.rails3?
+              output_buffer.concat(form)
               output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_general']")
               output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_design']")
               output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_development']")
@@ -330,7 +330,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
 
             @categories.each do |label, value|
               output_buffer.should have_tag("form li.#{as}", /#{label}/)
@@ -348,7 +348,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
 
             @categories.each do |text, value|
               label = as == :select ? :option : :label
@@ -369,7 +369,7 @@ def it_should_use_the_collection_when_provided(as, countable)
               form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:category_name, :as => as, :collection => @choices))
               end
-              output_buffer.concat(form) if Formtastic::Util.rails3?
+              output_buffer.concat(form)
 
               output_buffer.should have_tag("form li.#{as} #{countable}#post_category_name_true")
               output_buffer.should have_tag("form li.#{as} #{countable}#post_category_name_false")
@@ -386,7 +386,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
 
             @categories.each do |value|
               label = as == :select ? :option : :label
@@ -405,7 +405,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
             end
-            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.concat(form)
 
             @categories.each do |label, value|
               output_buffer.should have_tag("form li.#{as}", /#{label}/)
@@ -425,7 +425,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             end
 
             it 'should have options with text content from the specified method' do
-              output_buffer.concat(@form) if Formtastic::Util.rails3?
+              output_buffer.concat(@form)
               ::Author.all.each do |author|
                 output_buffer.should have_tag("form li.#{as}", /#{author.login}/)
               end
@@ -440,7 +440,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             end
 
             it 'should have options with the proc applied to each' do
-              output_buffer.concat(@form) if Formtastic::Util.rails3?
+              output_buffer.concat(@form)
               ::Author.all.each do |author|
                 output_buffer.should have_tag("form li.#{as}", /#{author.login.reverse}/)
               end
@@ -463,7 +463,7 @@ def it_should_use_the_collection_when_provided(as, countable)
               end
 
               it "should render the options with #{label_method} as the label" do
-                output_buffer.concat(@form) if Formtastic::Util.rails3?
+                output_buffer.concat(@form)
                 ::Author.all.each do |author|
                   output_buffer.should have_tag("form li.#{as}", /The Label Text/)
                 end
@@ -483,7 +483,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             end
 
             it 'should have options with values from specified method' do
-              output_buffer.concat(@form) if Formtastic::Util.rails3?
+              output_buffer.concat(@form)
               ::Author.all.each do |author|
                 output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login}']")
               end
@@ -498,7 +498,7 @@ def it_should_use_the_collection_when_provided(as, countable)
             end
 
             it 'should have options with the proc applied to each value' do
-              output_buffer.concat(@form) if Formtastic::Util.rails3?
+              output_buffer.concat(@form)
               ::Author.all.each do |author|
                 output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login.reverse}']")
               end
diff --git a/spec/support/test_environment.rb b/spec/support/test_environment.rb
index 665aac524..abd650d15 100644
--- a/spec/support/test_environment.rb
+++ b/spec/support/test_environment.rb
@@ -7,25 +7,18 @@
   config.mock_with :rspec
 end
 
-if Formtastic::Util.rails3?
-
-  require "action_controller/railtie"
-  require "active_resource/railtie"
-  require 'active_model'
-
-  # Create a simple rails application for use in testing the viewhelper
-  module FormtasticTest
-    class Application < Rails::Application
-      # Configure the default encoding used in templates for Ruby 1.9.
-      config.encoding = "utf-8"
-      config.active_support.deprecation = :stderr
-    end
+require "action_controller/railtie"
+require "active_resource/railtie"
+require 'active_model'
+
+# Create a simple rails application for use in testing the viewhelper
+module FormtasticTest
+  class Application < Rails::Application
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+    config.active_support.deprecation = :stderr
   end
-  FormtasticTest::Application.initialize!
-
-  require 'rspec/rails'
 end
+FormtasticTest::Application.initialize!
 
-
-
-
+require 'rspec/rails'

From 6441bf0cde903565be5f845a7273cc3c9ec2d7ef Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 12 Jan 2011 23:24:24 +1100
Subject: [PATCH 425/992] uncomment a test that was failing under rails 2

---
 spec/inputs/check_boxes_input_spec.rb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index de9a3aa02..dfdc1a1aa 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -163,12 +163,9 @@
         end
         output_buffer.concat(form)
 
-        ## This should work, but it's emits deprecation warnings under Rails 2
-        ## TODO: revisit in 2.0 when we drop Rails 2. Simpler test follows.
-        #output_buffer.should have_tag('form li fieldset ol li label') do |label|
-        #  label.body.should match /&lt;b&gt;Item [12]&lt;\/b&gt;$/
-        #end
-        output_buffer.should  =~ /&lt;b&gt;Item [12]&lt;\/b&gt;/
+        output_buffer.should have_tag('form li fieldset ol li label') do |label|
+          label.body.should match /&lt;b&gt;Item [12]&lt;\/b&gt;$/
+        end
       end
     end
 

From 2fb4a75560b2cf2d22dd395f9f6625bb65470704 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 13 Jan 2011 07:03:41 +1100
Subject: [PATCH 426/992] pretty sure we don't need these in Rails 3

---
 lib/formtastic.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 2ade8337b..99998eb08 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -568,13 +568,11 @@ def inputs_for_nested_attributes(*args, &block) #:nodoc:
           lambda do |f|
             contents = f.inputs(*args){ block.call(f) }
             template.concat(contents)
-            contents # TODO: needed in Rails 3?
           end
         else
           lambda do |f|
             contents = f.inputs(*args)
             template.concat(contents)
-            contents # TODO: needed in Rails 3?
           end
         end
 

From dc5857b918582fd40082ddd0fd4828d8aac32333 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 13 Jan 2011 07:12:26 +1100
Subject: [PATCH 427/992] moved compatibility note in README further up

---
 README.textile | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/README.textile b/README.textile
index 5229a4b09..499277a48 100644
--- a/README.textile
+++ b/README.textile
@@ -4,6 +4,15 @@ Formtastic is a Rails FormBuilder DSL (with some other goodies) to make it far e
 
 <a href='http://www.pledgie.com/campaigns/2178'><img alt='Click here to lend your support to: formtastic and make a donation at www.pledgie.com !' src='http://pledgie.com/campaigns/2178.png?skin_name=chrome' border='0' /></a>
 
+
+h2. Compatibility
+
+* Formtastic 1.x is compatible with both Rails 2 and 3, and is being maintained for bug fixes in the the "1.2-stable branch":https://github.com/justinfrench/formtastic/tree/1.2-stable.
+* Formtastic 2.0 will be Rails 3.x compatible only
+* If you're bundling Formtastic from edge/master, get ready for a bumpy ride. Try the "1.2-stable branch":https://github.com/justinfrench/formtastic/tree/1.2-stable.
+* Formtastic, much like Rails, is very ActiveRecord-centric. Many are successfully using other ActiveModel-like ORMs and objects (DataMapper, MongoMapper, Mongoid, Authlogic, Devise...) but we're not guaranteeing full compatibility at this stage. Patches are welcome!
+ 
+
 h2. The Story
 
 One day, I finally had enough, so I opened up my text editor, and wrote a DSL for how I'd like to author forms:
@@ -81,7 +90,7 @@ RDoc documentation _should_ be automatically generated after each commit and mad
 
 h2. Installation
 
-Formtastic 2 compatible with Rails 3 only, and the gem is "hosted":http://rubygems.org/gems/formtastic on RubyGems.org.
+Formtastic edge (2.0) will be compatible with Rails 3 only, and the gem is "hosted":http://rubygems.org/gems/formtastic on RubyGems.org.
 
 Simply add Formtastic to your Gemfile and bundle it up:
 
@@ -588,12 +597,6 @@ There are none, but...
 * "rspec":http://github.com/dchelimsky/rspec/, "rspec_hpricot_matchers":http://rubyforge.org/projects/rspec-hpricot/ and "rcov":http://github.com/relevance/rcov gems (plus any of their own dependencies) are required for the test suite.
 
 
-h2. Compatibility
-
-* We're only testing Formtastic with the latest Rails stable release. Patches are welcome to allow backwards compatibility with previous versions of Rails, of course, but we've dropped support for Rails 2. Formtastic 1.x is compatible with Rails 2, and is being maintained for bug fixes only. See the README in the "1.2-stable branch":https://github.com/justinfrench/formtastic/tree/1.2-stable.
-* Formtastic, much like Rails, is very ActiveRecord-centric. Many people are using Formtastic successfully with other ActiveModel-like ORMs and classes (DataMapper, MongoMapper, Mongoid, Authlogic, Devise...) but we're not guaranteeing full compatibility at this stage. Patches are welcome.
- 
-
 h2. How to contribute
 
 Please ensure that you provide appropriate spec/test coverage and ensure the documentation is up-to-date.  Bonus points if you perform your changes in a clean topic branch rather than master, and if you create a pull request for your changes to be discussed and reviewed.

From 39470eeaad84d2c5af919d2c940da7de74808422 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 14 Jan 2011 22:53:41 +1100
Subject: [PATCH 428/992] No need for output_buffer.concat(form) any more now
 that we're only supporting the Rails 3 block styles.

---
 spec/buttons_spec.rb                  |  40 ++---
 spec/commit_button_spec.rb            | 123 ++++++-------
 spec/errors_spec.rb                   |  10 +-
 spec/form_helper_spec.rb              |  47 ++---
 spec/i18n_spec.rb                     |  25 ++-
 spec/include_blank_spec.rb            |  20 +--
 spec/input_spec.rb                    | 202 +++++++++-------------
 spec/inputs/boolean_input_spec.rb     |  41 ++---
 spec/inputs/check_boxes_input_spec.rb |  91 ++++------
 spec/inputs/country_input_spec.rb     |  20 +--
 spec/inputs/date_input_spec.rb        |  23 +--
 spec/inputs/datetime_input_spec.rb    | 239 --------------------------
 spec/inputs/email_input_spec.rb       |   8 +-
 spec/inputs/file_input_spec.rb        |  13 +-
 spec/inputs/hidden_input_spec.rb      |  23 +--
 spec/inputs/numeric_input_spec.rb     |  12 +-
 spec/inputs/password_input_spec.rb    |  12 +-
 spec/inputs/phone_input_spec.rb       |   8 +-
 spec/inputs/radio_input_spec.rb       |  63 +++----
 spec/inputs/search_input_spec.rb      |   8 +-
 spec/inputs/select_input_spec.rb      | 136 +++++----------
 spec/inputs/string_input_spec.rb      |  27 ++-
 spec/inputs/text_input_spec.rb        |  53 +++---
 spec/inputs/time_input_spec.rb        |  37 ++--
 spec/inputs/time_zone_input_spec.rb   |  21 +--
 spec/inputs/url_input_spec.rb         |   8 +-
 spec/inputs_spec.rb                   | 122 +++++--------
 spec/label_spec.rb                    |  10 +-
 spec/semantic_fields_for_spec.rb      |  15 +-
 spec/support/custom_macros.rb         | 140 ++++++---------
 spec/support/test_environment.rb      |   5 +
 31 files changed, 508 insertions(+), 1094 deletions(-)
 delete mode 100644 spec/inputs/datetime_input_spec.rb

diff --git a/spec/buttons_spec.rb b/spec/buttons_spec.rb
index 23aa11258..a52c89127 100644
--- a/spec/buttons_spec.rb
+++ b/spec/buttons_spec.rb
@@ -13,31 +13,27 @@
   describe 'with a block' do
     describe 'when no options are provided' do
       before do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           buttons = builder.buttons do
             concat('hello')
           end
           concat(buttons)
-        end
+        end)
       end
 
       it 'should render a fieldset inside the form, with a class of "inputs"' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset.buttons")
       end
 
       it 'should render an ol inside the fieldset' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset.buttons ol")
       end
 
       it 'should render the contents of the block inside the ol' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset.buttons ol", /hello/)
       end
 
       it 'should not render a legend inside the fieldset' do
-        output_buffer.concat(@form)
         output_buffer.should_not have_tag("form fieldset.buttons legend")
       end
     end
@@ -46,13 +42,12 @@
       before do
         @legend_text = "Advanced options"
 
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           builder.buttons :name => @legend_text do
           end
-        end
+        end)
       end
       it 'should render a fieldset inside the form' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset legend", /#{@legend_text}/)
       end
     end
@@ -62,13 +57,12 @@
         @id_option = 'advanced'
         @class_option = 'wide'
 
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           builder.buttons :id => @id_option, :class => @class_option do
           end
-        end
+        end)
       end
       it 'should pass the options into the fieldset tag as attributes' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset##{@id_option}")
         output_buffer.should have_tag("form fieldset.#{@class_option}")
       end
@@ -81,38 +75,32 @@
     describe 'with no args (default buttons)' do
 
       before do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.buttons)
-        end
+        end)
       end
 
       it 'should render a form' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form')
       end
 
       it 'should render a buttons fieldset inside the form' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form fieldset.buttons')
       end
 
       it 'should not render a legend in the fieldset' do
-        output_buffer.concat(@form)
         output_buffer.should_not have_tag('form fieldset.buttons legend')
       end
 
       it 'should render an ol in the fieldset' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form fieldset.buttons ol')
       end
 
       it 'should render a list item in the ol for each default button' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form fieldset.buttons ol li', :count => 1)
       end
 
       it 'should render a commit list item for the commit button' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form fieldset.buttons ol li.commit')
       end
 
@@ -121,13 +109,12 @@
     describe 'with button names as args' do
 
       before do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.buttons(:commit))
-        end
+        end)
       end
 
       it 'should render a form with a fieldset containing a list item for each button arg' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.buttons > ol > li', :count => 1)
         output_buffer.should have_tag('form > fieldset.buttons > ol > li.commit')
       end
@@ -137,24 +124,21 @@
     describe 'with button names as args and an options hash' do
 
       before do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.buttons(:commit, :name => "Now click a button", :id => "my-id"))
-        end
+        end)
       end
 
       it 'should render a form with a fieldset containing a list item for each button arg' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.buttons > ol > li', :count => 1)
         output_buffer.should have_tag('form > fieldset.buttons > ol > li.commit', :count => 1)
       end
 
       it 'should pass the options down to the fieldset' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset#my-id.buttons')
       end
 
       it 'should use the special :name option as a text for the legend tag' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset#my-id.buttons > legend', /Now click a button/)
       end
 
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index 700040167..866d2a7b9 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -33,33 +33,29 @@
 
     before do
       @new_post.stub!(:new_record?).and_return(false)
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.commit_button)
-      end
+      end)
     end
 
     it 'should render a commit li' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('li.commit')
     end
 
     it 'should render an input with a type attribute of "submit"' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('li.commit input[@type="submit"]')
     end
 
     it 'should render an input with a name attribute of "commit"' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('li.commit input[@name="commit"]')
     end
 
     it 'should pass options given in :button_html to the button' do
       @new_post.stub!(:new_record?).and_return(false)
-      form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.commit_button('text', :button_html => {:class => 'my_class', :id => 'my_id'}))
-      end
+      end)
 
-      output_buffer.concat(form)
       output_buffer.should have_tag('li.commit input#my_id')
       output_buffer.should have_tag('li.commit input.my_class')
     end
@@ -77,10 +73,9 @@
     it 'should use the default if set' do
       with_config :default_commit_button_accesskey, 's' do
         @new_post.stub!(:new_record?).and_return(false)
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :button_html => {}))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag('li.commit input[@accesskey="s"]')
       end
     end
@@ -88,10 +83,9 @@
     it 'should use the value set in options over the default' do
       with_config :default_commit_button_accesskey, 's' do
         @new_post.stub!(:new_record?).and_return(false)
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :accesskey => 'o'))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should_not have_tag('li.commit input[@accesskey="s"]')
         output_buffer.should have_tag('li.commit input[@accesskey="o"]')
       end
@@ -100,10 +94,9 @@
     it 'should use the value set in button_html over options' do
       with_config :default_commit_button_accesskey, 's' do
         @new_post.stub!(:new_record?).and_return(false)
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :accesskey => 'o', :button_html => {:accesskey => 't'}))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should_not have_tag('li.commit input[@accesskey="s"]')
         output_buffer.should_not have_tag('li.commit input[@accesskey="o"]')
         output_buffer.should have_tag('li.commit input[@accesskey="t"]')
@@ -116,18 +109,16 @@
 
     before do
       @new_post.stub!(:new_record?).and_return(false)
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.commit_button("a string", :button_html => { :class => "pretty"}))
-      end
+      end)
     end
 
     it "should render the string as the value of the button" do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('li input[@value="a string"]')
     end
 
     it "should deal with the options hash" do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('li input.pretty')
     end
 
@@ -137,13 +128,12 @@
 
     before do
       @new_post.stub!(:new_record?).and_return(false)
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.commit_button(:button_html => { :class => "pretty"}))
-      end
+      end)
     end
 
     it "should deal with the options hash" do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('li input.pretty')
     end
 
@@ -155,10 +145,9 @@
     describe 'when used without object' do
       describe 'when explicit label is provided' do
         it 'should render an input with the explicitly specified label' do
-          form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
+          concat(semantic_form_for(:post, :url => 'http://example.com') do |builder|
             concat(builder.commit_button("Click!"))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag('li.commit input[@value="Click!"][@class~="submit"]')
         end
       end
@@ -174,10 +163,9 @@
           end
 
           it 'should render an input with default I18n-localized label (fallback)' do
-            form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
+            concat(semantic_form_for(:post, :url => 'http://example.com') do |builder|
               concat(builder.commit_button)
-            end
-            output_buffer.concat(form)
+            end)
             output_buffer.should have_tag('li.commit input[@value="Submit Post"][@class~="submit"]')
           end
         end
@@ -206,18 +194,16 @@
                     }
                   }
                }
-           form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
+           concat(semantic_form_for(:post, :url => 'http://example.com') do |builder|
              concat(builder.commit_button)
-           end
-           output_buffer.concat(form)
+           end)
            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit Post"][@class~="submit"]})
          end
 
          it 'should render an input with anoptional localized label (I18n) - if first is not set' do
-           form = semantic_form_for(:post, :url => 'http://example.com') do |builder|
+           concat(semantic_form_for(:post, :url => 'http://example.com') do |builder|
              concat(builder.commit_button)
-           end
-           output_buffer.concat(form)
+           end)
            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit"][@class~="submit"]})
          end
 
@@ -233,10 +219,9 @@
 
       describe 'when explicit label is provided' do
         it 'should render an input with the explicitly specified label' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.commit_button("Click!"))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag('li.commit input[@value="Click!"][@class~="create"]')
         end
       end
@@ -252,10 +237,9 @@
           end
 
           it 'should render an input with default I18n-localized label (fallback)' do
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
-            end
-            output_buffer.concat(form)
+            end)
             output_buffer.should have_tag('li.commit input[@value="Create Post"][@class~="create"]')
           end
         end
@@ -284,18 +268,16 @@
                      }
                    }
                 }
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
-            end
-            output_buffer.concat(form)
+            end)
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create Post"][@class~="create"]})
           end
 
           it 'should render an input with anoptional localized label (I18n) - if first is not set' do
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
-            end
-            output_buffer.concat(form)
+            end)
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create"][@class~="create"]})
           end
 
@@ -311,10 +293,9 @@
 
       describe 'when explicit label is provided' do
         it 'should render an input with the explicitly specified label' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.commit_button("Click!"))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag('li.commit input[@value="Click!"][@class~="update"]')
         end
       end
@@ -330,10 +311,9 @@
           end
 
           it 'should render an input with default I18n-localized label (fallback)' do
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
-            end
-            output_buffer.concat(form)
+            end)
             output_buffer.should have_tag('li.commit input[@value="Save Post"][@class~="update"]')
           end
         end
@@ -363,18 +343,16 @@
                      }
                    }
                 }
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
-            end
-            output_buffer.concat(form)
+            end)
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save Post"][@class~="update"]})
           end
 
           it 'should render an input with anoptional localized label (I18n) - if first is not set' do
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.commit_button)
-            end
-            output_buffer.concat(form)
+            end)
             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save"][@class~="update"]})
             ::I18n.backend.store_translations :en, :formtastic => {}
           end
@@ -405,13 +383,12 @@ def self.human_name
       @new_user_post = ::UserPost.new
 
       @new_user_post.stub!(:new_record?).and_return(true)
-      @form = semantic_form_for(@new_user_post, :url => '') do |builder|
+      concat(semantic_form_for(@new_user_post, :url => '') do |builder|
         concat(builder.commit_button())
-      end
+      end)
     end
 
     it "should render the string as the value of the button" do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('li input[@value="Create User post"]')
     end
 
@@ -421,27 +398,24 @@ def self.human_name
 
     describe 'when provided' do
       it 'should be passed down to the li tag' do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :wrapper_html => {:id => :another_id}))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag("form li#another_id")
       end
 
       it 'should append given classes to li default classes' do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :wrapper_html => {:class => :another_class}))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag("form li.commit")
         output_buffer.should have_tag("form li.another_class")
       end
 
       it 'should allow classes to be an array' do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text', :wrapper_html => {:class => [ :my_class, :another_class ]}))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag("form li.commit")
         output_buffer.should have_tag("form li.my_class")
         output_buffer.should have_tag("form li.another_class")
@@ -450,10 +424,9 @@ def self.human_name
 
     describe 'when not provided' do
       it 'should use default id and class' do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text'))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag("form li.commit")
       end
     end
diff --git a/spec/errors_spec.rb b/spec/errors_spec.rb
index 3961d83a1..63d033d8f 100644
--- a/spec/errors_spec.rb
+++ b/spec/errors_spec.rb
@@ -138,11 +138,10 @@
       @errors.stub!(:[]).with(:document).and_return(nil)
 
       with_config :inline_errors, :sentence do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:document))
-        end
+        end)
       end 
-      output_buffer.concat(@form)
       output_buffer.should have_tag("li[@class='file optional error']")
       output_buffer.should have_tag('p.inline-errors', (['must be an image','must be provided', 'must be less than 4mb']).to_sentence)
     end
@@ -157,11 +156,10 @@
       @errors.stub!(:[]).with(:author_id).and_return(['is already taken', 'must not be blank']) # note the duplicate of association
 
       with_config :inline_errors, :list do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:author))
-        end
+        end)
       end
-      output_buffer.concat(@form)
       output_buffer.should have_tag("ul.errors li", /must not be blank/, :count => 1)
       output_buffer.should have_tag("ul.errors li", /is already taken/, :count => 1)
     end
diff --git a/spec/form_helper_spec.rb b/spec/form_helper_spec.rb
index 1bf37e754..ec9a87cce 100644
--- a/spec/form_helper_spec.rb
+++ b/spec/form_helper_spec.rb
@@ -19,76 +19,65 @@
     end
 
     it 'adds a class of "formtastic" to the generated form' do
-      form = semantic_form_for(@new_post, :url => '/hello') do |builder|
-      end
-      output_buffer.concat(form)
+      concat(semantic_form_for(@new_post, :url => '/hello') do |builder|
+      end)
       output_buffer.should have_tag("form.formtastic")
     end
 
     it 'adds a class of "xyz" to the generated form' do
       ::Formtastic::SemanticFormHelper.default_form_class = 'xyz'
-      form = semantic_form_for(::Post.new, :as => :post, :url => '/hello') do |builder|
-      end
-      output_buffer.concat(form)
+      concat(semantic_form_for(::Post.new, :as => :post, :url => '/hello') do |builder|
+      end)
       output_buffer.should have_tag("form.xyz")
     end
 
     it 'adds class matching the object name to the generated form when a symbol is provided' do
-      form = semantic_form_for(@new_post, :url => '/hello') do |builder|
-      end
-      output_buffer.concat(form)
+      concat(semantic_form_for(@new_post, :url => '/hello') do |builder|
+      end)
       output_buffer.should have_tag("form.post")
 
-      form = semantic_form_for(:project, :url => '/hello') do |builder|
-      end
-      output_buffer.concat(form)
+      concat(semantic_form_for(:project, :url => '/hello') do |builder|
+      end)
       output_buffer.should have_tag("form.project")
     end
 
     it 'adds class matching the :as option when provided' do
-      form = semantic_form_for(@new_post, :as => :message, :url => '/hello') do |builder|
-      end
-      output_buffer.concat(form)
+      concat(semantic_form_for(@new_post, :as => :message, :url => '/hello') do |builder|
+      end)
       output_buffer.should have_tag("form.message")
 
-      form = semantic_form_for([:admins, @new_post], :as => :message, :url => '/hello') do |builder|
-      end
-      output_buffer.concat(form)
+      concat(semantic_form_for([:admins, @new_post], :as => :message, :url => '/hello') do |builder|
+      end)
       output_buffer.should have_tag("form.message")
     end
 
     it 'adds class matching the object\'s class to the generated form when an object is provided' do
-      form = semantic_form_for(@new_post) do |builder|
-      end
-      output_buffer.concat(form)
+      concat(semantic_form_for(@new_post) do |builder|
+      end)
       output_buffer.should have_tag("form.post")
     end
 
     it 'adds a namespaced class to the generated form' do
-      form = semantic_form_for(::Namespaced::Post.new, :url => '/hello') do |builder|
-      end
-      output_buffer.concat(form)
+      concat(semantic_form_for(::Namespaced::Post.new, :url => '/hello') do |builder|
+      end)
       output_buffer.should have_tag("form.namespaced_post")
     end
 
     describe 'allows :html options' do
       before(:each) do
-         @form = semantic_form_for(@new_post, :url => '/hello', :html => { :id => "something-special", :class => "something-extra", :multipart => true }) do |builder|
-        end
+        concat(semantic_form_for(@new_post, :url => '/hello', :html => { :id => "something-special", :class => "something-extra", :multipart => true }) do |builder|
+        end)
       end
 
       it 'to add a id of "something-special" to generated form' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form#something-special")
       end
 
       it 'to add a class of "something-extra" to generated form' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form.something-extra")
       end
 
       it 'to add enctype="multipart/form-data"' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form[@enctype="multipart/form-data"]')
       end
     end
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index 48d06abbb..cd4ecfd07 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -113,46 +113,41 @@
     end
 
     it "should be able to translate with namespaced object" do
-      form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:title))
-      end
-      output_buffer.concat(form)
+      end)
       output_buffer.should have_tag("form label", /Hello post!/)
     end
 
     it "should be able to translate without form-object" do
-      form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+      concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:title))
-      end
-      output_buffer.concat(form)
+      end)
       output_buffer.should have_tag("form label", /Hello project!/)
     end
 
     it 'should be able to translate nested objects with nested translations' do
-      form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+      concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
         builder.semantic_fields_for(:task) do |f|
           concat(f.input(:name))
         end
-      end
-      output_buffer.concat(form)
+      end)
       output_buffer.should have_tag("form label", /Hello task name!/)
     end
 
     it 'should be able to translate nested objects with top level translations' do
-      form = semantic_form_for(:order, :url => 'http://test.host') do |builder|
+      concat(semantic_form_for(:order, :url => 'http://test.host') do |builder|
         builder.semantic_fields_for(:line_item) do |f|
           concat(f.input(:name))
         end
-      end
-      output_buffer.concat(form)
+      end)
       output_buffer.should have_tag("form label", /Hello line item name!/)
     end
 
     it 'should be able to translate helper label as Rails does' do
-      form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author))
-      end
-      output_buffer.concat(form)
+      end)
       output_buffer.should have_tag("form label", /Written by/)
     end
 
diff --git a/spec/include_blank_spec.rb b/spec/include_blank_spec.rb
index c854d7b47..5c68efb4f 100644
--- a/spec/include_blank_spec.rb
+++ b/spec/include_blank_spec.rb
@@ -24,10 +24,9 @@
     it 'blank value should be included if the default value specified in config is true' do
       ::Formtastic::SemanticFormBuilder.include_blank_for_select_by_default = true
       @select_input_types.each do |as, attribute|
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag("form li select option[@value='']", "")
       end
     end
@@ -35,10 +34,9 @@
     it 'blank value should not be included if the default value specified in config is false' do
       ::Formtastic::SemanticFormBuilder.include_blank_for_select_by_default = false
       @select_input_types.each do |as, attribute|
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should_not have_tag("form li select option[@value='']", "")
       end
     end
@@ -51,10 +49,9 @@
   describe 'when :include_blank is set to false' do
     it 'should not have a blank option' do
       @select_input_types.each do |as, attribute|
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as, :include_blank => false))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should_not have_tag("form li select option[@value='']", "")
       end
     end
@@ -63,10 +60,9 @@
   describe 'when :include_blank => true is set' do
     it 'should have a blank select option' do
       @select_input_types.each do |as, attribute|
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as, :include_blank => true))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag("form li select option[@value='']", "")
       end
     end
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 422dde47b..4ce014391 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -55,9 +55,9 @@
 
     it 'should require the first argument (the method on form\'s object)' do
       lambda {
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input()) # no args passed in at all
-        end
+        end)
       }.should raise_error(ArgumentError)
     end
 
@@ -76,19 +76,17 @@
         end
 
         it 'should set a "required" class' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => true))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should_not have_tag('form li.optional')
           output_buffer.should have_tag('form li.required')
         end
 
         it 'should append the "required" string to the label' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => true))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag('form li.required label', /#{@new_string}$/)
         end
 
@@ -106,19 +104,17 @@
         end
 
         it 'should set an "optional" class' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => false))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should_not have_tag('form li.required')
           output_buffer.should have_tag('form li.optional')
         end
 
         it 'should append the "optional" string to the label' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => false))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag('form li.optional label', /#{@string}$/)
         end
 
@@ -132,10 +128,9 @@
             ::Formtastic::SemanticFormBuilder.all_fields_required_by_default.should == true
             ::Formtastic::SemanticFormBuilder.all_fields_required_by_default = false
 
-            form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+            concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
               concat(builder.input(:title))
-            end
-            output_buffer.concat(form)
+            end)
             output_buffer.should_not have_tag('form li.required')
             output_buffer.should have_tag('form li.optional')
 
@@ -162,11 +157,10 @@
                   mock('MacroReflection', :macro => :validates_presence_of, :name => :body, :options => {:if => true})
                 ])
 
-                form = semantic_form_for(@new_post) do |builder|
+                concat(semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:title))
                   concat(builder.input(:body))
-                end
-                output_buffer.concat(form)
+                end)
                 output_buffer.should have_tag('form li.required')
                 output_buffer.should_not have_tag('form li.optional')
               end
@@ -218,11 +212,9 @@ def should_be_required(options)
                 mock('MacroReflection', :macro => :validates_presence_of, :name => :body, :options => options[:options])
               ])
 
-              form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:body))
-              end
-
-              output_buffer.concat(form)
+              end)
 
               if options[:required]
                 output_buffer.should_not have_tag('form li.optional')
@@ -239,10 +231,9 @@ def should_be_required(options)
               end
 
               it 'should not be required' do
-                form = semantic_form_for(@new_post) do |builder|
+                concat(semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:title))
-                end
-                output_buffer.concat(form)
+                end)
                 output_buffer.should_not have_tag('form li.required')
                 output_buffer.should have_tag('form li.optional')
               end
@@ -269,11 +260,10 @@ def should_be_required(options)
                   active_model_presence_validator([:body], {:if => true})
                 ])
 
-                form = semantic_form_for(@new_post) do |builder|
+                concat(semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:title))
                   concat(builder.input(:body))
-                end
-                output_buffer.concat(form)
+                end)
                 output_buffer.should have_tag('form li.required')
                 output_buffer.should_not have_tag('form li.optional')
               end
@@ -325,10 +315,9 @@ def should_be_required(options)
                   active_model_inclusion_validator([:published], {:in => [false, true]})
                 ])
 
-                form = semantic_form_for(@new_post) do |builder|
+                concat(semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:published))
-                end
-                output_buffer.concat(form)
+                end)
                 output_buffer.should have_tag('form li.required')
                 output_buffer.should_not have_tag('form li.optional')
               end
@@ -338,10 +327,9 @@ def should_be_required(options)
                   active_model_inclusion_validator([:published], {:in => [false, true], :allow_blank => true})
                 ])
 
-                form = semantic_form_for(@new_post) do |builder|
+                concat(semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:published))
-                end
-                output_buffer.concat(form)
+                end)
                 output_buffer.should_not have_tag('form li.required')
                 output_buffer.should have_tag('form li.optional')
               end
@@ -353,11 +341,9 @@ def should_be_required(options)
                 active_model_presence_validator([:body], options[:options])
               ])
 
-              form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:body))
-              end
-
-              output_buffer.concat(form)
+              end)
 
               if options[:required]
                 output_buffer.should_not have_tag('form li.optional')
@@ -374,10 +360,9 @@ def should_be_required(options)
               end
 
               it 'should not be required' do
-                form = semantic_form_for(@new_post) do |builder|
+                concat(semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:title))
-                end
-                output_buffer.concat(form)
+                end)
                 output_buffer.should_not have_tag('form li.required')
                 output_buffer.should have_tag('form li.optional')
               end
@@ -391,10 +376,9 @@ def should_be_required(options)
               ::Formtastic::SemanticFormBuilder.all_fields_required_by_default.should == true
               ::Formtastic::SemanticFormBuilder.all_fields_required_by_default = false
 
-              form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title))
-              end
-              output_buffer.concat(form)
+              end)
               output_buffer.should_not have_tag('form li.required')
               output_buffer.should have_tag('form li.optional')
 
@@ -414,20 +398,18 @@ def should_be_required(options)
       describe 'when not provided' do
 
         it 'should default to a string for forms without objects unless column is password' do
-          form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
             concat(builder.input(:anything))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag('form li.string')
         end
 
         it 'should default to password for forms without objects if column is password' do
-          form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
             concat(builder.input(:password))
             concat(builder.input(:password_confirmation))
             concat(builder.input(:confirm_password))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag('form li.password', :count => 3)
         end
 
@@ -573,27 +555,23 @@ def should_be_required(options)
 
       describe 'when provided' do
         it 'should be passed down to the label tag' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :label => "Kustom"))
-          end
-
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form li label", /Kustom/)
         end
 
         it 'should not generate a label if false' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :label => false))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should_not have_tag("form li label")
         end
 
         it 'should be dupped if frozen' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :label => "Kustom".freeze))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form li label", /Kustom/)
         end
       end
@@ -608,11 +586,9 @@ def should_be_required(options)
                   @new_post.stub!(:meta_description)
                   @new_post.class.should_receive(:human_attribute_name).with('meta_description').and_return(@localized_label_text)
 
-                  form = semantic_form_for(@new_post) do |builder|
+                  concat(semantic_form_for(@new_post) do |builder|
                     concat(builder.input(:meta_description))
-                  end
-
-                  output_buffer.concat(form)
+                  end)
                   output_buffer.should have_tag('form li label', Regexp.new('^' + @localized_label_text))
                 end
               end
@@ -625,11 +601,9 @@ def should_be_required(options)
             it 'should default the humanized method name, passing it down to the label tag' do
               ::Formtastic::SemanticFormBuilder.label_str_method = :humanize
 
-              form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+              concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
                 concat(builder.input(:meta_description))
-              end
-
-              output_buffer.concat(form)
+              end)
               output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
             end
           end
@@ -639,11 +613,9 @@ def should_be_required(options)
               @new_post.stub!(:meta_description) # a two word method name
               @new_post.class.should_receive(:human_attribute_name).with('meta_description').and_return('meta_description'.humanize)
 
-              form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:meta_description))
-              end
-
-              output_buffer.concat(form)
+              end)
               output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
             end
           end
@@ -653,11 +625,9 @@ def should_be_required(options)
               with_config :label_str_method, :capitalize do
                 @new_post.stub!(:meta_description)
 
-                form = semantic_form_for(@new_post) do |builder|
+                concat(semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:meta_description))
-                end
-
-                output_buffer.concat(form)
+                end)
                 output_buffer.should have_tag("form li label", /#{'meta_description'.capitalize}/)
               end
             end
@@ -683,11 +653,10 @@ def should_be_required(options)
           end
 
           it 'should render a label with localized label (I18n)' do
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.input(:title, :label => true))
               concat(builder.input(:published, :as => :boolean, :label => true))
-            end
-            output_buffer.concat(form)
+            end)
             output_buffer.should have_tag('form li label', Regexp.new('^' + @localized_label_text))
           end
 
@@ -701,11 +670,10 @@ def should_be_required(options)
                      }
                    }
                 }
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.input(:title, :label => true))
               concat(builder.input(:published, :as => :boolean, :label => true))
-            end
-            output_buffer.concat(form)
+            end)
             output_buffer.should have_tag('form li label', Regexp.new('^' + @default_localized_label_text))
           end
         end
@@ -723,29 +691,26 @@ def should_be_required(options)
 
         it 'should be passed down to the paragraph tag' do
           hint_text = "this is the title of the post"
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :hint => hint_text))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form li p.inline-hints", hint_text)
         end
 
 				it 'should have a custom hint class if I ask for one' do
           hint_text = "this is the title of the post"
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :hint => hint_text, :hint_class => 'custom-hint-class'))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form li p.custom-hint-class", hint_text)
         end
 
         it 'should have a custom hint class defaulted for all forms' do
           hint_text = "this is the title of the post"
           ::Formtastic::SemanticFormBuilder.default_hint_class = "custom-hint-class"
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :hint => hint_text))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form li p.custom-hint-class", hint_text)
         end
       end
@@ -778,10 +743,9 @@ def should_be_required(options)
                      }
                    }
                 }
-              form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => true))
-              end
-              output_buffer.concat(form)
+              end)
               output_buffer.should have_tag('form li p.inline-hints', @localized_hint_text)
             end
 
@@ -794,28 +758,25 @@ def should_be_required(options)
                      }
                    }
                 }
-              form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => true, :hint_class => 'custom-hint-class'))
-              end
-              output_buffer.concat(form)
+              end)
               output_buffer.should have_tag('form li p.custom-hint-class', @localized_hint_text)
             end
 
             it 'should render a hint paragraph containing an optional localized hint (I18n) if first is not set' do
-              form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => true))
-              end
-              output_buffer.concat(form)
+              end)
               output_buffer.should have_tag('form li p.inline-hints', @default_localized_hint_text)
             end
           end
 
           describe 'when provided value (label value) is set to FALSE' do
             it 'should not render a hint paragraph' do
-              form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => false))
-              end
-              output_buffer.concat(form)
+              end)
               output_buffer.should_not have_tag('form li p.inline-hints', @localized_hint_text)
             end
           end
@@ -840,10 +801,9 @@ def should_be_required(options)
 
         describe 'when localized hint (I18n) is not provided' do
           it 'should not render a hint paragraph' do
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.input(:title))
-            end
-            output_buffer.concat(form)
+            end)
             output_buffer.should_not have_tag('form li p.inline-hints')
           end
         end
@@ -855,28 +815,25 @@ def should_be_required(options)
 
       describe 'when provided' do
         it 'should be passed down to the li tag' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :wrapper_html => {:id => :another_id}))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form li#another_id")
         end
 
         it 'should append given classes to li default classes' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :wrapper_html => {:class => :another_class}, :required => true))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form li.string")
           output_buffer.should have_tag("form li.required")
           output_buffer.should have_tag("form li.another_class")
         end
 
         it 'should allow classes to be an array' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :wrapper_html => {:class => [ :my_class, :another_class ]}))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form li.string")
           output_buffer.should have_tag("form li.my_class")
           output_buffer.should have_tag("form li.another_class")
@@ -885,10 +842,9 @@ def should_be_required(options)
 
       describe 'when not provided' do
         it 'should use default id and class' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form li#post_title_input")
           output_buffer.should have_tag("form li.string")
         end
@@ -903,12 +859,10 @@ def should_be_required(options)
       my_options = { :as => :string }
       output = ''
       
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:title, my_options))
         concat(builder.input(:publish_at, my_options))
-      end
-      output_buffer.concat(@form)
-      
+      end)
       output_buffer.should have_tag 'li.string', :count => 2
     end
     
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index c6840b68f..d6fae56bd 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -9,9 +9,9 @@
     @output_buffer = ''
     mock_everything
 
-    @form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean))
-    end
+    end)
   end
 
   it_should_have_input_wrapper_with_class("boolean")
@@ -19,7 +19,6 @@
   it_should_apply_error_logic_for_input_type(:boolean)
 
   it 'should generate a label containing the input' do
-    output_buffer.concat(@form)
     output_buffer.should have_tag('form li label', :count => 1)
     output_buffer.should have_tag('form li label[@for="post_allow_comments"]')
     output_buffer.should have_tag('form li label', /Allow comments/)
@@ -29,7 +28,6 @@
   end
 
   it 'should generate a checkbox input' do
-    output_buffer.concat(@form)
     output_buffer.should have_tag('form li label input')
     output_buffer.should have_tag('form li label input#post_allow_comments')
     output_buffer.should have_tag('form li label input[@type="checkbox"]')
@@ -38,57 +36,46 @@
   end
   
   it 'should generate a checked input if object.method returns true' do
-    output_buffer.concat(@form)
     output_buffer.should have_tag('form li label input[@checked="checked"]')
     output_buffer.should have_tag('form li input[@name="post[allow_comments]"]', :count => 2)
     output_buffer.should have_tag('form li input#post_allow_comments', :count => 1)
   end
   
   it 'should generate a checked input if :input_html is passed :checked => checked' do
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:answer_comments, :as => :boolean, :input_html => {:checked => 'checked'}))
-    end
-
-    output_buffer.concat(form)
+    end)
     output_buffer.should have_tag('form li label input[@checked="checked"]')
   end
   
   it "should generate a disabled input if :input_html is passed :disabled => 'disabled' " do
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :input_html => {:disabled => 'disabled'}))
-    end
-    
-    output_buffer.concat(form)
+    end)
     output_buffer.should have_tag('form li label input[@disabled="disabled"]')
   end
   
   it 'should generate an input[id] with matching label[for] when id passed in :input_html' do
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :input_html => {:id => 'custom_id'}))
-    end
-    
-    output_buffer.concat(form)
+    end)
     output_buffer.should have_tag('form li label input[@id="custom_id"]')
     output_buffer.should have_tag('form li label[@for="custom_id"]')
   end
 
   it 'should allow checked and unchecked values to be sent' do
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'checked', :unchecked_value => 'unchecked'))
-    end
-
-    output_buffer.concat(form)
+    end)
     output_buffer.should have_tag('form li label input[@type="checkbox"][@value="checked"]:not([@unchecked_value][@checked_value])')
     output_buffer.should have_tag('form li input[@type="hidden"][@value="unchecked"]')
     output_buffer.should_not have_tag('form li label input[@type="hidden"]') # invalid HTML5
   end
 
   it 'should generate a label and a checkbox even if no object is given' do
-    form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+    concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
       concat(builder.input(:allow_comments, :as => :boolean))
-    end
-
-    output_buffer.concat(form)
+    end)
 
     output_buffer.should have_tag('form li label[@for="project_allow_comments"]')
     output_buffer.should have_tag('form li label', /Allow comments/)
@@ -105,9 +92,9 @@
       @output_buffer = ''
       mock_everything
 
-      @form = semantic_form_for(@new_post, :namespace => "context2") do |builder|
+      concat(semantic_form_for(@new_post, :namespace => "context2") do |builder|
         concat(builder.input(:allow_comments, :as => :boolean))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_allow_comments_input")
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index dfdc1a1aa..fac7a3d3d 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -10,9 +10,9 @@
       @output_buffer = ''
       mock_everything
 
-      @form = semantic_form_for(@fred) do |builder|
+      concat(semantic_form_for(@fred) do |builder|
         concat(builder.input(:posts, :as => :check_boxes, :value_as_class => true))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class("check_boxes")
@@ -23,46 +23,38 @@
     it_should_use_the_collection_when_provided(:check_boxes, 'input[@type="checkbox"]')
 
     it 'should generate a legend containing a label with text for the input' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li fieldset legend.label label')
       output_buffer.should have_tag('form li fieldset legend.label label', /Posts/)
     end
 
     it 'should not link the label within the legend to any input' do
-      output_buffer.concat(@form)
       output_buffer.should_not have_tag('form li fieldset legend label[@for^="author_post_ids_"]')
     end
 
     it 'should generate an ordered list with a list item for each choice' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li fieldset ol')
       output_buffer.should have_tag('form li fieldset ol li input[@type=checkbox]', :count => ::Post.all.size)
     end
 
     it 'should have one option with a "checked" attribute' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li input[@checked]', :count => 1)
     end
 
     it 'should not generate hidden inputs with default value blank' do
-      output_buffer.concat(@form)
       output_buffer.should_not have_tag("form li fieldset ol li label input[@type='hidden'][@value='']")
     end
 
     it 'should not render hidden inputs inside the ol' do
-      output_buffer.concat(@form)
       output_buffer.should_not have_tag("form li fieldset ol li input[@type='hidden']")
     end
 
     it 'should render one hidden input for each choice outside the ol' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li fieldset > input[@type='hidden']", :count => 1)
     end
 
     describe "each choice" do
 
       it 'should contain a label for the radio input with a nested input and label text' do
-        output_buffer.concat(@form)
         ::Post.all.each do |post|
           output_buffer.should have_tag('form li fieldset ol li label', /#{post.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='author_post_ids_#{post.id}']")
@@ -70,14 +62,12 @@
       end
 
       it 'should use values as li.class when value_as_class is true' do
-        output_buffer.concat(@form)
         ::Post.all.each do |post|
           output_buffer.should have_tag("form li fieldset ol li.post_#{post.id} label")
         end
       end
 
       it 'should have a checkbox input but no hidden field for each post' do
-        output_buffer.concat(@form)
         ::Post.all.each do |post|
           output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@name='author[post_ids][]']", :count => 1)
@@ -85,27 +75,23 @@
       end
 
       it 'should have a hidden field with an empty array value for the collection to allow clearing of all checkboxes' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li fieldset > input[@type=hidden][@name='author[post_ids][]'][@value='']", :count => 1)
       end
 
       it 'the hidden field with an empty array value should be followed by the ol' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li fieldset > input[@type=hidden][@name='author[post_ids][]'][@value=''] + ol", :count => 1)
       end
 
       it 'should not have a hidden field with an empty string value for the collection' do
-        output_buffer.concat(@form)
         output_buffer.should_not have_tag("form li fieldset > input[@type=hidden][@name='author[post_ids]'][@value='']", :count => 1)
       end
 
       it 'should have a checkbox and a hidden field for each post with :hidden_field => true' do
         output_buffer.replace ''
 
-        form = semantic_form_for(@fred) do |builder|
+        concat(semantic_form_for(@fred) do |builder|
           concat(builder.input(:posts, :as => :check_boxes, :hidden_fields => true, :value_as_class => true))
-        end
-        output_buffer.concat(form)
+        end)
 
         ::Post.all.each do |post|
           output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
@@ -116,7 +102,6 @@
 
       it "should mark input as checked if it's the the existing choice" do
         ::Post.all.include?(@fred.posts.first).should be_true
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
       end
     end
@@ -124,23 +109,20 @@
     describe 'and no object is given' do
       before(:each) do
         output_buffer.replace ''
-        @form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:author_id, :as => :check_boxes, :collection => ::Author.all))
-        end
+        end)
       end
 
       it 'should generate a fieldset with legend' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form li fieldset legend', /Author/)
       end
 
       it 'shold generate an li tag for each item in the collection' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form li fieldset ol li input[@type=checkbox]', :count => ::Author.all.size)
       end
 
       it 'should generate labels for each item' do
-        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='project_author_id_#{author.id}']")
@@ -148,7 +130,6 @@
       end
 
       it 'should generate inputs for each item' do
-        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#project_author_id_#{author.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@type='checkbox']")
@@ -158,10 +139,9 @@
       end
 
       it 'should html escape the label string' do
-        form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:author_id, :as => :check_boxes, :collection => [["<b>Item 1</b>", 1], ["<b>Item 2</b>", 2]]))
-        end
-        output_buffer.concat(form)
+        end)
 
         output_buffer.should have_tag('form li fieldset ol li label') do |label|
           label.body.should match /&lt;b&gt;Item [12]&lt;\/b&gt;$/
@@ -174,10 +154,9 @@
         @output_buffer = ''
         mock_everything
 
-        form = semantic_form_for(@fred) do |builder|
+        concat(semantic_form_for(@fred) do |builder|
           concat(builder.input(:posts, :as => :check_boxes, :value_as_class => true, :hidden_fields => false))
-        end
-        output_buffer.concat(form)
+        end)
       end
 
       it 'should have a checkbox input for each post' do
@@ -206,13 +185,12 @@
         before do
           @new_post.stub!(:author_ids).and_return(nil)
 
-          @form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:authors, :as => :check_boxes, :disabled => nil))
-          end
+          end)
         end
 
         it 'should not have any disabled item(s)' do
-          output_buffer.concat(@form)
           output_buffer.should_not have_tag("form li fieldset ol li label input[@disabled='disabled']")
         end
       end
@@ -221,13 +199,12 @@
         before do
           @new_post.stub!(:author_ids).and_return(nil)
 
-          @form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:authors, :as => :check_boxes, :disabled => @fred.id))
-          end
+          end)
         end
 
         it "should have one item disabled; the specified one" do
-          output_buffer.concat(@form)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 1)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@fred.id}']")
@@ -238,13 +215,12 @@
         before do
           @new_post.stub!(:author_ids).and_return(nil)
 
-          @form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:authors, :as => :check_boxes, :disabled => [@bob.id, @fred.id]))
-          end
+          end)
         end
 
         it "should have multiple items disabled; the specified ones" do
-          output_buffer.concat(@form)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 2)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@bob.id}']", /bob/i)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@bob.id}']")
@@ -262,9 +238,9 @@
         Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
 
         @new_post.stub!(:author_ids).and_return(nil)
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:authors, :as => :check_boxes))
-        end
+        end)
       end
 
       after do
@@ -273,7 +249,6 @@
       end
 
       it "should do foo" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("legend.label label", /Translated/)
       end
 
@@ -282,13 +257,12 @@
     describe "when :label option is set" do
       before do
         @new_post.stub!(:author_ids).and_return(nil)
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:authors, :as => :check_boxes, :label => 'The authors'))
-        end
+        end)
       end
 
       it "should output the correct label title" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("legend.label label", /The authors/)
       end
     end
@@ -297,13 +271,12 @@
       before do
         @output_buffer = ''
         @new_post.stub!(:author_ids).and_return(nil)
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:authors, :as => :check_boxes, :label => false))
-        end
+        end)
       end
 
       it "should not output the legend" do
-        output_buffer.concat(@form)
         output_buffer.should_not have_tag("legend.label")
       end
     end
@@ -311,13 +284,12 @@
     describe "when :required option is true" do
       before do
         @new_post.stub!(:author_ids).and_return(nil)
-        semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:authors, :as => :check_boxes, :required => true))
-        end
+        end)
       end
 
       it "should output the correct label title" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("legend.label label abbr")
       end
     end
@@ -330,10 +302,9 @@
       @output_buffer = ''
       mock_everything
 
-      @form = semantic_form_for(@freds_post) do |builder|
+      concat(semantic_form_for(@freds_post) do |builder|
         concat(builder.input(:authors, :as => :check_boxes))
-      end
-      output_buffer.concat(@form)
+      end)
     end
 
     it 'should render checkboxes' do
@@ -363,11 +334,9 @@
         item.stub!(:custom_value).and_return('custom_value')
         item.should_receive(:custom_value).exactly(3).times
         @new_post.author.should_receive(:custom_value)
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:author, :as => :check_boxes, :value_method => :custom_value, :collection => [item, item, item]))
-        end
-
-        output_buffer.concat(@form)
+        end)
         output_buffer.should have_tag('input[@type=checkbox][@value="custom_value"]', :count => 3)
       end
     end
@@ -379,9 +348,9 @@
       @output_buffer = ''
       mock_everything
 
-      @form = semantic_form_for(@fred, :namespace => "context2") do |builder|
+      concat(semantic_form_for(@fred, :namespace => "context2") do |builder|
         concat(builder.input(:posts, :as => :check_boxes))
-      end
+      end)
     end
 
     it_should_have_label_for('context2_author_post_ids_19')
diff --git a/spec/inputs/country_input_spec.rb b/spec/inputs/country_input_spec.rb
index cb5d54eb6..dc39b0849 100644
--- a/spec/inputs/country_input_spec.rb
+++ b/spec/inputs/country_input_spec.rb
@@ -25,10 +25,10 @@
   describe "when country_select is available as a helper (from a plugin)" do
 
     before do
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         concat(builder.input(:country, :as => :country))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class("country")
@@ -38,14 +38,12 @@
     #it_should_apply_error_logic_for_input_type(:country)
 
     it 'should generate a label for the input' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li label')
       output_buffer.should have_tag('form li label[@for="post_country"]')
       output_buffer.should have_tag('form li label', /Country/)
     end
 
     it "should generate a select" do
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select")
     end
 
@@ -84,11 +82,11 @@
       @output_buffer = ''
       mock_everything
 
-      @form = semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+      concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         builder.should_receive(:country_select).with(:country, [], {}, {:id => "context2_post_country"}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         concat(builder.input(:country, :priority_countries => []))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_country_input")
@@ -101,14 +99,13 @@
     describe "when the attribute is 'country'" do
 
       before do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
           concat(builder.input(:country))
-        end
+        end)
       end
 
       it "should render a country input" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag "form li.country"
       end
     end
@@ -116,14 +113,13 @@
     describe "whent the attribute is 'country_something'" do
 
       before do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:country_subdivision))
           concat(builder.input(:country_code))
-        end
+        end)
       end
 
       it "should render a country input" do
-        output_buffer.concat(@form)
         output_buffer.should_not have_tag "form li.country"
         output_buffer.should have_tag "form li.string", :count => 2
       end
diff --git a/spec/inputs/date_input_spec.rb b/spec/inputs/date_input_spec.rb
index e01094fcb..d9171927a 100644
--- a/spec/inputs/date_input_spec.rb
+++ b/spec/inputs/date_input_spec.rb
@@ -14,9 +14,9 @@
 
     before do
       output_buffer.replace ''
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:publish_at, :as => :date, :order => [:year, :month, :day]))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class("date")
@@ -25,12 +25,10 @@
     it_should_apply_error_logic_for_input_type(:date)
 
     it 'should have a legend and label with the label text inside the fieldset' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.date fieldset legend.label label', /Publish at/)
     end
 
     it 'should associate the legend label with the first select' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.date fieldset legend.label')
       output_buffer.should have_tag('form li.date fieldset legend.label label')
       output_buffer.should have_tag('form li.date fieldset legend.label label[@for]')
@@ -38,13 +36,11 @@
     end
 
     it 'should have an ordered list of three items inside the fieldset' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.date fieldset ol')
       output_buffer.should have_tag('form li.date fieldset ol li', :count => 3)
     end
 
     it 'should have three labels for year, month and day' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.date fieldset ol li label', :count => 3)
       output_buffer.should have_tag('form li.date fieldset ol li label', /year/i)
       output_buffer.should have_tag('form li.date fieldset ol li label', /month/i)
@@ -52,7 +48,6 @@
     end
 
     it 'should have three selects for year, month and day' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li.date fieldset ol li select', :count => 3)
     end
   end
@@ -61,9 +56,9 @@
 
     before do
       output_buffer.replace ''
-      @form = semantic_form_for(@new_post, :namespace => "context2") do |builder|
+      concat(semantic_form_for(@new_post, :namespace => "context2") do |builder|
         concat(builder.input(:publish_at, :as => :date, :order => [:year, :month, :day]))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_publish_at_input")
@@ -78,10 +73,9 @@
     fields.each do |field|
       it "should replace the #{field} label with the specified text if :labels[:#{field}] is set" do
         output_buffer.replace ''
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :date, :labels => { field => "another #{field} label" }))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag('form li.date fieldset ol li label', :count => fields.length)
         fields.each do |f|
           output_buffer.should have_tag('form li.date fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
@@ -90,10 +84,9 @@
 
       it "should not display the label for the #{field} field when :labels[:#{field}] is blank" do
         output_buffer.replace ''
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :date, :labels => { field => "" }))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag('form li.date fieldset ol li label', :count => fields.length-1)
         fields.each do |f|
           output_buffer.should have_tag('form li.date fieldset ol li label', /#{f}/i) unless field == f
diff --git a/spec/inputs/datetime_input_spec.rb b/spec/inputs/datetime_input_spec.rb
deleted file mode 100644
index 8495bb827..000000000
--- a/spec/inputs/datetime_input_spec.rb
+++ /dev/null
@@ -1,239 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-
-describe 'datetime input' do
-
-  include FormtasticSpecHelper
-
-  before do
-    @output_buffer = ''
-    mock_everything
-
-    @new_post.should_receive(:publish_at=).any_number_of_times
-    @new_post.should_receive(:created_at=).any_number_of_times
-    @bob.should_receive(:created_at=).any_number_of_times
-    @new_post.should_receive(:title=).any_number_of_times # Macro stuff forces this.
-  end
-
-  describe "general" do
-
-    before do
-      output_buffer.replace ''
-      @form = semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:publish_at, :as => :datetime))
-      end
-    end
-
-    it_should_have_input_wrapper_with_class("datetime")
-    it_should_have_input_wrapper_with_id("post_publish_at_input")
-    it_should_have_a_nested_fieldset
-    it_should_apply_error_logic_for_input_type(:datetime)
-
-    it 'should have a legend and label with the label text inside the fieldset' do
-      output_buffer.concat(@form)
-      output_buffer.should have_tag('form li.datetime fieldset legend.label label', /Publish at/)
-    end
-
-    it 'should associate the legend label with the first select' do
-      output_buffer.concat(@form)
-      output_buffer.should have_tag('form li.datetime fieldset legend.label label[@for="post_publish_at_1i"]')
-    end
-
-    it 'should have an ordered list of five items inside the fieldset' do
-      output_buffer.concat(@form)
-      output_buffer.should have_tag('form li.datetime fieldset ol')
-      output_buffer.should have_tag('form li.datetime fieldset ol li', :count => 5)
-    end
-
-    it 'should have five labels for year, month, day, hour and minute' do
-      output_buffer.concat(@form)
-      output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => 5)
-      output_buffer.should have_tag('form li.datetime fieldset ol li label', /year/i)
-      output_buffer.should have_tag('form li.datetime fieldset ol li label', /month/i)
-      output_buffer.should have_tag('form li.datetime fieldset ol li label', /day/i)
-      output_buffer.should have_tag('form li.datetime fieldset ol li label', /hour/i)
-      output_buffer.should have_tag('form li.datetime fieldset ol li label', /minute/i)
-    end
-
-    it 'should have five selects for year, month, day, hour and minute' do
-      output_buffer.concat(@form)
-      output_buffer.should have_tag('form li.datetime fieldset ol li select', :count => 5)
-    end
-
-    it 'should generate a sanitized label and matching ids for attribute' do
-      form = semantic_form_for(@new_post) do |builder|
-        fields = builder.semantic_fields_for(@bob, :index => 10) do |bob_builder|
-          concat(bob_builder.input(:created_at, :as => :datetime))
-        end
-        concat(fields)
-      end
-      output_buffer.concat(form)
-
-      1.upto(5) do |i|
-        output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_10_created_at_#{i}i']")
-        output_buffer.should have_tag("form li fieldset ol li #post_author_10_created_at_#{i}i")
-      end
-    end
-  end
-
-  describe 'when :discard_input => true is set' do
-    it 'should use default attribute value when it is not nil' do
-      @new_post.stub!(:publish_at).and_return(Date.new(2007,12,27))
-      form = semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:publish_at, :as => :datetime, :discard_day => true))
-      end
-
-      output_buffer.concat(form)
-      output_buffer.should have_tag("form li input[@type='hidden'][@value='27']")
-    end
-  end
-
-  describe 'inputs order' do
-    it 'should have a default' do
-      output_buffer.replace ''
-      semantic_form_for(@new_post) do |builder|
-        self.should_receive(:select_year).once.ordered.and_return('')
-        self.should_receive(:select_month).once.ordered.and_return('')
-        self.should_receive(:select_day).once.ordered.and_return('')
-        builder.input(:publish_at, :as => :datetime)
-      end
-    end
-
-    it 'should be specified with :order option' do
-      ::I18n.backend.store_translations 'en', :date => { :order => [:month, :year, :day] }
-      output_buffer.replace ''
-      semantic_form_for(@new_post) do |builder|
-        self.should_receive(:select_month).once.ordered.and_return('')
-        self.should_receive(:select_year).once.ordered.and_return('')
-        self.should_receive(:select_day).once.ordered.and_return('')
-        builder.input(:publish_at, :as => :datetime)
-        ::I18n.backend.store_translations 'en', :date => nil
-      end
-    end
-
-    it 'should be changed through I18n' do
-      output_buffer.replace ''
-      semantic_form_for(@new_post) do |builder|
-        self.should_receive(:select_day).once.ordered.and_return('')
-        self.should_receive(:select_month).once.ordered.and_return('')
-        self.should_receive(:select_year).once.ordered.and_return('')
-        builder.input(:publish_at, :as => :datetime, :order => [:day, :month, :year])
-      end
-    end
-  end
-
-  describe 'when the locale changes the label text' do
-    before do
-      ::I18n.backend.store_translations 'en', :datetime => {:prompts => {
-        :year => 'The Year', :month => 'The Month', :day => 'The Day',
-        :hour => 'The Hour', :minute => 'The Minute'
-      }}
-      output_buffer.replace ''
-      @form = semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:publish_at, :as => :datetime))
-      end
-    end
-
-    after do
-      ::I18n.backend.store_translations 'en', :formtastic => {
-        :year => nil, :month => nil, :day => nil,
-        :hour => nil, :minute => nil
-      }
-    end
-
-    it 'should have translated labels for year, month, day, hour and minute' do
-      output_buffer.concat(@form)
-      output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Year/)
-      output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Month/)
-      output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Day/)
-      output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Hour/)
-      output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Minute/)
-    end
-  end
-
-  describe 'when no object is given' do
-    before(:each) do
-      output_buffer.replace ''
-      @form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
-        concat(builder.input(:publish_at, :as => :datetime))
-      end
-    end
-
-    it 'should have fieldset with legend - classified as a label' do
-      output_buffer.concat(@form)
-      output_buffer.should have_tag('form li.datetime fieldset legend.label', /Publish at/)
-    end
-
-    it 'should have labels for each input' do
-      output_buffer.concat(@form)
-      output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => 5)
-    end
-
-    it 'should have selects for each inputs' do
-      output_buffer.concat(@form)
-      output_buffer.should have_tag('form li.datetime fieldset ol li select', :count => 5)
-    end
-  end
-
-  #describe 'when an object is given and the attribute value is nil' do
-  #  before(:each) do
-  #    @new_post.stub!(:publish_at).and_return(nil)
-  #    output_buffer.replace ''
-  #    semantic_form_for(@new_post) do |builder|
-  #      concat(builder.input(:publish_at, :as => :datetime))
-  #    end
-  #  end
-  #
-  #  it 'should not select a value' do
-  #    output_buffer.should_not have_tag('form li.datetime option[@selected]')
-  #  end
-  #
-  #end
-
-  describe "when namespace is provided" do
-
-    before do
-      output_buffer.replace ''
-      @form = semantic_form_for(@new_post, :namespace => "context2") do |builder|
-        concat(builder.input(:created_at, :as => :datetime, :include_seconds => true))
-      end
-    end
-
-    it_should_have_input_wrapper_with_id("context2_post_created_at_input")
-    (1..6).each do |i|
-      it_should_have_select_with_id("context2_post_created_at_#{i}i")
-    end
-
-  end
-
-  describe ':labels option' do
-    fields = [:year, :month, :day, :hour, :minute]
-    fields.each do |field|
-      it "should replace the #{field} label with the specified text if :labels[:#{field}] is set" do
-        output_buffer.replace ''
-        form = semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:created_at, :as => :datetime, :labels => { field => "another #{field} label" }))
-        end
-        output_buffer.concat(form)
-        output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => fields.length)
-        fields.each do |f|
-          output_buffer.should have_tag('form li.datetime fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
-        end
-      end
-
-      it "should not display the label for the #{field} field when :labels[:#{field}] is blank" do
-        output_buffer.replace ''
-        form = semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:created_at, :as => :datetime, :labels => { field => "" }))
-        end
-        output_buffer.concat(form)
-        output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => fields.length-1)
-        fields.each do |f|
-          output_buffer.should have_tag('form li.datetime fieldset ol li label', /#{f}/i) unless field == f
-        end
-      end
-    end
-  end
-
-end
-
diff --git a/spec/inputs/email_input_spec.rb b/spec/inputs/email_input_spec.rb
index c7a6368f1..4c664f8a9 100644
--- a/spec/inputs/email_input_spec.rb
+++ b/spec/inputs/email_input_spec.rb
@@ -12,9 +12,9 @@
 
   describe "when object is provided" do
     before do
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:email))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class(:email)
@@ -30,9 +30,9 @@
   describe "when namespace is provided" do
 
     before do
-      @form = semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+      concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         concat(builder.input(:email))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_email_input")
diff --git a/spec/inputs/file_input_spec.rb b/spec/inputs/file_input_spec.rb
index e65e3b8c7..d95f5d0c5 100644
--- a/spec/inputs/file_input_spec.rb
+++ b/spec/inputs/file_input_spec.rb
@@ -9,9 +9,9 @@
     @output_buffer = ''
     mock_everything
 
-    @form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:body, :as => :file))
-    end
+    end)
   end
 
   it_should_have_input_wrapper_with_class("file")
@@ -23,10 +23,9 @@
   it_should_apply_error_logic_for_input_type(:file)
 
   it 'should use input_html to style inputs' do
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :file, :input_html => { :class => 'myclass' }))
-    end
-    output_buffer.concat(form)
+    end)
     output_buffer.should have_tag("form li input.myclass")
   end
 
@@ -36,9 +35,9 @@
       @output_buffer = ''
       mock_everything
 
-      @form = semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+      concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         concat(builder.input(:body, :as => :file))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_body_input")
diff --git a/spec/inputs/hidden_input_spec.rb b/spec/inputs/hidden_input_spec.rb
index 5ab5bc824..f8914edc7 100644
--- a/spec/inputs/hidden_input_spec.rb
+++ b/spec/inputs/hidden_input_spec.rb
@@ -9,13 +9,13 @@
     @output_buffer = ''
     mock_everything
 
-    @form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:secret, :as => :hidden))
       concat(builder.input(:author_id, :as => :hidden, :value => 99))
       concat(builder.input(:published, :as => :hidden, :input_html => {:value => true}))
       concat(builder.input(:reviewer, :as => :hidden, :input_html => {:class => 'new_post_reviewer', :id => 'new_post_reviewer'}))
       concat(builder.input(:author, :as => :hidden, :value => 'direct_value', :input_html => {:value => "formtastic_value"}))
-    end
+    end)
   end
 
   it_should_have_input_wrapper_with_class("hidden")
@@ -23,30 +23,25 @@
   it_should_not_have_a_label
 
   it "should generate a input field" do
-    output_buffer.concat(@form)
     output_buffer.should have_tag("form li input#post_secret")
     output_buffer.should have_tag("form li input#post_secret[@type=\"hidden\"]")
     output_buffer.should have_tag("form li input#post_secret[@name=\"post[secret]\"]")
   end
 
   it "should pass any explicitly specified value - using :value" do
-    output_buffer.concat(@form)
     output_buffer.should have_tag("form li input#post_author_id[@type=\"hidden\"][@value=\"99\"]")
   end
 
   # Handle Formtastic :input_html options for consistency.
   it "should pass any explicitly specified value - using :input_html options" do
-    output_buffer.concat(@form)
     output_buffer.should have_tag("form li input#post_published[@type=\"hidden\"][@value=\"true\"]")
   end
 
   it "should pass any option specified using :input_html" do
-    output_buffer.concat(@form)
     output_buffer.should have_tag("form li input#new_post_reviewer[@type=\"hidden\"][@class=\"new_post_reviewer\"]")
   end
 
   it "should prefer :input_html over directly supplied options" do
-    output_buffer.concat(@form)
     output_buffer.should have_tag("form li input#post_author[@type=\"hidden\"][@value=\"formtastic_value\"]")
   end
 
@@ -55,21 +50,19 @@
     @errors.stub!(:[]).with(:secret).and_return(["foo", "bah"])
     @new_post.stub!(:errors).and_return(@errors)
 
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:secret, :as => :hidden))
-    end
+    end)
 
-    output_buffer.concat(form)
     output_buffer.should_not have_tag("form li p.inline-errors")
     output_buffer.should_not have_tag("form li ul.errors")
   end
 
   it "should not render inline hints" do
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:secret, :as => :hidden, :hint => "all your base are belong to use"))
-    end
+    end)
 
-    output_buffer.concat(form)
     output_buffer.should_not have_tag("form li p.inline-hints")
     output_buffer.should_not have_tag("form li ul.hints")
   end
@@ -80,13 +73,13 @@
       @output_buffer = ''
       mock_everything
 
-      @form = semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+      concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         concat(builder.input(:secret, :as => :hidden))
         concat(builder.input(:author_id, :as => :hidden, :value => 99))
         concat(builder.input(:published, :as => :hidden, :input_html => {:value => true}))
         concat(builder.input(:reviewer, :as => :hidden, :input_html => {:class => 'new_post_reviewer', :id => 'new_post_reviewer'}))
         concat(builder.input(:author, :as => :hidden, :value => 'direct_value', :input_html => {:value => "formtastic_value"}))
-      end
+      end)
     end
 
     attributes_to_check = [:secret, :author_id, :published, :reviewer, :author]
diff --git a/spec/inputs/numeric_input_spec.rb b/spec/inputs/numeric_input_spec.rb
index ace93ffb8..ede943aff 100644
--- a/spec/inputs/numeric_input_spec.rb
+++ b/spec/inputs/numeric_input_spec.rb
@@ -9,9 +9,9 @@
     @output_buffer = ''
     mock_everything
 
-    @form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :numeric))
-    end
+    end)
   end
 
   it_should_have_input_wrapper_with_class(:numeric)
@@ -29,9 +29,9 @@
 
   describe "when no object is provided" do
     before do
-      @form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+      concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
         concat(builder.input(:title, :as => :numeric))
-      end
+      end)
     end
 
     it_should_have_label_with_text(/Title/)
@@ -43,9 +43,9 @@
 
   describe "when namespace provided" do
     before do
-      @form = semantic_form_for(@new_post, :namespace => :context2) do |builder|
+      concat(semantic_form_for(@new_post, :namespace => :context2) do |builder|
         concat(builder.input(:title, :as => :numeric))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_title_input")
diff --git a/spec/inputs/password_input_spec.rb b/spec/inputs/password_input_spec.rb
index ee348f433..7516b8abb 100644
--- a/spec/inputs/password_input_spec.rb
+++ b/spec/inputs/password_input_spec.rb
@@ -9,9 +9,9 @@
     @output_buffer = ''
     mock_everything
 
-    @form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :password))
-    end
+    end)
   end
 
   it_should_have_input_wrapper_with_class(:password)
@@ -30,9 +30,9 @@
 
   describe "when no object is provided" do
     before do
-      @form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+      concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
         concat(builder.input(:title, :as => :password))
-      end
+      end)
     end
 
     it_should_have_label_with_text(/Title/)
@@ -45,9 +45,9 @@
   describe "when namespace is provided" do
 
     before do
-      @form = semantic_form_for(@new_post, :namespace => "context2") do |builder|
+      concat(semantic_form_for(@new_post, :namespace => "context2") do |builder|
         concat(builder.input(:title, :as => :password))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_title_input")
diff --git a/spec/inputs/phone_input_spec.rb b/spec/inputs/phone_input_spec.rb
index b7bfd39c5..f48897e2d 100644
--- a/spec/inputs/phone_input_spec.rb
+++ b/spec/inputs/phone_input_spec.rb
@@ -12,9 +12,9 @@
 
   describe "when object is provided" do
     before do
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:phone))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class(:phone)
@@ -30,9 +30,9 @@
   describe "when namespace is provided" do
 
     before do
-      @form = semantic_form_for(@new_post, :namespace => "context2") do |builder|
+      concat(semantic_form_for(@new_post, :namespace => "context2") do |builder|
         concat(builder.input(:phone))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_phone_input")
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 593e6588f..48a9a7132 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -12,9 +12,9 @@
 
   describe 'for belongs_to association' do
     before do
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :radio, :value_as_class => true))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class("radio")
@@ -24,31 +24,26 @@
     it_should_use_the_collection_when_provided(:radio, 'input')
 
     it 'should generate a legend containing a label with text for the input' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li fieldset legend.label label')
       output_buffer.should have_tag('form li fieldset legend.label label', /Author/)
     end
 
     it 'should not link the label within the legend to any input' do
-      output_buffer.concat(@form)
       output_buffer.should_not have_tag('form li fieldset legend label[@for]')
     end
 
     it 'should generate an ordered list with a list item for each choice' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li fieldset ol')
       output_buffer.should have_tag('form li fieldset ol li', :count => ::Author.all.size)
     end
 
     it 'should have one option with a "checked" attribute' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li input[@checked]', :count => 1)
     end
 
     describe "each choice" do
 
       it 'should contain a label for the radio input with a nested input and label text' do
-        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_id_#{author.id}']")
@@ -56,14 +51,12 @@
       end
 
       it 'should use values as li.class when value_as_class is true' do
-        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag("form li fieldset ol li.author_#{author.id} label")
         end
       end
 
       it "should have a radio input" do
-        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#post_author_id_#{author.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@type='radio']")
@@ -77,21 +70,19 @@
         @new_post.author.id.should == @bob.id
         @new_post.author.should == @bob
 
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:author, :as => :radio))
-        end
+        end)
 
-        output_buffer.concat(form)
         output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
       end
 
       it "should not contain invalid HTML attributes" do
 
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:author, :as => :radio))
-        end
+        end)
 
-        output_buffer.concat(form)
         output_buffer.should_not have_tag("form li fieldset ol li input[@find_options]")
       end
 
@@ -100,23 +91,20 @@
     describe 'and no object is given' do
       before(:each) do
         output_buffer.replace ''
-        @form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:author_id, :as => :radio, :collection => ::Author.all))
-        end
+        end)
       end
 
       it 'should generate a fieldset with legend' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form li fieldset legend', /Author/)
       end
 
       it 'should generate an li tag for each item in the collection' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form li fieldset ol li', :count => ::Author.all.size)
       end
 
       it 'should generate labels for each item' do
-        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='project_author_id_#{author.id}']")
@@ -124,18 +112,15 @@
       end
 
       it 'should html escape the label string' do
-        output_buffer.replace ''
-        form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:author_id, :as => :radio, :collection => [["<b>Item 1</b>", 1], ["<b>Item 2</b>", 2]]))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag('form li fieldset ol li label') do |label|
           label.body.should match /&lt;b&gt;Item [12]&lt;\/b&gt;$/
         end
       end
 
       it 'should generate inputs for each item' do
-        output_buffer.concat(@form)
         ::Author.all.each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#project_author_id_#{author.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@type='radio']")
@@ -153,9 +138,9 @@
 
       Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
       @new_post.stub!(:author_ids).and_return(nil)
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:authors, :as => :radio))
-      end
+      end)
     end
 
     after do
@@ -164,7 +149,6 @@
     end
 
     it "should do foo" do
-      output_buffer.concat(@form)
       output_buffer.should have_tag("legend.label label", /Translated/)
     end
 
@@ -173,13 +157,12 @@
   describe "when :label option is set" do
     before do
       @new_post.stub!(:author_ids).and_return(nil)
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:authors, :as => :radio, :label => 'The authors'))
-      end
+      end)
     end
 
     it "should output the correct label title" do
-      output_buffer.concat(@form)
       output_buffer.should have_tag("legend.label label", /The authors/)
     end
   end
@@ -188,13 +171,12 @@
     before do
       @output_buffer = ''
       @new_post.stub!(:author_ids).and_return(nil)
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:authors, :as => :radio, :label => false))
-      end
+      end)
     end
 
     it "should not output the legend" do
-      output_buffer.concat(@form)
       output_buffer.should_not have_tag("legend.label")
     end
   end
@@ -202,13 +184,12 @@
   describe "when :required option is true" do
     before do
       @new_post.stub!(:author_ids).and_return(nil)
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:authors, :as => :radio, :required => true))
-      end
+      end)
     end
 
     it "should output the correct label title" do
-      output_buffer.concat(@form)
       output_buffer.should have_tag("legend.label label abbr")
     end
   end
@@ -217,12 +198,12 @@
     before do
       @output_buffer = ''
       @new_post.stub!(:author_ids).and_return(nil)
-      @form = semantic_form_for(@new_post, :namespace => "custom_prefix") do |builder|
+      concat(semantic_form_for(@new_post, :namespace => "custom_prefix") do |builder|
         concat(builder.input(:authors, :as => :radio, :label => ''))
-      end
+      end)
 
-      @form.should match(/for="custom_prefix_post_author_ids_(\d+)"/)
-      @form.should match(/id="custom_prefix_post_author_ids_(\d+)"/)
+      output_buffer.should match(/for="custom_prefix_post_author_ids_(\d+)"/)
+      output_buffer.should match(/id="custom_prefix_post_author_ids_(\d+)"/)
     end
     it_should_have_input_wrapper_with_id("custom_prefix_post_authors_input")
   end
diff --git a/spec/inputs/search_input_spec.rb b/spec/inputs/search_input_spec.rb
index a7ab3ef09..68800d3d3 100644
--- a/spec/inputs/search_input_spec.rb
+++ b/spec/inputs/search_input_spec.rb
@@ -12,9 +12,9 @@
 
   describe "when object is provided" do
     before do
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:search))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class(:search)
@@ -30,9 +30,9 @@
   describe "when namespace is provided" do
 
     before do
-      @form = semantic_form_for(@new_post, :namespace => "context2") do |builder|
+      concat(semantic_form_for(@new_post, :namespace => "context2") do |builder|
         concat(builder.input(:search))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_search_input")
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 28a7ced0b..b3e88734a 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -15,14 +15,13 @@
       before do
         @array_with_values = ["Title A", "Title B", "Title C"]
         @array_with_keys_and_values = [["Title D", 1], ["Title E", 2], ["Title F", 3]]
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :select, :collection => @array_with_values))
           concat(builder.input(:title, :as => :select, :collection => @array_with_keys_and_values))
-        end
+        end)
       end
 
       it 'should have a option for each key and/or value' do
-        output_buffer.concat(@form)
         @array_with_values.each do |v|
           output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
         end
@@ -35,13 +34,12 @@
     describe 'using a range' do
       before do
         @range_with_values = 1..5
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :select, :collection => @range_with_values))
-        end
+        end)
       end
 
       it 'should have an option for each value' do
-        output_buffer.concat(@form)
         @range_with_values.each do |v|
           output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
         end
@@ -51,13 +49,12 @@
     describe 'using a string' do
       before do
         @string ="<option value='0'>0</option><option value='1'>1</option>"
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :select, :collection => @string))
-        end
+        end)
       end
 
       it 'should render select options using provided HTML string' do
-        output_buffer.concat(@form)
         2.times do |v|
           output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
         end
@@ -72,9 +69,9 @@
         ::I18n.load_path = [File.join(File.dirname(__FILE__), *%w[.. .. lib locale en.yml])]
         ::I18n.backend.send(:init_translations)
 
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:published, :as => :select))
-        end
+        end)
       end
 
       after do
@@ -82,7 +79,6 @@
       end
 
       it 'should render a select with at least options: true/false' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select option[@value='true']", /^Yes$/)
         output_buffer.should have_tag("form li select option[@value='false']", /^No$/)
       end
@@ -93,9 +89,9 @@
         @boolean_select_labels = {:yes => 'Yep', :no => 'Nope'}
         ::I18n.backend.store_translations :en, :formtastic => @boolean_select_labels
 
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:published, :as => :select))
-        end
+        end)
       end
 
       after do
@@ -103,7 +99,6 @@
       end
 
       it 'should render a select with at least options: true/false' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select option[@value='true']", /#{@boolean_select_labels[:yes]}/)
         output_buffer.should have_tag("form li select option[@value='false']", /#{@boolean_select_labels[:no]}/)
       end
@@ -112,10 +107,10 @@
 
   describe 'for a belongs_to association' do
     before do
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select))
         concat(builder.input(:reviewer, :as => :select))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class("select")
@@ -127,36 +122,30 @@
     it_should_use_the_collection_when_provided(:select, 'option')
 
     it 'should have a select inside the wrapper' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#post_author_id')
       output_buffer.should have_tag('form li select#post_reviewer_id')
     end
 
     it 'should have a valid name' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select[@name='post[author_id]']")
       output_buffer.should_not have_tag("form li select[@name='post[author_id][]']")
       output_buffer.should_not have_tag("form li select[@name='post[reviewer_id][]']")
     end
 
     it 'should not create a multi-select' do
-      output_buffer.concat(@form)
       output_buffer.should_not have_tag('form li select[@multiple]')
     end
 
     it 'should create a select without size' do
-      output_buffer.concat(@form)
       output_buffer.should_not have_tag('form li select[@size]')
     end
 
     it 'should have a blank option' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select option[@value='']")
     end
 
     it 'should have a select option for each Author' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select[@name='post[author_id]'] option", :count => ::Author.all.size + 1)
       ::Author.all.each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
@@ -164,7 +153,6 @@
     end
 
     it 'should have one option with a "selected" attribute' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select[@name='post[author_id]'] option[@selected]", :count => 1)
     end
 
@@ -173,11 +161,10 @@
       @new_post.stub!(:author_status_id).and_return(@bob.id)
       @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => :integer, :limit => 255))
 
-      form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author_status, :as => :select))
-      end
+      end)
 
-      output_buffer.concat(form)
       output_buffer.should have_tag('form li select#post_author_status_id')
     end
   end
@@ -187,9 +174,9 @@
       [@freds_post].each { |post| post.stub!(:to_label).and_return("Post - #{post.id}") }
       @fred.should_receive(:posts)
 
-      semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:main_post, :as => :select, :group_by => :author ) )
-      end
+      end)
     end
   end
 
@@ -238,12 +225,12 @@
         continent.stub!(:authors).and_return([@authors[i]])
       end
 
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select, :group_by => :continent ) )
         concat(builder.input(:author, :as => :select, :group_by => :continent, :group_label_method => :id ) )
         concat(builder.input(:author, :as => :select, :group_by => :continent, :label_method => :login ) )
         concat(builder.input(:author, :as => :select, :group_by => :continent, :label_method => :login, :group_label_method => :id ) )
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class("select")
@@ -255,33 +242,27 @@
 
     0.upto(1) do |i|
       it 'should have all option groups and the right values' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select optgroup[@label='#{@continent_names[i]}']", @authors[i].to_label)
       end
 
       it 'should have custom group labels' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select optgroup[@label='#{@continents[i].id}']", @authors[i].to_label)
       end
 
       it 'should have custom author labels' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select optgroup[@label='#{@continent_names[i]}']", @authors[i].login)
       end
 
       it 'should have custom author and group labels' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select optgroup[@label='#{@continents[i].id}']", @authors[i].login)
       end
     end
 
     it 'should have no duplicate groups' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select optgroup', :count => 8)
     end
 
     it 'should sort the groups on the label method' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select optgroup[@label='Africa']")
       output_buffer.should have_tag("form li select optgroup[@label='99']")
     end
@@ -297,9 +278,9 @@
 
   describe 'for a has_many association' do
     before do
-      @form = semantic_form_for(@fred) do |builder|
+      concat(semantic_form_for(@fred) do |builder|
         concat(builder.input(:posts, :as => :select))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class("select")
@@ -311,18 +292,15 @@
     it_should_use_the_collection_when_provided(:select, 'option')
 
     it 'should have a select inside the wrapper' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#author_post_ids')
     end
 
     it 'should have a multi-select select' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select[@multiple="multiple"]')
     end
 
     it 'should have a select option for each Post' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select option', :count => ::Post.all.size)
       ::Post.all.each do |post|
         output_buffer.should have_tag("form li select option[@value='#{post.id}']", /#{post.to_label}/)
@@ -330,39 +308,35 @@
     end
 
     it 'should not have a blank option by default' do
-      output_buffer.concat(@form)
       output_buffer.should_not have_tag("form li select option[@value='']")
     end
 
     it 'should respect the :include_blank option for single selects' do
-      @form = semantic_form_for(@fred) do |builder|
+      concat(semantic_form_for(@fred) do |builder|
         concat(builder.input(:posts, :as => :select, :multiple => false, :include_blank => true))
-      end
+      end)
 
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select option[@value='']")
     end
 
     it 'should respect the :include_blank option for multiple selects' do
-      @form = semantic_form_for(@fred) do |builder|
+      concat(semantic_form_for(@fred) do |builder|
         concat(builder.input(:posts, :as => :select, :multiple => true, :include_blank => true))
-      end
+      end)
 
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select option[@value='']")
     end
 
     it 'should have one option with a "selected" attribute' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select option[@selected]', :count => 1)
     end
   end
 
   describe 'for a has_and_belongs_to_many association' do
     before do
-      @form = semantic_form_for(@freds_post) do |builder|
+      concat(semantic_form_for(@freds_post) do |builder|
         concat(builder.input(:authors, :as => :select))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class("select")
@@ -374,18 +348,15 @@
     it_should_use_the_collection_when_provided(:select, 'option')
 
     it 'should have a select inside the wrapper' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#post_author_ids')
     end
 
     it 'should have a multi-select select' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select[@multiple="multiple"]')
     end
 
     it 'should have a select option for each Author' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select option', :count => ::Author.all.size)
       ::Author.all.each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
@@ -393,30 +364,26 @@
     end
 
     it 'should not have a blank option by default' do
-      output_buffer.concat(@form)
       output_buffer.should_not have_tag("form li select option[@value='']")
     end
 
     it 'should respect the :include_blank option for single selects' do
-      @form = semantic_form_for(@freds_post) do |builder|
+      concat(semantic_form_for(@freds_post) do |builder|
         concat(builder.input(:authors, :as => :select, :multiple => false, :include_blank => true))
-      end
+      end)
 
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select option[@value='']")
     end
 
     it 'should respect the :include_blank option for multiple selects' do
-      @form = semantic_form_for(@freds_post) do |builder|
+      concat(semantic_form_for(@freds_post) do |builder|
         concat(builder.input(:authors, :as => :select, :multiple => true, :include_blank => true))
-      end
+      end)
 
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select option[@value='']")
     end
 
     it 'should have one option with a "selected" attribute' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select option[@selected]', :count => 1)
     end
   end
@@ -424,43 +391,38 @@
   describe 'when :prompt => "choose something" is set' do
     before do
       @new_post.stub!(:author_id).and_return(nil)
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select, :prompt => "choose author"))
-      end
+      end)
     end
 
     it 'should have a select with prompt' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select option[@value='']", /choose author/)
     end
 
     it 'should not have a blank select option' do
-      output_buffer.concat(@form)
       output_buffer.should_not have_tag("form li select option[@value='']", "")
     end
   end
 
   describe 'when no object is given' do
     before(:each) do
-      @form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+      concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:author, :as => :select, :collection => ::Author.all))
-      end
+      end)
     end
 
     it 'should generate label' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li label', /Author/)
       output_buffer.should have_tag("form li label[@for='project_author']")
     end
 
     it 'should generate select inputs' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li select#project_author')
       output_buffer.should have_tag('form li select option', :count => ::Author.all.size + 1)
     end
 
     it 'should generate an option to each item' do
-      output_buffer.concat(@form)
       ::Author.all.each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
       end
@@ -469,16 +431,15 @@
 
   describe 'when a grouped collection collection is given' do
     before(:each) do
-      @form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+      concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
         @grouped_opts = [['one',   ['pencil', 'crayon', 'pen']],
                          ['two',   ['eyes', 'hands', 'feet']],
                          ['three', ['wickets', 'witches', 'blind mice']]]
         concat(builder.input(:author, :as => :select, :collection => grouped_options_for_select(@grouped_opts, "hands")))
-      end
+      end)
     end
 
     it 'should generate an option to each item' do
-      output_buffer.concat(@form)
       @grouped_opts.each do |opt_pair|
         output_buffer.should have_tag("form li select optgroup[@label='#{opt_pair[0]}']")
         opt_pair[1].each do |v|
@@ -498,18 +459,15 @@
 
     describe ":as is not set" do
       before do
-        @form_new_post = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:meta_description, :collection => @some_meta_descriptions))
-        end
-        @form_project = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        end)
+        concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:meta_description, :collection => @some_meta_descriptions))
-        end
-
+        end)
       end
 
       it "should render a select field" do
-        output_buffer.concat(@form_new_post)
-        output_buffer.concat(@form_project)
         output_buffer.should have_tag("form li select", :count => 2)
       end
     end
@@ -517,17 +475,15 @@
     describe ":as is set" do
       before do
         # Should not be a case, but just checking :as got highest priority in setting input type.
-        @form_new_post = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:meta_description, :as => :string, :collection => @some_meta_descriptions))
-        end
-        @form_project = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        end)
+        concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:meta_description, :as => :string, :collection => @some_meta_descriptions))
-        end
+        end)
       end
 
       it "should render a text field" do
-        output_buffer.concat(@form_new_post)
-        output_buffer.concat(@form_project)
         output_buffer.should have_tag("form li input[@type='text']", :count => 2)
       end
     end
@@ -535,9 +491,9 @@
 
   describe 'when a namespace is provided' do
     before do
-      @form = semantic_form_for(@freds_post, :namespace => 'context2') do |builder|
+      concat(semantic_form_for(@freds_post, :namespace => 'context2') do |builder|
         concat(builder.input(:authors, :as => :select))
-      end
+      end)
     end
     it_should_have_input_wrapper_with_id("context2_post_authors_input")
     it_should_have_select_with_id("context2_post_author_ids")
diff --git a/spec/inputs/string_input_spec.rb b/spec/inputs/string_input_spec.rb
index c0d293cf6..5b0d7ae59 100644
--- a/spec/inputs/string_input_spec.rb
+++ b/spec/inputs/string_input_spec.rb
@@ -12,9 +12,9 @@
 
   describe "when object is provided" do
     before do
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:title, :as => :string))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class(:string)
@@ -32,10 +32,9 @@
     it_should_apply_error_logic_for_input_type(:string)
 
     def input_field_for_method_should_have_maxlength(method, maxlength)
-      form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(method))
-      end
-      output_buffer.concat(form)
+      end)
       output_buffer.should have_tag("form li input[@maxlength='#{maxlength}']")
     end
 
@@ -83,11 +82,10 @@ def should_have_maxlength(maxlength, options)
             active_model_length_validator([:title], options[:options])
           ])
 
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title))
-          end
+          end)
 
-          output_buffer.concat(form)
           output_buffer.should have_tag("form li input##{@new_post.class.name.underscore}_title[@maxlength='#{maxlength}']")
         end
 
@@ -141,9 +139,9 @@ def should_have_maxlength(maxlength, options)
   describe "when namespace is provided" do
 
     before do
-      @form = semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+      concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         concat(builder.input(:title, :as => :string))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_title_input")
@@ -153,9 +151,9 @@ def should_have_maxlength(maxlength, options)
 
   describe "when no object is provided" do
     before do
-      @form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+      concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
         concat(builder.input(:title, :as => :string))
-      end
+      end)
     end
 
     it_should_have_label_with_text(/Title/)
@@ -167,13 +165,12 @@ def should_have_maxlength(maxlength, options)
 
   describe "when size is nil" do
     before do
-      @form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+      concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
         concat(builder.input(:title, :as => :string, :input_html => {:size => nil}))
-      end
+      end)
     end
 
     it "should have no size attribute" do
-      output_buffer.concat(@form)
       output_buffer.should_not have_tag("input[@size]")
     end
   end
diff --git a/spec/inputs/text_input_spec.rb b/spec/inputs/text_input_spec.rb
index e390e66d8..f02e50a36 100644
--- a/spec/inputs/text_input_spec.rb
+++ b/spec/inputs/text_input_spec.rb
@@ -9,9 +9,9 @@
     @output_buffer = ''
     mock_everything
 
-    @form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:body, :as => :text))
-    end
+    end)
   end
 
   it_should_have_input_wrapper_with_class("text")
@@ -24,47 +24,42 @@
 
   it 'should use input_html to style inputs' do
     output_buffer.replace ''
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :class => 'myclass' }))
-    end
-    output_buffer.concat(form)
+    end)
     output_buffer.should have_tag("form li textarea.myclass")
   end
 
   it "should have a cols attribute when :cols is a number in :input_html" do
     output_buffer.replace ''
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :cols => 42 }))
-    end
-    output_buffer.concat(form)
+    end)
     output_buffer.should have_tag("form li textarea[@cols='42']")
   end
 
   it "should not have a cols attribute when :cols is nil in :input_html" do
     output_buffer.replace ''
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :cols => nil }))
-    end
-    output_buffer.concat(form)
+    end)
     output_buffer.should_not have_tag("form li textarea[@cols]")
   end
 
   it "should have a rows attribute when :rows is a number in :input_html" do
     output_buffer.replace ''
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :rows => 42 }))
-    end
-    output_buffer.concat(form)
+    end)
     output_buffer.should have_tag("form li textarea[@rows='42']")
 
   end
 
   it "should not have a rows attribute when :rows is nil in :input_html" do
     output_buffer.replace ''
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :rows => nil }))
-    end
-    output_buffer.concat(form)
+    end)
     output_buffer.should_not have_tag("form li textarea[@rows]")
   end
 
@@ -74,9 +69,9 @@
       @output_buffer = ''
       mock_everything
 
-      @form = semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+      concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         concat(builder.input(:body, :as => :text))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_body_input")
@@ -92,20 +87,18 @@
 
     it "should have a rows attribute matching default_text_area_height if numeric" do
       with_config :default_text_area_height, 12 do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :text))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag("form li textarea[@rows='12']")
       end
     end
 
     it "should not have a rows attribute if default_text_area_height is nil" do
       with_config :default_text_area_height, nil do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :text))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should_not have_tag("form li textarea[@rows]")
       end
 
@@ -119,20 +112,18 @@
 
     it "should have a cols attribute matching default_text_area_width if numeric" do
       with_config :default_text_area_width, 10 do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :text))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag("form li textarea[@cols='10']")
       end
     end
 
     it "should not have a cols attribute if default_text_area_width is nil" do
       with_config :default_text_area_width, nil do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :text))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should_not have_tag("form li textarea[@cols]")
       end
 
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index c073e2f91..716721fe5 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -18,20 +18,18 @@
 
     describe "with :ignore_date" do
       before do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:publish_at, :as => :time, :ignore_date => true))
-        end
+        end)
       end
 
       it 'should not have an input for day, month and year' do
-        output_buffer.concat(@form)
         output_buffer.should_not have_tag('#post_publish_at_1i')
         output_buffer.should_not have_tag('#post_publish_at_2i')
         output_buffer.should_not have_tag('#post_publish_at_3i')
       end
 
       it 'should have an input for hour and minute' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('#post_publish_at_4i')
         output_buffer.should have_tag('#post_publish_at_5i')
       end
@@ -40,9 +38,9 @@
 
     describe "without seconds" do
       before do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:publish_at, :as => :time))
-        end
+        end)
       end
 
       it_should_have_input_wrapper_with_class("time")
@@ -51,43 +49,37 @@
       it_should_apply_error_logic_for_input_type(:time)
 
       it 'should have a legend and label with the label text inside the fieldset' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset legend.label label', /Publish at/)
       end
 
       it 'should associate the legend label with the first select' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset legend.label label[@for="post_publish_at_1i"]')
       end
 
       it 'should have an ordered list of two items inside the fieldset' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset ol')
         output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
       end
 
       it 'should have five labels for hour and minute' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => 2)
         output_buffer.should have_tag('form li.time fieldset ol li label', /hour/i)
         output_buffer.should have_tag('form li.time fieldset ol li label', /minute/i)
       end
 
       it 'should have two selects for hour and minute' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
       end
     end
 
     describe "with seconds" do
       before do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:publish_at, :as => :time, :include_seconds => true))
-        end
+        end)
       end
 
       it 'should have five labels for hour and minute' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => 3)
         output_buffer.should have_tag('form li.time fieldset ol li label', /hour/i)
         output_buffer.should have_tag('form li.time fieldset ol li label', /minute/i)
@@ -95,12 +87,10 @@
       end
 
       it 'should have three selects for hour, minute and seconds' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form li.time fieldset ol li', :count => 3)
       end
 
       it 'should generate a sanitized label and matching ids for attribute' do
-        output_buffer.concat(@form)
         4.upto(6) do |i|
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_publish_at_#{i}i']")
           output_buffer.should have_tag("form li fieldset ol li #post_publish_at_#{i}i")
@@ -114,10 +104,9 @@
     fields.each do |field|
       it "should replace the #{field} label with the specified text if :labels[:#{field}] is set" do
         output_buffer.replace ''
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :time, :include_seconds => true, :labels => { field => "another #{field} label" }))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => fields.length)
         fields.each do |f|
           output_buffer.should have_tag('form li.time fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
@@ -126,10 +115,9 @@
 
       it "should not display the label for the #{field} field when :labels[:#{field}] is blank" do
         output_buffer.replace ''
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :time, :include_seconds => true, :labels => { field => "" }))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => fields.length-1)
         fields.each do |f|
           output_buffer.should have_tag('form li.time fieldset ol li label', /#{f}/i) unless field == f
@@ -140,13 +128,12 @@
 
   describe ':namespace option' do
     before do
-      @form = semantic_form_for(@new_post, :namespace => 'form2') do |builder|
+      concat(semantic_form_for(@new_post, :namespace => 'form2') do |builder|
         concat(builder.input(:publish_at, :as => :time))
-      end
+      end)
     end
 
     it 'should have a tag matching the namespace' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('#form2_post_publish_at_input')
       output_buffer.should have_tag('#form2_post_publish_at_4i')
       output_buffer.should have_tag('#form2_post_publish_at_5i')
diff --git a/spec/inputs/time_zone_input_spec.rb b/spec/inputs/time_zone_input_spec.rb
index fdf61de88..f7b9d811a 100644
--- a/spec/inputs/time_zone_input_spec.rb
+++ b/spec/inputs/time_zone_input_spec.rb
@@ -9,9 +9,9 @@
     @output_buffer = ''
     mock_everything
 
-    @form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:time_zone))
-    end
+    end)
   end
 
   it_should_have_input_wrapper_with_class("time_zone")
@@ -19,24 +19,21 @@
   it_should_apply_error_logic_for_input_type(:time_zone)
 
   it 'should generate a label for the input' do
-    output_buffer.concat(@form)
     output_buffer.should have_tag('form li label')
     output_buffer.should have_tag('form li label[@for="post_time_zone"]')
     output_buffer.should have_tag('form li label', /Time zone/)
   end
 
   it "should generate a select" do
-    output_buffer.concat(@form)
     output_buffer.should have_tag("form li select")
     output_buffer.should have_tag("form li select#post_time_zone")
     output_buffer.should have_tag("form li select[@name=\"post[time_zone]\"]")
   end
 
   it 'should use input_html to style inputs' do
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:time_zone, :input_html => { :class => 'myclass' }))
-    end
-    output_buffer.concat(form)
+    end)
     output_buffer.should have_tag("form li select.myclass")
   end
 
@@ -46,9 +43,9 @@
       @output_buffer = ''
       mock_everything
 
-      @form = semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+      concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         concat(builder.input(:time_zone))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_time_zone_input")
@@ -59,20 +56,18 @@
 
   describe 'when no object is given' do
     before(:each) do
-      @form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+      concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
         concat(builder.input(:time_zone, :as => :time_zone))
-      end
+      end)
     end
 
     it 'should generate labels' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag('form li label')
       output_buffer.should have_tag('form li label[@for="project_time_zone"]')
       output_buffer.should have_tag('form li label', /Time zone/)
     end
 
     it 'should generate select inputs' do
-      output_buffer.concat(@form)
       output_buffer.should have_tag("form li select")
       output_buffer.should have_tag("form li select#project_time_zone")
       output_buffer.should have_tag("form li select[@name=\"project[time_zone]\"]")
diff --git a/spec/inputs/url_input_spec.rb b/spec/inputs/url_input_spec.rb
index aae30275c..077286589 100644
--- a/spec/inputs/url_input_spec.rb
+++ b/spec/inputs/url_input_spec.rb
@@ -12,9 +12,9 @@
 
   describe "when object is provided" do
     before do
-      @form = semantic_form_for(@new_post) do |builder|
+      concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:url))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_class(:url)
@@ -30,9 +30,9 @@
   describe "when namespace is provided" do
 
     before do
-      @form = semantic_form_for(@new_post, :namespace => "context2") do |builder|
+      concat(semantic_form_for(@new_post, :namespace => "context2") do |builder|
         concat(builder.input(:url))
-      end
+      end)
     end
 
     it_should_have_input_wrapper_with_id("context2_post_url_input")
diff --git a/spec/inputs_spec.rb b/spec/inputs_spec.rb
index 8dffc630a..57f0be8c7 100644
--- a/spec/inputs_spec.rb
+++ b/spec/inputs_spec.rb
@@ -15,47 +15,40 @@
     describe 'when no options are provided' do
       before do
         output_buffer.replace 'before_builder' # clear the output buffer and sets before_builder
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           @inputs_output = builder.inputs do
             concat('hello')
           end
-        end
+        end)
       end
 
       it 'should output just the content wrapped in inputs, not the whole template' do
-        output_buffer.concat(@form)
         output_buffer.should      =~ /before_builder/
         @inputs_output.should_not =~ /before_builder/
       end
 
       it 'should render a fieldset inside the form, with a class of "inputs"' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset.inputs")
       end
 
       it 'should render an ol inside the fieldset' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset.inputs ol")
       end
 
       it 'should render the contents of the block inside the ol' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset.inputs ol", /hello/)
       end
 
       it 'should not render a legend inside the fieldset' do
-        output_buffer.concat(@form)
         output_buffer.should_not have_tag("form fieldset.inputs legend")
       end
 
       it 'should render a fieldset even if no object is given' do
-        form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+        concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
           @inputs_output = builder.inputs do
             concat('bye')
           end
-        end
-
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag("form fieldset.inputs ol", /bye/)
       end
     end
@@ -70,29 +63,25 @@
       it 'should render nested inputs' do
         @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
 
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           inputs = builder.inputs :for => [:author, @bob] do |bob_builder|
             concat(bob_builder.input(:login))
           end
           concat(inputs)
-        end
-
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag("form fieldset.inputs #post_author_attributes_login")
         output_buffer.should_not have_tag("form fieldset.inputs #author_login")
-
       end
 
       it 'should concat rendered nested inputs to the template' do
         @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
 
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           builder.inputs :for => [:author, @bob] do |bob_builder|
             concat(bob_builder.input(:login))
           end
-        end
+        end)
 
-        output_buffer.concat(form)
         output_buffer.should have_tag("form fieldset.inputs #post_author_attributes_login")
         output_buffer.should_not have_tag("form fieldset.inputs #author_login")
 
@@ -101,13 +90,12 @@
       describe "as a symbol representing the association name" do
 
         it 'should nest the inputs with an _attributes suffix on the association name' do
-          form = semantic_form_for(@new_post) do |post|
+          concat(semantic_form_for(@new_post) do |post|
             inputs = post.inputs :for => :author do |author|
               concat(author.input(:login))
             end
             concat(inputs)
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form input[@name='post[author_attributes][login]']")
         end
 
@@ -120,13 +108,12 @@
         end
 
         it 'should nest the inputs with a fieldset, legend and :name input for each item' do
-          form = semantic_form_for(@new_post) do |post|
+          concat(semantic_form_for(@new_post) do |post|
             post.inputs :for => :authors, :name => '%i' do |author|
               concat(author.input(:login))
             end
-          end
+          end)
 
-          output_buffer.concat(form)
           output_buffer.should have_tag("form fieldset.inputs", :count => 2)
           output_buffer.should have_tag("form fieldset.inputs legend", :count => 2)
           output_buffer.should have_tag("form input[@name='post[authors_attributes][0][login]']")
@@ -137,13 +124,12 @@
       describe 'as an array containing the a symbole for the association name and the associated object' do
 
         it 'should nest the inputs with an _attributes suffix on the association name' do
-          form = semantic_form_for(@new_post) do |post|
+          concat(semantic_form_for(@new_post) do |post|
             inputs = post.inputs :for => [:author, @new_post.author] do |author|
               concat(author.input(:login))
             end
             concat(inputs)
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form input[@name='post[author_attributes][login]']")
         end
 
@@ -152,13 +138,12 @@
       describe 'as an associated object' do
 
         it 'should not nest the inputs with an _attributes suffix' do
-          form = semantic_form_for(@new_post) do |post|
+          concat(semantic_form_for(@new_post) do |post|
             inputs = post.inputs :for => @new_post.author do |author|
               concat(author.input(:login))
             end
             concat(inputs)
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form input[@name='post[author][login]']")
         end
 
@@ -178,52 +163,48 @@
       it 'should pass options down to semantic_fields_for' do
         @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
 
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           inputs = builder.inputs :for => [:author, @bob], :for_options => { :index => 10 } do |bob_builder|
             concat(bob_builder.input(:login))
           end
           concat(inputs)
-        end
+        end)
 
-        output_buffer.concat(form)
         output_buffer.should have_tag('form fieldset ol li #post_author_attributes_10_login')
       end
 
       it 'should not add builder as a fieldset attribute tag' do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           inputs = builder.inputs :for => [:author, @bob], :for_options => { :index => 10 } do |bob_builder|
             concat('input')
           end
           concat(inputs)
-        end
+        end)
 
-        output_buffer.concat(form)
         output_buffer.should_not have_tag('fieldset[@builder="Formtastic::SemanticFormHelper"]')
       end
 
       it 'should send parent_builder as an option to allow child index interpolation' do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           builder.instance_variable_set('@nested_child_index', 0)
           inputs = builder.inputs :for => [:author, @bob], :name => 'Author #%i' do |bob_builder|
             concat('input')
           end
           concat(inputs)
-        end
+        end)
 
-        output_buffer.concat(form)
         output_buffer.should have_tag('fieldset legend', 'Author #1')
       end
 
       it 'should also provide child index interpolation when nested child index is a hash' do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           builder.instance_variable_set('@nested_child_index', :author => 10)
           inputs = builder.inputs :for => [:author, @bob], :name => 'Author #%i' do |bob_builder|
             concat('input')
           end
           concat(inputs)
-        end
+        end)
 
-        output_buffer.concat(form)
         output_buffer.should have_tag('fieldset legend', 'Author #11')
       end
     end
@@ -235,7 +216,7 @@
           @legend_text_using_name = "Advanced options 2"
           @legend_text_using_title = "Advanced options 3"
           @nested_forms_legend_text = "This is a nested form title"
-          @form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             inputs = builder.inputs @legend_text do
             end
             concat(inputs)
@@ -248,11 +229,10 @@
             inputs = builder.inputs @nested_forms_legend_text, :for => :authors do |nf|
             end
             concat(inputs)
-          end
+          end)
         end
 
         it 'should render a fieldset with a legend inside the form' do
-          output_buffer.concat(@form)
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text_using_name}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text_using_title}$/)
@@ -276,7 +256,7 @@
                     }
                 }
             }
-          @form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             inputs = builder.inputs :advanced_options do
             end
             concat(inputs)
@@ -289,11 +269,10 @@
             inputs = builder.inputs :nested_forms_title, :for => :authors do |nf|
             end
             concat(inputs)
-          end
+          end)
         end
 
         it 'should render a fieldset with a localized legend inside the form' do
-          output_buffer.concat(@form)
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text_using_name}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text_using_title}$/)
@@ -307,14 +286,13 @@
         @id_option = 'advanced'
         @class_option = 'wide'
 
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           builder.inputs :id => @id_option, :class => @class_option do
           end
-        end
+        end)
       end
 
       it 'should pass the options into the fieldset tag as attributes' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form fieldset##{@id_option}")
         output_buffer.should have_tag("form fieldset.#{@class_option}")
       end
@@ -341,55 +319,46 @@
 
     describe 'with no args' do
       before do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.inputs)
-        end
+        end)
       end
 
       it 'should render a form' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form')
       end
 
       it 'should render a fieldset inside the form' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs')
       end
 
       it 'should not render a legend in the fieldset' do
-        output_buffer.concat(@form)
         output_buffer.should_not have_tag('form > fieldset.inputs > legend')
       end
 
       it 'should render an ol in the fieldset' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs > ol')
       end
 
       it 'should render a list item in the ol for each column and reflection' do
         # Remove the :has_many macro and :created_at column
         count = ::Post.content_columns.size + ::Post.reflections.size - 2
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => count)
       end
 
       it 'should render a string list item for title' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs > ol > li.string')
       end
 
       it 'should render a text list item for body' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs > ol > li.text')
       end
 
       it 'should render a select list item for author_id' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs > ol > li.select', :count => 1)
       end
 
       it 'should not render timestamps inputs by default' do
-        output_buffer.concat(@form)
         output_buffer.should_not have_tag('form > fieldset.inputs > ol > li.datetime')
       end
     end
@@ -397,11 +366,10 @@
     describe 'with column names as args' do
       describe 'and an object is given' do
         it 'should render a form with a fieldset containing two list items' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.inputs(:title, :body))
-          end
+          end)
 
-          output_buffer.concat(form)
           output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => 2)
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.string')
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.text')
@@ -410,11 +378,10 @@
 
       describe 'and no object is given' do
         it 'should render a form with a fieldset containing two list items' do
-          form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
             concat(builder.inputs(:title, :body))
-          end
+          end)
 
-          output_buffer.concat(form)
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.string', :count => 2)
         end
       end
@@ -424,11 +391,10 @@
       describe 'and an object is given' do
         it 'should render nested inputs' do
           @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.inputs(:login, :for => @bob))
-          end
+          end)
 
-          output_buffer.concat(form)
           output_buffer.should have_tag("form fieldset.inputs #post_author_login")
           output_buffer.should_not have_tag("form fieldset.inputs #author_login")
         end
@@ -436,10 +402,9 @@
 
       describe 'and no object is given' do
         it 'should render nested inputs' do
-          form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+          concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
             concat(builder.inputs(:login, :for => @bob))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form fieldset.inputs #project_author_login")
           output_buffer.should_not have_tag("form fieldset.inputs #project_login")
         end
@@ -448,26 +413,23 @@
 
     describe 'with column names and an options hash as args' do
       before do
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           @legend_text_using_option = "Legendary Legend Text"
           @legend_text_using_arg = "Legendary Legend Text 2"
           concat(builder.inputs(:title, :body, :name => @legend_text_using_option, :id => "my-id"))
           concat(builder.inputs(@legend_text_using_arg, :title, :body, :id => "my-id-2"))
-        end
+        end)
       end
 
       it 'should render a form with a fieldset containing two list items' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => 4)
       end
 
       it 'should pass the options down to the fieldset' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset#my-id.inputs')
       end
 
       it 'should use the special :name option as a text for the legend tag' do
-        output_buffer.concat(@form)
         output_buffer.should have_tag('form > fieldset#my-id.inputs > legend', /^#{@legend_text_using_option}$/)
         output_buffer.should have_tag('form > fieldset#my-id-2.inputs > legend', /^#{@legend_text_using_arg}$/)
       end
diff --git a/spec/label_spec.rb b/spec/label_spec.rb
index b536340e1..9e97e3f77 100644
--- a/spec/label_spec.rb
+++ b/spec/label_spec.rb
@@ -32,18 +32,16 @@
 
   describe 'when a collection is given' do
     it 'should use a supplied label_method for simple collections' do
-      form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+      concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :value_method => :to_s, :label_method => proc {|f| ('Label_%s' % [f])}))
-      end
-      output_buffer.concat(form)
+      end)
       output_buffer.should have_tag('form li fieldset ol li label', :with => /Label_[abc]/, :count => 3)
     end
 
     it 'should use a supplied value_method for simple collections' do
-      form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+      concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :value_method => proc {|f| ('Value_%s' % [f.to_s])}))
-      end
-      output_buffer.concat(form)
+      end)
       output_buffer.should have_tag('form li fieldset ol li label input[value="Value_a"]')
       output_buffer.should have_tag('form li fieldset ol li label input[value="Value_b"]')
       output_buffer.should have_tag('form li fieldset ol li label input[value="Value_c"]')
diff --git a/spec/semantic_fields_for_spec.rb b/spec/semantic_fields_for_spec.rb
index 4cfe27d76..74ef5ddc5 100644
--- a/spec/semantic_fields_for_spec.rb
+++ b/spec/semantic_fields_for_spec.rb
@@ -29,12 +29,11 @@
 
   it 'should sanitize html id for li tag' do
     @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.semantic_fields_for(@bob, :index => 1) do |nested_builder|
         concat(nested_builder.inputs(:login))
       end)
-    end
-    output_buffer.concat(form)
+    end)
     output_buffer.should have_tag('form fieldset.inputs #post_author_1_login_input')
     # Not valid selector, so using good ol' regex
     output_buffer.should_not =~ /id="post\[author\]_1_login_input"/
@@ -43,12 +42,11 @@
 
   it 'should use namespace provided in nested fields' do
     @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
-    form = semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+    concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
       concat(builder.semantic_fields_for(@bob, :index => 1) do |nested_builder|
         concat(nested_builder.inputs(:login))
       end)
-    end
-    output_buffer.concat(form)
+    end)
     output_buffer.should have_tag('form fieldset.inputs #context2_post_author_1_login_input')
   end
   
@@ -61,13 +59,12 @@
       @fred.posts.first.stub!(:persisted?).and_return(true)
       @fred.stub!(:posts_attributes=)
 
-      form = semantic_form_for(@fred) do |builder|
+      concat(semantic_form_for(@fred) do |builder|
         concat(builder.semantic_fields_for(:posts) do |nested_builder|
           concat(nested_builder.input(:id, :as => :hidden))
           concat(nested_builder.input(:title))
         end)
-      end
-      output_buffer.concat(form)
+      end)
     end
   
     it "should only render one hidden input (my one)" do
diff --git a/spec/support/custom_macros.rb b/spec/support/custom_macros.rb
index 0b9e757cb..b7ec8be26 100644
--- a/spec/support/custom_macros.rb
+++ b/spec/support/custom_macros.rb
@@ -10,91 +10,78 @@ module ClassMethods
 
     def it_should_have_input_wrapper_with_class(class_name)
       it "should have input wrapper with class '#{class_name}'" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li.#{class_name}")
       end
     end
 
     def it_should_have_input_wrapper_with_id(id_string)
       it "should have input wrapper with id '#{id_string}'" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li##{id_string}")
       end
     end
 
     def it_should_not_have_a_label
       it "should not have a label" do
-        output_buffer.concat(@form)
         output_buffer.should_not have_tag("form li label")
       end
     end
 
     def it_should_have_a_nested_fieldset
       it "should have a nested_fieldset" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li fieldset")
       end
     end
 
     def it_should_have_label_with_text(string_or_regex)
       it "should have a label with text '#{string_or_regex}'" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li label", string_or_regex)
       end
     end
 
     def it_should_have_label_for(element_id)
       it "should have a label for ##{element_id}" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li label[@for='#{element_id}']")
       end
     end
 
     def it_should_have_input_with_id(element_id)
       it "should have an input with id '#{element_id}'" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li input##{element_id}")
       end
     end
 
     def it_should_have_select_with_id(element_id)
       it "should have a select box with id '#{element_id}'" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li select##{element_id}")
       end
     end
 
     def it_should_have_input_with_type(input_type)
       it "should have a #{input_type} input" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li input[@type=\"#{input_type}\"]")
       end
     end
 
     def it_should_have_input_with_name(name)
       it "should have an input named #{name}" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li input[@name=\"#{name}\"]")
       end
     end
 
     def it_should_have_textarea_with_name(name)
       it "should have an input named #{name}" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li textarea[@name=\"#{name}\"]")
       end
     end
 
     def it_should_have_textarea_with_id(element_id)
       it "should have an input with id '#{element_id}'" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li textarea##{element_id}")
       end
     end
 
     def it_should_have_label_and_input_with_id(element_id)
       it "should have an input with id '#{element_id}'" do
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li input##{element_id}")
         output_buffer.should have_tag("form li label[@for='#{element_id}']")
       end
@@ -103,10 +90,9 @@ def it_should_have_label_and_input_with_id(element_id)
     def it_should_use_default_text_field_size_when_not_nil(as)
       it 'should use default_text_field_size when not nil' do
         with_config :default_text_field_size, 30 do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => as))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form li input[@size='#{Formtastic::SemanticFormBuilder.default_text_field_size}']")
         end
       end
@@ -115,10 +101,9 @@ def it_should_use_default_text_field_size_when_not_nil(as)
     def it_should_not_use_default_text_field_size_when_nil(as)
       it 'should not use default_text_field_size when nil' do
         with_config :default_text_field_size, nil do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => as))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form li input")
           output_buffer.should_not have_tag("form li input[@size]")
         end
@@ -127,20 +112,18 @@ def it_should_not_use_default_text_field_size_when_nil(as)
 
     def it_should_apply_custom_input_attributes_when_input_html_provided(as)
       it 'it should apply custom input attributes when input_html provided' do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as, :input_html => { :class => 'myclass' }))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag("form li input.myclass")
       end
     end
 
     def it_should_apply_custom_for_to_label_when_input_html_id_provided(as)
       it 'it should apply custom for to label when input_html :id provided' do
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as, :input_html => { :id => 'myid' }))
-        end
-        output_buffer.concat(form)
+        end)
         output_buffer.should have_tag('form li label[@for="myid"]')
       end
     end
@@ -148,7 +131,6 @@ def it_should_apply_custom_for_to_label_when_input_html_id_provided(as)
     def it_should_have_maxlength_matching_column_limit
       it 'should have a maxlength matching column limit' do
         @new_post.column_for_attribute(:title).limit.should == 50
-        output_buffer.concat(@form)
         output_buffer.should have_tag("form li input[@maxlength='50']")
       end
     end
@@ -158,11 +140,10 @@ def it_should_use_column_size_for_columns_shorter_than_default_text_field_size(a
         column_limit_shorted_than_default = 1
         @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => as, :limit => column_limit_shorted_than_default))
 
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as))
-        end
+        end)
 
-        output_buffer.concat(form)
         output_buffer.should have_tag("form li input[@size='#{column_limit_shorted_than_default}']")
       end
     end
@@ -180,36 +161,32 @@ def it_should_apply_error_logic_for_input_type(type)
         end
 
         it 'should apply an errors class to the list item' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag('form li.error')
         end
 
         it 'should not wrap the input with the Rails default error wrapping' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should_not have_tag('div.fieldWithErrors')
         end
 
         it 'should render a paragraph for the errors' do
           ::Formtastic::SemanticFormBuilder.inline_errors = :sentence
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag('form li.error p.inline-errors')
         end
 
         it 'should not display an error list' do
           ::Formtastic::SemanticFormBuilder.inline_errors = :list
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag('form li.error ul.errors')
         end
       end
@@ -222,40 +199,34 @@ def it_should_apply_error_logic_for_input_type(type)
         end
 
         it 'should not apply an errors class to the list item' do
-          output_buffer.concat(@form)
           output_buffer.should_not have_tag('form li.error')
         end
 
         it 'should not render a paragraph for the errors' do
-          output_buffer.concat(@form)
           output_buffer.should_not have_tag('form li.error p.inline-errors')
         end
 
         it 'should not display an error list' do
-          output_buffer.concat(@form)
           output_buffer.should_not have_tag('form li.error ul.errors')
         end
       end
 
       describe 'when no object is provided' do
         before do
-          @form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
             concat(builder.input(:title, :as => type))
-          end
+          end)
         end
 
         it 'should not apply an errors class to the list item' do
-          output_buffer.concat(@form)
           output_buffer.should_not have_tag('form li.error')
         end
 
         it 'should not render a paragraph for the errors' do
-          output_buffer.concat(@form)
           output_buffer.should_not have_tag('form li.error p.inline-errors')
         end
 
         it 'should not display an error list' do
-          output_buffer.concat(@form)
           output_buffer.should_not have_tag('form li.error ul.errors')
         end
       end
@@ -264,9 +235,9 @@ def it_should_apply_error_logic_for_input_type(type)
     def it_should_call_find_on_association_class_when_no_collection_is_provided(as)
       it "should call find on the association class when no collection is provided" do
         ::Author.should_receive(:all)
-        form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:author, :as => as))
-        end
+        end)
       end
     end
 
@@ -275,14 +246,13 @@ def it_should_use_the_collection_when_provided(as, countable)
 
         before do
           @authors = ::Author.all * 2
-          output_buffer.replace '' # clears the output_buffer from the before block, hax!
+          output_buffer.replace ''
         end
 
         it 'should use the provided collection' do
-          form = semantic_form_for(@new_post) do |builder|
+          concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:author, :as => as, :collection => @authors))
-          end
-          output_buffer.concat(form)
+          end)
           output_buffer.should have_tag("form li.#{as} #{countable}", :count => @authors.size + (as == :select ? 1 : 0))
         end
 
@@ -292,10 +262,9 @@ def it_should_use_the_collection_when_provided(as, countable)
           end
 
           it "should use the string as the label text and value for each #{countable}" do
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
-            end
-            output_buffer.concat(form)
+            end)
 
             @categories.each do |value|
               output_buffer.should have_tag("form li.#{as}", /#{value}/)
@@ -306,13 +275,12 @@ def it_should_use_the_collection_when_provided(as, countable)
           if as == :radio
             it 'should generate a sanitized label for attribute' do
               @bob.stub!(:category_name).and_return(@categories)
-              form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 fields = builder.semantic_fields_for(@bob) do |bob_builder|
                   concat(bob_builder.input(:category_name, :as => as, :collection => @categories))
                 end
                 concat(fields)
-              end
-              output_buffer.concat(form)
+              end)
               output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_general']")
               output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_design']")
               output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_development']")
@@ -327,10 +295,9 @@ def it_should_use_the_collection_when_provided(as, countable)
           end
 
           it "should use the key as the label text and the hash value as the value attribute for each #{countable}" do
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
-            end
-            output_buffer.concat(form)
+            end)
 
             @categories.each do |label, value|
               output_buffer.should have_tag("form li.#{as}", /#{label}/)
@@ -345,10 +312,9 @@ def it_should_use_the_collection_when_provided(as, countable)
           end
 
           it "should use the first value as the label text and the last value as the value attribute for #{countable}" do
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
-            end
-            output_buffer.concat(form)
+            end)
 
             @categories.each do |text, value|
               label = as == :select ? :option : :label
@@ -366,10 +332,9 @@ def it_should_use_the_collection_when_provided(as, countable)
             end
 
             it "should use the first value as the label text and the last value as the value attribute for #{countable}" do
-              form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:category_name, :as => as, :collection => @choices))
-              end
-              output_buffer.concat(form)
+              end)
 
               output_buffer.should have_tag("form li.#{as} #{countable}#post_category_name_true")
               output_buffer.should have_tag("form li.#{as} #{countable}#post_category_name_false")
@@ -383,10 +348,9 @@ def it_should_use_the_collection_when_provided(as, countable)
           end
 
           it "should use the symbol as the label text and value for each #{countable}" do
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
-            end
-            output_buffer.concat(form)
+            end)
 
             @categories.each do |value|
               label = as == :select ? :option : :label
@@ -402,10 +366,9 @@ def it_should_use_the_collection_when_provided(as, countable)
           end
 
           it "should use the key as the label text and the hash value as the value attribute for each #{countable}" do
-            form = semantic_form_for(@new_post) do |builder|
+            concat(semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
-            end
-            output_buffer.concat(form)
+            end)
 
             @categories.each do |label, value|
               output_buffer.should have_tag("form li.#{as}", /#{label}/)
@@ -419,13 +382,12 @@ def it_should_use_the_collection_when_provided(as, countable)
 
           describe 'as a symbol' do
             before do
-              @form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:author, :as => as, :label_method => :login))
-              end
+              end)
             end
 
             it 'should have options with text content from the specified method' do
-              output_buffer.concat(@form)
               ::Author.all.each do |author|
                 output_buffer.should have_tag("form li.#{as}", /#{author.login}/)
               end
@@ -434,13 +396,12 @@ def it_should_use_the_collection_when_provided(as, countable)
 
           describe 'as a proc' do
             before do
-              @form  = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:author, :as => as, :label_method => Proc.new {|a| a.login.reverse }))
-              end
+              end)
             end
 
             it 'should have options with the proc applied to each' do
-              output_buffer.concat(@form)
               ::Author.all.each do |author|
                 output_buffer.should have_tag("form li.#{as}", /#{author.login.reverse}/)
               end
@@ -457,13 +418,12 @@ def it_should_use_the_collection_when_provided(as, countable)
                 @fred.stub!(:respond_to?).and_return { |m| m.to_s == label_method || m.to_s == 'id' }
                 ::Author.all.each { |a| a.stub!(label_method).and_return('The Label Text') }
 
-                @form = semantic_form_for(@new_post) do |builder|
+                concat(semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:author, :as => as))
-                end
+                end)
               end
 
               it "should render the options with #{label_method} as the label" do
-                output_buffer.concat(@form)
                 ::Author.all.each do |author|
                   output_buffer.should have_tag("form li.#{as}", /The Label Text/)
                 end
@@ -477,13 +437,12 @@ def it_should_use_the_collection_when_provided(as, countable)
 
           describe 'as a symbol' do
             before do
-              @form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:author, :as => as, :value_method => :login))
-              end
+              end)
             end
 
             it 'should have options with values from specified method' do
-              output_buffer.concat(@form)
               ::Author.all.each do |author|
                 output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login}']")
               end
@@ -492,13 +451,12 @@ def it_should_use_the_collection_when_provided(as, countable)
 
           describe 'as a proc' do
             before do
-              @form = semantic_form_for(@new_post) do |builder|
+              concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:author, :as => as, :value_method => Proc.new {|a| a.login.reverse }))
-              end
+              end)
             end
 
             it 'should have options with the proc applied to each value' do
-              output_buffer.concat(@form)
               ::Author.all.each do |author|
                 output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login.reverse}']")
               end
diff --git a/spec/support/test_environment.rb b/spec/support/test_environment.rb
index abd650d15..7d77d7afa 100644
--- a/spec/support/test_environment.rb
+++ b/spec/support/test_environment.rb
@@ -22,3 +22,8 @@ class Application < Rails::Application
 FormtasticTest::Application.initialize!
 
 require 'rspec/rails'
+
+# Quick hack to avoid the 'Spec' deprecation warnings from rspec_tag_matchers
+module Spec
+  include Rspec
+end

From 86badc7ac1dc9b36b3bade1c5336e869f2636520 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 16 Jan 2011 14:54:24 +1100
Subject: [PATCH 429/992] no longer need rails3? method

---
 lib/formtastic/util.rb | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/lib/formtastic/util.rb b/lib/formtastic/util.rb
index ee4ba0185..c9b41e858 100644
--- a/lib/formtastic/util.rb
+++ b/lib/formtastic/util.rb
@@ -22,12 +22,5 @@ def rails_safe_buffer_class
       return ActiveSupport::SafeBuffer
     end
 
-    def rails3?
-      version=
-        if defined?(ActionPack::VERSION::MAJOR)
-          ActionPack::VERSION::MAJOR
-        end
-      !version.blank? && version >= 3
-    end
   end
 end

From 8e4772f107a859e2ae50f6a1088e2ec1da7a1fb4 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 16 Jan 2011 14:02:45 +1100
Subject: [PATCH 430/992] split SemanticFormBuilder and SemanticFormHelper into
 two separate files (finally!)

---
 lib/formtastic.rb                       | 1935 +----------------------
 lib/formtastic/semantic_form_builder.rb | 1836 +++++++++++++++++++++
 lib/formtastic/semantic_form_helper.rb  |   96 ++
 3 files changed, 1934 insertions(+), 1933 deletions(-)
 create mode 100644 lib/formtastic/semantic_form_builder.rb
 create mode 100644 lib/formtastic/semantic_form_helper.rb

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 99998eb08..59b902ed4 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -2,1936 +2,5 @@
 require File.join(File.dirname(__FILE__), *%w[formtastic i18n])
 require File.join(File.dirname(__FILE__), *%w[formtastic util])
 require File.join(File.dirname(__FILE__), *%w[formtastic railtie]) if defined?(::Rails::Railtie)
-
-module Formtastic #:nodoc:
-
-  class SemanticFormBuilder < ActionView::Helpers::FormBuilder
-    
-    configurables = [
-      :default_text_field_size, :default_text_area_height, :default_text_area_width, :all_fields_required_by_default, :include_blank_for_select_by_default,
-      :required_string, :optional_string, :inline_errors, :label_str_method, :collection_value_methods, :collection_label_methods, :file_metadata_suffixes,
-      :inline_order, :custom_inline_order, :file_methods, :priority_countries, :i18n_lookups_by_default, :escape_html_entities_in_hints_and_labels,
-      :default_commit_button_accesskey, :default_inline_error_class, :default_hint_class, :default_error_list_class
-    ]
-    
-    if respond_to?(:class_attribute)
-      class_attribute *configurables
-    else
-      class_inheritable_accessor *configurables
-    end
-    
-    cattr_accessor :custom_namespace
-
-    self.default_text_field_size = nil
-    self.default_text_area_height = 20
-    self.default_text_area_width = nil
-    self.all_fields_required_by_default = true
-    self.include_blank_for_select_by_default = true
-    self.required_string = proc { ::Formtastic::Util.html_safe(%{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>}) }
-    self.optional_string = ''
-    self.inline_errors = :sentence
-    self.label_str_method = :humanize
-    self.collection_label_methods = %w[to_label display_name full_name name title username login value to_s]
-    self.collection_value_methods = %w[id to_s]
-    self.inline_order = [ :input, :hints, :errors ]
-    self.custom_inline_order = {}
-    self.file_methods = [ :file?, :public_filename, :filename ]
-    self.file_metadata_suffixes = ['content_type', 'file_name', 'file_size']
-    self.priority_countries = ["Australia", "Canada", "United Kingdom", "United States"]
-    self.i18n_lookups_by_default = false
-    self.escape_html_entities_in_hints_and_labels = true
-    self.default_commit_button_accesskey = nil
-    self.default_inline_error_class = 'inline-errors'
-    self.default_error_list_class = 'errors'
-    self.default_hint_class = 'inline-hints'
-
-    RESERVED_COLUMNS = [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
-
-    INLINE_ERROR_TYPES = [:sentence, :list, :first]
-
-    attr_accessor :template
-
-    # Returns a suitable form input for the given +method+, using the database column information
-    # and other factors (like the method name) to figure out what you probably want.
-    #
-    # Options:
-    #
-    # * :as - override the input type (eg force a :string to render as a :password field)
-    # * :label - use something other than the method name as the label text, when false no label is printed
-    # * :required - specify if the column is required (true) or not (false)
-    # * :hint - provide some text to hint or help the user provide the correct information for a field
-    # * :input_html - provide options that will be passed down to the generated input
-    # * :wrapper_html - provide options that will be passed down to the li wrapper
-    #
-    # Input Types:
-    #
-    # Most inputs map directly to one of ActiveRecord's column types by default (eg string_input),
-    # but there are a few special cases and some simplification (:integer, :float and :decimal
-    # columns all map to a single numeric_input, for example).
-    #
-    # * :select (a select menu for associations) - default to association names
-    # * :check_boxes (a set of check_box inputs for associations) - alternative to :select has_many and has_and_belongs_to_many associations
-    # * :radio (a set of radio inputs for associations) - alternative to :select belongs_to associations
-    # * :time_zone (a select menu with time zones)
-    # * :password (a password input) - default for :string column types with 'password' in the method name
-    # * :text (a textarea) - default for :text column types
-    # * :date (a date select) - default for :date column types
-    # * :datetime (a date and time select) - default for :datetime and :timestamp column types
-    # * :time (a time select) - default for :time column types
-    # * :boolean (a checkbox) - default for :boolean column types (you can also have booleans as :select and :radio)
-    # * :string (a text field) - default for :string column types
-    # * :numeric (a text field, like string) - default for :integer, :float and :decimal column types
-    # * :email (an email input) - default for :string column types with 'email' as the method name.
-    # * :url (a url input) - default for :string column types with 'url' as the method name.
-    # * :phone (a tel input) - default for :string column types with 'phone' or 'fax' in the method name.
-    # * :search (a search input) - default for :string column types with 'search' as the method name.
-    # * :country (a select menu of country names) - requires a country_select plugin to be installed
-    # * :email (an email input) - New in HTML5 - needs to be explicitly provided with :as => :email
-    # * :url (a url input) - New in HTML5 - needs to be explicitly provided with :as => :url
-    # * :phone (a tel input) - New in HTML5 - needs to be explicitly provided with :as => :phone
-    # * :search (a search input) - New in HTML5 - needs to be explicity provided with :as => :search
-    # * :country (a select menu of country names) - requires a country_select plugin to be installed
-    # * :hidden (a hidden field) - creates a hidden field (added for compatibility)
-    #
-    # Example:
-    #
-    #   <% semantic_form_for @employee do |form| %>
-    #     <% form.inputs do -%>
-    #       <%= form.input :name, :label => "Full Name" %>
-    #       <%= form.input :manager, :as => :radio %>
-    #       <%= form.input :secret, :as => :password, :input_html => { :value => "xxxx" } %>
-    #       <%= form.input :hired_at, :as => :date, :label => "Date Hired" %>
-    #       <%= form.input :phone, :required => false, :hint => "Eg: +1 555 1234" %>
-    #       <%= form.input :email %>
-    #       <%= form.input :website, :as => :url, :hint => "You may wish to omit the http://" %>
-    #     <% end %>
-    #   <% end %>
-    #
-    def input(method, options = {})
-      options = options.dup # Allow options to be shared without being tainted by Formtastic
-      
-      options[:required] = method_required?(method) unless options.key?(:required)
-      options[:as]     ||= default_input_type(method, options)
-
-      html_class = [ options[:as], (options[:required] ? :required : :optional) ]
-      html_class << 'error' if has_errors?(method, options)
-
-      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 options[:input_html] && options[:input_html][:id]
-        options[:label_html] ||= {}
-        options[:label_html][:for] ||= options[:input_html][:id]
-      end
-
-      input_parts = (custom_inline_order[options[:as]] || inline_order).dup
-      input_parts = input_parts - [:errors, :hints] if options[:as] == :hidden
-
-      list_item_content = input_parts.map do |type|
-        send(:"inline_#{type}_for", method, options)
-      end.compact.join("\n")
-
-      return template.content_tag(:li, Formtastic::Util.html_safe(list_item_content), wrapper_html)
-    end
-
-    # Creates an input fieldset and ol tag wrapping for use around a set of inputs.  It can be
-    # called either with a block (in which you can do the usual Rails form stuff, HTML, ERB, etc),
-    # or with a list of fields.  These two examples are functionally equivalent:
-    #
-    #   # With a block:
-    #   <% semantic_form_for @post do |form| %>
-    #     <% form.inputs do %>
-    #       <%= form.input :title %>
-    #       <%= form.input :body %>
-    #     <% end %>
-    #   <% end %>
-    #
-    #   # With a list of fields:
-    #   <% semantic_form_for @post do |form| %>
-    #     <%= form.inputs :title, :body %>
-    #   <% end %>
-    #
-    #   # Output:
-    #   <form ...>
-    #     <fieldset class="inputs">
-    #       <ol>
-    #         <li class="string">...</li>
-    #         <li class="text">...</li>
-    #       </ol>
-    #     </fieldset>
-    #   </form>
-    #
-    # === Quick Forms
-    #
-    # When called without a block or a field list, an input is rendered for each column in the
-    # model's database table, just like Rails' scaffolding.  You'll obviously want more control
-    # than this in a production application, but it's a great way to get started, then come back
-    # later to customise the form with a field list or a block of inputs.  Example:
-    #
-    #   <% semantic_form_for @post do |form| %>
-    #     <%= 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/: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| %>
-    #     <% form.inputs :name => "Create a new post", :style => "border:1px;" do %>
-    #       ...
-    #     <% end %>
-    #   <% end %>
-    #
-    #   # With a list (the options must come after the field list):
-    #   <% semantic_form_for @post do |form| %>
-    #     <%= 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,
-    # use inputs:
-    #
-    #   <% semantic_form_for @post do |f| %>
-    #     <% f.inputs do %>
-    #       <%= f.input :title %>
-    #       <%= f.input :body %>
-    #     <% end %>
-    #     <% f.inputs :name => "Advanced", :id => "advanced" do %>
-    #       <%= f.input :created_at %>
-    #       <%= f.input :user_id, :label => "Author" %>
-    #     <% end %>
-    #     <% f.inputs "Extra" do %>
-    #       <%= f.input :update_at %>
-    #     <% end %>
-    #   <% end %>
-    #
-    #   # Output:
-    #   <form ...>
-    #     <fieldset class="inputs">
-    #       <ol>
-    #         <li class="string">...</li>
-    #         <li class="text">...</li>
-    #       </ol>
-    #     </fieldset>
-    #     <fieldset class="inputs" id="advanced">
-    #       <legend><span>Advanced</span></legend>
-    #       <ol>
-    #         <li class="datetime">...</li>
-    #         <li class="select">...</li>
-    #       </ol>
-    #     </fieldset>
-    #     <fieldset class="inputs">
-    #       <legend><span>Extra</span></legend>
-    #       <ol>
-    #         <li class="datetime">...</li>
-    #       </ol>
-    #     </fieldset>
-    #   </form>
-    #
-    # === Nested attributes
-    #
-    # As in Rails, you can use semantic_fields_for to nest attributes:
-    #
-    #   <% semantic_form_for @post do |form| %>
-    #     <%= form.inputs :title, :body %>
-    #
-    #     <% form.semantic_fields_for :author, @bob do |author_form| %>
-    #       <% author_form.inputs do %>
-    #         <%= author_form.input :first_name, :required => false %>
-    #         <%= author_form.input :last_name %>
-    #       <% end %>
-    #     <% end %>
-    #   <% end %>
-    #
-    # But this does not look formtastic! This is equivalent:
-    #
-    #   <% semantic_form_for @post do |form| %>
-    #     <%= form.inputs :title, :body %>
-    #     <% form.inputs :for => [ :author, @bob ] do |author_form| %>
-    #       <%= author_form.input :first_name, :required => false %>
-    #       <%= author_form.input :last_name %>
-    #     <% end %>
-    #   <% end %>
-    #
-    # And if you don't need to give options to your input call, you could do it
-    # in just one line:
-    #
-    #   <% semantic_form_for @post do |form| %>
-    #     <%= form.inputs :title, :body %>
-    #     <%= form.inputs :first_name, :last_name, :for => @bob %>
-    #   <% end %>
-    #
-    # Just remember that calling inputs generates a new fieldset to wrap your
-    # inputs. If you have two separate models, but, semantically, on the page
-    # they are part of the same fieldset, you should use semantic_fields_for
-    # 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"
-      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(*(args << html_options), &block)
-      else
-        if @object && args.empty?
-          args  = association_columns(:belongs_to)
-          args += content_columns
-          args -= RESERVED_COLUMNS
-          args.compact!
-        end
-        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
-
-    # Creates a fieldset and ol tag wrapping for form buttons / actions as list items.
-    # See inputs documentation for a full example.  The fieldset's default class attriute
-    # is set to "buttons".
-    #
-    # See inputs for html attributes and special options.
-    def buttons(*args, &block)
-      html_options = args.extract_options!
-      html_options[:class] ||= "buttons"
-
-      if block_given?
-        field_set_and_list_wrapping(html_options, &block)
-      else
-        args = [:commit] if args.empty?
-        contents = args.map { |button_name| send(:"#{button_name}_button") }
-        field_set_and_list_wrapping(html_options, contents)
-      end
-    end
-
-    # Creates a submit input tag with the value "Save [model name]" (for existing records) or
-    # "Create [model name]" (for new records) by default:
-    #
-    #   <%= form.commit_button %> => <input name="commit" type="submit" value="Save Post" />
-    #
-    # The value of the button text can be overridden:
-    #
-    #  <%= 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 :button_html => { :class => "pretty" } %> => <input name="commit" type="submit" value="Save Post" class="pretty {create|update|submit}" />
-    def commit_button(*args)
-      options = args.extract_options!
-      text = options.delete(:label) || args.shift
-
-      if @object && (@object.respond_to?(:persisted?) || @object.respond_to?(:new_record?))
-        key = @object.persisted? ? :update : :create
-
-        # Deal with some complications with ActiveRecord::Base.human_name and two name models (eg UserPost)
-        # ActiveRecord::Base.human_name falls back to ActiveRecord::Base.name.humanize ("Userpost")
-        # if there's no i18n, which is pretty crappy.  In this circumstance we want to detect this
-        # fall back (human_name == name.humanize) and do our own thing name.underscore.humanize ("User Post")
-        if @object.class.model_name.respond_to?(:human)
-          object_name = @object.class.model_name.human
-        else
-          object_human_name = @object.class.human_name                # default is UserPost => "Userpost", but i18n may do better ("User post")
-          crappy_human_name = @object.class.name.humanize             # UserPost => "Userpost"
-          decent_human_name = @object.class.name.underscore.humanize  # UserPost => "User post"
-          object_name = (object_human_name == crappy_human_name) ? decent_human_name : object_human_name
-        end
-      else
-        key = :submit
-        object_name = @object_name.to_s.send(label_str_method)
-      end
-
-      text = (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) || {}
-      button_html.merge!(:class => [button_html[:class], key].compact.join(' '))
-
-      wrapper_html_class = ['commit'] # TODO: Add class reflecting on form action.
-      wrapper_html = options.delete(:wrapper_html) || {}
-      wrapper_html[:class] = (wrapper_html_class << wrapper_html[:class]).flatten.compact.join(' ')
-
-      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, Formtastic::Util.html_safe(submit(text, button_html)), wrapper_html)
-    end
-
-    # A thin wrapper around #fields_for to set :builder => Formtastic::SemanticFormBuilder
-    # for nesting forms:
-    #
-    #   # Example:
-    #   <% semantic_form_for @post do |post| %>
-    #     <% post.semantic_fields_for :author do |author| %>
-    #       <% author.inputs :name %>
-    #     <% end %>
-    #   <% end %>
-    #
-    #   # Output:
-    #   <form ...>
-    #     <fieldset class="inputs">
-    #       <ol>
-    #         <li class="string"><input type='text' name='post[author][name]' id='post_author_name' /></li>
-    #       </ol>
-    #     </fieldset>
-    #   </form>
-    #
-    def semantic_fields_for(record_or_name_or_array, *args, &block)
-      opts = args.extract_options!
-      opts[:builder] ||= self.class
-      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.
-    # * :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_string(method, text, :label) || humanized_attribute_name(method)
-      text += required_or_optional_string(options.delete(:required))
-      text = Formtastic::Util.html_safe(text)
-
-      # special case for boolean (checkbox) labels, which have a nested input
-      if options.key?(:label_prefix_for_nested_input)
-        text = options.delete(:label_prefix_for_nested_input) + text
-      end
-
-      input_name = options.delete(:input_name) || method
-      super(input_name, text, options)
-    end
-
-    # 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.
-    #
-    # 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 = {}) #:nodoc:
-      if render_inline_errors?
-        errors = error_keys(method, options).map{|x| @object.errors[x] }.flatten.compact.uniq
-        send(:"error_#{inline_errors}", [*errors], options) if errors.any?
-      else
-        nil
-      end
-    end
-    alias :errors_on :inline_errors_for
-
-    # Generates error messages for given method names and for base.
-    # You can pass a hash with html options that will be added to ul tag
-    #
-    # == Examples
-    #
-    #  f.semantic_errors # This will show only errors on base
-    #  f.semantic_errors :state # This will show errors on base and state
-    #  f.semantic_errors :state, :class => "awesome" # errors will be rendered in ul.awesome
-    #
-    def semantic_errors(*args)
-      html_options = args.extract_options!
-      full_errors = args.inject([]) do |array, method|
-        attribute = localized_string(method, method.to_sym, :label) || humanized_attribute_name(method)
-        errors = Array(@object.errors[method.to_sym]).to_sentence
-        errors.present? ? array << [attribute, errors].join(" ") : array ||= []
-      end
-      full_errors << @object.errors[:base]
-      full_errors.flatten!
-      full_errors.compact!
-      return nil if full_errors.blank?
-      html_options[:class] ||= "errors"
-      template.content_tag(:ul, html_options) do
-        Formtastic::Util.html_safe(full_errors.map { |error| template.content_tag(:li, Formtastic::Util.html_safe(error)) }.join)
-      end
-    end
-
-    protected
-
-      def error_keys(method, options)
-        @methods_for_error ||= {}
-        @methods_for_error[method] ||= begin
-          methods_for_error = [method.to_sym]
-          methods_for_error << file_metadata_suffixes.map{|suffix| "#{method}_#{suffix}".to_sym} if is_file?(method, options)
-          methods_for_error << [association_primary_key(method)] if association_macro_for_method(method) == :belongs_to
-          methods_for_error.flatten.compact.uniq
-        end
-      end
-
-      def has_errors?(method, options)
-        methods_for_error = error_keys(method,options)
-        @object && @object.respond_to?(:errors) && methods_for_error.any?{|error| !@object.errors[error].blank?}
-      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:
-        model_name.constantize.content_columns.collect { |c| c.name.to_sym }.compact rescue []
-      end
-
-      # Collects association columns (relation columns) for the current form object class.
-      #
-      def association_columns(*by_associations) #:nodoc:
-        if @object.present? && @object.class.respond_to?(:reflections)
-          @object.class.reflections.collect do |name, association_reflection|
-            if by_associations.present?
-              name if by_associations.include?(association_reflection.macro)
-            else
-              name
-            end
-          end.compact
-        else
-          []
-        end
-      end
-
-      # Returns nil, or a symbol like :belongs_to or :has_many
-      def association_macro_for_method(method) #:nodoc:
-        reflection = reflection_for(method)
-        reflection.macro if reflection
-      end
-
-      def association_primary_key(method)
-        reflection = reflection_for(method)
-        reflection.options[:foreign_key] if reflection && !reflection.options[:foreign_key].blank?
-        :"#{method}_id"
-      end
-
-      # Prepare options to be sent to label
-      #
-      def options_for_label(options) #:nodoc:
-        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.
-      #
-      # 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
-          lambda do |f|
-            contents = f.inputs(*args){ block.call(f) }
-            template.concat(contents)
-          end
-        else
-          lambda do |f|
-            contents = f.inputs(*args)
-            template.concat(contents)
-          end
-        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.
-      #
-      def strip_formtastic_options(options) #:nodoc:
-        options.except(:value_method, :label_method, :collection, :required, :label,
-                       :as, :hint, :input_html, :label_html, :value_as_class, :find_options, :class)
-      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), or the object is
-      #   an ActiveModel, 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 validates_presence_of can't be determined, the
-      #   configuration option all_fields_required_by_default is used.
-      #
-      def method_required?(attribute) #:nodoc:
-        attribute_sym = attribute.to_s.sub(/_id$/, '').to_sym
-
-        if @object && @object.class.respond_to?(:reflect_on_validations_for)
-          @object.class.reflect_on_validations_for(attribute_sym).any? do |validation|
-            (validation.macro == :validates_presence_of || validation.macro == :validates_inclusion_of) &&
-            validation.name == attribute_sym &&
-            (validation.options.present? ? options_require_validation?(validation.options) : true)
-          end
-        else
-          if @object && @object.class.respond_to?(:validators_on)
-            !@object.class.validators_on(attribute_sym).find{|validator| (validator.kind == :presence || validator.kind == :inclusion) && (validator.options.present? ? options_require_validation?(validator.options) : true)}.nil?
-          else
-            all_fields_required_by_default
-          end
-        end
-      end
-
-      # Determines whether the given options evaluate to true
-      def options_require_validation?(options) #nodoc
-        allow_blank = options[:allow_blank]
-        return !allow_blank unless allow_blank.nil?
-        if_condition = !options[:if].nil?
-        condition = if_condition ? options[:if] : options[:unless]
-
-        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
-
-      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, :text, :phone, :search, :url, :email].include?(type)
-        field_id = generate_html_id(method, "")
-        html_options[:id] ||= field_id
-        label_options = options_for_label(options)
-        label_options[:for] ||= html_options[:id]
-        label(method, label_options) <<
-          send(respond_to?(form_helper_method) ? form_helper_method : :text_field, 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 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
-
-      # 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
-
-      # Outputs a label and a standard Rails email field inside the wrapper.
-      def email_input(method, options)
-        basic_input_helper(:email_field, :email, method, options)
-      end
-
-      # Outputs a label and a standard Rails phone field inside the wrapper.
-      def phone_input(method, options)
-        basic_input_helper(:phone_field, :phone, method, options)
-      end
-
-      # Outputs a label and a standard Rails url field inside the wrapper.
-      def url_input(method, options)
-        basic_input_helper(:url_field, :url, method, options)
-      end
-
-      # Outputs a label and a standard Rails search field inside the wrapper.
-      def search_input(method, options)
-        basic_input_helper(:search_field, :search, method, options)
-      end
-
-      # Outputs a hidden field inside the wrapper, which should be hidden with CSS.
-      # Additionals options can be given using :input_hml. Should :input_html not be
-      # specified every option except for formtastic options will be sent straight
-      # to hidden input element.
-      #
-      def hidden_input(method, options)
-        options ||= {}
-        html_options = options.delete(:input_html) || strip_formtastic_options(options)
-        html_options[:id] ||= generate_html_id(method, "")
-        hidden_field(method, html_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. A collection can be given
-      # as an Array, a Hash or as a String (containing pre-rendered HTML options). If not provided, the choices are
-      # found by inferring the parent's class name from the method name and simply calling all on it
-      # (VehicleOwner.all in the example above).
-      #
-      # Examples:
-      #
-      #   f.input :author, :collection => @authors
-      #   f.input :author, :collection => Author.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"]
-      #   f.input :author, :collection => grouped_options_for_select(["North America",[["United States","US"],["Canada","CA"]]])
-      #
-      # 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 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) || {}
-        html_options[:multiple] = html_options[:multiple] || options.delete(:multiple)
-        html_options.delete(:multiple) if html_options[:multiple].nil?
-
-        reflection = reflection_for(method)
-        if reflection && [ :has_many, :has_and_belongs_to_many ].include?(reflection.macro)
-          html_options[:multiple] = true if html_options[:multiple].nil?
-          html_options[:size]     ||= 5
-          options[:include_blank] ||= false
-        end
-        options = set_include_blank(options)
-        input_name = generate_association_input_name(method)
-        html_options[:id] ||= generate_html_id(input_name, "")
-
-        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, options)
-          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
-          grouped_collection_select(input_name, group_collection,
-                                         group_association, group_label_method,
-                                         value, label,
-                                         strip_formtastic_options(options), html_options)
-        else
-          collection = find_collection_for_column(method, options)
-
-          select(input_name, collection, strip_formtastic_options(options), html_options)
-        end
-
-        label_options = options_for_label(options).merge(:input_name => input_name)
-        label_options[:for] ||= html_options[:id]
-        label(method, label_options) << select_html
-      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) || {}
-        field_id = generate_html_id(method, "")
-        html_options[:id] ||= field_id
-        label_options = options_for_label(options)
-        label_options[:for] ||= html_options[:id]
-        label(method, label_options) <<
-        time_zone_select(method, options.delete(:priority_zones),
-          strip_formtastic_options(options), 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.all in the example above).
-      #
-      # Examples:
-      #
-      #   f.input :author, :as => :radio, :collection => @authors
-      #   f.input :author, :as => :radio, :collection => Author.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}" }
-      #
-      # 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 = []
-
-        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[:id] = input_id
-
-          li_content = template.content_tag(:label,
-            Formtastic::Util.html_safe("#{radio_button(input_name, value, html_options)} #{escape_html_entities(label)}"),
-            :for => input_id
-          )
-
-          li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
-          template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
-        end
-
-        template.content_tag(:fieldset,
-          legend_tag(method, options) << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
-        )
-      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).  Each li contains a label
-      # (eg "Year") and a select box. Overwriting the label is possible by adding the :labels option.
-      # :labels should be a hash with the field (e.g. day) as key and the label text as value.
-      # See date_or_datetime_input for a more detailed output example.
-      #
-      # Some of Rails' options for select_date are supported, but not everything yet, see
-      # documentation of date_or_datetime_input() for more information.
-      def date_input(method, options)
-        options = set_include_blank(options)
-        date_or_datetime_input(method, options.merge(:discard_hour => true))
-      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. Overwriting the label is possible by adding
-      # the :labels option. :labels should be a hash with the field (e.g. day) as key and the label
-      # text as value.  See date_or_datetime_input for a more detailed output example.
-      #
-      # Some of Rails' options for select_date are supported, but not everything yet, see
-      # documentation of date_or_datetime_input() for more information.
-      def datetime_input(method, options)
-        options = set_include_blank(options)
-        date_or_datetime_input(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. Overwriting the label is possible by adding the :labels option.
-      # :labels should be a hash with the field (e.g. day) as key and the label text as value.
-      # See date_or_datetime_input for a more detailed output example.
-      #
-      # Some of Rails' options for select_time are supported, but not everything yet, see
-      # documentation of date_or_datetime_input() for more information.
-      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
-
-      # Helper method used by :as => (:date|:datetime|:time).  Generates a fieldset containing a
-      # legend (for what would normally be considered the label), and an ordered list of list items
-      # for year, month, day, hour, etc, each containing a label and a select.  Example:
-      #
-      # <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().
-      #
-      # Options:
-      #
-      #   * @:order => [:month, :day, :year]@
-      #   * @:include_seconds@ => true@
-      #   * @:discard_(year|month|day|hour|minute) => true@
-      #   * @:include_blank => true@
-      #   * @:labels => {}@
-      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]
-        inputs   = [] if options[:ignore_date]
-        labels   = options.delete(:labels) || {}
-
-        time_inputs = [:hour, :minute]
-        time_inputs << :second if options[:include_seconds]
-
-        list_items_capture = ""
-        hidden_fields_capture = ""
-
-        datetime = @object.send(method) if @object && @object.send(method)
-
-        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) : 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 = labels[input] || ::I18n.t(input.to_s, :default => input.to_s.humanize, :scope => [:datetime, :prompts])
-
-            list_items_capture << template.content_tag(:li, Formtastic::Util.html_safe([
-                !item_label_text.blank? ? template.content_tag(:label, Formtastic::Util.html_safe(item_label_text), :for => input_id) : "",
-                template.send(:"select_#{input}", datetime, opts, html_options.merge(:id => input_id))
-              ].join(""))
-            )
-          end
-        end
-
-        hidden_fields_capture << field_set_and_list_wrapping_for_method(method, options.merge(:label_for => input_ids.first), list_items_capture)
-      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 all on
-      # it (Author.all in the example above).
-      #
-      # Examples:
-      #
-      #   f.input :author, :as => :check_boxes, :collection => @authors
-      #   f.input :author, :as => :check_boxes, :collection => Author.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}" }
-      #
-      # Formtastic works around a bug in rails handling of check box collections by
-      # not generating the hidden fields for state checking of the checkboxes
-      # The :hidden_fields option provides a way to re-enable these hidden inputs by
-      # setting it to true.
-      #
-      #   f.input :authors, :as => :check_boxes, :hidden_fields => false
-      #   f.input :authors, :as => :check_boxes, :hidden_fields => true
-      #
-      # 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)
-        hidden_fields   = options.delete(:hidden_fields)
-        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_values = find_selected_values_for_column(method, options)
-        disabled_option_is_present = options.key?(:disabled)
-        disabled_values = [*options[:disabled]] if disabled_option_is_present
-
-        li_options = value_as_class ? { :class => [method.to_s.singularize, 'default'].join('_') } : {}
-
-        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)
-          html_options[:disabled] = disabled_values.include?(value) if disabled_option_is_present
-          html_options[:id] = input_id
-
-          li_content = template.content_tag(:label,
-            Formtastic::Util.html_safe("#{create_check_boxes(input_name, html_options, value, unchecked_value, hidden_fields)} #{escape_html_entities(label)}"),
-            :for => input_id
-          )
-
-          li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
-          template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
-        end
-
-        fieldset_content = legend_tag(method, options)
-        fieldset_content << create_hidden_field_for_check_boxes(input_name, value_as_class) unless hidden_fields
-        fieldset_content << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
-        template.content_tag(:fieldset, fieldset_content)
-      end
-
-      # Used by check_boxes input. The selected values will be set by retrieving the value
-      # through the association.
-      #
-      # If the collection is not a hash or an array of strings, fixnums or symbols,
-      # we use value_method to retrieve an array with the values
-      def find_selected_values_for_column(method, options)
-        if object.respond_to?(method)
-          collection = [object.send(method)].compact.flatten
-          label, value = detect_label_and_value_method!(collection, options)
-          [*collection.map { |o| send_or_call(value, o) }].compact
-        else
-          []
-        end
-      end
-
-      # Outputs a custom hidden field for check_boxes
-      def create_hidden_field_for_check_boxes(method, value_as_class) #:nodoc:
-        options = value_as_class ? { :class => [method.to_s.singularize, 'default'].join('_') } : {}
-        input_name = "#{object_name}[#{method.to_s}][]"
-        template.hidden_field_tag(input_name, '', options)
-      end
-
-      # Outputs a checkbox tag. If called with no_hidden_input = true a plain check_box_tag is returned,
-      # otherwise the helper uses the output generated by the rails check_box method.
-      def create_check_boxes(input_name, html_options = {}, checked_value = "1", unchecked_value = "0", hidden_fields = false) #:nodoc:
-        return template.check_box_tag(input_name, checked_value, html_options[:checked], html_options) unless hidden_fields == true
-        check_box(input_name, html_options, checked_value, unchecked_value)
-      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 respond_to?(:country_select)
-
-        html_options = options.delete(:input_html) || {}
-        priority_countries = options.delete(:priority_countries) || self.priority_countries
-
-        field_id = generate_html_id(method, "")
-        html_options[:id] ||= field_id
-        label_options = options_for_label(options)
-        label_options[:for] ||= html_options[:id]
-
-        label(method, label_options) <<
-        country_select(method, priority_countries, strip_formtastic_options(options), html_options)
-      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) || {}
-        checked_value = options.delete(:checked_value) || '1'
-        unchecked_value = options.delete(:unchecked_value) || '0'
-
-        html_options[:id] = html_options[:id] || generate_html_id(method, "")
-        input = template.check_box_tag(
-          "#{@object_name}[#{method}]",
-          checked_value,
-          (@object && @object.send(:"#{method}")),
-          html_options
-        )
-        
-        options = options_for_label(options)
-        options[:for] ||= html_options[:id]
-
-        # the label() method will insert this nested input into the label at the last minute
-        options[:label_prefix_for_nested_input] = input
-
-        template.hidden_field_tag("#{@object_name}[#{method}]", unchecked_value, :id => nil) << label(method, options)
-      end
-
-      # 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
-
-      # 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? or options[:hint].kind_of? Hash
-        hint_class = options[:hint_class] || default_hint_class
-        template.content_tag(:p, Formtastic::Util.html_safe(options[:hint]), :class => hint_class)
-      end
-
-      # Creates an error sentence by calling to_sentence on the errors array.
-      #
-      def error_sentence(errors, options = {}) #:nodoc:
-        error_class = options[:error_class] || default_inline_error_class
-        template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.untaint), :class => error_class)
-      end
-
-      # Creates an error li list.
-      #
-      def error_list(errors, options = {}) #:nodoc:
-        error_class = options[:error_class] || default_error_list_class
-        list_elements = []
-        errors.each do |error|
-          list_elements <<  template.content_tag(:li, Formtastic::Util.html_safe(error.untaint))
-        end
-        template.content_tag(:ul, Formtastic::Util.html_safe(list_elements.join("\n")), :class => error_class)
-      end
-
-      # Creates an error sentence containing only the first error
-      #
-      def error_first(errors, options = {}) #:nodoc:
-        error_class = options[:error_class] || default_inline_error_class
-        template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => error_class)
-      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
-
-        if string_or_proc.is_a?(Proc)
-          string_or_proc.call
-        else
-          string_or_proc.to_s
-        end
-      end
-
-      # Generates a fieldset and wraps the content in an ordered list. When working
-      # with nested attributes, 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.dup.delete(:name).to_s
-        legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
-        legend  = template.content_tag(:legend, template.content_tag(:span, Formtastic::Util.html_safe(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
-
-        # 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,
-          Formtastic::Util.html_safe(legend) << template.content_tag(:ol, Formtastic::Util.html_safe(contents)),
-          html_options.except(:builder, :parent)
-        )
-
-        fieldset
-      end
-
-      def field_set_title_from_args(*args) #:nodoc:
-        options = args.extract_options!
-        options[:name] ||= options.delete(:title)
-        title = options[:name]
-
-        if title.blank?
-          valid_name_classes = [::String, ::Symbol]
-          valid_name_classes.delete(::Symbol) if !block_given? && (args.first.is_a?(::Symbol) && 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
-
-      # 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,
-                label(method, options_for_label(options).merge(:for => options.delete(:label_for))), :class => 'label'
-              ) <<
-            template.content_tag(:ol, Formtastic::Util.html_safe(contents))
-          )
-      end
-
-      # Generates the legend for radiobuttons and checkboxes
-      def legend_tag(method, options = {})
-        if options[:label] == false
-          Formtastic::Util.html_safe("")
-        else
-          text = localized_string(method, options[:label], :label) || humanized_attribute_name(method)
-          text += required_or_optional_string(options.delete(:required))
-          text = Formtastic::Util.html_safe(text)
-          template.content_tag :legend, template.label_tag(nil, text, :for => nil), :class => :label
-        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, options = {}) #:nodoc:
-        if column = 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/
-            return :email     if method.to_s =~ /email/
-            return :url       if method.to_s =~ /^url$|^website$|_url$/
-            return :phone     if method.to_s =~ /(phone|fax)/
-            return :search    if method.to_s =~ /^search$/
-          when :integer
-            return :select    if reflection_for(method)
-            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 reflection_for(method)
-
-            return :file    if is_file?(method, options)
-          end
-
-          return :select    if options.key?(:collection)
-          return :password  if method.to_s =~ /password/
-          return :string
-        end
-      end
-
-      def is_file?(method, options = {})
-        @files ||= {}
-        @files[method] ||= (options[:as].present? && options[:as] == :file) || begin
-          file = @object.send(method) if @object && @object.respond_to?(method)
-          file && file_methods.any?{|m| file.respond_to?(m)}
-        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 a plain string
-        return collection if collection.instance_of?(String) || collection.instance_of?(::Formtastic::Util.rails_safe_buffer_class)
-
-        # 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) &&
-                             !(options.include?(:label_method) || options.include?(:value_method))
-
-        label, value = detect_label_and_value_method!(collection, options)
-        collection.map { |o| [send_or_call(label, o), send_or_call(value, o)] }
-      end
-
-      # 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 = reflection_for(column)
-          options[:find_options] ||= {}
-
-          if conditions = reflection.options[:conditions]
-            if reflection.klass.respond_to?(:merge_conditions)
-              options[:find_options][:conditions] = reflection.klass.merge_conditions(conditions, options[:find_options][:conditions])
-              reflection.klass.all(options[:find_options])
-            else
-              reflection.klass.where(conditions).where(options[:find_options][:conditions])
-            end
-          else
-            reflection.klass.all(options[:find_options])
-          end
-        else
-          create_boolean_collection(options)
-        end
-
-        collection = collection.to_a if collection.is_a?(Hash)
-        collection
-      end
-
-      # Detects the label and value methods from a collection using methods set in
-      # collection_label_methods and collection_value_methods. For some ruby core
-      # classes sensible defaults have been defined. It will use and delete the options
-      # :label_method and :value_methods when present.
-      #
-      def detect_label_and_value_method!(collection, options = {})
-        sample = collection.first || collection.last
-
-        case sample
-        when Array
-          label, value = :first, :last
-        when Integer
-          label, value = :to_s, :to_i
-        when String, NilClass
-          label, value = :to_s, :to_s
-        end
-
-        # Order of preference: user supplied method, class defaults, auto-detect
-        label = options[:label_method] || label || collection_label_methods.find { |m| sample.respond_to?(m) }
-        value = options[:value_method] || value || collection_value_methods.find { |m| sample.respond_to?(m) }
-
-        [label, value]
-      end
-
-      # Return the label collection method when none is supplied using the
-      # values set in collection_label_methods.
-      #
-      def detect_label_method(collection) #:nodoc:
-        detect_label_and_value_method!(collection).first
-      end
-
-      # 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 = 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
-
-      # 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)
-
-        [ [ options.delete(:true), true], [ options.delete(:false), false ] ]
-      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 = 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
-
-      # 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
-
-      # 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
-
-      # Returns the active validations for the given method or an empty Array if no validations are
-      # found for the method.
-      #
-      # By default, the if/unless options of the validations are evaluated and only the validations
-      # that should be run for the current object state are returned. Pass :all to the last
-      # parameter to return :all validations regardless of if/unless options.
-      #
-      # Requires the ValidationReflection plugin to be present or an ActiveModel. Returns an epmty
-      # Array if neither is the case.
-      #
-      def validations_for(method, mode = :active)
-        # ActiveModel?
-        validations = if @object && @object.class.respond_to?(:validators_on)
-          @object.class.validators_on(method)
-        else
-          # ValidationReflection plugin?
-          if @object && @object.class.respond_to?(:reflect_on_validations_for)
-            @object.class.reflect_on_validations_for(method)
-          else
-            []
-          end
-        end
-
-        validations = validations.select do |validation|
-          (validation.options.present? ? options_require_validation?(validation.options) : true)
-        end unless mode == :all
-
-        return validations
-      end
-
-      # Generates default_string_options by retrieving column information from
-      # the database.
-      #
-      def default_string_options(method, type) #:nodoc:
-        def get_maxlength_for(method)
-          validation = validations_for(method).find do |validation|
-            (validation.respond_to?(:macro) && validation.macro == :validates_length_of) || # Rails 2 + 3 style validation
-            (validation.respond_to?(:kind) && validation.kind == :length) # Rails 3 style validator
-          end
-
-          if validation
-            validation.options[:maximum] || (validation.options[:within].present? ? validation.options[:within].max : nil)
-          else
-            nil
-          end
-        end
-
-        validation_max_limit = get_maxlength_for(method)
-        column = column_for(method)
-
-        if type == :text
-          { :rows => default_text_area_height, 
-            :cols => default_text_area_width }
-        elsif type == :numeric || column.nil? || !column.respond_to?(:limit) || column.limit.nil?
-          { :maxlength => validation_max_limit,
-            :size => default_text_field_size }
-        else
-          { :maxlength => validation_max_limit || column.limit,
-            :size => default_text_field_size }
-        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') #:nodoc:
-        index = if options.has_key?(:index)
-                  options[:index]
-                elsif defined?(@auto_index)
-                  @auto_index
-                else
-                  ""
-                end
-        sanitized_method_name = method_name.to_s.gsub(/[\?\/\-]$/, '')
-
-        [@@custom_namespace, sanitized_object_name, index, sanitized_method_name, value].reject{|x|x.blank?}.join('_')
-      end
-
-      # Gets the nested_child_index value from the parent builder. 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')
-
-        child = parent[:for]
-        child = child.first if child.respond_to?(:first)
-        duck[child].to_i + 1
-      end
-
-      def sanitized_object_name #:nodoc:
-        @sanitized_object_name ||= @object_name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
-      end
-
-      def humanized_attribute_name(method) #:nodoc:
-        if @object && @object.class.respond_to?(:human_attribute_name)
-          humanized_name = @object.class.human_attribute_name(method.to_s)
-          if humanized_name == method.to_s.send(:humanize)
-            method.to_s.send(label_str_method)
-          else
-            humanized_name
-          end
-        else
-          method.to_s.send(label_str_method)
-        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 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)
-          escape_html_entities(value)
-        else
-          use_i18n = value.nil? ? i18n_lookups_by_default : (value != false)
-
-          if use_i18n
-            model_name, nested_model_name  = normalize_model_name(self.model_name.underscore)
-            action_name = template.params[:action].to_s rescue ''
-            attribute_name = key.to_s
-
-            defaults = ::Formtastic::I18n::SCOPES.reject do |i18n_scope|
-              nested_model_name.nil? && i18n_scope.match(/nested_model/)
-            end.collect do |i18n_scope|
-              i18n_path = i18n_scope.dup
-              i18n_path.gsub!('%{action}', action_name)
-              i18n_path.gsub!('%{model}', model_name)
-              i18n_path.gsub!('%{nested_model}', nested_model_name) unless nested_model_name.nil?
-              i18n_path.gsub!('%{attribute}', attribute_name)
-              i18n_path.gsub!('..', '.')
-              i18n_path.to_sym
-            end
-            defaults << ''
-
-            defaults.uniq!
-
-            default_key = defaults.shift
-            i18n_value = ::Formtastic::I18n.t(default_key,
-              options.merge(:default => defaults, :scope => type.to_s.pluralize.to_sym))
-            if i18n_value.blank? && type == :label
-              # This is effectively what Rails label helper does for i18n lookup
-              options[:scope] = [:helpers, type]
-              options[:default] = defaults
-              i18n_value = ::I18n.t(default_key, options)
-            end
-            i18n_value = escape_html_entities(i18n_value) if i18n_value.is_a?(::String)
-            i18n_value.blank? ? nil : i18n_value
-          end
-        end
-      end
-
-      def model_name
-        @object.present? ? @object.class.name : @object_name.to_s.classify
-      end
-
-      def normalize_model_name(name)
-        if name =~ /(.+)\[(.+)\]/
-          [$1, $2]
-        else
-          [name]
-        end
-      end
-
-      def send_or_call(duck, object)
-        if duck.is_a?(Proc)
-          duck.call(object)
-        else
-          object.send(duck)
-        end
-      end
-
-      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
-
-      def escape_html_entities(string) #:nodoc:
-        if escape_html_entities_in_hints_and_labels
-          # Acceppt html_safe flag as indicator to skip escaping
-          string = template.escape_once(string) unless string.respond_to?(:html_safe?) && string.html_safe? == true
-        end
-        string
-      end
-
-  end
-
-  # Wrappers around form_for (etc) with :builder => SemanticFormBuilder.
-  #
-  # * semantic_form_for(@post)
-  # * semantic_fields_for(@post)
-  # * semantic_form_remote_for(@post)
-  # * semantic_remote_form_for(@post)
-  #
-  # Each of which are the equivalent of:
-  #
-  # * form_for(@post, :builder => Formtastic::SemanticFormBuilder))
-  # * fields_for(@post, :builder => Formtastic::SemanticFormBuilder))
-  # * form_remote_for(@post, :builder => Formtastic::SemanticFormBuilder))
-  # * remote_form_for(@post, :builder => Formtastic::SemanticFormBuilder))
-  #
-  # Example Usage:
-  #
-  #   <% semantic_form_for @post do |f| %>
-  #     <%= f.input :title %>
-  #     <%= f.input :body %>
-  #   <% 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, 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| %>
-  #     ...
-  #   <% end %>
-  #
-  #   <% semantic_form_for :post, Post.new, :url => posts_path do |f| %>
-  #     ...
-  #   <% end %>
-  module SemanticFormHelper
-    @@builder = ::Formtastic::SemanticFormBuilder
-    @@default_form_class = 'formtastic'
-    mattr_accessor :builder, :default_form_class
-
-    # 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
-
-    def with_custom_field_error_proc(&block)
-      default_field_error_proc = ::ActionView::Base.field_error_proc
-      ::ActionView::Base.field_error_proc = FIELD_ERROR_PROC
-      yield
-    ensure
-      ::ActionView::Base.field_error_proc = default_field_error_proc
-    end
-
-    def semantic_remote_form_for_wrapper(record_or_name_or_array, *args, &proc)
-      options = args.extract_options!
-      if respond_to? :remote_form_for
-        semantic_remote_form_for_real(record_or_name_or_array, *(args << options), &proc)
-      else
-        options[:remote] = true
-        semantic_form_for(record_or_name_or_array, *(args << options), &proc)
-      end
-    end
-
-    [:form_for, :fields_for, :remote_form_for].each do |meth|
-      module_eval <<-END_SRC, __FILE__, __LINE__ + 1
-        def semantic_#{meth}(record_or_name_or_array, *args, &proc)
-          options = args.extract_options!
-          options[:builder] ||= @@builder
-          options[:html] ||= {}
-          @@builder.custom_namespace = options[:namespace].to_s
-
-          singularizer = defined?(ActiveModel::Naming.singular) ? ActiveModel::Naming.method(:singular) : ActionController::RecordIdentifier.method(:singular_class_name)
-
-          class_names = options[:html][:class] ? options[:html][:class].split(" ") : []
-          class_names << @@default_form_class
-          class_names << case record_or_name_or_array
-            when String, Symbol then record_or_name_or_array.to_s                                  # :post => "post"
-            when Array then options[:as] || singularizer.call(record_or_name_or_array.last.class)  # [@post, @comment] # => "comment"
-            else options[:as] || singularizer.call(record_or_name_or_array.class)                  # @post => "post"
-          end
-          options[:html][:class] = class_names.join(" ")
-
-          with_custom_field_error_proc do
-            #{meth}(record_or_name_or_array, *(args << options), &proc)
-          end
-        end
-      END_SRC
-    end
-    alias :semantic_remote_form_for_real :semantic_remote_form_for
-    alias :semantic_remote_form_for :semantic_remote_form_for_wrapper
-    alias :semantic_form_remote_for :semantic_remote_form_for
-
-  end
-end
-
+require File.join(File.dirname(__FILE__), *%w[formtastic semantic_form_builder])
+require File.join(File.dirname(__FILE__), *%w[formtastic semantic_form_helper])
diff --git a/lib/formtastic/semantic_form_builder.rb b/lib/formtastic/semantic_form_builder.rb
new file mode 100644
index 000000000..fc25e5595
--- /dev/null
+++ b/lib/formtastic/semantic_form_builder.rb
@@ -0,0 +1,1836 @@
+module Formtastic
+  class SemanticFormBuilder < ActionView::Helpers::FormBuilder
+
+    configurables = [
+      :default_text_field_size, :default_text_area_height, :default_text_area_width, :all_fields_required_by_default, :include_blank_for_select_by_default,
+      :required_string, :optional_string, :inline_errors, :label_str_method, :collection_value_methods, :collection_label_methods, :file_metadata_suffixes,
+      :inline_order, :custom_inline_order, :file_methods, :priority_countries, :i18n_lookups_by_default, :escape_html_entities_in_hints_and_labels,
+      :default_commit_button_accesskey, :default_inline_error_class, :default_hint_class, :default_error_list_class
+    ]
+    
+    if respond_to?(:class_attribute)
+      class_attribute *configurables
+    else
+      class_inheritable_accessor *configurables
+    end
+    
+    cattr_accessor :custom_namespace
+
+    self.default_text_field_size = nil
+    self.default_text_area_height = 20
+    self.default_text_area_width = nil
+    self.all_fields_required_by_default = true
+    self.include_blank_for_select_by_default = true
+    self.required_string = proc { ::Formtastic::Util.html_safe(%{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>}) }
+    self.optional_string = ''
+    self.inline_errors = :sentence
+    self.label_str_method = :humanize
+    self.collection_label_methods = %w[to_label display_name full_name name title username login value to_s]
+    self.collection_value_methods = %w[id to_s]
+    self.inline_order = [ :input, :hints, :errors ]
+    self.custom_inline_order = {}
+    self.file_methods = [ :file?, :public_filename, :filename ]
+    self.file_metadata_suffixes = ['content_type', 'file_name', 'file_size']
+    self.priority_countries = ["Australia", "Canada", "United Kingdom", "United States"]
+    self.i18n_lookups_by_default = false
+    self.escape_html_entities_in_hints_and_labels = true
+    self.default_commit_button_accesskey = nil
+    self.default_inline_error_class = 'inline-errors'
+    self.default_error_list_class = 'errors'
+    self.default_hint_class = 'inline-hints'
+
+    RESERVED_COLUMNS = [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
+
+    INLINE_ERROR_TYPES = [:sentence, :list, :first]
+
+    attr_accessor :template
+
+    # Returns a suitable form input for the given +method+, using the database column information
+    # and other factors (like the method name) to figure out what you probably want.
+    #
+    # Options:
+    #
+    # * :as - override the input type (eg force a :string to render as a :password field)
+    # * :label - use something other than the method name as the label text, when false no label is printed
+    # * :required - specify if the column is required (true) or not (false)
+    # * :hint - provide some text to hint or help the user provide the correct information for a field
+    # * :input_html - provide options that will be passed down to the generated input
+    # * :wrapper_html - provide options that will be passed down to the li wrapper
+    #
+    # Input Types:
+    #
+    # Most inputs map directly to one of ActiveRecord's column types by default (eg string_input),
+    # but there are a few special cases and some simplification (:integer, :float and :decimal
+    # columns all map to a single numeric_input, for example).
+    #
+    # * :select (a select menu for associations) - default to association names
+    # * :check_boxes (a set of check_box inputs for associations) - alternative to :select has_many and has_and_belongs_to_many associations
+    # * :radio (a set of radio inputs for associations) - alternative to :select belongs_to associations
+    # * :time_zone (a select menu with time zones)
+    # * :password (a password input) - default for :string column types with 'password' in the method name
+    # * :text (a textarea) - default for :text column types
+    # * :date (a date select) - default for :date column types
+    # * :datetime (a date and time select) - default for :datetime and :timestamp column types
+    # * :time (a time select) - default for :time column types
+    # * :boolean (a checkbox) - default for :boolean column types (you can also have booleans as :select and :radio)
+    # * :string (a text field) - default for :string column types
+    # * :numeric (a text field, like string) - default for :integer, :float and :decimal column types
+    # * :email (an email input) - default for :string column types with 'email' as the method name.
+    # * :url (a url input) - default for :string column types with 'url' as the method name.
+    # * :phone (a tel input) - default for :string column types with 'phone' or 'fax' in the method name.
+    # * :search (a search input) - default for :string column types with 'search' as the method name.
+    # * :country (a select menu of country names) - requires a country_select plugin to be installed
+    # * :email (an email input) - New in HTML5 - needs to be explicitly provided with :as => :email
+    # * :url (a url input) - New in HTML5 - needs to be explicitly provided with :as => :url
+    # * :phone (a tel input) - New in HTML5 - needs to be explicitly provided with :as => :phone
+    # * :search (a search input) - New in HTML5 - needs to be explicity provided with :as => :search
+    # * :country (a select menu of country names) - requires a country_select plugin to be installed
+    # * :hidden (a hidden field) - creates a hidden field (added for compatibility)
+    #
+    # Example:
+    #
+    #   <% semantic_form_for @employee do |form| %>
+    #     <% form.inputs do -%>
+    #       <%= form.input :name, :label => "Full Name" %>
+    #       <%= form.input :manager, :as => :radio %>
+    #       <%= form.input :secret, :as => :password, :input_html => { :value => "xxxx" } %>
+    #       <%= form.input :hired_at, :as => :date, :label => "Date Hired" %>
+    #       <%= form.input :phone, :required => false, :hint => "Eg: +1 555 1234" %>
+    #       <%= form.input :email %>
+    #       <%= form.input :website, :as => :url, :hint => "You may wish to omit the http://" %>
+    #     <% end %>
+    #   <% end %>
+    #
+    def input(method, options = {})
+      options = options.dup # Allow options to be shared without being tainted by Formtastic
+      
+      options[:required] = method_required?(method) unless options.key?(:required)
+      options[:as]     ||= default_input_type(method, options)
+
+      html_class = [ options[:as], (options[:required] ? :required : :optional) ]
+      html_class << 'error' if has_errors?(method, options)
+
+      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 options[:input_html] && options[:input_html][:id]
+        options[:label_html] ||= {}
+        options[:label_html][:for] ||= options[:input_html][:id]
+      end
+
+      input_parts = (custom_inline_order[options[:as]] || inline_order).dup
+      input_parts = input_parts - [:errors, :hints] if options[:as] == :hidden
+
+      list_item_content = input_parts.map do |type|
+        send(:"inline_#{type}_for", method, options)
+      end.compact.join("\n")
+
+      return template.content_tag(:li, Formtastic::Util.html_safe(list_item_content), wrapper_html)
+    end
+
+    # Creates an input fieldset and ol tag wrapping for use around a set of inputs.  It can be
+    # called either with a block (in which you can do the usual Rails form stuff, HTML, ERB, etc),
+    # or with a list of fields.  These two examples are functionally equivalent:
+    #
+    #   # With a block:
+    #   <% semantic_form_for @post do |form| %>
+    #     <% form.inputs do %>
+    #       <%= form.input :title %>
+    #       <%= form.input :body %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   # With a list of fields:
+    #   <% semantic_form_for @post do |form| %>
+    #     <%= form.inputs :title, :body %>
+    #   <% end %>
+    #
+    #   # Output:
+    #   <form ...>
+    #     <fieldset class="inputs">
+    #       <ol>
+    #         <li class="string">...</li>
+    #         <li class="text">...</li>
+    #       </ol>
+    #     </fieldset>
+    #   </form>
+    #
+    # === Quick Forms
+    #
+    # When called without a block or a field list, an input is rendered for each column in the
+    # model's database table, just like Rails' scaffolding.  You'll obviously want more control
+    # than this in a production application, but it's a great way to get started, then come back
+    # later to customise the form with a field list or a block of inputs.  Example:
+    #
+    #   <% semantic_form_for @post do |form| %>
+    #     <%= 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/: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| %>
+    #     <% form.inputs :name => "Create a new post", :style => "border:1px;" do %>
+    #       ...
+    #     <% end %>
+    #   <% end %>
+    #
+    #   # With a list (the options must come after the field list):
+    #   <% semantic_form_for @post do |form| %>
+    #     <%= 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,
+    # use inputs:
+    #
+    #   <% semantic_form_for @post do |f| %>
+    #     <% f.inputs do %>
+    #       <%= f.input :title %>
+    #       <%= f.input :body %>
+    #     <% end %>
+    #     <% f.inputs :name => "Advanced", :id => "advanced" do %>
+    #       <%= f.input :created_at %>
+    #       <%= f.input :user_id, :label => "Author" %>
+    #     <% end %>
+    #     <% f.inputs "Extra" do %>
+    #       <%= f.input :update_at %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   # Output:
+    #   <form ...>
+    #     <fieldset class="inputs">
+    #       <ol>
+    #         <li class="string">...</li>
+    #         <li class="text">...</li>
+    #       </ol>
+    #     </fieldset>
+    #     <fieldset class="inputs" id="advanced">
+    #       <legend><span>Advanced</span></legend>
+    #       <ol>
+    #         <li class="datetime">...</li>
+    #         <li class="select">...</li>
+    #       </ol>
+    #     </fieldset>
+    #     <fieldset class="inputs">
+    #       <legend><span>Extra</span></legend>
+    #       <ol>
+    #         <li class="datetime">...</li>
+    #       </ol>
+    #     </fieldset>
+    #   </form>
+    #
+    # === Nested attributes
+    #
+    # As in Rails, you can use semantic_fields_for to nest attributes:
+    #
+    #   <% semantic_form_for @post do |form| %>
+    #     <%= form.inputs :title, :body %>
+    #
+    #     <% form.semantic_fields_for :author, @bob do |author_form| %>
+    #       <% author_form.inputs do %>
+    #         <%= author_form.input :first_name, :required => false %>
+    #         <%= author_form.input :last_name %>
+    #       <% end %>
+    #     <% end %>
+    #   <% end %>
+    #
+    # But this does not look formtastic! This is equivalent:
+    #
+    #   <% semantic_form_for @post do |form| %>
+    #     <%= form.inputs :title, :body %>
+    #     <% form.inputs :for => [ :author, @bob ] do |author_form| %>
+    #       <%= author_form.input :first_name, :required => false %>
+    #       <%= author_form.input :last_name %>
+    #     <% end %>
+    #   <% end %>
+    #
+    # And if you don't need to give options to your input call, you could do it
+    # in just one line:
+    #
+    #   <% semantic_form_for @post do |form| %>
+    #     <%= form.inputs :title, :body %>
+    #     <%= form.inputs :first_name, :last_name, :for => @bob %>
+    #   <% end %>
+    #
+    # Just remember that calling inputs generates a new fieldset to wrap your
+    # inputs. If you have two separate models, but, semantically, on the page
+    # they are part of the same fieldset, you should use semantic_fields_for
+    # 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"
+      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(*(args << html_options), &block)
+      else
+        if @object && args.empty?
+          args  = association_columns(:belongs_to)
+          args += content_columns
+          args -= RESERVED_COLUMNS
+          args.compact!
+        end
+        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
+
+    # Creates a fieldset and ol tag wrapping for form buttons / actions as list items.
+    # See inputs documentation for a full example.  The fieldset's default class attriute
+    # is set to "buttons".
+    #
+    # See inputs for html attributes and special options.
+    def buttons(*args, &block)
+      html_options = args.extract_options!
+      html_options[:class] ||= "buttons"
+
+      if block_given?
+        field_set_and_list_wrapping(html_options, &block)
+      else
+        args = [:commit] if args.empty?
+        contents = args.map { |button_name| send(:"#{button_name}_button") }
+        field_set_and_list_wrapping(html_options, contents)
+      end
+    end
+
+    # Creates a submit input tag with the value "Save [model name]" (for existing records) or
+    # "Create [model name]" (for new records) by default:
+    #
+    #   <%= form.commit_button %> => <input name="commit" type="submit" value="Save Post" />
+    #
+    # The value of the button text can be overridden:
+    #
+    #  <%= 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 :button_html => { :class => "pretty" } %> => <input name="commit" type="submit" value="Save Post" class="pretty {create|update|submit}" />
+    def commit_button(*args)
+      options = args.extract_options!
+      text = options.delete(:label) || args.shift
+
+      if @object && (@object.respond_to?(:persisted?) || @object.respond_to?(:new_record?))
+        key = @object.persisted? ? :update : :create
+
+        # Deal with some complications with ActiveRecord::Base.human_name and two name models (eg UserPost)
+        # ActiveRecord::Base.human_name falls back to ActiveRecord::Base.name.humanize ("Userpost")
+        # if there's no i18n, which is pretty crappy.  In this circumstance we want to detect this
+        # fall back (human_name == name.humanize) and do our own thing name.underscore.humanize ("User Post")
+        if @object.class.model_name.respond_to?(:human)
+          object_name = @object.class.model_name.human
+        else
+          object_human_name = @object.class.human_name                # default is UserPost => "Userpost", but i18n may do better ("User post")
+          crappy_human_name = @object.class.name.humanize             # UserPost => "Userpost"
+          decent_human_name = @object.class.name.underscore.humanize  # UserPost => "User post"
+          object_name = (object_human_name == crappy_human_name) ? decent_human_name : object_human_name
+        end
+      else
+        key = :submit
+        object_name = @object_name.to_s.send(label_str_method)
+      end
+
+      text = (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) || {}
+      button_html.merge!(:class => [button_html[:class], key].compact.join(' '))
+
+      wrapper_html_class = ['commit'] # TODO: Add class reflecting on form action.
+      wrapper_html = options.delete(:wrapper_html) || {}
+      wrapper_html[:class] = (wrapper_html_class << wrapper_html[:class]).flatten.compact.join(' ')
+
+      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, Formtastic::Util.html_safe(submit(text, button_html)), wrapper_html)
+    end
+
+    # A thin wrapper around #fields_for to set :builder => Formtastic::SemanticFormBuilder
+    # for nesting forms:
+    #
+    #   # Example:
+    #   <% semantic_form_for @post do |post| %>
+    #     <% post.semantic_fields_for :author do |author| %>
+    #       <% author.inputs :name %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   # Output:
+    #   <form ...>
+    #     <fieldset class="inputs">
+    #       <ol>
+    #         <li class="string"><input type='text' name='post[author][name]' id='post_author_name' /></li>
+    #       </ol>
+    #     </fieldset>
+    #   </form>
+    #
+    def semantic_fields_for(record_or_name_or_array, *args, &block)
+      opts = args.extract_options!
+      opts[:builder] ||= self.class
+      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.
+    # * :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_string(method, text, :label) || humanized_attribute_name(method)
+      text += required_or_optional_string(options.delete(:required))
+      text = Formtastic::Util.html_safe(text)
+
+      # special case for boolean (checkbox) labels, which have a nested input
+      if options.key?(:label_prefix_for_nested_input)
+        text = options.delete(:label_prefix_for_nested_input) + text
+      end
+
+      input_name = options.delete(:input_name) || method
+      super(input_name, text, options)
+    end
+
+    # 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.
+    #
+    # 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 = {}) #:nodoc:
+      if render_inline_errors?
+        errors = error_keys(method, options).map{|x| @object.errors[x] }.flatten.compact.uniq
+        send(:"error_#{inline_errors}", [*errors], options) if errors.any?
+      else
+        nil
+      end
+    end
+    alias :errors_on :inline_errors_for
+
+    # Generates error messages for given method names and for base.
+    # You can pass a hash with html options that will be added to ul tag
+    #
+    # == Examples
+    #
+    #  f.semantic_errors # This will show only errors on base
+    #  f.semantic_errors :state # This will show errors on base and state
+    #  f.semantic_errors :state, :class => "awesome" # errors will be rendered in ul.awesome
+    #
+    def semantic_errors(*args)
+      html_options = args.extract_options!
+      full_errors = args.inject([]) do |array, method|
+        attribute = localized_string(method, method.to_sym, :label) || humanized_attribute_name(method)
+        errors = Array(@object.errors[method.to_sym]).to_sentence
+        errors.present? ? array << [attribute, errors].join(" ") : array ||= []
+      end
+      full_errors << @object.errors[:base]
+      full_errors.flatten!
+      full_errors.compact!
+      return nil if full_errors.blank?
+      html_options[:class] ||= "errors"
+      template.content_tag(:ul, html_options) do
+        Formtastic::Util.html_safe(full_errors.map { |error| template.content_tag(:li, Formtastic::Util.html_safe(error)) }.join)
+      end
+    end
+
+    protected
+
+      def error_keys(method, options)
+        @methods_for_error ||= {}
+        @methods_for_error[method] ||= begin
+          methods_for_error = [method.to_sym]
+          methods_for_error << file_metadata_suffixes.map{|suffix| "#{method}_#{suffix}".to_sym} if is_file?(method, options)
+          methods_for_error << [association_primary_key(method)] if association_macro_for_method(method) == :belongs_to
+          methods_for_error.flatten.compact.uniq
+        end
+      end
+
+      def has_errors?(method, options)
+        methods_for_error = error_keys(method,options)
+        @object && @object.respond_to?(:errors) && methods_for_error.any?{|error| !@object.errors[error].blank?}
+      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:
+        model_name.constantize.content_columns.collect { |c| c.name.to_sym }.compact rescue []
+      end
+
+      # Collects association columns (relation columns) for the current form object class.
+      #
+      def association_columns(*by_associations) #:nodoc:
+        if @object.present? && @object.class.respond_to?(:reflections)
+          @object.class.reflections.collect do |name, association_reflection|
+            if by_associations.present?
+              name if by_associations.include?(association_reflection.macro)
+            else
+              name
+            end
+          end.compact
+        else
+          []
+        end
+      end
+
+      # Returns nil, or a symbol like :belongs_to or :has_many
+      def association_macro_for_method(method) #:nodoc:
+        reflection = reflection_for(method)
+        reflection.macro if reflection
+      end
+
+      def association_primary_key(method)
+        reflection = reflection_for(method)
+        reflection.options[:foreign_key] if reflection && !reflection.options[:foreign_key].blank?
+        :"#{method}_id"
+      end
+
+      # Prepare options to be sent to label
+      #
+      def options_for_label(options) #:nodoc:
+        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.
+      #
+      # 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
+          lambda do |f|
+            contents = f.inputs(*args){ block.call(f) }
+            template.concat(contents)
+          end
+        else
+          lambda do |f|
+            contents = f.inputs(*args)
+            template.concat(contents)
+          end
+        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.
+      #
+      def strip_formtastic_options(options) #:nodoc:
+        options.except(:value_method, :label_method, :collection, :required, :label,
+                       :as, :hint, :input_html, :label_html, :value_as_class, :find_options, :class)
+      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), or the object is
+      #   an ActiveModel, 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 validates_presence_of can't be determined, the
+      #   configuration option all_fields_required_by_default is used.
+      #
+      def method_required?(attribute) #:nodoc:
+        attribute_sym = attribute.to_s.sub(/_id$/, '').to_sym
+
+        if @object && @object.class.respond_to?(:reflect_on_validations_for)
+          @object.class.reflect_on_validations_for(attribute_sym).any? do |validation|
+            (validation.macro == :validates_presence_of || validation.macro == :validates_inclusion_of) &&
+            validation.name == attribute_sym &&
+            (validation.options.present? ? options_require_validation?(validation.options) : true)
+          end
+        else
+          if @object && @object.class.respond_to?(:validators_on)
+            !@object.class.validators_on(attribute_sym).find{|validator| (validator.kind == :presence || validator.kind == :inclusion) && (validator.options.present? ? options_require_validation?(validator.options) : true)}.nil?
+          else
+            all_fields_required_by_default
+          end
+        end
+      end
+
+      # Determines whether the given options evaluate to true
+      def options_require_validation?(options) #nodoc
+        allow_blank = options[:allow_blank]
+        return !allow_blank unless allow_blank.nil?
+        if_condition = !options[:if].nil?
+        condition = if_condition ? options[:if] : options[:unless]
+
+        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
+
+      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, :text, :phone, :search, :url, :email].include?(type)
+        field_id = generate_html_id(method, "")
+        html_options[:id] ||= field_id
+        label_options = options_for_label(options)
+        label_options[:for] ||= html_options[:id]
+        label(method, label_options) <<
+          send(respond_to?(form_helper_method) ? form_helper_method : :text_field, 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 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
+
+      # 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
+
+      # Outputs a label and a standard Rails email field inside the wrapper.
+      def email_input(method, options)
+        basic_input_helper(:email_field, :email, method, options)
+      end
+
+      # Outputs a label and a standard Rails phone field inside the wrapper.
+      def phone_input(method, options)
+        basic_input_helper(:phone_field, :phone, method, options)
+      end
+
+      # Outputs a label and a standard Rails url field inside the wrapper.
+      def url_input(method, options)
+        basic_input_helper(:url_field, :url, method, options)
+      end
+
+      # Outputs a label and a standard Rails search field inside the wrapper.
+      def search_input(method, options)
+        basic_input_helper(:search_field, :search, method, options)
+      end
+
+      # Outputs a hidden field inside the wrapper, which should be hidden with CSS.
+      # Additionals options can be given using :input_hml. Should :input_html not be
+      # specified every option except for formtastic options will be sent straight
+      # to hidden input element.
+      #
+      def hidden_input(method, options)
+        options ||= {}
+        html_options = options.delete(:input_html) || strip_formtastic_options(options)
+        html_options[:id] ||= generate_html_id(method, "")
+        hidden_field(method, html_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. A collection can be given
+      # as an Array, a Hash or as a String (containing pre-rendered HTML options). If not provided, the choices are
+      # found by inferring the parent's class name from the method name and simply calling all on it
+      # (VehicleOwner.all in the example above).
+      #
+      # Examples:
+      #
+      #   f.input :author, :collection => @authors
+      #   f.input :author, :collection => Author.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"]
+      #   f.input :author, :collection => grouped_options_for_select(["North America",[["United States","US"],["Canada","CA"]]])
+      #
+      # 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 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) || {}
+        html_options[:multiple] = html_options[:multiple] || options.delete(:multiple)
+        html_options.delete(:multiple) if html_options[:multiple].nil?
+
+        reflection = reflection_for(method)
+        if reflection && [ :has_many, :has_and_belongs_to_many ].include?(reflection.macro)
+          html_options[:multiple] = true if html_options[:multiple].nil?
+          html_options[:size]     ||= 5
+          options[:include_blank] ||= false
+        end
+        options = set_include_blank(options)
+        input_name = generate_association_input_name(method)
+        html_options[:id] ||= generate_html_id(input_name, "")
+
+        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, options)
+          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
+          grouped_collection_select(input_name, group_collection,
+                                         group_association, group_label_method,
+                                         value, label,
+                                         strip_formtastic_options(options), html_options)
+        else
+          collection = find_collection_for_column(method, options)
+
+          select(input_name, collection, strip_formtastic_options(options), html_options)
+        end
+
+        label_options = options_for_label(options).merge(:input_name => input_name)
+        label_options[:for] ||= html_options[:id]
+        label(method, label_options) << select_html
+      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) || {}
+        field_id = generate_html_id(method, "")
+        html_options[:id] ||= field_id
+        label_options = options_for_label(options)
+        label_options[:for] ||= html_options[:id]
+        label(method, label_options) <<
+        time_zone_select(method, options.delete(:priority_zones),
+          strip_formtastic_options(options), 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.all in the example above).
+      #
+      # Examples:
+      #
+      #   f.input :author, :as => :radio, :collection => @authors
+      #   f.input :author, :as => :radio, :collection => Author.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}" }
+      #
+      # 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 = []
+
+        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[:id] = input_id
+
+          li_content = template.content_tag(:label,
+            Formtastic::Util.html_safe("#{radio_button(input_name, value, html_options)} #{escape_html_entities(label)}"),
+            :for => input_id
+          )
+
+          li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
+          template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
+        end
+
+        template.content_tag(:fieldset,
+          legend_tag(method, options) << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
+        )
+      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).  Each li contains a label
+      # (eg "Year") and a select box. Overwriting the label is possible by adding the :labels option.
+      # :labels should be a hash with the field (e.g. day) as key and the label text as value.
+      # See date_or_datetime_input for a more detailed output example.
+      #
+      # Some of Rails' options for select_date are supported, but not everything yet, see
+      # documentation of date_or_datetime_input() for more information.
+      def date_input(method, options)
+        options = set_include_blank(options)
+        date_or_datetime_input(method, options.merge(:discard_hour => true))
+      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. Overwriting the label is possible by adding
+      # the :labels option. :labels should be a hash with the field (e.g. day) as key and the label
+      # text as value.  See date_or_datetime_input for a more detailed output example.
+      #
+      # Some of Rails' options for select_date are supported, but not everything yet, see
+      # documentation of date_or_datetime_input() for more information.
+      def datetime_input(method, options)
+        options = set_include_blank(options)
+        date_or_datetime_input(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. Overwriting the label is possible by adding the :labels option.
+      # :labels should be a hash with the field (e.g. day) as key and the label text as value.
+      # See date_or_datetime_input for a more detailed output example.
+      #
+      # Some of Rails' options for select_time are supported, but not everything yet, see
+      # documentation of date_or_datetime_input() for more information.
+      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
+
+      # Helper method used by :as => (:date|:datetime|:time).  Generates a fieldset containing a
+      # legend (for what would normally be considered the label), and an ordered list of list items
+      # for year, month, day, hour, etc, each containing a label and a select.  Example:
+      #
+      # <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().
+      #
+      # Options:
+      #
+      #   * @:order => [:month, :day, :year]@
+      #   * @:include_seconds@ => true@
+      #   * @:discard_(year|month|day|hour|minute) => true@
+      #   * @:include_blank => true@
+      #   * @:labels => {}@
+      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]
+        inputs   = [] if options[:ignore_date]
+        labels   = options.delete(:labels) || {}
+
+        time_inputs = [:hour, :minute]
+        time_inputs << :second if options[:include_seconds]
+
+        list_items_capture = ""
+        hidden_fields_capture = ""
+
+        datetime = @object.send(method) if @object && @object.send(method)
+
+        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) : 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 = labels[input] || ::I18n.t(input.to_s, :default => input.to_s.humanize, :scope => [:datetime, :prompts])
+
+            list_items_capture << template.content_tag(:li, Formtastic::Util.html_safe([
+                !item_label_text.blank? ? template.content_tag(:label, Formtastic::Util.html_safe(item_label_text), :for => input_id) : "",
+                template.send(:"select_#{input}", datetime, opts, html_options.merge(:id => input_id))
+              ].join(""))
+            )
+          end
+        end
+
+        hidden_fields_capture << field_set_and_list_wrapping_for_method(method, options.merge(:label_for => input_ids.first), list_items_capture)
+      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 all on
+      # it (Author.all in the example above).
+      #
+      # Examples:
+      #
+      #   f.input :author, :as => :check_boxes, :collection => @authors
+      #   f.input :author, :as => :check_boxes, :collection => Author.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}" }
+      #
+      # Formtastic works around a bug in rails handling of check box collections by
+      # not generating the hidden fields for state checking of the checkboxes
+      # The :hidden_fields option provides a way to re-enable these hidden inputs by
+      # setting it to true.
+      #
+      #   f.input :authors, :as => :check_boxes, :hidden_fields => false
+      #   f.input :authors, :as => :check_boxes, :hidden_fields => true
+      #
+      # 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)
+        hidden_fields   = options.delete(:hidden_fields)
+        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_values = find_selected_values_for_column(method, options)
+        disabled_option_is_present = options.key?(:disabled)
+        disabled_values = [*options[:disabled]] if disabled_option_is_present
+
+        li_options = value_as_class ? { :class => [method.to_s.singularize, 'default'].join('_') } : {}
+
+        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)
+          html_options[:disabled] = disabled_values.include?(value) if disabled_option_is_present
+          html_options[:id] = input_id
+
+          li_content = template.content_tag(:label,
+            Formtastic::Util.html_safe("#{create_check_boxes(input_name, html_options, value, unchecked_value, hidden_fields)} #{escape_html_entities(label)}"),
+            :for => input_id
+          )
+
+          li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
+          template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
+        end
+
+        fieldset_content = legend_tag(method, options)
+        fieldset_content << create_hidden_field_for_check_boxes(input_name, value_as_class) unless hidden_fields
+        fieldset_content << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
+        template.content_tag(:fieldset, fieldset_content)
+      end
+
+      # Used by check_boxes input. The selected values will be set by retrieving the value
+      # through the association.
+      #
+      # If the collection is not a hash or an array of strings, fixnums or symbols,
+      # we use value_method to retrieve an array with the values
+      def find_selected_values_for_column(method, options)
+        if object.respond_to?(method)
+          collection = [object.send(method)].compact.flatten
+          label, value = detect_label_and_value_method!(collection, options)
+          [*collection.map { |o| send_or_call(value, o) }].compact
+        else
+          []
+        end
+      end
+
+      # Outputs a custom hidden field for check_boxes
+      def create_hidden_field_for_check_boxes(method, value_as_class) #:nodoc:
+        options = value_as_class ? { :class => [method.to_s.singularize, 'default'].join('_') } : {}
+        input_name = "#{object_name}[#{method.to_s}][]"
+        template.hidden_field_tag(input_name, '', options)
+      end
+
+      # Outputs a checkbox tag. If called with no_hidden_input = true a plain check_box_tag is returned,
+      # otherwise the helper uses the output generated by the rails check_box method.
+      def create_check_boxes(input_name, html_options = {}, checked_value = "1", unchecked_value = "0", hidden_fields = false) #:nodoc:
+        return template.check_box_tag(input_name, checked_value, html_options[:checked], html_options) unless hidden_fields == true
+        check_box(input_name, html_options, checked_value, unchecked_value)
+      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 respond_to?(:country_select)
+
+        html_options = options.delete(:input_html) || {}
+        priority_countries = options.delete(:priority_countries) || self.priority_countries
+
+        field_id = generate_html_id(method, "")
+        html_options[:id] ||= field_id
+        label_options = options_for_label(options)
+        label_options[:for] ||= html_options[:id]
+
+        label(method, label_options) <<
+        country_select(method, priority_countries, strip_formtastic_options(options), html_options)
+      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) || {}
+        checked_value = options.delete(:checked_value) || '1'
+        unchecked_value = options.delete(:unchecked_value) || '0'
+
+        html_options[:id] = html_options[:id] || generate_html_id(method, "")
+        input = template.check_box_tag(
+          "#{@object_name}[#{method}]",
+          checked_value,
+          (@object && @object.send(:"#{method}")),
+          html_options
+        )
+        
+        options = options_for_label(options)
+        options[:for] ||= html_options[:id]
+
+        # the label() method will insert this nested input into the label at the last minute
+        options[:label_prefix_for_nested_input] = input
+
+        template.hidden_field_tag("#{@object_name}[#{method}]", unchecked_value, :id => nil) << label(method, options)
+      end
+
+      # 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
+
+      # 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? or options[:hint].kind_of? Hash
+        hint_class = options[:hint_class] || default_hint_class
+        template.content_tag(:p, Formtastic::Util.html_safe(options[:hint]), :class => hint_class)
+      end
+
+      # Creates an error sentence by calling to_sentence on the errors array.
+      #
+      def error_sentence(errors, options = {}) #:nodoc:
+        error_class = options[:error_class] || default_inline_error_class
+        template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.untaint), :class => error_class)
+      end
+
+      # Creates an error li list.
+      #
+      def error_list(errors, options = {}) #:nodoc:
+        error_class = options[:error_class] || default_error_list_class
+        list_elements = []
+        errors.each do |error|
+          list_elements <<  template.content_tag(:li, Formtastic::Util.html_safe(error.untaint))
+        end
+        template.content_tag(:ul, Formtastic::Util.html_safe(list_elements.join("\n")), :class => error_class)
+      end
+
+      # Creates an error sentence containing only the first error
+      #
+      def error_first(errors, options = {}) #:nodoc:
+        error_class = options[:error_class] || default_inline_error_class
+        template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => error_class)
+      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
+
+        if string_or_proc.is_a?(Proc)
+          string_or_proc.call
+        else
+          string_or_proc.to_s
+        end
+      end
+
+      # Generates a fieldset and wraps the content in an ordered list. When working
+      # with nested attributes, 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.dup.delete(:name).to_s
+        legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
+        legend  = template.content_tag(:legend, template.content_tag(:span, Formtastic::Util.html_safe(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
+
+        # 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,
+          Formtastic::Util.html_safe(legend) << template.content_tag(:ol, Formtastic::Util.html_safe(contents)),
+          html_options.except(:builder, :parent)
+        )
+
+        fieldset
+      end
+
+      def field_set_title_from_args(*args) #:nodoc:
+        options = args.extract_options!
+        options[:name] ||= options.delete(:title)
+        title = options[:name]
+
+        if title.blank?
+          valid_name_classes = [::String, ::Symbol]
+          valid_name_classes.delete(::Symbol) if !block_given? && (args.first.is_a?(::Symbol) && 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
+
+      # 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,
+                label(method, options_for_label(options).merge(:for => options.delete(:label_for))), :class => 'label'
+              ) <<
+            template.content_tag(:ol, Formtastic::Util.html_safe(contents))
+          )
+      end
+
+      # Generates the legend for radiobuttons and checkboxes
+      def legend_tag(method, options = {})
+        if options[:label] == false
+          Formtastic::Util.html_safe("")
+        else
+          text = localized_string(method, options[:label], :label) || humanized_attribute_name(method)
+          text += required_or_optional_string(options.delete(:required))
+          text = Formtastic::Util.html_safe(text)
+          template.content_tag :legend, template.label_tag(nil, text, :for => nil), :class => :label
+        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, options = {}) #:nodoc:
+        if column = 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/
+            return :email     if method.to_s =~ /email/
+            return :url       if method.to_s =~ /^url$|^website$|_url$/
+            return :phone     if method.to_s =~ /(phone|fax)/
+            return :search    if method.to_s =~ /^search$/
+          when :integer
+            return :select    if reflection_for(method)
+            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 reflection_for(method)
+
+            return :file    if is_file?(method, options)
+          end
+
+          return :select    if options.key?(:collection)
+          return :password  if method.to_s =~ /password/
+          return :string
+        end
+      end
+
+      def is_file?(method, options = {})
+        @files ||= {}
+        @files[method] ||= (options[:as].present? && options[:as] == :file) || begin
+          file = @object.send(method) if @object && @object.respond_to?(method)
+          file && file_methods.any?{|m| file.respond_to?(m)}
+        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 a plain string
+        return collection if collection.instance_of?(String) || collection.instance_of?(::Formtastic::Util.rails_safe_buffer_class)
+
+        # 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) &&
+                             !(options.include?(:label_method) || options.include?(:value_method))
+
+        label, value = detect_label_and_value_method!(collection, options)
+        collection.map { |o| [send_or_call(label, o), send_or_call(value, o)] }
+      end
+
+      # 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 = reflection_for(column)
+          options[:find_options] ||= {}
+
+          if conditions = reflection.options[:conditions]
+            if reflection.klass.respond_to?(:merge_conditions)
+              options[:find_options][:conditions] = reflection.klass.merge_conditions(conditions, options[:find_options][:conditions])
+              reflection.klass.all(options[:find_options])
+            else
+              reflection.klass.where(conditions).where(options[:find_options][:conditions])
+            end
+          else
+            reflection.klass.all(options[:find_options])
+          end
+        else
+          create_boolean_collection(options)
+        end
+
+        collection = collection.to_a if collection.is_a?(Hash)
+        collection
+      end
+
+      # Detects the label and value methods from a collection using methods set in
+      # collection_label_methods and collection_value_methods. For some ruby core
+      # classes sensible defaults have been defined. It will use and delete the options
+      # :label_method and :value_methods when present.
+      #
+      def detect_label_and_value_method!(collection, options = {})
+        sample = collection.first || collection.last
+
+        case sample
+        when Array
+          label, value = :first, :last
+        when Integer
+          label, value = :to_s, :to_i
+        when String, NilClass
+          label, value = :to_s, :to_s
+        end
+
+        # Order of preference: user supplied method, class defaults, auto-detect
+        label = options[:label_method] || label || collection_label_methods.find { |m| sample.respond_to?(m) }
+        value = options[:value_method] || value || collection_value_methods.find { |m| sample.respond_to?(m) }
+
+        [label, value]
+      end
+
+      # Return the label collection method when none is supplied using the
+      # values set in collection_label_methods.
+      #
+      def detect_label_method(collection) #:nodoc:
+        detect_label_and_value_method!(collection).first
+      end
+
+      # 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 = 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
+
+      # 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)
+
+        [ [ options.delete(:true), true], [ options.delete(:false), false ] ]
+      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 = 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
+
+      # 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
+
+      # 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
+
+      # Returns the active validations for the given method or an empty Array if no validations are
+      # found for the method.
+      #
+      # By default, the if/unless options of the validations are evaluated and only the validations
+      # that should be run for the current object state are returned. Pass :all to the last
+      # parameter to return :all validations regardless of if/unless options.
+      #
+      # Requires the ValidationReflection plugin to be present or an ActiveModel. Returns an epmty
+      # Array if neither is the case.
+      #
+      def validations_for(method, mode = :active)
+        # ActiveModel?
+        validations = if @object && @object.class.respond_to?(:validators_on)
+          @object.class.validators_on(method)
+        else
+          # ValidationReflection plugin?
+          if @object && @object.class.respond_to?(:reflect_on_validations_for)
+            @object.class.reflect_on_validations_for(method)
+          else
+            []
+          end
+        end
+
+        validations = validations.select do |validation|
+          (validation.options.present? ? options_require_validation?(validation.options) : true)
+        end unless mode == :all
+
+        return validations
+      end
+
+      # Generates default_string_options by retrieving column information from
+      # the database.
+      #
+      def default_string_options(method, type) #:nodoc:
+        def get_maxlength_for(method)
+          validation = validations_for(method).find do |validation|
+            (validation.respond_to?(:macro) && validation.macro == :validates_length_of) || # Rails 2 + 3 style validation
+            (validation.respond_to?(:kind) && validation.kind == :length) # Rails 3 style validator
+          end
+
+          if validation
+            validation.options[:maximum] || (validation.options[:within].present? ? validation.options[:within].max : nil)
+          else
+            nil
+          end
+        end
+
+        validation_max_limit = get_maxlength_for(method)
+        column = column_for(method)
+
+        if type == :text
+          { :rows => default_text_area_height, 
+            :cols => default_text_area_width }
+        elsif type == :numeric || column.nil? || !column.respond_to?(:limit) || column.limit.nil?
+          { :maxlength => validation_max_limit,
+            :size => default_text_field_size }
+        else
+          { :maxlength => validation_max_limit || column.limit,
+            :size => default_text_field_size }
+        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') #:nodoc:
+        index = if options.has_key?(:index)
+                  options[:index]
+                elsif defined?(@auto_index)
+                  @auto_index
+                else
+                  ""
+                end
+        sanitized_method_name = method_name.to_s.gsub(/[\?\/\-]$/, '')
+
+        [@@custom_namespace, sanitized_object_name, index, sanitized_method_name, value].reject{|x|x.blank?}.join('_')
+      end
+
+      # Gets the nested_child_index value from the parent builder. 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')
+
+        child = parent[:for]
+        child = child.first if child.respond_to?(:first)
+        duck[child].to_i + 1
+      end
+
+      def sanitized_object_name #:nodoc:
+        @sanitized_object_name ||= @object_name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
+      end
+
+      def humanized_attribute_name(method) #:nodoc:
+        if @object && @object.class.respond_to?(:human_attribute_name)
+          humanized_name = @object.class.human_attribute_name(method.to_s)
+          if humanized_name == method.to_s.send(:humanize)
+            method.to_s.send(label_str_method)
+          else
+            humanized_name
+          end
+        else
+          method.to_s.send(label_str_method)
+        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 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)
+          escape_html_entities(value)
+        else
+          use_i18n = value.nil? ? i18n_lookups_by_default : (value != false)
+
+          if use_i18n
+            model_name, nested_model_name  = normalize_model_name(self.model_name.underscore)
+            action_name = template.params[:action].to_s rescue ''
+            attribute_name = key.to_s
+
+            defaults = ::Formtastic::I18n::SCOPES.reject do |i18n_scope|
+              nested_model_name.nil? && i18n_scope.match(/nested_model/)
+            end.collect do |i18n_scope|
+              i18n_path = i18n_scope.dup
+              i18n_path.gsub!('%{action}', action_name)
+              i18n_path.gsub!('%{model}', model_name)
+              i18n_path.gsub!('%{nested_model}', nested_model_name) unless nested_model_name.nil?
+              i18n_path.gsub!('%{attribute}', attribute_name)
+              i18n_path.gsub!('..', '.')
+              i18n_path.to_sym
+            end
+            defaults << ''
+
+            defaults.uniq!
+
+            default_key = defaults.shift
+            i18n_value = ::Formtastic::I18n.t(default_key,
+              options.merge(:default => defaults, :scope => type.to_s.pluralize.to_sym))
+            if i18n_value.blank? && type == :label
+              # This is effectively what Rails label helper does for i18n lookup
+              options[:scope] = [:helpers, type]
+              options[:default] = defaults
+              i18n_value = ::I18n.t(default_key, options)
+            end
+            i18n_value = escape_html_entities(i18n_value) if i18n_value.is_a?(::String)
+            i18n_value.blank? ? nil : i18n_value
+          end
+        end
+      end
+
+      def model_name
+        @object.present? ? @object.class.name : @object_name.to_s.classify
+      end
+
+      def normalize_model_name(name)
+        if name =~ /(.+)\[(.+)\]/
+          [$1, $2]
+        else
+          [name]
+        end
+      end
+
+      def send_or_call(duck, object)
+        if duck.is_a?(Proc)
+          duck.call(object)
+        else
+          object.send(duck)
+        end
+      end
+
+      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
+
+      def escape_html_entities(string) #:nodoc:
+        if escape_html_entities_in_hints_and_labels
+          # Acceppt html_safe flag as indicator to skip escaping
+          string = template.escape_once(string) unless string.respond_to?(:html_safe?) && string.html_safe? == true
+        end
+        string
+      end
+    
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/semantic_form_helper.rb b/lib/formtastic/semantic_form_helper.rb
new file mode 100644
index 000000000..659752c5a
--- /dev/null
+++ b/lib/formtastic/semantic_form_helper.rb
@@ -0,0 +1,96 @@
+module Formtastic
+  
+  # Wrappers around form_for (etc) with :builder => SemanticFormBuilder.
+  #
+  # * semantic_form_for(@post)
+  # * semantic_fields_for(@post)
+  # * semantic_form_remote_for(@post)
+  # * semantic_remote_form_for(@post)
+  #
+  # Each of which are the equivalent of:
+  #
+  # * form_for(@post, :builder => Formtastic::SemanticFormBuilder))
+  # * fields_for(@post, :builder => Formtastic::SemanticFormBuilder))
+  # * form_remote_for(@post, :builder => Formtastic::SemanticFormBuilder))
+  # * remote_form_for(@post, :builder => Formtastic::SemanticFormBuilder))
+  #
+  # Example Usage:
+  #
+  #   <% semantic_form_for @post do |f| %>
+  #     <%= f.input :title %>
+  #     <%= f.input :body %>
+  #   <% 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, 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| %>
+  #     ...
+  #   <% end %>
+  #
+  #   <% semantic_form_for :post, Post.new, :url => posts_path do |f| %>
+  #     ...
+  #   <% end %>
+  module SemanticFormHelper
+    @@builder = ::Formtastic::SemanticFormBuilder
+    @@default_form_class = 'formtastic'
+    mattr_accessor :builder, :default_form_class
+
+    # 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
+
+    def with_custom_field_error_proc(&block)
+      default_field_error_proc = ::ActionView::Base.field_error_proc
+      ::ActionView::Base.field_error_proc = FIELD_ERROR_PROC
+      yield
+    ensure
+      ::ActionView::Base.field_error_proc = default_field_error_proc
+    end
+
+    def semantic_remote_form_for_wrapper(record_or_name_or_array, *args, &proc)
+      options = args.extract_options!
+      if respond_to? :remote_form_for
+        semantic_remote_form_for_real(record_or_name_or_array, *(args << options), &proc)
+      else
+        options[:remote] = true
+        semantic_form_for(record_or_name_or_array, *(args << options), &proc)
+      end
+    end
+
+    [:form_for, :fields_for, :remote_form_for].each do |meth|
+      module_eval <<-END_SRC, __FILE__, __LINE__ + 1
+        def semantic_#{meth}(record_or_name_or_array, *args, &proc)
+          options = args.extract_options!
+          options[:builder] ||= @@builder
+          options[:html] ||= {}
+          @@builder.custom_namespace = options[:namespace].to_s
+
+          singularizer = defined?(ActiveModel::Naming.singular) ? ActiveModel::Naming.method(:singular) : ActionController::RecordIdentifier.method(:singular_class_name)
+
+          class_names = options[:html][:class] ? options[:html][:class].split(" ") : []
+          class_names << @@default_form_class
+          class_names << case record_or_name_or_array
+            when String, Symbol then record_or_name_or_array.to_s                                  # :post => "post"
+            when Array then options[:as] || singularizer.call(record_or_name_or_array.last.class)  # [@post, @comment] # => "comment"
+            else options[:as] || singularizer.call(record_or_name_or_array.class)                  # @post => "post"
+          end
+          options[:html][:class] = class_names.join(" ")
+
+          with_custom_field_error_proc do
+            #{meth}(record_or_name_or_array, *(args << options), &proc)
+          end
+        end
+      END_SRC
+    end
+    alias :semantic_remote_form_for_real :semantic_remote_form_for
+    alias :semantic_remote_form_for :semantic_remote_form_for_wrapper
+    alias :semantic_form_remote_for :semantic_remote_form_for
+
+  end
+end
\ No newline at end of file

From e02695f5f3f9663e3f87e8f175974e2e3f248ea8 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 16 Jan 2011 14:06:33 +1100
Subject: [PATCH 431/992] we don't need to fall back to the Rails 2
 class_inheritable stuff (hooray)

---
 lib/formtastic/semantic_form_builder.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/formtastic/semantic_form_builder.rb b/lib/formtastic/semantic_form_builder.rb
index fc25e5595..2b7275809 100644
--- a/lib/formtastic/semantic_form_builder.rb
+++ b/lib/formtastic/semantic_form_builder.rb
@@ -8,11 +8,7 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
       :default_commit_button_accesskey, :default_inline_error_class, :default_hint_class, :default_error_list_class
     ]
     
-    if respond_to?(:class_attribute)
-      class_attribute *configurables
-    else
-      class_inheritable_accessor *configurables
-    end
+    class_attribute *configurables
     
     cattr_accessor :custom_namespace
 

From 8830c0973ca788fb665636d3e8137ca1c5fca833 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 16 Jan 2011 14:16:03 +1100
Subject: [PATCH 432/992] no idea why this is a special config

---
 lib/formtastic/semantic_form_builder.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic/semantic_form_builder.rb b/lib/formtastic/semantic_form_builder.rb
index 2b7275809..120691a40 100644
--- a/lib/formtastic/semantic_form_builder.rb
+++ b/lib/formtastic/semantic_form_builder.rb
@@ -10,7 +10,7 @@ class SemanticFormBuilder < ActionView::Helpers::FormBuilder
     
     class_attribute *configurables
     
-    cattr_accessor :custom_namespace
+    class_attribute :custom_namespace
 
     self.default_text_field_size = nil
     self.default_text_area_height = 20
@@ -1699,7 +1699,7 @@ def generate_html_id(method_name, value='input') #:nodoc:
                 end
         sanitized_method_name = method_name.to_s.gsub(/[\?\/\-]$/, '')
 
-        [@@custom_namespace, sanitized_object_name, index, sanitized_method_name, value].reject{|x|x.blank?}.join('_')
+        [custom_namespace, sanitized_object_name, index, sanitized_method_name, value].reject{|x|x.blank?}.join('_')
       end
 
       # Gets the nested_child_index value from the parent builder. It returns a hash with each

From e9b18c7945cdfed8290269589961dcb17f605c16 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 16 Jan 2011 14:30:12 +1100
Subject: [PATCH 433/992] cleaned up the way that we declare configurable
 values. one line for each (nice clean diffs) and no duplication/separation
 between the value and the declaration

---
 lib/formtastic/semantic_form_builder.rb | 61 ++++++++++++-------------
 1 file changed, 28 insertions(+), 33 deletions(-)

diff --git a/lib/formtastic/semantic_form_builder.rb b/lib/formtastic/semantic_form_builder.rb
index 120691a40..b1aa73252 100644
--- a/lib/formtastic/semantic_form_builder.rb
+++ b/lib/formtastic/semantic_form_builder.rb
@@ -1,39 +1,34 @@
 module Formtastic
   class SemanticFormBuilder < ActionView::Helpers::FormBuilder
 
-    configurables = [
-      :default_text_field_size, :default_text_area_height, :default_text_area_width, :all_fields_required_by_default, :include_blank_for_select_by_default,
-      :required_string, :optional_string, :inline_errors, :label_str_method, :collection_value_methods, :collection_label_methods, :file_metadata_suffixes,
-      :inline_order, :custom_inline_order, :file_methods, :priority_countries, :i18n_lookups_by_default, :escape_html_entities_in_hints_and_labels,
-      :default_commit_button_accesskey, :default_inline_error_class, :default_hint_class, :default_error_list_class
-    ]
-    
-    class_attribute *configurables
-    
-    class_attribute :custom_namespace
-
-    self.default_text_field_size = nil
-    self.default_text_area_height = 20
-    self.default_text_area_width = nil
-    self.all_fields_required_by_default = true
-    self.include_blank_for_select_by_default = true
-    self.required_string = proc { ::Formtastic::Util.html_safe(%{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>}) }
-    self.optional_string = ''
-    self.inline_errors = :sentence
-    self.label_str_method = :humanize
-    self.collection_label_methods = %w[to_label display_name full_name name title username login value to_s]
-    self.collection_value_methods = %w[id to_s]
-    self.inline_order = [ :input, :hints, :errors ]
-    self.custom_inline_order = {}
-    self.file_methods = [ :file?, :public_filename, :filename ]
-    self.file_metadata_suffixes = ['content_type', 'file_name', 'file_size']
-    self.priority_countries = ["Australia", "Canada", "United Kingdom", "United States"]
-    self.i18n_lookups_by_default = false
-    self.escape_html_entities_in_hints_and_labels = true
-    self.default_commit_button_accesskey = nil
-    self.default_inline_error_class = 'inline-errors'
-    self.default_error_list_class = 'errors'
-    self.default_hint_class = 'inline-hints'
+    def self.configure(name, value = nil)
+      class_attribute(name)
+      self.send(:"#{name}=", value)  
+    end
+
+    configure :custom_namespace
+    configure :default_text_field_size
+    configure :default_text_area_height, 20
+    configure :default_text_area_width
+    configure :all_fields_required_by_default, true
+    configure :include_blank_for_select_by_default, true
+    configure :required_string, proc { ::Formtastic::Util.html_safe(%{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>}) }
+    configure :optional_string, ''
+    configure :inline_errors, :sentence
+    configure :label_str_method, :humanize
+    configure :collection_label_methods, %w[to_label display_name full_name name title username login value to_s]
+    configure :collection_value_methods, %w[id to_s]
+    configure :inline_order, [ :input, :hints, :errors ]
+    configure :custom_inline_order, {}
+    configure :file_methods, [ :file?, :public_filename, :filename ]
+    configure :file_metadata_suffixes, ['content_type', 'file_name', 'file_size']
+    configure :priority_countries, ["Australia", "Canada", "United Kingdom", "United States"]
+    configure :i18n_lookups_by_default, false
+    configure :escape_html_entities_in_hints_and_labels, true
+    configure :default_commit_button_accesskey
+    configure :default_inline_error_class, 'inline-errors'
+    configure :default_error_list_class, 'errors'
+    configure :default_hint_class, 'inline-hints'
 
     RESERVED_COLUMNS = [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
 

From b31b629707d2114cb1e7a26db3dd06e444ca15c8 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 16 Jan 2011 15:08:32 +1100
Subject: [PATCH 434/992] renamed Formtastic::SemanticFormBuilder to
 Builder::Base and Formtastic::SemanticFormHelper to
 Formtastic::Helpers::FormHelper, with backwards-compatible class and module
 respectively to keep dependencies happy for now.

---
 lib/formtastic.rb                       |    4 +-
 lib/formtastic/builder/base.rb          | 1835 +++++++++++++++++++++++
 lib/formtastic/helpers/form_helper.rb   |  106 ++
 lib/formtastic/semantic_form_builder.rb | 1827 ----------------------
 lib/formtastic/semantic_form_helper.rb  |   96 --
 5 files changed, 1943 insertions(+), 1925 deletions(-)
 create mode 100644 lib/formtastic/builder/base.rb
 create mode 100644 lib/formtastic/helpers/form_helper.rb
 delete mode 100644 lib/formtastic/semantic_form_builder.rb
 delete mode 100644 lib/formtastic/semantic_form_helper.rb

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 59b902ed4..9a926b2cd 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -2,5 +2,5 @@
 require File.join(File.dirname(__FILE__), *%w[formtastic i18n])
 require File.join(File.dirname(__FILE__), *%w[formtastic util])
 require File.join(File.dirname(__FILE__), *%w[formtastic railtie]) if defined?(::Rails::Railtie)
-require File.join(File.dirname(__FILE__), *%w[formtastic semantic_form_builder])
-require File.join(File.dirname(__FILE__), *%w[formtastic semantic_form_helper])
+require File.join(File.dirname(__FILE__), *%w[formtastic builder base])
+require File.join(File.dirname(__FILE__), *%w[formtastic helpers form_helper])
diff --git a/lib/formtastic/builder/base.rb b/lib/formtastic/builder/base.rb
new file mode 100644
index 000000000..b12a93cf1
--- /dev/null
+++ b/lib/formtastic/builder/base.rb
@@ -0,0 +1,1835 @@
+module Formtastic
+  module Builder
+    class Base < ActionView::Helpers::FormBuilder
+    
+      def self.configure(name, value = nil)
+        class_attribute(name)
+        self.send(:"#{name}=", value)  
+      end
+    
+      configure :custom_namespace
+      configure :default_text_field_size
+      configure :default_text_area_height, 20
+      configure :default_text_area_width
+      configure :all_fields_required_by_default, true
+      configure :include_blank_for_select_by_default, true
+      configure :required_string, proc { ::Formtastic::Util.html_safe(%{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>}) }
+      configure :optional_string, ''
+      configure :inline_errors, :sentence
+      configure :label_str_method, :humanize
+      configure :collection_label_methods, %w[to_label display_name full_name name title username login value to_s]
+      configure :collection_value_methods, %w[id to_s]
+      configure :inline_order, [ :input, :hints, :errors ]
+      configure :custom_inline_order, {}
+      configure :file_methods, [ :file?, :public_filename, :filename ]
+      configure :file_metadata_suffixes, ['content_type', 'file_name', 'file_size']
+      configure :priority_countries, ["Australia", "Canada", "United Kingdom", "United States"]
+      configure :i18n_lookups_by_default, false
+      configure :escape_html_entities_in_hints_and_labels, true
+      configure :default_commit_button_accesskey
+      configure :default_inline_error_class, 'inline-errors'
+      configure :default_error_list_class, 'errors'
+      configure :default_hint_class, 'inline-hints'
+    
+      RESERVED_COLUMNS = [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
+    
+      INLINE_ERROR_TYPES = [:sentence, :list, :first]
+    
+      attr_accessor :template
+    
+      # Returns a suitable form input for the given +method+, using the database column information
+      # and other factors (like the method name) to figure out what you probably want.
+      #
+      # Options:
+      #
+      # * :as - override the input type (eg force a :string to render as a :password field)
+      # * :label - use something other than the method name as the label text, when false no label is printed
+      # * :required - specify if the column is required (true) or not (false)
+      # * :hint - provide some text to hint or help the user provide the correct information for a field
+      # * :input_html - provide options that will be passed down to the generated input
+      # * :wrapper_html - provide options that will be passed down to the li wrapper
+      #
+      # Input Types:
+      #
+      # Most inputs map directly to one of ActiveRecord's column types by default (eg string_input),
+      # but there are a few special cases and some simplification (:integer, :float and :decimal
+      # columns all map to a single numeric_input, for example).
+      #
+      # * :select (a select menu for associations) - default to association names
+      # * :check_boxes (a set of check_box inputs for associations) - alternative to :select has_many and has_and_belongs_to_many associations
+      # * :radio (a set of radio inputs for associations) - alternative to :select belongs_to associations
+      # * :time_zone (a select menu with time zones)
+      # * :password (a password input) - default for :string column types with 'password' in the method name
+      # * :text (a textarea) - default for :text column types
+      # * :date (a date select) - default for :date column types
+      # * :datetime (a date and time select) - default for :datetime and :timestamp column types
+      # * :time (a time select) - default for :time column types
+      # * :boolean (a checkbox) - default for :boolean column types (you can also have booleans as :select and :radio)
+      # * :string (a text field) - default for :string column types
+      # * :numeric (a text field, like string) - default for :integer, :float and :decimal column types
+      # * :email (an email input) - default for :string column types with 'email' as the method name.
+      # * :url (a url input) - default for :string column types with 'url' as the method name.
+      # * :phone (a tel input) - default for :string column types with 'phone' or 'fax' in the method name.
+      # * :search (a search input) - default for :string column types with 'search' as the method name.
+      # * :country (a select menu of country names) - requires a country_select plugin to be installed
+      # * :email (an email input) - New in HTML5 - needs to be explicitly provided with :as => :email
+      # * :url (a url input) - New in HTML5 - needs to be explicitly provided with :as => :url
+      # * :phone (a tel input) - New in HTML5 - needs to be explicitly provided with :as => :phone
+      # * :search (a search input) - New in HTML5 - needs to be explicity provided with :as => :search
+      # * :country (a select menu of country names) - requires a country_select plugin to be installed
+      # * :hidden (a hidden field) - creates a hidden field (added for compatibility)
+      #
+      # Example:
+      #
+      #   <% semantic_form_for @employee do |form| %>
+      #     <% form.inputs do -%>
+      #       <%= form.input :name, :label => "Full Name" %>
+      #       <%= form.input :manager, :as => :radio %>
+      #       <%= form.input :secret, :as => :password, :input_html => { :value => "xxxx" } %>
+      #       <%= form.input :hired_at, :as => :date, :label => "Date Hired" %>
+      #       <%= form.input :phone, :required => false, :hint => "Eg: +1 555 1234" %>
+      #       <%= form.input :email %>
+      #       <%= form.input :website, :as => :url, :hint => "You may wish to omit the http://" %>
+      #     <% end %>
+      #   <% end %>
+      #
+      def input(method, options = {})
+        options = options.dup # Allow options to be shared without being tainted by Formtastic
+        
+        options[:required] = method_required?(method) unless options.key?(:required)
+        options[:as]     ||= default_input_type(method, options)
+    
+        html_class = [ options[:as], (options[:required] ? :required : :optional) ]
+        html_class << 'error' if has_errors?(method, options)
+    
+        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 options[:input_html] && options[:input_html][:id]
+          options[:label_html] ||= {}
+          options[:label_html][:for] ||= options[:input_html][:id]
+        end
+    
+        input_parts = (custom_inline_order[options[:as]] || inline_order).dup
+        input_parts = input_parts - [:errors, :hints] if options[:as] == :hidden
+    
+        list_item_content = input_parts.map do |type|
+          send(:"inline_#{type}_for", method, options)
+        end.compact.join("\n")
+    
+        return template.content_tag(:li, Formtastic::Util.html_safe(list_item_content), wrapper_html)
+      end
+    
+      # Creates an input fieldset and ol tag wrapping for use around a set of inputs.  It can be
+      # called either with a block (in which you can do the usual Rails form stuff, HTML, ERB, etc),
+      # or with a list of fields.  These two examples are functionally equivalent:
+      #
+      #   # With a block:
+      #   <% semantic_form_for @post do |form| %>
+      #     <% form.inputs do %>
+      #       <%= form.input :title %>
+      #       <%= form.input :body %>
+      #     <% end %>
+      #   <% end %>
+      #
+      #   # With a list of fields:
+      #   <% semantic_form_for @post do |form| %>
+      #     <%= form.inputs :title, :body %>
+      #   <% end %>
+      #
+      #   # Output:
+      #   <form ...>
+      #     <fieldset class="inputs">
+      #       <ol>
+      #         <li class="string">...</li>
+      #         <li class="text">...</li>
+      #       </ol>
+      #     </fieldset>
+      #   </form>
+      #
+      # === Quick Forms
+      #
+      # When called without a block or a field list, an input is rendered for each column in the
+      # model's database table, just like Rails' scaffolding.  You'll obviously want more control
+      # than this in a production application, but it's a great way to get started, then come back
+      # later to customise the form with a field list or a block of inputs.  Example:
+      #
+      #   <% semantic_form_for @post do |form| %>
+      #     <%= 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/: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| %>
+      #     <% form.inputs :name => "Create a new post", :style => "border:1px;" do %>
+      #       ...
+      #     <% end %>
+      #   <% end %>
+      #
+      #   # With a list (the options must come after the field list):
+      #   <% semantic_form_for @post do |form| %>
+      #     <%= 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,
+      # use inputs:
+      #
+      #   <% semantic_form_for @post do |f| %>
+      #     <% f.inputs do %>
+      #       <%= f.input :title %>
+      #       <%= f.input :body %>
+      #     <% end %>
+      #     <% f.inputs :name => "Advanced", :id => "advanced" do %>
+      #       <%= f.input :created_at %>
+      #       <%= f.input :user_id, :label => "Author" %>
+      #     <% end %>
+      #     <% f.inputs "Extra" do %>
+      #       <%= f.input :update_at %>
+      #     <% end %>
+      #   <% end %>
+      #
+      #   # Output:
+      #   <form ...>
+      #     <fieldset class="inputs">
+      #       <ol>
+      #         <li class="string">...</li>
+      #         <li class="text">...</li>
+      #       </ol>
+      #     </fieldset>
+      #     <fieldset class="inputs" id="advanced">
+      #       <legend><span>Advanced</span></legend>
+      #       <ol>
+      #         <li class="datetime">...</li>
+      #         <li class="select">...</li>
+      #       </ol>
+      #     </fieldset>
+      #     <fieldset class="inputs">
+      #       <legend><span>Extra</span></legend>
+      #       <ol>
+      #         <li class="datetime">...</li>
+      #       </ol>
+      #     </fieldset>
+      #   </form>
+      #
+      # === Nested attributes
+      #
+      # As in Rails, you can use semantic_fields_for to nest attributes:
+      #
+      #   <% semantic_form_for @post do |form| %>
+      #     <%= form.inputs :title, :body %>
+      #
+      #     <% form.semantic_fields_for :author, @bob do |author_form| %>
+      #       <% author_form.inputs do %>
+      #         <%= author_form.input :first_name, :required => false %>
+      #         <%= author_form.input :last_name %>
+      #       <% end %>
+      #     <% end %>
+      #   <% end %>
+      #
+      # But this does not look formtastic! This is equivalent:
+      #
+      #   <% semantic_form_for @post do |form| %>
+      #     <%= form.inputs :title, :body %>
+      #     <% form.inputs :for => [ :author, @bob ] do |author_form| %>
+      #       <%= author_form.input :first_name, :required => false %>
+      #       <%= author_form.input :last_name %>
+      #     <% end %>
+      #   <% end %>
+      #
+      # And if you don't need to give options to your input call, you could do it
+      # in just one line:
+      #
+      #   <% semantic_form_for @post do |form| %>
+      #     <%= form.inputs :title, :body %>
+      #     <%= form.inputs :first_name, :last_name, :for => @bob %>
+      #   <% end %>
+      #
+      # Just remember that calling inputs generates a new fieldset to wrap your
+      # inputs. If you have two separate models, but, semantically, on the page
+      # they are part of the same fieldset, you should use semantic_fields_for
+      # 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"
+        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(*(args << html_options), &block)
+        else
+          if @object && args.empty?
+            args  = association_columns(:belongs_to)
+            args += content_columns
+            args -= RESERVED_COLUMNS
+            args.compact!
+          end
+          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
+    
+      # Creates a fieldset and ol tag wrapping for form buttons / actions as list items.
+      # See inputs documentation for a full example.  The fieldset's default class attriute
+      # is set to "buttons".
+      #
+      # See inputs for html attributes and special options.
+      def buttons(*args, &block)
+        html_options = args.extract_options!
+        html_options[:class] ||= "buttons"
+    
+        if block_given?
+          field_set_and_list_wrapping(html_options, &block)
+        else
+          args = [:commit] if args.empty?
+          contents = args.map { |button_name| send(:"#{button_name}_button") }
+          field_set_and_list_wrapping(html_options, contents)
+        end
+      end
+    
+      # Creates a submit input tag with the value "Save [model name]" (for existing records) or
+      # "Create [model name]" (for new records) by default:
+      #
+      #   <%= form.commit_button %> => <input name="commit" type="submit" value="Save Post" />
+      #
+      # The value of the button text can be overridden:
+      #
+      #  <%= 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 :button_html => { :class => "pretty" } %> => <input name="commit" type="submit" value="Save Post" class="pretty {create|update|submit}" />
+      def commit_button(*args)
+        options = args.extract_options!
+        text = options.delete(:label) || args.shift
+    
+        if @object && (@object.respond_to?(:persisted?) || @object.respond_to?(:new_record?))
+          key = @object.persisted? ? :update : :create
+    
+          # Deal with some complications with ActiveRecord::Base.human_name and two name models (eg UserPost)
+          # ActiveRecord::Base.human_name falls back to ActiveRecord::Base.name.humanize ("Userpost")
+          # if there's no i18n, which is pretty crappy.  In this circumstance we want to detect this
+          # fall back (human_name == name.humanize) and do our own thing name.underscore.humanize ("User Post")
+          if @object.class.model_name.respond_to?(:human)
+            object_name = @object.class.model_name.human
+          else
+            object_human_name = @object.class.human_name                # default is UserPost => "Userpost", but i18n may do better ("User post")
+            crappy_human_name = @object.class.name.humanize             # UserPost => "Userpost"
+            decent_human_name = @object.class.name.underscore.humanize  # UserPost => "User post"
+            object_name = (object_human_name == crappy_human_name) ? decent_human_name : object_human_name
+          end
+        else
+          key = :submit
+          object_name = @object_name.to_s.send(label_str_method)
+        end
+    
+        text = (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) || {}
+        button_html.merge!(:class => [button_html[:class], key].compact.join(' '))
+    
+        wrapper_html_class = ['commit'] # TODO: Add class reflecting on form action.
+        wrapper_html = options.delete(:wrapper_html) || {}
+        wrapper_html[:class] = (wrapper_html_class << wrapper_html[:class]).flatten.compact.join(' ')
+    
+        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, Formtastic::Util.html_safe(submit(text, button_html)), wrapper_html)
+      end
+    
+      # A thin wrapper around #fields_for to set :builder => Formtastic::SemanticFormBuilder
+      # for nesting forms:
+      #
+      #   # Example:
+      #   <% semantic_form_for @post do |post| %>
+      #     <% post.semantic_fields_for :author do |author| %>
+      #       <% author.inputs :name %>
+      #     <% end %>
+      #   <% end %>
+      #
+      #   # Output:
+      #   <form ...>
+      #     <fieldset class="inputs">
+      #       <ol>
+      #         <li class="string"><input type='text' name='post[author][name]' id='post_author_name' /></li>
+      #       </ol>
+      #     </fieldset>
+      #   </form>
+      #
+      def semantic_fields_for(record_or_name_or_array, *args, &block)
+        opts = args.extract_options!
+        opts[:builder] ||= self.class
+        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.
+      # * :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_string(method, text, :label) || humanized_attribute_name(method)
+        text += required_or_optional_string(options.delete(:required))
+        text = Formtastic::Util.html_safe(text)
+    
+        # special case for boolean (checkbox) labels, which have a nested input
+        if options.key?(:label_prefix_for_nested_input)
+          text = options.delete(:label_prefix_for_nested_input) + text
+        end
+    
+        input_name = options.delete(:input_name) || method
+        super(input_name, text, options)
+      end
+    
+      # 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.
+      #
+      # 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 = {}) #:nodoc:
+        if render_inline_errors?
+          errors = error_keys(method, options).map{|x| @object.errors[x] }.flatten.compact.uniq
+          send(:"error_#{inline_errors}", [*errors], options) if errors.any?
+        else
+          nil
+        end
+      end
+      alias :errors_on :inline_errors_for
+    
+      # Generates error messages for given method names and for base.
+      # You can pass a hash with html options that will be added to ul tag
+      #
+      # == Examples
+      #
+      #  f.semantic_errors # This will show only errors on base
+      #  f.semantic_errors :state # This will show errors on base and state
+      #  f.semantic_errors :state, :class => "awesome" # errors will be rendered in ul.awesome
+      #
+      def semantic_errors(*args)
+        html_options = args.extract_options!
+        full_errors = args.inject([]) do |array, method|
+          attribute = localized_string(method, method.to_sym, :label) || humanized_attribute_name(method)
+          errors = Array(@object.errors[method.to_sym]).to_sentence
+          errors.present? ? array << [attribute, errors].join(" ") : array ||= []
+        end
+        full_errors << @object.errors[:base]
+        full_errors.flatten!
+        full_errors.compact!
+        return nil if full_errors.blank?
+        html_options[:class] ||= "errors"
+        template.content_tag(:ul, html_options) do
+          Formtastic::Util.html_safe(full_errors.map { |error| template.content_tag(:li, Formtastic::Util.html_safe(error)) }.join)
+        end
+      end
+    
+      protected
+    
+        def error_keys(method, options)
+          @methods_for_error ||= {}
+          @methods_for_error[method] ||= begin
+            methods_for_error = [method.to_sym]
+            methods_for_error << file_metadata_suffixes.map{|suffix| "#{method}_#{suffix}".to_sym} if is_file?(method, options)
+            methods_for_error << [association_primary_key(method)] if association_macro_for_method(method) == :belongs_to
+            methods_for_error.flatten.compact.uniq
+          end
+        end
+    
+        def has_errors?(method, options)
+          methods_for_error = error_keys(method,options)
+          @object && @object.respond_to?(:errors) && methods_for_error.any?{|error| !@object.errors[error].blank?}
+        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:
+          model_name.constantize.content_columns.collect { |c| c.name.to_sym }.compact rescue []
+        end
+    
+        # Collects association columns (relation columns) for the current form object class.
+        #
+        def association_columns(*by_associations) #:nodoc:
+          if @object.present? && @object.class.respond_to?(:reflections)
+            @object.class.reflections.collect do |name, association_reflection|
+              if by_associations.present?
+                name if by_associations.include?(association_reflection.macro)
+              else
+                name
+              end
+            end.compact
+          else
+            []
+          end
+        end
+    
+        # Returns nil, or a symbol like :belongs_to or :has_many
+        def association_macro_for_method(method) #:nodoc:
+          reflection = reflection_for(method)
+          reflection.macro if reflection
+        end
+    
+        def association_primary_key(method)
+          reflection = reflection_for(method)
+          reflection.options[:foreign_key] if reflection && !reflection.options[:foreign_key].blank?
+          :"#{method}_id"
+        end
+    
+        # Prepare options to be sent to label
+        #
+        def options_for_label(options) #:nodoc:
+          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.
+        #
+        # 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
+            lambda do |f|
+              contents = f.inputs(*args){ block.call(f) }
+              template.concat(contents)
+            end
+          else
+            lambda do |f|
+              contents = f.inputs(*args)
+              template.concat(contents)
+            end
+          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.
+        #
+        def strip_formtastic_options(options) #:nodoc:
+          options.except(:value_method, :label_method, :collection, :required, :label,
+                         :as, :hint, :input_html, :label_html, :value_as_class, :find_options, :class)
+        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), or the object is
+        #   an ActiveModel, 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 validates_presence_of can't be determined, the
+        #   configuration option all_fields_required_by_default is used.
+        #
+        def method_required?(attribute) #:nodoc:
+          attribute_sym = attribute.to_s.sub(/_id$/, '').to_sym
+    
+          if @object && @object.class.respond_to?(:reflect_on_validations_for)
+            @object.class.reflect_on_validations_for(attribute_sym).any? do |validation|
+              (validation.macro == :validates_presence_of || validation.macro == :validates_inclusion_of) &&
+              validation.name == attribute_sym &&
+              (validation.options.present? ? options_require_validation?(validation.options) : true)
+            end
+          else
+            if @object && @object.class.respond_to?(:validators_on)
+              !@object.class.validators_on(attribute_sym).find{|validator| (validator.kind == :presence || validator.kind == :inclusion) && (validator.options.present? ? options_require_validation?(validator.options) : true)}.nil?
+            else
+              all_fields_required_by_default
+            end
+          end
+        end
+    
+        # Determines whether the given options evaluate to true
+        def options_require_validation?(options) #nodoc
+          allow_blank = options[:allow_blank]
+          return !allow_blank unless allow_blank.nil?
+          if_condition = !options[:if].nil?
+          condition = if_condition ? options[:if] : options[:unless]
+    
+          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
+    
+        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, :text, :phone, :search, :url, :email].include?(type)
+          field_id = generate_html_id(method, "")
+          html_options[:id] ||= field_id
+          label_options = options_for_label(options)
+          label_options[:for] ||= html_options[:id]
+          label(method, label_options) <<
+            send(respond_to?(form_helper_method) ? form_helper_method : :text_field, 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 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
+    
+        # 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
+    
+        # Outputs a label and a standard Rails email field inside the wrapper.
+        def email_input(method, options)
+          basic_input_helper(:email_field, :email, method, options)
+        end
+    
+        # Outputs a label and a standard Rails phone field inside the wrapper.
+        def phone_input(method, options)
+          basic_input_helper(:phone_field, :phone, method, options)
+        end
+    
+        # Outputs a label and a standard Rails url field inside the wrapper.
+        def url_input(method, options)
+          basic_input_helper(:url_field, :url, method, options)
+        end
+    
+        # Outputs a label and a standard Rails search field inside the wrapper.
+        def search_input(method, options)
+          basic_input_helper(:search_field, :search, method, options)
+        end
+    
+        # Outputs a hidden field inside the wrapper, which should be hidden with CSS.
+        # Additionals options can be given using :input_hml. Should :input_html not be
+        # specified every option except for formtastic options will be sent straight
+        # to hidden input element.
+        #
+        def hidden_input(method, options)
+          options ||= {}
+          html_options = options.delete(:input_html) || strip_formtastic_options(options)
+          html_options[:id] ||= generate_html_id(method, "")
+          hidden_field(method, html_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. A collection can be given
+        # as an Array, a Hash or as a String (containing pre-rendered HTML options). If not provided, the choices are
+        # found by inferring the parent's class name from the method name and simply calling all on it
+        # (VehicleOwner.all in the example above).
+        #
+        # Examples:
+        #
+        #   f.input :author, :collection => @authors
+        #   f.input :author, :collection => Author.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"]
+        #   f.input :author, :collection => grouped_options_for_select(["North America",[["United States","US"],["Canada","CA"]]])
+        #
+        # 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 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) || {}
+          html_options[:multiple] = html_options[:multiple] || options.delete(:multiple)
+          html_options.delete(:multiple) if html_options[:multiple].nil?
+    
+          reflection = reflection_for(method)
+          if reflection && [ :has_many, :has_and_belongs_to_many ].include?(reflection.macro)
+            html_options[:multiple] = true if html_options[:multiple].nil?
+            html_options[:size]     ||= 5
+            options[:include_blank] ||= false
+          end
+          options = set_include_blank(options)
+          input_name = generate_association_input_name(method)
+          html_options[:id] ||= generate_html_id(input_name, "")
+    
+          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, options)
+            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
+            grouped_collection_select(input_name, group_collection,
+                                           group_association, group_label_method,
+                                           value, label,
+                                           strip_formtastic_options(options), html_options)
+          else
+            collection = find_collection_for_column(method, options)
+    
+            select(input_name, collection, strip_formtastic_options(options), html_options)
+          end
+    
+          label_options = options_for_label(options).merge(:input_name => input_name)
+          label_options[:for] ||= html_options[:id]
+          label(method, label_options) << select_html
+        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) || {}
+          field_id = generate_html_id(method, "")
+          html_options[:id] ||= field_id
+          label_options = options_for_label(options)
+          label_options[:for] ||= html_options[:id]
+          label(method, label_options) <<
+          time_zone_select(method, options.delete(:priority_zones),
+            strip_formtastic_options(options), 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.all in the example above).
+        #
+        # Examples:
+        #
+        #   f.input :author, :as => :radio, :collection => @authors
+        #   f.input :author, :as => :radio, :collection => Author.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}" }
+        #
+        # 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 = []
+    
+          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[:id] = input_id
+    
+            li_content = template.content_tag(:label,
+              Formtastic::Util.html_safe("#{radio_button(input_name, value, html_options)} #{escape_html_entities(label)}"),
+              :for => input_id
+            )
+    
+            li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
+            template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
+          end
+    
+          template.content_tag(:fieldset,
+            legend_tag(method, options) << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
+          )
+        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).  Each li contains a label
+        # (eg "Year") and a select box. Overwriting the label is possible by adding the :labels option.
+        # :labels should be a hash with the field (e.g. day) as key and the label text as value.
+        # See date_or_datetime_input for a more detailed output example.
+        #
+        # Some of Rails' options for select_date are supported, but not everything yet, see
+        # documentation of date_or_datetime_input() for more information.
+        def date_input(method, options)
+          options = set_include_blank(options)
+          date_or_datetime_input(method, options.merge(:discard_hour => true))
+        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. Overwriting the label is possible by adding
+        # the :labels option. :labels should be a hash with the field (e.g. day) as key and the label
+        # text as value.  See date_or_datetime_input for a more detailed output example.
+        #
+        # Some of Rails' options for select_date are supported, but not everything yet, see
+        # documentation of date_or_datetime_input() for more information.
+        def datetime_input(method, options)
+          options = set_include_blank(options)
+          date_or_datetime_input(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. Overwriting the label is possible by adding the :labels option.
+        # :labels should be a hash with the field (e.g. day) as key and the label text as value.
+        # See date_or_datetime_input for a more detailed output example.
+        #
+        # Some of Rails' options for select_time are supported, but not everything yet, see
+        # documentation of date_or_datetime_input() for more information.
+        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
+    
+        # Helper method used by :as => (:date|:datetime|:time).  Generates a fieldset containing a
+        # legend (for what would normally be considered the label), and an ordered list of list items
+        # for year, month, day, hour, etc, each containing a label and a select.  Example:
+        #
+        # <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().
+        #
+        # Options:
+        #
+        #   * @:order => [:month, :day, :year]@
+        #   * @:include_seconds@ => true@
+        #   * @:discard_(year|month|day|hour|minute) => true@
+        #   * @:include_blank => true@
+        #   * @:labels => {}@
+        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]
+          inputs   = [] if options[:ignore_date]
+          labels   = options.delete(:labels) || {}
+    
+          time_inputs = [:hour, :minute]
+          time_inputs << :second if options[:include_seconds]
+    
+          list_items_capture = ""
+          hidden_fields_capture = ""
+    
+          datetime = @object.send(method) if @object && @object.send(method)
+    
+          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) : 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 = labels[input] || ::I18n.t(input.to_s, :default => input.to_s.humanize, :scope => [:datetime, :prompts])
+    
+              list_items_capture << template.content_tag(:li, Formtastic::Util.html_safe([
+                  !item_label_text.blank? ? template.content_tag(:label, Formtastic::Util.html_safe(item_label_text), :for => input_id) : "",
+                  template.send(:"select_#{input}", datetime, opts, html_options.merge(:id => input_id))
+                ].join(""))
+              )
+            end
+          end
+    
+          hidden_fields_capture << field_set_and_list_wrapping_for_method(method, options.merge(:label_for => input_ids.first), list_items_capture)
+        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 all on
+        # it (Author.all in the example above).
+        #
+        # Examples:
+        #
+        #   f.input :author, :as => :check_boxes, :collection => @authors
+        #   f.input :author, :as => :check_boxes, :collection => Author.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}" }
+        #
+        # Formtastic works around a bug in rails handling of check box collections by
+        # not generating the hidden fields for state checking of the checkboxes
+        # The :hidden_fields option provides a way to re-enable these hidden inputs by
+        # setting it to true.
+        #
+        #   f.input :authors, :as => :check_boxes, :hidden_fields => false
+        #   f.input :authors, :as => :check_boxes, :hidden_fields => true
+        #
+        # 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)
+          hidden_fields   = options.delete(:hidden_fields)
+          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_values = find_selected_values_for_column(method, options)
+          disabled_option_is_present = options.key?(:disabled)
+          disabled_values = [*options[:disabled]] if disabled_option_is_present
+    
+          li_options = value_as_class ? { :class => [method.to_s.singularize, 'default'].join('_') } : {}
+    
+          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)
+            html_options[:disabled] = disabled_values.include?(value) if disabled_option_is_present
+            html_options[:id] = input_id
+    
+            li_content = template.content_tag(:label,
+              Formtastic::Util.html_safe("#{create_check_boxes(input_name, html_options, value, unchecked_value, hidden_fields)} #{escape_html_entities(label)}"),
+              :for => input_id
+            )
+    
+            li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
+            template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
+          end
+    
+          fieldset_content = legend_tag(method, options)
+          fieldset_content << create_hidden_field_for_check_boxes(input_name, value_as_class) unless hidden_fields
+          fieldset_content << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
+          template.content_tag(:fieldset, fieldset_content)
+        end
+    
+        # Used by check_boxes input. The selected values will be set by retrieving the value
+        # through the association.
+        #
+        # If the collection is not a hash or an array of strings, fixnums or symbols,
+        # we use value_method to retrieve an array with the values
+        def find_selected_values_for_column(method, options)
+          if object.respond_to?(method)
+            collection = [object.send(method)].compact.flatten
+            label, value = detect_label_and_value_method!(collection, options)
+            [*collection.map { |o| send_or_call(value, o) }].compact
+          else
+            []
+          end
+        end
+    
+        # Outputs a custom hidden field for check_boxes
+        def create_hidden_field_for_check_boxes(method, value_as_class) #:nodoc:
+          options = value_as_class ? { :class => [method.to_s.singularize, 'default'].join('_') } : {}
+          input_name = "#{object_name}[#{method.to_s}][]"
+          template.hidden_field_tag(input_name, '', options)
+        end
+    
+        # Outputs a checkbox tag. If called with no_hidden_input = true a plain check_box_tag is returned,
+        # otherwise the helper uses the output generated by the rails check_box method.
+        def create_check_boxes(input_name, html_options = {}, checked_value = "1", unchecked_value = "0", hidden_fields = false) #:nodoc:
+          return template.check_box_tag(input_name, checked_value, html_options[:checked], html_options) unless hidden_fields == true
+          check_box(input_name, html_options, checked_value, unchecked_value)
+        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 respond_to?(:country_select)
+    
+          html_options = options.delete(:input_html) || {}
+          priority_countries = options.delete(:priority_countries) || self.priority_countries
+    
+          field_id = generate_html_id(method, "")
+          html_options[:id] ||= field_id
+          label_options = options_for_label(options)
+          label_options[:for] ||= html_options[:id]
+    
+          label(method, label_options) <<
+          country_select(method, priority_countries, strip_formtastic_options(options), html_options)
+        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) || {}
+          checked_value = options.delete(:checked_value) || '1'
+          unchecked_value = options.delete(:unchecked_value) || '0'
+    
+          html_options[:id] = html_options[:id] || generate_html_id(method, "")
+          input = template.check_box_tag(
+            "#{@object_name}[#{method}]",
+            checked_value,
+            (@object && @object.send(:"#{method}")),
+            html_options
+          )
+          
+          options = options_for_label(options)
+          options[:for] ||= html_options[:id]
+    
+          # the label() method will insert this nested input into the label at the last minute
+          options[:label_prefix_for_nested_input] = input
+    
+          template.hidden_field_tag("#{@object_name}[#{method}]", unchecked_value, :id => nil) << label(method, options)
+        end
+    
+        # 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
+    
+        # 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? or options[:hint].kind_of? Hash
+          hint_class = options[:hint_class] || default_hint_class
+          template.content_tag(:p, Formtastic::Util.html_safe(options[:hint]), :class => hint_class)
+        end
+    
+        # Creates an error sentence by calling to_sentence on the errors array.
+        #
+        def error_sentence(errors, options = {}) #:nodoc:
+          error_class = options[:error_class] || default_inline_error_class
+          template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.untaint), :class => error_class)
+        end
+    
+        # Creates an error li list.
+        #
+        def error_list(errors, options = {}) #:nodoc:
+          error_class = options[:error_class] || default_error_list_class
+          list_elements = []
+          errors.each do |error|
+            list_elements <<  template.content_tag(:li, Formtastic::Util.html_safe(error.untaint))
+          end
+          template.content_tag(:ul, Formtastic::Util.html_safe(list_elements.join("\n")), :class => error_class)
+        end
+    
+        # Creates an error sentence containing only the first error
+        #
+        def error_first(errors, options = {}) #:nodoc:
+          error_class = options[:error_class] || default_inline_error_class
+          template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => error_class)
+        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
+    
+          if string_or_proc.is_a?(Proc)
+            string_or_proc.call
+          else
+            string_or_proc.to_s
+          end
+        end
+    
+        # Generates a fieldset and wraps the content in an ordered list. When working
+        # with nested attributes, 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.dup.delete(:name).to_s
+          legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
+          legend  = template.content_tag(:legend, template.content_tag(:span, Formtastic::Util.html_safe(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
+    
+          # 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,
+            Formtastic::Util.html_safe(legend) << template.content_tag(:ol, Formtastic::Util.html_safe(contents)),
+            html_options.except(:builder, :parent)
+          )
+    
+          fieldset
+        end
+    
+        def field_set_title_from_args(*args) #:nodoc:
+          options = args.extract_options!
+          options[:name] ||= options.delete(:title)
+          title = options[:name]
+    
+          if title.blank?
+            valid_name_classes = [::String, ::Symbol]
+            valid_name_classes.delete(::Symbol) if !block_given? && (args.first.is_a?(::Symbol) && 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
+    
+        # 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,
+                  label(method, options_for_label(options).merge(:for => options.delete(:label_for))), :class => 'label'
+                ) <<
+              template.content_tag(:ol, Formtastic::Util.html_safe(contents))
+            )
+        end
+    
+        # Generates the legend for radiobuttons and checkboxes
+        def legend_tag(method, options = {})
+          if options[:label] == false
+            Formtastic::Util.html_safe("")
+          else
+            text = localized_string(method, options[:label], :label) || humanized_attribute_name(method)
+            text += required_or_optional_string(options.delete(:required))
+            text = Formtastic::Util.html_safe(text)
+            template.content_tag :legend, template.label_tag(nil, text, :for => nil), :class => :label
+          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, options = {}) #:nodoc:
+          if column = 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/
+              return :email     if method.to_s =~ /email/
+              return :url       if method.to_s =~ /^url$|^website$|_url$/
+              return :phone     if method.to_s =~ /(phone|fax)/
+              return :search    if method.to_s =~ /^search$/
+            when :integer
+              return :select    if reflection_for(method)
+              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 reflection_for(method)
+    
+              return :file    if is_file?(method, options)
+            end
+    
+            return :select    if options.key?(:collection)
+            return :password  if method.to_s =~ /password/
+            return :string
+          end
+        end
+    
+        def is_file?(method, options = {})
+          @files ||= {}
+          @files[method] ||= (options[:as].present? && options[:as] == :file) || begin
+            file = @object.send(method) if @object && @object.respond_to?(method)
+            file && file_methods.any?{|m| file.respond_to?(m)}
+          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 a plain string
+          return collection if collection.instance_of?(String) || collection.instance_of?(::Formtastic::Util.rails_safe_buffer_class)
+    
+          # 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) &&
+                               !(options.include?(:label_method) || options.include?(:value_method))
+    
+          label, value = detect_label_and_value_method!(collection, options)
+          collection.map { |o| [send_or_call(label, o), send_or_call(value, o)] }
+        end
+    
+        # 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 = reflection_for(column)
+            options[:find_options] ||= {}
+    
+            if conditions = reflection.options[:conditions]
+              if reflection.klass.respond_to?(:merge_conditions)
+                options[:find_options][:conditions] = reflection.klass.merge_conditions(conditions, options[:find_options][:conditions])
+                reflection.klass.all(options[:find_options])
+              else
+                reflection.klass.where(conditions).where(options[:find_options][:conditions])
+              end
+            else
+              reflection.klass.all(options[:find_options])
+            end
+          else
+            create_boolean_collection(options)
+          end
+    
+          collection = collection.to_a if collection.is_a?(Hash)
+          collection
+        end
+    
+        # Detects the label and value methods from a collection using methods set in
+        # collection_label_methods and collection_value_methods. For some ruby core
+        # classes sensible defaults have been defined. It will use and delete the options
+        # :label_method and :value_methods when present.
+        #
+        def detect_label_and_value_method!(collection, options = {})
+          sample = collection.first || collection.last
+    
+          case sample
+          when Array
+            label, value = :first, :last
+          when Integer
+            label, value = :to_s, :to_i
+          when String, NilClass
+            label, value = :to_s, :to_s
+          end
+    
+          # Order of preference: user supplied method, class defaults, auto-detect
+          label = options[:label_method] || label || collection_label_methods.find { |m| sample.respond_to?(m) }
+          value = options[:value_method] || value || collection_value_methods.find { |m| sample.respond_to?(m) }
+    
+          [label, value]
+        end
+    
+        # Return the label collection method when none is supplied using the
+        # values set in collection_label_methods.
+        #
+        def detect_label_method(collection) #:nodoc:
+          detect_label_and_value_method!(collection).first
+        end
+    
+        # 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 = 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
+    
+        # 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)
+    
+          [ [ options.delete(:true), true], [ options.delete(:false), false ] ]
+        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 = 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
+    
+        # 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
+    
+        # 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
+    
+        # Returns the active validations for the given method or an empty Array if no validations are
+        # found for the method.
+        #
+        # By default, the if/unless options of the validations are evaluated and only the validations
+        # that should be run for the current object state are returned. Pass :all to the last
+        # parameter to return :all validations regardless of if/unless options.
+        #
+        # Requires the ValidationReflection plugin to be present or an ActiveModel. Returns an epmty
+        # Array if neither is the case.
+        #
+        def validations_for(method, mode = :active)
+          # ActiveModel?
+          validations = if @object && @object.class.respond_to?(:validators_on)
+            @object.class.validators_on(method)
+          else
+            # ValidationReflection plugin?
+            if @object && @object.class.respond_to?(:reflect_on_validations_for)
+              @object.class.reflect_on_validations_for(method)
+            else
+              []
+            end
+          end
+    
+          validations = validations.select do |validation|
+            (validation.options.present? ? options_require_validation?(validation.options) : true)
+          end unless mode == :all
+    
+          return validations
+        end
+    
+        # Generates default_string_options by retrieving column information from
+        # the database.
+        #
+        def default_string_options(method, type) #:nodoc:
+          def get_maxlength_for(method)
+            validation = validations_for(method).find do |validation|
+              (validation.respond_to?(:macro) && validation.macro == :validates_length_of) || # Rails 2 + 3 style validation
+              (validation.respond_to?(:kind) && validation.kind == :length) # Rails 3 style validator
+            end
+    
+            if validation
+              validation.options[:maximum] || (validation.options[:within].present? ? validation.options[:within].max : nil)
+            else
+              nil
+            end
+          end
+    
+          validation_max_limit = get_maxlength_for(method)
+          column = column_for(method)
+    
+          if type == :text
+            { :rows => default_text_area_height, 
+              :cols => default_text_area_width }
+          elsif type == :numeric || column.nil? || !column.respond_to?(:limit) || column.limit.nil?
+            { :maxlength => validation_max_limit,
+              :size => default_text_field_size }
+          else
+            { :maxlength => validation_max_limit || column.limit,
+              :size => default_text_field_size }
+          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') #:nodoc:
+          index = if options.has_key?(:index)
+                    options[:index]
+                  elsif defined?(@auto_index)
+                    @auto_index
+                  else
+                    ""
+                  end
+          sanitized_method_name = method_name.to_s.gsub(/[\?\/\-]$/, '')
+    
+          [custom_namespace, sanitized_object_name, index, sanitized_method_name, value].reject{|x|x.blank?}.join('_')
+        end
+    
+        # Gets the nested_child_index value from the parent builder. 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')
+    
+          child = parent[:for]
+          child = child.first if child.respond_to?(:first)
+          duck[child].to_i + 1
+        end
+    
+        def sanitized_object_name #:nodoc:
+          @sanitized_object_name ||= @object_name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
+        end
+    
+        def humanized_attribute_name(method) #:nodoc:
+          if @object && @object.class.respond_to?(:human_attribute_name)
+            humanized_name = @object.class.human_attribute_name(method.to_s)
+            if humanized_name == method.to_s.send(:humanize)
+              method.to_s.send(label_str_method)
+            else
+              humanized_name
+            end
+          else
+            method.to_s.send(label_str_method)
+          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 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)
+            escape_html_entities(value)
+          else
+            use_i18n = value.nil? ? i18n_lookups_by_default : (value != false)
+    
+            if use_i18n
+              model_name, nested_model_name  = normalize_model_name(self.model_name.underscore)
+              action_name = template.params[:action].to_s rescue ''
+              attribute_name = key.to_s
+    
+              defaults = ::Formtastic::I18n::SCOPES.reject do |i18n_scope|
+                nested_model_name.nil? && i18n_scope.match(/nested_model/)
+              end.collect do |i18n_scope|
+                i18n_path = i18n_scope.dup
+                i18n_path.gsub!('%{action}', action_name)
+                i18n_path.gsub!('%{model}', model_name)
+                i18n_path.gsub!('%{nested_model}', nested_model_name) unless nested_model_name.nil?
+                i18n_path.gsub!('%{attribute}', attribute_name)
+                i18n_path.gsub!('..', '.')
+                i18n_path.to_sym
+              end
+              defaults << ''
+    
+              defaults.uniq!
+    
+              default_key = defaults.shift
+              i18n_value = ::Formtastic::I18n.t(default_key,
+                options.merge(:default => defaults, :scope => type.to_s.pluralize.to_sym))
+              if i18n_value.blank? && type == :label
+                # This is effectively what Rails label helper does for i18n lookup
+                options[:scope] = [:helpers, type]
+                options[:default] = defaults
+                i18n_value = ::I18n.t(default_key, options)
+              end
+              i18n_value = escape_html_entities(i18n_value) if i18n_value.is_a?(::String)
+              i18n_value.blank? ? nil : i18n_value
+            end
+          end
+        end
+    
+        def model_name
+          @object.present? ? @object.class.name : @object_name.to_s.classify
+        end
+    
+        def normalize_model_name(name)
+          if name =~ /(.+)\[(.+)\]/
+            [$1, $2]
+          else
+            [name]
+          end
+        end
+    
+        def send_or_call(duck, object)
+          if duck.is_a?(Proc)
+            duck.call(object)
+          else
+            object.send(duck)
+          end
+        end
+    
+        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
+    
+        def escape_html_entities(string) #:nodoc:
+          if escape_html_entities_in_hints_and_labels
+            # Acceppt html_safe flag as indicator to skip escaping
+            string = template.escape_once(string) unless string.respond_to?(:html_safe?) && string.html_safe? == true
+          end
+          string
+        end
+      
+    end
+  end
+  
+  # Quick hack/shim so that any code expecting the old SemanticFormBuilder class still works.
+  # TODO: migrate everything across
+  class SemanticFormBuilder < Formtastic::Builder::Base
+  end
+  
+end
\ No newline at end of file
diff --git a/lib/formtastic/helpers/form_helper.rb b/lib/formtastic/helpers/form_helper.rb
new file mode 100644
index 000000000..639ef8d0d
--- /dev/null
+++ b/lib/formtastic/helpers/form_helper.rb
@@ -0,0 +1,106 @@
+module Formtastic
+  module Helpers
+    # Wrappers around form_for (etc) with :builder => SemanticFormBuilder.
+    #
+    # * semantic_form_for(@post)
+    # * semantic_fields_for(@post)
+    # * semantic_form_remote_for(@post)
+    # * semantic_remote_form_for(@post)
+    #
+    # Each of which are the equivalent of:
+    #
+    # * form_for(@post, :builder => Formtastic::SemanticFormBuilder))
+    # * fields_for(@post, :builder => Formtastic::SemanticFormBuilder))
+    # * form_remote_for(@post, :builder => Formtastic::SemanticFormBuilder))
+    # * remote_form_for(@post, :builder => Formtastic::SemanticFormBuilder))
+    #
+    # Example Usage:
+    #
+    #   <% semantic_form_for @post do |f| %>
+    #     <%= f.input :title %>
+    #     <%= f.input :body %>
+    #   <% 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, 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| %>
+    #     ...
+    #   <% end %>
+    #
+    #   <% semantic_form_for :post, Post.new, :url => posts_path do |f| %>
+    #     ...
+    #   <% end %>
+    module FormHelper
+      @@builder = ::Formtastic::SemanticFormBuilder
+      @@default_form_class = 'formtastic'
+      mattr_accessor :builder, :default_form_class
+  
+      # 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
+  
+      def with_custom_field_error_proc(&block)
+        default_field_error_proc = ::ActionView::Base.field_error_proc
+        ::ActionView::Base.field_error_proc = FIELD_ERROR_PROC
+        yield
+      ensure
+        ::ActionView::Base.field_error_proc = default_field_error_proc
+      end
+  
+      def semantic_remote_form_for_wrapper(record_or_name_or_array, *args, &proc)
+        options = args.extract_options!
+        if respond_to? :remote_form_for
+          semantic_remote_form_for_real(record_or_name_or_array, *(args << options), &proc)
+        else
+          options[:remote] = true
+          semantic_form_for(record_or_name_or_array, *(args << options), &proc)
+        end
+      end
+  
+      [:form_for, :fields_for, :remote_form_for].each do |meth|
+        module_eval <<-END_SRC, __FILE__, __LINE__ + 1
+          def semantic_#{meth}(record_or_name_or_array, *args, &proc)
+            options = args.extract_options!
+            options[:builder] ||= @@builder
+            options[:html] ||= {}
+            @@builder.custom_namespace = options[:namespace].to_s
+  
+            singularizer = defined?(ActiveModel::Naming.singular) ? ActiveModel::Naming.method(:singular) : ActionController::RecordIdentifier.method(:singular_class_name)
+  
+            class_names = options[:html][:class] ? options[:html][:class].split(" ") : []
+            class_names << @@default_form_class
+            class_names << case record_or_name_or_array
+              when String, Symbol then record_or_name_or_array.to_s                                  # :post => "post"
+              when Array then options[:as] || singularizer.call(record_or_name_or_array.last.class)  # [@post, @comment] # => "comment"
+              else options[:as] || singularizer.call(record_or_name_or_array.class)                  # @post => "post"
+            end
+            options[:html][:class] = class_names.join(" ")
+  
+            with_custom_field_error_proc do
+              #{meth}(record_or_name_or_array, *(args << options), &proc)
+            end
+          end
+        END_SRC
+      end
+      alias :semantic_remote_form_for_real :semantic_remote_form_for
+      alias :semantic_remote_form_for :semantic_remote_form_for_wrapper
+      alias :semantic_form_remote_for :semantic_remote_form_for
+    end
+  end
+  
+  # Quick hack/shim for anything expecting the old SemanticFormHelper module.
+  # TODO: migrate everything across
+  module SemanticFormHelper
+    include Formtastic::Helpers::FormHelper
+    @@builder = Formtastic::Helpers::FormHelper.builder
+    @@default_form_class = Formtastic::Helpers::FormHelper.default_form_class
+    mattr_accessor :builder, :default_form_class
+  end
+
+end
\ No newline at end of file
diff --git a/lib/formtastic/semantic_form_builder.rb b/lib/formtastic/semantic_form_builder.rb
deleted file mode 100644
index b1aa73252..000000000
--- a/lib/formtastic/semantic_form_builder.rb
+++ /dev/null
@@ -1,1827 +0,0 @@
-module Formtastic
-  class SemanticFormBuilder < ActionView::Helpers::FormBuilder
-
-    def self.configure(name, value = nil)
-      class_attribute(name)
-      self.send(:"#{name}=", value)  
-    end
-
-    configure :custom_namespace
-    configure :default_text_field_size
-    configure :default_text_area_height, 20
-    configure :default_text_area_width
-    configure :all_fields_required_by_default, true
-    configure :include_blank_for_select_by_default, true
-    configure :required_string, proc { ::Formtastic::Util.html_safe(%{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>}) }
-    configure :optional_string, ''
-    configure :inline_errors, :sentence
-    configure :label_str_method, :humanize
-    configure :collection_label_methods, %w[to_label display_name full_name name title username login value to_s]
-    configure :collection_value_methods, %w[id to_s]
-    configure :inline_order, [ :input, :hints, :errors ]
-    configure :custom_inline_order, {}
-    configure :file_methods, [ :file?, :public_filename, :filename ]
-    configure :file_metadata_suffixes, ['content_type', 'file_name', 'file_size']
-    configure :priority_countries, ["Australia", "Canada", "United Kingdom", "United States"]
-    configure :i18n_lookups_by_default, false
-    configure :escape_html_entities_in_hints_and_labels, true
-    configure :default_commit_button_accesskey
-    configure :default_inline_error_class, 'inline-errors'
-    configure :default_error_list_class, 'errors'
-    configure :default_hint_class, 'inline-hints'
-
-    RESERVED_COLUMNS = [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
-
-    INLINE_ERROR_TYPES = [:sentence, :list, :first]
-
-    attr_accessor :template
-
-    # Returns a suitable form input for the given +method+, using the database column information
-    # and other factors (like the method name) to figure out what you probably want.
-    #
-    # Options:
-    #
-    # * :as - override the input type (eg force a :string to render as a :password field)
-    # * :label - use something other than the method name as the label text, when false no label is printed
-    # * :required - specify if the column is required (true) or not (false)
-    # * :hint - provide some text to hint or help the user provide the correct information for a field
-    # * :input_html - provide options that will be passed down to the generated input
-    # * :wrapper_html - provide options that will be passed down to the li wrapper
-    #
-    # Input Types:
-    #
-    # Most inputs map directly to one of ActiveRecord's column types by default (eg string_input),
-    # but there are a few special cases and some simplification (:integer, :float and :decimal
-    # columns all map to a single numeric_input, for example).
-    #
-    # * :select (a select menu for associations) - default to association names
-    # * :check_boxes (a set of check_box inputs for associations) - alternative to :select has_many and has_and_belongs_to_many associations
-    # * :radio (a set of radio inputs for associations) - alternative to :select belongs_to associations
-    # * :time_zone (a select menu with time zones)
-    # * :password (a password input) - default for :string column types with 'password' in the method name
-    # * :text (a textarea) - default for :text column types
-    # * :date (a date select) - default for :date column types
-    # * :datetime (a date and time select) - default for :datetime and :timestamp column types
-    # * :time (a time select) - default for :time column types
-    # * :boolean (a checkbox) - default for :boolean column types (you can also have booleans as :select and :radio)
-    # * :string (a text field) - default for :string column types
-    # * :numeric (a text field, like string) - default for :integer, :float and :decimal column types
-    # * :email (an email input) - default for :string column types with 'email' as the method name.
-    # * :url (a url input) - default for :string column types with 'url' as the method name.
-    # * :phone (a tel input) - default for :string column types with 'phone' or 'fax' in the method name.
-    # * :search (a search input) - default for :string column types with 'search' as the method name.
-    # * :country (a select menu of country names) - requires a country_select plugin to be installed
-    # * :email (an email input) - New in HTML5 - needs to be explicitly provided with :as => :email
-    # * :url (a url input) - New in HTML5 - needs to be explicitly provided with :as => :url
-    # * :phone (a tel input) - New in HTML5 - needs to be explicitly provided with :as => :phone
-    # * :search (a search input) - New in HTML5 - needs to be explicity provided with :as => :search
-    # * :country (a select menu of country names) - requires a country_select plugin to be installed
-    # * :hidden (a hidden field) - creates a hidden field (added for compatibility)
-    #
-    # Example:
-    #
-    #   <% semantic_form_for @employee do |form| %>
-    #     <% form.inputs do -%>
-    #       <%= form.input :name, :label => "Full Name" %>
-    #       <%= form.input :manager, :as => :radio %>
-    #       <%= form.input :secret, :as => :password, :input_html => { :value => "xxxx" } %>
-    #       <%= form.input :hired_at, :as => :date, :label => "Date Hired" %>
-    #       <%= form.input :phone, :required => false, :hint => "Eg: +1 555 1234" %>
-    #       <%= form.input :email %>
-    #       <%= form.input :website, :as => :url, :hint => "You may wish to omit the http://" %>
-    #     <% end %>
-    #   <% end %>
-    #
-    def input(method, options = {})
-      options = options.dup # Allow options to be shared without being tainted by Formtastic
-      
-      options[:required] = method_required?(method) unless options.key?(:required)
-      options[:as]     ||= default_input_type(method, options)
-
-      html_class = [ options[:as], (options[:required] ? :required : :optional) ]
-      html_class << 'error' if has_errors?(method, options)
-
-      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 options[:input_html] && options[:input_html][:id]
-        options[:label_html] ||= {}
-        options[:label_html][:for] ||= options[:input_html][:id]
-      end
-
-      input_parts = (custom_inline_order[options[:as]] || inline_order).dup
-      input_parts = input_parts - [:errors, :hints] if options[:as] == :hidden
-
-      list_item_content = input_parts.map do |type|
-        send(:"inline_#{type}_for", method, options)
-      end.compact.join("\n")
-
-      return template.content_tag(:li, Formtastic::Util.html_safe(list_item_content), wrapper_html)
-    end
-
-    # Creates an input fieldset and ol tag wrapping for use around a set of inputs.  It can be
-    # called either with a block (in which you can do the usual Rails form stuff, HTML, ERB, etc),
-    # or with a list of fields.  These two examples are functionally equivalent:
-    #
-    #   # With a block:
-    #   <% semantic_form_for @post do |form| %>
-    #     <% form.inputs do %>
-    #       <%= form.input :title %>
-    #       <%= form.input :body %>
-    #     <% end %>
-    #   <% end %>
-    #
-    #   # With a list of fields:
-    #   <% semantic_form_for @post do |form| %>
-    #     <%= form.inputs :title, :body %>
-    #   <% end %>
-    #
-    #   # Output:
-    #   <form ...>
-    #     <fieldset class="inputs">
-    #       <ol>
-    #         <li class="string">...</li>
-    #         <li class="text">...</li>
-    #       </ol>
-    #     </fieldset>
-    #   </form>
-    #
-    # === Quick Forms
-    #
-    # When called without a block or a field list, an input is rendered for each column in the
-    # model's database table, just like Rails' scaffolding.  You'll obviously want more control
-    # than this in a production application, but it's a great way to get started, then come back
-    # later to customise the form with a field list or a block of inputs.  Example:
-    #
-    #   <% semantic_form_for @post do |form| %>
-    #     <%= 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/: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| %>
-    #     <% form.inputs :name => "Create a new post", :style => "border:1px;" do %>
-    #       ...
-    #     <% end %>
-    #   <% end %>
-    #
-    #   # With a list (the options must come after the field list):
-    #   <% semantic_form_for @post do |form| %>
-    #     <%= 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,
-    # use inputs:
-    #
-    #   <% semantic_form_for @post do |f| %>
-    #     <% f.inputs do %>
-    #       <%= f.input :title %>
-    #       <%= f.input :body %>
-    #     <% end %>
-    #     <% f.inputs :name => "Advanced", :id => "advanced" do %>
-    #       <%= f.input :created_at %>
-    #       <%= f.input :user_id, :label => "Author" %>
-    #     <% end %>
-    #     <% f.inputs "Extra" do %>
-    #       <%= f.input :update_at %>
-    #     <% end %>
-    #   <% end %>
-    #
-    #   # Output:
-    #   <form ...>
-    #     <fieldset class="inputs">
-    #       <ol>
-    #         <li class="string">...</li>
-    #         <li class="text">...</li>
-    #       </ol>
-    #     </fieldset>
-    #     <fieldset class="inputs" id="advanced">
-    #       <legend><span>Advanced</span></legend>
-    #       <ol>
-    #         <li class="datetime">...</li>
-    #         <li class="select">...</li>
-    #       </ol>
-    #     </fieldset>
-    #     <fieldset class="inputs">
-    #       <legend><span>Extra</span></legend>
-    #       <ol>
-    #         <li class="datetime">...</li>
-    #       </ol>
-    #     </fieldset>
-    #   </form>
-    #
-    # === Nested attributes
-    #
-    # As in Rails, you can use semantic_fields_for to nest attributes:
-    #
-    #   <% semantic_form_for @post do |form| %>
-    #     <%= form.inputs :title, :body %>
-    #
-    #     <% form.semantic_fields_for :author, @bob do |author_form| %>
-    #       <% author_form.inputs do %>
-    #         <%= author_form.input :first_name, :required => false %>
-    #         <%= author_form.input :last_name %>
-    #       <% end %>
-    #     <% end %>
-    #   <% end %>
-    #
-    # But this does not look formtastic! This is equivalent:
-    #
-    #   <% semantic_form_for @post do |form| %>
-    #     <%= form.inputs :title, :body %>
-    #     <% form.inputs :for => [ :author, @bob ] do |author_form| %>
-    #       <%= author_form.input :first_name, :required => false %>
-    #       <%= author_form.input :last_name %>
-    #     <% end %>
-    #   <% end %>
-    #
-    # And if you don't need to give options to your input call, you could do it
-    # in just one line:
-    #
-    #   <% semantic_form_for @post do |form| %>
-    #     <%= form.inputs :title, :body %>
-    #     <%= form.inputs :first_name, :last_name, :for => @bob %>
-    #   <% end %>
-    #
-    # Just remember that calling inputs generates a new fieldset to wrap your
-    # inputs. If you have two separate models, but, semantically, on the page
-    # they are part of the same fieldset, you should use semantic_fields_for
-    # 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"
-      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(*(args << html_options), &block)
-      else
-        if @object && args.empty?
-          args  = association_columns(:belongs_to)
-          args += content_columns
-          args -= RESERVED_COLUMNS
-          args.compact!
-        end
-        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
-
-    # Creates a fieldset and ol tag wrapping for form buttons / actions as list items.
-    # See inputs documentation for a full example.  The fieldset's default class attriute
-    # is set to "buttons".
-    #
-    # See inputs for html attributes and special options.
-    def buttons(*args, &block)
-      html_options = args.extract_options!
-      html_options[:class] ||= "buttons"
-
-      if block_given?
-        field_set_and_list_wrapping(html_options, &block)
-      else
-        args = [:commit] if args.empty?
-        contents = args.map { |button_name| send(:"#{button_name}_button") }
-        field_set_and_list_wrapping(html_options, contents)
-      end
-    end
-
-    # Creates a submit input tag with the value "Save [model name]" (for existing records) or
-    # "Create [model name]" (for new records) by default:
-    #
-    #   <%= form.commit_button %> => <input name="commit" type="submit" value="Save Post" />
-    #
-    # The value of the button text can be overridden:
-    #
-    #  <%= 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 :button_html => { :class => "pretty" } %> => <input name="commit" type="submit" value="Save Post" class="pretty {create|update|submit}" />
-    def commit_button(*args)
-      options = args.extract_options!
-      text = options.delete(:label) || args.shift
-
-      if @object && (@object.respond_to?(:persisted?) || @object.respond_to?(:new_record?))
-        key = @object.persisted? ? :update : :create
-
-        # Deal with some complications with ActiveRecord::Base.human_name and two name models (eg UserPost)
-        # ActiveRecord::Base.human_name falls back to ActiveRecord::Base.name.humanize ("Userpost")
-        # if there's no i18n, which is pretty crappy.  In this circumstance we want to detect this
-        # fall back (human_name == name.humanize) and do our own thing name.underscore.humanize ("User Post")
-        if @object.class.model_name.respond_to?(:human)
-          object_name = @object.class.model_name.human
-        else
-          object_human_name = @object.class.human_name                # default is UserPost => "Userpost", but i18n may do better ("User post")
-          crappy_human_name = @object.class.name.humanize             # UserPost => "Userpost"
-          decent_human_name = @object.class.name.underscore.humanize  # UserPost => "User post"
-          object_name = (object_human_name == crappy_human_name) ? decent_human_name : object_human_name
-        end
-      else
-        key = :submit
-        object_name = @object_name.to_s.send(label_str_method)
-      end
-
-      text = (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) || {}
-      button_html.merge!(:class => [button_html[:class], key].compact.join(' '))
-
-      wrapper_html_class = ['commit'] # TODO: Add class reflecting on form action.
-      wrapper_html = options.delete(:wrapper_html) || {}
-      wrapper_html[:class] = (wrapper_html_class << wrapper_html[:class]).flatten.compact.join(' ')
-
-      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, Formtastic::Util.html_safe(submit(text, button_html)), wrapper_html)
-    end
-
-    # A thin wrapper around #fields_for to set :builder => Formtastic::SemanticFormBuilder
-    # for nesting forms:
-    #
-    #   # Example:
-    #   <% semantic_form_for @post do |post| %>
-    #     <% post.semantic_fields_for :author do |author| %>
-    #       <% author.inputs :name %>
-    #     <% end %>
-    #   <% end %>
-    #
-    #   # Output:
-    #   <form ...>
-    #     <fieldset class="inputs">
-    #       <ol>
-    #         <li class="string"><input type='text' name='post[author][name]' id='post_author_name' /></li>
-    #       </ol>
-    #     </fieldset>
-    #   </form>
-    #
-    def semantic_fields_for(record_or_name_or_array, *args, &block)
-      opts = args.extract_options!
-      opts[:builder] ||= self.class
-      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.
-    # * :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_string(method, text, :label) || humanized_attribute_name(method)
-      text += required_or_optional_string(options.delete(:required))
-      text = Formtastic::Util.html_safe(text)
-
-      # special case for boolean (checkbox) labels, which have a nested input
-      if options.key?(:label_prefix_for_nested_input)
-        text = options.delete(:label_prefix_for_nested_input) + text
-      end
-
-      input_name = options.delete(:input_name) || method
-      super(input_name, text, options)
-    end
-
-    # 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.
-    #
-    # 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 = {}) #:nodoc:
-      if render_inline_errors?
-        errors = error_keys(method, options).map{|x| @object.errors[x] }.flatten.compact.uniq
-        send(:"error_#{inline_errors}", [*errors], options) if errors.any?
-      else
-        nil
-      end
-    end
-    alias :errors_on :inline_errors_for
-
-    # Generates error messages for given method names and for base.
-    # You can pass a hash with html options that will be added to ul tag
-    #
-    # == Examples
-    #
-    #  f.semantic_errors # This will show only errors on base
-    #  f.semantic_errors :state # This will show errors on base and state
-    #  f.semantic_errors :state, :class => "awesome" # errors will be rendered in ul.awesome
-    #
-    def semantic_errors(*args)
-      html_options = args.extract_options!
-      full_errors = args.inject([]) do |array, method|
-        attribute = localized_string(method, method.to_sym, :label) || humanized_attribute_name(method)
-        errors = Array(@object.errors[method.to_sym]).to_sentence
-        errors.present? ? array << [attribute, errors].join(" ") : array ||= []
-      end
-      full_errors << @object.errors[:base]
-      full_errors.flatten!
-      full_errors.compact!
-      return nil if full_errors.blank?
-      html_options[:class] ||= "errors"
-      template.content_tag(:ul, html_options) do
-        Formtastic::Util.html_safe(full_errors.map { |error| template.content_tag(:li, Formtastic::Util.html_safe(error)) }.join)
-      end
-    end
-
-    protected
-
-      def error_keys(method, options)
-        @methods_for_error ||= {}
-        @methods_for_error[method] ||= begin
-          methods_for_error = [method.to_sym]
-          methods_for_error << file_metadata_suffixes.map{|suffix| "#{method}_#{suffix}".to_sym} if is_file?(method, options)
-          methods_for_error << [association_primary_key(method)] if association_macro_for_method(method) == :belongs_to
-          methods_for_error.flatten.compact.uniq
-        end
-      end
-
-      def has_errors?(method, options)
-        methods_for_error = error_keys(method,options)
-        @object && @object.respond_to?(:errors) && methods_for_error.any?{|error| !@object.errors[error].blank?}
-      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:
-        model_name.constantize.content_columns.collect { |c| c.name.to_sym }.compact rescue []
-      end
-
-      # Collects association columns (relation columns) for the current form object class.
-      #
-      def association_columns(*by_associations) #:nodoc:
-        if @object.present? && @object.class.respond_to?(:reflections)
-          @object.class.reflections.collect do |name, association_reflection|
-            if by_associations.present?
-              name if by_associations.include?(association_reflection.macro)
-            else
-              name
-            end
-          end.compact
-        else
-          []
-        end
-      end
-
-      # Returns nil, or a symbol like :belongs_to or :has_many
-      def association_macro_for_method(method) #:nodoc:
-        reflection = reflection_for(method)
-        reflection.macro if reflection
-      end
-
-      def association_primary_key(method)
-        reflection = reflection_for(method)
-        reflection.options[:foreign_key] if reflection && !reflection.options[:foreign_key].blank?
-        :"#{method}_id"
-      end
-
-      # Prepare options to be sent to label
-      #
-      def options_for_label(options) #:nodoc:
-        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.
-      #
-      # 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
-          lambda do |f|
-            contents = f.inputs(*args){ block.call(f) }
-            template.concat(contents)
-          end
-        else
-          lambda do |f|
-            contents = f.inputs(*args)
-            template.concat(contents)
-          end
-        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.
-      #
-      def strip_formtastic_options(options) #:nodoc:
-        options.except(:value_method, :label_method, :collection, :required, :label,
-                       :as, :hint, :input_html, :label_html, :value_as_class, :find_options, :class)
-      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), or the object is
-      #   an ActiveModel, 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 validates_presence_of can't be determined, the
-      #   configuration option all_fields_required_by_default is used.
-      #
-      def method_required?(attribute) #:nodoc:
-        attribute_sym = attribute.to_s.sub(/_id$/, '').to_sym
-
-        if @object && @object.class.respond_to?(:reflect_on_validations_for)
-          @object.class.reflect_on_validations_for(attribute_sym).any? do |validation|
-            (validation.macro == :validates_presence_of || validation.macro == :validates_inclusion_of) &&
-            validation.name == attribute_sym &&
-            (validation.options.present? ? options_require_validation?(validation.options) : true)
-          end
-        else
-          if @object && @object.class.respond_to?(:validators_on)
-            !@object.class.validators_on(attribute_sym).find{|validator| (validator.kind == :presence || validator.kind == :inclusion) && (validator.options.present? ? options_require_validation?(validator.options) : true)}.nil?
-          else
-            all_fields_required_by_default
-          end
-        end
-      end
-
-      # Determines whether the given options evaluate to true
-      def options_require_validation?(options) #nodoc
-        allow_blank = options[:allow_blank]
-        return !allow_blank unless allow_blank.nil?
-        if_condition = !options[:if].nil?
-        condition = if_condition ? options[:if] : options[:unless]
-
-        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
-
-      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, :text, :phone, :search, :url, :email].include?(type)
-        field_id = generate_html_id(method, "")
-        html_options[:id] ||= field_id
-        label_options = options_for_label(options)
-        label_options[:for] ||= html_options[:id]
-        label(method, label_options) <<
-          send(respond_to?(form_helper_method) ? form_helper_method : :text_field, 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 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
-
-      # 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
-
-      # Outputs a label and a standard Rails email field inside the wrapper.
-      def email_input(method, options)
-        basic_input_helper(:email_field, :email, method, options)
-      end
-
-      # Outputs a label and a standard Rails phone field inside the wrapper.
-      def phone_input(method, options)
-        basic_input_helper(:phone_field, :phone, method, options)
-      end
-
-      # Outputs a label and a standard Rails url field inside the wrapper.
-      def url_input(method, options)
-        basic_input_helper(:url_field, :url, method, options)
-      end
-
-      # Outputs a label and a standard Rails search field inside the wrapper.
-      def search_input(method, options)
-        basic_input_helper(:search_field, :search, method, options)
-      end
-
-      # Outputs a hidden field inside the wrapper, which should be hidden with CSS.
-      # Additionals options can be given using :input_hml. Should :input_html not be
-      # specified every option except for formtastic options will be sent straight
-      # to hidden input element.
-      #
-      def hidden_input(method, options)
-        options ||= {}
-        html_options = options.delete(:input_html) || strip_formtastic_options(options)
-        html_options[:id] ||= generate_html_id(method, "")
-        hidden_field(method, html_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. A collection can be given
-      # as an Array, a Hash or as a String (containing pre-rendered HTML options). If not provided, the choices are
-      # found by inferring the parent's class name from the method name and simply calling all on it
-      # (VehicleOwner.all in the example above).
-      #
-      # Examples:
-      #
-      #   f.input :author, :collection => @authors
-      #   f.input :author, :collection => Author.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"]
-      #   f.input :author, :collection => grouped_options_for_select(["North America",[["United States","US"],["Canada","CA"]]])
-      #
-      # 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 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) || {}
-        html_options[:multiple] = html_options[:multiple] || options.delete(:multiple)
-        html_options.delete(:multiple) if html_options[:multiple].nil?
-
-        reflection = reflection_for(method)
-        if reflection && [ :has_many, :has_and_belongs_to_many ].include?(reflection.macro)
-          html_options[:multiple] = true if html_options[:multiple].nil?
-          html_options[:size]     ||= 5
-          options[:include_blank] ||= false
-        end
-        options = set_include_blank(options)
-        input_name = generate_association_input_name(method)
-        html_options[:id] ||= generate_html_id(input_name, "")
-
-        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, options)
-          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
-          grouped_collection_select(input_name, group_collection,
-                                         group_association, group_label_method,
-                                         value, label,
-                                         strip_formtastic_options(options), html_options)
-        else
-          collection = find_collection_for_column(method, options)
-
-          select(input_name, collection, strip_formtastic_options(options), html_options)
-        end
-
-        label_options = options_for_label(options).merge(:input_name => input_name)
-        label_options[:for] ||= html_options[:id]
-        label(method, label_options) << select_html
-      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) || {}
-        field_id = generate_html_id(method, "")
-        html_options[:id] ||= field_id
-        label_options = options_for_label(options)
-        label_options[:for] ||= html_options[:id]
-        label(method, label_options) <<
-        time_zone_select(method, options.delete(:priority_zones),
-          strip_formtastic_options(options), 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.all in the example above).
-      #
-      # Examples:
-      #
-      #   f.input :author, :as => :radio, :collection => @authors
-      #   f.input :author, :as => :radio, :collection => Author.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}" }
-      #
-      # 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 = []
-
-        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[:id] = input_id
-
-          li_content = template.content_tag(:label,
-            Formtastic::Util.html_safe("#{radio_button(input_name, value, html_options)} #{escape_html_entities(label)}"),
-            :for => input_id
-          )
-
-          li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
-          template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
-        end
-
-        template.content_tag(:fieldset,
-          legend_tag(method, options) << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
-        )
-      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).  Each li contains a label
-      # (eg "Year") and a select box. Overwriting the label is possible by adding the :labels option.
-      # :labels should be a hash with the field (e.g. day) as key and the label text as value.
-      # See date_or_datetime_input for a more detailed output example.
-      #
-      # Some of Rails' options for select_date are supported, but not everything yet, see
-      # documentation of date_or_datetime_input() for more information.
-      def date_input(method, options)
-        options = set_include_blank(options)
-        date_or_datetime_input(method, options.merge(:discard_hour => true))
-      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. Overwriting the label is possible by adding
-      # the :labels option. :labels should be a hash with the field (e.g. day) as key and the label
-      # text as value.  See date_or_datetime_input for a more detailed output example.
-      #
-      # Some of Rails' options for select_date are supported, but not everything yet, see
-      # documentation of date_or_datetime_input() for more information.
-      def datetime_input(method, options)
-        options = set_include_blank(options)
-        date_or_datetime_input(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. Overwriting the label is possible by adding the :labels option.
-      # :labels should be a hash with the field (e.g. day) as key and the label text as value.
-      # See date_or_datetime_input for a more detailed output example.
-      #
-      # Some of Rails' options for select_time are supported, but not everything yet, see
-      # documentation of date_or_datetime_input() for more information.
-      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
-
-      # Helper method used by :as => (:date|:datetime|:time).  Generates a fieldset containing a
-      # legend (for what would normally be considered the label), and an ordered list of list items
-      # for year, month, day, hour, etc, each containing a label and a select.  Example:
-      #
-      # <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().
-      #
-      # Options:
-      #
-      #   * @:order => [:month, :day, :year]@
-      #   * @:include_seconds@ => true@
-      #   * @:discard_(year|month|day|hour|minute) => true@
-      #   * @:include_blank => true@
-      #   * @:labels => {}@
-      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]
-        inputs   = [] if options[:ignore_date]
-        labels   = options.delete(:labels) || {}
-
-        time_inputs = [:hour, :minute]
-        time_inputs << :second if options[:include_seconds]
-
-        list_items_capture = ""
-        hidden_fields_capture = ""
-
-        datetime = @object.send(method) if @object && @object.send(method)
-
-        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) : 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 = labels[input] || ::I18n.t(input.to_s, :default => input.to_s.humanize, :scope => [:datetime, :prompts])
-
-            list_items_capture << template.content_tag(:li, Formtastic::Util.html_safe([
-                !item_label_text.blank? ? template.content_tag(:label, Formtastic::Util.html_safe(item_label_text), :for => input_id) : "",
-                template.send(:"select_#{input}", datetime, opts, html_options.merge(:id => input_id))
-              ].join(""))
-            )
-          end
-        end
-
-        hidden_fields_capture << field_set_and_list_wrapping_for_method(method, options.merge(:label_for => input_ids.first), list_items_capture)
-      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 all on
-      # it (Author.all in the example above).
-      #
-      # Examples:
-      #
-      #   f.input :author, :as => :check_boxes, :collection => @authors
-      #   f.input :author, :as => :check_boxes, :collection => Author.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}" }
-      #
-      # Formtastic works around a bug in rails handling of check box collections by
-      # not generating the hidden fields for state checking of the checkboxes
-      # The :hidden_fields option provides a way to re-enable these hidden inputs by
-      # setting it to true.
-      #
-      #   f.input :authors, :as => :check_boxes, :hidden_fields => false
-      #   f.input :authors, :as => :check_boxes, :hidden_fields => true
-      #
-      # 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)
-        hidden_fields   = options.delete(:hidden_fields)
-        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_values = find_selected_values_for_column(method, options)
-        disabled_option_is_present = options.key?(:disabled)
-        disabled_values = [*options[:disabled]] if disabled_option_is_present
-
-        li_options = value_as_class ? { :class => [method.to_s.singularize, 'default'].join('_') } : {}
-
-        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)
-          html_options[:disabled] = disabled_values.include?(value) if disabled_option_is_present
-          html_options[:id] = input_id
-
-          li_content = template.content_tag(:label,
-            Formtastic::Util.html_safe("#{create_check_boxes(input_name, html_options, value, unchecked_value, hidden_fields)} #{escape_html_entities(label)}"),
-            :for => input_id
-          )
-
-          li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
-          template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
-        end
-
-        fieldset_content = legend_tag(method, options)
-        fieldset_content << create_hidden_field_for_check_boxes(input_name, value_as_class) unless hidden_fields
-        fieldset_content << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
-        template.content_tag(:fieldset, fieldset_content)
-      end
-
-      # Used by check_boxes input. The selected values will be set by retrieving the value
-      # through the association.
-      #
-      # If the collection is not a hash or an array of strings, fixnums or symbols,
-      # we use value_method to retrieve an array with the values
-      def find_selected_values_for_column(method, options)
-        if object.respond_to?(method)
-          collection = [object.send(method)].compact.flatten
-          label, value = detect_label_and_value_method!(collection, options)
-          [*collection.map { |o| send_or_call(value, o) }].compact
-        else
-          []
-        end
-      end
-
-      # Outputs a custom hidden field for check_boxes
-      def create_hidden_field_for_check_boxes(method, value_as_class) #:nodoc:
-        options = value_as_class ? { :class => [method.to_s.singularize, 'default'].join('_') } : {}
-        input_name = "#{object_name}[#{method.to_s}][]"
-        template.hidden_field_tag(input_name, '', options)
-      end
-
-      # Outputs a checkbox tag. If called with no_hidden_input = true a plain check_box_tag is returned,
-      # otherwise the helper uses the output generated by the rails check_box method.
-      def create_check_boxes(input_name, html_options = {}, checked_value = "1", unchecked_value = "0", hidden_fields = false) #:nodoc:
-        return template.check_box_tag(input_name, checked_value, html_options[:checked], html_options) unless hidden_fields == true
-        check_box(input_name, html_options, checked_value, unchecked_value)
-      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 respond_to?(:country_select)
-
-        html_options = options.delete(:input_html) || {}
-        priority_countries = options.delete(:priority_countries) || self.priority_countries
-
-        field_id = generate_html_id(method, "")
-        html_options[:id] ||= field_id
-        label_options = options_for_label(options)
-        label_options[:for] ||= html_options[:id]
-
-        label(method, label_options) <<
-        country_select(method, priority_countries, strip_formtastic_options(options), html_options)
-      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) || {}
-        checked_value = options.delete(:checked_value) || '1'
-        unchecked_value = options.delete(:unchecked_value) || '0'
-
-        html_options[:id] = html_options[:id] || generate_html_id(method, "")
-        input = template.check_box_tag(
-          "#{@object_name}[#{method}]",
-          checked_value,
-          (@object && @object.send(:"#{method}")),
-          html_options
-        )
-        
-        options = options_for_label(options)
-        options[:for] ||= html_options[:id]
-
-        # the label() method will insert this nested input into the label at the last minute
-        options[:label_prefix_for_nested_input] = input
-
-        template.hidden_field_tag("#{@object_name}[#{method}]", unchecked_value, :id => nil) << label(method, options)
-      end
-
-      # 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
-
-      # 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? or options[:hint].kind_of? Hash
-        hint_class = options[:hint_class] || default_hint_class
-        template.content_tag(:p, Formtastic::Util.html_safe(options[:hint]), :class => hint_class)
-      end
-
-      # Creates an error sentence by calling to_sentence on the errors array.
-      #
-      def error_sentence(errors, options = {}) #:nodoc:
-        error_class = options[:error_class] || default_inline_error_class
-        template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.untaint), :class => error_class)
-      end
-
-      # Creates an error li list.
-      #
-      def error_list(errors, options = {}) #:nodoc:
-        error_class = options[:error_class] || default_error_list_class
-        list_elements = []
-        errors.each do |error|
-          list_elements <<  template.content_tag(:li, Formtastic::Util.html_safe(error.untaint))
-        end
-        template.content_tag(:ul, Formtastic::Util.html_safe(list_elements.join("\n")), :class => error_class)
-      end
-
-      # Creates an error sentence containing only the first error
-      #
-      def error_first(errors, options = {}) #:nodoc:
-        error_class = options[:error_class] || default_inline_error_class
-        template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => error_class)
-      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
-
-        if string_or_proc.is_a?(Proc)
-          string_or_proc.call
-        else
-          string_or_proc.to_s
-        end
-      end
-
-      # Generates a fieldset and wraps the content in an ordered list. When working
-      # with nested attributes, 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.dup.delete(:name).to_s
-        legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
-        legend  = template.content_tag(:legend, template.content_tag(:span, Formtastic::Util.html_safe(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
-
-        # 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,
-          Formtastic::Util.html_safe(legend) << template.content_tag(:ol, Formtastic::Util.html_safe(contents)),
-          html_options.except(:builder, :parent)
-        )
-
-        fieldset
-      end
-
-      def field_set_title_from_args(*args) #:nodoc:
-        options = args.extract_options!
-        options[:name] ||= options.delete(:title)
-        title = options[:name]
-
-        if title.blank?
-          valid_name_classes = [::String, ::Symbol]
-          valid_name_classes.delete(::Symbol) if !block_given? && (args.first.is_a?(::Symbol) && 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
-
-      # 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,
-                label(method, options_for_label(options).merge(:for => options.delete(:label_for))), :class => 'label'
-              ) <<
-            template.content_tag(:ol, Formtastic::Util.html_safe(contents))
-          )
-      end
-
-      # Generates the legend for radiobuttons and checkboxes
-      def legend_tag(method, options = {})
-        if options[:label] == false
-          Formtastic::Util.html_safe("")
-        else
-          text = localized_string(method, options[:label], :label) || humanized_attribute_name(method)
-          text += required_or_optional_string(options.delete(:required))
-          text = Formtastic::Util.html_safe(text)
-          template.content_tag :legend, template.label_tag(nil, text, :for => nil), :class => :label
-        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, options = {}) #:nodoc:
-        if column = 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/
-            return :email     if method.to_s =~ /email/
-            return :url       if method.to_s =~ /^url$|^website$|_url$/
-            return :phone     if method.to_s =~ /(phone|fax)/
-            return :search    if method.to_s =~ /^search$/
-          when :integer
-            return :select    if reflection_for(method)
-            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 reflection_for(method)
-
-            return :file    if is_file?(method, options)
-          end
-
-          return :select    if options.key?(:collection)
-          return :password  if method.to_s =~ /password/
-          return :string
-        end
-      end
-
-      def is_file?(method, options = {})
-        @files ||= {}
-        @files[method] ||= (options[:as].present? && options[:as] == :file) || begin
-          file = @object.send(method) if @object && @object.respond_to?(method)
-          file && file_methods.any?{|m| file.respond_to?(m)}
-        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 a plain string
-        return collection if collection.instance_of?(String) || collection.instance_of?(::Formtastic::Util.rails_safe_buffer_class)
-
-        # 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) &&
-                             !(options.include?(:label_method) || options.include?(:value_method))
-
-        label, value = detect_label_and_value_method!(collection, options)
-        collection.map { |o| [send_or_call(label, o), send_or_call(value, o)] }
-      end
-
-      # 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 = reflection_for(column)
-          options[:find_options] ||= {}
-
-          if conditions = reflection.options[:conditions]
-            if reflection.klass.respond_to?(:merge_conditions)
-              options[:find_options][:conditions] = reflection.klass.merge_conditions(conditions, options[:find_options][:conditions])
-              reflection.klass.all(options[:find_options])
-            else
-              reflection.klass.where(conditions).where(options[:find_options][:conditions])
-            end
-          else
-            reflection.klass.all(options[:find_options])
-          end
-        else
-          create_boolean_collection(options)
-        end
-
-        collection = collection.to_a if collection.is_a?(Hash)
-        collection
-      end
-
-      # Detects the label and value methods from a collection using methods set in
-      # collection_label_methods and collection_value_methods. For some ruby core
-      # classes sensible defaults have been defined. It will use and delete the options
-      # :label_method and :value_methods when present.
-      #
-      def detect_label_and_value_method!(collection, options = {})
-        sample = collection.first || collection.last
-
-        case sample
-        when Array
-          label, value = :first, :last
-        when Integer
-          label, value = :to_s, :to_i
-        when String, NilClass
-          label, value = :to_s, :to_s
-        end
-
-        # Order of preference: user supplied method, class defaults, auto-detect
-        label = options[:label_method] || label || collection_label_methods.find { |m| sample.respond_to?(m) }
-        value = options[:value_method] || value || collection_value_methods.find { |m| sample.respond_to?(m) }
-
-        [label, value]
-      end
-
-      # Return the label collection method when none is supplied using the
-      # values set in collection_label_methods.
-      #
-      def detect_label_method(collection) #:nodoc:
-        detect_label_and_value_method!(collection).first
-      end
-
-      # 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 = 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
-
-      # 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)
-
-        [ [ options.delete(:true), true], [ options.delete(:false), false ] ]
-      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 = 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
-
-      # 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
-
-      # 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
-
-      # Returns the active validations for the given method or an empty Array if no validations are
-      # found for the method.
-      #
-      # By default, the if/unless options of the validations are evaluated and only the validations
-      # that should be run for the current object state are returned. Pass :all to the last
-      # parameter to return :all validations regardless of if/unless options.
-      #
-      # Requires the ValidationReflection plugin to be present or an ActiveModel. Returns an epmty
-      # Array if neither is the case.
-      #
-      def validations_for(method, mode = :active)
-        # ActiveModel?
-        validations = if @object && @object.class.respond_to?(:validators_on)
-          @object.class.validators_on(method)
-        else
-          # ValidationReflection plugin?
-          if @object && @object.class.respond_to?(:reflect_on_validations_for)
-            @object.class.reflect_on_validations_for(method)
-          else
-            []
-          end
-        end
-
-        validations = validations.select do |validation|
-          (validation.options.present? ? options_require_validation?(validation.options) : true)
-        end unless mode == :all
-
-        return validations
-      end
-
-      # Generates default_string_options by retrieving column information from
-      # the database.
-      #
-      def default_string_options(method, type) #:nodoc:
-        def get_maxlength_for(method)
-          validation = validations_for(method).find do |validation|
-            (validation.respond_to?(:macro) && validation.macro == :validates_length_of) || # Rails 2 + 3 style validation
-            (validation.respond_to?(:kind) && validation.kind == :length) # Rails 3 style validator
-          end
-
-          if validation
-            validation.options[:maximum] || (validation.options[:within].present? ? validation.options[:within].max : nil)
-          else
-            nil
-          end
-        end
-
-        validation_max_limit = get_maxlength_for(method)
-        column = column_for(method)
-
-        if type == :text
-          { :rows => default_text_area_height, 
-            :cols => default_text_area_width }
-        elsif type == :numeric || column.nil? || !column.respond_to?(:limit) || column.limit.nil?
-          { :maxlength => validation_max_limit,
-            :size => default_text_field_size }
-        else
-          { :maxlength => validation_max_limit || column.limit,
-            :size => default_text_field_size }
-        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') #:nodoc:
-        index = if options.has_key?(:index)
-                  options[:index]
-                elsif defined?(@auto_index)
-                  @auto_index
-                else
-                  ""
-                end
-        sanitized_method_name = method_name.to_s.gsub(/[\?\/\-]$/, '')
-
-        [custom_namespace, sanitized_object_name, index, sanitized_method_name, value].reject{|x|x.blank?}.join('_')
-      end
-
-      # Gets the nested_child_index value from the parent builder. 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')
-
-        child = parent[:for]
-        child = child.first if child.respond_to?(:first)
-        duck[child].to_i + 1
-      end
-
-      def sanitized_object_name #:nodoc:
-        @sanitized_object_name ||= @object_name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
-      end
-
-      def humanized_attribute_name(method) #:nodoc:
-        if @object && @object.class.respond_to?(:human_attribute_name)
-          humanized_name = @object.class.human_attribute_name(method.to_s)
-          if humanized_name == method.to_s.send(:humanize)
-            method.to_s.send(label_str_method)
-          else
-            humanized_name
-          end
-        else
-          method.to_s.send(label_str_method)
-        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 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)
-          escape_html_entities(value)
-        else
-          use_i18n = value.nil? ? i18n_lookups_by_default : (value != false)
-
-          if use_i18n
-            model_name, nested_model_name  = normalize_model_name(self.model_name.underscore)
-            action_name = template.params[:action].to_s rescue ''
-            attribute_name = key.to_s
-
-            defaults = ::Formtastic::I18n::SCOPES.reject do |i18n_scope|
-              nested_model_name.nil? && i18n_scope.match(/nested_model/)
-            end.collect do |i18n_scope|
-              i18n_path = i18n_scope.dup
-              i18n_path.gsub!('%{action}', action_name)
-              i18n_path.gsub!('%{model}', model_name)
-              i18n_path.gsub!('%{nested_model}', nested_model_name) unless nested_model_name.nil?
-              i18n_path.gsub!('%{attribute}', attribute_name)
-              i18n_path.gsub!('..', '.')
-              i18n_path.to_sym
-            end
-            defaults << ''
-
-            defaults.uniq!
-
-            default_key = defaults.shift
-            i18n_value = ::Formtastic::I18n.t(default_key,
-              options.merge(:default => defaults, :scope => type.to_s.pluralize.to_sym))
-            if i18n_value.blank? && type == :label
-              # This is effectively what Rails label helper does for i18n lookup
-              options[:scope] = [:helpers, type]
-              options[:default] = defaults
-              i18n_value = ::I18n.t(default_key, options)
-            end
-            i18n_value = escape_html_entities(i18n_value) if i18n_value.is_a?(::String)
-            i18n_value.blank? ? nil : i18n_value
-          end
-        end
-      end
-
-      def model_name
-        @object.present? ? @object.class.name : @object_name.to_s.classify
-      end
-
-      def normalize_model_name(name)
-        if name =~ /(.+)\[(.+)\]/
-          [$1, $2]
-        else
-          [name]
-        end
-      end
-
-      def send_or_call(duck, object)
-        if duck.is_a?(Proc)
-          duck.call(object)
-        else
-          object.send(duck)
-        end
-      end
-
-      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
-
-      def escape_html_entities(string) #:nodoc:
-        if escape_html_entities_in_hints_and_labels
-          # Acceppt html_safe flag as indicator to skip escaping
-          string = template.escape_once(string) unless string.respond_to?(:html_safe?) && string.html_safe? == true
-        end
-        string
-      end
-    
-  end
-end
\ No newline at end of file
diff --git a/lib/formtastic/semantic_form_helper.rb b/lib/formtastic/semantic_form_helper.rb
deleted file mode 100644
index 659752c5a..000000000
--- a/lib/formtastic/semantic_form_helper.rb
+++ /dev/null
@@ -1,96 +0,0 @@
-module Formtastic
-  
-  # Wrappers around form_for (etc) with :builder => SemanticFormBuilder.
-  #
-  # * semantic_form_for(@post)
-  # * semantic_fields_for(@post)
-  # * semantic_form_remote_for(@post)
-  # * semantic_remote_form_for(@post)
-  #
-  # Each of which are the equivalent of:
-  #
-  # * form_for(@post, :builder => Formtastic::SemanticFormBuilder))
-  # * fields_for(@post, :builder => Formtastic::SemanticFormBuilder))
-  # * form_remote_for(@post, :builder => Formtastic::SemanticFormBuilder))
-  # * remote_form_for(@post, :builder => Formtastic::SemanticFormBuilder))
-  #
-  # Example Usage:
-  #
-  #   <% semantic_form_for @post do |f| %>
-  #     <%= f.input :title %>
-  #     <%= f.input :body %>
-  #   <% 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, 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| %>
-  #     ...
-  #   <% end %>
-  #
-  #   <% semantic_form_for :post, Post.new, :url => posts_path do |f| %>
-  #     ...
-  #   <% end %>
-  module SemanticFormHelper
-    @@builder = ::Formtastic::SemanticFormBuilder
-    @@default_form_class = 'formtastic'
-    mattr_accessor :builder, :default_form_class
-
-    # 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
-
-    def with_custom_field_error_proc(&block)
-      default_field_error_proc = ::ActionView::Base.field_error_proc
-      ::ActionView::Base.field_error_proc = FIELD_ERROR_PROC
-      yield
-    ensure
-      ::ActionView::Base.field_error_proc = default_field_error_proc
-    end
-
-    def semantic_remote_form_for_wrapper(record_or_name_or_array, *args, &proc)
-      options = args.extract_options!
-      if respond_to? :remote_form_for
-        semantic_remote_form_for_real(record_or_name_or_array, *(args << options), &proc)
-      else
-        options[:remote] = true
-        semantic_form_for(record_or_name_or_array, *(args << options), &proc)
-      end
-    end
-
-    [:form_for, :fields_for, :remote_form_for].each do |meth|
-      module_eval <<-END_SRC, __FILE__, __LINE__ + 1
-        def semantic_#{meth}(record_or_name_or_array, *args, &proc)
-          options = args.extract_options!
-          options[:builder] ||= @@builder
-          options[:html] ||= {}
-          @@builder.custom_namespace = options[:namespace].to_s
-
-          singularizer = defined?(ActiveModel::Naming.singular) ? ActiveModel::Naming.method(:singular) : ActionController::RecordIdentifier.method(:singular_class_name)
-
-          class_names = options[:html][:class] ? options[:html][:class].split(" ") : []
-          class_names << @@default_form_class
-          class_names << case record_or_name_or_array
-            when String, Symbol then record_or_name_or_array.to_s                                  # :post => "post"
-            when Array then options[:as] || singularizer.call(record_or_name_or_array.last.class)  # [@post, @comment] # => "comment"
-            else options[:as] || singularizer.call(record_or_name_or_array.class)                  # @post => "post"
-          end
-          options[:html][:class] = class_names.join(" ")
-
-          with_custom_field_error_proc do
-            #{meth}(record_or_name_or_array, *(args << options), &proc)
-          end
-        end
-      END_SRC
-    end
-    alias :semantic_remote_form_for_real :semantic_remote_form_for
-    alias :semantic_remote_form_for :semantic_remote_form_for_wrapper
-    alias :semantic_form_remote_for :semantic_remote_form_for
-
-  end
-end
\ No newline at end of file

From 2f69d7d0fde0395b5964850cea03122480c7296e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 16 Jan 2011 15:31:50 +1100
Subject: [PATCH 435/992] shifted inputs() and input() out to
 Builder::InputsHelper

---
 lib/formtastic/builder/base.rb          | 260 +----------------------
 lib/formtastic/builder/inputs_helper.rb | 262 ++++++++++++++++++++++++
 2 files changed, 267 insertions(+), 255 deletions(-)
 create mode 100644 lib/formtastic/builder/inputs_helper.rb

diff --git a/lib/formtastic/builder/base.rb b/lib/formtastic/builder/base.rb
index b12a93cf1..299fc698e 100644
--- a/lib/formtastic/builder/base.rb
+++ b/lib/formtastic/builder/base.rb
@@ -1,3 +1,5 @@
+require File.join(File.dirname(__FILE__), *%w[inputs_helper])
+
 module Formtastic
   module Builder
     class Base < ActionView::Helpers::FormBuilder
@@ -36,261 +38,9 @@ def self.configure(name, value = nil)
       INLINE_ERROR_TYPES = [:sentence, :list, :first]
     
       attr_accessor :template
-    
-      # Returns a suitable form input for the given +method+, using the database column information
-      # and other factors (like the method name) to figure out what you probably want.
-      #
-      # Options:
-      #
-      # * :as - override the input type (eg force a :string to render as a :password field)
-      # * :label - use something other than the method name as the label text, when false no label is printed
-      # * :required - specify if the column is required (true) or not (false)
-      # * :hint - provide some text to hint or help the user provide the correct information for a field
-      # * :input_html - provide options that will be passed down to the generated input
-      # * :wrapper_html - provide options that will be passed down to the li wrapper
-      #
-      # Input Types:
-      #
-      # Most inputs map directly to one of ActiveRecord's column types by default (eg string_input),
-      # but there are a few special cases and some simplification (:integer, :float and :decimal
-      # columns all map to a single numeric_input, for example).
-      #
-      # * :select (a select menu for associations) - default to association names
-      # * :check_boxes (a set of check_box inputs for associations) - alternative to :select has_many and has_and_belongs_to_many associations
-      # * :radio (a set of radio inputs for associations) - alternative to :select belongs_to associations
-      # * :time_zone (a select menu with time zones)
-      # * :password (a password input) - default for :string column types with 'password' in the method name
-      # * :text (a textarea) - default for :text column types
-      # * :date (a date select) - default for :date column types
-      # * :datetime (a date and time select) - default for :datetime and :timestamp column types
-      # * :time (a time select) - default for :time column types
-      # * :boolean (a checkbox) - default for :boolean column types (you can also have booleans as :select and :radio)
-      # * :string (a text field) - default for :string column types
-      # * :numeric (a text field, like string) - default for :integer, :float and :decimal column types
-      # * :email (an email input) - default for :string column types with 'email' as the method name.
-      # * :url (a url input) - default for :string column types with 'url' as the method name.
-      # * :phone (a tel input) - default for :string column types with 'phone' or 'fax' in the method name.
-      # * :search (a search input) - default for :string column types with 'search' as the method name.
-      # * :country (a select menu of country names) - requires a country_select plugin to be installed
-      # * :email (an email input) - New in HTML5 - needs to be explicitly provided with :as => :email
-      # * :url (a url input) - New in HTML5 - needs to be explicitly provided with :as => :url
-      # * :phone (a tel input) - New in HTML5 - needs to be explicitly provided with :as => :phone
-      # * :search (a search input) - New in HTML5 - needs to be explicity provided with :as => :search
-      # * :country (a select menu of country names) - requires a country_select plugin to be installed
-      # * :hidden (a hidden field) - creates a hidden field (added for compatibility)
-      #
-      # Example:
-      #
-      #   <% semantic_form_for @employee do |form| %>
-      #     <% form.inputs do -%>
-      #       <%= form.input :name, :label => "Full Name" %>
-      #       <%= form.input :manager, :as => :radio %>
-      #       <%= form.input :secret, :as => :password, :input_html => { :value => "xxxx" } %>
-      #       <%= form.input :hired_at, :as => :date, :label => "Date Hired" %>
-      #       <%= form.input :phone, :required => false, :hint => "Eg: +1 555 1234" %>
-      #       <%= form.input :email %>
-      #       <%= form.input :website, :as => :url, :hint => "You may wish to omit the http://" %>
-      #     <% end %>
-      #   <% end %>
-      #
-      def input(method, options = {})
-        options = options.dup # Allow options to be shared without being tainted by Formtastic
-        
-        options[:required] = method_required?(method) unless options.key?(:required)
-        options[:as]     ||= default_input_type(method, options)
-    
-        html_class = [ options[:as], (options[:required] ? :required : :optional) ]
-        html_class << 'error' if has_errors?(method, options)
-    
-        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 options[:input_html] && options[:input_html][:id]
-          options[:label_html] ||= {}
-          options[:label_html][:for] ||= options[:input_html][:id]
-        end
-    
-        input_parts = (custom_inline_order[options[:as]] || inline_order).dup
-        input_parts = input_parts - [:errors, :hints] if options[:as] == :hidden
-    
-        list_item_content = input_parts.map do |type|
-          send(:"inline_#{type}_for", method, options)
-        end.compact.join("\n")
-    
-        return template.content_tag(:li, Formtastic::Util.html_safe(list_item_content), wrapper_html)
-      end
-    
-      # Creates an input fieldset and ol tag wrapping for use around a set of inputs.  It can be
-      # called either with a block (in which you can do the usual Rails form stuff, HTML, ERB, etc),
-      # or with a list of fields.  These two examples are functionally equivalent:
-      #
-      #   # With a block:
-      #   <% semantic_form_for @post do |form| %>
-      #     <% form.inputs do %>
-      #       <%= form.input :title %>
-      #       <%= form.input :body %>
-      #     <% end %>
-      #   <% end %>
-      #
-      #   # With a list of fields:
-      #   <% semantic_form_for @post do |form| %>
-      #     <%= form.inputs :title, :body %>
-      #   <% end %>
-      #
-      #   # Output:
-      #   <form ...>
-      #     <fieldset class="inputs">
-      #       <ol>
-      #         <li class="string">...</li>
-      #         <li class="text">...</li>
-      #       </ol>
-      #     </fieldset>
-      #   </form>
-      #
-      # === Quick Forms
-      #
-      # When called without a block or a field list, an input is rendered for each column in the
-      # model's database table, just like Rails' scaffolding.  You'll obviously want more control
-      # than this in a production application, but it's a great way to get started, then come back
-      # later to customise the form with a field list or a block of inputs.  Example:
-      #
-      #   <% semantic_form_for @post do |form| %>
-      #     <%= 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/: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| %>
-      #     <% form.inputs :name => "Create a new post", :style => "border:1px;" do %>
-      #       ...
-      #     <% end %>
-      #   <% end %>
-      #
-      #   # With a list (the options must come after the field list):
-      #   <% semantic_form_for @post do |form| %>
-      #     <%= 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,
-      # use inputs:
-      #
-      #   <% semantic_form_for @post do |f| %>
-      #     <% f.inputs do %>
-      #       <%= f.input :title %>
-      #       <%= f.input :body %>
-      #     <% end %>
-      #     <% f.inputs :name => "Advanced", :id => "advanced" do %>
-      #       <%= f.input :created_at %>
-      #       <%= f.input :user_id, :label => "Author" %>
-      #     <% end %>
-      #     <% f.inputs "Extra" do %>
-      #       <%= f.input :update_at %>
-      #     <% end %>
-      #   <% end %>
-      #
-      #   # Output:
-      #   <form ...>
-      #     <fieldset class="inputs">
-      #       <ol>
-      #         <li class="string">...</li>
-      #         <li class="text">...</li>
-      #       </ol>
-      #     </fieldset>
-      #     <fieldset class="inputs" id="advanced">
-      #       <legend><span>Advanced</span></legend>
-      #       <ol>
-      #         <li class="datetime">...</li>
-      #         <li class="select">...</li>
-      #       </ol>
-      #     </fieldset>
-      #     <fieldset class="inputs">
-      #       <legend><span>Extra</span></legend>
-      #       <ol>
-      #         <li class="datetime">...</li>
-      #       </ol>
-      #     </fieldset>
-      #   </form>
-      #
-      # === Nested attributes
-      #
-      # As in Rails, you can use semantic_fields_for to nest attributes:
-      #
-      #   <% semantic_form_for @post do |form| %>
-      #     <%= form.inputs :title, :body %>
-      #
-      #     <% form.semantic_fields_for :author, @bob do |author_form| %>
-      #       <% author_form.inputs do %>
-      #         <%= author_form.input :first_name, :required => false %>
-      #         <%= author_form.input :last_name %>
-      #       <% end %>
-      #     <% end %>
-      #   <% end %>
-      #
-      # But this does not look formtastic! This is equivalent:
-      #
-      #   <% semantic_form_for @post do |form| %>
-      #     <%= form.inputs :title, :body %>
-      #     <% form.inputs :for => [ :author, @bob ] do |author_form| %>
-      #       <%= author_form.input :first_name, :required => false %>
-      #       <%= author_form.input :last_name %>
-      #     <% end %>
-      #   <% end %>
-      #
-      # And if you don't need to give options to your input call, you could do it
-      # in just one line:
-      #
-      #   <% semantic_form_for @post do |form| %>
-      #     <%= form.inputs :title, :body %>
-      #     <%= form.inputs :first_name, :last_name, :for => @bob %>
-      #   <% end %>
-      #
-      # Just remember that calling inputs generates a new fieldset to wrap your
-      # inputs. If you have two separate models, but, semantically, on the page
-      # they are part of the same fieldset, you should use semantic_fields_for
-      # 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"
-        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(*(args << html_options), &block)
-        else
-          if @object && args.empty?
-            args  = association_columns(:belongs_to)
-            args += content_columns
-            args -= RESERVED_COLUMNS
-            args.compact!
-          end
-          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
+      
+      include Formtastic::Builder::InputsHelper
+      
     
       # Creates a fieldset and ol tag wrapping for form buttons / actions as list items.
       # See inputs documentation for a full example.  The fieldset's default class attriute
diff --git a/lib/formtastic/builder/inputs_helper.rb b/lib/formtastic/builder/inputs_helper.rb
new file mode 100644
index 000000000..5f6ae53c4
--- /dev/null
+++ b/lib/formtastic/builder/inputs_helper.rb
@@ -0,0 +1,262 @@
+module Formtastic
+  module Builder
+    module InputsHelper
+
+      # Returns a suitable form input for the given +method+, using the database column information
+      # and other factors (like the method name) to figure out what you probably want.
+      #
+      # Options:
+      #
+      # * :as - override the input type (eg force a :string to render as a :password field)
+      # * :label - use something other than the method name as the label text, when false no label is printed
+      # * :required - specify if the column is required (true) or not (false)
+      # * :hint - provide some text to hint or help the user provide the correct information for a field
+      # * :input_html - provide options that will be passed down to the generated input
+      # * :wrapper_html - provide options that will be passed down to the li wrapper
+      #
+      # Input Types:
+      #
+      # Most inputs map directly to one of ActiveRecord's column types by default (eg string_input),
+      # but there are a few special cases and some simplification (:integer, :float and :decimal
+      # columns all map to a single numeric_input, for example).
+      #
+      # * :select (a select menu for associations) - default to association names
+      # * :check_boxes (a set of check_box inputs for associations) - alternative to :select has_many and has_and_belongs_to_many associations
+      # * :radio (a set of radio inputs for associations) - alternative to :select belongs_to associations
+      # * :time_zone (a select menu with time zones)
+      # * :password (a password input) - default for :string column types with 'password' in the method name
+      # * :text (a textarea) - default for :text column types
+      # * :date (a date select) - default for :date column types
+      # * :datetime (a date and time select) - default for :datetime and :timestamp column types
+      # * :time (a time select) - default for :time column types
+      # * :boolean (a checkbox) - default for :boolean column types (you can also have booleans as :select and :radio)
+      # * :string (a text field) - default for :string column types
+      # * :numeric (a text field, like string) - default for :integer, :float and :decimal column types
+      # * :email (an email input) - default for :string column types with 'email' as the method name.
+      # * :url (a url input) - default for :string column types with 'url' as the method name.
+      # * :phone (a tel input) - default for :string column types with 'phone' or 'fax' in the method name.
+      # * :search (a search input) - default for :string column types with 'search' as the method name.
+      # * :country (a select menu of country names) - requires a country_select plugin to be installed
+      # * :email (an email input) - New in HTML5 - needs to be explicitly provided with :as => :email
+      # * :url (a url input) - New in HTML5 - needs to be explicitly provided with :as => :url
+      # * :phone (a tel input) - New in HTML5 - needs to be explicitly provided with :as => :phone
+      # * :search (a search input) - New in HTML5 - needs to be explicity provided with :as => :search
+      # * :country (a select menu of country names) - requires a country_select plugin to be installed
+      # * :hidden (a hidden field) - creates a hidden field (added for compatibility)
+      #
+      # Example:
+      #
+      #   <% semantic_form_for @employee do |form| %>
+      #     <% form.inputs do -%>
+      #       <%= form.input :name, :label => "Full Name" %>
+      #       <%= form.input :manager, :as => :radio %>
+      #       <%= form.input :secret, :as => :password, :input_html => { :value => "xxxx" } %>
+      #       <%= form.input :hired_at, :as => :date, :label => "Date Hired" %>
+      #       <%= form.input :phone, :required => false, :hint => "Eg: +1 555 1234" %>
+      #       <%= form.input :email %>
+      #       <%= form.input :website, :as => :url, :hint => "You may wish to omit the http://" %>
+      #     <% end %>
+      #   <% end %>
+      #
+      def input(method, options = {})
+        options = options.dup # Allow options to be shared without being tainted by Formtastic
+        
+        options[:required] = method_required?(method) unless options.key?(:required)
+        options[:as]     ||= default_input_type(method, options)
+    
+        html_class = [ options[:as], (options[:required] ? :required : :optional) ]
+        html_class << 'error' if has_errors?(method, options)
+    
+        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 options[:input_html] && options[:input_html][:id]
+          options[:label_html] ||= {}
+          options[:label_html][:for] ||= options[:input_html][:id]
+        end
+    
+        input_parts = (custom_inline_order[options[:as]] || inline_order).dup
+        input_parts = input_parts - [:errors, :hints] if options[:as] == :hidden
+    
+        list_item_content = input_parts.map do |type|
+          send(:"inline_#{type}_for", method, options)
+        end.compact.join("\n")
+    
+        return template.content_tag(:li, Formtastic::Util.html_safe(list_item_content), wrapper_html)
+      end
+    
+      # Creates an input fieldset and ol tag wrapping for use around a set of inputs.  It can be
+      # called either with a block (in which you can do the usual Rails form stuff, HTML, ERB, etc),
+      # or with a list of fields.  These two examples are functionally equivalent:
+      #
+      #   # With a block:
+      #   <% semantic_form_for @post do |form| %>
+      #     <% form.inputs do %>
+      #       <%= form.input :title %>
+      #       <%= form.input :body %>
+      #     <% end %>
+      #   <% end %>
+      #
+      #   # With a list of fields:
+      #   <% semantic_form_for @post do |form| %>
+      #     <%= form.inputs :title, :body %>
+      #   <% end %>
+      #
+      #   # Output:
+      #   <form ...>
+      #     <fieldset class="inputs">
+      #       <ol>
+      #         <li class="string">...</li>
+      #         <li class="text">...</li>
+      #       </ol>
+      #     </fieldset>
+      #   </form>
+      #
+      # === Quick Forms
+      #
+      # When called without a block or a field list, an input is rendered for each column in the
+      # model's database table, just like Rails' scaffolding.  You'll obviously want more control
+      # than this in a production application, but it's a great way to get started, then come back
+      # later to customise the form with a field list or a block of inputs.  Example:
+      #
+      #   <% semantic_form_for @post do |form| %>
+      #     <%= 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/: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| %>
+      #     <% form.inputs :name => "Create a new post", :style => "border:1px;" do %>
+      #       ...
+      #     <% end %>
+      #   <% end %>
+      #
+      #   # With a list (the options must come after the field list):
+      #   <% semantic_form_for @post do |form| %>
+      #     <%= 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,
+      # use inputs:
+      #
+      #   <% semantic_form_for @post do |f| %>
+      #     <% f.inputs do %>
+      #       <%= f.input :title %>
+      #       <%= f.input :body %>
+      #     <% end %>
+      #     <% f.inputs :name => "Advanced", :id => "advanced" do %>
+      #       <%= f.input :created_at %>
+      #       <%= f.input :user_id, :label => "Author" %>
+      #     <% end %>
+      #     <% f.inputs "Extra" do %>
+      #       <%= f.input :update_at %>
+      #     <% end %>
+      #   <% end %>
+      #
+      #   # Output:
+      #   <form ...>
+      #     <fieldset class="inputs">
+      #       <ol>
+      #         <li class="string">...</li>
+      #         <li class="text">...</li>
+      #       </ol>
+      #     </fieldset>
+      #     <fieldset class="inputs" id="advanced">
+      #       <legend><span>Advanced</span></legend>
+      #       <ol>
+      #         <li class="datetime">...</li>
+      #         <li class="select">...</li>
+      #       </ol>
+      #     </fieldset>
+      #     <fieldset class="inputs">
+      #       <legend><span>Extra</span></legend>
+      #       <ol>
+      #         <li class="datetime">...</li>
+      #       </ol>
+      #     </fieldset>
+      #   </form>
+      #
+      # === Nested attributes
+      #
+      # As in Rails, you can use semantic_fields_for to nest attributes:
+      #
+      #   <% semantic_form_for @post do |form| %>
+      #     <%= form.inputs :title, :body %>
+      #
+      #     <% form.semantic_fields_for :author, @bob do |author_form| %>
+      #       <% author_form.inputs do %>
+      #         <%= author_form.input :first_name, :required => false %>
+      #         <%= author_form.input :last_name %>
+      #       <% end %>
+      #     <% end %>
+      #   <% end %>
+      #
+      # But this does not look formtastic! This is equivalent:
+      #
+      #   <% semantic_form_for @post do |form| %>
+      #     <%= form.inputs :title, :body %>
+      #     <% form.inputs :for => [ :author, @bob ] do |author_form| %>
+      #       <%= author_form.input :first_name, :required => false %>
+      #       <%= author_form.input :last_name %>
+      #     <% end %>
+      #   <% end %>
+      #
+      # And if you don't need to give options to your input call, you could do it
+      # in just one line:
+      #
+      #   <% semantic_form_for @post do |form| %>
+      #     <%= form.inputs :title, :body %>
+      #     <%= form.inputs :first_name, :last_name, :for => @bob %>
+      #   <% end %>
+      #
+      # Just remember that calling inputs generates a new fieldset to wrap your
+      # inputs. If you have two separate models, but, semantically, on the page
+      # they are part of the same fieldset, you should use semantic_fields_for
+      # 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"
+        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(*(args << html_options), &block)
+        else
+          if @object && args.empty?
+            args  = association_columns(:belongs_to)
+            args += content_columns
+            args -= Formtastic::Builder::Base::RESERVED_COLUMNS
+            args.compact!
+          end
+          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
+      
+    end
+  end
+end
\ No newline at end of file

From fb5aef263aa3e4db41448067849e3bf371e65330 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 16 Jan 2011 15:34:54 +1100
Subject: [PATCH 436/992] shifted buttons() and commit_button() to
 ButtonsHelper

---
 lib/formtastic/builder/base.rb           | 73 +----------------------
 lib/formtastic/builder/buttons_helper.rb | 75 ++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 71 deletions(-)
 create mode 100644 lib/formtastic/builder/buttons_helper.rb

diff --git a/lib/formtastic/builder/base.rb b/lib/formtastic/builder/base.rb
index 299fc698e..092712cd6 100644
--- a/lib/formtastic/builder/base.rb
+++ b/lib/formtastic/builder/base.rb
@@ -1,4 +1,5 @@
 require File.join(File.dirname(__FILE__), *%w[inputs_helper])
+require File.join(File.dirname(__FILE__), *%w[buttons_helper])
 
 module Formtastic
   module Builder
@@ -40,77 +41,7 @@ def self.configure(name, value = nil)
       attr_accessor :template
       
       include Formtastic::Builder::InputsHelper
-      
-    
-      # Creates a fieldset and ol tag wrapping for form buttons / actions as list items.
-      # See inputs documentation for a full example.  The fieldset's default class attriute
-      # is set to "buttons".
-      #
-      # See inputs for html attributes and special options.
-      def buttons(*args, &block)
-        html_options = args.extract_options!
-        html_options[:class] ||= "buttons"
-    
-        if block_given?
-          field_set_and_list_wrapping(html_options, &block)
-        else
-          args = [:commit] if args.empty?
-          contents = args.map { |button_name| send(:"#{button_name}_button") }
-          field_set_and_list_wrapping(html_options, contents)
-        end
-      end
-    
-      # Creates a submit input tag with the value "Save [model name]" (for existing records) or
-      # "Create [model name]" (for new records) by default:
-      #
-      #   <%= form.commit_button %> => <input name="commit" type="submit" value="Save Post" />
-      #
-      # The value of the button text can be overridden:
-      #
-      #  <%= 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 :button_html => { :class => "pretty" } %> => <input name="commit" type="submit" value="Save Post" class="pretty {create|update|submit}" />
-      def commit_button(*args)
-        options = args.extract_options!
-        text = options.delete(:label) || args.shift
-    
-        if @object && (@object.respond_to?(:persisted?) || @object.respond_to?(:new_record?))
-          key = @object.persisted? ? :update : :create
-    
-          # Deal with some complications with ActiveRecord::Base.human_name and two name models (eg UserPost)
-          # ActiveRecord::Base.human_name falls back to ActiveRecord::Base.name.humanize ("Userpost")
-          # if there's no i18n, which is pretty crappy.  In this circumstance we want to detect this
-          # fall back (human_name == name.humanize) and do our own thing name.underscore.humanize ("User Post")
-          if @object.class.model_name.respond_to?(:human)
-            object_name = @object.class.model_name.human
-          else
-            object_human_name = @object.class.human_name                # default is UserPost => "Userpost", but i18n may do better ("User post")
-            crappy_human_name = @object.class.name.humanize             # UserPost => "Userpost"
-            decent_human_name = @object.class.name.underscore.humanize  # UserPost => "User post"
-            object_name = (object_human_name == crappy_human_name) ? decent_human_name : object_human_name
-          end
-        else
-          key = :submit
-          object_name = @object_name.to_s.send(label_str_method)
-        end
-    
-        text = (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) || {}
-        button_html.merge!(:class => [button_html[:class], key].compact.join(' '))
-    
-        wrapper_html_class = ['commit'] # TODO: Add class reflecting on form action.
-        wrapper_html = options.delete(:wrapper_html) || {}
-        wrapper_html[:class] = (wrapper_html_class << wrapper_html[:class]).flatten.compact.join(' ')
-    
-        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, Formtastic::Util.html_safe(submit(text, button_html)), wrapper_html)
-      end
+      include Formtastic::Builder::ButtonsHelper
     
       # A thin wrapper around #fields_for to set :builder => Formtastic::SemanticFormBuilder
       # for nesting forms:
diff --git a/lib/formtastic/builder/buttons_helper.rb b/lib/formtastic/builder/buttons_helper.rb
new file mode 100644
index 000000000..6baaf96fb
--- /dev/null
+++ b/lib/formtastic/builder/buttons_helper.rb
@@ -0,0 +1,75 @@
+module Formtastic
+  module Builder
+    module ButtonsHelper
+      # Creates a fieldset and ol tag wrapping for form buttons / actions as list items.
+      # See inputs documentation for a full example.  The fieldset's default class attriute
+      # is set to "buttons".
+      #
+      # See inputs for html attributes and special options.
+      def buttons(*args, &block)
+        html_options = args.extract_options!
+        html_options[:class] ||= "buttons"
+    
+        if block_given?
+          field_set_and_list_wrapping(html_options, &block)
+        else
+          args = [:commit] if args.empty?
+          contents = args.map { |button_name| send(:"#{button_name}_button") }
+          field_set_and_list_wrapping(html_options, contents)
+        end
+      end
+    
+      # Creates a submit input tag with the value "Save [model name]" (for existing records) or
+      # "Create [model name]" (for new records) by default:
+      #
+      #   <%= form.commit_button %> => <input name="commit" type="submit" value="Save Post" />
+      #
+      # The value of the button text can be overridden:
+      #
+      #  <%= 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 :button_html => { :class => "pretty" } %> => <input name="commit" type="submit" value="Save Post" class="pretty {create|update|submit}" />
+      def commit_button(*args)
+        options = args.extract_options!
+        text = options.delete(:label) || args.shift
+    
+        if @object && (@object.respond_to?(:persisted?) || @object.respond_to?(:new_record?))
+          key = @object.persisted? ? :update : :create
+    
+          # Deal with some complications with ActiveRecord::Base.human_name and two name models (eg UserPost)
+          # ActiveRecord::Base.human_name falls back to ActiveRecord::Base.name.humanize ("Userpost")
+          # if there's no i18n, which is pretty crappy.  In this circumstance we want to detect this
+          # fall back (human_name == name.humanize) and do our own thing name.underscore.humanize ("User Post")
+          if @object.class.model_name.respond_to?(:human)
+            object_name = @object.class.model_name.human
+          else
+            object_human_name = @object.class.human_name                # default is UserPost => "Userpost", but i18n may do better ("User post")
+            crappy_human_name = @object.class.name.humanize             # UserPost => "Userpost"
+            decent_human_name = @object.class.name.underscore.humanize  # UserPost => "User post"
+            object_name = (object_human_name == crappy_human_name) ? decent_human_name : object_human_name
+          end
+        else
+          key = :submit
+          object_name = @object_name.to_s.send(label_str_method)
+        end
+    
+        text = (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) || {}
+        button_html.merge!(:class => [button_html[:class], key].compact.join(' '))
+    
+        wrapper_html_class = ['commit'] # TODO: Add class reflecting on form action.
+        wrapper_html = options.delete(:wrapper_html) || {}
+        wrapper_html[:class] = (wrapper_html_class << wrapper_html[:class]).flatten.compact.join(' ')
+    
+        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, Formtastic::Util.html_safe(submit(text, button_html)), wrapper_html)
+      end
+    end
+  end
+end
\ No newline at end of file

From e6b27d268cc1bea00795ff26b06685e02125b428 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 17 Jan 2011 06:34:22 +1100
Subject: [PATCH 437/992] moved some stuff out to Builder::LabelHelper and
 Builder::Errors helper

---
 lib/formtastic/builder/base.rb          | 139 +-----------------------
 lib/formtastic/builder/errors_helper.rb | 101 +++++++++++++++++
 lib/formtastic/builder/label_helper.rb  |  47 ++++++++
 3 files changed, 152 insertions(+), 135 deletions(-)
 create mode 100644 lib/formtastic/builder/errors_helper.rb
 create mode 100644 lib/formtastic/builder/label_helper.rb

diff --git a/lib/formtastic/builder/base.rb b/lib/formtastic/builder/base.rb
index 092712cd6..f99c0db26 100644
--- a/lib/formtastic/builder/base.rb
+++ b/lib/formtastic/builder/base.rb
@@ -1,5 +1,7 @@
 require File.join(File.dirname(__FILE__), *%w[inputs_helper])
 require File.join(File.dirname(__FILE__), *%w[buttons_helper])
+require File.join(File.dirname(__FILE__), *%w[label_helper])
+require File.join(File.dirname(__FILE__), *%w[errors_helper])
 
 module Formtastic
   module Builder
@@ -42,142 +44,9 @@ def self.configure(name, value = nil)
       
       include Formtastic::Builder::InputsHelper
       include Formtastic::Builder::ButtonsHelper
+      include Formtastic::Builder::LabelHelper
+      include Formtastic::Builder::ErrorsHelper
     
-      # A thin wrapper around #fields_for to set :builder => Formtastic::SemanticFormBuilder
-      # for nesting forms:
-      #
-      #   # Example:
-      #   <% semantic_form_for @post do |post| %>
-      #     <% post.semantic_fields_for :author do |author| %>
-      #       <% author.inputs :name %>
-      #     <% end %>
-      #   <% end %>
-      #
-      #   # Output:
-      #   <form ...>
-      #     <fieldset class="inputs">
-      #       <ol>
-      #         <li class="string"><input type='text' name='post[author][name]' id='post_author_name' /></li>
-      #       </ol>
-      #     </fieldset>
-      #   </form>
-      #
-      def semantic_fields_for(record_or_name_or_array, *args, &block)
-        opts = args.extract_options!
-        opts[:builder] ||= self.class
-        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.
-      # * :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_string(method, text, :label) || humanized_attribute_name(method)
-        text += required_or_optional_string(options.delete(:required))
-        text = Formtastic::Util.html_safe(text)
-    
-        # special case for boolean (checkbox) labels, which have a nested input
-        if options.key?(:label_prefix_for_nested_input)
-          text = options.delete(:label_prefix_for_nested_input) + text
-        end
-    
-        input_name = options.delete(:input_name) || method
-        super(input_name, text, options)
-      end
-    
-      # 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.
-      #
-      # 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 = {}) #:nodoc:
-        if render_inline_errors?
-          errors = error_keys(method, options).map{|x| @object.errors[x] }.flatten.compact.uniq
-          send(:"error_#{inline_errors}", [*errors], options) if errors.any?
-        else
-          nil
-        end
-      end
-      alias :errors_on :inline_errors_for
-    
-      # Generates error messages for given method names and for base.
-      # You can pass a hash with html options that will be added to ul tag
-      #
-      # == Examples
-      #
-      #  f.semantic_errors # This will show only errors on base
-      #  f.semantic_errors :state # This will show errors on base and state
-      #  f.semantic_errors :state, :class => "awesome" # errors will be rendered in ul.awesome
-      #
-      def semantic_errors(*args)
-        html_options = args.extract_options!
-        full_errors = args.inject([]) do |array, method|
-          attribute = localized_string(method, method.to_sym, :label) || humanized_attribute_name(method)
-          errors = Array(@object.errors[method.to_sym]).to_sentence
-          errors.present? ? array << [attribute, errors].join(" ") : array ||= []
-        end
-        full_errors << @object.errors[:base]
-        full_errors.flatten!
-        full_errors.compact!
-        return nil if full_errors.blank?
-        html_options[:class] ||= "errors"
-        template.content_tag(:ul, html_options) do
-          Formtastic::Util.html_safe(full_errors.map { |error| template.content_tag(:li, Formtastic::Util.html_safe(error)) }.join)
-        end
-      end
-    
-      protected
-    
-        def error_keys(method, options)
-          @methods_for_error ||= {}
-          @methods_for_error[method] ||= begin
-            methods_for_error = [method.to_sym]
-            methods_for_error << file_metadata_suffixes.map{|suffix| "#{method}_#{suffix}".to_sym} if is_file?(method, options)
-            methods_for_error << [association_primary_key(method)] if association_macro_for_method(method) == :belongs_to
-            methods_for_error.flatten.compact.uniq
-          end
-        end
-    
-        def has_errors?(method, options)
-          methods_for_error = error_keys(method,options)
-          @object && @object.respond_to?(:errors) && methods_for_error.any?{|error| !@object.errors[error].blank?}
-        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.
         #
diff --git a/lib/formtastic/builder/errors_helper.rb b/lib/formtastic/builder/errors_helper.rb
new file mode 100644
index 000000000..68122ad4c
--- /dev/null
+++ b/lib/formtastic/builder/errors_helper.rb
@@ -0,0 +1,101 @@
+module Formtastic
+  module Builder
+    module ErrorsHelper
+      
+      # A thin wrapper around #fields_for to set :builder => Formtastic::SemanticFormBuilder
+      # for nesting forms:
+      #
+      #   # Example:
+      #   <% semantic_form_for @post do |post| %>
+      #     <% post.semantic_fields_for :author do |author| %>
+      #       <% author.inputs :name %>
+      #     <% end %>
+      #   <% end %>
+      #
+      #   # Output:
+      #   <form ...>
+      #     <fieldset class="inputs">
+      #       <ol>
+      #         <li class="string"><input type='text' name='post[author][name]' id='post_author_name' /></li>
+      #       </ol>
+      #     </fieldset>
+      #   </form>
+      #
+      def semantic_fields_for(record_or_name_or_array, *args, &block)
+        opts = args.extract_options!
+        opts[:builder] ||= self.class
+        args.push(opts)
+        fields_for(record_or_name_or_array, *args, &block)
+      end
+    
+      # 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.
+      #
+      # 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 = {}) #:nodoc:
+        if render_inline_errors?
+          errors = error_keys(method, options).map{|x| @object.errors[x] }.flatten.compact.uniq
+          send(:"error_#{inline_errors}", [*errors], options) if errors.any?
+        else
+          nil
+        end
+      end
+      alias :errors_on :inline_errors_for
+    
+      # Generates error messages for given method names and for base.
+      # You can pass a hash with html options that will be added to ul tag
+      #
+      # == Examples
+      #
+      #  f.semantic_errors # This will show only errors on base
+      #  f.semantic_errors :state # This will show errors on base and state
+      #  f.semantic_errors :state, :class => "awesome" # errors will be rendered in ul.awesome
+      #
+      def semantic_errors(*args)
+        html_options = args.extract_options!
+        full_errors = args.inject([]) do |array, method|
+          attribute = localized_string(method, method.to_sym, :label) || humanized_attribute_name(method)
+          errors = Array(@object.errors[method.to_sym]).to_sentence
+          errors.present? ? array << [attribute, errors].join(" ") : array ||= []
+        end
+        full_errors << @object.errors[:base]
+        full_errors.flatten!
+        full_errors.compact!
+        return nil if full_errors.blank?
+        html_options[:class] ||= "errors"
+        template.content_tag(:ul, html_options) do
+          Formtastic::Util.html_safe(full_errors.map { |error| template.content_tag(:li, Formtastic::Util.html_safe(error)) }.join)
+        end
+      end
+    
+      protected
+    
+      def error_keys(method, options)
+        @methods_for_error ||= {}
+        @methods_for_error[method] ||= begin
+          methods_for_error = [method.to_sym]
+          methods_for_error << file_metadata_suffixes.map{|suffix| "#{method}_#{suffix}".to_sym} if is_file?(method, options)
+          methods_for_error << [association_primary_key(method)] if association_macro_for_method(method) == :belongs_to
+          methods_for_error.flatten.compact.uniq
+        end
+      end
+      
+      def has_errors?(method, options)
+        methods_for_error = error_keys(method,options)
+        @object && @object.respond_to?(:errors) && methods_for_error.any?{|error| !@object.errors[error].blank?}
+      end
+      
+      def render_inline_errors?
+        @object && @object.respond_to?(:errors) && Formtastic::Builder::Base::INLINE_ERROR_TYPES.include?(inline_errors)
+      end
+      
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/builder/label_helper.rb b/lib/formtastic/builder/label_helper.rb
new file mode 100644
index 000000000..1f8ed299b
--- /dev/null
+++ b/lib/formtastic/builder/label_helper.rb
@@ -0,0 +1,47 @@
+module Formtastic
+  module Builder
+    module LabelHelper
+      # 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.
+      # * :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_string(method, text, :label) || humanized_attribute_name(method)
+        text += required_or_optional_string(options.delete(:required))
+        text = Formtastic::Util.html_safe(text)
+      
+        # special case for boolean (checkbox) labels, which have a nested input
+        if options.key?(:label_prefix_for_nested_input)
+          text = options.delete(:label_prefix_for_nested_input) + text
+        end
+      
+        input_name = options.delete(:input_name) || method
+        super(input_name, text, options)
+      end
+    end
+  end
+end

From 5db7f11f3b480131a8de325cc8fccffad42568c3 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 17 Jan 2011 06:37:59 +1100
Subject: [PATCH 438/992] mv association_columns to InputsHelper

---
 lib/formtastic/builder/base.rb          | 21 ++++-----------------
 lib/formtastic/builder/inputs_helper.rb | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/lib/formtastic/builder/base.rb b/lib/formtastic/builder/base.rb
index f99c0db26..7e4076898 100644
--- a/lib/formtastic/builder/base.rb
+++ b/lib/formtastic/builder/base.rb
@@ -46,30 +46,17 @@ def self.configure(name, value = nil)
       include Formtastic::Builder::ButtonsHelper
       include Formtastic::Builder::LabelHelper
       include Formtastic::Builder::ErrorsHelper
+      include Formtastic::Builder::Support
     
-    
+      
+      protected
+      
         # Collects content columns (non-relation columns) for the current form object class.
         #
         def content_columns #:nodoc:
           model_name.constantize.content_columns.collect { |c| c.name.to_sym }.compact rescue []
         end
     
-        # Collects association columns (relation columns) for the current form object class.
-        #
-        def association_columns(*by_associations) #:nodoc:
-          if @object.present? && @object.class.respond_to?(:reflections)
-            @object.class.reflections.collect do |name, association_reflection|
-              if by_associations.present?
-                name if by_associations.include?(association_reflection.macro)
-              else
-                name
-              end
-            end.compact
-          else
-            []
-          end
-        end
-    
         # Returns nil, or a symbol like :belongs_to or :has_many
         def association_macro_for_method(method) #:nodoc:
           reflection = reflection_for(method)
diff --git a/lib/formtastic/builder/inputs_helper.rb b/lib/formtastic/builder/inputs_helper.rb
index 5f6ae53c4..c12f37472 100644
--- a/lib/formtastic/builder/inputs_helper.rb
+++ b/lib/formtastic/builder/inputs_helper.rb
@@ -257,6 +257,24 @@ def inputs(*args, &block)
         end
       end
       
+      protected
+      
+      # Collects association columns (relation columns) for the current form object class.
+      #
+      def association_columns(*by_associations) #:nodoc:
+        if @object.present? && @object.class.respond_to?(:reflections)
+          @object.class.reflections.collect do |name, association_reflection|
+            if by_associations.present?
+              name if by_associations.include?(association_reflection.macro)
+            else
+              name
+            end
+          end.compact
+        else
+          []
+        end
+      end
+      
     end
   end
 end
\ No newline at end of file

From f3c46fc04c43b2337a23b53896358a2867c30db9 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 17 Jan 2011 06:39:14 +1100
Subject: [PATCH 439/992] moved association_macro_for_method to ErrorsHelper

---
 lib/formtastic/builder/base.rb          | 6 ------
 lib/formtastic/builder/errors_helper.rb | 5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/formtastic/builder/base.rb b/lib/formtastic/builder/base.rb
index 7e4076898..92fedb98f 100644
--- a/lib/formtastic/builder/base.rb
+++ b/lib/formtastic/builder/base.rb
@@ -57,12 +57,6 @@ def content_columns #:nodoc:
           model_name.constantize.content_columns.collect { |c| c.name.to_sym }.compact rescue []
         end
     
-        # Returns nil, or a symbol like :belongs_to or :has_many
-        def association_macro_for_method(method) #:nodoc:
-          reflection = reflection_for(method)
-          reflection.macro if reflection
-        end
-    
         def association_primary_key(method)
           reflection = reflection_for(method)
           reflection.options[:foreign_key] if reflection && !reflection.options[:foreign_key].blank?
diff --git a/lib/formtastic/builder/errors_helper.rb b/lib/formtastic/builder/errors_helper.rb
index 68122ad4c..7567dd802 100644
--- a/lib/formtastic/builder/errors_helper.rb
+++ b/lib/formtastic/builder/errors_helper.rb
@@ -96,6 +96,11 @@ def render_inline_errors?
         @object && @object.respond_to?(:errors) && Formtastic::Builder::Base::INLINE_ERROR_TYPES.include?(inline_errors)
       end
       
+      def association_macro_for_method(method) #:nodoc:
+        reflection = reflection_for(method)
+        reflection.macro if reflection
+      end
+  
     end
   end
 end
\ No newline at end of file

From d0db7bdfccd2260d54d7457bea863a1a75c78776 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 17 Jan 2011 06:39:55 +1100
Subject: [PATCH 440/992] mv association_primary_key to ErrorsHelper

---
 lib/formtastic/builder/base.rb          | 6 ------
 lib/formtastic/builder/errors_helper.rb | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/formtastic/builder/base.rb b/lib/formtastic/builder/base.rb
index 92fedb98f..120217f37 100644
--- a/lib/formtastic/builder/base.rb
+++ b/lib/formtastic/builder/base.rb
@@ -57,12 +57,6 @@ def content_columns #:nodoc:
           model_name.constantize.content_columns.collect { |c| c.name.to_sym }.compact rescue []
         end
     
-        def association_primary_key(method)
-          reflection = reflection_for(method)
-          reflection.options[:foreign_key] if reflection && !reflection.options[:foreign_key].blank?
-          :"#{method}_id"
-        end
-    
         # Prepare options to be sent to label
         #
         def options_for_label(options) #:nodoc:
diff --git a/lib/formtastic/builder/errors_helper.rb b/lib/formtastic/builder/errors_helper.rb
index 7567dd802..c0abe6120 100644
--- a/lib/formtastic/builder/errors_helper.rb
+++ b/lib/formtastic/builder/errors_helper.rb
@@ -100,6 +100,12 @@ def association_macro_for_method(method) #:nodoc:
         reflection = reflection_for(method)
         reflection.macro if reflection
       end
+      
+      def association_primary_key(method)
+        reflection = reflection_for(method)
+        reflection.options[:foreign_key] if reflection && !reflection.options[:foreign_key].blank?
+        :"#{method}_id"
+      end
   
     end
   end

From d7e341a135c46019447ba25a2e7566c9e422c696 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 17 Jan 2011 06:50:16 +1100
Subject: [PATCH 441/992] moved *Helper into Formastic::Helpers namespace
 instead of Builder

---
 lib/formtastic/builder/base.rb                | 20 +++++++++----------
 .../{builder => helpers}/buttons_helper.rb    |  2 +-
 .../{builder => helpers}/errors_helper.rb     |  2 +-
 .../{builder => helpers}/inputs_helper.rb     |  2 +-
 .../{builder => helpers}/label_helper.rb      |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)
 rename lib/formtastic/{builder => helpers}/buttons_helper.rb (99%)
 rename lib/formtastic/{builder => helpers}/errors_helper.rb (99%)
 rename lib/formtastic/{builder => helpers}/inputs_helper.rb (99%)
 rename lib/formtastic/{builder => helpers}/label_helper.rb (99%)

diff --git a/lib/formtastic/builder/base.rb b/lib/formtastic/builder/base.rb
index 120217f37..a6b98b478 100644
--- a/lib/formtastic/builder/base.rb
+++ b/lib/formtastic/builder/base.rb
@@ -1,7 +1,9 @@
-require File.join(File.dirname(__FILE__), *%w[inputs_helper])
-require File.join(File.dirname(__FILE__), *%w[buttons_helper])
-require File.join(File.dirname(__FILE__), *%w[label_helper])
-require File.join(File.dirname(__FILE__), *%w[errors_helper])
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'helpers')))
+
+require 'inputs_helper'
+require 'buttons_helper'
+require 'label_helper'
+require 'errors_helper'
 
 module Formtastic
   module Builder
@@ -42,12 +44,10 @@ def self.configure(name, value = nil)
     
       attr_accessor :template
       
-      include Formtastic::Builder::InputsHelper
-      include Formtastic::Builder::ButtonsHelper
-      include Formtastic::Builder::LabelHelper
-      include Formtastic::Builder::ErrorsHelper
-      include Formtastic::Builder::Support
-    
+      include Formtastic::Helpers::InputsHelper
+      include Formtastic::Helpers::ButtonsHelper
+      include Formtastic::Helpers::LabelHelper
+      include Formtastic::Helpers::ErrorsHelper
       
       protected
       
diff --git a/lib/formtastic/builder/buttons_helper.rb b/lib/formtastic/helpers/buttons_helper.rb
similarity index 99%
rename from lib/formtastic/builder/buttons_helper.rb
rename to lib/formtastic/helpers/buttons_helper.rb
index 6baaf96fb..08984ef56 100644
--- a/lib/formtastic/builder/buttons_helper.rb
+++ b/lib/formtastic/helpers/buttons_helper.rb
@@ -1,5 +1,5 @@
 module Formtastic
-  module Builder
+  module Helpers
     module ButtonsHelper
       # Creates a fieldset and ol tag wrapping for form buttons / actions as list items.
       # See inputs documentation for a full example.  The fieldset's default class attriute
diff --git a/lib/formtastic/builder/errors_helper.rb b/lib/formtastic/helpers/errors_helper.rb
similarity index 99%
rename from lib/formtastic/builder/errors_helper.rb
rename to lib/formtastic/helpers/errors_helper.rb
index c0abe6120..1a6f5bdba 100644
--- a/lib/formtastic/builder/errors_helper.rb
+++ b/lib/formtastic/helpers/errors_helper.rb
@@ -1,5 +1,5 @@
 module Formtastic
-  module Builder
+  module Helpers
     module ErrorsHelper
       
       # A thin wrapper around #fields_for to set :builder => Formtastic::SemanticFormBuilder
diff --git a/lib/formtastic/builder/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
similarity index 99%
rename from lib/formtastic/builder/inputs_helper.rb
rename to lib/formtastic/helpers/inputs_helper.rb
index c12f37472..381fcd812 100644
--- a/lib/formtastic/builder/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -1,5 +1,5 @@
 module Formtastic
-  module Builder
+  module Helpers
     module InputsHelper
 
       # Returns a suitable form input for the given +method+, using the database column information
diff --git a/lib/formtastic/builder/label_helper.rb b/lib/formtastic/helpers/label_helper.rb
similarity index 99%
rename from lib/formtastic/builder/label_helper.rb
rename to lib/formtastic/helpers/label_helper.rb
index 1f8ed299b..fc9fc32cc 100644
--- a/lib/formtastic/builder/label_helper.rb
+++ b/lib/formtastic/helpers/label_helper.rb
@@ -1,5 +1,5 @@
 module Formtastic
-  module Builder
+  module Helpers
     module LabelHelper
       # 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

From 9bb7d629e6e3588db8d59918506d7c63a3df0ecd Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 17 Jan 2011 07:57:47 +1100
Subject: [PATCH 442/992] first pass at shifting each input out into a separate
 module

---
 lib/formtastic/builder/base.rb             | 672 ++-------------------
 lib/formtastic/inputs/boolean_input.rb     |  30 +
 lib/formtastic/inputs/check_boxes_input.rb | 153 +++++
 lib/formtastic/inputs/country_input.rb     |  34 ++
 lib/formtastic/inputs/date_input.rb        |  21 +
 lib/formtastic/inputs/datetime_input.rb    |  21 +
 lib/formtastic/inputs/email_input.rb       |  14 +
 lib/formtastic/inputs/file_input.rb        |  14 +
 lib/formtastic/inputs/hidden_input.rb      |  17 +
 lib/formtastic/inputs/numeric_input.rb     |  14 +
 lib/formtastic/inputs/password_input.rb    |  14 +
 lib/formtastic/inputs/phone_input.rb       |  14 +
 lib/formtastic/inputs/radio_input.rb       |  91 +++
 lib/formtastic/inputs/search_input.rb      |  14 +
 lib/formtastic/inputs/select_input.rb      | 141 +++++
 lib/formtastic/inputs/string_input.rb      |  13 +
 lib/formtastic/inputs/support/basic.rb     |  18 +
 lib/formtastic/inputs/support/timeish.rb   |  93 +++
 lib/formtastic/inputs/text_input.rb        |  14 +
 lib/formtastic/inputs/time_input.rb        |  21 +
 lib/formtastic/inputs/time_zone_input.rb   |  22 +
 lib/formtastic/inputs/url_input.rb         |  12 +
 22 files changed, 826 insertions(+), 631 deletions(-)
 create mode 100644 lib/formtastic/inputs/boolean_input.rb
 create mode 100644 lib/formtastic/inputs/check_boxes_input.rb
 create mode 100644 lib/formtastic/inputs/country_input.rb
 create mode 100644 lib/formtastic/inputs/date_input.rb
 create mode 100644 lib/formtastic/inputs/datetime_input.rb
 create mode 100644 lib/formtastic/inputs/email_input.rb
 create mode 100644 lib/formtastic/inputs/file_input.rb
 create mode 100644 lib/formtastic/inputs/hidden_input.rb
 create mode 100644 lib/formtastic/inputs/numeric_input.rb
 create mode 100644 lib/formtastic/inputs/password_input.rb
 create mode 100644 lib/formtastic/inputs/phone_input.rb
 create mode 100644 lib/formtastic/inputs/radio_input.rb
 create mode 100644 lib/formtastic/inputs/search_input.rb
 create mode 100644 lib/formtastic/inputs/select_input.rb
 create mode 100644 lib/formtastic/inputs/string_input.rb
 create mode 100644 lib/formtastic/inputs/support/basic.rb
 create mode 100644 lib/formtastic/inputs/support/timeish.rb
 create mode 100644 lib/formtastic/inputs/text_input.rb
 create mode 100644 lib/formtastic/inputs/time_input.rb
 create mode 100644 lib/formtastic/inputs/time_zone_input.rb
 create mode 100644 lib/formtastic/inputs/url_input.rb

diff --git a/lib/formtastic/builder/base.rb b/lib/formtastic/builder/base.rb
index a6b98b478..4b7ec9893 100644
--- a/lib/formtastic/builder/base.rb
+++ b/lib/formtastic/builder/base.rb
@@ -1,10 +1,31 @@
 $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'helpers')))
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'inputs')))
 
 require 'inputs_helper'
 require 'buttons_helper'
 require 'label_helper'
 require 'errors_helper'
 
+require 'boolean_input'
+require 'check_boxes_input'
+require 'country_input'
+require 'datetime_input'
+require 'date_input'
+require 'email_input'
+require 'file_input'
+require 'hidden_input'
+require 'numeric_input'
+require 'password_input'
+require 'phone_input'
+require 'radio_input'
+require 'search_input'
+require 'select_input'
+require 'string_input'
+require 'text_input'
+require 'time_input'
+require 'time_zone_input'
+require 'url_input'
+
 module Formtastic
   module Builder
     class Base < ActionView::Helpers::FormBuilder
@@ -48,6 +69,26 @@ def self.configure(name, value = nil)
       include Formtastic::Helpers::ButtonsHelper
       include Formtastic::Helpers::LabelHelper
       include Formtastic::Helpers::ErrorsHelper
+
+      include Formtastic::Inputs::BooleanInput
+      include Formtastic::Inputs::CheckBoxesInput
+      include Formtastic::Inputs::CountryInput
+      include Formtastic::Inputs::DateInput
+      include Formtastic::Inputs::DatetimeInput
+      include Formtastic::Inputs::EmailInput
+      include Formtastic::Inputs::FileInput
+      include Formtastic::Inputs::HiddenInput
+      include Formtastic::Inputs::NumericInput
+      include Formtastic::Inputs::PasswordInput
+      include Formtastic::Inputs::PhoneInput
+      include Formtastic::Inputs::RadioInput
+      include Formtastic::Inputs::SearchInput
+      include Formtastic::Inputs::SelectInput
+      include Formtastic::Inputs::StringInput
+      include Formtastic::Inputs::TextInput
+      include Formtastic::Inputs::TimeInput
+      include Formtastic::Inputs::TimeZoneInput
+      include Formtastic::Inputs::UrlInput
       
       protected
       
@@ -148,637 +189,6 @@ def options_require_validation?(options) #nodoc
           if_condition ? !!condition : !condition
         end
     
-        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, :text, :phone, :search, :url, :email].include?(type)
-          field_id = generate_html_id(method, "")
-          html_options[:id] ||= field_id
-          label_options = options_for_label(options)
-          label_options[:for] ||= html_options[:id]
-          label(method, label_options) <<
-            send(respond_to?(form_helper_method) ? form_helper_method : :text_field, 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 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
-    
-        # 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
-    
-        # Outputs a label and a standard Rails email field inside the wrapper.
-        def email_input(method, options)
-          basic_input_helper(:email_field, :email, method, options)
-        end
-    
-        # Outputs a label and a standard Rails phone field inside the wrapper.
-        def phone_input(method, options)
-          basic_input_helper(:phone_field, :phone, method, options)
-        end
-    
-        # Outputs a label and a standard Rails url field inside the wrapper.
-        def url_input(method, options)
-          basic_input_helper(:url_field, :url, method, options)
-        end
-    
-        # Outputs a label and a standard Rails search field inside the wrapper.
-        def search_input(method, options)
-          basic_input_helper(:search_field, :search, method, options)
-        end
-    
-        # Outputs a hidden field inside the wrapper, which should be hidden with CSS.
-        # Additionals options can be given using :input_hml. Should :input_html not be
-        # specified every option except for formtastic options will be sent straight
-        # to hidden input element.
-        #
-        def hidden_input(method, options)
-          options ||= {}
-          html_options = options.delete(:input_html) || strip_formtastic_options(options)
-          html_options[:id] ||= generate_html_id(method, "")
-          hidden_field(method, html_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. A collection can be given
-        # as an Array, a Hash or as a String (containing pre-rendered HTML options). If not provided, the choices are
-        # found by inferring the parent's class name from the method name and simply calling all on it
-        # (VehicleOwner.all in the example above).
-        #
-        # Examples:
-        #
-        #   f.input :author, :collection => @authors
-        #   f.input :author, :collection => Author.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"]
-        #   f.input :author, :collection => grouped_options_for_select(["North America",[["United States","US"],["Canada","CA"]]])
-        #
-        # 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 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) || {}
-          html_options[:multiple] = html_options[:multiple] || options.delete(:multiple)
-          html_options.delete(:multiple) if html_options[:multiple].nil?
-    
-          reflection = reflection_for(method)
-          if reflection && [ :has_many, :has_and_belongs_to_many ].include?(reflection.macro)
-            html_options[:multiple] = true if html_options[:multiple].nil?
-            html_options[:size]     ||= 5
-            options[:include_blank] ||= false
-          end
-          options = set_include_blank(options)
-          input_name = generate_association_input_name(method)
-          html_options[:id] ||= generate_html_id(input_name, "")
-    
-          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, options)
-            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
-            grouped_collection_select(input_name, group_collection,
-                                           group_association, group_label_method,
-                                           value, label,
-                                           strip_formtastic_options(options), html_options)
-          else
-            collection = find_collection_for_column(method, options)
-    
-            select(input_name, collection, strip_formtastic_options(options), html_options)
-          end
-    
-          label_options = options_for_label(options).merge(:input_name => input_name)
-          label_options[:for] ||= html_options[:id]
-          label(method, label_options) << select_html
-        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) || {}
-          field_id = generate_html_id(method, "")
-          html_options[:id] ||= field_id
-          label_options = options_for_label(options)
-          label_options[:for] ||= html_options[:id]
-          label(method, label_options) <<
-          time_zone_select(method, options.delete(:priority_zones),
-            strip_formtastic_options(options), 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.all in the example above).
-        #
-        # Examples:
-        #
-        #   f.input :author, :as => :radio, :collection => @authors
-        #   f.input :author, :as => :radio, :collection => Author.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}" }
-        #
-        # 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 = []
-    
-          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[:id] = input_id
-    
-            li_content = template.content_tag(:label,
-              Formtastic::Util.html_safe("#{radio_button(input_name, value, html_options)} #{escape_html_entities(label)}"),
-              :for => input_id
-            )
-    
-            li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
-            template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
-          end
-    
-          template.content_tag(:fieldset,
-            legend_tag(method, options) << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
-          )
-        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).  Each li contains a label
-        # (eg "Year") and a select box. Overwriting the label is possible by adding the :labels option.
-        # :labels should be a hash with the field (e.g. day) as key and the label text as value.
-        # See date_or_datetime_input for a more detailed output example.
-        #
-        # Some of Rails' options for select_date are supported, but not everything yet, see
-        # documentation of date_or_datetime_input() for more information.
-        def date_input(method, options)
-          options = set_include_blank(options)
-          date_or_datetime_input(method, options.merge(:discard_hour => true))
-        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. Overwriting the label is possible by adding
-        # the :labels option. :labels should be a hash with the field (e.g. day) as key and the label
-        # text as value.  See date_or_datetime_input for a more detailed output example.
-        #
-        # Some of Rails' options for select_date are supported, but not everything yet, see
-        # documentation of date_or_datetime_input() for more information.
-        def datetime_input(method, options)
-          options = set_include_blank(options)
-          date_or_datetime_input(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. Overwriting the label is possible by adding the :labels option.
-        # :labels should be a hash with the field (e.g. day) as key and the label text as value.
-        # See date_or_datetime_input for a more detailed output example.
-        #
-        # Some of Rails' options for select_time are supported, but not everything yet, see
-        # documentation of date_or_datetime_input() for more information.
-        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
-    
-        # Helper method used by :as => (:date|:datetime|:time).  Generates a fieldset containing a
-        # legend (for what would normally be considered the label), and an ordered list of list items
-        # for year, month, day, hour, etc, each containing a label and a select.  Example:
-        #
-        # <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().
-        #
-        # Options:
-        #
-        #   * @:order => [:month, :day, :year]@
-        #   * @:include_seconds@ => true@
-        #   * @:discard_(year|month|day|hour|minute) => true@
-        #   * @:include_blank => true@
-        #   * @:labels => {}@
-        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]
-          inputs   = [] if options[:ignore_date]
-          labels   = options.delete(:labels) || {}
-    
-          time_inputs = [:hour, :minute]
-          time_inputs << :second if options[:include_seconds]
-    
-          list_items_capture = ""
-          hidden_fields_capture = ""
-    
-          datetime = @object.send(method) if @object && @object.send(method)
-    
-          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) : 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 = labels[input] || ::I18n.t(input.to_s, :default => input.to_s.humanize, :scope => [:datetime, :prompts])
-    
-              list_items_capture << template.content_tag(:li, Formtastic::Util.html_safe([
-                  !item_label_text.blank? ? template.content_tag(:label, Formtastic::Util.html_safe(item_label_text), :for => input_id) : "",
-                  template.send(:"select_#{input}", datetime, opts, html_options.merge(:id => input_id))
-                ].join(""))
-              )
-            end
-          end
-    
-          hidden_fields_capture << field_set_and_list_wrapping_for_method(method, options.merge(:label_for => input_ids.first), list_items_capture)
-        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 all on
-        # it (Author.all in the example above).
-        #
-        # Examples:
-        #
-        #   f.input :author, :as => :check_boxes, :collection => @authors
-        #   f.input :author, :as => :check_boxes, :collection => Author.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}" }
-        #
-        # Formtastic works around a bug in rails handling of check box collections by
-        # not generating the hidden fields for state checking of the checkboxes
-        # The :hidden_fields option provides a way to re-enable these hidden inputs by
-        # setting it to true.
-        #
-        #   f.input :authors, :as => :check_boxes, :hidden_fields => false
-        #   f.input :authors, :as => :check_boxes, :hidden_fields => true
-        #
-        # 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)
-          hidden_fields   = options.delete(:hidden_fields)
-          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_values = find_selected_values_for_column(method, options)
-          disabled_option_is_present = options.key?(:disabled)
-          disabled_values = [*options[:disabled]] if disabled_option_is_present
-    
-          li_options = value_as_class ? { :class => [method.to_s.singularize, 'default'].join('_') } : {}
-    
-          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)
-            html_options[:disabled] = disabled_values.include?(value) if disabled_option_is_present
-            html_options[:id] = input_id
-    
-            li_content = template.content_tag(:label,
-              Formtastic::Util.html_safe("#{create_check_boxes(input_name, html_options, value, unchecked_value, hidden_fields)} #{escape_html_entities(label)}"),
-              :for => input_id
-            )
-    
-            li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
-            template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
-          end
-    
-          fieldset_content = legend_tag(method, options)
-          fieldset_content << create_hidden_field_for_check_boxes(input_name, value_as_class) unless hidden_fields
-          fieldset_content << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
-          template.content_tag(:fieldset, fieldset_content)
-        end
-    
-        # Used by check_boxes input. The selected values will be set by retrieving the value
-        # through the association.
-        #
-        # If the collection is not a hash or an array of strings, fixnums or symbols,
-        # we use value_method to retrieve an array with the values
-        def find_selected_values_for_column(method, options)
-          if object.respond_to?(method)
-            collection = [object.send(method)].compact.flatten
-            label, value = detect_label_and_value_method!(collection, options)
-            [*collection.map { |o| send_or_call(value, o) }].compact
-          else
-            []
-          end
-        end
-    
-        # Outputs a custom hidden field for check_boxes
-        def create_hidden_field_for_check_boxes(method, value_as_class) #:nodoc:
-          options = value_as_class ? { :class => [method.to_s.singularize, 'default'].join('_') } : {}
-          input_name = "#{object_name}[#{method.to_s}][]"
-          template.hidden_field_tag(input_name, '', options)
-        end
-    
-        # Outputs a checkbox tag. If called with no_hidden_input = true a plain check_box_tag is returned,
-        # otherwise the helper uses the output generated by the rails check_box method.
-        def create_check_boxes(input_name, html_options = {}, checked_value = "1", unchecked_value = "0", hidden_fields = false) #:nodoc:
-          return template.check_box_tag(input_name, checked_value, html_options[:checked], html_options) unless hidden_fields == true
-          check_box(input_name, html_options, checked_value, unchecked_value)
-        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 respond_to?(:country_select)
-    
-          html_options = options.delete(:input_html) || {}
-          priority_countries = options.delete(:priority_countries) || self.priority_countries
-    
-          field_id = generate_html_id(method, "")
-          html_options[:id] ||= field_id
-          label_options = options_for_label(options)
-          label_options[:for] ||= html_options[:id]
-    
-          label(method, label_options) <<
-          country_select(method, priority_countries, strip_formtastic_options(options), html_options)
-        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) || {}
-          checked_value = options.delete(:checked_value) || '1'
-          unchecked_value = options.delete(:unchecked_value) || '0'
-    
-          html_options[:id] = html_options[:id] || generate_html_id(method, "")
-          input = template.check_box_tag(
-            "#{@object_name}[#{method}]",
-            checked_value,
-            (@object && @object.send(:"#{method}")),
-            html_options
-          )
-          
-          options = options_for_label(options)
-          options[:for] ||= html_options[:id]
-    
-          # the label() method will insert this nested input into the label at the last minute
-          options[:label_prefix_for_nested_input] = input
-    
-          template.hidden_field_tag("#{@object_name}[#{method}]", unchecked_value, :id => nil) << label(method, options)
-        end
-    
         # 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)
diff --git a/lib/formtastic/inputs/boolean_input.rb b/lib/formtastic/inputs/boolean_input.rb
new file mode 100644
index 000000000..1097a8c49
--- /dev/null
+++ b/lib/formtastic/inputs/boolean_input.rb
@@ -0,0 +1,30 @@
+module Formtastic
+  module Inputs
+    module BooleanInput
+      # 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) || {}
+        checked_value = options.delete(:checked_value) || '1'
+        unchecked_value = options.delete(:unchecked_value) || '0'
+  
+        html_options[:id] = html_options[:id] || generate_html_id(method, "")
+        input = template.check_box_tag(
+          "#{@object_name}[#{method}]",
+          checked_value,
+          (@object && @object.send(:"#{method}")),
+          html_options
+        )
+        
+        options = options_for_label(options)
+        options[:for] ||= html_options[:id]
+  
+        # the label() method will insert this nested input into the label at the last minute
+        options[:label_prefix_for_nested_input] = input
+  
+        template.hidden_field_tag("#{@object_name}[#{method}]", unchecked_value, :id => nil) << label(method, options)
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
new file mode 100644
index 000000000..d749f055d
--- /dev/null
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -0,0 +1,153 @@
+module Formtastic
+  module Inputs
+    module CheckBoxesInput
+      
+      # 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 all on
+      # it (Author.all in the example above).
+      #
+      # Examples:
+      #
+      #   f.input :author, :as => :check_boxes, :collection => @authors
+      #   f.input :author, :as => :check_boxes, :collection => Author.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}" }
+      #
+      # Formtastic works around a bug in rails handling of check box collections by
+      # not generating the hidden fields for state checking of the checkboxes
+      # The :hidden_fields option provides a way to re-enable these hidden inputs by
+      # setting it to true.
+      #
+      #   f.input :authors, :as => :check_boxes, :hidden_fields => false
+      #   f.input :authors, :as => :check_boxes, :hidden_fields => true
+      #
+      # 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)
+        hidden_fields   = options.delete(:hidden_fields)
+        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_values = find_selected_values_for_column(method, options)
+        disabled_option_is_present = options.key?(:disabled)
+        disabled_values = [*options[:disabled]] if disabled_option_is_present
+  
+        li_options = value_as_class ? { :class => [method.to_s.singularize, 'default'].join('_') } : {}
+  
+        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)
+          html_options[:disabled] = disabled_values.include?(value) if disabled_option_is_present
+          html_options[:id] = input_id
+  
+          li_content = template.content_tag(:label,
+            Formtastic::Util.html_safe("#{create_check_boxes(input_name, html_options, value, unchecked_value, hidden_fields)} #{escape_html_entities(label)}"),
+            :for => input_id
+          )
+  
+          li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
+          template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
+        end
+  
+        fieldset_content = legend_tag(method, options)
+        fieldset_content << create_hidden_field_for_check_boxes(input_name, value_as_class) unless hidden_fields
+        fieldset_content << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
+        template.content_tag(:fieldset, fieldset_content)
+      end
+      
+      protected
+      
+      # Used by check_boxes input. The selected values will be set by retrieving the value
+      # through the association.
+      #
+      # If the collection is not a hash or an array of strings, fixnums or symbols,
+      # we use value_method to retrieve an array with the values
+      def find_selected_values_for_column(method, options)
+        if object.respond_to?(method)
+          collection = [object.send(method)].compact.flatten
+          label, value = detect_label_and_value_method!(collection, options)
+          [*collection.map { |o| send_or_call(value, o) }].compact
+        else
+          []
+        end
+      end
+      
+      # Outputs a custom hidden field for check_boxes
+      def create_hidden_field_for_check_boxes(method, value_as_class) #:nodoc:
+        options = value_as_class ? { :class => [method.to_s.singularize, 'default'].join('_') } : {}
+        input_name = "#{object_name}[#{method.to_s}][]"
+        template.hidden_field_tag(input_name, '', options)
+      end
+  
+      # Outputs a checkbox tag. If called with no_hidden_input = true a plain check_box_tag is returned,
+      # otherwise the helper uses the output generated by the rails check_box method.
+      def create_check_boxes(input_name, html_options = {}, checked_value = "1", unchecked_value = "0", hidden_fields = false) #:nodoc:
+        return template.check_box_tag(input_name, checked_value, html_options[:checked], html_options) unless hidden_fields == true
+        check_box(input_name, html_options, checked_value, unchecked_value)
+      end
+
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/country_input.rb b/lib/formtastic/inputs/country_input.rb
new file mode 100644
index 000000000..c9acedd29
--- /dev/null
+++ b/lib/formtastic/inputs/country_input.rb
@@ -0,0 +1,34 @@
+module Formtastic
+  module Inputs
+    module CountryInput
+      # 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 respond_to?(:country_select)
+  
+        html_options = options.delete(:input_html) || {}
+        priority_countries = options.delete(:priority_countries) || self.priority_countries
+  
+        field_id = generate_html_id(method, "")
+        html_options[:id] ||= field_id
+        label_options = options_for_label(options)
+        label_options[:for] ||= html_options[:id]
+  
+        label(method, label_options) <<
+        country_select(method, priority_countries, strip_formtastic_options(options), html_options)
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/date_input.rb b/lib/formtastic/inputs/date_input.rb
new file mode 100644
index 000000000..9f8fac368
--- /dev/null
+++ b/lib/formtastic/inputs/date_input.rb
@@ -0,0 +1,21 @@
+require 'support/timeish'
+
+module Formtastic
+  module Inputs
+    module DateInput
+      include Support::Timeish
+      # 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. Overwriting the label is possible by adding the :labels option.
+      # :labels should be a hash with the field (e.g. day) as key and the label text as value.
+      # See date_or_datetime_input for a more detailed output example.
+      #
+      # Some of Rails' options for select_date are supported, but not everything yet, see
+      # documentation of date_or_datetime_input() for more information.
+      def date_input(method, options)
+        options = set_include_blank(options)
+        date_or_datetime_input(method, options.merge(:discard_hour => true))
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/datetime_input.rb b/lib/formtastic/inputs/datetime_input.rb
new file mode 100644
index 000000000..9a136a1e3
--- /dev/null
+++ b/lib/formtastic/inputs/datetime_input.rb
@@ -0,0 +1,21 @@
+require 'support/timeish'
+
+module Formtastic
+  module Inputs
+    module DatetimeInput
+      include Support::Timeish
+      # 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. Overwriting the label is possible by adding
+      # the :labels option. :labels should be a hash with the field (e.g. day) as key and the label
+      # text as value.  See date_or_datetime_input for a more detailed output example.
+      #
+      # Some of Rails' options for select_date are supported, but not everything yet, see
+      # documentation of date_or_datetime_input() for more information.
+      def datetime_input(method, options)
+        options = set_include_blank(options)
+        date_or_datetime_input(method, options)
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/email_input.rb b/lib/formtastic/inputs/email_input.rb
new file mode 100644
index 000000000..9543d6937
--- /dev/null
+++ b/lib/formtastic/inputs/email_input.rb
@@ -0,0 +1,14 @@
+require 'support/basic'
+
+module Formtastic
+  module Inputs
+    module EmailInput
+      include Support::Basic
+      
+      # Outputs a label and a standard Rails email field inside the wrapper.
+      def email_input(method, options)
+        basic_input_helper(:email_field, :email, method, options)
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/file_input.rb b/lib/formtastic/inputs/file_input.rb
new file mode 100644
index 000000000..6c43c0d33
--- /dev/null
+++ b/lib/formtastic/inputs/file_input.rb
@@ -0,0 +1,14 @@
+require 'support/basic'
+
+module Formtastic
+  module Inputs
+    module FileInput
+      include Support::Basic
+      
+      # 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
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/hidden_input.rb b/lib/formtastic/inputs/hidden_input.rb
new file mode 100644
index 000000000..1f28a18fd
--- /dev/null
+++ b/lib/formtastic/inputs/hidden_input.rb
@@ -0,0 +1,17 @@
+module Formtastic
+  module Inputs
+    module HiddenInput
+      # Outputs a hidden field inside the wrapper, which should be hidden with CSS.
+      # Additionals options can be given using :input_hml. Should :input_html not be
+      # specified every option except for formtastic options will be sent straight
+      # to hidden input element.
+      #
+      def hidden_input(method, options)
+        options ||= {}
+        html_options = options.delete(:input_html) || strip_formtastic_options(options)
+        html_options[:id] ||= generate_html_id(method, "")
+        hidden_field(method, html_options)
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/numeric_input.rb b/lib/formtastic/inputs/numeric_input.rb
new file mode 100644
index 000000000..cbab574ca
--- /dev/null
+++ b/lib/formtastic/inputs/numeric_input.rb
@@ -0,0 +1,14 @@
+require 'support/basic'
+
+module Formtastic
+  module Inputs
+    module NumericInput
+      include Support::Basic
+      
+      # 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
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/password_input.rb b/lib/formtastic/inputs/password_input.rb
new file mode 100644
index 000000000..8152d7d99
--- /dev/null
+++ b/lib/formtastic/inputs/password_input.rb
@@ -0,0 +1,14 @@
+require 'support/basic'
+
+module Formtastic
+  module Inputs
+    module PasswordInput
+      include Support::Basic
+      
+      # 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
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/phone_input.rb b/lib/formtastic/inputs/phone_input.rb
new file mode 100644
index 000000000..00021827f
--- /dev/null
+++ b/lib/formtastic/inputs/phone_input.rb
@@ -0,0 +1,14 @@
+require 'support/basic'
+
+module Formtastic
+  module Inputs
+    module PhoneInput
+      include Support::Basic
+
+      # Outputs a label and a standard Rails phone field inside the wrapper.
+      def phone_input(method, options)
+        basic_input_helper(:phone_field, :phone, method, options)
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/radio_input.rb b/lib/formtastic/inputs/radio_input.rb
new file mode 100644
index 000000000..58ff236a4
--- /dev/null
+++ b/lib/formtastic/inputs/radio_input.rb
@@ -0,0 +1,91 @@
+module Formtastic
+  module Inputs
+    module RadioInput
+      # 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.all in the example above).
+      #
+      # Examples:
+      #
+      #   f.input :author, :as => :radio, :collection => @authors
+      #   f.input :author, :as => :radio, :collection => Author.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}" }
+      #
+      # 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 = []
+  
+        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[:id] = input_id
+  
+          li_content = template.content_tag(:label,
+            Formtastic::Util.html_safe("#{radio_button(input_name, value, html_options)} #{escape_html_entities(label)}"),
+            :for => input_id
+          )
+  
+          li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
+          template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
+        end
+  
+        template.content_tag(:fieldset,
+          legend_tag(method, options) << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
+        )
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/search_input.rb b/lib/formtastic/inputs/search_input.rb
new file mode 100644
index 000000000..3ca2d4a35
--- /dev/null
+++ b/lib/formtastic/inputs/search_input.rb
@@ -0,0 +1,14 @@
+require 'support/basic'
+
+module Formtastic
+  module Inputs
+    module SearchInput
+      include Support::Basic
+      
+      # Outputs a label and a standard Rails search field inside the wrapper.
+      def search_input(method, options)
+        basic_input_helper(:search_field, :search, method, options)
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
new file mode 100644
index 000000000..d507b87d7
--- /dev/null
+++ b/lib/formtastic/inputs/select_input.rb
@@ -0,0 +1,141 @@
+module Formtastic
+  module Inputs
+    module SelectInput
+      # 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. A collection can be given
+      # as an Array, a Hash or as a String (containing pre-rendered HTML options). If not provided, the choices are
+      # found by inferring the parent's class name from the method name and simply calling all on it
+      # (VehicleOwner.all in the example above).
+      #
+      # Examples:
+      #
+      #   f.input :author, :collection => @authors
+      #   f.input :author, :collection => Author.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"]
+      #   f.input :author, :collection => grouped_options_for_select(["North America",[["United States","US"],["Canada","CA"]]])
+      #
+      # 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 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) || {}
+        html_options[:multiple] = html_options[:multiple] || options.delete(:multiple)
+        html_options.delete(:multiple) if html_options[:multiple].nil?
+  
+        reflection = reflection_for(method)
+        if reflection && [ :has_many, :has_and_belongs_to_many ].include?(reflection.macro)
+          html_options[:multiple] = true if html_options[:multiple].nil?
+          html_options[:size]     ||= 5
+          options[:include_blank] ||= false
+        end
+        options = set_include_blank(options)
+        input_name = generate_association_input_name(method)
+        html_options[:id] ||= generate_html_id(input_name, "")
+  
+        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, options)
+          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
+          grouped_collection_select(input_name, group_collection,
+                                         group_association, group_label_method,
+                                         value, label,
+                                         strip_formtastic_options(options), html_options)
+        else
+          collection = find_collection_for_column(method, options)
+  
+          select(input_name, collection, strip_formtastic_options(options), html_options)
+        end
+  
+        label_options = options_for_label(options).merge(:input_name => input_name)
+        label_options[:for] ||= html_options[:id]
+        label(method, label_options) << select_html
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/string_input.rb b/lib/formtastic/inputs/string_input.rb
new file mode 100644
index 000000000..62d45b7d7
--- /dev/null
+++ b/lib/formtastic/inputs/string_input.rb
@@ -0,0 +1,13 @@
+require 'support/basic'
+
+module Formtastic
+  module Inputs
+    module StringInput
+      include Support::Basic
+      # 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
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/support/basic.rb b/lib/formtastic/inputs/support/basic.rb
new file mode 100644
index 000000000..449a6316c
--- /dev/null
+++ b/lib/formtastic/inputs/support/basic.rb
@@ -0,0 +1,18 @@
+module Formtastic
+  module Inputs
+    module Support
+      module Basic
+        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, :text, :phone, :search, :url, :email].include?(type)
+          field_id = generate_html_id(method, "")
+          html_options[:id] ||= field_id
+          label_options = options_for_label(options)
+          label_options[:for] ||= html_options[:id]
+          label(method, label_options) <<
+            send(respond_to?(form_helper_method) ? form_helper_method : :text_field, method, html_options)
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/support/timeish.rb b/lib/formtastic/inputs/support/timeish.rb
new file mode 100644
index 000000000..d91500444
--- /dev/null
+++ b/lib/formtastic/inputs/support/timeish.rb
@@ -0,0 +1,93 @@
+module Formtastic
+  module Inputs
+    module Support
+      module Timeish
+        # Helper method used by :as => (:date|:datetime|:time).  Generates a fieldset containing a
+        # legend (for what would normally be considered the label), and an ordered list of list items
+        # for year, month, day, hour, etc, each containing a label and a select.  Example:
+        #
+        # <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().
+        #
+        # Options:
+        #
+        #   * @:order => [:month, :day, :year]@
+        #   * @:include_seconds@ => true@
+        #   * @:discard_(year|month|day|hour|minute) => true@
+        #   * @:include_blank => true@
+        #   * @:labels => {}@
+        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]
+          inputs   = [] if options[:ignore_date]
+          labels   = options.delete(:labels) || {}
+        
+          time_inputs = [:hour, :minute]
+          time_inputs << :second if options[:include_seconds]
+        
+          list_items_capture = ""
+          hidden_fields_capture = ""
+        
+          datetime = @object.send(method) if @object && @object.send(method)
+        
+          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) : 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 = labels[input] || ::I18n.t(input.to_s, :default => input.to_s.humanize, :scope => [:datetime, :prompts])
+        
+              list_items_capture << template.content_tag(:li, Formtastic::Util.html_safe([
+                  !item_label_text.blank? ? template.content_tag(:label, Formtastic::Util.html_safe(item_label_text), :for => input_id) : "",
+                  template.send(:"select_#{input}", datetime, opts, html_options.merge(:id => input_id))
+                ].join(""))
+              )
+            end
+          end
+        
+          hidden_fields_capture << field_set_and_list_wrapping_for_method(method, options.merge(:label_for => input_ids.first), list_items_capture)
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/text_input.rb b/lib/formtastic/inputs/text_input.rb
new file mode 100644
index 000000000..f9dc3143c
--- /dev/null
+++ b/lib/formtastic/inputs/text_input.rb
@@ -0,0 +1,14 @@
+require 'support/basic'
+
+module Formtastic
+  module Inputs
+    module TextInput
+      include Support::Basic
+      
+      # 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
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/time_input.rb b/lib/formtastic/inputs/time_input.rb
new file mode 100644
index 000000000..28b1c8605
--- /dev/null
+++ b/lib/formtastic/inputs/time_input.rb
@@ -0,0 +1,21 @@
+require 'support/timeish'
+
+module Formtastic
+  module Inputs
+    module TimeInput
+      include Support::Timeish
+      # 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. Overwriting the label is possible by adding the :labels option.
+      # :labels should be a hash with the field (e.g. day) as key and the label text as value.
+      # See date_or_datetime_input for a more detailed output example.
+      #
+      # Some of Rails' options for select_time are supported, but not everything yet, see
+      # documentation of date_or_datetime_input() for more information.
+      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
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/time_zone_input.rb b/lib/formtastic/inputs/time_zone_input.rb
new file mode 100644
index 000000000..7917e355b
--- /dev/null
+++ b/lib/formtastic/inputs/time_zone_input.rb
@@ -0,0 +1,22 @@
+module Formtastic
+  module Inputs
+    module TimeZoneInput
+      # 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) || {}
+        field_id = generate_html_id(method, "")
+        html_options[:id] ||= field_id
+        label_options = options_for_label(options)
+        label_options[:for] ||= html_options[:id]
+        label(method, label_options) <<
+        time_zone_select(method, options.delete(:priority_zones),
+          strip_formtastic_options(options), html_options)
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/url_input.rb b/lib/formtastic/inputs/url_input.rb
new file mode 100644
index 000000000..2bb639e8c
--- /dev/null
+++ b/lib/formtastic/inputs/url_input.rb
@@ -0,0 +1,12 @@
+module Formtastic
+  module Inputs
+    module UrlInput
+      include Support::Basic
+      
+      # Outputs a label and a standard Rails url field inside the wrapper.
+      def url_input(method, options)
+        basic_input_helper(:url_field, :url, method, options)
+      end
+    end
+  end
+end
\ No newline at end of file

From 58255e789fff608c22c370b86a691a4ace0337c3 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 17 Jan 2011 08:05:26 +1100
Subject: [PATCH 443/992] move content_columns into InputsHelper

---
 lib/formtastic/builder/base.rb          | 6 ------
 lib/formtastic/helpers/inputs_helper.rb | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/formtastic/builder/base.rb b/lib/formtastic/builder/base.rb
index 4b7ec9893..7b77261d5 100644
--- a/lib/formtastic/builder/base.rb
+++ b/lib/formtastic/builder/base.rb
@@ -92,12 +92,6 @@ def self.configure(name, value = nil)
       
       protected
       
-        # Collects content columns (non-relation columns) for the current form object class.
-        #
-        def content_columns #:nodoc:
-          model_name.constantize.content_columns.collect { |c| c.name.to_sym }.compact rescue []
-        end
-    
         # Prepare options to be sent to label
         #
         def options_for_label(options) #:nodoc:
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 381fcd812..06b043849 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -275,6 +275,12 @@ def association_columns(*by_associations) #:nodoc:
         end
       end
       
+      # Collects content columns (non-relation columns) for the current form object class.
+      #
+      def content_columns #:nodoc:
+        model_name.constantize.content_columns.collect { |c| c.name.to_sym }.compact rescue []
+      end
+      
     end
   end
 end
\ No newline at end of file

From c07e2934f95e39399565b5f96ccd96aa92263d34 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 17 Jan 2011 08:06:49 +1100
Subject: [PATCH 444/992] mv inputs_for_nested_attributes into InputsHelper

---
 lib/formtastic/builder/base.rb          | 28 -------------------------
 lib/formtastic/helpers/inputs_helper.rb | 28 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/lib/formtastic/builder/base.rb b/lib/formtastic/builder/base.rb
index 7b77261d5..0df1aac01 100644
--- a/lib/formtastic/builder/base.rb
+++ b/lib/formtastic/builder/base.rb
@@ -98,34 +98,6 @@ def options_for_label(options) #:nodoc:
           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.
-        #
-        # 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
-            lambda do |f|
-              contents = f.inputs(*args){ block.call(f) }
-              template.concat(contents)
-            end
-          else
-            lambda do |f|
-              contents = f.inputs(*args)
-              template.concat(contents)
-            end
-          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.
         #
         def strip_formtastic_options(options) #:nodoc:
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 06b043849..705888c3f 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -281,6 +281,34 @@ def content_columns #:nodoc:
         model_name.constantize.content_columns.collect { |c| c.name.to_sym }.compact rescue []
       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
+          lambda do |f|
+            contents = f.inputs(*args){ block.call(f) }
+            template.concat(contents)
+          end
+        else
+          lambda do |f|
+            contents = f.inputs(*args)
+            template.concat(contents)
+          end
+        end
+  
+        fields_for_args = [options.delete(:for), options.delete(:for_options) || {}].flatten
+        semantic_fields_for(*fields_for_args, &fields_for_block)
+      end
+      
     end
   end
 end
\ No newline at end of file

From 31d82a8d8bdf8fd52d30173d32d907776f79317d Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 17 Jan 2011 08:07:56 +1100
Subject: [PATCH 445/992] mv method_required? to InputsHelper

---
 lib/formtastic/builder/base.rb          | 32 -------------------------
 lib/formtastic/helpers/inputs_helper.rb | 32 +++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lib/formtastic/builder/base.rb b/lib/formtastic/builder/base.rb
index 0df1aac01..3a099b6d8 100644
--- a/lib/formtastic/builder/base.rb
+++ b/lib/formtastic/builder/base.rb
@@ -105,38 +105,6 @@ def strip_formtastic_options(options) #:nodoc:
                          :as, :hint, :input_html, :label_html, :value_as_class, :find_options, :class)
         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), or the object is
-        #   an ActiveModel, 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 validates_presence_of can't be determined, the
-        #   configuration option all_fields_required_by_default is used.
-        #
-        def method_required?(attribute) #:nodoc:
-          attribute_sym = attribute.to_s.sub(/_id$/, '').to_sym
-    
-          if @object && @object.class.respond_to?(:reflect_on_validations_for)
-            @object.class.reflect_on_validations_for(attribute_sym).any? do |validation|
-              (validation.macro == :validates_presence_of || validation.macro == :validates_inclusion_of) &&
-              validation.name == attribute_sym &&
-              (validation.options.present? ? options_require_validation?(validation.options) : true)
-            end
-          else
-            if @object && @object.class.respond_to?(:validators_on)
-              !@object.class.validators_on(attribute_sym).find{|validator| (validator.kind == :presence || validator.kind == :inclusion) && (validator.options.present? ? options_require_validation?(validator.options) : true)}.nil?
-            else
-              all_fields_required_by_default
-            end
-          end
-        end
-    
         # Determines whether the given options evaluate to true
         def options_require_validation?(options) #nodoc
           allow_blank = options[:allow_blank]
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 705888c3f..a62eee677 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -309,6 +309,38 @@ def inputs_for_nested_attributes(*args, &block) #:nodoc:
         semantic_fields_for(*fields_for_args, &fields_for_block)
       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), or the object is
+      #   an ActiveModel, 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 validates_presence_of can't be determined, the
+      #   configuration option all_fields_required_by_default is used.
+      #
+      def method_required?(attribute) #:nodoc:
+        attribute_sym = attribute.to_s.sub(/_id$/, '').to_sym
+  
+        if @object && @object.class.respond_to?(:reflect_on_validations_for)
+          @object.class.reflect_on_validations_for(attribute_sym).any? do |validation|
+            (validation.macro == :validates_presence_of || validation.macro == :validates_inclusion_of) &&
+            validation.name == attribute_sym &&
+            (validation.options.present? ? options_require_validation?(validation.options) : true)
+          end
+        else
+          if @object && @object.class.respond_to?(:validators_on)
+            !@object.class.validators_on(attribute_sym).find{|validator| (validator.kind == :presence || validator.kind == :inclusion) && (validator.options.present? ? options_require_validation?(validator.options) : true)}.nil?
+          else
+            all_fields_required_by_default
+          end
+        end
+      end
+      
     end
   end
 end
\ No newline at end of file

From 95ec73025c508c6208050636284e0f1d39b4c3fd Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 17 Jan 2011 08:08:38 +1100
Subject: [PATCH 446/992] mv options_require_validation? to InputsHelper

---
 lib/formtastic/builder/base.rb          | 18 ------------------
 lib/formtastic/helpers/inputs_helper.rb | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/lib/formtastic/builder/base.rb b/lib/formtastic/builder/base.rb
index 3a099b6d8..6a6b0d322 100644
--- a/lib/formtastic/builder/base.rb
+++ b/lib/formtastic/builder/base.rb
@@ -105,24 +105,6 @@ def strip_formtastic_options(options) #:nodoc:
                          :as, :hint, :input_html, :label_html, :value_as_class, :find_options, :class)
         end
     
-        # Determines whether the given options evaluate to true
-        def options_require_validation?(options) #nodoc
-          allow_blank = options[:allow_blank]
-          return !allow_blank unless allow_blank.nil?
-          if_condition = !options[:if].nil?
-          condition = if_condition ? options[:if] : options[:unless]
-    
-          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
-    
         # 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)
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index a62eee677..b2cf269c9 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -341,6 +341,24 @@ def method_required?(attribute) #:nodoc:
         end
       end
       
+      # Determines whether the given options evaluate to true
+      def options_require_validation?(options) #nodoc
+        allow_blank = options[:allow_blank]
+        return !allow_blank unless allow_blank.nil?
+        if_condition = !options[:if].nil?
+        condition = if_condition ? options[:if] : options[:unless]
+  
+        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
+      
     end
   end
 end
\ No newline at end of file

From 98ae3b5b0b87347c7292cad552a1697085245a30 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 17 Jan 2011 08:10:16 +1100
Subject: [PATCH 447/992] mv required_or_optional_string into LabelHelper

---
 lib/formtastic/builder/base.rb         | 22 +---------------------
 lib/formtastic/helpers/label_helper.rb | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/lib/formtastic/builder/base.rb b/lib/formtastic/builder/base.rb
index 6a6b0d322..4245f5182 100644
--- a/lib/formtastic/builder/base.rb
+++ b/lib/formtastic/builder/base.rb
@@ -143,27 +143,7 @@ def error_first(errors, options = {}) #:nodoc:
           error_class = options[:error_class] || default_inline_error_class
           template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => error_class)
         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
-    
-          if string_or_proc.is_a?(Proc)
-            string_or_proc.call
-          else
-            string_or_proc.to_s
-          end
-        end
-    
+        
         # Generates a fieldset and wraps the content in an ordered list. When working
         # with nested attributes, it allows %i as interpolation option in :name. So you can do:
         #
diff --git a/lib/formtastic/helpers/label_helper.rb b/lib/formtastic/helpers/label_helper.rb
index fc9fc32cc..cd0badf39 100644
--- a/lib/formtastic/helpers/label_helper.rb
+++ b/lib/formtastic/helpers/label_helper.rb
@@ -42,6 +42,29 @@ def label(method, options_or_text=nil, options=nil)
         input_name = options.delete(:input_name) || method
         super(input_name, text, options)
       end
+      
+      protected
+      
+      # 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
+  
+        if string_or_proc.is_a?(Proc)
+          string_or_proc.call
+        else
+          string_or_proc.to_s
+        end
+      end
+      
     end
   end
 end

From 9606f5c18260e46efd722b942f9e9d8ff3fbeecb Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 17 Jan 2011 08:12:43 +1100
Subject: [PATCH 448/992] mv find_raw_collection_for_column to SelectInput

---
 lib/formtastic/builder/base.rb          | 72 -------------------------
 lib/formtastic/helpers/inputs_helper.rb | 46 ++++++++++++++++
 lib/formtastic/inputs/select_input.rb   | 29 ++++++++++
 3 files changed, 75 insertions(+), 72 deletions(-)

diff --git a/lib/formtastic/builder/base.rb b/lib/formtastic/builder/base.rb
index 4245f5182..6ff009ce2 100644
--- a/lib/formtastic/builder/base.rb
+++ b/lib/formtastic/builder/base.rb
@@ -227,52 +227,6 @@ def legend_tag(method, options = {})
           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, options = {}) #:nodoc:
-          if column = 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/
-              return :email     if method.to_s =~ /email/
-              return :url       if method.to_s =~ /^url$|^website$|_url$/
-              return :phone     if method.to_s =~ /(phone|fax)/
-              return :search    if method.to_s =~ /^search$/
-            when :integer
-              return :select    if reflection_for(method)
-              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 reflection_for(method)
-    
-              return :file    if is_file?(method, options)
-            end
-    
-            return :select    if options.key?(:collection)
-            return :password  if method.to_s =~ /password/
-            return :string
-          end
-        end
-    
         def is_file?(method, options = {})
           @files ||= {}
           @files[method] ||= (options[:as].present? && options[:as] == :file) || begin
@@ -307,32 +261,6 @@ def find_collection_for_column(column, options) #:nodoc:
           collection.map { |o| [send_or_call(label, o), send_or_call(value, o)] }
         end
     
-        # 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 = reflection_for(column)
-            options[:find_options] ||= {}
-    
-            if conditions = reflection.options[:conditions]
-              if reflection.klass.respond_to?(:merge_conditions)
-                options[:find_options][:conditions] = reflection.klass.merge_conditions(conditions, options[:find_options][:conditions])
-                reflection.klass.all(options[:find_options])
-              else
-                reflection.klass.where(conditions).where(options[:find_options][:conditions])
-              end
-            else
-              reflection.klass.all(options[:find_options])
-            end
-          else
-            create_boolean_collection(options)
-          end
-    
-          collection = collection.to_a if collection.is_a?(Hash)
-          collection
-        end
-    
         # Detects the label and value methods from a collection using methods set in
         # collection_label_methods and collection_value_methods. For some ruby core
         # classes sensible defaults have been defined. It will use and delete the options
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index b2cf269c9..0bd6f068f 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -359,6 +359,52 @@ def options_require_validation?(options) #nodoc
         if_condition ? !!condition : !condition
       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, options = {}) #:nodoc:
+        if column = 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/
+            return :email     if method.to_s =~ /email/
+            return :url       if method.to_s =~ /^url$|^website$|_url$/
+            return :phone     if method.to_s =~ /(phone|fax)/
+            return :search    if method.to_s =~ /^search$/
+          when :integer
+            return :select    if reflection_for(method)
+            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 reflection_for(method)
+  
+            return :file    if is_file?(method, options)
+          end
+  
+          return :select    if options.key?(:collection)
+          return :password  if method.to_s =~ /password/
+          return :string
+        end
+      end
+      
     end
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index d507b87d7..20de56807 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -136,6 +136,35 @@ def select_input(method, options)
         label_options[:for] ||= html_options[:id]
         label(method, label_options) << select_html
       end
+      
+      protected
+      
+      # 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 = reflection_for(column)
+          options[:find_options] ||= {}
+  
+          if conditions = reflection.options[:conditions]
+            if reflection.klass.respond_to?(:merge_conditions)
+              options[:find_options][:conditions] = reflection.klass.merge_conditions(conditions, options[:find_options][:conditions])
+              reflection.klass.all(options[:find_options])
+            else
+              reflection.klass.where(conditions).where(options[:find_options][:conditions])
+            end
+          else
+            reflection.klass.all(options[:find_options])
+          end
+        else
+          create_boolean_collection(options)
+        end
+  
+        collection = collection.to_a if collection.is_a?(Hash)
+        collection
+      end
+      
     end
   end
 end
\ No newline at end of file

From 7d7ea0b356fbe5019bd9b8ddbeab37ee146c99b5 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 17 Jan 2011 08:13:58 +1100
Subject: [PATCH 449/992] mv create_boolean_collection to SelectInput

---
 lib/formtastic/builder/base.rb        | 11 -----------
 lib/formtastic/inputs/select_input.rb | 11 +++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/formtastic/builder/base.rb b/lib/formtastic/builder/base.rb
index 6ff009ce2..dcf81ce4f 100644
--- a/lib/formtastic/builder/base.rb
+++ b/lib/formtastic/builder/base.rb
@@ -333,17 +333,6 @@ def detect_group_association(method, group_by)
     
         end
     
-        # 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)
-    
-          [ [ options.delete(:true), true], [ options.delete(:false), false ] ]
-        end
-    
         # Used by association inputs (select, radio) to generate the name that should
         # be used for the input
         #
diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index 20de56807..544860c6e 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -165,6 +165,17 @@ def find_raw_collection_for_column(column, options) #:nodoc:
         collection
       end
       
+      # 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)
+  
+        [ [ options.delete(:true), true], [ options.delete(:false), false ] ]
+      end
+  
     end
   end
 end
\ No newline at end of file

From f7b8a6b1bfc894c82d034690605a852ec7e740ee Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 17 Jan 2011 08:19:05 +1100
Subject: [PATCH 450/992] moved more methods into the right module

---
 lib/formtastic/builder/base.rb          | 68 -------------------------
 lib/formtastic/helpers/inputs_helper.rb |  6 +++
 lib/formtastic/inputs/support/basic.rb  | 66 ++++++++++++++++++++++++
 3 files changed, 72 insertions(+), 68 deletions(-)

diff --git a/lib/formtastic/builder/base.rb b/lib/formtastic/builder/base.rb
index dcf81ce4f..e1a9076cb 100644
--- a/lib/formtastic/builder/base.rb
+++ b/lib/formtastic/builder/base.rb
@@ -360,74 +360,6 @@ def reflection_for(method) #:nodoc:
           @object.class.reflect_on_association(method) if @object.class.respond_to?(:reflect_on_association)
         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
-    
-        # Returns the active validations for the given method or an empty Array if no validations are
-        # found for the method.
-        #
-        # By default, the if/unless options of the validations are evaluated and only the validations
-        # that should be run for the current object state are returned. Pass :all to the last
-        # parameter to return :all validations regardless of if/unless options.
-        #
-        # Requires the ValidationReflection plugin to be present or an ActiveModel. Returns an epmty
-        # Array if neither is the case.
-        #
-        def validations_for(method, mode = :active)
-          # ActiveModel?
-          validations = if @object && @object.class.respond_to?(:validators_on)
-            @object.class.validators_on(method)
-          else
-            # ValidationReflection plugin?
-            if @object && @object.class.respond_to?(:reflect_on_validations_for)
-              @object.class.reflect_on_validations_for(method)
-            else
-              []
-            end
-          end
-    
-          validations = validations.select do |validation|
-            (validation.options.present? ? options_require_validation?(validation.options) : true)
-          end unless mode == :all
-    
-          return validations
-        end
-    
-        # Generates default_string_options by retrieving column information from
-        # the database.
-        #
-        def default_string_options(method, type) #:nodoc:
-          def get_maxlength_for(method)
-            validation = validations_for(method).find do |validation|
-              (validation.respond_to?(:macro) && validation.macro == :validates_length_of) || # Rails 2 + 3 style validation
-              (validation.respond_to?(:kind) && validation.kind == :length) # Rails 3 style validator
-            end
-    
-            if validation
-              validation.options[:maximum] || (validation.options[:within].present? ? validation.options[:within].max : nil)
-            else
-              nil
-            end
-          end
-    
-          validation_max_limit = get_maxlength_for(method)
-          column = column_for(method)
-    
-          if type == :text
-            { :rows => default_text_area_height, 
-              :cols => default_text_area_width }
-          elsif type == :numeric || column.nil? || !column.respond_to?(:limit) || column.limit.nil?
-            { :maxlength => validation_max_limit,
-              :size => default_text_field_size }
-          else
-            { :maxlength => validation_max_limit || column.limit,
-              :size => default_text_field_size }
-          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
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 0bd6f068f..28f37e531 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -405,6 +405,12 @@ def default_input_type(method, options = {}) #:nodoc:
         end
       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
+      
     end
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/support/basic.rb b/lib/formtastic/inputs/support/basic.rb
index 449a6316c..9f42be3db 100644
--- a/lib/formtastic/inputs/support/basic.rb
+++ b/lib/formtastic/inputs/support/basic.rb
@@ -2,6 +2,7 @@ module Formtastic
   module Inputs
     module Support
       module Basic
+        
         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, :text, :phone, :search, :url, :email].include?(type)
@@ -12,6 +13,71 @@ def basic_input_helper(form_helper_method, type, method, options) #:nodoc:
           label(method, label_options) <<
             send(respond_to?(form_helper_method) ? form_helper_method : :text_field, method, html_options)
         end
+        
+        protected
+        
+        # Generates default_string_options by retrieving column information from
+        # the database.
+        #
+        def default_string_options(method, type) #:nodoc:
+          def get_maxlength_for(method)
+            validation = validations_for(method).find do |validation|
+              (validation.respond_to?(:macro) && validation.macro == :validates_length_of) || # Rails 2 + 3 style validation
+              (validation.respond_to?(:kind) && validation.kind == :length) # Rails 3 style validator
+            end
+    
+            if validation
+              validation.options[:maximum] || (validation.options[:within].present? ? validation.options[:within].max : nil)
+            else
+              nil
+            end
+          end
+    
+          validation_max_limit = get_maxlength_for(method)
+          column = column_for(method)
+    
+          if type == :text
+            { :rows => default_text_area_height, 
+              :cols => default_text_area_width }
+          elsif type == :numeric || column.nil? || !column.respond_to?(:limit) || column.limit.nil?
+            { :maxlength => validation_max_limit,
+              :size => default_text_field_size }
+          else
+            { :maxlength => validation_max_limit || column.limit,
+              :size => default_text_field_size }
+          end
+        end
+        
+        # Returns the active validations for the given method or an empty Array if no validations are
+        # found for the method.
+        #
+        # By default, the if/unless options of the validations are evaluated and only the validations
+        # that should be run for the current object state are returned. Pass :all to the last
+        # parameter to return :all validations regardless of if/unless options.
+        #
+        # Requires the ValidationReflection plugin to be present or an ActiveModel. Returns an epmty
+        # Array if neither is the case.
+        #
+        def validations_for(method, mode = :active)
+          # ActiveModel?
+          validations = if @object && @object.class.respond_to?(:validators_on)
+            @object.class.validators_on(method)
+          else
+            # ValidationReflection plugin?
+            if @object && @object.class.respond_to?(:reflect_on_validations_for)
+              @object.class.reflect_on_validations_for(method)
+            else
+              []
+            end
+          end
+    
+          validations = validations.select do |validation|
+            (validation.options.present? ? options_require_validation?(validation.options) : true)
+          end unless mode == :all
+    
+          return validations
+        end
+        
       end
     end
   end

From 7a1a30ca713a03c31848eacc9b760f59fcbacba8 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 17 Jan 2011 09:02:28 +1100
Subject: [PATCH 451/992] beginings of a Support::Base for all inputs

---
 lib/formtastic/builder/base.rb             | 23 ---------------------
 lib/formtastic/inputs/boolean_input.rb     |  4 ++++
 lib/formtastic/inputs/check_boxes_input.rb | 11 ++++++++++
 lib/formtastic/inputs/country_input.rb     |  4 ++++
 lib/formtastic/inputs/date_input.rb        |  3 +++
 lib/formtastic/inputs/datetime_input.rb    |  3 +++
 lib/formtastic/inputs/email_input.rb       |  2 ++
 lib/formtastic/inputs/file_input.rb        |  2 ++
 lib/formtastic/inputs/hidden_input.rb      |  4 ++++
 lib/formtastic/inputs/numeric_input.rb     |  2 ++
 lib/formtastic/inputs/password_input.rb    |  2 ++
 lib/formtastic/inputs/phone_input.rb       |  2 ++
 lib/formtastic/inputs/radio_input.rb       |  4 ++++
 lib/formtastic/inputs/search_input.rb      |  2 ++
 lib/formtastic/inputs/select_input.rb      |  4 ++++
 lib/formtastic/inputs/string_input.rb      |  2 ++
 lib/formtastic/inputs/support/base.rb      | 24 ++++++++++++++++++++++
 17 files changed, 75 insertions(+), 23 deletions(-)
 create mode 100644 lib/formtastic/inputs/support/base.rb

diff --git a/lib/formtastic/builder/base.rb b/lib/formtastic/builder/base.rb
index e1a9076cb..f725425a3 100644
--- a/lib/formtastic/builder/base.rb
+++ b/lib/formtastic/builder/base.rb
@@ -480,29 +480,6 @@ def normalize_model_name(name)
             [name]
           end
         end
-    
-        def send_or_call(duck, object)
-          if duck.is_a?(Proc)
-            duck.call(object)
-          else
-            object.send(duck)
-          end
-        end
-    
-        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
-    
-        def escape_html_entities(string) #:nodoc:
-          if escape_html_entities_in_hints_and_labels
-            # Acceppt html_safe flag as indicator to skip escaping
-            string = template.escape_once(string) unless string.respond_to?(:html_safe?) && string.html_safe? == true
-          end
-          string
-        end
       
     end
   end
diff --git a/lib/formtastic/inputs/boolean_input.rb b/lib/formtastic/inputs/boolean_input.rb
index 1097a8c49..abf0bce28 100644
--- a/lib/formtastic/inputs/boolean_input.rb
+++ b/lib/formtastic/inputs/boolean_input.rb
@@ -1,6 +1,10 @@
+require 'support/base'
+
 module Formtastic
   module Inputs
     module BooleanInput
+      include Support::Base
+      
       # 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.
diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index d749f055d..5cc64f988 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -1,6 +1,9 @@
+require 'support/base'
+
 module Formtastic
   module Inputs
     module CheckBoxesInput
+      include Support::Base
       
       # 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
@@ -147,6 +150,14 @@ def create_check_boxes(input_name, html_options = {}, checked_value = "1", unche
         return template.check_box_tag(input_name, checked_value, html_options[:checked], html_options) unless hidden_fields == true
         check_box(input_name, html_options, checked_value, unchecked_value)
       end
+      
+      def send_or_call(duck, object)
+        if duck.is_a?(Proc)
+          duck.call(object)
+        else
+          object.send(duck)
+        end
+      end
 
     end
   end
diff --git a/lib/formtastic/inputs/country_input.rb b/lib/formtastic/inputs/country_input.rb
index c9acedd29..1e3599f1f 100644
--- a/lib/formtastic/inputs/country_input.rb
+++ b/lib/formtastic/inputs/country_input.rb
@@ -1,6 +1,10 @@
+require 'support/base'
+
 module Formtastic
   module Inputs
     module CountryInput
+      include Support::Base
+      
       # 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
diff --git a/lib/formtastic/inputs/date_input.rb b/lib/formtastic/inputs/date_input.rb
index 9f8fac368..74bb88428 100644
--- a/lib/formtastic/inputs/date_input.rb
+++ b/lib/formtastic/inputs/date_input.rb
@@ -1,9 +1,12 @@
+require 'support/base'
 require 'support/timeish'
 
 module Formtastic
   module Inputs
     module DateInput
+      include Support::Base
       include Support::Timeish
+      
       # 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. Overwriting the label is possible by adding the :labels option.
diff --git a/lib/formtastic/inputs/datetime_input.rb b/lib/formtastic/inputs/datetime_input.rb
index 9a136a1e3..eee469626 100644
--- a/lib/formtastic/inputs/datetime_input.rb
+++ b/lib/formtastic/inputs/datetime_input.rb
@@ -1,9 +1,12 @@
+require 'support/base'
 require 'support/timeish'
 
 module Formtastic
   module Inputs
     module DatetimeInput
+      include Support::Base
       include Support::Timeish
+      
       # 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. Overwriting the label is possible by adding
diff --git a/lib/formtastic/inputs/email_input.rb b/lib/formtastic/inputs/email_input.rb
index 9543d6937..413eeb2e6 100644
--- a/lib/formtastic/inputs/email_input.rb
+++ b/lib/formtastic/inputs/email_input.rb
@@ -1,8 +1,10 @@
+require 'support/base'
 require 'support/basic'
 
 module Formtastic
   module Inputs
     module EmailInput
+      include Support::Base
       include Support::Basic
       
       # Outputs a label and a standard Rails email field inside the wrapper.
diff --git a/lib/formtastic/inputs/file_input.rb b/lib/formtastic/inputs/file_input.rb
index 6c43c0d33..ad032c04e 100644
--- a/lib/formtastic/inputs/file_input.rb
+++ b/lib/formtastic/inputs/file_input.rb
@@ -1,8 +1,10 @@
+require 'support/base'
 require 'support/basic'
 
 module Formtastic
   module Inputs
     module FileInput
+      include Support::Base
       include Support::Basic
       
       # Outputs a label and a standard Rails file field inside the wrapper.
diff --git a/lib/formtastic/inputs/hidden_input.rb b/lib/formtastic/inputs/hidden_input.rb
index 1f28a18fd..d7da0bdf5 100644
--- a/lib/formtastic/inputs/hidden_input.rb
+++ b/lib/formtastic/inputs/hidden_input.rb
@@ -1,6 +1,10 @@
+require 'support/base'
+
 module Formtastic
   module Inputs
     module HiddenInput
+      include Support::Base
+      
       # Outputs a hidden field inside the wrapper, which should be hidden with CSS.
       # Additionals options can be given using :input_hml. Should :input_html not be
       # specified every option except for formtastic options will be sent straight
diff --git a/lib/formtastic/inputs/numeric_input.rb b/lib/formtastic/inputs/numeric_input.rb
index cbab574ca..83788451d 100644
--- a/lib/formtastic/inputs/numeric_input.rb
+++ b/lib/formtastic/inputs/numeric_input.rb
@@ -1,8 +1,10 @@
+require 'support/base'
 require 'support/basic'
 
 module Formtastic
   module Inputs
     module NumericInput
+      include Support::Base
       include Support::Basic
       
       # Outputs a label and standard Rails text field inside the wrapper.
diff --git a/lib/formtastic/inputs/password_input.rb b/lib/formtastic/inputs/password_input.rb
index 8152d7d99..88ecf5236 100644
--- a/lib/formtastic/inputs/password_input.rb
+++ b/lib/formtastic/inputs/password_input.rb
@@ -1,8 +1,10 @@
+require 'support/base'
 require 'support/basic'
 
 module Formtastic
   module Inputs
     module PasswordInput
+      include Support::Base
       include Support::Basic
       
       # Outputs a label and standard Rails password field inside the wrapper.
diff --git a/lib/formtastic/inputs/phone_input.rb b/lib/formtastic/inputs/phone_input.rb
index 00021827f..bfcad853a 100644
--- a/lib/formtastic/inputs/phone_input.rb
+++ b/lib/formtastic/inputs/phone_input.rb
@@ -1,8 +1,10 @@
+require 'support/base'
 require 'support/basic'
 
 module Formtastic
   module Inputs
     module PhoneInput
+      include Support::Base
       include Support::Basic
 
       # Outputs a label and a standard Rails phone field inside the wrapper.
diff --git a/lib/formtastic/inputs/radio_input.rb b/lib/formtastic/inputs/radio_input.rb
index 58ff236a4..7fb8784b9 100644
--- a/lib/formtastic/inputs/radio_input.rb
+++ b/lib/formtastic/inputs/radio_input.rb
@@ -1,6 +1,10 @@
+require 'support/base'
+
 module Formtastic
   module Inputs
     module RadioInput
+      include Support::Base
+      
       # 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.
diff --git a/lib/formtastic/inputs/search_input.rb b/lib/formtastic/inputs/search_input.rb
index 3ca2d4a35..1e19c9de2 100644
--- a/lib/formtastic/inputs/search_input.rb
+++ b/lib/formtastic/inputs/search_input.rb
@@ -1,8 +1,10 @@
+require 'support/base'
 require 'support/basic'
 
 module Formtastic
   module Inputs
     module SearchInput
+      include Support::Base
       include Support::Basic
       
       # Outputs a label and a standard Rails search field inside the wrapper.
diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index 544860c6e..f833fe4ef 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -1,6 +1,10 @@
+require 'support/base'
+
 module Formtastic
   module Inputs
     module SelectInput
+      include Support::Base
+      
       # 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
diff --git a/lib/formtastic/inputs/string_input.rb b/lib/formtastic/inputs/string_input.rb
index 62d45b7d7..de14a6046 100644
--- a/lib/formtastic/inputs/string_input.rb
+++ b/lib/formtastic/inputs/string_input.rb
@@ -1,8 +1,10 @@
+require 'support/base'
 require 'support/basic'
 
 module Formtastic
   module Inputs
     module StringInput
+      include Support::Base
       include Support::Basic
       # Outputs a label and standard Rails text field inside the wrapper.
       def string_input(method, options)
diff --git a/lib/formtastic/inputs/support/base.rb b/lib/formtastic/inputs/support/base.rb
new file mode 100644
index 000000000..0cec27d30
--- /dev/null
+++ b/lib/formtastic/inputs/support/base.rb
@@ -0,0 +1,24 @@
+module Formtastic
+  module Inputs
+    module Support
+      module Base
+
+        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
+        
+        def escape_html_entities(string) #:nodoc:
+          if escape_html_entities_in_hints_and_labels
+            # Acceppt html_safe flag as indicator to skip escaping
+            string = template.escape_once(string) unless string.respond_to?(:html_safe?) && string.html_safe? == true
+          end
+          string
+        end
+        
+      end
+    end
+  end
+end
\ No newline at end of file

From 424dc770e2b223aa2ce1c7746911a4e650fc1806 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 17 Jan 2011 09:17:56 +1100
Subject: [PATCH 452/992] more Suport::Base stuff

---
 lib/formtastic/builder/base.rb        | 13 -------------
 lib/formtastic/inputs/support/base.rb | 11 +++++++++++
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/lib/formtastic/builder/base.rb b/lib/formtastic/builder/base.rb
index f725425a3..036831044 100644
--- a/lib/formtastic/builder/base.rb
+++ b/lib/formtastic/builder/base.rb
@@ -92,19 +92,6 @@ def self.configure(name, value = nil)
       
       protected
       
-        # Prepare options to be sent to label
-        #
-        def options_for_label(options) #:nodoc:
-          options.slice(:label, :required).merge!(options.fetch(:label_html, {}))
-        end
-    
-        # 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, :find_options, :class)
-        end
-    
         # 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)
diff --git a/lib/formtastic/inputs/support/base.rb b/lib/formtastic/inputs/support/base.rb
index 0cec27d30..d9bd9a414 100644
--- a/lib/formtastic/inputs/support/base.rb
+++ b/lib/formtastic/inputs/support/base.rb
@@ -18,6 +18,17 @@ def escape_html_entities(string) #:nodoc:
           string
         end
         
+        # Prepare options to be sent to label
+        def options_for_label(options) #:nodoc:
+          options.slice(:label, :required).merge!(options.fetch(:label_html, {}))
+        end
+        
+        # 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, :find_options, :class)
+        end
+    
       end
     end
   end

From 899ce96d1211e907d4e58874f5a3f2ace58ab38a Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 17 Jan 2011 09:39:42 +1100
Subject: [PATCH 453/992] more shifting of methods into the right places

---
 lib/formtastic/builder/base.rb          | 183 ------------------------
 lib/formtastic/helpers/errors_helper.rb |  47 ------
 lib/formtastic/helpers/inputs_helper.rb | 100 +++++++++++++
 lib/formtastic/inputs/select_input.rb   |  48 +++++++
 lib/formtastic/inputs/support/base.rb   |  82 +++++++++++
 5 files changed, 230 insertions(+), 230 deletions(-)

diff --git a/lib/formtastic/builder/base.rb b/lib/formtastic/builder/base.rb
index 036831044..e5e70608a 100644
--- a/lib/formtastic/builder/base.rb
+++ b/lib/formtastic/builder/base.rb
@@ -91,45 +91,6 @@ def self.configure(name, value = nil)
       include Formtastic::Inputs::UrlInput
       
       protected
-      
-        # 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
-    
-        # 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? or options[:hint].kind_of? Hash
-          hint_class = options[:hint_class] || default_hint_class
-          template.content_tag(:p, Formtastic::Util.html_safe(options[:hint]), :class => hint_class)
-        end
-    
-        # Creates an error sentence by calling to_sentence on the errors array.
-        #
-        def error_sentence(errors, options = {}) #:nodoc:
-          error_class = options[:error_class] || default_inline_error_class
-          template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.untaint), :class => error_class)
-        end
-    
-        # Creates an error li list.
-        #
-        def error_list(errors, options = {}) #:nodoc:
-          error_class = options[:error_class] || default_error_list_class
-          list_elements = []
-          errors.each do |error|
-            list_elements <<  template.content_tag(:li, Formtastic::Util.html_safe(error.untaint))
-          end
-          template.content_tag(:ul, Formtastic::Util.html_safe(list_elements.join("\n")), :class => error_class)
-        end
-    
-        # Creates an error sentence containing only the first error
-        #
-        def error_first(errors, options = {}) #:nodoc:
-          error_class = options[:error_class] || default_inline_error_class
-          template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => error_class)
-        end
         
         # Generates a fieldset and wraps the content in an ordered list. When working
         # with nested attributes, it allows %i as interpolation option in :name. So you can do:
@@ -174,20 +135,6 @@ def field_set_and_list_wrapping(*args, &block) #:nodoc:
           fieldset
         end
     
-        def field_set_title_from_args(*args) #:nodoc:
-          options = args.extract_options!
-          options[:name] ||= options.delete(:title)
-          title = options[:name]
-    
-          if title.blank?
-            valid_name_classes = [::String, ::Symbol]
-            valid_name_classes.delete(::Symbol) if !block_given? && (args.first.is_a?(::Symbol) && 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
-    
         # Also generates a fieldset and an ordered list but with label based in
         # method. This methods is currently used by radio and datetime inputs.
         #
@@ -202,18 +149,6 @@ def field_set_and_list_wrapping_for_method(method, options, contents) #:nodoc:
             )
         end
     
-        # Generates the legend for radiobuttons and checkboxes
-        def legend_tag(method, options = {})
-          if options[:label] == false
-            Formtastic::Util.html_safe("")
-          else
-            text = localized_string(method, options[:label], :label) || humanized_attribute_name(method)
-            text += required_or_optional_string(options.delete(:required))
-            text = Formtastic::Util.html_safe(text)
-            template.content_tag :legend, template.label_tag(nil, text, :for => nil), :class => :label
-          end
-        end
-    
         def is_file?(method, options = {})
           @files ||= {}
           @files[method] ||= (options[:as].present? && options[:as] == :file) || begin
@@ -222,124 +157,6 @@ def is_file?(method, options = {})
           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 a plain string
-          return collection if collection.instance_of?(String) || collection.instance_of?(::Formtastic::Util.rails_safe_buffer_class)
-    
-          # 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) &&
-                               !(options.include?(:label_method) || options.include?(:value_method))
-    
-          label, value = detect_label_and_value_method!(collection, options)
-          collection.map { |o| [send_or_call(label, o), send_or_call(value, o)] }
-        end
-    
-        # Detects the label and value methods from a collection using methods set in
-        # collection_label_methods and collection_value_methods. For some ruby core
-        # classes sensible defaults have been defined. It will use and delete the options
-        # :label_method and :value_methods when present.
-        #
-        def detect_label_and_value_method!(collection, options = {})
-          sample = collection.first || collection.last
-    
-          case sample
-          when Array
-            label, value = :first, :last
-          when Integer
-            label, value = :to_s, :to_i
-          when String, NilClass
-            label, value = :to_s, :to_s
-          end
-    
-          # Order of preference: user supplied method, class defaults, auto-detect
-          label = options[:label_method] || label || collection_label_methods.find { |m| sample.respond_to?(m) }
-          value = options[:value_method] || value || collection_value_methods.find { |m| sample.respond_to?(m) }
-    
-          [label, value]
-        end
-    
-        # Return the label collection method when none is supplied using the
-        # values set in collection_label_methods.
-        #
-        def detect_label_method(collection) #:nodoc:
-          detect_label_and_value_method!(collection).first
-        end
-    
-        # 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 = 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
-    
-        # 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 = 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
-    
         # If an association method is passed in (f.input :author) try to find the
         # reflection object.
         #
diff --git a/lib/formtastic/helpers/errors_helper.rb b/lib/formtastic/helpers/errors_helper.rb
index 1a6f5bdba..0e9dadb0e 100644
--- a/lib/formtastic/helpers/errors_helper.rb
+++ b/lib/formtastic/helpers/errors_helper.rb
@@ -2,53 +2,6 @@ module Formtastic
   module Helpers
     module ErrorsHelper
       
-      # A thin wrapper around #fields_for to set :builder => Formtastic::SemanticFormBuilder
-      # for nesting forms:
-      #
-      #   # Example:
-      #   <% semantic_form_for @post do |post| %>
-      #     <% post.semantic_fields_for :author do |author| %>
-      #       <% author.inputs :name %>
-      #     <% end %>
-      #   <% end %>
-      #
-      #   # Output:
-      #   <form ...>
-      #     <fieldset class="inputs">
-      #       <ol>
-      #         <li class="string"><input type='text' name='post[author][name]' id='post_author_name' /></li>
-      #       </ol>
-      #     </fieldset>
-      #   </form>
-      #
-      def semantic_fields_for(record_or_name_or_array, *args, &block)
-        opts = args.extract_options!
-        opts[:builder] ||= self.class
-        args.push(opts)
-        fields_for(record_or_name_or_array, *args, &block)
-      end
-    
-      # 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.
-      #
-      # 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 = {}) #:nodoc:
-        if render_inline_errors?
-          errors = error_keys(method, options).map{|x| @object.errors[x] }.flatten.compact.uniq
-          send(:"error_#{inline_errors}", [*errors], options) if errors.any?
-        else
-          nil
-        end
-      end
-      alias :errors_on :inline_errors_for
-    
       # Generates error messages for given method names and for base.
       # You can pass a hash with html options that will be added to ul tag
       #
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 28f37e531..6ca0dd211 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -257,6 +257,53 @@ def inputs(*args, &block)
         end
       end
       
+      # A thin wrapper around #fields_for to set :builder => Formtastic::SemanticFormBuilder
+      # for nesting forms:
+      #
+      #   # Example:
+      #   <% semantic_form_for @post do |post| %>
+      #     <% post.semantic_fields_for :author do |author| %>
+      #       <% author.inputs :name %>
+      #     <% end %>
+      #   <% end %>
+      #
+      #   # Output:
+      #   <form ...>
+      #     <fieldset class="inputs">
+      #       <ol>
+      #         <li class="string"><input type='text' name='post[author][name]' id='post_author_name' /></li>
+      #       </ol>
+      #     </fieldset>
+      #   </form>
+      #
+      def semantic_fields_for(record_or_name_or_array, *args, &block)
+        opts = args.extract_options!
+        opts[:builder] ||= self.class
+        args.push(opts)
+        fields_for(record_or_name_or_array, *args, &block)
+      end
+      
+      # 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.
+      #
+      # 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 = {}) #:nodoc:
+        if render_inline_errors?
+          errors = error_keys(method, options).map{|x| @object.errors[x] }.flatten.compact.uniq
+          send(:"error_#{inline_errors}", [*errors], options) if errors.any?
+        else
+          nil
+        end
+      end
+      alias :errors_on :inline_errors_for
+      
       protected
       
       # Collects association columns (relation columns) for the current form object class.
@@ -411,6 +458,59 @@ def column_for(method) #:nodoc:
         @object.column_for_attribute(method) if @object.respond_to?(:column_for_attribute)
       end
       
+      # 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
+  
+      # 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? or options[:hint].kind_of? Hash
+        hint_class = options[:hint_class] || default_hint_class
+        template.content_tag(:p, Formtastic::Util.html_safe(options[:hint]), :class => hint_class)
+      end
+      
+      # Creates an error sentence by calling to_sentence on the errors array.
+      #
+      def error_sentence(errors, options = {}) #:nodoc:
+        error_class = options[:error_class] || default_inline_error_class
+        template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.untaint), :class => error_class)
+      end
+  
+      # Creates an error li list.
+      #
+      def error_list(errors, options = {}) #:nodoc:
+        error_class = options[:error_class] || default_error_list_class
+        list_elements = []
+        errors.each do |error|
+          list_elements <<  template.content_tag(:li, Formtastic::Util.html_safe(error.untaint))
+        end
+        template.content_tag(:ul, Formtastic::Util.html_safe(list_elements.join("\n")), :class => error_class)
+      end
+  
+      # Creates an error sentence containing only the first error
+      #
+      def error_first(errors, options = {}) #:nodoc:
+        error_class = options[:error_class] || default_inline_error_class
+        template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => error_class)
+      end
+      
+      def field_set_title_from_args(*args) #:nodoc:
+        options = args.extract_options!
+        options[:name] ||= options.delete(:title)
+        title = options[:name]
+  
+        if title.blank?
+          valid_name_classes = [::String, ::Symbol]
+          valid_name_classes.delete(::Symbol) if !block_given? && (args.first.is_a?(::Symbol) && 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
+      
     end
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index f833fe4ef..dad198098 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -179,6 +179,54 @@ def create_boolean_collection(options) #:nodoc:
   
         [ [ options.delete(:true), true], [ options.delete(:false), false ] ]
       end
+      
+      # Return the label collection method when none is supplied using the
+      # values set in collection_label_methods.
+      #
+      def detect_label_method(collection) #:nodoc:
+        detect_label_and_value_method!(collection).first
+      end
+      
+      # 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 = 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
   
     end
   end
diff --git a/lib/formtastic/inputs/support/base.rb b/lib/formtastic/inputs/support/base.rb
index d9bd9a414..46e5c99b4 100644
--- a/lib/formtastic/inputs/support/base.rb
+++ b/lib/formtastic/inputs/support/base.rb
@@ -28,6 +28,88 @@ def strip_formtastic_options(options) #:nodoc:
           options.except(:value_method, :label_method, :collection, :required, :label,
                          :as, :hint, :input_html, :label_html, :value_as_class, :find_options, :class)
         end
+        
+        # Generates the legend for radiobuttons and checkboxes
+        def legend_tag(method, options = {})
+          if options[:label] == false
+            Formtastic::Util.html_safe("")
+          else
+            text = localized_string(method, options[:label], :label) || humanized_attribute_name(method)
+            text += required_or_optional_string(options.delete(:required))
+            text = Formtastic::Util.html_safe(text)
+            template.content_tag :legend, template.label_tag(nil, text, :for => nil), :class => :label
+          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 a plain string
+          return collection if collection.instance_of?(String) || collection.instance_of?(::Formtastic::Util.rails_safe_buffer_class)
+    
+          # 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) &&
+                               !(options.include?(:label_method) || options.include?(:value_method))
+    
+          label, value = detect_label_and_value_method!(collection, options)
+          collection.map { |o| [send_or_call(label, o), send_or_call(value, o)] }
+        end
+        
+        # Detects the label and value methods from a collection using methods set in
+        # collection_label_methods and collection_value_methods. For some ruby core
+        # classes sensible defaults have been defined. It will use and delete the options
+        # :label_method and :value_methods when present.
+        #
+        def detect_label_and_value_method!(collection, options = {})
+          sample = collection.first || collection.last
+    
+          case sample
+          when Array
+            label, value = :first, :last
+          when Integer
+            label, value = :to_s, :to_i
+          when String, NilClass
+            label, value = :to_s, :to_s
+          end
+    
+          # Order of preference: user supplied method, class defaults, auto-detect
+          label = options[:label_method] || label || collection_label_methods.find { |m| sample.respond_to?(m) }
+          value = options[:value_method] || value || collection_value_methods.find { |m| sample.respond_to?(m) }
+    
+          [label, value]
+        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 = 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
     
       end
     end

From 56d6558d54193415dfecd5a8d013e10af8e3d51d Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 17 Jan 2011 16:50:34 +1100
Subject: [PATCH 454/992] shifted Formtastic::LayoutHelper to
 Formtastic::Helpers::LayoutHelper

---
 init.rb                                       |  4 +-
 lib/formtastic/helpers/layout_helper.rb       | 14 +++++
 .../helpers/support/fieldset_wrapper.rb       | 52 +++++++++++++++++++
 lib/formtastic/layout_helper.rb               | 12 -----
 lib/formtastic/railtie.rb                     |  4 +-
 spec/helpers/layout_helper_spec.rb            |  4 +-
 spec/spec_helper.rb                           |  2 +-
 7 files changed, 73 insertions(+), 19 deletions(-)
 create mode 100644 lib/formtastic/helpers/layout_helper.rb
 create mode 100644 lib/formtastic/helpers/support/fieldset_wrapper.rb
 delete mode 100644 lib/formtastic/layout_helper.rb

diff --git a/init.rb b/init.rb
index 45896e266..e357b9275 100644
--- a/init.rb
+++ b/init.rb
@@ -1,5 +1,5 @@
 # encoding: utf-8
 require 'formtastic'
-require 'formtastic/layout_helper'
+require 'formtastic/helpers/layout_helper'
 ActionView::Base.send :include, Formtastic::SemanticFormHelper
-ActionView::Base.send :include, Formtastic::LayoutHelper
+ActionView::Base.send :include, Formtastic::Helpers::LayoutHelper
diff --git a/lib/formtastic/helpers/layout_helper.rb b/lib/formtastic/helpers/layout_helper.rb
new file mode 100644
index 000000000..656bfe65e
--- /dev/null
+++ b/lib/formtastic/helpers/layout_helper.rb
@@ -0,0 +1,14 @@
+# encoding: utf-8
+
+module Formtastic
+  module Helpers
+    module LayoutHelper
+    
+      def formtastic_stylesheet_link_tag
+        stylesheet_link_tag("formtastic") +
+        stylesheet_link_tag("formtastic_changes")
+      end
+    
+    end
+  end
+end
diff --git a/lib/formtastic/helpers/support/fieldset_wrapper.rb b/lib/formtastic/helpers/support/fieldset_wrapper.rb
new file mode 100644
index 000000000..a49d8eb69
--- /dev/null
+++ b/lib/formtastic/helpers/support/fieldset_wrapper.rb
@@ -0,0 +1,52 @@
+module Formtastic
+  module Helpers
+    module Support
+      module FieldsetWrapper
+    
+        protected
+        
+        # Generates a fieldset and wraps the content in an ordered list. When working
+        # with nested attributes, 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.dup.delete(:name).to_s
+          legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
+          legend  = template.content_tag(:legend, template.content_tag(:span, Formtastic::Util.html_safe(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
+        
+          # 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,
+            Formtastic::Util.html_safe(legend) << template.content_tag(:ol, Formtastic::Util.html_safe(contents)),
+            html_options.except(:builder, :parent)
+          )
+        
+          fieldset
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/layout_helper.rb b/lib/formtastic/layout_helper.rb
deleted file mode 100644
index e2a950694..000000000
--- a/lib/formtastic/layout_helper.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-
-module Formtastic
-  module LayoutHelper
-
-    def formtastic_stylesheet_link_tag
-      stylesheet_link_tag("formtastic") +
-      stylesheet_link_tag("formtastic_changes")
-    end
-
-  end
-end
diff --git a/lib/formtastic/railtie.rb b/lib/formtastic/railtie.rb
index 2d116e47d..25c9b8887 100644
--- a/lib/formtastic/railtie.rb
+++ b/lib/formtastic/railtie.rb
@@ -1,14 +1,14 @@
 # encoding: utf-8
 
 require 'formtastic'
-require 'formtastic/layout_helper'
+require 'formtastic/helpers/layout_helper'
 require 'rails'
 
 module Formtastic
   class Railtie < Rails::Railtie
     initializer 'formtastic.initialize', :after => :after_initialize do
       ActionView::Base.send :include, Formtastic::SemanticFormHelper
-      ActionView::Base.send(:include, Formtastic::LayoutHelper)
+      ActionView::Base.send(:include, Formtastic::Helpers::LayoutHelper)
     end
   end
 end
diff --git a/spec/helpers/layout_helper_spec.rb b/spec/helpers/layout_helper_spec.rb
index 815af8c33..96904c5ce 100644
--- a/spec/helpers/layout_helper_spec.rb
+++ b/spec/helpers/layout_helper_spec.rb
@@ -1,10 +1,10 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe Formtastic::LayoutHelper do
+describe Formtastic::Helpers::LayoutHelper do
 
   include FormtasticSpecHelper
-  include Formtastic::LayoutHelper
+  include Formtastic::Helpers::LayoutHelper
 
   describe '#formtastic_stylesheet_link_tag' do
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f4c724cf9..50c32c9b5 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -11,7 +11,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic/util'))
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic'))
-require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic/layout_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic/helpers/layout_helper'))
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories in alphabetic order.

From 98f2176d210c58a766c5ca845664c975c534a25e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 17 Jan 2011 17:04:50 +1100
Subject: [PATCH 455/992] Shifted field_set_and_list_wrapping_for_method into
 Timeish and field_set_and_list_wrapping into
 Helpers::Support::FieldsetWrapper

---
 lib/formtastic/builder/base.rb           | 57 ------------------------
 lib/formtastic/helpers/buttons_helper.rb |  4 ++
 lib/formtastic/helpers/inputs_helper.rb  |  5 ++-
 lib/formtastic/inputs/support/timeish.rb | 14 ++++++
 4 files changed, 22 insertions(+), 58 deletions(-)

diff --git a/lib/formtastic/builder/base.rb b/lib/formtastic/builder/base.rb
index e5e70608a..e2c65c62d 100644
--- a/lib/formtastic/builder/base.rb
+++ b/lib/formtastic/builder/base.rb
@@ -92,63 +92,6 @@ def self.configure(name, value = nil)
       
       protected
         
-        # Generates a fieldset and wraps the content in an ordered list. When working
-        # with nested attributes, 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.dup.delete(:name).to_s
-          legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
-          legend  = template.content_tag(:legend, template.content_tag(:span, Formtastic::Util.html_safe(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
-    
-          # 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,
-            Formtastic::Util.html_safe(legend) << template.content_tag(:ol, Formtastic::Util.html_safe(contents)),
-            html_options.except(:builder, :parent)
-          )
-    
-          fieldset
-        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) #:nodoc:
-          contents = contents.join if contents.respond_to?(:join)
-    
-          template.content_tag(:fieldset,
-              template.content_tag(:legend,
-                  label(method, options_for_label(options).merge(:for => options.delete(:label_for))), :class => 'label'
-                ) <<
-              template.content_tag(:ol, Formtastic::Util.html_safe(contents))
-            )
-        end
-    
         def is_file?(method, options = {})
           @files ||= {}
           @files[method] ||= (options[:as].present? && options[:as] == :file) || begin
diff --git a/lib/formtastic/helpers/buttons_helper.rb b/lib/formtastic/helpers/buttons_helper.rb
index 08984ef56..a474f40cc 100644
--- a/lib/formtastic/helpers/buttons_helper.rb
+++ b/lib/formtastic/helpers/buttons_helper.rb
@@ -1,6 +1,10 @@
+require 'support/fieldset_wrapper'
+
 module Formtastic
   module Helpers
     module ButtonsHelper
+      include Support::FieldsetWrapper
+      
       # Creates a fieldset and ol tag wrapping for form buttons / actions as list items.
       # See inputs documentation for a full example.  The fieldset's default class attriute
       # is set to "buttons".
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 6ca0dd211..28f79fe27 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -1,7 +1,10 @@
+require 'support/fieldset_wrapper'
+
 module Formtastic
   module Helpers
     module InputsHelper
-
+      include Support::FieldsetWrapper
+      
       # Returns a suitable form input for the given +method+, using the database column information
       # and other factors (like the method name) to figure out what you probably want.
       #
diff --git a/lib/formtastic/inputs/support/timeish.rb b/lib/formtastic/inputs/support/timeish.rb
index d91500444..215f5d894 100644
--- a/lib/formtastic/inputs/support/timeish.rb
+++ b/lib/formtastic/inputs/support/timeish.rb
@@ -87,6 +87,20 @@ def date_or_datetime_input(method, options)
         
           hidden_fields_capture << field_set_and_list_wrapping_for_method(method, options.merge(:label_for => input_ids.first), list_items_capture)
         end
+        
+        # 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,
+                  label(method, options_for_label(options).merge(:for => options.delete(:label_for))), :class => 'label'
+                ) <<
+              template.content_tag(:ol, Formtastic::Util.html_safe(contents))
+            )
+        end
+
       end
     end
   end

From cb45c21860c26fddc70039015a2eb01fa5d52d4a Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 17 Jan 2011 17:14:07 +1100
Subject: [PATCH 456/992] moved is_file? in
 Helpers::Support::FileColumnDetection mv reflection_for to
 Formtastic::Reflection

---
 lib/formtastic/builder/base.rb                  | 15 ---------------
 lib/formtastic/helpers/errors_helper.rb         |  5 +++++
 lib/formtastic/helpers/inputs_helper.rb         |  4 ++++
 .../helpers/support/file_column_detection.rb    | 17 +++++++++++++++++
 lib/formtastic/inputs/select_input.rb           |  2 ++
 lib/formtastic/inputs/support/base.rb           |  3 +++
 lib/formtastic/reflection.rb                    | 10 ++++++++++
 7 files changed, 41 insertions(+), 15 deletions(-)
 create mode 100644 lib/formtastic/helpers/support/file_column_detection.rb
 create mode 100644 lib/formtastic/reflection.rb

diff --git a/lib/formtastic/builder/base.rb b/lib/formtastic/builder/base.rb
index e2c65c62d..55e3923e4 100644
--- a/lib/formtastic/builder/base.rb
+++ b/lib/formtastic/builder/base.rb
@@ -92,21 +92,6 @@ def self.configure(name, value = nil)
       
       protected
         
-        def is_file?(method, options = {})
-          @files ||= {}
-          @files[method] ||= (options[:as].present? && options[:as] == :file) || begin
-            file = @object.send(method) if @object && @object.respond_to?(method)
-            file && file_methods.any?{|m| file.respond_to?(m)}
-          end
-        end
-    
-        # 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
-    
         # 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
diff --git a/lib/formtastic/helpers/errors_helper.rb b/lib/formtastic/helpers/errors_helper.rb
index 0e9dadb0e..3989a108f 100644
--- a/lib/formtastic/helpers/errors_helper.rb
+++ b/lib/formtastic/helpers/errors_helper.rb
@@ -1,6 +1,11 @@
+require 'formtastic/helpers/support/file_column_detection'
+require 'formtastic/reflection'
+
 module Formtastic
   module Helpers
     module ErrorsHelper
+      include Support::FileColumnDetection
+      include Formtastic::Reflection
       
       # Generates error messages for given method names and for base.
       # You can pass a hash with html options that will be added to ul tag
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 28f79fe27..0932dce09 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -1,9 +1,13 @@
 require 'support/fieldset_wrapper'
+require 'formtastic/helpers/support/file_column_detection'
+require 'formtastic/reflection'
 
 module Formtastic
   module Helpers
     module InputsHelper
       include Support::FieldsetWrapper
+      include Support::FileColumnDetection
+      include Formtastic::Reflection
       
       # Returns a suitable form input for the given +method+, using the database column information
       # and other factors (like the method name) to figure out what you probably want.
diff --git a/lib/formtastic/helpers/support/file_column_detection.rb b/lib/formtastic/helpers/support/file_column_detection.rb
new file mode 100644
index 000000000..9964e3e40
--- /dev/null
+++ b/lib/formtastic/helpers/support/file_column_detection.rb
@@ -0,0 +1,17 @@
+module Formtastic
+  module Helpers
+    module Support
+      module FileColumnDetection
+        
+        def is_file?(method, options = {})
+          @files ||= {}
+          @files[method] ||= (options[:as].present? && options[:as] == :file) || begin
+            file = @object.send(method) if @object && @object.respond_to?(method)
+            file && file_methods.any?{|m| file.respond_to?(m)}
+          end
+        end
+      
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index dad198098..b3143c45f 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -1,9 +1,11 @@
 require 'support/base'
+require 'formtastic/reflection'
 
 module Formtastic
   module Inputs
     module SelectInput
       include Support::Base
+      include Formtastic::Reflection
       
       # 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
diff --git a/lib/formtastic/inputs/support/base.rb b/lib/formtastic/inputs/support/base.rb
index 46e5c99b4..4eac1b00a 100644
--- a/lib/formtastic/inputs/support/base.rb
+++ b/lib/formtastic/inputs/support/base.rb
@@ -1,7 +1,10 @@
+require 'formtastic/reflection'
+
 module Formtastic
   module Inputs
     module Support
       module Base
+        include Formtastic::Reflection
 
         def set_include_blank(options)
           unless options.key?(:include_blank) || options.key?(:prompt)
diff --git a/lib/formtastic/reflection.rb b/lib/formtastic/reflection.rb
new file mode 100644
index 000000000..817ba0ea9
--- /dev/null
+++ b/lib/formtastic/reflection.rb
@@ -0,0 +1,10 @@
+module Formtastic
+  module Reflection
+    # 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
+  end
+end
\ No newline at end of file

From 56a1516408b2da73330451b3f6de92ba42b962c4 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 17 Jan 2011 21:25:58 +1100
Subject: [PATCH 457/992] didn't feel like there was need for the
 inputs/support namespace

---
 lib/formtastic/builder/base.rb                |   1 +
 lib/formtastic/inputs/base.rb                 | 118 +++++++++++++++++
 lib/formtastic/inputs/{support => }/basic.rb  |   0
 lib/formtastic/inputs/boolean_input.rb        |   4 +-
 lib/formtastic/inputs/check_boxes_input.rb    |   4 +-
 lib/formtastic/inputs/country_input.rb        |   4 +-
 lib/formtastic/inputs/date_input.rb           |   6 +-
 lib/formtastic/inputs/datetime_input.rb       |   6 +-
 lib/formtastic/inputs/email_input.rb          |   6 +-
 lib/formtastic/inputs/file_input.rb           |   6 +-
 lib/formtastic/inputs/hidden_input.rb         |   4 +-
 lib/formtastic/inputs/numeric_input.rb        |   5 +-
 lib/formtastic/inputs/password_input.rb       |   5 +-
 lib/formtastic/inputs/phone_input.rb          |   5 +-
 lib/formtastic/inputs/radio_input.rb          |   4 +-
 lib/formtastic/inputs/search_input.rb         |   5 +-
 lib/formtastic/inputs/select_input.rb         |   3 +-
 lib/formtastic/inputs/string_input.rb         |   5 +-
 lib/formtastic/inputs/support/base.rb         | 120 ------------------
 lib/formtastic/inputs/text_input.rb           |   2 +-
 lib/formtastic/inputs/time_input.rb           |   2 +-
 .../inputs/{support => }/timeish.rb           |   0
 22 files changed, 152 insertions(+), 163 deletions(-)
 create mode 100644 lib/formtastic/inputs/base.rb
 rename lib/formtastic/inputs/{support => }/basic.rb (100%)
 delete mode 100644 lib/formtastic/inputs/support/base.rb
 rename lib/formtastic/inputs/{support => }/timeish.rb (100%)

diff --git a/lib/formtastic/builder/base.rb b/lib/formtastic/builder/base.rb
index 55e3923e4..8da915160 100644
--- a/lib/formtastic/builder/base.rb
+++ b/lib/formtastic/builder/base.rb
@@ -1,3 +1,4 @@
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..')))
 $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'helpers')))
 $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'inputs')))
 
diff --git a/lib/formtastic/inputs/base.rb b/lib/formtastic/inputs/base.rb
new file mode 100644
index 000000000..9b385fdf3
--- /dev/null
+++ b/lib/formtastic/inputs/base.rb
@@ -0,0 +1,118 @@
+require 'formtastic/reflection'
+
+module Formtastic
+  module Inputs
+    module Base
+      include Formtastic::Reflection
+    
+      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
+      
+      def escape_html_entities(string) #:nodoc:
+        if escape_html_entities_in_hints_and_labels
+          # Acceppt html_safe flag as indicator to skip escaping
+          string = template.escape_once(string) unless string.respond_to?(:html_safe?) && string.html_safe? == true
+        end
+        string
+      end
+      
+      # Prepare options to be sent to label
+      def options_for_label(options) #:nodoc:
+        options.slice(:label, :required).merge!(options.fetch(:label_html, {}))
+      end
+      
+      # 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, :find_options, :class)
+      end
+      
+      # Generates the legend for radiobuttons and checkboxes
+      def legend_tag(method, options = {})
+        if options[:label] == false
+          Formtastic::Util.html_safe("")
+        else
+          text = localized_string(method, options[:label], :label) || humanized_attribute_name(method)
+          text += required_or_optional_string(options.delete(:required))
+          text = Formtastic::Util.html_safe(text)
+          template.content_tag :legend, template.label_tag(nil, text, :for => nil), :class => :label
+        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 a plain string
+        return collection if collection.instance_of?(String) || collection.instance_of?(::Formtastic::Util.rails_safe_buffer_class)
+    
+        # 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) &&
+                             !(options.include?(:label_method) || options.include?(:value_method))
+    
+        label, value = detect_label_and_value_method!(collection, options)
+        collection.map { |o| [send_or_call(label, o), send_or_call(value, o)] }
+      end
+      
+      # Detects the label and value methods from a collection using methods set in
+      # collection_label_methods and collection_value_methods. For some ruby core
+      # classes sensible defaults have been defined. It will use and delete the options
+      # :label_method and :value_methods when present.
+      #
+      def detect_label_and_value_method!(collection, options = {})
+        sample = collection.first || collection.last
+    
+        case sample
+        when Array
+          label, value = :first, :last
+        when Integer
+          label, value = :to_s, :to_i
+        when String, NilClass
+          label, value = :to_s, :to_s
+        end
+    
+        # Order of preference: user supplied method, class defaults, auto-detect
+        label = options[:label_method] || label || collection_label_methods.find { |m| sample.respond_to?(m) }
+        value = options[:value_method] || value || collection_value_methods.find { |m| sample.respond_to?(m) }
+    
+        [label, value]
+      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 = 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
+    
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/support/basic.rb b/lib/formtastic/inputs/basic.rb
similarity index 100%
rename from lib/formtastic/inputs/support/basic.rb
rename to lib/formtastic/inputs/basic.rb
diff --git a/lib/formtastic/inputs/boolean_input.rb b/lib/formtastic/inputs/boolean_input.rb
index abf0bce28..46222475e 100644
--- a/lib/formtastic/inputs/boolean_input.rb
+++ b/lib/formtastic/inputs/boolean_input.rb
@@ -1,9 +1,9 @@
-require 'support/base'
+require 'inputs/base'
 
 module Formtastic
   module Inputs
     module BooleanInput
-      include Support::Base
+      include Formtastic::Inputs::Base
       
       # 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.
diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index 5cc64f988..bed9b8eda 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -1,9 +1,9 @@
-require 'support/base'
+require 'inputs/base'
 
 module Formtastic
   module Inputs
     module CheckBoxesInput
-      include Support::Base
+      include Formtastic::Inputs::Base
       
       # 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
diff --git a/lib/formtastic/inputs/country_input.rb b/lib/formtastic/inputs/country_input.rb
index 1e3599f1f..a0405d0d4 100644
--- a/lib/formtastic/inputs/country_input.rb
+++ b/lib/formtastic/inputs/country_input.rb
@@ -1,9 +1,9 @@
-require 'support/base'
+require 'inputs/base'
 
 module Formtastic
   module Inputs
     module CountryInput
-      include Support::Base
+      include Formtastic::Inputs::Base
       
       # 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
diff --git a/lib/formtastic/inputs/date_input.rb b/lib/formtastic/inputs/date_input.rb
index 74bb88428..23619f9c8 100644
--- a/lib/formtastic/inputs/date_input.rb
+++ b/lib/formtastic/inputs/date_input.rb
@@ -1,10 +1,10 @@
-require 'support/base'
-require 'support/timeish'
+require 'inputs/timeish'
+require 'inputs/base'
 
 module Formtastic
   module Inputs
     module DateInput
-      include Support::Base
+      include Formtastic::Inputs::Base
       include Support::Timeish
       
       # Outputs a fieldset with a legend for the method label, and a ordered list (ol) of list
diff --git a/lib/formtastic/inputs/datetime_input.rb b/lib/formtastic/inputs/datetime_input.rb
index eee469626..327b75a98 100644
--- a/lib/formtastic/inputs/datetime_input.rb
+++ b/lib/formtastic/inputs/datetime_input.rb
@@ -1,10 +1,10 @@
-require 'support/base'
-require 'support/timeish'
+require 'inputs/timeish'
+require 'inputs/base'
 
 module Formtastic
   module Inputs
     module DatetimeInput
-      include Support::Base
+      include Formtastic::Inputs::Base
       include Support::Timeish
       
       # Outputs a fieldset with a legend for the method label, and a ordered list (ol) of list
diff --git a/lib/formtastic/inputs/email_input.rb b/lib/formtastic/inputs/email_input.rb
index 413eeb2e6..195198423 100644
--- a/lib/formtastic/inputs/email_input.rb
+++ b/lib/formtastic/inputs/email_input.rb
@@ -1,10 +1,10 @@
-require 'support/base'
-require 'support/basic'
+require 'inputs/basic'
+require 'inputs/base'
 
 module Formtastic
   module Inputs
     module EmailInput
-      include Support::Base
+      include Formtastic::Inputs::Base
       include Support::Basic
       
       # Outputs a label and a standard Rails email field inside the wrapper.
diff --git a/lib/formtastic/inputs/file_input.rb b/lib/formtastic/inputs/file_input.rb
index ad032c04e..4a67f22d8 100644
--- a/lib/formtastic/inputs/file_input.rb
+++ b/lib/formtastic/inputs/file_input.rb
@@ -1,10 +1,10 @@
-require 'support/base'
-require 'support/basic'
+require 'inputs/basic'
+require 'inputs/base'
 
 module Formtastic
   module Inputs
     module FileInput
-      include Support::Base
+      include Formtastic::Inputs::Base
       include Support::Basic
       
       # Outputs a label and a standard Rails file field inside the wrapper.
diff --git a/lib/formtastic/inputs/hidden_input.rb b/lib/formtastic/inputs/hidden_input.rb
index d7da0bdf5..4aa94f761 100644
--- a/lib/formtastic/inputs/hidden_input.rb
+++ b/lib/formtastic/inputs/hidden_input.rb
@@ -1,9 +1,7 @@
-require 'support/base'
-
 module Formtastic
   module Inputs
     module HiddenInput
-      include Support::Base
+      include Formtastic::Inputs::Base
       
       # Outputs a hidden field inside the wrapper, which should be hidden with CSS.
       # Additionals options can be given using :input_hml. Should :input_html not be
diff --git a/lib/formtastic/inputs/numeric_input.rb b/lib/formtastic/inputs/numeric_input.rb
index 83788451d..a9a38676a 100644
--- a/lib/formtastic/inputs/numeric_input.rb
+++ b/lib/formtastic/inputs/numeric_input.rb
@@ -1,10 +1,9 @@
-require 'support/base'
-require 'support/basic'
+require 'inputs/basic'
 
 module Formtastic
   module Inputs
     module NumericInput
-      include Support::Base
+      include Formtastic::Inputs::Base
       include Support::Basic
       
       # Outputs a label and standard Rails text field inside the wrapper.
diff --git a/lib/formtastic/inputs/password_input.rb b/lib/formtastic/inputs/password_input.rb
index 88ecf5236..01d2133bb 100644
--- a/lib/formtastic/inputs/password_input.rb
+++ b/lib/formtastic/inputs/password_input.rb
@@ -1,10 +1,9 @@
-require 'support/base'
-require 'support/basic'
+require 'inputs/basic'
 
 module Formtastic
   module Inputs
     module PasswordInput
-      include Support::Base
+      include Formtastic::Inputs::Base
       include Support::Basic
       
       # Outputs a label and standard Rails password field inside the wrapper.
diff --git a/lib/formtastic/inputs/phone_input.rb b/lib/formtastic/inputs/phone_input.rb
index bfcad853a..3cac04850 100644
--- a/lib/formtastic/inputs/phone_input.rb
+++ b/lib/formtastic/inputs/phone_input.rb
@@ -1,10 +1,9 @@
-require 'support/base'
-require 'support/basic'
+require 'inputs/basic'
 
 module Formtastic
   module Inputs
     module PhoneInput
-      include Support::Base
+      include Formtastic::Inputs::Base
       include Support::Basic
 
       # Outputs a label and a standard Rails phone field inside the wrapper.
diff --git a/lib/formtastic/inputs/radio_input.rb b/lib/formtastic/inputs/radio_input.rb
index 7fb8784b9..fd57915f7 100644
--- a/lib/formtastic/inputs/radio_input.rb
+++ b/lib/formtastic/inputs/radio_input.rb
@@ -1,9 +1,7 @@
-require 'support/base'
-
 module Formtastic
   module Inputs
     module RadioInput
-      include Support::Base
+      include Formtastic::Inputs::Base
       
       # 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
diff --git a/lib/formtastic/inputs/search_input.rb b/lib/formtastic/inputs/search_input.rb
index 1e19c9de2..50487c72f 100644
--- a/lib/formtastic/inputs/search_input.rb
+++ b/lib/formtastic/inputs/search_input.rb
@@ -1,10 +1,9 @@
-require 'support/base'
-require 'support/basic'
+require 'inputs/basic'
 
 module Formtastic
   module Inputs
     module SearchInput
-      include Support::Base
+      include Formtastic::Inputs::Base
       include Support::Basic
       
       # Outputs a label and a standard Rails search field inside the wrapper.
diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index b3143c45f..59651effd 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -1,10 +1,9 @@
-require 'support/base'
 require 'formtastic/reflection'
 
 module Formtastic
   module Inputs
     module SelectInput
-      include Support::Base
+      include Formtastic::Inputs::Base
       include Formtastic::Reflection
       
       # Outputs a label and a select box containing options from the parent
diff --git a/lib/formtastic/inputs/string_input.rb b/lib/formtastic/inputs/string_input.rb
index de14a6046..c67438b76 100644
--- a/lib/formtastic/inputs/string_input.rb
+++ b/lib/formtastic/inputs/string_input.rb
@@ -1,10 +1,9 @@
-require 'support/base'
-require 'support/basic'
+require 'inputs/basic'
 
 module Formtastic
   module Inputs
     module StringInput
-      include Support::Base
+      include Formtastic::Inputs::Base
       include Support::Basic
       # Outputs a label and standard Rails text field inside the wrapper.
       def string_input(method, options)
diff --git a/lib/formtastic/inputs/support/base.rb b/lib/formtastic/inputs/support/base.rb
deleted file mode 100644
index 4eac1b00a..000000000
--- a/lib/formtastic/inputs/support/base.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-require 'formtastic/reflection'
-
-module Formtastic
-  module Inputs
-    module Support
-      module Base
-        include Formtastic::Reflection
-
-        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
-        
-        def escape_html_entities(string) #:nodoc:
-          if escape_html_entities_in_hints_and_labels
-            # Acceppt html_safe flag as indicator to skip escaping
-            string = template.escape_once(string) unless string.respond_to?(:html_safe?) && string.html_safe? == true
-          end
-          string
-        end
-        
-        # Prepare options to be sent to label
-        def options_for_label(options) #:nodoc:
-          options.slice(:label, :required).merge!(options.fetch(:label_html, {}))
-        end
-        
-        # 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, :find_options, :class)
-        end
-        
-        # Generates the legend for radiobuttons and checkboxes
-        def legend_tag(method, options = {})
-          if options[:label] == false
-            Formtastic::Util.html_safe("")
-          else
-            text = localized_string(method, options[:label], :label) || humanized_attribute_name(method)
-            text += required_or_optional_string(options.delete(:required))
-            text = Formtastic::Util.html_safe(text)
-            template.content_tag :legend, template.label_tag(nil, text, :for => nil), :class => :label
-          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 a plain string
-          return collection if collection.instance_of?(String) || collection.instance_of?(::Formtastic::Util.rails_safe_buffer_class)
-    
-          # 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) &&
-                               !(options.include?(:label_method) || options.include?(:value_method))
-    
-          label, value = detect_label_and_value_method!(collection, options)
-          collection.map { |o| [send_or_call(label, o), send_or_call(value, o)] }
-        end
-        
-        # Detects the label and value methods from a collection using methods set in
-        # collection_label_methods and collection_value_methods. For some ruby core
-        # classes sensible defaults have been defined. It will use and delete the options
-        # :label_method and :value_methods when present.
-        #
-        def detect_label_and_value_method!(collection, options = {})
-          sample = collection.first || collection.last
-    
-          case sample
-          when Array
-            label, value = :first, :last
-          when Integer
-            label, value = :to_s, :to_i
-          when String, NilClass
-            label, value = :to_s, :to_s
-          end
-    
-          # Order of preference: user supplied method, class defaults, auto-detect
-          label = options[:label_method] || label || collection_label_methods.find { |m| sample.respond_to?(m) }
-          value = options[:value_method] || value || collection_value_methods.find { |m| sample.respond_to?(m) }
-    
-          [label, value]
-        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 = 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
-    
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/text_input.rb b/lib/formtastic/inputs/text_input.rb
index f9dc3143c..e7b36b607 100644
--- a/lib/formtastic/inputs/text_input.rb
+++ b/lib/formtastic/inputs/text_input.rb
@@ -1,4 +1,4 @@
-require 'support/basic'
+require 'inputs/basic'
 
 module Formtastic
   module Inputs
diff --git a/lib/formtastic/inputs/time_input.rb b/lib/formtastic/inputs/time_input.rb
index 28b1c8605..836b52d9f 100644
--- a/lib/formtastic/inputs/time_input.rb
+++ b/lib/formtastic/inputs/time_input.rb
@@ -1,4 +1,4 @@
-require 'support/timeish'
+require 'inputs/timeish'
 
 module Formtastic
   module Inputs
diff --git a/lib/formtastic/inputs/support/timeish.rb b/lib/formtastic/inputs/timeish.rb
similarity index 100%
rename from lib/formtastic/inputs/support/timeish.rb
rename to lib/formtastic/inputs/timeish.rb

From 0492221c5e1f5e67e54ce76d99951b43539b1dd7 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 17 Jan 2011 21:31:03 +1100
Subject: [PATCH 458/992] didn't feel like there was much need for the
 helpers/support namespace

---
 lib/formtastic/helpers/buttons_helper.rb      |  4 +-
 lib/formtastic/helpers/errors_helper.rb       |  4 +-
 lib/formtastic/helpers/fieldset_wrapper.rb    | 50 ++++++++++++++++++
 .../helpers/file_column_detection.rb          | 15 ++++++
 lib/formtastic/helpers/inputs_helper.rb       |  8 +--
 .../helpers/support/fieldset_wrapper.rb       | 52 -------------------
 .../helpers/support/file_column_detection.rb  | 17 ------
 7 files changed, 73 insertions(+), 77 deletions(-)
 create mode 100644 lib/formtastic/helpers/fieldset_wrapper.rb
 create mode 100644 lib/formtastic/helpers/file_column_detection.rb
 delete mode 100644 lib/formtastic/helpers/support/fieldset_wrapper.rb
 delete mode 100644 lib/formtastic/helpers/support/file_column_detection.rb

diff --git a/lib/formtastic/helpers/buttons_helper.rb b/lib/formtastic/helpers/buttons_helper.rb
index a474f40cc..ae4d3be1f 100644
--- a/lib/formtastic/helpers/buttons_helper.rb
+++ b/lib/formtastic/helpers/buttons_helper.rb
@@ -1,9 +1,9 @@
-require 'support/fieldset_wrapper'
+require 'helpers/fieldset_wrapper'
 
 module Formtastic
   module Helpers
     module ButtonsHelper
-      include Support::FieldsetWrapper
+      include Formtastic::Helpers::FieldsetWrapper
       
       # Creates a fieldset and ol tag wrapping for form buttons / actions as list items.
       # See inputs documentation for a full example.  The fieldset's default class attriute
diff --git a/lib/formtastic/helpers/errors_helper.rb b/lib/formtastic/helpers/errors_helper.rb
index 3989a108f..fdc71e187 100644
--- a/lib/formtastic/helpers/errors_helper.rb
+++ b/lib/formtastic/helpers/errors_helper.rb
@@ -1,10 +1,10 @@
-require 'formtastic/helpers/support/file_column_detection'
+require 'helpers/file_column_detection'
 require 'formtastic/reflection'
 
 module Formtastic
   module Helpers
     module ErrorsHelper
-      include Support::FileColumnDetection
+      include Formtastic::Helpers::FileColumnDetection
       include Formtastic::Reflection
       
       # Generates error messages for given method names and for base.
diff --git a/lib/formtastic/helpers/fieldset_wrapper.rb b/lib/formtastic/helpers/fieldset_wrapper.rb
new file mode 100644
index 000000000..78483b7d5
--- /dev/null
+++ b/lib/formtastic/helpers/fieldset_wrapper.rb
@@ -0,0 +1,50 @@
+module Formtastic
+  module Helpers
+    module FieldsetWrapper
+    
+      protected
+      
+      # Generates a fieldset and wraps the content in an ordered list. When working
+      # with nested attributes, 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.dup.delete(:name).to_s
+        legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
+        legend  = template.content_tag(:legend, template.content_tag(:span, Formtastic::Util.html_safe(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
+      
+        # 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,
+          Formtastic::Util.html_safe(legend) << template.content_tag(:ol, Formtastic::Util.html_safe(contents)),
+          html_options.except(:builder, :parent)
+        )
+      
+        fieldset
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/helpers/file_column_detection.rb b/lib/formtastic/helpers/file_column_detection.rb
new file mode 100644
index 000000000..da079214c
--- /dev/null
+++ b/lib/formtastic/helpers/file_column_detection.rb
@@ -0,0 +1,15 @@
+module Formtastic
+  module Helpers
+    module FileColumnDetection
+      
+      def is_file?(method, options = {})
+        @files ||= {}
+        @files[method] ||= (options[:as].present? && options[:as] == :file) || begin
+          file = @object.send(method) if @object && @object.respond_to?(method)
+          file && file_methods.any?{|m| file.respond_to?(m)}
+        end
+      end
+    
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 0932dce09..bf708e81d 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -1,12 +1,12 @@
-require 'support/fieldset_wrapper'
-require 'formtastic/helpers/support/file_column_detection'
+require 'helpers/fieldset_wrapper'
+require 'helpers/file_column_detection'
 require 'formtastic/reflection'
 
 module Formtastic
   module Helpers
     module InputsHelper
-      include Support::FieldsetWrapper
-      include Support::FileColumnDetection
+      include Formtastic::Helpers::FieldsetWrapper
+      include Formtastic::Helpers::FileColumnDetection
       include Formtastic::Reflection
       
       # Returns a suitable form input for the given +method+, using the database column information
diff --git a/lib/formtastic/helpers/support/fieldset_wrapper.rb b/lib/formtastic/helpers/support/fieldset_wrapper.rb
deleted file mode 100644
index a49d8eb69..000000000
--- a/lib/formtastic/helpers/support/fieldset_wrapper.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-module Formtastic
-  module Helpers
-    module Support
-      module FieldsetWrapper
-    
-        protected
-        
-        # Generates a fieldset and wraps the content in an ordered list. When working
-        # with nested attributes, 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.dup.delete(:name).to_s
-          legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
-          legend  = template.content_tag(:legend, template.content_tag(:span, Formtastic::Util.html_safe(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
-        
-          # 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,
-            Formtastic::Util.html_safe(legend) << template.content_tag(:ol, Formtastic::Util.html_safe(contents)),
-            html_options.except(:builder, :parent)
-          )
-        
-          fieldset
-        end
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/lib/formtastic/helpers/support/file_column_detection.rb b/lib/formtastic/helpers/support/file_column_detection.rb
deleted file mode 100644
index 9964e3e40..000000000
--- a/lib/formtastic/helpers/support/file_column_detection.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module Formtastic
-  module Helpers
-    module Support
-      module FileColumnDetection
-        
-        def is_file?(method, options = {})
-          @files ||= {}
-          @files[method] ||= (options[:as].present? && options[:as] == :file) || begin
-            file = @object.send(method) if @object && @object.respond_to?(method)
-            file && file_methods.any?{|m| file.respond_to?(m)}
-          end
-        end
-      
-      end
-    end
-  end
-end
\ No newline at end of file

From 4535e663f556c92456f049edf3bc8dea9982bc3e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 17 Jan 2011 21:38:19 +1100
Subject: [PATCH 459/992] fiddling with some require statements

---
 lib/formtastic/builder/base.rb          | 48 ++++++++++++-------------
 lib/formtastic/helpers/errors_helper.rb |  2 +-
 lib/formtastic/helpers/inputs_helper.rb |  2 +-
 lib/formtastic/inputs/base.rb           |  2 +-
 lib/formtastic/inputs/select_input.rb   |  2 +-
 5 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/lib/formtastic/builder/base.rb b/lib/formtastic/builder/base.rb
index 8da915160..2a5015ad6 100644
--- a/lib/formtastic/builder/base.rb
+++ b/lib/formtastic/builder/base.rb
@@ -1,31 +1,29 @@
 $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..')))
-$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'helpers')))
-$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'inputs')))
 
-require 'inputs_helper'
-require 'buttons_helper'
-require 'label_helper'
-require 'errors_helper'
+require 'helpers/inputs_helper'
+require 'helpers/buttons_helper'
+require 'helpers/label_helper'
+require 'helpers/errors_helper'
 
-require 'boolean_input'
-require 'check_boxes_input'
-require 'country_input'
-require 'datetime_input'
-require 'date_input'
-require 'email_input'
-require 'file_input'
-require 'hidden_input'
-require 'numeric_input'
-require 'password_input'
-require 'phone_input'
-require 'radio_input'
-require 'search_input'
-require 'select_input'
-require 'string_input'
-require 'text_input'
-require 'time_input'
-require 'time_zone_input'
-require 'url_input'
+require 'inputs/boolean_input'
+require 'inputs/check_boxes_input'
+require 'inputs/country_input'
+require 'inputs/datetime_input'
+require 'inputs/date_input'
+require 'inputs/email_input'
+require 'inputs/file_input'
+require 'inputs/hidden_input'
+require 'inputs/numeric_input'
+require 'inputs/password_input'
+require 'inputs/phone_input'
+require 'inputs/radio_input'
+require 'inputs/search_input'
+require 'inputs/select_input'
+require 'inputs/string_input'
+require 'inputs/text_input'
+require 'inputs/time_input'
+require 'inputs/time_zone_input'
+require 'inputs/url_input'
 
 module Formtastic
   module Builder
diff --git a/lib/formtastic/helpers/errors_helper.rb b/lib/formtastic/helpers/errors_helper.rb
index fdc71e187..c2277a452 100644
--- a/lib/formtastic/helpers/errors_helper.rb
+++ b/lib/formtastic/helpers/errors_helper.rb
@@ -1,5 +1,5 @@
 require 'helpers/file_column_detection'
-require 'formtastic/reflection'
+require 'reflection'
 
 module Formtastic
   module Helpers
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index bf708e81d..a611f8de7 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -1,6 +1,6 @@
 require 'helpers/fieldset_wrapper'
 require 'helpers/file_column_detection'
-require 'formtastic/reflection'
+require 'reflection'
 
 module Formtastic
   module Helpers
diff --git a/lib/formtastic/inputs/base.rb b/lib/formtastic/inputs/base.rb
index 9b385fdf3..2e6a6b148 100644
--- a/lib/formtastic/inputs/base.rb
+++ b/lib/formtastic/inputs/base.rb
@@ -1,4 +1,4 @@
-require 'formtastic/reflection'
+require 'reflection'
 
 module Formtastic
   module Inputs
diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index 59651effd..f7d1b5f51 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -1,4 +1,4 @@
-require 'formtastic/reflection'
+require 'reflection'
 
 module Formtastic
   module Inputs

From 4e88ade0ce12e0f9d2617b51a64bc16783330970 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 18 Jan 2011 06:36:32 +1100
Subject: [PATCH 460/992] rename Builder::Base to FormBuilder

---
 lib/formtastic.rb                       |   2 +-
 lib/formtastic/builder/base.rb          | 223 ------------------------
 lib/formtastic/form_builder.rb          | 221 +++++++++++++++++++++++
 lib/formtastic/helpers/errors_helper.rb |   2 +-
 lib/formtastic/helpers/inputs_helper.rb |   2 +-
 5 files changed, 224 insertions(+), 226 deletions(-)
 delete mode 100644 lib/formtastic/builder/base.rb
 create mode 100644 lib/formtastic/form_builder.rb

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 9a926b2cd..e25d338c6 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -2,5 +2,5 @@
 require File.join(File.dirname(__FILE__), *%w[formtastic i18n])
 require File.join(File.dirname(__FILE__), *%w[formtastic util])
 require File.join(File.dirname(__FILE__), *%w[formtastic railtie]) if defined?(::Rails::Railtie)
-require File.join(File.dirname(__FILE__), *%w[formtastic builder base])
+require File.join(File.dirname(__FILE__), *%w[formtastic form_builder])
 require File.join(File.dirname(__FILE__), *%w[formtastic helpers form_helper])
diff --git a/lib/formtastic/builder/base.rb b/lib/formtastic/builder/base.rb
deleted file mode 100644
index 2a5015ad6..000000000
--- a/lib/formtastic/builder/base.rb
+++ /dev/null
@@ -1,223 +0,0 @@
-$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..')))
-
-require 'helpers/inputs_helper'
-require 'helpers/buttons_helper'
-require 'helpers/label_helper'
-require 'helpers/errors_helper'
-
-require 'inputs/boolean_input'
-require 'inputs/check_boxes_input'
-require 'inputs/country_input'
-require 'inputs/datetime_input'
-require 'inputs/date_input'
-require 'inputs/email_input'
-require 'inputs/file_input'
-require 'inputs/hidden_input'
-require 'inputs/numeric_input'
-require 'inputs/password_input'
-require 'inputs/phone_input'
-require 'inputs/radio_input'
-require 'inputs/search_input'
-require 'inputs/select_input'
-require 'inputs/string_input'
-require 'inputs/text_input'
-require 'inputs/time_input'
-require 'inputs/time_zone_input'
-require 'inputs/url_input'
-
-module Formtastic
-  module Builder
-    class Base < ActionView::Helpers::FormBuilder
-    
-      def self.configure(name, value = nil)
-        class_attribute(name)
-        self.send(:"#{name}=", value)  
-      end
-    
-      configure :custom_namespace
-      configure :default_text_field_size
-      configure :default_text_area_height, 20
-      configure :default_text_area_width
-      configure :all_fields_required_by_default, true
-      configure :include_blank_for_select_by_default, true
-      configure :required_string, proc { ::Formtastic::Util.html_safe(%{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>}) }
-      configure :optional_string, ''
-      configure :inline_errors, :sentence
-      configure :label_str_method, :humanize
-      configure :collection_label_methods, %w[to_label display_name full_name name title username login value to_s]
-      configure :collection_value_methods, %w[id to_s]
-      configure :inline_order, [ :input, :hints, :errors ]
-      configure :custom_inline_order, {}
-      configure :file_methods, [ :file?, :public_filename, :filename ]
-      configure :file_metadata_suffixes, ['content_type', 'file_name', 'file_size']
-      configure :priority_countries, ["Australia", "Canada", "United Kingdom", "United States"]
-      configure :i18n_lookups_by_default, false
-      configure :escape_html_entities_in_hints_and_labels, true
-      configure :default_commit_button_accesskey
-      configure :default_inline_error_class, 'inline-errors'
-      configure :default_error_list_class, 'errors'
-      configure :default_hint_class, 'inline-hints'
-    
-      RESERVED_COLUMNS = [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
-    
-      INLINE_ERROR_TYPES = [:sentence, :list, :first]
-    
-      attr_accessor :template
-      
-      include Formtastic::Helpers::InputsHelper
-      include Formtastic::Helpers::ButtonsHelper
-      include Formtastic::Helpers::LabelHelper
-      include Formtastic::Helpers::ErrorsHelper
-
-      include Formtastic::Inputs::BooleanInput
-      include Formtastic::Inputs::CheckBoxesInput
-      include Formtastic::Inputs::CountryInput
-      include Formtastic::Inputs::DateInput
-      include Formtastic::Inputs::DatetimeInput
-      include Formtastic::Inputs::EmailInput
-      include Formtastic::Inputs::FileInput
-      include Formtastic::Inputs::HiddenInput
-      include Formtastic::Inputs::NumericInput
-      include Formtastic::Inputs::PasswordInput
-      include Formtastic::Inputs::PhoneInput
-      include Formtastic::Inputs::RadioInput
-      include Formtastic::Inputs::SearchInput
-      include Formtastic::Inputs::SelectInput
-      include Formtastic::Inputs::StringInput
-      include Formtastic::Inputs::TextInput
-      include Formtastic::Inputs::TimeInput
-      include Formtastic::Inputs::TimeZoneInput
-      include Formtastic::Inputs::UrlInput
-      
-      protected
-        
-        # 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:
-          index = if options.has_key?(:index)
-                    options[:index]
-                  elsif defined?(@auto_index)
-                    @auto_index
-                  else
-                    ""
-                  end
-          sanitized_method_name = method_name.to_s.gsub(/[\?\/\-]$/, '')
-    
-          [custom_namespace, sanitized_object_name, index, sanitized_method_name, value].reject{|x|x.blank?}.join('_')
-        end
-    
-        # Gets the nested_child_index value from the parent builder. 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')
-    
-          child = parent[:for]
-          child = child.first if child.respond_to?(:first)
-          duck[child].to_i + 1
-        end
-    
-        def sanitized_object_name #:nodoc:
-          @sanitized_object_name ||= @object_name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
-        end
-    
-        def humanized_attribute_name(method) #:nodoc:
-          if @object && @object.class.respond_to?(:human_attribute_name)
-            humanized_name = @object.class.human_attribute_name(method.to_s)
-            if humanized_name == method.to_s.send(:humanize)
-              method.to_s.send(label_str_method)
-            else
-              humanized_name
-            end
-          else
-            method.to_s.send(label_str_method)
-          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 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)
-            escape_html_entities(value)
-          else
-            use_i18n = value.nil? ? i18n_lookups_by_default : (value != false)
-    
-            if use_i18n
-              model_name, nested_model_name  = normalize_model_name(self.model_name.underscore)
-              action_name = template.params[:action].to_s rescue ''
-              attribute_name = key.to_s
-    
-              defaults = ::Formtastic::I18n::SCOPES.reject do |i18n_scope|
-                nested_model_name.nil? && i18n_scope.match(/nested_model/)
-              end.collect do |i18n_scope|
-                i18n_path = i18n_scope.dup
-                i18n_path.gsub!('%{action}', action_name)
-                i18n_path.gsub!('%{model}', model_name)
-                i18n_path.gsub!('%{nested_model}', nested_model_name) unless nested_model_name.nil?
-                i18n_path.gsub!('%{attribute}', attribute_name)
-                i18n_path.gsub!('..', '.')
-                i18n_path.to_sym
-              end
-              defaults << ''
-    
-              defaults.uniq!
-    
-              default_key = defaults.shift
-              i18n_value = ::Formtastic::I18n.t(default_key,
-                options.merge(:default => defaults, :scope => type.to_s.pluralize.to_sym))
-              if i18n_value.blank? && type == :label
-                # This is effectively what Rails label helper does for i18n lookup
-                options[:scope] = [:helpers, type]
-                options[:default] = defaults
-                i18n_value = ::I18n.t(default_key, options)
-              end
-              i18n_value = escape_html_entities(i18n_value) if i18n_value.is_a?(::String)
-              i18n_value.blank? ? nil : i18n_value
-            end
-          end
-        end
-    
-        def model_name
-          @object.present? ? @object.class.name : @object_name.to_s.classify
-        end
-    
-        def normalize_model_name(name)
-          if name =~ /(.+)\[(.+)\]/
-            [$1, $2]
-          else
-            [name]
-          end
-        end
-      
-    end
-  end
-  
-  # Quick hack/shim so that any code expecting the old SemanticFormBuilder class still works.
-  # TODO: migrate everything across
-  class SemanticFormBuilder < Formtastic::Builder::Base
-  end
-  
-end
\ No newline at end of file
diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
new file mode 100644
index 000000000..8702ee31e
--- /dev/null
+++ b/lib/formtastic/form_builder.rb
@@ -0,0 +1,221 @@
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__))))
+
+require 'helpers/inputs_helper'
+require 'helpers/buttons_helper'
+require 'helpers/label_helper'
+require 'helpers/errors_helper'
+
+require 'inputs/boolean_input'
+require 'inputs/check_boxes_input'
+require 'inputs/country_input'
+require 'inputs/datetime_input'
+require 'inputs/date_input'
+require 'inputs/email_input'
+require 'inputs/file_input'
+require 'inputs/hidden_input'
+require 'inputs/numeric_input'
+require 'inputs/password_input'
+require 'inputs/phone_input'
+require 'inputs/radio_input'
+require 'inputs/search_input'
+require 'inputs/select_input'
+require 'inputs/string_input'
+require 'inputs/text_input'
+require 'inputs/time_input'
+require 'inputs/time_zone_input'
+require 'inputs/url_input'
+
+module Formtastic
+  class FormBuilder < ActionView::Helpers::FormBuilder
+  
+    def self.configure(name, value = nil)
+      class_attribute(name)
+      self.send(:"#{name}=", value)  
+    end
+  
+    configure :custom_namespace
+    configure :default_text_field_size
+    configure :default_text_area_height, 20
+    configure :default_text_area_width
+    configure :all_fields_required_by_default, true
+    configure :include_blank_for_select_by_default, true
+    configure :required_string, proc { ::Formtastic::Util.html_safe(%{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>}) }
+    configure :optional_string, ''
+    configure :inline_errors, :sentence
+    configure :label_str_method, :humanize
+    configure :collection_label_methods, %w[to_label display_name full_name name title username login value to_s]
+    configure :collection_value_methods, %w[id to_s]
+    configure :inline_order, [ :input, :hints, :errors ]
+    configure :custom_inline_order, {}
+    configure :file_methods, [ :file?, :public_filename, :filename ]
+    configure :file_metadata_suffixes, ['content_type', 'file_name', 'file_size']
+    configure :priority_countries, ["Australia", "Canada", "United Kingdom", "United States"]
+    configure :i18n_lookups_by_default, false
+    configure :escape_html_entities_in_hints_and_labels, true
+    configure :default_commit_button_accesskey
+    configure :default_inline_error_class, 'inline-errors'
+    configure :default_error_list_class, 'errors'
+    configure :default_hint_class, 'inline-hints'
+  
+    RESERVED_COLUMNS = [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
+  
+    INLINE_ERROR_TYPES = [:sentence, :list, :first]
+  
+    attr_accessor :template
+    
+    include Formtastic::Helpers::InputsHelper
+    include Formtastic::Helpers::ButtonsHelper
+    include Formtastic::Helpers::LabelHelper
+    include Formtastic::Helpers::ErrorsHelper
+
+    include Formtastic::Inputs::BooleanInput
+    include Formtastic::Inputs::CheckBoxesInput
+    include Formtastic::Inputs::CountryInput
+    include Formtastic::Inputs::DateInput
+    include Formtastic::Inputs::DatetimeInput
+    include Formtastic::Inputs::EmailInput
+    include Formtastic::Inputs::FileInput
+    include Formtastic::Inputs::HiddenInput
+    include Formtastic::Inputs::NumericInput
+    include Formtastic::Inputs::PasswordInput
+    include Formtastic::Inputs::PhoneInput
+    include Formtastic::Inputs::RadioInput
+    include Formtastic::Inputs::SearchInput
+    include Formtastic::Inputs::SelectInput
+    include Formtastic::Inputs::StringInput
+    include Formtastic::Inputs::TextInput
+    include Formtastic::Inputs::TimeInput
+    include Formtastic::Inputs::TimeZoneInput
+    include Formtastic::Inputs::UrlInput
+    
+    protected
+      
+      # 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:
+        index = if options.has_key?(:index)
+                  options[:index]
+                elsif defined?(@auto_index)
+                  @auto_index
+                else
+                  ""
+                end
+        sanitized_method_name = method_name.to_s.gsub(/[\?\/\-]$/, '')
+  
+        [custom_namespace, sanitized_object_name, index, sanitized_method_name, value].reject{|x|x.blank?}.join('_')
+      end
+  
+      # Gets the nested_child_index value from the parent builder. 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')
+  
+        child = parent[:for]
+        child = child.first if child.respond_to?(:first)
+        duck[child].to_i + 1
+      end
+  
+      def sanitized_object_name #:nodoc:
+        @sanitized_object_name ||= @object_name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
+      end
+  
+      def humanized_attribute_name(method) #:nodoc:
+        if @object && @object.class.respond_to?(:human_attribute_name)
+          humanized_name = @object.class.human_attribute_name(method.to_s)
+          if humanized_name == method.to_s.send(:humanize)
+            method.to_s.send(label_str_method)
+          else
+            humanized_name
+          end
+        else
+          method.to_s.send(label_str_method)
+        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 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)
+          escape_html_entities(value)
+        else
+          use_i18n = value.nil? ? i18n_lookups_by_default : (value != false)
+  
+          if use_i18n
+            model_name, nested_model_name  = normalize_model_name(self.model_name.underscore)
+            action_name = template.params[:action].to_s rescue ''
+            attribute_name = key.to_s
+  
+            defaults = ::Formtastic::I18n::SCOPES.reject do |i18n_scope|
+              nested_model_name.nil? && i18n_scope.match(/nested_model/)
+            end.collect do |i18n_scope|
+              i18n_path = i18n_scope.dup
+              i18n_path.gsub!('%{action}', action_name)
+              i18n_path.gsub!('%{model}', model_name)
+              i18n_path.gsub!('%{nested_model}', nested_model_name) unless nested_model_name.nil?
+              i18n_path.gsub!('%{attribute}', attribute_name)
+              i18n_path.gsub!('..', '.')
+              i18n_path.to_sym
+            end
+            defaults << ''
+  
+            defaults.uniq!
+  
+            default_key = defaults.shift
+            i18n_value = ::Formtastic::I18n.t(default_key,
+              options.merge(:default => defaults, :scope => type.to_s.pluralize.to_sym))
+            if i18n_value.blank? && type == :label
+              # This is effectively what Rails label helper does for i18n lookup
+              options[:scope] = [:helpers, type]
+              options[:default] = defaults
+              i18n_value = ::I18n.t(default_key, options)
+            end
+            i18n_value = escape_html_entities(i18n_value) if i18n_value.is_a?(::String)
+            i18n_value.blank? ? nil : i18n_value
+          end
+        end
+      end
+  
+      def model_name
+        @object.present? ? @object.class.name : @object_name.to_s.classify
+      end
+  
+      def normalize_model_name(name)
+        if name =~ /(.+)\[(.+)\]/
+          [$1, $2]
+        else
+          [name]
+        end
+      end
+    
+  end
+  
+  # Quick hack/shim so that any code expecting the old SemanticFormBuilder class still works.
+  # TODO: migrate everything across
+  class SemanticFormBuilder < Formtastic::FormBuilder
+  end
+  
+end
\ No newline at end of file
diff --git a/lib/formtastic/helpers/errors_helper.rb b/lib/formtastic/helpers/errors_helper.rb
index c2277a452..112533e76 100644
--- a/lib/formtastic/helpers/errors_helper.rb
+++ b/lib/formtastic/helpers/errors_helper.rb
@@ -51,7 +51,7 @@ def has_errors?(method, options)
       end
       
       def render_inline_errors?
-        @object && @object.respond_to?(:errors) && Formtastic::Builder::Base::INLINE_ERROR_TYPES.include?(inline_errors)
+        @object && @object.respond_to?(:errors) && Formtastic::FormBuilder::INLINE_ERROR_TYPES.include?(inline_errors)
       end
       
       def association_macro_for_method(method) #:nodoc:
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index a611f8de7..f6ba2f862 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -253,7 +253,7 @@ def inputs(*args, &block)
           if @object && args.empty?
             args  = association_columns(:belongs_to)
             args += content_columns
-            args -= Formtastic::Builder::Base::RESERVED_COLUMNS
+            args -= Formtastic::FormBuilder::RESERVED_COLUMNS
             args.compact!
           end
           legend = args.shift if args.first.is_a?(::String)

From 3b5338d72d5bf62570768beddbb72639971c7486 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 18 Jan 2011 06:41:32 +1100
Subject: [PATCH 461/992] move RESERVED_COLUMNS into InputsHelper

---
 lib/formtastic.rb                       | 10 +++++-----
 lib/formtastic/form_builder.rb          |  2 --
 lib/formtastic/helpers/inputs_helper.rb |  4 +++-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index e25d338c6..344e28526 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
-require File.join(File.dirname(__FILE__), *%w[formtastic i18n])
-require File.join(File.dirname(__FILE__), *%w[formtastic util])
-require File.join(File.dirname(__FILE__), *%w[formtastic railtie]) if defined?(::Rails::Railtie)
-require File.join(File.dirname(__FILE__), *%w[formtastic form_builder])
-require File.join(File.dirname(__FILE__), *%w[formtastic helpers form_helper])
+require 'formtastic/i18n'
+require 'formtastic/util'
+require 'formtastic/railtie' if defined?(::Rails::Railtie)
+require 'formtastic/form_builder'
+require 'formtastic/helpers/form_helper'
diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 8702ee31e..508a42c9f 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -57,8 +57,6 @@ def self.configure(name, value = nil)
     configure :default_error_list_class, 'errors'
     configure :default_hint_class, 'inline-hints'
   
-    RESERVED_COLUMNS = [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
-  
     INLINE_ERROR_TYPES = [:sentence, :list, :first]
   
     attr_accessor :template
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index f6ba2f862..a117089c8 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -9,6 +9,8 @@ module InputsHelper
       include Formtastic::Helpers::FileColumnDetection
       include Formtastic::Reflection
       
+      RESERVED_COLUMNS = [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
+      
       # Returns a suitable form input for the given +method+, using the database column information
       # and other factors (like the method name) to figure out what you probably want.
       #
@@ -253,7 +255,7 @@ def inputs(*args, &block)
           if @object && args.empty?
             args  = association_columns(:belongs_to)
             args += content_columns
-            args -= Formtastic::FormBuilder::RESERVED_COLUMNS
+            args -= RESERVED_COLUMNS
             args.compact!
           end
           legend = args.shift if args.first.is_a?(::String)

From bf60ce2755097b72e4cb983fb33a5628c534d932 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 18 Jan 2011 06:43:53 +1100
Subject: [PATCH 462/992] moved INLINE_ERROR_TYPES to errors_helper

---
 lib/formtastic/form_builder.rb          | 2 --
 lib/formtastic/helpers/errors_helper.rb | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 508a42c9f..e74fd20d7 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -57,8 +57,6 @@ def self.configure(name, value = nil)
     configure :default_error_list_class, 'errors'
     configure :default_hint_class, 'inline-hints'
   
-    INLINE_ERROR_TYPES = [:sentence, :list, :first]
-  
     attr_accessor :template
     
     include Formtastic::Helpers::InputsHelper
diff --git a/lib/formtastic/helpers/errors_helper.rb b/lib/formtastic/helpers/errors_helper.rb
index 112533e76..04aea932e 100644
--- a/lib/formtastic/helpers/errors_helper.rb
+++ b/lib/formtastic/helpers/errors_helper.rb
@@ -7,6 +7,8 @@ module ErrorsHelper
       include Formtastic::Helpers::FileColumnDetection
       include Formtastic::Reflection
       
+      INLINE_ERROR_TYPES = [:sentence, :list, :first]
+      
       # Generates error messages for given method names and for base.
       # You can pass a hash with html options that will be added to ul tag
       #

From ea02738ba4864782840ee9ea5fc7a488ff6e56c9 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 18 Jan 2011 06:50:31 +1100
Subject: [PATCH 463/992] mv parent_child_index to FieldsetWrapper

---
 lib/formtastic/form_builder.rb             | 10 ----------
 lib/formtastic/helpers/fieldset_wrapper.rb | 11 +++++++++++
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index e74fd20d7..42e33679a 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -104,16 +104,6 @@ def generate_html_id(method_name, value='input') #:nodoc:
         [custom_namespace, sanitized_object_name, index, sanitized_method_name, value].reject{|x|x.blank?}.join('_')
       end
   
-      # Gets the nested_child_index value from the parent builder. 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')
-  
-        child = parent[:for]
-        child = child.first if child.respond_to?(:first)
-        duck[child].to_i + 1
-      end
-  
       def sanitized_object_name #:nodoc:
         @sanitized_object_name ||= @object_name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
       end
diff --git a/lib/formtastic/helpers/fieldset_wrapper.rb b/lib/formtastic/helpers/fieldset_wrapper.rb
index 78483b7d5..e5398930c 100644
--- a/lib/formtastic/helpers/fieldset_wrapper.rb
+++ b/lib/formtastic/helpers/fieldset_wrapper.rb
@@ -45,6 +45,17 @@ def field_set_and_list_wrapping(*args, &block) #:nodoc:
       
         fieldset
       end
+      
+      # Gets the nested_child_index value from the parent builder. 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')
+  
+        child = parent[:for]
+        child = child.first if child.respond_to?(:first)
+        duck[child].to_i + 1
+      end
+
     end
   end
 end
\ No newline at end of file

From 8a49bfdd3dbe46e42b0023fbb669508b54758bef Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 18 Jan 2011 07:02:11 +1100
Subject: [PATCH 464/992] Localization

---
 lib/formtastic/form_builder.rb           | 85 ++----------------------
 lib/formtastic/helpers/buttons_helper.rb |  2 +
 lib/formtastic/helpers/errors_helper.rb  |  2 +
 lib/formtastic/helpers/inputs_helper.rb  |  2 +
 lib/formtastic/helpers/label_helper.rb   |  4 ++
 lib/formtastic/inputs/base.rb            |  2 +
 lib/formtastic/localized_string.rb       | 83 +++++++++++++++++++++++
 7 files changed, 100 insertions(+), 80 deletions(-)
 create mode 100644 lib/formtastic/localized_string.rb

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 42e33679a..36d2ceeb9 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -90,7 +90,6 @@ def self.configure(name, value = nil)
       # 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:
         index = if options.has_key?(:index)
                   options[:index]
@@ -103,11 +102,13 @@ def generate_html_id(method_name, value='input') #:nodoc:
   
         [custom_namespace, sanitized_object_name, index, sanitized_method_name, value].reject{|x|x.blank?}.join('_')
       end
-  
+    
+      # Naming, used by FormBuilder generate_html_id
       def sanitized_object_name #:nodoc:
         @sanitized_object_name ||= @object_name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
       end
-  
+    
+      # Naming, used by ErrorsHelper, LabelHelper & Inputs::Base
       def humanized_attribute_name(method) #:nodoc:
         if @object && @object.class.respond_to?(:human_attribute_name)
           humanized_name = @object.class.human_attribute_name(method.to_s)
@@ -120,83 +121,7 @@ def humanized_attribute_name(method) #:nodoc:
           method.to_s.send(label_str_method)
         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 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)
-          escape_html_entities(value)
-        else
-          use_i18n = value.nil? ? i18n_lookups_by_default : (value != false)
-  
-          if use_i18n
-            model_name, nested_model_name  = normalize_model_name(self.model_name.underscore)
-            action_name = template.params[:action].to_s rescue ''
-            attribute_name = key.to_s
-  
-            defaults = ::Formtastic::I18n::SCOPES.reject do |i18n_scope|
-              nested_model_name.nil? && i18n_scope.match(/nested_model/)
-            end.collect do |i18n_scope|
-              i18n_path = i18n_scope.dup
-              i18n_path.gsub!('%{action}', action_name)
-              i18n_path.gsub!('%{model}', model_name)
-              i18n_path.gsub!('%{nested_model}', nested_model_name) unless nested_model_name.nil?
-              i18n_path.gsub!('%{attribute}', attribute_name)
-              i18n_path.gsub!('..', '.')
-              i18n_path.to_sym
-            end
-            defaults << ''
-  
-            defaults.uniq!
-  
-            default_key = defaults.shift
-            i18n_value = ::Formtastic::I18n.t(default_key,
-              options.merge(:default => defaults, :scope => type.to_s.pluralize.to_sym))
-            if i18n_value.blank? && type == :label
-              # This is effectively what Rails label helper does for i18n lookup
-              options[:scope] = [:helpers, type]
-              options[:default] = defaults
-              i18n_value = ::I18n.t(default_key, options)
-            end
-            i18n_value = escape_html_entities(i18n_value) if i18n_value.is_a?(::String)
-            i18n_value.blank? ? nil : i18n_value
-          end
-        end
-      end
-  
-      def model_name
-        @object.present? ? @object.class.name : @object_name.to_s.classify
-      end
-  
-      def normalize_model_name(name)
-        if name =~ /(.+)\[(.+)\]/
-          [$1, $2]
-        else
-          [name]
-        end
-      end
-    
+      
   end
   
   # Quick hack/shim so that any code expecting the old SemanticFormBuilder class still works.
diff --git a/lib/formtastic/helpers/buttons_helper.rb b/lib/formtastic/helpers/buttons_helper.rb
index ae4d3be1f..f0b2d5c42 100644
--- a/lib/formtastic/helpers/buttons_helper.rb
+++ b/lib/formtastic/helpers/buttons_helper.rb
@@ -1,9 +1,11 @@
 require 'helpers/fieldset_wrapper'
+require 'localized_string'
 
 module Formtastic
   module Helpers
     module ButtonsHelper
       include Formtastic::Helpers::FieldsetWrapper
+      include Formtastic::LocalizedString
       
       # Creates a fieldset and ol tag wrapping for form buttons / actions as list items.
       # See inputs documentation for a full example.  The fieldset's default class attriute
diff --git a/lib/formtastic/helpers/errors_helper.rb b/lib/formtastic/helpers/errors_helper.rb
index 04aea932e..ab33af255 100644
--- a/lib/formtastic/helpers/errors_helper.rb
+++ b/lib/formtastic/helpers/errors_helper.rb
@@ -1,11 +1,13 @@
 require 'helpers/file_column_detection'
 require 'reflection'
+require 'localized_string'
 
 module Formtastic
   module Helpers
     module ErrorsHelper
       include Formtastic::Helpers::FileColumnDetection
       include Formtastic::Reflection
+      include Formtastic::LocalizedString
       
       INLINE_ERROR_TYPES = [:sentence, :list, :first]
       
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index a117089c8..8d84fbcf4 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -1,6 +1,7 @@
 require 'helpers/fieldset_wrapper'
 require 'helpers/file_column_detection'
 require 'reflection'
+require 'localized_string'
 
 module Formtastic
   module Helpers
@@ -8,6 +9,7 @@ module InputsHelper
       include Formtastic::Helpers::FieldsetWrapper
       include Formtastic::Helpers::FileColumnDetection
       include Formtastic::Reflection
+      include Formtastic::LocalizedString
       
       RESERVED_COLUMNS = [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
       
diff --git a/lib/formtastic/helpers/label_helper.rb b/lib/formtastic/helpers/label_helper.rb
index cd0badf39..d7da0ccc6 100644
--- a/lib/formtastic/helpers/label_helper.rb
+++ b/lib/formtastic/helpers/label_helper.rb
@@ -1,6 +1,10 @@
+require 'localized_string'
+
 module Formtastic
   module Helpers
     module LabelHelper
+      include Formtastic::LocalizedString
+      
       # 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:
diff --git a/lib/formtastic/inputs/base.rb b/lib/formtastic/inputs/base.rb
index 2e6a6b148..de9415ddb 100644
--- a/lib/formtastic/inputs/base.rb
+++ b/lib/formtastic/inputs/base.rb
@@ -1,9 +1,11 @@
 require 'reflection'
+require 'localized_string'
 
 module Formtastic
   module Inputs
     module Base
       include Formtastic::Reflection
+      include Formtastic::LocalizedString
     
       def set_include_blank(options)
         unless options.key?(:include_blank) || options.key?(:prompt)
diff --git a/lib/formtastic/localized_string.rb b/lib/formtastic/localized_string.rb
new file mode 100644
index 000000000..7841bcc84
--- /dev/null
+++ b/lib/formtastic/localized_string.rb
@@ -0,0 +1,83 @@
+module Formtastic
+  module LocalizedString
+    
+    protected
+    
+    # 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)
+        escape_html_entities(value)
+      else
+        use_i18n = value.nil? ? i18n_lookups_by_default : (value != false)
+    
+        if use_i18n
+          model_name, nested_model_name  = normalize_model_name(self.model_name.underscore)
+          action_name = template.params[:action].to_s rescue ''
+          attribute_name = key.to_s
+    
+          defaults = ::Formtastic::I18n::SCOPES.reject do |i18n_scope|
+            nested_model_name.nil? && i18n_scope.match(/nested_model/)
+          end.collect do |i18n_scope|
+            i18n_path = i18n_scope.dup
+            i18n_path.gsub!('%{action}', action_name)
+            i18n_path.gsub!('%{model}', model_name)
+            i18n_path.gsub!('%{nested_model}', nested_model_name) unless nested_model_name.nil?
+            i18n_path.gsub!('%{attribute}', attribute_name)
+            i18n_path.gsub!('..', '.')
+            i18n_path.to_sym
+          end
+          defaults << ''
+    
+          defaults.uniq!
+    
+          default_key = defaults.shift
+          i18n_value = ::Formtastic::I18n.t(default_key,
+            options.merge(:default => defaults, :scope => type.to_s.pluralize.to_sym))
+          if i18n_value.blank? && type == :label
+            # This is effectively what Rails label helper does for i18n lookup
+            options[:scope] = [:helpers, type]
+            options[:default] = defaults
+            i18n_value = ::I18n.t(default_key, options)
+          end
+          i18n_value = escape_html_entities(i18n_value) if i18n_value.is_a?(::String)
+          i18n_value.blank? ? nil : i18n_value
+        end
+      end
+    end
+    
+    def model_name
+      @object.present? ? @object.class.name : @object_name.to_s.classify
+    end
+    
+    def normalize_model_name(name)
+      if name =~ /(.+)\[(.+)\]/
+        [$1, $2]
+      else
+        [name]
+      end
+    end
+    
+  end
+end
\ No newline at end of file

From 3438b0826371a9da7ab52522f0cee00ba70b0d15 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 18 Jan 2011 08:18:02 +1100
Subject: [PATCH 465/992] added some extra comments around something I found
 puzzling at first

---
 lib/formtastic/form_builder.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 36d2ceeb9..c5884a20c 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -90,6 +90,9 @@ def self.configure(name, value = nil)
       # 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.
+      #
+      # For those of you wondering (like me), options is part of the fields_for
+      # and Builder scope, which is why you can't see it passed in as an arg.
       def generate_html_id(method_name, value='input') #:nodoc:
         index = if options.has_key?(:index)
                   options[:index]

From 61877ce7278c67812e4715d3e525a23a202c8189 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 18 Jan 2011 14:36:48 +1100
Subject: [PATCH 466/992] shifted remaining stuff into
 Formtastic::HtmlAttributes

---
 lib/formtastic/form_builder.rb    | 45 +++----------------------------
 lib/formtastic/html_attributes.rb | 45 +++++++++++++++++++++++++++++++
 lib/formtastic/util.rb            |  2 +-
 3 files changed, 50 insertions(+), 42 deletions(-)
 create mode 100644 lib/formtastic/html_attributes.rb

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index c5884a20c..9f3521bb6 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -1,5 +1,7 @@
 $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__))))
 
+require 'html_attributes'
+
 require 'helpers/inputs_helper'
 require 'helpers/buttons_helper'
 require 'helpers/label_helper'
@@ -59,6 +61,8 @@ def self.configure(name, value = nil)
   
     attr_accessor :template
     
+    include Formtastic::HtmlAttributes
+    
     include Formtastic::Helpers::InputsHelper
     include Formtastic::Helpers::ButtonsHelper
     include Formtastic::Helpers::LabelHelper
@@ -84,47 +88,6 @@ def self.configure(name, value = nil)
     include Formtastic::Inputs::TimeZoneInput
     include Formtastic::Inputs::UrlInput
     
-    protected
-      
-      # 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.
-      #
-      # For those of you wondering (like me), options is part of the fields_for
-      # and Builder scope, which is why you can't see it passed in as an arg.
-      def generate_html_id(method_name, value='input') #:nodoc:
-        index = if options.has_key?(:index)
-                  options[:index]
-                elsif defined?(@auto_index)
-                  @auto_index
-                else
-                  ""
-                end
-        sanitized_method_name = method_name.to_s.gsub(/[\?\/\-]$/, '')
-  
-        [custom_namespace, sanitized_object_name, index, sanitized_method_name, value].reject{|x|x.blank?}.join('_')
-      end
-    
-      # Naming, used by FormBuilder generate_html_id
-      def sanitized_object_name #:nodoc:
-        @sanitized_object_name ||= @object_name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
-      end
-    
-      # Naming, used by ErrorsHelper, LabelHelper & Inputs::Base
-      def humanized_attribute_name(method) #:nodoc:
-        if @object && @object.class.respond_to?(:human_attribute_name)
-          humanized_name = @object.class.human_attribute_name(method.to_s)
-          if humanized_name == method.to_s.send(:humanize)
-            method.to_s.send(label_str_method)
-          else
-            humanized_name
-          end
-        else
-          method.to_s.send(label_str_method)
-        end
-      end
-      
   end
   
   # Quick hack/shim so that any code expecting the old SemanticFormBuilder class still works.
diff --git a/lib/formtastic/html_attributes.rb b/lib/formtastic/html_attributes.rb
new file mode 100644
index 000000000..37c971d18
--- /dev/null
+++ b/lib/formtastic/html_attributes.rb
@@ -0,0 +1,45 @@
+module Formtastic
+  module HtmlAttributes
+    
+    protected
+    
+    # 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.
+    #
+    # For those of you wondering (like me), options is part of the fields_for
+    # and Builder scope, which is why you can't see it passed in as an arg.
+    def generate_html_id(method_name, value='input') #:nodoc:
+      index = if options.has_key?(:index)
+                options[:index]
+              elsif defined?(@auto_index)
+                @auto_index
+              else
+                ""
+              end
+      sanitized_method_name = method_name.to_s.gsub(/[\?\/\-]$/, '')
+
+      [custom_namespace, sanitized_object_name, index, sanitized_method_name, value].reject{|x|x.blank?}.join('_')
+    end
+    
+    # Used by FormBuilder generate_html_id
+    def sanitized_object_name #:nodoc:
+      @sanitized_object_name ||= @object_name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
+    end
+    
+    def humanized_attribute_name(method)
+      if @object && @object.class.respond_to?(:human_attribute_name)
+        humanized_name = @object.class.human_attribute_name(method.to_s)
+        if humanized_name == method.to_s.send(:humanize)
+          method.to_s.send(label_str_method)
+        else
+          humanized_name
+        end
+      else
+        method.to_s.send(label_str_method)
+      end
+    end
+  
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/util.rb b/lib/formtastic/util.rb
index c9b41e858..912b9132c 100644
--- a/lib/formtastic/util.rb
+++ b/lib/formtastic/util.rb
@@ -21,6 +21,6 @@ def html_safe(text)
     def rails_safe_buffer_class
       return ActiveSupport::SafeBuffer
     end
-
+    
   end
 end

From 549ef7a76d7fd563498f18c165f3a70f05223a27 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 18 Jan 2011 15:17:57 +1100
Subject: [PATCH 467/992] Renamed all instances of
 Formtastic::SemanticFormBuilder to Formtastic::Builder,
 Formtastic::SemanticFormHelper to Formtastic::Helpers::FormHelper and
 ::Formtastic to just Formtastic.

Still need to work out upgrade path/warnings/etc, but the old class names still work for now (for those awesome enough to be on the edge).
---
 README.textile                                | 20 ++++----
 init.rb                                       |  2 +-
 lib/formtastic.rb                             |  1 +
 lib/formtastic/form_builder.rb                |  7 +--
 lib/formtastic/helpers/buttons_helper.rb      |  2 +-
 lib/formtastic/helpers/form_helper.rb         | 21 +++------
 lib/formtastic/helpers/inputs_helper.rb       |  2 +-
 .../helpers/semantic_form_helper.rb           | 10 ++++
 lib/formtastic/inputs/base.rb                 |  2 +-
 lib/formtastic/inputs/country_input.rb        |  2 +-
 lib/formtastic/inputs/select_input.rb         |  4 +-
 lib/formtastic/localized_string.rb            |  6 +--
 lib/formtastic/railtie.rb                     |  2 +-
 lib/formtastic/semantic_form_builder.rb       |  6 +++
 lib/generators/templates/formtastic.rb        | 42 ++++++++---------
 spec/buttons_spec.rb                          |  2 +-
 spec/commit_button_spec.rb                    |  8 ++--
 spec/custom_builder_spec.rb                   | 22 ++++-----
 spec/defaults_spec.rb                         |  4 +-
 spec/errors_spec.rb                           | 30 ++++++------
 spec/form_helper_spec.rb                      | 22 ++++-----
 spec/i18n_spec.rb                             | 34 +++++++-------
 spec/include_blank_spec.rb                    |  6 +--
 spec/input_spec.rb                            | 46 +++++++++----------
 spec/inputs/check_boxes_input_spec.rb         |  4 +-
 spec/inputs/country_input_spec.rb             |  2 +-
 spec/inputs/radio_input_spec.rb               |  4 +-
 spec/inputs_spec.rb                           |  4 +-
 spec/label_spec.rb                            |  6 +--
 spec/semantic_errors_spec.rb                  |  2 +-
 spec/semantic_fields_for_spec.rb              |  6 +--
 spec/spec_helper.rb                           | 10 ++--
 spec/support/custom_macros.rb                 | 10 ++--
 33 files changed, 177 insertions(+), 174 deletions(-)
 create mode 100644 lib/formtastic/helpers/semantic_form_helper.rb
 create mode 100644 lib/formtastic/semantic_form_builder.rb

diff --git a/README.textile b/README.textile
index 499277a48..d30415b1f 100644
--- a/README.textile
+++ b/README.textile
@@ -352,7 +352,7 @@ Formtastic supports localized *labels*, *hints*, *legends*, *actions* using the
 *1. Enable I18n lookups by default (@config/initializers/formtastic.rb@):*
 
 <pre>
-  Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
+  Formtastic::FormBuilder.i18n_lookups_by_default = true
 </pre>
 
 *2. Add some cool label-translations/variants (@config/locale/en.yml@):*
@@ -426,7 +426,7 @@ _Note: Slightly different because Formtastic can't guess how you group fields in
 If I18n-lookups is disabled, i.e.:
 
 <pre>
-  Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
+  Formtastic::FormBuilder.i18n_lookups_by_default = false
 </pre>
 
 ...then you can enable I18n within the forms instead:
@@ -557,27 +557,27 @@ h3. Specifying controller namespace with @--controller@
 
 h2. Custom Inputs
 
-If you want to add your own input types to encapsulate your own logic or interface patterns, you can do so by subclassing SemanticFormBuilder and configuring Formtastic to use your custom builder class.
+If you want to add your own input types to encapsulate your own logic or interface patterns, you can do so by subclassing Formtastic::FormBuilder and configuring Formtastic to use your custom builder class.
 
-@Formtastic::SemanticFormHelper.builder = MyCustomBuilder@
+@Formtastic::Helpers::FormHelper.builder = MyCustomBuilder@
 
 Be aware that you should either set the options on custom builder or require it after setting options on formtastic default builder.
 
 <pre>
   # OK
-  Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
+  Formtastic::FormBuilder.i18n_lookups_by_default = true
   require 'formtastic/my_custom_builder'
-  Formtastic::SemanticFormHelper.builder = Formtastic::MyCustomBuilder
+  Formtastic::Helpers::FormHelper.builder = Formtastic::MyCustomBuilder
   
   # OK
   require 'formtastic/my_custom_builder'
-  Formtastic::SemanticFormHelper.builder = Formtastic::MyCustomBuilder
+  Formtastic::Helpers::FormHelper.builder = Formtastic::MyCustomBuilder
   Formtastic::MyCustomBuilder.i18n_lookups_by_default = true
   
   # WRONG!
   require 'formtastic/my_custom_builder'
-  Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
-  Formtastic::SemanticFormHelper.builder = Formtastic::MyCustomBuilder
+  Formtastic::FormBuilder.i18n_lookups_by_default = true
+  Formtastic::Helpers::FormHelper.builder = Formtastic::MyCustomBuilder
 </pre>
 
 
@@ -585,7 +585,7 @@ h2. Security
 
 By default formtastic escapes html entities in both labels and hints unless a string is marked as html_safe. If you are using an older rails version which doesn't know html_safe, or you want to globally turn this feature off, you can set the following in your initializer:
 
-Formtastic::SemanticFormBuilder.escape_html_entities_in_hints_and_labels = false
+Formtastic::FormBuilder.escape_html_entities_in_hints_and_labels = false
 
 
 h2. Dependencies
diff --git a/init.rb b/init.rb
index e357b9275..a09b2ef4f 100644
--- a/init.rb
+++ b/init.rb
@@ -1,5 +1,5 @@
 # encoding: utf-8
 require 'formtastic'
 require 'formtastic/helpers/layout_helper'
-ActionView::Base.send :include, Formtastic::SemanticFormHelper
+ActionView::Base.send :include, Formtastic::Helpers::FormHelper
 ActionView::Base.send :include, Formtastic::Helpers::LayoutHelper
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 344e28526..ad16c1b5a 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -3,4 +3,5 @@
 require 'formtastic/util'
 require 'formtastic/railtie' if defined?(::Rails::Railtie)
 require 'formtastic/form_builder'
+require 'formtastic/semantic_form_builder' # TODO remove from 2.0
 require 'formtastic/helpers/form_helper'
diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 9f3521bb6..58dbd05c9 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -41,7 +41,7 @@ def self.configure(name, value = nil)
     configure :default_text_area_width
     configure :all_fields_required_by_default, true
     configure :include_blank_for_select_by_default, true
-    configure :required_string, proc { ::Formtastic::Util.html_safe(%{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>}) }
+    configure :required_string, proc { Formtastic::Util.html_safe(%{<abbr title="#{Formtastic::I18n.t(:required)}">*</abbr>}) }
     configure :optional_string, ''
     configure :inline_errors, :sentence
     configure :label_str_method, :humanize
@@ -90,9 +90,4 @@ def self.configure(name, value = nil)
     
   end
   
-  # Quick hack/shim so that any code expecting the old SemanticFormBuilder class still works.
-  # TODO: migrate everything across
-  class SemanticFormBuilder < Formtastic::FormBuilder
-  end
-  
 end
\ No newline at end of file
diff --git a/lib/formtastic/helpers/buttons_helper.rb b/lib/formtastic/helpers/buttons_helper.rb
index f0b2d5c42..ec370b1f7 100644
--- a/lib/formtastic/helpers/buttons_helper.rb
+++ b/lib/formtastic/helpers/buttons_helper.rb
@@ -63,7 +63,7 @@ def commit_button(*args)
         end
     
         text = (localized_string(key, text, :action, :model => object_name) ||
-                ::Formtastic::I18n.t(key, :model => object_name)) unless text.is_a?(::String)
+                Formtastic::I18n.t(key, :model => object_name)) unless text.is_a?(::String)
     
         button_html = options.delete(:button_html) || {}
         button_html.merge!(:class => [button_html[:class], key].compact.join(' '))
diff --git a/lib/formtastic/helpers/form_helper.rb b/lib/formtastic/helpers/form_helper.rb
index 639ef8d0d..5cbf12f99 100644
--- a/lib/formtastic/helpers/form_helper.rb
+++ b/lib/formtastic/helpers/form_helper.rb
@@ -1,6 +1,6 @@
 module Formtastic
   module Helpers
-    # Wrappers around form_for (etc) with :builder => SemanticFormBuilder.
+    # Wrappers around form_for (etc) with :builder => Formtastic::FormBuilder.
     #
     # * semantic_form_for(@post)
     # * semantic_fields_for(@post)
@@ -9,10 +9,10 @@ module Helpers
     #
     # Each of which are the equivalent of:
     #
-    # * form_for(@post, :builder => Formtastic::SemanticFormBuilder))
-    # * fields_for(@post, :builder => Formtastic::SemanticFormBuilder))
-    # * form_remote_for(@post, :builder => Formtastic::SemanticFormBuilder))
-    # * remote_form_for(@post, :builder => Formtastic::SemanticFormBuilder))
+    # * form_for(@post, :builder => Formtastic::FormBuilder))
+    # * fields_for(@post, :builder => Formtastic::FormBuilder))
+    # * form_remote_for(@post, :builder => Formtastic::FormBuilder))
+    # * remote_form_for(@post, :builder => Formtastic::FormBuilder))
     #
     # Example Usage:
     #
@@ -33,7 +33,7 @@ module Helpers
     #     ...
     #   <% end %>
     module FormHelper
-      @@builder = ::Formtastic::SemanticFormBuilder
+      @@builder = Formtastic::FormBuilder
       @@default_form_class = 'formtastic'
       mattr_accessor :builder, :default_form_class
   
@@ -94,13 +94,4 @@ def semantic_#{meth}(record_or_name_or_array, *args, &proc)
     end
   end
   
-  # Quick hack/shim for anything expecting the old SemanticFormHelper module.
-  # TODO: migrate everything across
-  module SemanticFormHelper
-    include Formtastic::Helpers::FormHelper
-    @@builder = Formtastic::Helpers::FormHelper.builder
-    @@default_form_class = Formtastic::Helpers::FormHelper.default_form_class
-    mattr_accessor :builder, :default_form_class
-  end
-
 end
\ No newline at end of file
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 8d84fbcf4..3a8e81147 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -268,7 +268,7 @@ def inputs(*args, &block)
         end
       end
       
-      # A thin wrapper around #fields_for to set :builder => Formtastic::SemanticFormBuilder
+      # A thin wrapper around #fields_for to set :builder => Formtastic::FormBuilder
       # for nesting forms:
       #
       #   # Example:
diff --git a/lib/formtastic/helpers/semantic_form_helper.rb b/lib/formtastic/helpers/semantic_form_helper.rb
new file mode 100644
index 000000000..0adf39d17
--- /dev/null
+++ b/lib/formtastic/helpers/semantic_form_helper.rb
@@ -0,0 +1,10 @@
+module Formtastic
+  # Quick hack/shim for anything expecting the old SemanticFormHelper module.
+  # TODO remove from 2.0 with a helpful upgrade path/warning.
+  module SemanticFormHelper
+    include Formtastic::Helpers::FormHelper
+    @@builder = Formtastic::Helpers::FormHelper.builder
+    @@default_form_class = Formtastic::Helpers::FormHelper.default_form_class
+    mattr_accessor :builder, :default_form_class
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/base.rb b/lib/formtastic/inputs/base.rb
index de9415ddb..731a71a3a 100644
--- a/lib/formtastic/inputs/base.rb
+++ b/lib/formtastic/inputs/base.rb
@@ -60,7 +60,7 @@ def find_collection_for_column(column, options) #:nodoc:
         collection = find_raw_collection_for_column(column, options)
     
         # Return if we have a plain string
-        return collection if collection.instance_of?(String) || collection.instance_of?(::Formtastic::Util.rails_safe_buffer_class)
+        return collection if collection.instance_of?(String) || collection.instance_of?(Formtastic::Util.rails_safe_buffer_class)
     
         # Return if we have an Array of strings, fixnums or arrays
         return collection if (collection.instance_of?(Array) || collection.instance_of?(Range)) &&
diff --git a/lib/formtastic/inputs/country_input.rb b/lib/formtastic/inputs/country_input.rb
index a0405d0d4..46e3d5420 100644
--- a/lib/formtastic/inputs/country_input.rb
+++ b/lib/formtastic/inputs/country_input.rb
@@ -16,7 +16,7 @@ module CountryInput
       # 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 # use Formtastic::FormBuilder.priority_countries array for the priority countries
       #   f.input :location, :as => :country, :priority_countries => /Australia/ # set your own
       #
       def country_input(method, options)
diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index f7d1b5f51..85f22001f 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -174,8 +174,8 @@ def find_raw_collection_for_column(column, options) #:nodoc:
       # is provided.
       #
       def create_boolean_collection(options) #:nodoc:
-        options[:true] ||= ::Formtastic::I18n.t(:yes)
-        options[:false] ||= ::Formtastic::I18n.t(:no)
+        options[:true] ||= Formtastic::I18n.t(:yes)
+        options[:false] ||= Formtastic::I18n.t(:no)
         options[:value_as_class] = true unless options.key?(:value_as_class)
   
         [ [ options.delete(:true), true], [ options.delete(:false), false ] ]
diff --git a/lib/formtastic/localized_string.rb b/lib/formtastic/localized_string.rb
index 7841bcc84..3d4d87058 100644
--- a/lib/formtastic/localized_string.rb
+++ b/lib/formtastic/localized_string.rb
@@ -8,7 +8,7 @@ module LocalizedString
     #
     # Enabled/Disable this by setting:
     #
-    #   Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true/false
+    #   Formtastic::FormBuilder.i18n_lookups_by_default = true/false
     #
     # Lookup priority:
     #
@@ -37,7 +37,7 @@ def localized_string(key, value, type, options = {}) #:nodoc:
           action_name = template.params[:action].to_s rescue ''
           attribute_name = key.to_s
     
-          defaults = ::Formtastic::I18n::SCOPES.reject do |i18n_scope|
+          defaults = Formtastic::I18n::SCOPES.reject do |i18n_scope|
             nested_model_name.nil? && i18n_scope.match(/nested_model/)
           end.collect do |i18n_scope|
             i18n_path = i18n_scope.dup
@@ -53,7 +53,7 @@ def localized_string(key, value, type, options = {}) #:nodoc:
           defaults.uniq!
     
           default_key = defaults.shift
-          i18n_value = ::Formtastic::I18n.t(default_key,
+          i18n_value = Formtastic::I18n.t(default_key,
             options.merge(:default => defaults, :scope => type.to_s.pluralize.to_sym))
           if i18n_value.blank? && type == :label
             # This is effectively what Rails label helper does for i18n lookup
diff --git a/lib/formtastic/railtie.rb b/lib/formtastic/railtie.rb
index 25c9b8887..912842863 100644
--- a/lib/formtastic/railtie.rb
+++ b/lib/formtastic/railtie.rb
@@ -7,7 +7,7 @@
 module Formtastic
   class Railtie < Rails::Railtie
     initializer 'formtastic.initialize', :after => :after_initialize do
-      ActionView::Base.send :include, Formtastic::SemanticFormHelper
+      ActionView::Base.send :include, Formtastic::Helpers::FormHelper
       ActionView::Base.send(:include, Formtastic::Helpers::LayoutHelper)
     end
   end
diff --git a/lib/formtastic/semantic_form_builder.rb b/lib/formtastic/semantic_form_builder.rb
new file mode 100644
index 000000000..25e134ba7
--- /dev/null
+++ b/lib/formtastic/semantic_form_builder.rb
@@ -0,0 +1,6 @@
+module Formtastic
+  # Quick hack/shim so that any code expecting the old SemanticFormBuilder class still works.
+  # TODO remove from 2.0 with a helpful upgrade path/warning.
+  class SemanticFormBuilder < Formtastic::FormBuilder
+  end
+end
\ No newline at end of file
diff --git a/lib/generators/templates/formtastic.rb b/lib/generators/templates/formtastic.rb
index 78e21e358..dca628b2c 100644
--- a/lib/generators/templates/formtastic.rb
+++ b/lib/generators/templates/formtastic.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # --------------------------------------------------------------------------------------------------
-# Please note: If you're subclassing Formtastic::SemanticFormBuilder, Formtastic uses 
+# Please note: If you're subclassing Formtastic::FormBuilder, Formtastic uses 
 # class_attribute for these configuration attributes instead of the deprecated 
 # class_inheritable_attribute. The behaviour is slightly different with subclasses (especially 
 # around attributes with Hash or Array) values, so make sure you understand what's happening. 
@@ -9,72 +9,72 @@
 # --------------------------------------------------------------------------------------------------
 
 # Set the default text field size when input is a string. Default is nil.
-# Formtastic::SemanticFormBuilder.default_text_field_size = 50
+# Formtastic::FormBuilder.default_text_field_size = 50
 
 # Set the default text area height when input is a text. Default is 20.
-# Formtastic::SemanticFormBuilder.default_text_area_height = 5
+# Formtastic::FormBuilder.default_text_area_height = 5
 
 # Set the default text area width when input is a text. Default is nil.
-# Formtastic::SemanticFormBuilder.default_text_area_width = 50
+# Formtastic::FormBuilder.default_text_area_width = 50
 
 # Should all fields be considered "required" by default?
 # Rails 2 only, ignored by Rails 3 because it will never fall back to this default.
 # Defaults to true.
-# Formtastic::SemanticFormBuilder.all_fields_required_by_default = true
+# Formtastic::FormBuilder.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
+# Formtastic::FormBuilder.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)"
+# Formtastic::FormBuilder.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)"
+# Formtastic::FormBuilder.optional_string = "(optional)"
 
 # Set the way inline errors will be displayed.
 # Defaults to :sentence, valid options are :sentence, :list, :first and :none
-# Formtastic::SemanticFormBuilder.inline_errors = :sentence
+# Formtastic::FormBuilder.inline_errors = :sentence
 # Formtastic uses the following classes as default for hints, inline_errors and error list
 
 # If you override the class here, please ensure to override it in your formtastic_changes.css stylesheet as well
-# Formtastic::SemanticFormBuilder.default_hint_class = "inline-hints"
-# Formtastic::SemanticFormBuilder.default_inline_error_class = "inline-errors"
-# Formtastic::SemanticFormBuilder.default_error_list_class = "errors"
+# Formtastic::FormBuilder.default_hint_class = "inline-hints"
+# Formtastic::FormBuilder.default_inline_error_class = "inline-errors"
+# Formtastic::FormBuilder.default_error_list_class = "errors"
 
 # Set the method to call on label text to transform or format it for human-friendly
 # reading when formtastic is used without object. Defaults to :humanize.
-# Formtastic::SemanticFormBuilder.label_str_method = :humanize
+# Formtastic::FormBuilder.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 = [
+# Formtastic::FormBuilder.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]
+# Formtastic::FormBuilder.inline_order = [:input, :hints, :errors]
 
 # Additionally, you can customize the order for specific types of inputs.
 # This is configured on a type basis and if a type is not found it will
 # fall back to the default order as defined by #inline_order
-# Formtastic::SemanticFormBuilder.custom_inline_order[:checkbox] = [:errors, :hints, :input]
-# Formtastic::SemanticFormBuilder.custom_inline_order[:select] = [:hints, :input, :errors]
+# Formtastic::FormBuilder.custom_inline_order[:checkbox] = [:errors, :hints, :input]
+# Formtastic::FormBuilder.custom_inline_order[:select] = [:hints, :input, :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
+# Formtastic::FormBuilder.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
+# You can add custom inputs or override parts of Formtastic by subclassing Formtastic::FormBuilder and
+# specifying that class here.  Defaults to Formtastic::FormBuilder.
+# Formtastic::Helpers::FormHelper.builder = MyCustomBuilder
diff --git a/spec/buttons_spec.rb b/spec/buttons_spec.rb
index a52c89127..9feee857d 100644
--- a/spec/buttons_spec.rb
+++ b/spec/buttons_spec.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'SemanticFormBuilder#buttons' do
+describe 'Formtastic::FormBuilder#buttons' do
 
   include FormtasticSpecHelper
 
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index 866d2a7b9..264ae1a7b 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'SemanticFormBuilder#commit_button' do
+describe 'Formtastic::FormBuilder#commit_button' do
 
   include FormtasticSpecHelper
 
@@ -178,7 +178,7 @@
                    :submit => 'Custom Submit',
                   }
                }
-           ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
+           Formtastic::FormBuilder.i18n_lookups_by_default = true
          end
 
          after do
@@ -252,7 +252,7 @@
                     :create => 'Custom Create',
                    }
                 }
-            ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
+            Formtastic::FormBuilder.i18n_lookups_by_default = true
           end
 
           after do
@@ -327,7 +327,7 @@
                     :update => 'Custom Save',
                    }
                 }
-            ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
+            Formtastic::FormBuilder.i18n_lookups_by_default = true
           end
 
           after do
diff --git a/spec/custom_builder_spec.rb b/spec/custom_builder_spec.rb
index 78799fb8a..3972374ea 100644
--- a/spec/custom_builder_spec.rb
+++ b/spec/custom_builder_spec.rb
@@ -1,11 +1,11 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'Formtastic::SemanticFormHelper.builder' do
+describe 'Formtastic::Helpers::FormHelper.builder' do
 
   include FormtasticSpecHelper
 
-  class MyCustomFormBuilder < ::Formtastic::SemanticFormBuilder
+  class MyCustomFormBuilder < Formtastic::FormBuilder
     def awesome_input(method, options)
       self.text_field(method)
     end
@@ -16,18 +16,18 @@ def awesome_input(method, options)
     mock_everything
   end
 
-  it 'is the Formtastic::SemanticFormBuilder by default' do
-    ::Formtastic::SemanticFormHelper.builder.should == ::Formtastic::SemanticFormBuilder
+  it 'is the Formtastic::FormBuilder by default' do
+    Formtastic::Helpers::FormHelper.builder.should == Formtastic::FormBuilder
   end
 
   it 'can be configured to use your own custom form builder' do
     # Set it to a custom builder class
-    ::Formtastic::SemanticFormHelper.builder = MyCustomFormBuilder
-    ::Formtastic::SemanticFormHelper.builder.should == MyCustomFormBuilder
+    Formtastic::Helpers::FormHelper.builder = MyCustomFormBuilder
+    Formtastic::Helpers::FormHelper.builder.should == MyCustomFormBuilder
 
     # Reset it to the default
-    ::Formtastic::SemanticFormHelper.builder = ::Formtastic::SemanticFormBuilder
-    ::Formtastic::SemanticFormHelper.builder.should == ::Formtastic::SemanticFormBuilder
+    Formtastic::Helpers::FormHelper.builder = Formtastic::FormBuilder
+    Formtastic::Helpers::FormHelper.builder.should == Formtastic::FormBuilder
   end
 
   it 'should allow custom settings per form builder subclass' do
@@ -35,7 +35,7 @@ def awesome_input(method, options)
       MyCustomFormBuilder.all_fields_required_by_default = false
 
       MyCustomFormBuilder.all_fields_required_by_default.should be_false
-      ::Formtastic::SemanticFormBuilder.all_fields_required_by_default.should be_true
+      Formtastic::FormBuilder.all_fields_required_by_default.should be_true
     end
   end
 
@@ -43,11 +43,11 @@ def awesome_input(method, options)
 
     before do
       @new_post.stub!(:title)
-      ::Formtastic::SemanticFormHelper.builder = MyCustomFormBuilder
+      Formtastic::Helpers::FormHelper.builder = MyCustomFormBuilder
     end
 
     after do
-      ::Formtastic::SemanticFormHelper.builder = ::Formtastic::SemanticFormBuilder
+      Formtastic::Helpers::FormHelper.builder = Formtastic::FormBuilder
     end
 
     describe "semantic_form_for" do
diff --git a/spec/defaults_spec.rb b/spec/defaults_spec.rb
index eb7abd842..2dedbbd0e 100644
--- a/spec/defaults_spec.rb
+++ b/spec/defaults_spec.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'Formtastic::SemanticFormBuilder-defaults' do
+describe 'Formtastic::FormBuilder-defaults' do
 
   # Note: This spec might make better sense somewhere else. Just temporary.
 
@@ -10,7 +10,7 @@
     it "should render proc with I18n correctly" do
       ::I18n.backend.store_translations :en, :formtastic => {:required => 'Haha!'}
 
-      required_string = Formtastic::SemanticFormBuilder.required_string
+      required_string = Formtastic::FormBuilder.required_string
       required_string = required_string.is_a?(::Proc) ? required_string.call : required_string.to_s
       required_string.should == %{<abbr title="Haha!">*</abbr>}
     end
diff --git a/spec/errors_spec.rb b/spec/errors_spec.rb
index 63d033d8f..673f475e7 100644
--- a/spec/errors_spec.rb
+++ b/spec/errors_spec.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'SemanticFormBuilder#errors_on' do
+describe 'Formtastic::FormBuilder#errors_on' do
 
   include FormtasticSpecHelper
 
@@ -19,34 +19,34 @@
     end
 
     after do
-      ::Formtastic::SemanticFormBuilder.default_inline_error_class = 'inline-errors'
-      ::Formtastic::SemanticFormBuilder.default_error_list_class = 'errors'
+      Formtastic::FormBuilder.default_inline_error_class = 'inline-errors'
+      Formtastic::FormBuilder.default_error_list_class = 'errors'
     end
 
     it 'should render a paragraph with the errors joined into a sentence when inline_errors config is :sentence' do
-      ::Formtastic::SemanticFormBuilder.inline_errors = :sentence
+      Formtastic::FormBuilder.inline_errors = :sentence
       semantic_form_for(@new_post) do |builder|
         builder.errors_on(:title).should have_tag('p.inline-errors', @title_errors.to_sentence)
       end
     end
 
     it 'should render a paragraph with a overridden default class' do
-      ::Formtastic::SemanticFormBuilder.inline_errors = :sentence
-      ::Formtastic::SemanticFormBuilder.default_inline_error_class = 'better-errors'
+      Formtastic::FormBuilder.inline_errors = :sentence
+      Formtastic::FormBuilder.default_inline_error_class = 'better-errors'
       semantic_form_for(@new_post) do |builder|
         builder.errors_on(:title).should have_tag('p.better-errors', @title_errors.to_sentence)
       end
     end
 
     it 'should render a paragraph with the errors joined into a sentence when inline_errors config is :sentence with a customized error class' do
-      ::Formtastic::SemanticFormBuilder.inline_errors = :sentence
+      Formtastic::FormBuilder.inline_errors = :sentence
       semantic_form_for(@new_post) do |builder|
         builder.errors_on(:title, :error_class => 'better-errors').should have_tag('p.better-errors', @title_errors.to_sentence)
       end
     end
 
     it 'should render an unordered list with the class errors when inline_errors config is :list' do
-      ::Formtastic::SemanticFormBuilder.inline_errors = :list
+      Formtastic::FormBuilder.inline_errors = :list
       semantic_form_for(@new_post) do |builder|
         builder.errors_on(:title).should have_tag('ul.errors')
         @title_errors.each do |error|
@@ -56,8 +56,8 @@
     end
 
     it 'should render an unordered list with the class overridden default class' do
-      ::Formtastic::SemanticFormBuilder.inline_errors = :list
-      ::Formtastic::SemanticFormBuilder.default_error_list_class = "better-errors"
+      Formtastic::FormBuilder.inline_errors = :list
+      Formtastic::FormBuilder.default_error_list_class = "better-errors"
       semantic_form_for(@new_post) do |builder|
         builder.errors_on(:title).should have_tag('ul.better-errors')
         @title_errors.each do |error|
@@ -67,7 +67,7 @@
     end
 
     it 'should render an unordered list with the class errors when inline_errors config is :list with a customized error class' do
-      ::Formtastic::SemanticFormBuilder.inline_errors = :list
+      Formtastic::FormBuilder.inline_errors = :list
       semantic_form_for(@new_post) do |builder|
         builder.errors_on(:title, :error_class => 'better-errors').should have_tag('ul.better-errors')
         @title_errors.each do |error|
@@ -77,21 +77,21 @@
     end
 
     it 'should render a paragraph with the first error when inline_errors config is :first' do
-      ::Formtastic::SemanticFormBuilder.inline_errors = :first
+      Formtastic::FormBuilder.inline_errors = :first
       semantic_form_for(@new_post) do |builder|
         builder.errors_on(:title).should have_tag('p.inline-errors', @title_errors.first)
       end
     end
 
     it 'should render a paragraph with the first error when inline_errors config is :first with a customized error class' do
-      ::Formtastic::SemanticFormBuilder.inline_errors = :first
+      Formtastic::FormBuilder.inline_errors = :first
       semantic_form_for(@new_post) do |builder|
         builder.errors_on(:title, :error_class => 'better-errors').should have_tag('p.better-errors', @title_errors.first)
       end
     end
 
     it 'should return nil when inline_errors config is :none' do
-      ::Formtastic::SemanticFormBuilder.inline_errors = :none
+      Formtastic::FormBuilder.inline_errors = :none
       semantic_form_for(@new_post) do |builder|
         builder.errors_on(:title).should be_nil
       end
@@ -122,7 +122,7 @@
 
     it 'should return nil when inline_errors config is :sentence, :list or :none' do
       [:sentence, :list, :none].each do |config|
-        ::Formtastic::SemanticFormBuilder.inline_errors = config
+        Formtastic::FormBuilder.inline_errors = config
         semantic_form_for(@new_post) do |builder|
           builder.errors_on(:title).should be_nil
         end
diff --git a/spec/form_helper_spec.rb b/spec/form_helper_spec.rb
index ec9a87cce..a592f2f31 100644
--- a/spec/form_helper_spec.rb
+++ b/spec/form_helper_spec.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'SemanticFormHelper' do
+describe 'FormHelper' do
 
   include FormtasticSpecHelper
 
@@ -12,9 +12,9 @@
 
   describe '#semantic_form_for' do
 
-    it 'yields an instance of SemanticFormBuilder' do
+    it 'yields an instance of Formtastic::FormBuilder' do
       semantic_form_for(@new_post, :url => '/hello') do |builder|
-        builder.class.should == ::Formtastic::SemanticFormBuilder
+        builder.class.should == Formtastic::FormBuilder
       end
     end
 
@@ -25,7 +25,7 @@
     end
 
     it 'adds a class of "xyz" to the generated form' do
-      ::Formtastic::SemanticFormHelper.default_form_class = 'xyz'
+      Formtastic::Helpers::FormHelper.default_form_class = 'xyz'
       concat(semantic_form_for(::Post.new, :as => :post, :url => '/hello') do |builder|
       end)
       output_buffer.should have_tag("form.xyz")
@@ -105,7 +105,7 @@
 
     describe "with :builder option" do
       it "yields an instance of the given builder" do
-        class MyAwesomeCustomBuilder < ::Formtastic::SemanticFormBuilder
+        class MyAwesomeCustomBuilder < Formtastic::FormBuilder
         end
         semantic_form_for(@new_post, :url => '/hello', :builder => MyAwesomeCustomBuilder) do |builder|
           builder.class.should == MyAwesomeCustomBuilder
@@ -124,25 +124,25 @@ class MyAwesomeCustomBuilder < ::Formtastic::SemanticFormBuilder
   end
 
   describe '#semantic_fields_for' do
-    it 'yields an instance of SemanticFormBuilder' do
+    it 'yields an instance of Formtastic::FormBuilder' do
       semantic_fields_for(@new_post, :url => '/hello') do |builder|
-        builder.class.should == ::Formtastic::SemanticFormBuilder
+        builder.class.should == Formtastic::FormBuilder
       end
     end
   end
 
   describe '#semantic_form_remote_for' do
-    it 'yields an instance of SemanticFormBuilder' do
+    it 'yields an instance of Formtastic::FormBuilder' do
       semantic_form_remote_for(@new_post, :url => '/hello') do |builder|
-        builder.class.should == ::Formtastic::SemanticFormBuilder
+        builder.class.should == Formtastic::FormBuilder
       end
     end
   end
 
   describe '#semantic_form_for_remote' do
-    it 'yields an instance of SemanticFormBuilder' do
+    it 'yields an instance of Formtastic::FormBuilder' do
       semantic_remote_form_for(@new_post, :url => '/hello') do |builder|
-        builder.class.should == ::Formtastic::SemanticFormBuilder
+        builder.class.should == Formtastic::FormBuilder
       end
     end
   end
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index cd4ecfd07..be9c9adfa 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -6,17 +6,17 @@
   FORMTASTIC_KEYS = [:required, :yes, :no, :create, :update].freeze
 
   it "should be defined" do
-    lambda { ::Formtastic::I18n }.should_not raise_error(::NameError)
+    lambda { Formtastic::I18n }.should_not raise_error(::NameError)
   end
 
   describe "default translations" do
     it "should be defined" do
-      lambda { ::Formtastic::I18n::DEFAULT_VALUES }.should_not raise_error(::NameError)
-      ::Formtastic::I18n::DEFAULT_VALUES.is_a?(::Hash).should == true
+      lambda { Formtastic::I18n::DEFAULT_VALUES }.should_not raise_error(::NameError)
+      Formtastic::I18n::DEFAULT_VALUES.is_a?(::Hash).should == true
     end
 
     it "should exists for the core I18n lookup keys" do
-      (::Formtastic::I18n::DEFAULT_VALUES.keys & FORMTASTIC_KEYS).size.should == FORMTASTIC_KEYS.size
+      (Formtastic::I18n::DEFAULT_VALUES.keys & FORMTASTIC_KEYS).size.should == FORMTASTIC_KEYS.size
     end
   end
 
@@ -42,23 +42,23 @@
 
     it "should translate core strings correctly" do
       ::I18n.backend.store_translations :en, {:formtastic => {:required => 'Default Required'}}
-      ::Formtastic::I18n.t(:required).should  == "Default Required"
-      ::Formtastic::I18n.t(:yes).should       == "Default Yes"
-      ::Formtastic::I18n.t(:no).should        == "Default No"
-      ::Formtastic::I18n.t(:create, :model => 'Post').should == "Default Create Post"
-      ::Formtastic::I18n.t(:update, :model => 'Post').should == "Default Update Post"
+      Formtastic::I18n.t(:required).should  == "Default Required"
+      Formtastic::I18n.t(:yes).should       == "Default Yes"
+      Formtastic::I18n.t(:no).should        == "Default No"
+      Formtastic::I18n.t(:create, :model => 'Post').should == "Default Create Post"
+      Formtastic::I18n.t(:update, :model => 'Post').should == "Default Update Post"
     end
 
     it "should all belong to scope 'formtastic'" do
-      ::Formtastic::I18n.t(:duck, :scope => [:custom_scope]).should == 'Duck'
+      Formtastic::I18n.t(:duck, :scope => [:custom_scope]).should == 'Duck'
     end
 
     it "should override default I18n lookup args if these are specified" do
-      ::Formtastic::I18n.t(:duck_pond, :scope => [:custom_scope], :ducks => 15).should == '15 ducks in a pond'
+      Formtastic::I18n.t(:duck_pond, :scope => [:custom_scope], :ducks => 15).should == '15 ducks in a pond'
     end
 
     it "should be possible to override default values" do
-      ::Formtastic::I18n.t(:required, :default => 'Nothing found!').should == 'Nothing found!'
+      Formtastic::I18n.t(:required, :default => 'Nothing found!').should == 'Nothing found!'
     end
 
   end
@@ -70,8 +70,8 @@
     end
 
     it "should use default strings" do
-      (::Formtastic::I18n::DEFAULT_VALUES.keys).each do |key|
-        ::Formtastic::I18n.t(key, :model => '%{model}').should == ::Formtastic::I18n::DEFAULT_VALUES[key]
+      (Formtastic::I18n::DEFAULT_VALUES.keys).each do |key|
+        Formtastic::I18n.t(key, :model => '%{model}').should == Formtastic::I18n::DEFAULT_VALUES[key]
       end
     end
 
@@ -97,7 +97,7 @@
             :post => {:author => "Written by"}
           }
         }}
-      ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
+      Formtastic::FormBuilder.i18n_lookups_by_default = true
 
       @new_post.stub!(:title)
       @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :string, :limit => 255))
@@ -105,11 +105,11 @@
 
     after do
       ::I18n.backend.reload!
-      ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
+      Formtastic::FormBuilder.i18n_lookups_by_default = false
     end
 
     it "lookup scopes should be defined" do
-      lambda { ::Formtastic::I18n::SCOPES }.should_not raise_error(::NameError)
+      lambda { Formtastic::I18n::SCOPES }.should_not raise_error(::NameError)
     end
 
     it "should be able to translate with namespaced object" do
diff --git a/spec/include_blank_spec.rb b/spec/include_blank_spec.rb
index 5c68efb4f..da1ef98a0 100644
--- a/spec/include_blank_spec.rb
+++ b/spec/include_blank_spec.rb
@@ -22,7 +22,7 @@
 
   describe 'when :include_blank is not set' do
     it 'blank value should be included if the default value specified in config is true' do
-      ::Formtastic::SemanticFormBuilder.include_blank_for_select_by_default = true
+      Formtastic::FormBuilder.include_blank_for_select_by_default = true
       @select_input_types.each do |as, attribute|
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as))
@@ -32,7 +32,7 @@
     end
 
     it 'blank value should not be included if the default value specified in config is false' do
-      ::Formtastic::SemanticFormBuilder.include_blank_for_select_by_default = false
+      Formtastic::FormBuilder.include_blank_for_select_by_default = false
       @select_input_types.each do |as, attribute|
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as))
@@ -42,7 +42,7 @@
     end
 
     after do
-      ::Formtastic::SemanticFormBuilder.include_blank_for_select_by_default = true
+      Formtastic::FormBuilder.include_blank_for_select_by_default = true
     end
   end
 
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 4ce014391..64bc92ee3 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'SemanticFormBuilder#input' do
+describe 'Formtastic::FormBuilder#input' do
 
   include FormtasticSpecHelper
 
@@ -12,7 +12,7 @@
 
   describe 'with inline order customization' do
     it 'should allow input, hints, errors as order' do
-      ::Formtastic::SemanticFormBuilder.inline_order = [:input, :hints, :errors]
+      Formtastic::FormBuilder.inline_order = [:input, :hints, :errors]
 
       semantic_form_for(@new_post) do |builder|
         builder.should_receive(:inline_input_for).once.ordered
@@ -23,7 +23,7 @@
     end
 
     it 'should allow hints, input, errors as order' do
-      ::Formtastic::SemanticFormBuilder.inline_order = [:hints, :input, :errors]
+      Formtastic::FormBuilder.inline_order = [:hints, :input, :errors]
 
       semantic_form_for(@new_post) do |builder|
         builder.should_receive(:inline_hints_for).once.ordered
@@ -34,8 +34,8 @@
     end
 
     it 'should allow errors, input, hint for a custom type while preserving original inline order' do
-      ::Formtastic::SemanticFormBuilder.custom_inline_order[:checkbox] = [:errors, :input, :hints]
-      ::Formtastic::SemanticFormBuilder.inline_order = [:hints, :input, :errors]
+      Formtastic::FormBuilder.custom_inline_order[:checkbox] = [:errors, :input, :hints]
+      Formtastic::FormBuilder.inline_order = [:hints, :input, :errors]
 
       semantic_form_for(@new_post) do |builder|
         builder.should_receive(:inline_errors_for).once.ordered
@@ -66,13 +66,13 @@
       describe 'when true' do
 
         before do
-          @old_string = ::Formtastic::SemanticFormBuilder.required_string
-          @new_string = ::Formtastic::SemanticFormBuilder.required_string = " required yo!" # ensure there's something in the string
+          @old_string = Formtastic::FormBuilder.required_string
+          @new_string = Formtastic::FormBuilder.required_string = " required yo!" # ensure there's something in the string
           @new_post.class.should_not_receive(:reflect_on_all_validations)
         end
 
         after do
-          ::Formtastic::SemanticFormBuilder.required_string = @old_string
+          Formtastic::FormBuilder.required_string = @old_string
         end
 
         it 'should set a "required" class' do
@@ -95,12 +95,12 @@
       describe 'when false' do
 
         before do
-          @string = ::Formtastic::SemanticFormBuilder.optional_string = " optional yo!" # ensure there's something in the string
+          @string = Formtastic::FormBuilder.optional_string = " optional yo!" # ensure there's something in the string
           @new_post.class.should_not_receive(:reflect_on_all_validations)
         end
 
         after do
-          ::Formtastic::SemanticFormBuilder.optional_string = ''
+          Formtastic::FormBuilder.optional_string = ''
         end
 
         it 'should set an "optional" class' do
@@ -125,8 +125,8 @@
         describe 'and an object was not given' do
 
           it 'should use the default value' do
-            ::Formtastic::SemanticFormBuilder.all_fields_required_by_default.should == true
-            ::Formtastic::SemanticFormBuilder.all_fields_required_by_default = false
+            Formtastic::FormBuilder.all_fields_required_by_default.should == true
+            Formtastic::FormBuilder.all_fields_required_by_default = false
 
             concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
               concat(builder.input(:title))
@@ -134,7 +134,7 @@
             output_buffer.should_not have_tag('form li.required')
             output_buffer.should have_tag('form li.optional')
 
-            ::Formtastic::SemanticFormBuilder.all_fields_required_by_default = true
+            Formtastic::FormBuilder.all_fields_required_by_default = true
           end
 
         end
@@ -373,8 +373,8 @@ def should_be_required(options)
           describe 'and the validation reflection plugin is not available' do
 
             it 'should use the default value' do
-              ::Formtastic::SemanticFormBuilder.all_fields_required_by_default.should == true
-              ::Formtastic::SemanticFormBuilder.all_fields_required_by_default = false
+              Formtastic::FormBuilder.all_fields_required_by_default.should == true
+              Formtastic::FormBuilder.all_fields_required_by_default = false
 
               concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title))
@@ -382,7 +382,7 @@ def should_be_required(options)
               output_buffer.should_not have_tag('form li.required')
               output_buffer.should have_tag('form li.optional')
 
-              ::Formtastic::SemanticFormBuilder.all_fields_required_by_default = true
+              Formtastic::FormBuilder.all_fields_required_by_default = true
             end
 
           end
@@ -508,12 +508,12 @@ def should_be_required(options)
         end
 
         describe 'defaulting to file column' do
-          ::Formtastic::SemanticFormBuilder.file_methods.each do |method|
+          Formtastic::FormBuilder.file_methods.each do |method|
             it "should default to :file for attributes that respond to ##{method}" do
               @new_post.stub!(:column_for_attribute).and_return(nil)
               column = mock('column')
 
-              ::Formtastic::SemanticFormBuilder.file_methods.each do |test|
+              Formtastic::FormBuilder.file_methods.each do |test|
                 ### TODO: Check if this is ok
                 column.stub!(method).with(test).and_return(method == test)
               end
@@ -599,7 +599,7 @@ def should_be_required(options)
         describe 'when localized label is NOT provided' do
           describe 'and object is not given' do
             it 'should default the humanized method name, passing it down to the label tag' do
-              ::Formtastic::SemanticFormBuilder.label_str_method = :humanize
+              Formtastic::FormBuilder.label_str_method = :humanize
 
               concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
                 concat(builder.input(:meta_description))
@@ -649,7 +649,7 @@ def should_be_required(options)
                      }
                    }
                 }
-            ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
+            Formtastic::FormBuilder.i18n_lookups_by_default = false
           end
 
           it 'should render a label with localized label (I18n)' do
@@ -686,7 +686,7 @@ def should_be_required(options)
       describe 'when provided' do
 
         after do
-          ::Formtastic::SemanticFormBuilder.default_hint_class = "inline-hints"
+          Formtastic::FormBuilder.default_hint_class = "inline-hints"
         end
 
         it 'should be passed down to the paragraph tag' do
@@ -707,7 +707,7 @@ def should_be_required(options)
 
         it 'should have a custom hint class defaulted for all forms' do
           hint_text = "this is the title of the post"
-          ::Formtastic::SemanticFormBuilder.default_hint_class = "custom-hint-class"
+          Formtastic::FormBuilder.default_hint_class = "custom-hint-class"
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :hint => hint_text))
           end)
@@ -726,7 +726,7 @@ def should_be_required(options)
                     :title => @default_localized_hint_text,
                    }
                 }
-            ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
+            Formtastic::FormBuilder.i18n_lookups_by_default = false
           end
 
           after do
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index fac7a3d3d..5956babe1 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -235,7 +235,7 @@
 
       before do
         ::I18n.backend.store_translations :en, :formtastic => { :labels => { :post => { :authors => "Translated!" }}}
-        Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
+        Formtastic::FormBuilder.i18n_lookups_by_default = true
 
         @new_post.stub!(:author_ids).and_return(nil)
         concat(semantic_form_for(@new_post) do |builder|
@@ -245,7 +245,7 @@
 
       after do
         ::I18n.backend.reload!
-        Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
+        Formtastic::FormBuilder.i18n_lookups_by_default = false
       end
 
       it "should do foo" do
diff --git a/spec/inputs/country_input_spec.rb b/spec/inputs/country_input_spec.rb
index dc39b0849..36e44d69d 100644
--- a/spec/inputs/country_input_spec.rb
+++ b/spec/inputs/country_input_spec.rb
@@ -62,7 +62,7 @@
     end
 
     it "should default to the @@priority_countries config when absent" do
-      priority_countries = ::Formtastic::SemanticFormBuilder.priority_countries
+      priority_countries = Formtastic::FormBuilder.priority_countries
       priority_countries.should_not be_empty
       priority_countries.should_not be_nil
 
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 48a9a7132..5685a7d96 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -136,7 +136,7 @@
     before do
       ::I18n.backend.store_translations :en, :formtastic => { :labels => { :post => { :authors => "Translated!" }}}
 
-      Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
+      Formtastic::FormBuilder.i18n_lookups_by_default = true
       @new_post.stub!(:author_ids).and_return(nil)
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:authors, :as => :radio))
@@ -145,7 +145,7 @@
 
     after do
       ::I18n.backend.reload!
-      Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
+      Formtastic::FormBuilder.i18n_lookups_by_default = false
     end
 
     it "should do foo" do
diff --git a/spec/inputs_spec.rb b/spec/inputs_spec.rb
index 57f0be8c7..c3c94e8d1 100644
--- a/spec/inputs_spec.rb
+++ b/spec/inputs_spec.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'SemanticFormBuilder#inputs' do
+describe 'Formtastic::FormBuilder#inputs' do
 
   include FormtasticSpecHelper
 
@@ -181,7 +181,7 @@
           concat(inputs)
         end)
 
-        output_buffer.should_not have_tag('fieldset[@builder="Formtastic::SemanticFormHelper"]')
+        output_buffer.should_not have_tag('fieldset[@builder="Formtastic::Helpers::FormHelper"]')
       end
 
       it 'should send parent_builder as an option to allow child index interpolation' do
diff --git a/spec/label_spec.rb b/spec/label_spec.rb
index 9e97e3f77..28b92396b 100644
--- a/spec/label_spec.rb
+++ b/spec/label_spec.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'SemanticFormBuilder#label' do
+describe 'Formtastic::FormBuilder#label' do
 
   include FormtasticSpecHelper
 
@@ -68,14 +68,14 @@
     end
 
     it 'should not html escape the label if configured that way' do
-      ::Formtastic::SemanticFormBuilder.escape_html_entities_in_hints_and_labels = false
+      Formtastic::FormBuilder.escape_html_entities_in_hints_and_labels = false
       semantic_form_for(@new_post) do |builder|
         builder.label(:login, :required => false, :label => '<b>My label</b>').should == "<label for=\"post_login\"><b>My label</b></label>"
       end
     end
 
     it 'should not html escape the label string for html_safe strings' do
-      ::Formtastic::SemanticFormBuilder.escape_html_entities_in_hints_and_labels = true
+      Formtastic::FormBuilder.escape_html_entities_in_hints_and_labels = true
       semantic_form_for(@new_post) do |builder|
         builder.label(:login, :required => false, :label => '<b>My label</b>'.html_safe).should == "<label for=\"post_login\"><b>My label</b></label>"
       end
diff --git a/spec/semantic_errors_spec.rb b/spec/semantic_errors_spec.rb
index 9fc812954..f15ea8be4 100644
--- a/spec/semantic_errors_spec.rb
+++ b/spec/semantic_errors_spec.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'SemanticFormBuilder#semantic_errors' do
+describe 'Formtastic::FormBuilder#semantic_errors' do
 
   include FormtasticSpecHelper
 
diff --git a/spec/semantic_fields_for_spec.rb b/spec/semantic_fields_for_spec.rb
index 74ef5ddc5..87d3d8272 100644
--- a/spec/semantic_fields_for_spec.rb
+++ b/spec/semantic_fields_for_spec.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'SemanticFormBuilder#semantic_fields_for' do
+describe 'Formtastic::FormBuilder#semantic_fields_for' do
 
   include FormtasticSpecHelper
 
@@ -11,10 +11,10 @@
     @new_post.stub!(:author).and_return(::Author.new)
   end
 
-  it 'yields an instance of SemanticFormHelper.builder' do
+  it 'yields an instance of FormHelper.builder' do
     semantic_form_for(@new_post) do |builder|
       builder.semantic_fields_for(:author) do |nested_builder|
-        nested_builder.class.should == ::Formtastic::SemanticFormHelper.builder
+        nested_builder.class.should == Formtastic::Helpers::FormHelper.builder
       end
     end
   end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 50c32c9b5..6888ac035 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -35,7 +35,7 @@ module FormtasticSpecHelper
   include ActiveSupport
   include ActionController::PolymorphicRoutes if defined?(ActionController::PolymorphicRoutes)
 
-  include Formtastic::SemanticFormHelper
+  include Formtastic::Helpers::FormHelper
 
   def default_input_type(column_type, column_name = :generic_column_name)
     @new_post.stub!(column_name)
@@ -224,7 +224,7 @@ def new_author_path; "/authors/new"; end
     ::Post.stub!(:to_ary)
 
     @mock_file = mock('file')
-    ::Formtastic::SemanticFormBuilder.file_methods.each do |method|
+    Formtastic::FormBuilder.file_methods.each do |method|
       @mock_file.stub!(method).and_return(true)
     end
 
@@ -293,10 +293,10 @@ def protect_against_forgery?
   end
 
   def with_config(config_method_name, value, &block)
-    old_value = ::Formtastic::SemanticFormBuilder.send(config_method_name)
-    ::Formtastic::SemanticFormBuilder.send(:"#{config_method_name}=", value)
+    old_value = Formtastic::FormBuilder.send(config_method_name)
+    Formtastic::FormBuilder.send(:"#{config_method_name}=", value)
     yield
-    ::Formtastic::SemanticFormBuilder.send(:"#{config_method_name}=", old_value)
+    Formtastic::FormBuilder.send(:"#{config_method_name}=", old_value)
   end
 
 end
diff --git a/spec/support/custom_macros.rb b/spec/support/custom_macros.rb
index b7ec8be26..aac734820 100644
--- a/spec/support/custom_macros.rb
+++ b/spec/support/custom_macros.rb
@@ -93,7 +93,7 @@ def it_should_use_default_text_field_size_when_not_nil(as)
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => as))
           end)
-          output_buffer.should have_tag("form li input[@size='#{Formtastic::SemanticFormBuilder.default_text_field_size}']")
+          output_buffer.should have_tag("form li input[@size='#{Formtastic::FormBuilder.default_text_field_size}']")
         end
       end
     end
@@ -154,7 +154,7 @@ def it_should_apply_error_logic_for_input_type(type)
           @title_errors = ['must not be blank', 'must be longer than 10 characters', 'must be awesome']
           @errors = mock('errors')
           @errors.stub!(:[]).with(:title).and_return(@title_errors)
-          ::Formtastic::SemanticFormBuilder.file_metadata_suffixes.each do |suffix|
+          Formtastic::FormBuilder.file_metadata_suffixes.each do |suffix|
             @errors.stub!(:[]).with("title_#{suffix}".to_sym).and_return(nil)
           end
           @new_post.stub!(:errors).and_return(@errors)
@@ -175,7 +175,7 @@ def it_should_apply_error_logic_for_input_type(type)
         end
 
         it 'should render a paragraph for the errors' do
-          ::Formtastic::SemanticFormBuilder.inline_errors = :sentence
+          Formtastic::FormBuilder.inline_errors = :sentence
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
           end)
@@ -183,7 +183,7 @@ def it_should_apply_error_logic_for_input_type(type)
         end
 
         it 'should not display an error list' do
-          ::Formtastic::SemanticFormBuilder.inline_errors = :list
+          Formtastic::FormBuilder.inline_errors = :list
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
           end)
@@ -411,7 +411,7 @@ def it_should_use_the_collection_when_provided(as, countable)
         end
 
         describe 'when the :label_method option is not provided' do
-          ::Formtastic::SemanticFormBuilder.collection_label_methods.each do |label_method|
+          Formtastic::FormBuilder.collection_label_methods.each do |label_method|
 
             describe "when the collection objects respond to #{label_method}" do
               before do

From cb2f0455b57b858d5aea9ad85582fe0cf04dfb41 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 18 Jan 2011 21:58:38 +1100
Subject: [PATCH 468/992] add YARD to development dependencies, some basic
 .yardopts, and ignore some YARD artefacts like doc/

---
 .gitignore         | 4 +++-
 .yardopts          | 1 +
 formtastic.gemspec | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .yardopts

diff --git a/.gitignore b/.gitignore
index 268b57907..6acfab863 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,6 @@ pkg
 log/*
 .rvmrc
 .bundle
-Gemfile.lock
\ No newline at end of file
+Gemfile.lock
+.yardoc
+doc/
\ No newline at end of file
diff --git a/.yardopts b/.yardopts
new file mode 100644
index 000000000..aaa19adc7
--- /dev/null
+++ b/.yardopts
@@ -0,0 +1 @@
+--no-private --title "Formtastic Documentation"
\ No newline at end of file
diff --git a/formtastic.gemspec b/formtastic.gemspec
index 011db2f9b..d574a1ce3 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -39,5 +39,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<rspec-rails>, ["~> 2.0.0"])
   s.add_development_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
   s.add_development_dependency(%q<hpricot>, ["~> 0.8.3"])
+  s.add_development_dependency(%q<RedCloth>) # for YARD, which doesn't list it as a dependency
+  s.add_development_dependency(%q<yard>, ["~> 0.6"])
 
 end

From 2f81ae4461e3cd0975c3caea3550a7b091dcb286 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 18 Jan 2011 22:13:31 +1100
Subject: [PATCH 469/992] hid a bunch of internal modules from YARD with
 @private tags

---
 lib/formtastic/helpers/fieldset_wrapper.rb      | 1 +
 lib/formtastic/helpers/file_column_detection.rb | 1 +
 lib/formtastic/helpers/semantic_form_helper.rb  | 1 +
 lib/formtastic/html_attributes.rb               | 1 +
 lib/formtastic/i18n.rb                          | 1 +
 lib/formtastic/localized_string.rb              | 1 +
 lib/formtastic/railtie.rb                       | 1 +
 lib/formtastic/reflection.rb                    | 2 +-
 lib/formtastic/semantic_form_builder.rb         | 1 +
 lib/formtastic/util.rb                          | 1 +
 10 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/helpers/fieldset_wrapper.rb b/lib/formtastic/helpers/fieldset_wrapper.rb
index e5398930c..3f3b4a23b 100644
--- a/lib/formtastic/helpers/fieldset_wrapper.rb
+++ b/lib/formtastic/helpers/fieldset_wrapper.rb
@@ -1,5 +1,6 @@
 module Formtastic
   module Helpers
+    # @private
     module FieldsetWrapper
     
       protected
diff --git a/lib/formtastic/helpers/file_column_detection.rb b/lib/formtastic/helpers/file_column_detection.rb
index da079214c..42a26e157 100644
--- a/lib/formtastic/helpers/file_column_detection.rb
+++ b/lib/formtastic/helpers/file_column_detection.rb
@@ -1,5 +1,6 @@
 module Formtastic
   module Helpers
+    # @private
     module FileColumnDetection
       
       def is_file?(method, options = {})
diff --git a/lib/formtastic/helpers/semantic_form_helper.rb b/lib/formtastic/helpers/semantic_form_helper.rb
index 0adf39d17..a0fb71984 100644
--- a/lib/formtastic/helpers/semantic_form_helper.rb
+++ b/lib/formtastic/helpers/semantic_form_helper.rb
@@ -1,6 +1,7 @@
 module Formtastic
   # Quick hack/shim for anything expecting the old SemanticFormHelper module.
   # TODO remove from 2.0 with a helpful upgrade path/warning.
+  # @private
   module SemanticFormHelper
     include Formtastic::Helpers::FormHelper
     @@builder = Formtastic::Helpers::FormHelper.builder
diff --git a/lib/formtastic/html_attributes.rb b/lib/formtastic/html_attributes.rb
index 37c971d18..87a1fe3de 100644
--- a/lib/formtastic/html_attributes.rb
+++ b/lib/formtastic/html_attributes.rb
@@ -1,4 +1,5 @@
 module Formtastic
+  # @private
   module HtmlAttributes
     
     protected
diff --git a/lib/formtastic/i18n.rb b/lib/formtastic/i18n.rb
index d12ef44b7..cc3691a5c 100644
--- a/lib/formtastic/i18n.rb
+++ b/lib/formtastic/i18n.rb
@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 module Formtastic
+  # @private
   module I18n
 
     DEFAULT_SCOPE = [:formtastic].freeze
diff --git a/lib/formtastic/localized_string.rb b/lib/formtastic/localized_string.rb
index 3d4d87058..6223adf69 100644
--- a/lib/formtastic/localized_string.rb
+++ b/lib/formtastic/localized_string.rb
@@ -1,4 +1,5 @@
 module Formtastic
+  # @private
   module LocalizedString
     
     protected
diff --git a/lib/formtastic/railtie.rb b/lib/formtastic/railtie.rb
index 912842863..abb314e6a 100644
--- a/lib/formtastic/railtie.rb
+++ b/lib/formtastic/railtie.rb
@@ -5,6 +5,7 @@
 require 'rails'
 
 module Formtastic
+  # @private
   class Railtie < Rails::Railtie
     initializer 'formtastic.initialize', :after => :after_initialize do
       ActionView::Base.send :include, Formtastic::Helpers::FormHelper
diff --git a/lib/formtastic/reflection.rb b/lib/formtastic/reflection.rb
index 817ba0ea9..b0558996d 100644
--- a/lib/formtastic/reflection.rb
+++ b/lib/formtastic/reflection.rb
@@ -1,8 +1,8 @@
 module Formtastic
+  # @private
   module Reflection
     # 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
diff --git a/lib/formtastic/semantic_form_builder.rb b/lib/formtastic/semantic_form_builder.rb
index 25e134ba7..49bc1c4a8 100644
--- a/lib/formtastic/semantic_form_builder.rb
+++ b/lib/formtastic/semantic_form_builder.rb
@@ -1,6 +1,7 @@
 module Formtastic
   # Quick hack/shim so that any code expecting the old SemanticFormBuilder class still works.
   # TODO remove from 2.0 with a helpful upgrade path/warning.
+  # @private
   class SemanticFormBuilder < Formtastic::FormBuilder
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/util.rb b/lib/formtastic/util.rb
index 912b9132c..b7f0ee979 100644
--- a/lib/formtastic/util.rb
+++ b/lib/formtastic/util.rb
@@ -2,6 +2,7 @@
 
 # Adapted from the rails3 compatibility shim in Haml 2.2
 module Formtastic
+  # @private
   module Util
     extend self
     ## Rails XSS Safety

From 41720ed4113448e05491c29519c2f7440c08c905 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 18 Jan 2011 22:34:27 +1100
Subject: [PATCH 470/992] remove support namespace for inputs/basic and
 inputs/timeish

---
 lib/formtastic/inputs/basic.rb          | 140 +++++++++--------
 lib/formtastic/inputs/date_input.rb     |   2 +-
 lib/formtastic/inputs/datetime_input.rb |   2 +-
 lib/formtastic/inputs/email_input.rb    |   2 +-
 lib/formtastic/inputs/file_input.rb     |   2 +-
 lib/formtastic/inputs/numeric_input.rb  |   2 +-
 lib/formtastic/inputs/password_input.rb |   2 +-
 lib/formtastic/inputs/phone_input.rb    |   2 +-
 lib/formtastic/inputs/search_input.rb   |   2 +-
 lib/formtastic/inputs/string_input.rb   |   2 +-
 lib/formtastic/inputs/text_input.rb     |   2 +-
 lib/formtastic/inputs/time_input.rb     |   2 +-
 lib/formtastic/inputs/timeish.rb        | 196 ++++++++++++------------
 lib/formtastic/inputs/url_input.rb      |   2 +-
 14 files changed, 178 insertions(+), 182 deletions(-)

diff --git a/lib/formtastic/inputs/basic.rb b/lib/formtastic/inputs/basic.rb
index 9f42be3db..0e40196e2 100644
--- a/lib/formtastic/inputs/basic.rb
+++ b/lib/formtastic/inputs/basic.rb
@@ -1,84 +1,82 @@
 module Formtastic
   module Inputs
-    module Support
-      module Basic
-        
-        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, :text, :phone, :search, :url, :email].include?(type)
-          field_id = generate_html_id(method, "")
-          html_options[:id] ||= field_id
-          label_options = options_for_label(options)
-          label_options[:for] ||= html_options[:id]
-          label(method, label_options) <<
-            send(respond_to?(form_helper_method) ? form_helper_method : :text_field, method, html_options)
-        end
-        
-        protected
-        
-        # Generates default_string_options by retrieving column information from
-        # the database.
-        #
-        def default_string_options(method, type) #:nodoc:
-          def get_maxlength_for(method)
-            validation = validations_for(method).find do |validation|
-              (validation.respond_to?(:macro) && validation.macro == :validates_length_of) || # Rails 2 + 3 style validation
-              (validation.respond_to?(:kind) && validation.kind == :length) # Rails 3 style validator
-            end
-    
-            if validation
-              validation.options[:maximum] || (validation.options[:within].present? ? validation.options[:within].max : nil)
-            else
-              nil
-            end
+    module Basic
+      
+      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, :text, :phone, :search, :url, :email].include?(type)
+        field_id = generate_html_id(method, "")
+        html_options[:id] ||= field_id
+        label_options = options_for_label(options)
+        label_options[:for] ||= html_options[:id]
+        label(method, label_options) <<
+          send(respond_to?(form_helper_method) ? form_helper_method : :text_field, method, html_options)
+      end
+      
+      protected
+      
+      # Generates default_string_options by retrieving column information from
+      # the database.
+      #
+      def default_string_options(method, type) #:nodoc:
+        def get_maxlength_for(method)
+          validation = validations_for(method).find do |validation|
+            (validation.respond_to?(:macro) && validation.macro == :validates_length_of) || # Rails 2 + 3 style validation
+            (validation.respond_to?(:kind) && validation.kind == :length) # Rails 3 style validator
           end
-    
-          validation_max_limit = get_maxlength_for(method)
-          column = column_for(method)
-    
-          if type == :text
-            { :rows => default_text_area_height, 
-              :cols => default_text_area_width }
-          elsif type == :numeric || column.nil? || !column.respond_to?(:limit) || column.limit.nil?
-            { :maxlength => validation_max_limit,
-              :size => default_text_field_size }
+  
+          if validation
+            validation.options[:maximum] || (validation.options[:within].present? ? validation.options[:within].max : nil)
           else
-            { :maxlength => validation_max_limit || column.limit,
-              :size => default_text_field_size }
+            nil
           end
         end
-        
-        # Returns the active validations for the given method or an empty Array if no validations are
-        # found for the method.
-        #
-        # By default, the if/unless options of the validations are evaluated and only the validations
-        # that should be run for the current object state are returned. Pass :all to the last
-        # parameter to return :all validations regardless of if/unless options.
-        #
-        # Requires the ValidationReflection plugin to be present or an ActiveModel. Returns an epmty
-        # Array if neither is the case.
-        #
-        def validations_for(method, mode = :active)
-          # ActiveModel?
-          validations = if @object && @object.class.respond_to?(:validators_on)
-            @object.class.validators_on(method)
+  
+        validation_max_limit = get_maxlength_for(method)
+        column = column_for(method)
+  
+        if type == :text
+          { :rows => default_text_area_height, 
+            :cols => default_text_area_width }
+        elsif type == :numeric || column.nil? || !column.respond_to?(:limit) || column.limit.nil?
+          { :maxlength => validation_max_limit,
+            :size => default_text_field_size }
+        else
+          { :maxlength => validation_max_limit || column.limit,
+            :size => default_text_field_size }
+        end
+      end
+      
+      # Returns the active validations for the given method or an empty Array if no validations are
+      # found for the method.
+      #
+      # By default, the if/unless options of the validations are evaluated and only the validations
+      # that should be run for the current object state are returned. Pass :all to the last
+      # parameter to return :all validations regardless of if/unless options.
+      #
+      # Requires the ValidationReflection plugin to be present or an ActiveModel. Returns an epmty
+      # Array if neither is the case.
+      #
+      def validations_for(method, mode = :active)
+        # ActiveModel?
+        validations = if @object && @object.class.respond_to?(:validators_on)
+          @object.class.validators_on(method)
+        else
+          # ValidationReflection plugin?
+          if @object && @object.class.respond_to?(:reflect_on_validations_for)
+            @object.class.reflect_on_validations_for(method)
           else
-            # ValidationReflection plugin?
-            if @object && @object.class.respond_to?(:reflect_on_validations_for)
-              @object.class.reflect_on_validations_for(method)
-            else
-              []
-            end
+            []
           end
-    
-          validations = validations.select do |validation|
-            (validation.options.present? ? options_require_validation?(validation.options) : true)
-          end unless mode == :all
-    
-          return validations
         end
-        
+  
+        validations = validations.select do |validation|
+          (validation.options.present? ? options_require_validation?(validation.options) : true)
+        end unless mode == :all
+  
+        return validations
       end
+      
     end
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/date_input.rb b/lib/formtastic/inputs/date_input.rb
index 23619f9c8..b281de9ae 100644
--- a/lib/formtastic/inputs/date_input.rb
+++ b/lib/formtastic/inputs/date_input.rb
@@ -5,7 +5,7 @@ module Formtastic
   module Inputs
     module DateInput
       include Formtastic::Inputs::Base
-      include Support::Timeish
+      include Formtastic::Inputs::Timeish
       
       # 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
diff --git a/lib/formtastic/inputs/datetime_input.rb b/lib/formtastic/inputs/datetime_input.rb
index 327b75a98..5845b0b10 100644
--- a/lib/formtastic/inputs/datetime_input.rb
+++ b/lib/formtastic/inputs/datetime_input.rb
@@ -5,7 +5,7 @@ module Formtastic
   module Inputs
     module DatetimeInput
       include Formtastic::Inputs::Base
-      include Support::Timeish
+      include Formtastic::Inputs::Timeish
       
       # 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
diff --git a/lib/formtastic/inputs/email_input.rb b/lib/formtastic/inputs/email_input.rb
index 195198423..e9f51caf0 100644
--- a/lib/formtastic/inputs/email_input.rb
+++ b/lib/formtastic/inputs/email_input.rb
@@ -5,7 +5,7 @@ module Formtastic
   module Inputs
     module EmailInput
       include Formtastic::Inputs::Base
-      include Support::Basic
+      include Formtastic::Inputs::Basic
       
       # Outputs a label and a standard Rails email field inside the wrapper.
       def email_input(method, options)
diff --git a/lib/formtastic/inputs/file_input.rb b/lib/formtastic/inputs/file_input.rb
index 4a67f22d8..2197eda49 100644
--- a/lib/formtastic/inputs/file_input.rb
+++ b/lib/formtastic/inputs/file_input.rb
@@ -5,7 +5,7 @@ module Formtastic
   module Inputs
     module FileInput
       include Formtastic::Inputs::Base
-      include Support::Basic
+      include Formtastic::Inputs::Basic
       
       # Outputs a label and a standard Rails file field inside the wrapper.
       def file_input(method, options)
diff --git a/lib/formtastic/inputs/numeric_input.rb b/lib/formtastic/inputs/numeric_input.rb
index a9a38676a..847eb0169 100644
--- a/lib/formtastic/inputs/numeric_input.rb
+++ b/lib/formtastic/inputs/numeric_input.rb
@@ -4,7 +4,7 @@ module Formtastic
   module Inputs
     module NumericInput
       include Formtastic::Inputs::Base
-      include Support::Basic
+      include Formtastic::Inputs::Basic
       
       # Outputs a label and standard Rails text field inside the wrapper.
       def numeric_input(method, options)
diff --git a/lib/formtastic/inputs/password_input.rb b/lib/formtastic/inputs/password_input.rb
index 01d2133bb..c15b1cd20 100644
--- a/lib/formtastic/inputs/password_input.rb
+++ b/lib/formtastic/inputs/password_input.rb
@@ -4,7 +4,7 @@ module Formtastic
   module Inputs
     module PasswordInput
       include Formtastic::Inputs::Base
-      include Support::Basic
+      include Formtastic::Inputs::Basic
       
       # Outputs a label and standard Rails password field inside the wrapper.
       def password_input(method, options)
diff --git a/lib/formtastic/inputs/phone_input.rb b/lib/formtastic/inputs/phone_input.rb
index 3cac04850..3800608f8 100644
--- a/lib/formtastic/inputs/phone_input.rb
+++ b/lib/formtastic/inputs/phone_input.rb
@@ -4,7 +4,7 @@ module Formtastic
   module Inputs
     module PhoneInput
       include Formtastic::Inputs::Base
-      include Support::Basic
+      include Formtastic::Inputs::Basic
 
       # Outputs a label and a standard Rails phone field inside the wrapper.
       def phone_input(method, options)
diff --git a/lib/formtastic/inputs/search_input.rb b/lib/formtastic/inputs/search_input.rb
index 50487c72f..3012b44d2 100644
--- a/lib/formtastic/inputs/search_input.rb
+++ b/lib/formtastic/inputs/search_input.rb
@@ -4,7 +4,7 @@ module Formtastic
   module Inputs
     module SearchInput
       include Formtastic::Inputs::Base
-      include Support::Basic
+      include Formtastic::Inputs::Basic
       
       # Outputs a label and a standard Rails search field inside the wrapper.
       def search_input(method, options)
diff --git a/lib/formtastic/inputs/string_input.rb b/lib/formtastic/inputs/string_input.rb
index c67438b76..b051cc507 100644
--- a/lib/formtastic/inputs/string_input.rb
+++ b/lib/formtastic/inputs/string_input.rb
@@ -4,7 +4,7 @@ module Formtastic
   module Inputs
     module StringInput
       include Formtastic::Inputs::Base
-      include Support::Basic
+      include Formtastic::Inputs::Basic
       # Outputs a label and standard Rails text field inside the wrapper.
       def string_input(method, options)
         basic_input_helper(:text_field, :string, method, options)
diff --git a/lib/formtastic/inputs/text_input.rb b/lib/formtastic/inputs/text_input.rb
index e7b36b607..22f5748f3 100644
--- a/lib/formtastic/inputs/text_input.rb
+++ b/lib/formtastic/inputs/text_input.rb
@@ -3,7 +3,7 @@
 module Formtastic
   module Inputs
     module TextInput
-      include Support::Basic
+      include Formtastic::Inputs::Basic
       
       # Ouputs a label and standard Rails text area inside the wrapper.
       def text_input(method, options)
diff --git a/lib/formtastic/inputs/time_input.rb b/lib/formtastic/inputs/time_input.rb
index 836b52d9f..269ca8fda 100644
--- a/lib/formtastic/inputs/time_input.rb
+++ b/lib/formtastic/inputs/time_input.rb
@@ -3,7 +3,7 @@
 module Formtastic
   module Inputs
     module TimeInput
-      include Support::Timeish
+      include Formtastic::Inputs::Timeish
       # 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. Overwriting the label is possible by adding the :labels option.
diff --git a/lib/formtastic/inputs/timeish.rb b/lib/formtastic/inputs/timeish.rb
index 215f5d894..29956b704 100644
--- a/lib/formtastic/inputs/timeish.rb
+++ b/lib/formtastic/inputs/timeish.rb
@@ -1,107 +1,105 @@
 module Formtastic
   module Inputs
-    module Support
-      module Timeish
-        # Helper method used by :as => (:date|:datetime|:time).  Generates a fieldset containing a
-        # legend (for what would normally be considered the label), and an ordered list of list items
-        # for year, month, day, hour, etc, each containing a label and a select.  Example:
-        #
-        # <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().
-        #
-        # Options:
-        #
-        #   * @:order => [:month, :day, :year]@
-        #   * @:include_seconds@ => true@
-        #   * @:discard_(year|month|day|hour|minute) => true@
-        #   * @:include_blank => true@
-        #   * @:labels => {}@
-        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]
-          inputs   = [] if options[:ignore_date]
-          labels   = options.delete(:labels) || {}
-        
-          time_inputs = [:hour, :minute]
-          time_inputs << :second if options[:include_seconds]
-        
-          list_items_capture = ""
-          hidden_fields_capture = ""
-        
-          datetime = @object.send(method) if @object && @object.send(method)
-        
-          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) : 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 = labels[input] || ::I18n.t(input.to_s, :default => input.to_s.humanize, :scope => [:datetime, :prompts])
-        
-              list_items_capture << template.content_tag(:li, Formtastic::Util.html_safe([
-                  !item_label_text.blank? ? template.content_tag(:label, Formtastic::Util.html_safe(item_label_text), :for => input_id) : "",
-                  template.send(:"select_#{input}", datetime, opts, html_options.merge(:id => input_id))
-                ].join(""))
-              )
-            end
-          end
-        
-          hidden_fields_capture << field_set_and_list_wrapping_for_method(method, options.merge(:label_for => input_ids.first), list_items_capture)
-        end
-        
-        # 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,
-                  label(method, options_for_label(options).merge(:for => options.delete(:label_for))), :class => 'label'
-                ) <<
-              template.content_tag(:ol, Formtastic::Util.html_safe(contents))
+    module Timeish
+      # Helper method used by :as => (:date|:datetime|:time).  Generates a fieldset containing a
+      # legend (for what would normally be considered the label), and an ordered list of list items
+      # for year, month, day, hour, etc, each containing a label and a select.  Example:
+      #
+      # <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().
+      #
+      # Options:
+      #
+      #   * @:order => [:month, :day, :year]@
+      #   * @:include_seconds@ => true@
+      #   * @:discard_(year|month|day|hour|minute) => true@
+      #   * @:include_blank => true@
+      #   * @:labels => {}@
+      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]
+        inputs   = [] if options[:ignore_date]
+        labels   = options.delete(:labels) || {}
+      
+        time_inputs = [:hour, :minute]
+        time_inputs << :second if options[:include_seconds]
+      
+        list_items_capture = ""
+        hidden_fields_capture = ""
+      
+        datetime = @object.send(method) if @object && @object.send(method)
+      
+        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) : 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 = labels[input] || ::I18n.t(input.to_s, :default => input.to_s.humanize, :scope => [:datetime, :prompts])
+      
+            list_items_capture << template.content_tag(:li, Formtastic::Util.html_safe([
+                !item_label_text.blank? ? template.content_tag(:label, Formtastic::Util.html_safe(item_label_text), :for => input_id) : "",
+                template.send(:"select_#{input}", datetime, opts, html_options.merge(:id => input_id))
+              ].join(""))
             )
+          end
         end
-
+      
+        hidden_fields_capture << field_set_and_list_wrapping_for_method(method, options.merge(:label_for => input_ids.first), list_items_capture)
+      end
+      
+      # 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,
+                label(method, options_for_label(options).merge(:for => options.delete(:label_for))), :class => 'label'
+              ) <<
+            template.content_tag(:ol, Formtastic::Util.html_safe(contents))
+          )
       end
+  
     end
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/url_input.rb b/lib/formtastic/inputs/url_input.rb
index 2bb639e8c..9e0a8045a 100644
--- a/lib/formtastic/inputs/url_input.rb
+++ b/lib/formtastic/inputs/url_input.rb
@@ -1,7 +1,7 @@
 module Formtastic
   module Inputs
     module UrlInput
-      include Support::Basic
+      include Formtastic::Inputs::Basic
       
       # Outputs a label and a standard Rails url field inside the wrapper.
       def url_input(method, options)

From 93ebff3693638f51cd74aae8c93c1a072b57386f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 19 Jan 2011 02:03:18 +1100
Subject: [PATCH 471/992] force markdown for YARD, and be quiet about it

---
 .yardopts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yardopts b/.yardopts
index aaa19adc7..3e6286549 100644
--- a/.yardopts
+++ b/.yardopts
@@ -1 +1 @@
---no-private --title "Formtastic Documentation"
\ No newline at end of file
+--no-private --title "Formtastic Documentation" --markup markdown --quiet
\ No newline at end of file

From 649bc6b217e9b45ee9f6e99a2f8929bdc8cb65d7 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 19 Jan 2011 02:03:55 +1100
Subject: [PATCH 472/992] add BlueCloth to dev deps

---
 formtastic.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index d574a1ce3..3bff8edc1 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<rspec-rails>, ["~> 2.0.0"])
   s.add_development_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
   s.add_development_dependency(%q<hpricot>, ["~> 0.8.3"])
-  s.add_development_dependency(%q<RedCloth>) # for YARD, which doesn't list it as a dependency
+  s.add_development_dependency(%q<BlueCloth>) # for YARD
   s.add_development_dependency(%q<yard>, ["~> 0.6"])
 
 end

From 1079c82ade01b55ac4abf7c5a775a9ede4447827 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 19 Jan 2011 02:04:35 +1100
Subject: [PATCH 473/992] WIP massive clean-up of InputsHelper documentation

---
 lib/formtastic/helpers/inputs_helper.rb | 194 +++++++++++++++++-------
 1 file changed, 137 insertions(+), 57 deletions(-)

diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 3a8e81147..a736d8176 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -5,6 +5,55 @@
 
 module Formtastic
   module Helpers
+    
+    # InputsHelper encapsulates the responsibilties of the {#inputs} and {#input} helpers at the core of the 
+    # Formtastic DSL.
+    #
+    # {#inputs} is used to wrap a series of form items in a `<fieldset>` and `<ol>`, with each item
+    # in the list containing the markup representing a single {#input}.
+    #
+    # {#inputs} is usually called with a block containing a series of {#input} calls:
+    #
+    #     <%= semantic_form_for @post do |f| %>
+    #       <%= f.inputs do %>
+    #         <%= f.input :title %>
+    #         <%= f.input :body %>
+    #       <% end %>
+    #     <% end %>
+    #
+    # The HTML output will be something like:
+    #
+    #     <form class="formtastic" method="post" action="...">
+    #       <fieldset>
+    #         <ol>
+    #           <li class="string required" id="post_title_input">
+    #             <label for="post_title">Title*</label>
+    #             <input type="text" name="post[title]" id="post_title" value="">
+    #           </li>
+    #           <li class="text required" id="post_body_input">
+    #             <label for="post_title">Title*</label>
+    #             <textarea name="post[body]" id="post_body"></textarea>
+    #           </li>
+    #         </ol>
+    #       </fieldset>
+    #     </form>
+    #
+    # It's important to note that the `semantic_form_for` and {#inputs} blocks wrap the
+    # standard Rails `form_for` helper and form builder, so you have full access to every standard
+    # Rails form helper, with any HTML markup and ERB syntax, allowing you to "break free" from 
+    # Formtastic when it doesn't suit:
+    #
+    #     <%= semantic_form_for @post do |f| %>
+    #       <%= f.inputs do %>
+    #         <%= f.input :title %>
+    #         <li>
+    #           <%= f.text_area :body %>
+    #         <li>
+    #       <% end %>
+    #     <% end %>
+    #
+    # There are many other syntax variations and arguments to customize your form. See the
+    # full documentation of {#inputs} and {#input} for details.
     module InputsHelper
       include Formtastic::Helpers::FieldsetWrapper
       include Formtastic::Helpers::FileColumnDetection
@@ -13,62 +62,93 @@ module InputsHelper
       
       RESERVED_COLUMNS = [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
       
-      # Returns a suitable form input for the given +method+, using the database column information
-      # and other factors (like the method name) to figure out what you probably want.
-      #
-      # Options:
-      #
-      # * :as - override the input type (eg force a :string to render as a :password field)
-      # * :label - use something other than the method name as the label text, when false no label is printed
-      # * :required - specify if the column is required (true) or not (false)
-      # * :hint - provide some text to hint or help the user provide the correct information for a field
-      # * :input_html - provide options that will be passed down to the generated input
-      # * :wrapper_html - provide options that will be passed down to the li wrapper
-      #
-      # Input Types:
-      #
-      # Most inputs map directly to one of ActiveRecord's column types by default (eg string_input),
-      # but there are a few special cases and some simplification (:integer, :float and :decimal
-      # columns all map to a single numeric_input, for example).
-      #
-      # * :select (a select menu for associations) - default to association names
-      # * :check_boxes (a set of check_box inputs for associations) - alternative to :select has_many and has_and_belongs_to_many associations
-      # * :radio (a set of radio inputs for associations) - alternative to :select belongs_to associations
-      # * :time_zone (a select menu with time zones)
-      # * :password (a password input) - default for :string column types with 'password' in the method name
-      # * :text (a textarea) - default for :text column types
-      # * :date (a date select) - default for :date column types
-      # * :datetime (a date and time select) - default for :datetime and :timestamp column types
-      # * :time (a time select) - default for :time column types
-      # * :boolean (a checkbox) - default for :boolean column types (you can also have booleans as :select and :radio)
-      # * :string (a text field) - default for :string column types
-      # * :numeric (a text field, like string) - default for :integer, :float and :decimal column types
-      # * :email (an email input) - default for :string column types with 'email' as the method name.
-      # * :url (a url input) - default for :string column types with 'url' as the method name.
-      # * :phone (a tel input) - default for :string column types with 'phone' or 'fax' in the method name.
-      # * :search (a search input) - default for :string column types with 'search' as the method name.
-      # * :country (a select menu of country names) - requires a country_select plugin to be installed
-      # * :email (an email input) - New in HTML5 - needs to be explicitly provided with :as => :email
-      # * :url (a url input) - New in HTML5 - needs to be explicitly provided with :as => :url
-      # * :phone (a tel input) - New in HTML5 - needs to be explicitly provided with :as => :phone
-      # * :search (a search input) - New in HTML5 - needs to be explicity provided with :as => :search
-      # * :country (a select menu of country names) - requires a country_select plugin to be installed
-      # * :hidden (a hidden field) - creates a hidden field (added for compatibility)
-      #
-      # Example:
-      #
-      #   <% semantic_form_for @employee do |form| %>
-      #     <% form.inputs do -%>
-      #       <%= form.input :name, :label => "Full Name" %>
-      #       <%= form.input :manager, :as => :radio %>
-      #       <%= form.input :secret, :as => :password, :input_html => { :value => "xxxx" } %>
-      #       <%= form.input :hired_at, :as => :date, :label => "Date Hired" %>
-      #       <%= form.input :phone, :required => false, :hint => "Eg: +1 555 1234" %>
-      #       <%= form.input :email %>
-      #       <%= form.input :website, :as => :url, :hint => "You may wish to omit the http://" %>
+      # Returns a chunk of HTML markup for a given `method` on the form object, wrapped in
+      # an `<li>` wrapper tag with appropriate `class` and `id` attribute hooks for CSS and JS.
+      # In many cases, the contents of the wrapper will be as simple as a `<label>` and an `<input>`:
+      #
+      #     <%= f.input :title, :as => :string, :required => true %>
+      #
+      #     <li class="string required" id="post_title_input">
+      #       <label for="post_title">Title<abbr title="Required">*</abbr></label>
+      #       <input type="text" name="post[title]" value="" id="post_title">
+      #     </li>
+      #
+      # In other cases (like a series of checkboxes for a `has_many` relationship), the wrapper may 
+      # include more complex markup, like a nested `<fieldset>` with a `<legend>` and an `<ol>` of 
+      # checkbox/label pairs for each choice:
+      #
+      #     <%= f.input :categories, :as => :check_boxes, :collection => Category.active.ordered %>
+      #
+      #     <li class="check_boxes" id="post_categories_input">
+      #       <fieldset>
+      #         <legend>Categories</legend>
+      #         <ol>
+      #           <li>
+      #             <label><input type="checkbox" name="post[categories][1]" value="1"> Ruby</label>
+      #           </li>
+      #           <li>
+      #             <label><input type="checkbox" name="post[categories][2]" value="2"> Rails</label>
+      #           </li>
+      #           <li>
+      #             <label><input type="checkbox" name="post[categories][2]" value="2"> Awesome</label>
+      #           </li>
+      #         </ol>
+      #       </fieldset>
+      #     </li>
+      #
+      # Sensible defaults for all options are guessed by looking at the method name, database column 
+      # information, association information, validation information, etc. For example, a `:string`
+      # database column will map to a `:string` input, but if the method name contains 'email', will
+      # map to an `:email` input instead. `belongs_to` associations will have a `:select` input, etc.
+      #             
+      # Formtastic supports many different styles of inputs, and you can/should override the default
+      # with the `:as` option. Internally, the symbol is used to map to a protected method 
+      # responsible for the details. For example, `:as => :string` will map to `string_input`, 
+      # defined in a module of the same name. Detailed documentation for each input style and it's 
+      # supported options is available on the `*_input` method in each module (links provided below).
+      #
+      # Available input styles:
+      #
+      # * `:boolean`      (see {Inputs::BooleanInput})
+      # * `:check_boxes`  (see {Inputs::CheckBoxesInput})
+      # * `:country`      (see {Inputs::CountryInput})
+      # * `:datetime`     (see {Inputs::DatetimeInput})
+      # * `:date`         (see {Inputs::DateInput})
+      # * `:email`        (see {Inputs::EmailInput})
+      # * `:hidden`       (see {Inputs::HiddenInput})
+      # * `:numeric`      (see {Inputs::NumericInput})
+      # * `:password`     (see {Inputs::PasswordInput})
+      # * `:phone`        (see {Inputs::PhoneInput})
+      # * `:radio`        (see {Inputs::RadioInput})
+      # * `:search`       (see {Inputs::SearchInput})
+      # * `:select`       (see {Inputs::SelectInput})
+      # * `:string`       (see {Inputs::StringInput})
+      # * `:text`         (see {Inputs::TextInput})
+      # * `:time_zone`    (see {Inputs::TimeZoneInput})
+      # * `:time`         (see {Inputs::TimeInput})
+      # * `:url`          (see {Inputs::UrlInput})
+      #
+      # @param [Symbol] method The database column or method name on the form object that this input represents
+      # @option options [Symbol] :as Override the style of input should be rendered
+      # @option options [String, Symbol, Proc] :label Override the label text
+      # @option options [String, Symbol, Proc] :hint Override hint text
+      # @option options [Boolean] :required Optional flag to mark the input as required (or not)
+      # @option options [Hash] :input_html Optional HTML attributes to be passed down to the `<input>` tag
+      # @option options [Hash] :wrapper_html Optional HTML attributes to be passed down to the wrapping `<li>` tag
+      #
+      # Examples:
+      #
+      #     <% semantic_form_for @employee do |form| %>
+      #       <% form.inputs do -%>
+      #         <%= form.input :name, :label => "Full Name" %>
+      #         <%= form.input :manager, :as => :radio %>
+      #         <%= form.input :secret, :as => :password, :input_html => { :value => "xxxx" } %>
+      #         <%= form.input :hired_at, :as => :date, :label => "Date Hired" %>
+      #         <%= form.input :phone, :required => false, :hint => "Eg: +1 555 1234" %>
+      #         <%= form.input :email %>
+      #         <%= form.input :website, :as => :url, :hint => "You may wish to omit the http://" %>
+      #       <% end %>
       #     <% end %>
-      #   <% end %>
-      #
       def input(method, options = {})
         options = options.dup # Allow options to be shared without being tainted by Formtastic
         
@@ -242,7 +322,6 @@ def input(method, options = {})
       # inputs. If you have two separate models, but, semantically, on the page
       # they are part of the same fieldset, you should use semantic_fields_for
       # 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!
@@ -287,6 +366,7 @@ def inputs(*args, &block)
       #     </fieldset>
       #   </form>
       #
+      # @private
       def semantic_fields_for(record_or_name_or_array, *args, &block)
         opts = args.extract_options!
         opts[:builder] ||= self.class
@@ -304,7 +384,7 @@ def semantic_fields_for(record_or_name_or_array, *args, &block)
       #     f.text_field(:body)
       #     f.errors_on(:body)
       #   end
-      #
+      # @private
       def inline_errors_for(method, options = {}) #:nodoc:
         if render_inline_errors?
           errors = error_keys(method, options).map{|x| @object.errors[x] }.flatten.compact.uniq

From aee53bdb17e511bd8c02a1408d71b1540667f3d9 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 19 Jan 2011 02:04:53 +1100
Subject: [PATCH 474/992] make some internal modules @private

---
 lib/formtastic/inputs/base.rb    | 1 +
 lib/formtastic/inputs/basic.rb   | 1 +
 lib/formtastic/inputs/timeish.rb | 1 +
 3 files changed, 3 insertions(+)

diff --git a/lib/formtastic/inputs/base.rb b/lib/formtastic/inputs/base.rb
index 731a71a3a..773d9ce98 100644
--- a/lib/formtastic/inputs/base.rb
+++ b/lib/formtastic/inputs/base.rb
@@ -3,6 +3,7 @@
 
 module Formtastic
   module Inputs
+    # @private
     module Base
       include Formtastic::Reflection
       include Formtastic::LocalizedString
diff --git a/lib/formtastic/inputs/basic.rb b/lib/formtastic/inputs/basic.rb
index 0e40196e2..114667c40 100644
--- a/lib/formtastic/inputs/basic.rb
+++ b/lib/formtastic/inputs/basic.rb
@@ -1,5 +1,6 @@
 module Formtastic
   module Inputs
+    # @private
     module Basic
       
       def basic_input_helper(form_helper_method, type, method, options) #:nodoc:
diff --git a/lib/formtastic/inputs/timeish.rb b/lib/formtastic/inputs/timeish.rb
index 29956b704..879303ece 100644
--- a/lib/formtastic/inputs/timeish.rb
+++ b/lib/formtastic/inputs/timeish.rb
@@ -1,5 +1,6 @@
 module Formtastic
   module Inputs
+    # @private
     module Timeish
       # Helper method used by :as => (:date|:datetime|:time).  Generates a fieldset containing a
       # legend (for what would normally be considered the label), and an ordered list of list items

From 1fa7fa59404ad17f82eb35268096451d84092d5a Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 19 Jan 2011 16:32:45 +1100
Subject: [PATCH 475/992] more documentation tweaks for InputsHelper, want to
 set the tone here before moving on

---
 lib/formtastic/helpers/inputs_helper.rb | 312 +++++++++++++-----------
 1 file changed, 170 insertions(+), 142 deletions(-)

diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index a736d8176..e12f6ccc2 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -60,7 +60,8 @@ module InputsHelper
       include Formtastic::Reflection
       include Formtastic::LocalizedString
       
-      RESERVED_COLUMNS = [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
+      # Which columns to skip when automatically rendering a form without any fields specified.
+      SKIPPED_COLUMNS = [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
       
       # Returns a chunk of HTML markup for a given `method` on the form object, wrapped in
       # an `<li>` wrapper tag with appropriate `class` and `id` attribute hooks for CSS and JS.
@@ -115,6 +116,7 @@ module InputsHelper
       # * `:datetime`     (see {Inputs::DatetimeInput})
       # * `:date`         (see {Inputs::DateInput})
       # * `:email`        (see {Inputs::EmailInput})
+      # * `:file`         (see {Inputs::FileInput})
       # * `:hidden`       (see {Inputs::HiddenInput})
       # * `:numeric`      (see {Inputs::NumericInput})
       # * `:password`     (see {Inputs::PasswordInput})
@@ -128,13 +130,46 @@ module InputsHelper
       # * `:time`         (see {Inputs::TimeInput})
       # * `:url`          (see {Inputs::UrlInput})
       #
-      # @param [Symbol] method The database column or method name on the form object that this input represents
-      # @option options [Symbol] :as Override the style of input should be rendered
-      # @option options [String, Symbol, Proc] :label Override the label text
-      # @option options [String, Symbol, Proc] :hint Override hint text
-      # @option options [Boolean] :required Optional flag to mark the input as required (or not)
-      # @option options [Hash] :input_html Optional HTML attributes to be passed down to the `<input>` tag
-      # @option options [Hash] :wrapper_html Optional HTML attributes to be passed down to the wrapping `<li>` tag
+      # @param [Symbol] method 
+      #   The database column or method name on the form object that this input represents
+      #
+      # @option options :as [Symbol] 
+      #   Override the style of input should be rendered
+      #
+      # @option options :label [String, Symbol, Proc] 
+      #   Override the label text
+      #
+      # @option options :hint [String, Symbol, Proc]  
+      #   Override hint text
+      #
+      # @option options :required [Boolean] 
+      #   Override to mark the input as required (or not)
+      #
+      # @option options :input_html [Hash]  
+      #   Override the HTML attributes to be passed down to the `<input>` tag
+      #
+      # @option options :wrapper_html [Hash] 
+      #   Override the HTML attributes to be passed down to the wrapping `<li>` tag
+      #
+      # @option options :collection [Array<ActiveModel, String, Symbol>, Hash{String => String, Boolean}, OrderedHash{String => String, Boolean}]
+      #   Override collection of objects in the association (`:select`, `:radio` & `:check_boxes` inputs only)
+      #
+      # @option options :label_method [Symbol]
+      #   Override the method called on each object in the `:collection` for use as the `<label>` content (`:check_boxes` & `:radio` inputs) or `<option>` content (`:select` inputs)
+      #
+      # @option options :value_method [Symbol]
+      #   Override the method called on each object in the `:collection` for use as the `value` attribute in the `<input>` (`:check_boxes` & `:radio` inputs) or `<option>` (`:select` inputs)
+      #
+      # @option options :hint_class [String]
+      #   Override the `class` attribute applied to the `<p>` tag used when a `:hint` is rendered for an input
+      #
+      # @option options :error_class [String]
+      #   Override the `class` attribute applied to the `<p>` or `<ol>` tag used when inline errors are rendered for an input
+      #
+      # @todo Can we kill :hint_class & :error_class?
+      # @todo Can we kill :label & :hint (i18n)?
+      # @todo examples need improvement
+      # @todo document the "guessing" of input style
       #
       # Examples:
       #
@@ -181,147 +216,149 @@ def input(method, options = {})
       # called either with a block (in which you can do the usual Rails form stuff, HTML, ERB, etc),
       # or with a list of fields.  These two examples are functionally equivalent:
       #
-      #   # With a block:
-      #   <% semantic_form_for @post do |form| %>
-      #     <% form.inputs do %>
-      #       <%= form.input :title %>
-      #       <%= form.input :body %>
+      #     # With a block:
+      #     <% semantic_form_for @post do |form| %>
+      #       <% form.inputs do %>
+      #         <%= form.input :title %>
+      #         <%= form.input :body %>
+      #       <% end %>
       #     <% end %>
-      #   <% end %>
-      #
-      #   # With a list of fields:
-      #   <% semantic_form_for @post do |form| %>
-      #     <%= form.inputs :title, :body %>
-      #   <% end %>
-      #
-      #   # Output:
-      #   <form ...>
-      #     <fieldset class="inputs">
-      #       <ol>
-      #         <li class="string">...</li>
-      #         <li class="text">...</li>
-      #       </ol>
-      #     </fieldset>
-      #   </form>
+      #     
+      #     # With a list of fields:
+      #     <% semantic_form_for @post do |form| %>
+      #       <%= form.inputs :title, :body %>
+      #     <% end %>
+      #     
+      #     # Output:
+      #     <form ...>
+      #       <fieldset class="inputs">
+      #         <ol>
+      #           <li class="string">...</li>
+      #           <li class="text">...</li>
+      #         </ol>
+      #       </fieldset>
+      #     </form>
       #
-      # === Quick Forms
+      # **Quick Forms**
       #
       # When called without a block or a field list, an input is rendered for each column in the
       # model's database table, just like Rails' scaffolding.  You'll obviously want more control
       # than this in a production application, but it's a great way to get started, then come back
       # later to customise the form with a field list or a block of inputs.  Example:
       #
-      #   <% semantic_form_for @post do |form| %>
-      #     <%= form.inputs %>
-      #   <% end %>
-      #
-      #   With a few arguments:
-      #   <% semantic_form_for @post do |form| %>
-      #     <%= form.inputs "Post details", :title, :body %>
-      #   <% end %>
+      #     <% semantic_form_for @post do |form| %>
+      #       <%= form.inputs %>
+      #     <% end %>
+      #     
+      #     With a few arguments:
+      #     <% semantic_form_for @post do |form| %>
+      #       <%= form.inputs "Post details", :title, :body %>
+      #     <% end %>
       #
-      # === Options
+      # **Options**
       #
       # 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| %>
-      #     <% form.inputs :name => "Create a new post", :style => "border:1px;" do %>
-      #       ...
+      #     # With a block:
+      #     <% semantic_form_for @post do |form| %>
+      #       <% form.inputs :name => "Create a new post", :style => "border:1px;" do %>
+      #         ...
+      #       <% end %>
+      #     <% end %>
+      #     
+      #     # With a list (the options must come after the field list):
+      #     <% semantic_form_for @post do |form| %>
+      #       <%= 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 %>
-      #   <% end %>
-      #
-      #   # With a list (the options must come after the field list):
-      #   <% semantic_form_for @post do |form| %>
-      #     <%= 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!
+      # **It's basically a fieldset!**
       #
       # Instead of hard-coding fieldsets & legends into your form to logically group related fields,
       # use inputs:
       #
-      #   <% semantic_form_for @post do |f| %>
-      #     <% f.inputs do %>
-      #       <%= f.input :title %>
-      #       <%= f.input :body %>
-      #     <% end %>
-      #     <% f.inputs :name => "Advanced", :id => "advanced" do %>
-      #       <%= f.input :created_at %>
-      #       <%= f.input :user_id, :label => "Author" %>
-      #     <% end %>
-      #     <% f.inputs "Extra" do %>
-      #       <%= f.input :update_at %>
+      #     <% semantic_form_for @post do |f| %>
+      #       <% f.inputs do %>
+      #         <%= f.input :title %>
+      #         <%= f.input :body %>
+      #       <% end %>
+      #       <% f.inputs :name => "Advanced", :id => "advanced" do %>
+      #         <%= f.input :created_at %>
+      #         <%= f.input :user_id, :label => "Author" %>
+      #       <% end %>
+      #       <% f.inputs "Extra" do %>
+      #         <%= f.input :update_at %>
+      #       <% end %>
       #     <% end %>
-      #   <% end %>
-      #
-      #   # Output:
-      #   <form ...>
-      #     <fieldset class="inputs">
-      #       <ol>
-      #         <li class="string">...</li>
-      #         <li class="text">...</li>
-      #       </ol>
-      #     </fieldset>
-      #     <fieldset class="inputs" id="advanced">
-      #       <legend><span>Advanced</span></legend>
-      #       <ol>
-      #         <li class="datetime">...</li>
-      #         <li class="select">...</li>
-      #       </ol>
-      #     </fieldset>
-      #     <fieldset class="inputs">
-      #       <legend><span>Extra</span></legend>
-      #       <ol>
-      #         <li class="datetime">...</li>
-      #       </ol>
-      #     </fieldset>
-      #   </form>
-      #
-      # === Nested attributes
+      #     
+      #     # Output:
+      #     <form ...>
+      #       <fieldset class="inputs">
+      #         <ol>
+      #           <li class="string">...</li>
+      #           <li class="text">...</li>
+      #         </ol>
+      #       </fieldset>
+      #       <fieldset class="inputs" id="advanced">
+      #         <legend><span>Advanced</span></legend>
+      #         <ol>
+      #           <li class="datetime">...</li>
+      #           <li class="select">...</li>
+      #         </ol>
+      #       </fieldset>
+      #       <fieldset class="inputs">
+      #         <legend><span>Extra</span></legend>
+      #         <ol>
+      #           <li class="datetime">...</li>
+      #         </ol>
+      #       </fieldset>
+      #     </form>
       #
-      # As in Rails, you can use semantic_fields_for to nest attributes:
+      # **Nested attributes**
       #
-      #   <% semantic_form_for @post do |form| %>
-      #     <%= form.inputs :title, :body %>
+      # As in Rails, you can use semantic_fields_for to nest attributes:
       #
-      #     <% form.semantic_fields_for :author, @bob do |author_form| %>
-      #       <% author_form.inputs do %>
-      #         <%= author_form.input :first_name, :required => false %>
-      #         <%= author_form.input :last_name %>
+      #     <% semantic_form_for @post do |form| %>
+      #       <%= form.inputs :title, :body %>
+      #     
+      #       <% form.semantic_fields_for :author, @bob do |author_form| %>
+      #         <% author_form.inputs do %>
+      #           <%= author_form.input :first_name, :required => false %>
+      #           <%= author_form.input :last_name %>
+      #         <% end %>
       #       <% end %>
       #     <% end %>
-      #   <% end %>
       #
       # But this does not look formtastic! This is equivalent:
       #
-      #   <% semantic_form_for @post do |form| %>
-      #     <%= form.inputs :title, :body %>
-      #     <% form.inputs :for => [ :author, @bob ] do |author_form| %>
-      #       <%= author_form.input :first_name, :required => false %>
-      #       <%= author_form.input :last_name %>
+      #     <% semantic_form_for @post do |form| %>
+      #       <%= form.inputs :title, :body %>
+      #       <% form.inputs :for => [ :author, @bob ] do |author_form| %>
+      #         <%= author_form.input :first_name, :required => false %>
+      #         <%= author_form.input :last_name %>
+      #       <% end %>
       #     <% end %>
-      #   <% end %>
       #
       # And if you don't need to give options to your input call, you could do it
       # in just one line:
       #
-      #   <% semantic_form_for @post do |form| %>
-      #     <%= form.inputs :title, :body %>
-      #     <%= form.inputs :first_name, :last_name, :for => @bob %>
-      #   <% end %>
+      #     <% semantic_form_for @post do |form| %>
+      #       <%= form.inputs :title, :body %>
+      #       <%= form.inputs :first_name, :last_name, :for => @bob %>
+      #     <% end %>
       #
       # Just remember that calling inputs generates a new fieldset to wrap your
       # inputs. If you have two separate models, but, semantically, on the page
       # they are part of the same fieldset, you should use semantic_fields_for
       # instead (just as you would do with Rails' form builder).
+      #
+      # @todo convert to YARD documentation syntax
       def inputs(*args, &block)
         title = field_set_title_from_args(*args)
         html_options = args.extract_options!
@@ -336,7 +373,7 @@ def inputs(*args, &block)
           if @object && args.empty?
             args  = association_columns(:belongs_to)
             args += content_columns
-            args -= RESERVED_COLUMNS
+            args -= SKIPPED_COLUMNS
             args.compact!
           end
           legend = args.shift if args.first.is_a?(::String)
@@ -350,23 +387,23 @@ def inputs(*args, &block)
       # A thin wrapper around #fields_for to set :builder => Formtastic::FormBuilder
       # for nesting forms:
       #
-      #   # Example:
-      #   <% semantic_form_for @post do |post| %>
-      #     <% post.semantic_fields_for :author do |author| %>
-      #       <% author.inputs :name %>
+      #     # Example:
+      #     <% semantic_form_for @post do |post| %>
+      #       <% post.semantic_fields_for :author do |author| %>
+      #         <% author.inputs :name %>
+      #       <% end %>
       #     <% end %>
-      #   <% end %>
-      #
-      #   # Output:
-      #   <form ...>
-      #     <fieldset class="inputs">
-      #       <ol>
-      #         <li class="string"><input type='text' name='post[author][name]' id='post_author_name' /></li>
-      #       </ol>
-      #     </fieldset>
-      #   </form>
-      #
-      # @private
+      #     
+      #     # Output:
+      #     <form ...>
+      #       <fieldset class="inputs">
+      #         <ol>
+      #           <li class="string"><input type='text' name='post[author][name]' id='post_author_name' /></li>
+      #         </ol>
+      #       </fieldset>
+      #     </form>
+      #
+      # @todo convert to YARD syntax
       def semantic_fields_for(record_or_name_or_array, *args, &block)
         opts = args.extract_options!
         opts[:builder] ||= self.class
@@ -380,11 +417,12 @@ def semantic_fields_for(record_or_name_or_array, *args, &block)
       # 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
-      # @private
+      #     semantic_form_for :post do |f|
+      #       f.text_field(:body)
+      #       f.errors_on(:body)
+      #     end
+      #
+      # @todo convert to YARD syntax
       def inline_errors_for(method, options = {}) #:nodoc:
         if render_inline_errors?
           errors = error_keys(method, options).map{|x| @object.errors[x] }.flatten.compact.uniq
@@ -398,7 +436,6 @@ def inline_errors_for(method, options = {}) #:nodoc:
       protected
       
       # Collects association columns (relation columns) for the current form object class.
-      #
       def association_columns(*by_associations) #:nodoc:
         if @object.present? && @object.class.respond_to?(:reflections)
           @object.class.reflections.collect do |name, association_reflection|
@@ -414,7 +451,6 @@ def association_columns(*by_associations) #:nodoc:
       end
       
       # Collects content columns (non-relation columns) for the current form object class.
-      #
       def content_columns #:nodoc:
         model_name.constantize.content_columns.collect { |c| c.name.to_sym }.compact rescue []
       end
@@ -424,7 +460,6 @@ def content_columns #:nodoc:
       # 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] })
@@ -460,7 +495,6 @@ def inputs_for_nested_attributes(*args, &block) #:nodoc:
       #
       # * if the :required option isn't provided, and validates_presence_of can't be determined, the
       #   configuration option all_fields_required_by_default is used.
-      #
       def method_required?(attribute) #:nodoc:
         attribute_sym = attribute.to_s.sub(/_id$/, '').to_sym
   
@@ -504,7 +538,6 @@ def options_require_validation?(options) #nodoc
       #
       # 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 = column_for(method)
           # Special cases where the column type doesn't map to an input method.
@@ -544,7 +577,6 @@ def default_input_type(method, options = {}) #:nodoc:
       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
@@ -555,7 +587,6 @@ def inline_input_for(method, options)
       end
   
       # 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? or options[:hint].kind_of? Hash
@@ -564,14 +595,12 @@ def inline_hints_for(method, options) #:nodoc:
       end
       
       # Creates an error sentence by calling to_sentence on the errors array.
-      #
       def error_sentence(errors, options = {}) #:nodoc:
         error_class = options[:error_class] || default_inline_error_class
         template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.untaint), :class => error_class)
       end
   
       # Creates an error li list.
-      #
       def error_list(errors, options = {}) #:nodoc:
         error_class = options[:error_class] || default_error_list_class
         list_elements = []
@@ -582,7 +611,6 @@ def error_list(errors, options = {}) #:nodoc:
       end
   
       # Creates an error sentence containing only the first error
-      #
       def error_first(errors, options = {}) #:nodoc:
         error_class = options[:error_class] || default_inline_error_class
         template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => error_class)

From 5f73ed0f126391fa2d324380f96b7a6c4b58e8a0 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 19 Jan 2011 16:12:36 +1100
Subject: [PATCH 476/992] changelog catch up for v2 branch

---
 CHANGELOG | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index bbd0887c6..875c28e0b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,13 @@
+[v2 branch]
+
+* Improved some documentation, much more to come
+* Tagged many modules as @private to remove from YARD documentation
+* Added YARD as development dependency for a massive documentation effort
+* Renamed Formtastic::SemanticFormHelper to Formtastic::Helpers::FormHelper (SemanticFormHelper still exists as a module which includes the new module, need to handle deprecation notices somehow)
+* Renamed Formtastic::SemanticFormBuilder to Formtastic::FormBuilder (SemanticFormBuilder still exists as a subclass, need to handle deprecation notices somehow)
+* Massive refactoring of formtastic.rb into around 30 files and modules like StringInput and ButtonsHelper
+* Removed chunks of Rails 2 specific code, tests and documentation
+
 1.2.3
 
 * Removed deprecated methods input_field_set, button_field_set, boolean_select_input, boolean_radio_input and boolean_radio_input

From 79080d0029811b5daeb41d3ee828b6f05ed75a08 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 20 Jan 2011 09:47:48 +1100
Subject: [PATCH 477/992] more documentation of input()

---
 lib/formtastic/helpers/inputs_helper.rb | 82 ++++++++++++++++++-------
 1 file changed, 61 insertions(+), 21 deletions(-)

diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index e12f6ccc2..6cabf1fda 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -130,16 +130,18 @@ module InputsHelper
       # * `:time`         (see {Inputs::TimeInput})
       # * `:url`          (see {Inputs::UrlInput})
       #
+      # @todo document the "guessing" of input style
+      #
       # @param [Symbol] method 
       #   The database column or method name on the form object that this input represents
       #
       # @option options :as [Symbol] 
       #   Override the style of input should be rendered
       #
-      # @option options :label [String, Symbol, Proc] 
+      # @option options :label [String, Symbol, false] 
       #   Override the label text
       #
-      # @option options :hint [String, Symbol, Proc]  
+      # @option options :hint [String, Symbol, false]  
       #   Override hint text
       #
       # @option options :required [Boolean] 
@@ -154,10 +156,10 @@ module InputsHelper
       # @option options :collection [Array<ActiveModel, String, Symbol>, Hash{String => String, Boolean}, OrderedHash{String => String, Boolean}]
       #   Override collection of objects in the association (`:select`, `:radio` & `:check_boxes` inputs only)
       #
-      # @option options :label_method [Symbol]
+      # @option options :label_method [Symbol, Proc]
       #   Override the method called on each object in the `:collection` for use as the `<label>` content (`:check_boxes` & `:radio` inputs) or `<option>` content (`:select` inputs)
       #
-      # @option options :value_method [Symbol]
+      # @option options :value_method [Symbol, Proc]
       #   Override the method called on each object in the `:collection` for use as the `value` attribute in the `<input>` (`:check_boxes` & `:radio` inputs) or `<option>` (`:select` inputs)
       #
       # @option options :hint_class [String]
@@ -166,24 +168,62 @@ module InputsHelper
       # @option options :error_class [String]
       #   Override the `class` attribute applied to the `<p>` or `<ol>` tag used when inline errors are rendered for an input
       #
-      # @todo Can we kill :hint_class & :error_class?
-      # @todo Can we kill :label & :hint (i18n)?
-      # @todo examples need improvement
-      # @todo document the "guessing" of input style
+      # @option options :multiple [Boolean] TODO
+      # @option options :group_by [Symbol] TODO
+      # @option options :find_options [Symbol] TODO
+      # @option options :group_label_method [Symbol] TODO
+      # @option options :include_blank [Boolean] TODO
+      # @option options :prompt [String] TODO
       #
-      # Examples:
-      #
-      #     <% semantic_form_for @employee do |form| %>
-      #       <% form.inputs do -%>
-      #         <%= form.input :name, :label => "Full Name" %>
-      #         <%= form.input :manager, :as => :radio %>
-      #         <%= form.input :secret, :as => :password, :input_html => { :value => "xxxx" } %>
-      #         <%= form.input :hired_at, :as => :date, :label => "Date Hired" %>
-      #         <%= form.input :phone, :required => false, :hint => "Eg: +1 555 1234" %>
-      #         <%= form.input :email %>
-      #         <%= form.input :website, :as => :url, :hint => "You may wish to omit the http://" %>
-      #       <% end %>
-      #     <% end %>
+      # @todo Can we kill `:hint_class` & `:error_class`? What's the use case for input-by-input? Shift to config or burn!
+      # @todo Can we kill `:group_by` & `:group_label_method`? Should be done with :collection => grouped_options_for_select(...)
+      # @todo Can we kill `:find_options`? Should be done with MyModel.some_scope.where(...).order(...).whatever_scope
+      # @todo Can we kill `:label`, `:hint` & `:prompt`? All strings could be shifted to i18n!
+      #
+      # @example Accept all default options
+      #   <%= f.input :title %>
+      #
+      # @example Change the input type
+      #   <%= f.input :title, :as => :string %>
+      #
+      # @example Changing the label with a String
+      #   <%= f.input :title, :label => "Post title" %>
+      #
+      # @example Disabling the label with false, even if an i18n translation exists
+      #   <%= f.input :title, :label => false  %>
+      #
+      # @example Changing the hint with a String
+      #   <%= f.input :title, :hint => "Every post needs a title!" %>
+      #
+      # @example Disabling the hint with false, even if an i18n translation exists
+      #   <%= f.input :title, :hint => false  %>
+      #
+      # @example Marking a field as required or not (even if validations do not enforce it)
+      #   <%= f.input :title, :required => true  %>
+      #   <%= f.input :title, :required => false  %>
+      #
+      # @example Changing or adding to HTML attributes in the main `<input>` or `<select>` tag
+      #   <%= f.input :title, :input_html => { :onchange => "somethingAwesome();", :class => 'awesome' } %>
+      #
+      # @example Changing or adding to HTML attributes in the wrapper `<li>` tag
+      #   <%= f.input :title, :wrapper_html => { :class => "important-input" } %>
+      #
+      # @example Changing the association choices with `:collection`
+      #   <%= f.input :author,     :collection => User.active %>
+      #   <%= f.input :categories, :collection => Category.where(...).order(...) %>
+      #   <%= f.input :status,     :collection => ["Draft", "Published"] %>
+      #   <%= f.input :status,     :collection => [:draft, :published] %>
+      #   <%= f.input :status,     :collection => {"Draft" => 0, "Published" => 1} %>
+      #   <%= f.input :status,     :collection => OrderedHash.new("Draft" => 0, "Published" => 1) %>
+      #   <%= f.input :status,     :collection => [["Draft", 0], ["Published", 1]] %>
+      #   <%= f.input :status,     :collection => grouped_options_for_select(...) %>
+      #   <%= f.input :status,     :collection => options_for_select(...) %>
+      #
+      # @example Specifying if a `:select` should allow multiple selections:
+      #   <%= f.input :cateogies, :as => :select, :multiple => true %>
+      #   <%= f.input :cateogies, :as => :select, :multiple => false %>
+      #
+      # @todo Many many more examples. Some of the detail probably needs to be pushed out to the relevant methods too.
       def input(method, options = {})
         options = options.dup # Allow options to be shared without being tainted by Formtastic
         

From cd39b4b53e2c715976de092a5d2fc5ea615db295 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Wed, 19 Jan 2011 22:56:03 -0200
Subject: [PATCH 478/992] Remove formtastic_stylesheet_link_tag

---
 CHANGELOG                               |  1 +
 README.textile                          |  2 +-
 init.rb                                 |  2 --
 lib/formtastic/helpers/layout_helper.rb | 14 --------------
 lib/formtastic/railtie.rb               |  2 --
 spec/helpers/layout_helper_spec.rb      | 21 ---------------------
 spec/spec_helper.rb                     |  1 -
 7 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 lib/formtastic/helpers/layout_helper.rb
 delete mode 100644 spec/helpers/layout_helper_spec.rb

diff --git a/CHANGELOG b/CHANGELOG
index 875c28e0b..6021c1902 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@
 * Renamed Formtastic::SemanticFormBuilder to Formtastic::FormBuilder (SemanticFormBuilder still exists as a subclass, need to handle deprecation notices somehow)
 * Massive refactoring of formtastic.rb into around 30 files and modules like StringInput and ButtonsHelper
 * Removed chunks of Rails 2 specific code, tests and documentation
+* Removed formtastic_stylesheet_link_tag
 
 1.2.3
 
diff --git a/README.textile b/README.textile
index d30415b1f..f764b5f8d 100644
--- a/README.textile
+++ b/README.textile
@@ -112,7 +112,7 @@ A proof-of-concept stylesheet is provided which you can include in your layout.
 <pre>
   <head>
     ...
-    <%= formtastic_stylesheet_link_tag %>
+    <%= stylesheet_link_tag 'formtastic', 'formtastic_changes' %>
     ...
   </head>
 </pre>
diff --git a/init.rb b/init.rb
index a09b2ef4f..e9dda0508 100644
--- a/init.rb
+++ b/init.rb
@@ -1,5 +1,3 @@
 # encoding: utf-8
 require 'formtastic'
-require 'formtastic/helpers/layout_helper'
 ActionView::Base.send :include, Formtastic::Helpers::FormHelper
-ActionView::Base.send :include, Formtastic::Helpers::LayoutHelper
diff --git a/lib/formtastic/helpers/layout_helper.rb b/lib/formtastic/helpers/layout_helper.rb
deleted file mode 100644
index 656bfe65e..000000000
--- a/lib/formtastic/helpers/layout_helper.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# encoding: utf-8
-
-module Formtastic
-  module Helpers
-    module LayoutHelper
-    
-      def formtastic_stylesheet_link_tag
-        stylesheet_link_tag("formtastic") +
-        stylesheet_link_tag("formtastic_changes")
-      end
-    
-    end
-  end
-end
diff --git a/lib/formtastic/railtie.rb b/lib/formtastic/railtie.rb
index abb314e6a..720ab0773 100644
--- a/lib/formtastic/railtie.rb
+++ b/lib/formtastic/railtie.rb
@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 require 'formtastic'
-require 'formtastic/helpers/layout_helper'
 require 'rails'
 
 module Formtastic
@@ -9,7 +8,6 @@ module Formtastic
   class Railtie < Rails::Railtie
     initializer 'formtastic.initialize', :after => :after_initialize do
       ActionView::Base.send :include, Formtastic::Helpers::FormHelper
-      ActionView::Base.send(:include, Formtastic::Helpers::LayoutHelper)
     end
   end
 end
diff --git a/spec/helpers/layout_helper_spec.rb b/spec/helpers/layout_helper_spec.rb
deleted file mode 100644
index 96904c5ce..000000000
--- a/spec/helpers/layout_helper_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-
-describe Formtastic::Helpers::LayoutHelper do
-
-  include FormtasticSpecHelper
-  include Formtastic::Helpers::LayoutHelper
-
-  describe '#formtastic_stylesheet_link_tag' do
-
-    it 'should render a link to formtastic.css' do
-      formtastic_stylesheet_link_tag.should have_tag("link[@href='/stylesheets/formtastic.css']")
-    end
-
-    it 'should render a link to formtastic_changes.css' do
-      formtastic_stylesheet_link_tag.should have_tag("link[@href='/stylesheets/formtastic_changes.css']")
-    end
-
-  end
-end
-
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6888ac035..6ef70e005 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -11,7 +11,6 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic/util'))
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic'))
-require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic/helpers/layout_helper'))
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories in alphabetic order.

From af9da37b9f19a4011f5bd431eeea89e7f0ebd13b Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Wed, 19 Jan 2011 23:00:18 -0200
Subject: [PATCH 479/992] Formtastic should wait action view to be loaded

---
 lib/formtastic/railtie.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic/railtie.rb b/lib/formtastic/railtie.rb
index 720ab0773..33bcf6351 100644
--- a/lib/formtastic/railtie.rb
+++ b/lib/formtastic/railtie.rb
@@ -6,8 +6,10 @@
 module Formtastic
   # @private
   class Railtie < Rails::Railtie
-    initializer 'formtastic.initialize', :after => :after_initialize do
-      ActionView::Base.send :include, Formtastic::Helpers::FormHelper
+    initializer 'formtastic.initialize' do
+      ActiveSupport.on_load(:action_view) do
+        include Formtastic::Helpers::FormHelper
+      end
     end
   end
 end

From 83fc7a30c374b3575e2ec8576bbcf8fe5b45514c Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Wed, 19 Jan 2011 23:01:25 -0200
Subject: [PATCH 480/992] Do not need the init.rb anymore

---
 init.rb | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 init.rb

diff --git a/init.rb b/init.rb
deleted file mode 100644
index e9dda0508..000000000
--- a/init.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# encoding: utf-8
-require 'formtastic'
-ActionView::Base.send :include, Formtastic::Helpers::FormHelper

From f0768cbeb5af8151020b2ecdb0226e9f50a59a17 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Wed, 19 Jan 2011 23:08:09 -0200
Subject: [PATCH 481/992] Use ActiveSupport::SafeBuffer instead of
 Formtastic::Util.rails_safe_buffer_class

---
 lib/formtastic/inputs/base.rb | 2 +-
 lib/formtastic/util.rb        | 4 ----
 spec/support/output_buffer.rb | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/formtastic/inputs/base.rb b/lib/formtastic/inputs/base.rb
index 773d9ce98..018f0bbc1 100644
--- a/lib/formtastic/inputs/base.rb
+++ b/lib/formtastic/inputs/base.rb
@@ -61,7 +61,7 @@ def find_collection_for_column(column, options) #:nodoc:
         collection = find_raw_collection_for_column(column, options)
     
         # Return if we have a plain string
-        return collection if collection.instance_of?(String) || collection.instance_of?(Formtastic::Util.rails_safe_buffer_class)
+        return collection if collection.instance_of?(String) || collection.instance_of?(ActiveSupport::SafeBuffer)
     
         # Return if we have an Array of strings, fixnums or arrays
         return collection if (collection.instance_of?(Array) || collection.instance_of?(Range)) &&
diff --git a/lib/formtastic/util.rb b/lib/formtastic/util.rb
index b7f0ee979..af2106fdb 100644
--- a/lib/formtastic/util.rb
+++ b/lib/formtastic/util.rb
@@ -18,10 +18,6 @@ def html_safe(text)
       return text.html_safe
       text
     end
-
-    def rails_safe_buffer_class
-      return ActiveSupport::SafeBuffer
-    end
     
   end
 end
diff --git a/spec/support/output_buffer.rb b/spec/support/output_buffer.rb
index 9a1ba6819..9c2166326 100644
--- a/spec/support/output_buffer.rb
+++ b/spec/support/output_buffer.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
 module ActionView
-  class OutputBuffer < Formtastic::Util.rails_safe_buffer_class
+  class OutputBuffer < ActiveSupport::SafeBuffer
   end
 end

From 60ceac22ec2a6788027c6e8c9a327fea09e4b250 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Wed, 19 Jan 2011 23:09:34 -0200
Subject: [PATCH 482/992] ActionView::OutputBuffer is not used

---
 spec/support/output_buffer.rb | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 spec/support/output_buffer.rb

diff --git a/spec/support/output_buffer.rb b/spec/support/output_buffer.rb
deleted file mode 100644
index 9c2166326..000000000
--- a/spec/support/output_buffer.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# encoding: utf-8
-
-module ActionView
-  class OutputBuffer < ActiveSupport::SafeBuffer
-  end
-end

From 457b09849f5fb6bfd3db56536bfff77930445018 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Wed, 19 Jan 2011 23:10:25 -0200
Subject: [PATCH 483/992] Refactoring on Formtastic::Util.html_safe

---
 lib/formtastic/util.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic/util.rb b/lib/formtastic/util.rb
index af2106fdb..96bc5ed3a 100644
--- a/lib/formtastic/util.rb
+++ b/lib/formtastic/util.rb
@@ -14,9 +14,11 @@ module Util
     # @param text [String]
     # @return [String] `text`, marked as HTML-safe
     def html_safe(text)
-      return text if text.nil?
-      return text.html_safe
-      text
+      if text.respond_to?(:html_safe)
+        text.html_safe
+      else
+        text
+      end
     end
     
   end

From f79a83efdda93f0052674473da4c715457fc773e Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Wed, 19 Jan 2011 23:20:26 -0200
Subject: [PATCH 484/992] Formtastic::SemanticFormBuilder has been deprecated
 in favor of Formtastic::FormBuilder

---
 lib/formtastic/semantic_form_builder.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/formtastic/semantic_form_builder.rb b/lib/formtastic/semantic_form_builder.rb
index 49bc1c4a8..f91e5b27d 100644
--- a/lib/formtastic/semantic_form_builder.rb
+++ b/lib/formtastic/semantic_form_builder.rb
@@ -3,5 +3,9 @@ module Formtastic
   # TODO remove from 2.0 with a helpful upgrade path/warning.
   # @private
   class SemanticFormBuilder < Formtastic::FormBuilder
+    def initialize(*args)
+      ActiveSupport::Deprecation.warn('Formtastic::SemanticFormBuilder has been deprecated in favor of Formtastic::FormBuilder.', caller)
+      super
+    end
   end
 end
\ No newline at end of file

From 1b947170c9508d90e15a4833c5b16802c7b0c395 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 20 Jan 2011 23:44:08 +1100
Subject: [PATCH 485/992] added documentation to Formtastic::InstallGenerator

---
 lib/generators/formtastic/install/install_generator.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/generators/formtastic/install/install_generator.rb b/lib/generators/formtastic/install/install_generator.rb
index 5be5c17af..fe6ddf4d6 100644
--- a/lib/generators/formtastic/install/install_generator.rb
+++ b/lib/generators/formtastic/install/install_generator.rb
@@ -1,5 +1,13 @@
 # encoding: utf-8
+
 module Formtastic
+  # Copies formtastic.css and formtastic_changes.css to public/stylesheets/ and a config initializer
+  # to config/initializers/formtastic_config.rb.
+  #
+  # @example
+  #   $ rails generate formtastic:install
+  #
+  # @todo Revisit in Rails 3.1 where public assets are treated differently
   class InstallGenerator < Rails::Generators::Base
     desc "Copies formtastic.css and formtastic_changes.css to public/stylesheets/ and a config initializer to config/initializers/formtastic_config.rb"
 

From 27baf422a0c0eee850ba1e3032a7847b38393f8e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 20 Jan 2011 23:53:08 +1100
Subject: [PATCH 486/992] added documentation to Formtastic::FormGenerator

---
 lib/generators/formtastic/form/form_generator.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lib/generators/formtastic/form/form_generator.rb b/lib/generators/formtastic/form/form_generator.rb
index e1d21cd11..5acc556ba 100644
--- a/lib/generators/formtastic/form/form_generator.rb
+++ b/lib/generators/formtastic/form/form_generator.rb
@@ -1,5 +1,16 @@
 # encoding: utf-8
 module Formtastic
+  # Copies formtastic.css and formtastic_changes.css to public/stylesheets/ and a config initializer
+  # to config/initializers/formtastic_config.rb.
+  #
+  # @example
+  #   $ rails generate formtastic:form Post
+  # @example Write a partial to the file system 
+  #   $ rails generate formtastic:form Post --partial
+  # @example Return HAML output instead of ERB 
+  #   $ rails generate formtastic:form Post --haml
+  # @example Generate a form for specific model attributes 
+  #   $ rails generate formtastic:form Post title:string body:text
   class FormGenerator < Rails::Generators::NamedBase
     desc "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 " <<

From 44e944c815b964f956e643bdb1fb863d0d35cd26 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 21 Jan 2011 00:08:49 +1100
Subject: [PATCH 487/992] Changed formtastic:form generator to generate a
 partial by default (instead of copying to clipboard, which can be done with
 --copy)

---
 CHANGELOG                                     |  3 +-
 README.textile                                | 28 +++----------
 .../formtastic/form/form_generator.rb         | 42 ++++++++-----------
 3 files changed, 25 insertions(+), 48 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6021c1902..585452443 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 [v2 branch]
 
+* Changed formtastic:form generator to generate a partial by default (instead of copying to clipboard, which can be done with --copy)
+* Removed formtastic_stylesheet_link_tag
 * Improved some documentation, much more to come
 * Tagged many modules as @private to remove from YARD documentation
 * Added YARD as development dependency for a massive documentation effort
@@ -7,7 +9,6 @@
 * Renamed Formtastic::SemanticFormBuilder to Formtastic::FormBuilder (SemanticFormBuilder still exists as a subclass, need to handle deprecation notices somehow)
 * Massive refactoring of formtastic.rb into around 30 files and modules like StringInput and ButtonsHelper
 * Removed chunks of Rails 2 specific code, tests and documentation
-* Removed formtastic_stylesheet_link_tag
 
 1.2.3
 
diff --git a/README.textile b/README.textile
index f764b5f8d..c69e317cc 100644
--- a/README.textile
+++ b/README.textile
@@ -508,34 +508,16 @@ h3. Basic usage
 
 <pre>
   $ rails generate formtastic:form ModelName
+      exists  app/views/posts
+      create  app/views/posts/_form.html.erb
 </pre>
 
-The results are something like this, with the ERB code printed out to the terminal 
-
-<pre>
-  $ rails generate formtastic:form Post
-  # ---------------------------------------------------------
-  #  GENERATED FORMTASTIC CODE
-  # ---------------------------------------------------------
-
-  <% f.inputs do %>
-    <%= f.input :title, :label => 'Title' %>
-    <%= f.input :body, :label => 'Body' %>
-    <%= f.input :published, :label => 'Published' %>
-  <% end %>
-
-  # ---------------------------------------------------------
-   Copied to clipboard - just paste it!
-</pre>
-
-h3. Generating a partial with @--partial@
+The ERB code is saved to a partial file, but it will not overwrite existing files without a prompt.
 
-You can also ask Formtastic to *generate a partial* with the @--partial@ option, placing it in the correct location inside your @app/views@ directory:
+h3. Copying the ERB code to the clipboard instead with @--copy@
 
 <pre>
-  $ rails generate formtastic:form Post --partial
-      exists  app/views/posts
-      create  app/views/posts/_form.html.erb
+  $ rails generate formtastic:form Post --copy
 </pre>
 
 h3. Specifying HAML instead of ERB with @--haml@
diff --git a/lib/generators/formtastic/form/form_generator.rb b/lib/generators/formtastic/form/form_generator.rb
index 5acc556ba..8e03d8d62 100644
--- a/lib/generators/formtastic/form/form_generator.rb
+++ b/lib/generators/formtastic/form/form_generator.rb
@@ -1,29 +1,30 @@
 # encoding: utf-8
 module Formtastic
-  # Copies formtastic.css and formtastic_changes.css to public/stylesheets/ and a config initializer
-  # to config/initializers/formtastic_config.rb.
+  # Generates a Formtastic form partial based on an existing model. It will not overwrite existing
+  # files without confirmation.
   #
   # @example
   #   $ rails generate formtastic:form Post
-  # @example Write a partial to the file system 
-  #   $ rails generate formtastic:form Post --partial
+  # @example Copy the partial code to the pasteboard rather than generating a partial
+  #   $ rails generate formtastic:form Post --copy
   # @example Return HAML output instead of ERB 
   #   $ rails generate formtastic:form Post --haml
   # @example Generate a form for specific model attributes 
   #   $ rails generate formtastic:form Post title:string body:text
   class FormGenerator < Rails::Generators::NamedBase
-    desc "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."
+    desc "Generates a Formtastic form partial based on an existing model."
 
-    argument :name, :type => :string, :required => true, :banner => 'ExistingModelName'
-    argument :attributes, :type => :array, :default => [], :banner => 'field:type field:type'
+    argument :name, :type => :string, :required => true, :banner => 'MyExistingModel'
+    argument :attributes, :type => :array, :default => [], :banner => 'attribute:type attribute:type'
 
     class_option :haml, :type => :boolean, :default => false, :group => :formtastic,
                  :desc => "Generate HAML instead of ERB"
 
-    class_option :partial, :type => :boolean, :default => false, :group => :formtastic,
-                 :desc => 'Generate a form partial in the model views path, i.e. "_form.html.erb" or "_form.html.haml"'
+    class_option :partial, :type => :boolean, :default => true, :group => :formtastic,
+                 :desc => 'Generate a form partial in the model views path (eg `posts/_form.html.erb`'
+
+    class_option :copy, :type => :boolean, :default => false, :group => :formtastic,
+                 :desc => 'Copy the generated code the clipboard instead of generating a partial file."'
 
     class_option :controller, :type => :string, :default => false, :group => :formtastic,
                  :desc => 'Generate for custom controller/view path - in case model and controller namespace is different, i.e. "admin/posts"'
@@ -33,22 +34,15 @@ class FormGenerator < Rails::Generators::NamedBase
     def create_or_show
       @attributes = self.columns if @attributes.empty?
 
-      if options[:partial]
-        empty_directory "app/views/#{controller_path}"
-        template "_form.html.#{template_type}", "app/views/#{controller_path}/_form.html.#{template_type}"
-      else
+      if options[:copy]
         template = File.read("#{self.class.source_root}/_form.html.#{template_type}")
         erb = ERB.new(template, nil, '-')
         generated_code = erb.result(binding).strip rescue nil
-
-        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)
+        puts "The following code has been to the clipboard, just paste it in your views:" if save_to_clipboard(generated_code)
+        puts generated_code || "Error: Nothing generated. Does the model exist?"
+      else
+        empty_directory "app/views/#{controller_path}"
+        template "_form.html.#{template_type}", "app/views/#{controller_path}/_form.html.#{template_type}"
       end
     end
 

From 29e26ca41382b10c4747f91795ab0ea9ab0b412c Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 21 Jan 2011 00:20:38 +1100
Subject: [PATCH 488/992] more formtastic:form docs

---
 README.textile                                   | 13 +++++++++++--
 lib/generators/formtastic/form/form_generator.rb |  2 ++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/README.textile b/README.textile
index c69e317cc..130e9b995 100644
--- a/README.textile
+++ b/README.textile
@@ -502,7 +502,7 @@ Run @rails generate formtastic:install@ to copy a commented out config file into
 
 h2. Form Generator
 
-There's a Formtastic form code generator to make your transition to Formtastic easier. All you have to do is to *specify an existing model name*, and optionally specify view template framework (ERB/HAML), and you are good to go. *Note:* This won't overwrite any of your stuff.
+There's a Formtastic form code generator to make your transition to Formtastic easier. All you have to do is to *specify an existing model name*, and optionally specify view template framework (ERB/HAML), and you are good to go. *Note:* This won't overwrite any of your exsting files without confrmation.
 
 h3. Basic usage
 
@@ -531,11 +531,20 @@ h3. Specifying HAML instead of ERB with @--haml@
 h3. Specifying controller namespace with @--controller@
 
 <pre>
-  $ rails generate formtastic:form Post --partial --controller admin/posts
+  $ rails generate formtastic:form Post --controller admin/posts
       exists  app/views/admin/posts
       create  app/views/admin/posts/_form.html.erb
 </pre>
 
+h3. Specifying which attributes need an input
+
+<pre>
+  $ rails generate formtastic:form Post title:string body:text publication_state:select
+      exists  app/views/admin/posts
+      create  app/views/admin/posts/_form.html.erb
+</pre>
+
+
 
 h2. Custom Inputs
 
diff --git a/lib/generators/formtastic/form/form_generator.rb b/lib/generators/formtastic/form/form_generator.rb
index 8e03d8d62..792c33626 100644
--- a/lib/generators/formtastic/form/form_generator.rb
+++ b/lib/generators/formtastic/form/form_generator.rb
@@ -11,6 +11,8 @@ module Formtastic
   #   $ rails generate formtastic:form Post --haml
   # @example Generate a form for specific model attributes 
   #   $ rails generate formtastic:form Post title:string body:text
+  # @example Generate a form for a specific controller 
+  #   $ rails generate formtastic:form Post --controller admin/posts
   class FormGenerator < Rails::Generators::NamedBase
     desc "Generates a Formtastic form partial based on an existing model."
 

From df22871a65655372da065084a969c79c272d0fbc Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 21 Jan 2011 07:42:00 +1100
Subject: [PATCH 489/992] use with_config to ensure there's no confusion about
 the i18n config in a test

---
 spec/commit_button_spec.rb            | 113 ++++++++++----------
 spec/i18n_spec.rb                     |  64 +++++++-----
 spec/input_spec.rb                    | 142 ++++++++++++++------------
 spec/inputs/check_boxes_input_spec.rb |  13 ++-
 spec/inputs/radio_input_spec.rb       |  12 +--
 5 files changed, 188 insertions(+), 156 deletions(-)

diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index 264ae1a7b..2f132630b 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -178,33 +178,36 @@
                    :submit => 'Custom Submit',
                   }
                }
-           Formtastic::FormBuilder.i18n_lookups_by_default = true
          end
-
+         
          after do
            ::I18n.backend.reload!
          end
-
+         
          it 'should render an input with localized label (I18n)' do
-           ::I18n.backend.store_translations :en,
-             :formtastic => {
-                 :actions => {
-                   :post => {
-                     :submit => 'Custom Submit %{model}'
+           with_config :i18n_lookups_by_default, true do
+             ::I18n.backend.store_translations :en,
+               :formtastic => {
+                   :actions => {
+                     :post => {
+                       :submit => 'Custom Submit %{model}'
+                      }
                     }
-                  }
-               }
-           concat(semantic_form_for(:post, :url => 'http://example.com') do |builder|
-             concat(builder.commit_button)
-           end)
-           output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit Post"][@class~="submit"]})
+                 }
+             concat(semantic_form_for(:post, :url => 'http://example.com') do |builder|
+               concat(builder.commit_button)
+             end)
+             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit Post"][@class~="submit"]})
+           end
          end
-
+         
          it 'should render an input with anoptional localized label (I18n) - if first is not set' do
-           concat(semantic_form_for(:post, :url => 'http://example.com') do |builder|
-             concat(builder.commit_button)
-           end)
-           output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit"][@class~="submit"]})
+           with_config :i18n_lookups_by_default, true do
+             concat(semantic_form_for(:post, :url => 'http://example.com') do |builder|
+               concat(builder.commit_button)
+             end)
+             output_buffer.should have_tag(%Q{li.commit input[@value="Custom Submit"][@class~="submit"]})
+           end
          end
 
        end
@@ -252,7 +255,6 @@
                     :create => 'Custom Create',
                    }
                 }
-            Formtastic::FormBuilder.i18n_lookups_by_default = true
           end
 
           after do
@@ -260,25 +262,29 @@
           end
 
           it 'should render an input with localized label (I18n)' do
-            ::I18n.backend.store_translations :en,
-              :formtastic => {
-                  :actions => {
-                    :post => {
-                      :create => 'Custom Create %{model}'
+            with_config :i18n_lookups_by_default, true do
+              ::I18n.backend.store_translations :en,
+                :formtastic => {
+                    :actions => {
+                      :post => {
+                        :create => 'Custom Create %{model}'
+                       }
                      }
-                   }
-                }
-            concat(semantic_form_for(@new_post) do |builder|
-              concat(builder.commit_button)
-            end)
-            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create Post"][@class~="create"]})
+                  }
+              concat(semantic_form_for(@new_post) do |builder|
+                concat(builder.commit_button)
+              end)
+              output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create Post"][@class~="create"]})
+            end
           end
 
           it 'should render an input with anoptional localized label (I18n) - if first is not set' do
-            concat(semantic_form_for(@new_post) do |builder|
-              concat(builder.commit_button)
-            end)
-            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create"][@class~="create"]})
+            with_config :i18n_lookups_by_default, true do
+              concat(semantic_form_for(@new_post) do |builder|
+                concat(builder.commit_button)
+              end)
+              output_buffer.should have_tag(%Q{li.commit input[@value="Custom Create"][@class~="create"]})
+            end
           end
 
         end
@@ -327,7 +333,6 @@
                     :update => 'Custom Save',
                    }
                 }
-            Formtastic::FormBuilder.i18n_lookups_by_default = true
           end
 
           after do
@@ -335,26 +340,30 @@
           end
 
           it 'should render an input with localized label (I18n)' do
-            ::I18n.backend.store_translations :en,
-              :formtastic => {
-                  :actions => {
-                    :post => {
-                      :update => 'Custom Save %{model}'
+            with_config :i18n_lookups_by_default, true do
+              ::I18n.backend.store_translations :en,
+                :formtastic => {
+                    :actions => {
+                      :post => {
+                        :update => 'Custom Save %{model}'
+                       }
                      }
-                   }
-                }
-            concat(semantic_form_for(@new_post) do |builder|
-              concat(builder.commit_button)
-            end)
-            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save Post"][@class~="update"]})
+                  }
+              concat(semantic_form_for(@new_post) do |builder|
+                concat(builder.commit_button)
+              end)
+              output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save Post"][@class~="update"]})
+            end
           end
 
           it 'should render an input with anoptional localized label (I18n) - if first is not set' do
-            concat(semantic_form_for(@new_post) do |builder|
-              concat(builder.commit_button)
-            end)
-            output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save"][@class~="update"]})
-            ::I18n.backend.store_translations :en, :formtastic => {}
+            with_config :i18n_lookups_by_default, true do
+              concat(semantic_form_for(@new_post) do |builder|
+                concat(builder.commit_button)
+              end)
+              output_buffer.should have_tag(%Q{li.commit input[@value="Custom Save"][@class~="update"]})
+              ::I18n.backend.store_translations :en, :formtastic => {}
+            end
           end
 
         end
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index be9c9adfa..0941b6fae 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -97,7 +97,6 @@
             :post => {:author => "Written by"}
           }
         }}
-      Formtastic::FormBuilder.i18n_lookups_by_default = true
 
       @new_post.stub!(:title)
       @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :string, :limit => 255))
@@ -105,50 +104,61 @@
 
     after do
       ::I18n.backend.reload!
-      Formtastic::FormBuilder.i18n_lookups_by_default = false
     end
 
     it "lookup scopes should be defined" do
-      lambda { Formtastic::I18n::SCOPES }.should_not raise_error(::NameError)
+      with_config :i18n_lookups_by_default, true do
+        lambda { Formtastic::I18n::SCOPES }.should_not raise_error(::NameError)
+      end
     end
 
     it "should be able to translate with namespaced object" do
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:title))
-      end)
-      output_buffer.should have_tag("form label", /Hello post!/)
+      with_config :i18n_lookups_by_default, true do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:title))
+        end)
+        output_buffer.should have_tag("form label", /Hello post!/)
+      end
     end
 
     it "should be able to translate without form-object" do
-      concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
-        concat(builder.input(:title))
-      end)
-      output_buffer.should have_tag("form label", /Hello project!/)
+      with_config :i18n_lookups_by_default, true do
+        concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          concat(builder.input(:title))
+        end)
+        output_buffer.should have_tag("form label", /Hello project!/)
+      end
     end
 
     it 'should be able to translate nested objects with nested translations' do
-      concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
-        builder.semantic_fields_for(:task) do |f|
-          concat(f.input(:name))
-        end
-      end)
-      output_buffer.should have_tag("form label", /Hello task name!/)
+      with_config :i18n_lookups_by_default, true do
+        concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          builder.semantic_fields_for(:task) do |f|
+            concat(f.input(:name))
+          end
+        end)
+        output_buffer.should have_tag("form label", /Hello task name!/)
+      end
     end
 
     it 'should be able to translate nested objects with top level translations' do
-      concat(semantic_form_for(:order, :url => 'http://test.host') do |builder|
-        builder.semantic_fields_for(:line_item) do |f|
-          concat(f.input(:name))
-        end
-      end)
-      output_buffer.should have_tag("form label", /Hello line item name!/)
+      with_config :i18n_lookups_by_default, true do
+        concat(semantic_form_for(:order, :url => 'http://test.host') do |builder|
+          builder.semantic_fields_for(:line_item) do |f|
+            concat(f.input(:name))
+          end
+        end)
+        output_buffer.should have_tag("form label", /Hello line item name!/)
+      end
     end
 
     it 'should be able to translate helper label as Rails does' do
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:author))
-      end)
-      output_buffer.should have_tag("form label", /Written by/)
+      with_config :i18n_lookups_by_default, true do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:author))
+        end)
+        output_buffer.should have_tag("form label", /Written by/)
+      end
     end
 
     # TODO: Add spec for namespaced models?
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 64bc92ee3..fbeb3c812 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -649,32 +649,35 @@ def should_be_required(options)
                      }
                    }
                 }
-            Formtastic::FormBuilder.i18n_lookups_by_default = false
           end
 
           it 'should render a label with localized label (I18n)' do
-            concat(semantic_form_for(@new_post) do |builder|
-              concat(builder.input(:title, :label => true))
-              concat(builder.input(:published, :as => :boolean, :label => true))
-            end)
-            output_buffer.should have_tag('form li label', Regexp.new('^' + @localized_label_text))
+            with_config :i18n_lookups_by_default, false do
+              concat(semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title, :label => true))
+                concat(builder.input(:published, :as => :boolean, :label => true))
+              end)
+              output_buffer.should have_tag('form li label', Regexp.new('^' + @localized_label_text))
+            end
           end
 
           it 'should render a hint paragraph containing an optional localized label (I18n) if first is not set' do
-            ::I18n.backend.store_translations :en,
-              :formtastic => {
-                  :labels => {
-                    :post => {
-                      :title => nil,
-                      :published => nil
+            with_config :i18n_lookups_by_default, false do
+              ::I18n.backend.store_translations :en,
+                :formtastic => {
+                    :labels => {
+                      :post => {
+                        :title => nil,
+                        :published => nil
+                       }
                      }
-                   }
-                }
-            concat(semantic_form_for(@new_post) do |builder|
-              concat(builder.input(:title, :label => true))
-              concat(builder.input(:published, :as => :boolean, :label => true))
-            end)
-            output_buffer.should have_tag('form li label', Regexp.new('^' + @default_localized_label_text))
+                  }
+              concat(semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title, :label => true))
+                concat(builder.input(:published, :as => :boolean, :label => true))
+              end)
+              output_buffer.should have_tag('form li label', Regexp.new('^' + @default_localized_label_text))
+            end
           end
         end
       end
@@ -726,7 +729,6 @@ def should_be_required(options)
                     :title => @default_localized_hint_text,
                    }
                 }
-            Formtastic::FormBuilder.i18n_lookups_by_default = false
           end
 
           after do
@@ -735,76 +737,88 @@ def should_be_required(options)
 
           describe 'when provided value (hint value) is set to TRUE' do
             it 'should render a hint paragraph containing a localized hint (I18n)' do
-              ::I18n.backend.store_translations :en,
-              :formtastic => {
-                  :hints => {
-                    :post => {
-                      :title => @localized_hint_text
+              with_config :i18n_lookups_by_default, false do
+                ::I18n.backend.store_translations :en,
+                :formtastic => {
+                    :hints => {
+                      :post => {
+                        :title => @localized_hint_text
+                       }
                      }
-                   }
-                }
-              concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:title, :hint => true))
-              end)
-              output_buffer.should have_tag('form li p.inline-hints', @localized_hint_text)
+                  }
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:title, :hint => true))
+                end)
+                output_buffer.should have_tag('form li p.inline-hints', @localized_hint_text)
+              end
             end
 
 						it 'should render a hint paragraph containing a localized hint (I18n) with a custom hint class if i ask for one' do
-              ::I18n.backend.store_translations :en,
-              :formtastic => {
-                  :hints => {
-                    :post => {
-                      :title => @localized_hint_text
+              with_config :i18n_lookups_by_default, false do
+                ::I18n.backend.store_translations :en,
+                :formtastic => {
+                    :hints => {
+                      :post => {
+                        :title => @localized_hint_text
+                       }
                      }
-                   }
-                }
-              concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:title, :hint => true, :hint_class => 'custom-hint-class'))
-              end)
-              output_buffer.should have_tag('form li p.custom-hint-class', @localized_hint_text)
+                  }
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:title, :hint => true, :hint_class => 'custom-hint-class'))
+                end)
+                output_buffer.should have_tag('form li p.custom-hint-class', @localized_hint_text)
+              end
             end
 
             it 'should render a hint paragraph containing an optional localized hint (I18n) if first is not set' do
-              concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:title, :hint => true))
-              end)
-              output_buffer.should have_tag('form li p.inline-hints', @default_localized_hint_text)
+              with_config :i18n_lookups_by_default, false do
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:title, :hint => true))
+                end)
+                output_buffer.should have_tag('form li p.inline-hints', @default_localized_hint_text)
+              end
             end
           end
 
           describe 'when provided value (label value) is set to FALSE' do
             it 'should not render a hint paragraph' do
-              concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:title, :hint => false))
-              end)
-              output_buffer.should_not have_tag('form li p.inline-hints', @localized_hint_text)
+              with_config :i18n_lookups_by_default, false do
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:title, :hint => false))
+                end)
+                output_buffer.should_not have_tag('form li p.inline-hints', @localized_hint_text)
+              end
             end
           end
         end
 
         describe 'when localized hint (I18n) is a model with attribute hints' do
           it "should see the provided hash as a blank entry" do
-            ::I18n.backend.store_translations :en,
-            :formtastic => {
-                :hints => {
-                  :title => { # movie title
-                    :summary => @localized_hint_text # summary of movie
+            with_config :i18n_lookups_by_default, false do
+              ::I18n.backend.store_translations :en,
+              :formtastic => {
+                  :hints => {
+                    :title => { # movie title
+                      :summary => @localized_hint_text # summary of movie
+                     }
                    }
-                 }
-              }
-            semantic_form_for(@new_post) do |builder|
-              concat(builder.input(:title, :hint => true))
+                }
+              semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title, :hint => true))
+              end
+              output_buffer.should_not have_tag('form li p.inline-hints', @localized_hint_text)
             end
-            output_buffer.should_not have_tag('form li p.inline-hints', @localized_hint_text)
           end
         end
 
         describe 'when localized hint (I18n) is not provided' do
           it 'should not render a hint paragraph' do
-            concat(semantic_form_for(@new_post) do |builder|
-              concat(builder.input(:title))
-            end)
-            output_buffer.should_not have_tag('form li p.inline-hints')
+            with_config :i18n_lookups_by_default, false do
+              concat(semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title))
+              end)
+              output_buffer.should_not have_tag('form li p.inline-hints')
+            end
           end
         end
       end
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 5956babe1..a251e55b9 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -235,17 +235,16 @@
 
       before do
         ::I18n.backend.store_translations :en, :formtastic => { :labels => { :post => { :authors => "Translated!" }}}
-        Formtastic::FormBuilder.i18n_lookups_by_default = true
-
-        @new_post.stub!(:author_ids).and_return(nil)
-        concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:authors, :as => :check_boxes))
-        end)
+        with_config :i18n_lookups_by_default, true do
+          @new_post.stub!(:author_ids).and_return(nil)
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:authors, :as => :check_boxes))
+          end)
+        end
       end
 
       after do
         ::I18n.backend.reload!
-        Formtastic::FormBuilder.i18n_lookups_by_default = false
       end
 
       it "should do foo" do
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 5685a7d96..acd8f29d6 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -136,16 +136,16 @@
     before do
       ::I18n.backend.store_translations :en, :formtastic => { :labels => { :post => { :authors => "Translated!" }}}
 
-      Formtastic::FormBuilder.i18n_lookups_by_default = true
-      @new_post.stub!(:author_ids).and_return(nil)
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:authors, :as => :radio))
-      end)
+      with_config :i18n_lookups_by_default, true do
+        @new_post.stub!(:author_ids).and_return(nil)
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:authors, :as => :radio))
+        end)
+      end
     end
 
     after do
       ::I18n.backend.reload!
-      Formtastic::FormBuilder.i18n_lookups_by_default = false
     end
 
     it "should do foo" do

From d9b54b161b11e10b0afc0f77b316fcaff75c23d6 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 21 Jan 2011 21:29:24 +1100
Subject: [PATCH 490/992] changed the form generator to include the wrapping
 semantic_form_for block

---
 CHANGELOG                                        |  1 +
 lib/generators/formtastic/form/form_generator.rb |  1 -
 lib/generators/templates/_form.html.erb          | 10 ++++++----
 lib/generators/templates/_form.html.haml         |  9 +++++----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 585452443..1f6ce2b12 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 [v2 branch]
 
+* Changed formtastic:form generator include the wrapping semantic_form_for block
 * Changed formtastic:form generator to generate a partial by default (instead of copying to clipboard, which can be done with --copy)
 * Removed formtastic_stylesheet_link_tag
 * Improved some documentation, much more to come
diff --git a/lib/generators/formtastic/form/form_generator.rb b/lib/generators/formtastic/form/form_generator.rb
index 792c33626..ee52bab37 100644
--- a/lib/generators/formtastic/form/form_generator.rb
+++ b/lib/generators/formtastic/form/form_generator.rb
@@ -35,7 +35,6 @@ class FormGenerator < Rails::Generators::NamedBase
 
     def create_or_show
       @attributes = self.columns if @attributes.empty?
-
       if options[:copy]
         template = File.read("#{self.class.source_root}/_form.html.#{template_type}")
         erb = ERB.new(template, nil, '-')
diff --git a/lib/generators/templates/_form.html.erb b/lib/generators/templates/_form.html.erb
index 7f102a7b2..9469fded4 100644
--- a/lib/generators/templates/_form.html.erb
+++ b/lib/generators/templates/_form.html.erb
@@ -1,5 +1,7 @@
-<%%= f.inputs do %>
-<% attributes.each do |attribute| -%>
-  <%%= f.input :<%= attribute.name %> %>
-<% end -%>
+<%%= semantic_form_for @<%= name.underscore %> do |f| %>
+  <%%= f.inputs do %>
+  <% attributes.each do |attribute| -%>
+    <%%= f.input :<%= attribute.name %> %>
+  <% end -%>
+  <%% end %>
 <%% end %>
diff --git a/lib/generators/templates/_form.html.haml b/lib/generators/templates/_form.html.haml
index 7e7b48b05..8879e1336 100644
--- a/lib/generators/templates/_form.html.haml
+++ b/lib/generators/templates/_form.html.haml
@@ -1,4 +1,5 @@
-= f.inputs do
-<% attributes.each do |attribute| -%>
-  = f.input :<%= attribute.name %>
-<% end -%>
+= semantic_form_for @<%= name.underscore %> do |f|
+  = f.inputs do
+  <% attributes.each do |attribute| -%>
+    = f.input :<%= attribute.name %>
+  <% end -%>

From d6e211ede1a5b49f754d5d5767cd2a4eea5000c2 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 23 Jan 2011 14:12:10 +1100
Subject: [PATCH 491/992] make the gemspec valid so that I can bundle with this
 branch

---
 formtastic.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 3bff8edc1..250b56daf 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formtastic}
-  s.version = "1.2.3"
+  s.version = "2.0.0.pre"
   s.date = %q{2011-01-07}
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.summary = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.email = %q{justin@indent.com.au}
   s.extra_rdoc_files = ["README.textile"]
-  s.files = Dir.glob("generators/**/*") + Dir.glob("lib/**/*") + Dir.glob("rails/*") + %w(MIT-LICENSE README.textile init.rb)
+  s.files = Dir.glob("lib/**/*") + %w(MIT-LICENSE README.textile)
   s.homepage = %q{http://github.com/justinfrench/formtastic/tree/master}
   s.post_install_message = %q{
   ========================================================================

From d3be58bcd3eb4b48fe8510bcdcf185e8b55e51c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Oko=C5=84ski?= <kuba@okonski.org>
Date: Wed, 26 Jan 2011 12:28:18 +0100
Subject: [PATCH 492/992] Range Input support.

---
 lib/formtastic/form_builder.rb       |  4 +++-
 lib/formtastic/inputs/range_input.rb | 32 ++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 lib/formtastic/inputs/range_input.rb

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 58dbd05c9..7e713e08c 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -19,6 +19,7 @@
 require 'inputs/password_input'
 require 'inputs/phone_input'
 require 'inputs/radio_input'
+require 'inputs/range_input'
 require 'inputs/search_input'
 require 'inputs/select_input'
 require 'inputs/string_input'
@@ -80,6 +81,7 @@ def self.configure(name, value = nil)
     include Formtastic::Inputs::PasswordInput
     include Formtastic::Inputs::PhoneInput
     include Formtastic::Inputs::RadioInput
+    include Formtastic::Inputs::RangeInput
     include Formtastic::Inputs::SearchInput
     include Formtastic::Inputs::SelectInput
     include Formtastic::Inputs::StringInput
@@ -90,4 +92,4 @@ def self.configure(name, value = nil)
     
   end
   
-end
\ No newline at end of file
+end
diff --git a/lib/formtastic/inputs/range_input.rb b/lib/formtastic/inputs/range_input.rb
new file mode 100644
index 000000000..083a99fa0
--- /dev/null
+++ b/lib/formtastic/inputs/range_input.rb
@@ -0,0 +1,32 @@
+require 'reflection'
+
+module Formtastic
+  module Inputs
+    module RangeInput
+      include Formtastic::Inputs::Base
+      include Formtastic::Reflection
+      
+      def range_input(method, options)  
+        reflections = @object.class.reflect_on_validations_for(method) if @object.class.respond_to?(:reflect_on_validations_for)
+        reflections.each do |reflection|
+          if reflection.macro == :validates_numericality_of
+            if reflection.options.include?(:greater_than)
+              range_start = (reflection.options[:greater_than] + 1)
+            elsif reflection.options.include?(:greater_than_or_equal_to)
+              range_start = reflection.options[:greater_than_or_equal_to]
+            end
+            if reflection.options.include?(:less_than)
+              range_end = (reflection.options[:less_than] - 1)
+            elsif reflection.options.include?(:less_than_or_equal_to)
+              range_end = reflection.options[:less_than_or_equal_to]
+            end
+            options[:input_html] ||= {}
+            options[:input_html][:in] = (range_start..range_end)
+          end
+        end
+        basic_input_helper(:range_field, :numeric, method, options)
+      end
+  
+    end
+  end
+end

From 4b82f84b38dd69f1f73b17a2cc9fde1e1513d187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Oko=C5=84ski?= <kuba@okonski.org>
Date: Wed, 26 Jan 2011 12:31:57 +0100
Subject: [PATCH 493/992] Don't include Formtastic::Reflection.

---
 lib/formtastic/inputs/range_input.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/formtastic/inputs/range_input.rb b/lib/formtastic/inputs/range_input.rb
index 083a99fa0..475de231c 100644
--- a/lib/formtastic/inputs/range_input.rb
+++ b/lib/formtastic/inputs/range_input.rb
@@ -1,10 +1,7 @@
-require 'reflection'
-
 module Formtastic
   module Inputs
     module RangeInput
       include Formtastic::Inputs::Base
-      include Formtastic::Reflection
       
       def range_input(method, options)  
         reflections = @object.class.reflect_on_validations_for(method) if @object.class.respond_to?(:reflect_on_validations_for)

From b3938c897504551890c29295f9dbb5130527a6dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Oko=C5=84ski?= <kuba@okonski.org>
Date: Mon, 31 Jan 2011 14:16:12 +0100
Subject: [PATCH 494/992] Allow :in option for RangeInput.

---
 lib/formtastic/inputs/range_input.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/range_input.rb b/lib/formtastic/inputs/range_input.rb
index 475de231c..518ab691c 100644
--- a/lib/formtastic/inputs/range_input.rb
+++ b/lib/formtastic/inputs/range_input.rb
@@ -18,7 +18,8 @@ def range_input(method, options)
               range_end = reflection.options[:less_than_or_equal_to]
             end
             options[:input_html] ||= {}
-            options[:input_html][:in] = (range_start..range_end)
+            options[:input_html][:in] = options.delete(:in) if options[:in]
+            options[:input_html][:in] ||= (range_start..range_end)
           end
         end
         basic_input_helper(:range_field, :numeric, method, options)

From 003009cceba910e1b87e22801e6c52048c6c9fbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Oko=C5=84ski?= <kuba@okonski.org>
Date: Mon, 31 Jan 2011 14:21:55 +0100
Subject: [PATCH 495/992] Prettier code for RangeInput, allow for :step option.

---
 lib/formtastic/inputs/range_input.rb | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/formtastic/inputs/range_input.rb b/lib/formtastic/inputs/range_input.rb
index 518ab691c..59b54e158 100644
--- a/lib/formtastic/inputs/range_input.rb
+++ b/lib/formtastic/inputs/range_input.rb
@@ -7,21 +7,24 @@ def range_input(method, options)
         reflections = @object.class.reflect_on_validations_for(method) if @object.class.respond_to?(:reflect_on_validations_for)
         reflections.each do |reflection|
           if reflection.macro == :validates_numericality_of
-            if reflection.options.include?(:greater_than)
-              range_start = (reflection.options[:greater_than] + 1)
-            elsif reflection.options.include?(:greater_than_or_equal_to)
-              range_start = reflection.options[:greater_than_or_equal_to]
-            end
-            if reflection.options.include?(:less_than)
-              range_end = (reflection.options[:less_than] - 1)
-            elsif reflection.options.include?(:less_than_or_equal_to)
-              range_end = reflection.options[:less_than_or_equal_to]
+            unless options.include? :in
+              if reflection.options.include?(:greater_than)
+                range_start = (reflection.options[:greater_than] + 1)
+              elsif reflection.options.include?(:greater_than_or_equal_to)
+                range_start = reflection.options[:greater_than_or_equal_to]
+              end
+              if reflection.options.include?(:less_than)
+                range_end = (reflection.options[:less_than] - 1)
+              elsif reflection.options.include?(:less_than_or_equal_to)
+                range_end = reflection.options[:less_than_or_equal_to]
+              end
             end
             options[:input_html] ||= {}
-            options[:input_html][:in] = options.delete(:in) if options[:in]
-            options[:input_html][:in] ||= (range_start..range_end)
+            options[:input_html][:in] = options.delete(:in) || (range_start..range_end)
+            options[:input_html][:step] = options.delete(:step) || 1
           end
         end
+        
         basic_input_helper(:range_field, :numeric, method, options)
       end
   

From 5733f7b6644128aea07218f8974a6734c6cf6a6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Oko=C5=84ski?= <kuba@okonski.org>
Date: Tue, 1 Feb 2011 13:54:19 +0100
Subject: [PATCH 496/992] Tests for RangeInput and minor code refactoring. New
 column for Author in #mock_everything - age.

---
 lib/formtastic/inputs/range_input.rb | 17 +++---
 spec/inputs/range_input_spec.rb      | 88 ++++++++++++++++++++++++++++
 spec/spec_helper.rb                  |  3 +
 3 files changed, 101 insertions(+), 7 deletions(-)
 create mode 100644 spec/inputs/range_input_spec.rb

diff --git a/lib/formtastic/inputs/range_input.rb b/lib/formtastic/inputs/range_input.rb
index 59b54e158..8738921b4 100644
--- a/lib/formtastic/inputs/range_input.rb
+++ b/lib/formtastic/inputs/range_input.rb
@@ -4,10 +4,14 @@ module RangeInput
       include Formtastic::Inputs::Base
       
       def range_input(method, options)  
-        reflections = @object.class.reflect_on_validations_for(method) if @object.class.respond_to?(:reflect_on_validations_for)
-        reflections.each do |reflection|
-          if reflection.macro == :validates_numericality_of
-            unless options.include? :in
+        options[:input_html] ||= {}
+        options[:input_html][:in] = options.delete(:in)
+        options[:input_html][:step] = options.delete(:step) || 1
+        
+        unless options[:input_html][:in]
+          reflections = @object.class.reflect_on_validations_for(method) rescue []
+          reflections.each do |reflection|
+            if reflection.macro == :validates_numericality_of
               if reflection.options.include?(:greater_than)
                 range_start = (reflection.options[:greater_than] + 1)
               elsif reflection.options.include?(:greater_than_or_equal_to)
@@ -18,10 +22,9 @@ def range_input(method, options)
               elsif reflection.options.include?(:less_than_or_equal_to)
                 range_end = reflection.options[:less_than_or_equal_to]
               end
+              
+              options[:input_html][:in] = (range_start..range_end)
             end
-            options[:input_html] ||= {}
-            options[:input_html][:in] = options.delete(:in) || (range_start..range_end)
-            options[:input_html][:step] = options.delete(:step) || 1
           end
         end
         
diff --git a/spec/inputs/range_input_spec.rb b/spec/inputs/range_input_spec.rb
new file mode 100644
index 000000000..f1e03c949
--- /dev/null
+++ b/spec/inputs/range_input_spec.rb
@@ -0,0 +1,88 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'active_record'
+
+describe 'range input' do
+
+  include FormtasticSpecHelper
+
+  before do
+    @output_buffer = ''
+    mock_everything
+  end
+
+  describe "when object is provided" do
+    before do
+      concat(semantic_form_for(@bob) do |builder|
+        concat(builder.input(:age, :as => :range))
+      end)
+    end
+
+    it_should_have_input_wrapper_with_class(:range)
+    it_should_have_input_wrapper_with_id("author_age_input")
+    it_should_have_label_with_text(/Age/)
+    it_should_have_label_for("author_age")
+    it_should_have_input_with_id("author_age")
+    it_should_have_input_with_type(:range)
+    it_should_have_input_with_name("author[age]")
+
+  end
+
+  describe "when namespace is provided" do
+
+    before do
+      concat(semantic_form_for(@james, :namespace => "context2") do |builder|
+        concat(builder.input(:age, :as => :range))
+      end)
+    end
+
+    it_should_have_input_wrapper_with_id("context2_author_age_input")
+    it_should_have_label_and_input_with_id("context2_author_age")
+
+  end
+  
+  describe "core processing" do
+  
+    before { mock_everything; @options = {} }
+  
+    describe "with validation_reflection" do
+      
+      before do
+        # Insane, but we need to test with and without validation_reflection
+        ::Author.stub!(:reflect_on_validations_for).with(:age).and_return([ActiveRecord::Reflection::MacroReflection.new(:validates_numericality_of, :age, {:greater_than => 0, :less_than => 6}, ::Author)])
+      end
+      
+      it "works with alternate validation options" do
+        ::Author.stub!(:reflect_on_validations_for).with(:age).and_return([ActiveRecord::Reflection::MacroReflection.new(:validates_numericality_of, :age, {:greater_than_or_equal_to => 1930, :less_than_or_equal_to => (Time.now.year - 5)}, ::Author)])
+        
+        concat(semantic_form_for(@james) do |builder|
+          concat(builder.input(:age, @options.merge(:as => :range)))
+        end)
+        
+        output_buffer.should have_tag("form li input[step=\"1\"][min=\"1930\"][max=\"#{Time.now.year - 5}\"]")
+      end
+    
+      it "assigns range and step from model" do        
+        concat(semantic_form_for(@james) do |builder|
+          concat(builder.input(:age, @options.merge(:as => :range)))
+        end)
+        
+        output_buffer.should have_tag("form li input[step=\"1\"][min=\"1\"][max=\"5\"]")
+      end
+      
+      it "allows for overriding range and step values" do
+        @options.merge! :in => 9..10, :step => 0.2
+        
+        concat(semantic_form_for(@james) do |builder|
+          concat(builder.input(:age, @options.merge(:as => :range)))
+        end)
+        
+        output_buffer.should have_tag("form li input[step=\"0.2\"][min=\"9\"][max=\"10\"]")
+      end
+    
+    end
+    
+  end 
+
+end
+
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6ef70e005..5b05e27bc 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -121,6 +121,7 @@ def new_author_path; "/authors/new"; end
     @fred.stub!(:class).and_return(::Author)
     @fred.stub!(:to_label).and_return('Fred Smith')
     @fred.stub!(:login).and_return('fred_smith')
+    @fred.stub!(:age).and_return(27)
     @fred.stub!(:id).and_return(37)
     @fred.stub!(:new_record?).and_return(false)
     @fred.stub!(:errors).and_return(mock('errors', :[] => nil))
@@ -130,6 +131,7 @@ def new_author_path; "/authors/new"; end
     @bob = ::Author.new
     @bob.stub!(:to_label).and_return('Bob Rock')
     @bob.stub!(:login).and_return('bob')
+    @bob.stub!(:age).and_return(43)
     @bob.stub!(:created_at)
     @bob.stub!(:id).and_return(42)
     @bob.stub!(:posts).and_return([])
@@ -142,6 +144,7 @@ def new_author_path; "/authors/new"; end
     @james = ::Author.new
     @james.stub!(:to_label).and_return('James Shock')
     @james.stub!(:login).and_return('james')
+    @james.stub!(:age).and_return(38)
     @james.stub!(:id).and_return(75)
     @james.stub!(:posts).and_return([])
     @james.stub!(:post_ids).and_return([])

From 3067c855937402b8ed5715acc16ac18348e8a460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Oko=C5=84ski?= <kuba@okonski.org>
Date: Tue, 1 Feb 2011 14:27:33 +0100
Subject: [PATCH 497/992] Use ValidationHelper that provides
 #range_options_for. It takes options set by user or taken from validations
 and provides them in :input_html hash.

---
 lib/formtastic/form_builder.rb              |  2 ++
 lib/formtastic/helpers/validation_helper.rb | 39 +++++++++++++++++++++
 lib/formtastic/inputs/range_input.rb        | 28 ++-------------
 3 files changed, 43 insertions(+), 26 deletions(-)
 create mode 100644 lib/formtastic/helpers/validation_helper.rb

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 7e713e08c..d12f44b2c 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -6,6 +6,7 @@
 require 'helpers/buttons_helper'
 require 'helpers/label_helper'
 require 'helpers/errors_helper'
+require 'helpers/validation_helper'
 
 require 'inputs/boolean_input'
 require 'inputs/check_boxes_input'
@@ -68,6 +69,7 @@ def self.configure(name, value = nil)
     include Formtastic::Helpers::ButtonsHelper
     include Formtastic::Helpers::LabelHelper
     include Formtastic::Helpers::ErrorsHelper
+    include Formtastic::Helpers::ValidationHelper
 
     include Formtastic::Inputs::BooleanInput
     include Formtastic::Inputs::CheckBoxesInput
diff --git a/lib/formtastic/helpers/validation_helper.rb b/lib/formtastic/helpers/validation_helper.rb
new file mode 100644
index 000000000..2c1b762f2
--- /dev/null
+++ b/lib/formtastic/helpers/validation_helper.rb
@@ -0,0 +1,39 @@
+module Formtastic
+  module Helpers
+    module ValidationHelper
+    
+      def range_options_for(method, options = {})
+        options[:input_html] ||= {}
+        if options[:in]
+          options[:input_html][:in] = options.delete :in
+          options[:input_html][:step] = options.delete :step || 1
+          return options
+        end
+        
+        reflections = @object.class.reflect_on_validations_for(method) if @object.class.respond_to? :reflect_on_validations_for
+        reflections ||= []
+        reflections.each do |reflection|
+          if reflection.macro == :validates_numericality_of
+            if reflection.options.include?(:greater_than)
+              range_start = (reflection.options[:greater_than] + 1)
+            elsif reflection.options.include?(:greater_than_or_equal_to)
+              range_start = reflection.options[:greater_than_or_equal_to]
+            end
+            if reflection.options.include?(:less_than)
+              range_end = (reflection.options[:less_than] - 1)
+            elsif reflection.options.include?(:less_than_or_equal_to)
+              range_end = reflection.options[:less_than_or_equal_to]
+            end
+              
+            options[:input_html][:in] = (range_start..range_end)
+          end
+        end
+        
+        options[:input_html][:step] ||= 1
+        
+        return options
+      end
+      
+    end
+  end
+end
diff --git a/lib/formtastic/inputs/range_input.rb b/lib/formtastic/inputs/range_input.rb
index 8738921b4..21f0668bd 100644
--- a/lib/formtastic/inputs/range_input.rb
+++ b/lib/formtastic/inputs/range_input.rb
@@ -3,32 +3,8 @@ module Inputs
     module RangeInput
       include Formtastic::Inputs::Base
       
-      def range_input(method, options)  
-        options[:input_html] ||= {}
-        options[:input_html][:in] = options.delete(:in)
-        options[:input_html][:step] = options.delete(:step) || 1
-        
-        unless options[:input_html][:in]
-          reflections = @object.class.reflect_on_validations_for(method) rescue []
-          reflections.each do |reflection|
-            if reflection.macro == :validates_numericality_of
-              if reflection.options.include?(:greater_than)
-                range_start = (reflection.options[:greater_than] + 1)
-              elsif reflection.options.include?(:greater_than_or_equal_to)
-                range_start = reflection.options[:greater_than_or_equal_to]
-              end
-              if reflection.options.include?(:less_than)
-                range_end = (reflection.options[:less_than] - 1)
-              elsif reflection.options.include?(:less_than_or_equal_to)
-                range_end = reflection.options[:less_than_or_equal_to]
-              end
-              
-              options[:input_html][:in] = (range_start..range_end)
-            end
-          end
-        end
-        
-        basic_input_helper(:range_field, :numeric, method, options)
+      def range_input(method, options)
+        basic_input_helper(:range_field, :numeric, method, range_options_for(method, options))
       end
   
     end

From cd55b01d53974484527c4fac8b2d3262f0ece265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Oko=C5=84ski?= <kuba@okonski.org>
Date: Tue, 1 Feb 2011 14:31:09 +0100
Subject: [PATCH 498/992] Use ValidationHelper#range_options_for in
 #numeric_input and return number_field with range-aware options.

---
 lib/formtastic/inputs/numeric_input.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic/inputs/numeric_input.rb b/lib/formtastic/inputs/numeric_input.rb
index 847eb0169..1ae6aa39e 100644
--- a/lib/formtastic/inputs/numeric_input.rb
+++ b/lib/formtastic/inputs/numeric_input.rb
@@ -8,8 +8,8 @@ module NumericInput
       
       # Outputs a label and standard Rails text field inside the wrapper.
       def numeric_input(method, options)
-        basic_input_helper(:text_field, :numeric, method, options)
+        basic_input_helper(:number_field, :numeric, method, range_options_for(method, options))
       end
     end
   end
-end
\ No newline at end of file
+end

From 60c6b3f8511104ca0e08fc3898d9266898ace0a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Oko=C5=84ski?= <kuba@okonski.org>
Date: Tue, 1 Feb 2011 14:58:14 +0100
Subject: [PATCH 499/992] Describe new functionality of :range and :numeric
 fields in readme.

---
 README.textile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.textile b/README.textile
index 130e9b995..7fa139dbc 100644
--- a/README.textile
+++ b/README.textile
@@ -304,7 +304,7 @@ The Formtastic input types:
 * @:time@ - a time select. Default for column types: @:time@.
 * @:boolean@ - a checkbox. Default for column types: @:boolean@.
 * @:string@ - a text field. Default for column types: @:string@.
-* @:numeric@ - a text field (just like string). Default for  column types: @:integer@, @:float@, and @:decimal@.
+* @:numeric@ - a text field (just like string). Default for  column types: @:integer@, @:float@, and @:decimal@. Handles range validations.
 * @:file@ - a file field. Default for file-attachment attributes matching: "paperclip":http://github.com/thoughtbot/paperclip or "attachment_fu":http://github.com/technoweenie/attachment_fu.
 * @:country@ - a select menu of country names. Default for column types: :string with name @"country"@ - requires a *country_select* plugin to be installed.
 * @:email@ - a text field (just like string). Default for columns with name matching @"email"@. New in HTML5. Works on some mobile browsers already.
@@ -312,6 +312,7 @@ The Formtastic input types:
 * @:phone@ - a text field (just like string). Default for columns with name matching @"phone"@ or @"fax"@. New in HTML5.
 * @:search@ - a text field (just like string). Default for columns with name matching @"search"@. New in HTML5. Works on Safari.
 * @:hidden@ - a hidden field. Creates a hidden field (added for compatibility).
+* @:range@ - a slider field. Handles range validations.
 
 The comments in the code are pretty good for each of these (what it does, what the output is, what the options are, etc.) so go check it out.
 

From 91d5292fddd672e3aea3dbce21854bac82e5365b Mon Sep 17 00:00:00 2001
From: Tom Simnett <tom@initforthe.com>
Date: Tue, 1 Feb 2011 17:48:43 +0000
Subject: [PATCH 500/992] Add spec to test for disabled hidden field with
 disabled checkbox

---
 spec/inputs/check_boxes_input_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 0a886a665..02f3882e5 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -231,6 +231,7 @@
 
         it "should have one item disabled; the specified one" do
           output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.should have_tag("form li fieldset ol li input[@type='hidden'][@disabled='disabled']", :count => 1)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 1)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@fred.id}']")

From f53e74a85587e035bac51a640c987b60911dc514 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sun, 6 Feb 2011 13:27:37 -0200
Subject: [PATCH 501/992] Update CHANGELOG

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index bbd0887c6..cc4f2f38a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+* Fixed an issue when formtastic fails to determine if a checkbox is checked with custom checked and unchecked values (thanks to Eugene Bolshakov)
+
 1.2.3
 
 * Removed deprecated methods input_field_set, button_field_set, boolean_select_input, boolean_radio_input and boolean_radio_input

From 6df4f98460ccf695affed0fe62a013af786e703d Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 9 Feb 2011 09:23:18 +1100
Subject: [PATCH 502/992] replicate 'Use check_box_checked? from Rails for
 boolean inputs' (a2d6a09fe6b5be2f98a99f8bc70df8f7db3d36d7) from master in v2

---
 lib/formtastic/inputs/boolean_input.rb |  3 ++-
 spec/inputs/boolean_input_spec.rb      | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/boolean_input.rb b/lib/formtastic/inputs/boolean_input.rb
index 46222475e..025d411c5 100644
--- a/lib/formtastic/inputs/boolean_input.rb
+++ b/lib/formtastic/inputs/boolean_input.rb
@@ -12,12 +12,13 @@ def boolean_input(method, options)
         html_options  = options.delete(:input_html) || {}
         checked_value = options.delete(:checked_value) || '1'
         unchecked_value = options.delete(:unchecked_value) || '0'
+        checked = @object && ActionView::Helpers::InstanceTag.check_box_checked?(@object.send(:"#{method}"), checked_value)
   
         html_options[:id] = html_options[:id] || generate_html_id(method, "")
         input = template.check_box_tag(
           "#{@object_name}[#{method}]",
           checked_value,
-          (@object && @object.send(:"#{method}")),
+          checked,
           html_options
         )
         
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index d6fae56bd..3314c63d9 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -71,6 +71,28 @@
     output_buffer.should have_tag('form li input[@type="hidden"][@value="unchecked"]')
     output_buffer.should_not have_tag('form li label input[@type="hidden"]') # invalid HTML5
   end
+  
+  it 'should generate a checked input if object.method returns checked value' do
+    @new_post.stub!(:allow_comments).and_return('yes')
+  
+    form = semantic_form_for(@new_post) do |builder|
+      concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'yes', :unchecked_value => 'no'))
+    end
+  
+    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.should have_tag('form li label input[@type="checkbox"][@value="yes"][@checked="checked"]')
+  end
+  
+  it 'should not generate a checked input if object.method returns unchecked value' do
+    @new_post.stub!(:allow_comments).and_return('no')
+  
+    form = semantic_form_for(@new_post) do |builder|
+      concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'yes', :unchecked_value => 'no'))
+    end
+  
+    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.should have_tag('form li label input[@type="checkbox"][@value="yes"]:not([@checked])')
+  end
 
   it 'should generate a label and a checkbox even if no object is given' do
     concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|

From 675a3ecc931badf93ccfaf6727f03a2e2d817f54 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 9 Feb 2011 09:25:47 +1100
Subject: [PATCH 503/992] Add spec to test for disabled hidden field with
 disabled checkbox (cherry-pick from master)

---
 spec/inputs/check_boxes_input_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index a251e55b9..1056d20ad 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -205,6 +205,8 @@
         end
 
         it "should have one item disabled; the specified one" do
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.should have_tag("form li fieldset ol li input[@type='hidden'][@disabled='disabled']", :count => 1)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 1)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@fred.id}']")

From bf3ed652cd2b8d063877472e4980bb4d7a1e8729 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 9 Feb 2011 18:37:28 +1100
Subject: [PATCH 504/992] the hidden input rendered with a boolean input with
 respect a custom :name attribute

---
 CHANGELOG                         |  1 +
 lib/formtastic.rb                 |  2 +-
 spec/inputs/boolean_input_spec.rb | 12 +++++++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index cc4f2f38a..547c6174c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
 * Fixed an issue when formtastic fails to determine if a checkbox is checked with custom checked and unchecked values (thanks to Eugene Bolshakov)
+* Fixed that the hidden input rendered with a boolean checkbox did nt use the custom :name from :input_html options hash
 
 1.2.3
 
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 9e2dc0d8c..a4aa48613 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1272,7 +1272,7 @@ def boolean_input(method, options)
         # the label() method will insert this nested input into the label at the last minute
         options[:label_prefix_for_nested_input] = input
 
-        template.hidden_field_tag("#{@object_name}[#{method}]", unchecked_value, :id => nil) << label(method, options)
+        template.hidden_field_tag((html_options[:name] || "#{@object_name}[#{method}]"), unchecked_value, :id => nil) << label(method, options)
       end
 
       # Generates an input for the given method using the type supplied with :as.
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index e31a8eb6e..83d731600 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -27,7 +27,7 @@
     output_buffer.should have_tag('form li input[@type="hidden"]', :count => 1)
     output_buffer.should_not have_tag('form li label input[@type="hidden"]', :count => 1) # invalid HTML5
   end
-
+  
   it 'should generate a checkbox input' do
     output_buffer.concat(@form) if Formtastic::Util.rails3?
     output_buffer.should have_tag('form li label input')
@@ -53,6 +53,16 @@
     output_buffer.should have_tag('form li label input[@checked="checked"]')
   end
   
+  it 'should name the hidden input with the :name html_option' do
+    form = semantic_form_for(@new_post) do |builder|
+      concat(builder.input(:answer_comments, :as => :boolean, :input_html => { :name => "foo" }))
+    end
+    
+    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.should have_tag('form li input[@type="checkbox"][@name="foo"]', :count => 1)
+    output_buffer.should have_tag('form li input[@type="hidden"][@name="foo"]', :count => 1)
+  end
+  
   it "should generate a disabled input if :input_html is passed :disabled => 'disabled' " do
     form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :input_html => {:disabled => 'disabled'}))

From e8c3d9f6122cf7a59a11b0b47c91e128deedf93c Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 10 Feb 2011 06:51:50 +1100
Subject: [PATCH 505/992] Revert "Add spec to test for disabled hidden field
 with disabled checkbox" until we have the issue properly understood (see
 GH-498 and branch of same name for WIP).

This reverts commit 91d5292fddd672e3aea3dbce21854bac82e5365b.
---
 spec/inputs/check_boxes_input_spec.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 02f3882e5..0a886a665 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -231,7 +231,6 @@
 
         it "should have one item disabled; the specified one" do
           output_buffer.concat(@form) if Formtastic::Util.rails3?
-          output_buffer.should have_tag("form li fieldset ol li input[@type='hidden'][@disabled='disabled']", :count => 1)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 1)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@fred.id}']")

From 34efd969f87cf67a8a1c2e1117829256b2f992b6 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 10 Feb 2011 06:58:01 +1100
Subject: [PATCH 506/992] the hidden input rendered with a boolean input with
 respect a custom :name attribute (copied from master)

---
 lib/formtastic/inputs/boolean_input.rb |  2 +-
 spec/inputs/boolean_input_spec.rb      | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/boolean_input.rb b/lib/formtastic/inputs/boolean_input.rb
index 025d411c5..23c9b02b8 100644
--- a/lib/formtastic/inputs/boolean_input.rb
+++ b/lib/formtastic/inputs/boolean_input.rb
@@ -28,7 +28,7 @@ def boolean_input(method, options)
         # the label() method will insert this nested input into the label at the last minute
         options[:label_prefix_for_nested_input] = input
   
-        template.hidden_field_tag("#{@object_name}[#{method}]", unchecked_value, :id => nil) << label(method, options)
+        template.hidden_field_tag((html_options[:name] || "#{@object_name}[#{method}]"), unchecked_value, :id => nil) << label(method, options)
       end
     end
   end
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index 3314c63d9..72c2345e3 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -47,6 +47,16 @@
     end)
     output_buffer.should have_tag('form li label input[@checked="checked"]')
   end
+
+  it 'should name the hidden input with the :name html_option' do
+    form = semantic_form_for(@new_post) do |builder|
+      concat(builder.input(:answer_comments, :as => :boolean, :input_html => { :name => "foo" }))
+    end
+    
+    output_buffer.concat(form) if Formtastic::Util.rails3?
+    output_buffer.should have_tag('form li input[@type="checkbox"][@name="foo"]', :count => 1)
+    output_buffer.should have_tag('form li input[@type="hidden"][@name="foo"]', :count => 1)
+  end
   
   it "should generate a disabled input if :input_html is passed :disabled => 'disabled' " do
     concat(semantic_form_for(@new_post) do |builder|

From af484b3f38f47a23a116723e26e0173ec512b128 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 10 Feb 2011 07:00:59 +1100
Subject: [PATCH 507/992] sync changelog with 1.2-stable/master branches

---
 CHANGELOG | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 1f6ce2b12..dab9246d9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,16 @@
 * Massive refactoring of formtastic.rb into around 30 files and modules like StringInput and ButtonsHelper
 * Removed chunks of Rails 2 specific code, tests and documentation
 
+1.2.4.beta (unreleased)
+
+* Changed :boolean inputs to use Rails' check_box_checked? instead of our own logic
+* Changed developer instructions in README
+* Fixed :boolean inputs to disable the included hidden input when disabling the actual checkbox
+* Fixed that Formtastic was making changes to the options hash directly instead of on a duplicate, causing problems for those trying to reuse options on multiple inputs in the view 
+* Fixed that tiny scroll bars were appearing on legends in date/time/radio/cbheckboxes fielsets (GH-477)    
+* Fixed an issue when formtastic fails to determine if a checkbox is checked with custom checked and unchecked values (thanks to Eugene Bolshakov)
+* Fixed that the hidden input rendered with a boolean checkbox did nt use the custom :name from :input_html options hash
+
 1.2.3
 
 * Removed deprecated methods input_field_set, button_field_set, boolean_select_input, boolean_radio_input and boolean_radio_input

From 47b18cb880e74088cfc6e3f2b685703387d647ba Mon Sep 17 00:00:00 2001
From: Victor Stan <victor.stan@gmail.com>
Date: Thu, 3 Feb 2011 01:09:18 +0800
Subject: [PATCH 508/992] defined :rows => 10, :cols => 20, :maxlength => 10
 options in example to show how those HTML atributes can be integrated into
 the form, removed :size, as it's de same as :cols and more ambiguous.

---
 README.textile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.textile b/README.textile
index 035a398c7..9a035aee7 100644
--- a/README.textile
+++ b/README.textile
@@ -256,8 +256,8 @@ Customize HTML attributes for any input using the @:input_html@ option. Typicall
 
 <pre>
   <% semantic_form_for @post do |form| %>
-    <%= form.input :title,      :input_html => { :size => 60 } %>
-    <%= form.input :body,       :input_html => { :class => 'autogrow' } %>
+    <%= form.input :title,      :input_html => {  :cols => 10 } %>
+    <%= form.input :body,       :input_html => { :class => 'autogrow', :rows => 10, :cols => 20, :maxlength => 10  } %>
     <%= form.input :created_at, :input_html => { :disabled => true } %>
     <%= form.buttons %>
   <% end %>

From a9889c561d524be0f498b32458655532e73201d7 Mon Sep 17 00:00:00 2001
From: Victor Stan <victor.stan@gmail.com>
Date: Thu, 3 Feb 2011 01:09:18 +0800
Subject: [PATCH 509/992] defined :rows => 10, :cols => 20, :maxlength => 10
 options in example to show how those HTML atributes can be integrated into
 the form, removed :size, as it's de same as :cols and more ambiguous.

---
 README.textile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.textile b/README.textile
index 130e9b995..4eaf60ed0 100644
--- a/README.textile
+++ b/README.textile
@@ -234,8 +234,8 @@ Customize HTML attributes for any input using the @:input_html@ option. Typicall
 
 <pre>
   <% semantic_form_for @post do |form| %>
-    <%= form.input :title,      :input_html => { :size => 60 } %>
-    <%= form.input :body,       :input_html => { :class => 'autogrow' } %>
+    <%= form.input :title,      :input_html => {  :cols => 10 } %>
+    <%= form.input :body,       :input_html => { :class => 'autogrow', :rows => 10, :cols => 20, :maxlength => 10  } %>
     <%= form.input :created_at, :input_html => { :disabled => true } %>
     <%= form.buttons %>
   <% end %>

From fd666234359edfbb8ef7c70df13937b0f12e0a03 Mon Sep 17 00:00:00 2001
From: smix <smixok@gmail.com>
Date: Mon, 24 Jan 2011 05:11:03 +0800
Subject: [PATCH 510/992] make
 Formtastic::SemanticFormBuilder#generate_association_input_name to work with
 Mongoid Documents

---
 lib/formtastic.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index a4aa48613..c4bb31dce 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1620,6 +1620,8 @@ def generate_association_input_name(method) #:nodoc:
         if reflection = reflection_for(method)
           if [:has_and_belongs_to_many, :has_many].include?(reflection.macro)
             "#{method.to_s.singularize}_ids"
+          elsif reflection.respond_to? :foreign_key
+            reflection.foreign_key
           else
             reflection.options[:foreign_key] || "#{method}_id"
           end

From b69cc85b9bf062ab0fb9f35b6139c415bb50f667 Mon Sep 17 00:00:00 2001
From: smix <smixok@gmail.com>
Date: Wed, 2 Feb 2011 01:49:38 +0800
Subject: [PATCH 511/992] spec for mongoid references fix

---
 spec/inputs/select_input_spec.rb | 14 ++++++++++++++
 spec/spec_helper.rb              |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index a06af0f56..7c1d57126 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -31,6 +31,20 @@
         end
       end
     end
+    
+    describe "using a related model without reflection's options(Mongoid Document)" do
+      before do        
+        @form = semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:mongoid_reviewer, :as => :select))
+        end
+      end
+      
+      it 'should draw select options' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag('form li select')
+        output_buffer.should have_tag('form li select#post_reviewer_id')
+      end
+    end
 
     describe 'using a range' do
       before do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 01d63ea8b..cd8ab7ea1 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -221,6 +221,8 @@ def new_author_path; "/authors/new"; end
         mock('reflection', :options => {}, :klass => ::Post, :macro => :has_many)
       when :main_post
         mock('reflection', :options => {}, :klass => ::Post, :macro => :belongs_to)
+      when :mongoid_reviewer
+        mock('reflection', :options => {}, :klass => ::Author, :macro => :referenced_in, :foreign_key => "reviewer_id")
       end
 
     end

From ea7d9c6bc38df6d31319ee7dead3a54126763414 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 10 Feb 2011 07:00:21 +1100
Subject: [PATCH 512/992] sync changelog with 1.2-stable branch

---
 CHANGELOG | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 547c6174c..a301025d8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+1.2.4.beta (unreleased)
+
+* Changed :boolean inputs to use Rails' check_box_checked? instead of our own logic
+* Changed developer instructions in README
+* Fixed :boolean inputs to disable the included hidden input when disabling the actual checkbox
+* Fixed that Formtastic was making changes to the options hash directly instead of on a duplicate, causing problems for those trying to reuse options on multiple inputs in the view 
+* Fixed that tiny scroll bars were appearing on legends in date/time/radio/cbheckboxes fielsets (GH-477)    
 * Fixed an issue when formtastic fails to determine if a checkbox is checked with custom checked and unchecked values (thanks to Eugene Bolshakov)
 * Fixed that the hidden input rendered with a boolean checkbox did nt use the custom :name from :input_html options hash
 

From fb643c7442339c675c7cf1439bc1149d35f3a97a Mon Sep 17 00:00:00 2001
From: smix <smixok@gmail.com>
Date: Wed, 2 Feb 2011 01:49:38 +0800
Subject: [PATCH 513/992] spec for mongoid references fix

---
 spec/inputs/select_input_spec.rb | 14 ++++++++++++++
 spec/spec_helper.rb              |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index b3e88734a..28f93e258 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -30,6 +30,20 @@
         end
       end
     end
+    
+    describe "using a related model without reflection's options(Mongoid Document)" do
+      before do        
+        @form = semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:mongoid_reviewer, :as => :select))
+        end
+      end
+      
+      it 'should draw select options' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag('form li select')
+        output_buffer.should have_tag('form li select#post_reviewer_id')
+      end
+    end
 
     describe 'using a range' do
       before do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6ef70e005..c428522db 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -212,6 +212,8 @@ def new_author_path; "/authors/new"; end
         mock('reflection', :options => {}, :klass => ::Post, :macro => :has_many)
       when :main_post
         mock('reflection', :options => {}, :klass => ::Post, :macro => :belongs_to)
+      when :mongoid_reviewer
+        mock('reflection', :options => {}, :klass => ::Author, :macro => :referenced_in, :foreign_key => "reviewer_id")
       end
 
     end

From f33fb411495b0d2fd398b9b02161bf44f333a3e6 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 10 Feb 2011 07:10:49 +1100
Subject: [PATCH 514/992] copied fd666234359edfbb8ef7c70df13937b0f12e0a03 from
 master

---
 lib/formtastic/inputs/base.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/formtastic/inputs/base.rb b/lib/formtastic/inputs/base.rb
index 018f0bbc1..a7315dce9 100644
--- a/lib/formtastic/inputs/base.rb
+++ b/lib/formtastic/inputs/base.rb
@@ -108,6 +108,8 @@ def generate_association_input_name(method) #:nodoc:
         if reflection = reflection_for(method)
           if [:has_and_belongs_to_many, :has_many].include?(reflection.macro)
             "#{method.to_s.singularize}_ids"
+          elsif reflection.respond_to? :foreign_key
+            reflection.foreign_key
           else
             reflection.options[:foreign_key] || "#{method}_id"
           end

From 4d998ffb141de888ce044dc446f133d7d52473b7 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 10 Feb 2011 09:51:33 +1100
Subject: [PATCH 515/992] clean up specs from some lazy merges and cherry-picks

---
 spec/inputs/boolean_input_spec.rb     | 15 ++++++---------
 spec/inputs/check_boxes_input_spec.rb |  2 --
 spec/inputs/select_input_spec.rb      |  5 ++---
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index 72c2345e3..ed4947f7c 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -49,11 +49,10 @@
   end
 
   it 'should name the hidden input with the :name html_option' do
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:answer_comments, :as => :boolean, :input_html => { :name => "foo" }))
-    end
+    end)
     
-    output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should have_tag('form li input[@type="checkbox"][@name="foo"]', :count => 1)
     output_buffer.should have_tag('form li input[@type="hidden"][@name="foo"]', :count => 1)
   end
@@ -85,22 +84,20 @@
   it 'should generate a checked input if object.method returns checked value' do
     @new_post.stub!(:allow_comments).and_return('yes')
   
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'yes', :unchecked_value => 'no'))
-    end
+    end)
   
-    output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should have_tag('form li label input[@type="checkbox"][@value="yes"][@checked="checked"]')
   end
   
   it 'should not generate a checked input if object.method returns unchecked value' do
     @new_post.stub!(:allow_comments).and_return('no')
   
-    form = semantic_form_for(@new_post) do |builder|
+    concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'yes', :unchecked_value => 'no'))
-    end
+    end)
   
-    output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should have_tag('form li label input[@type="checkbox"][@value="yes"]:not([@checked])')
   end
 
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 1056d20ad..a251e55b9 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -205,8 +205,6 @@
         end
 
         it "should have one item disabled; the specified one" do
-          output_buffer.concat(@form) if Formtastic::Util.rails3?
-          output_buffer.should have_tag("form li fieldset ol li input[@type='hidden'][@disabled='disabled']", :count => 1)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 1)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
           output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@fred.id}']")
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 28f93e258..8fe0f7a27 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -33,13 +33,12 @@
     
     describe "using a related model without reflection's options(Mongoid Document)" do
       before do        
-        @form = semantic_form_for(@new_post) do |builder|
+        concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:mongoid_reviewer, :as => :select))
-        end
+        end)
       end
       
       it 'should draw select options' do
-        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li select')
         output_buffer.should have_tag('form li select#post_reviewer_id')
       end

From 541be0bfed511e64ed926116796a9aed1c31fbe0 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 10 Feb 2011 23:31:54 +1100
Subject: [PATCH 516/992] beefed up ButtonsHelper #buttons and #commit_button
 documentation, still needs to be converted to YARD

---
 lib/formtastic/helpers/buttons_helper.rb | 130 +++++++++++++++++++++--
 1 file changed, 122 insertions(+), 8 deletions(-)

diff --git a/lib/formtastic/helpers/buttons_helper.rb b/lib/formtastic/helpers/buttons_helper.rb
index ec370b1f7..67829e593 100644
--- a/lib/formtastic/helpers/buttons_helper.rb
+++ b/lib/formtastic/helpers/buttons_helper.rb
@@ -3,15 +3,126 @@
 
 module Formtastic
   module Helpers
+    
+    # ButtonsHelper encapsulates the responsibilties of the {#buttons} and {#commit_button} helpers 
+    # for submitting forms.
+    #
+    # {#buttons} is used to wrap the form's button(s) and actions in a `<fieldset>` and `<ol>`, 
+    # with each item in the list containing the markup representing a single button.
+    #
+    # {#buttons} is usually called with a block containing a single {#commit_button} call:
+    #
+    #     <%= semantic_form_for @post do |f| %>
+    #       ...
+    #       <%= f.buttons do %>
+    #         <%= f.commit_button
+    #       <% end %>
+    #     <% end %>
+    #
+    # The HTML output will be something like:
+    #
+    #     <form class="formtastic" method="post" action="...">
+    #       ...
+    #       <fieldset class="buttons">
+    #         <ol>
+    #           <li class="commit">
+    #             <input type="submit" name="commit" value="Create Post" class="create">
+    #           </li>
+    #         </ol>
+    #       </fieldset>
+    #     </form>
+    #
+    # While this may seem slightly over-engineered, it is consistent with the way form inputs are
+    # handled, and makes room for other types of buttons and actions in future versions (such as
+    # cancel buttons or links, reset buttons and even alternate actions like 'save and continue 
+    # editing').
+    #
+    # It's important to note that the `semantic_form_for` and {#buttons} blocks wrap the
+    # standard Rails `form_for` helper and form builder, so you have full access to every standard
+    # Rails form helper, with any HTML markup and ERB syntax, allowing you to "break free" from 
+    # Formtastic when it doesn't suit to create your own buttons, links and actions:
+    #
+    #     <%= semantic_form_for @post do |f| %>
+    #       ...
+    #       <%= f.buttons do %>
+    #         <li class="save">
+    #           <%= f.submit "Save" %>
+    #         <li>
+    #         <li class="cancel-link">
+    #           Or <%= link_to "Cancel", posts_url %>
+    #         <li>
+    #       <% end %>
+    #     <% end %>
+    #
+    # There are many other syntax variations and arguments to customize your form. See the
+    # full documentation of {#buttons} and {#commit_button} for details.
     module ButtonsHelper
       include Formtastic::Helpers::FieldsetWrapper
       include Formtastic::LocalizedString
       
-      # Creates a fieldset and ol tag wrapping for form buttons / actions as list items.
-      # See inputs documentation for a full example.  The fieldset's default class attriute
-      # is set to "buttons".
+      # Creates a fieldset and ol tag wrapping for use around a set of buttons. It can be
+      # called either with a block (in which you can do the usual Rails form stuff, HTML, ERB, etc),
+      # or with a list of named buttons. These two examples are functionally equivalent:
+      #
+      #     # With a block:
+      #     <% semantic_form_for @post do |f| %>
+      #       ...
+      #       <% f.buttons do %>
+      #         <%= f.commit_button %>
+      #       <% end %>
+      #     <% end %>
+      #     
+      #     # With a list of fields:
+      #     <% semantic_form_for @post do |f| %>
+      #       <%= f.buttons :commit %>
+      #     <% end %>
+      #     
+      #     # Output:
+      #     <form ...>
+      #       <fieldset class="inputs">
+      #         <ol>
+      #           <li class="commit">
+      #             <input type="submit" ...>
+      #           </li>
+      #         </ol>
+      #       </fieldset>
+      #     </form>
+      #
+      # Only one type of named button is supported at this time (:commit), and it's assumed to be 
+      # the default choice, so this is also functionally equivalent, but may change in the future:
+      #
+      #     # With no args:
+      #     <% semantic_form_for @post do |f| %>
+      #       <%= f.buttons %>
+      #     <% end %>
+      #
+      # While this may seem slightly over-engineered, it is consistent with the way form inputs are
+      # handled, and makes room for other types of buttons and actions in future versions (such as
+      # cancel buttons or links, reset buttons and even alternate actions like 'save and continue 
+      # editing').
       #
-      # See inputs for html attributes and special options.
+      # **Options**
+      #
+      # 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 |f| %>
+      #       ...
+      #       <% f.buttons :name => "Actions", :style => "border:1px;" do %>
+      #         ...
+      #       <% end %>
+      #     <% end %>
+      #     
+      #     # With a list of named buttons (the options must come after the button list list):
+      #     <% semantic_form_for @post do |f| %>
+      #       ...
+      #       <%= f.buttons :commit, :name => "Create a new post", :style => "border:1px;" %>
+      #     <% end %>
+      #
+      # @todo convert to YARD documentation syntax
+      # @todo document i18n keys
       def buttons(*args, &block)
         html_options = args.extract_options!
         html_options[:class] ||= "buttons"
@@ -28,16 +139,19 @@ def buttons(*args, &block)
       # Creates a submit input tag with the value "Save [model name]" (for existing records) or
       # "Create [model name]" (for new records) by default:
       #
-      #   <%= form.commit_button %> => <input name="commit" type="submit" value="Save Post" />
+      #   <%= f.commit_button %> => <input name="commit" type="submit" value="Save Post" />
       #
       # The value of the button text can be overridden:
       #
-      #  <%= 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}" />
+      #  <%= f.commit_button "Go" %> => <input name="commit" type="submit" value="Go" class="{create|update|submit}" />
+      #  <%= f.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 :button_html => { :class => "pretty" } %> => <input name="commit" type="submit" value="Save Post" class="pretty {create|update|submit}" />
+      #  <%= f.commit_button :button_html => { :class => "pretty" } %> => <input name="commit" type="submit" value="Save Post" class="pretty {create|update|submit}" />
+      #
+      # @todo convert to YARD syntax
+      # @todo document i18n keys
       def commit_button(*args)
         options = args.extract_options!
         text = options.delete(:label) || args.shift

From f118ae6a71176069bf86b6db694383fe37828d39 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 11 Feb 2011 07:28:22 +1100
Subject: [PATCH 517/992] YARD documentation for commit_button

---
 lib/formtastic/helpers/buttons_helper.rb | 57 ++++++++++++++++++++----
 1 file changed, 49 insertions(+), 8 deletions(-)

diff --git a/lib/formtastic/helpers/buttons_helper.rb b/lib/formtastic/helpers/buttons_helper.rb
index 67829e593..9da7fa0ef 100644
--- a/lib/formtastic/helpers/buttons_helper.rb
+++ b/lib/formtastic/helpers/buttons_helper.rb
@@ -137,21 +137,62 @@ def buttons(*args, &block)
       end
     
       # Creates a submit input tag with the value "Save [model name]" (for existing records) or
-      # "Create [model name]" (for new records) by default:
+      # "Create [model name]" (for new records) by default. The output is an `<input>` tag with the 
+      # `type` of `submit` and a class of either `create` or `update` (if Formtastic can determin if)
+      # the record is new or not) with `submit` as a fallback class. The submit button is wrapped in
+      # an `<li>` tag with a class of `commit`, and is intended to be rendered inside a {#buttons}
+      # block which wraps the button in a `fieldset` and `ol`.
       #
-      #   <%= f.commit_button %> => <input name="commit" type="submit" value="Save Post" />
+      # The textual value of the label can be changed from this default through the `:label` 
+      # argument or through i18n.
       #
-      # The value of the button text can be overridden:
+      # You can pass HTML attributes down to the `<input>` tag with the `:button_html` option, and 
+      # pass HTML attributes to the wrapping `<li>` tag with the `:wrapper_html` option.
       #
-      #  <%= f.commit_button "Go" %> => <input name="commit" type="submit" value="Go" class="{create|update|submit}" />
-      #  <%= f.commit_button :label => "Go" %> => <input name="commit" type="submit" value="Go" class="{create|update|submit}" />
+      # @example Basic usage
+      #   # form
+      #   <%= semantic_form_for @post do |f| %>
+      #     ...
+      #     <%= f.buttons do %>
+      #       <%= f.commit_button %>
+      #     <% end %>
+      #   <% end %>
+      #
+      #   # output
+      #   <form ...>
+      #     ...
+      #     <fieldset class="buttons">
+      #       <input name="commit" type="submit" value="Create Post" class="create">
+      #     </fieldset>
+      #   </form>
+      #
+      # @example Set the value through the `:label` option
+      #   <%= f.commit_button :label => "Go" %>
+      #
+      # @example Set the value through the optional first argument (like Rails' `f.submit`)
+      #   <%= f.commit_button "Go" %>
+      #
+      # @example Pass HTML attributes down to the `<input>`
+      #   <%= f.commit_button :button_html => { :class => 'pretty', :accesskey => 'g' } %>
+      #   <%= f.commit_button :label => "Go", :button_html => { :class => 'pretty', :accesskey => 'g' } %>
+      #   <%= f.commit_button "Go", :button_html => { :class => 'pretty', :accesskey => 'g' } %>
+      #
+      # @example Pass HTML attributes down to the `<li>` wrapper
+      #   <%= f.commit_button :button_html => { :class => 'special', :id => 'whatever' } %>
+      #   <%= f.commit_button :label => "Go", :button_html => { :class => 'special', :id => 'whatever' } %>
+      #   <%= f.commit_button "Go", :button_html => { :class => 'special', :id => 'whatever' } %>
+      #
+      # @option args :label [String, Symbol]  
+      #   Override the label text with a String or a symbold for an i18n translation key
       #
-      # And you can pass html atributes down to the input, with or without the button text:
+      # @option args :button_html [Hash]  
+      #   Override or add to the HTML attributes to be passed down to the `<input>` tag
       #
-      #  <%= f.commit_button :button_html => { :class => "pretty" } %> => <input name="commit" type="submit" value="Save Post" class="pretty {create|update|submit}" />
+      # @option args :wrapper_html [Hash] 
+      #   Override or add to the HTML attributes to be passed down to the wrapping `<li>` tag
       #
-      # @todo convert to YARD syntax
       # @todo document i18n keys
+      # @todo strange that `:accesskey` seems to be supported in the top level args as well as `:button_html`
       def commit_button(*args)
         options = args.extract_options!
         text = options.delete(:label) || args.shift

From dadf7e5c0cceaec497f678292b25008fa25fdd95 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 11 Feb 2011 07:29:00 +1100
Subject: [PATCH 518/992] clarified :wrapper_html and :input_html docs

---
 lib/formtastic/helpers/inputs_helper.rb | 44 ++++++++++++-------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 6cabf1fda..f21ad24f9 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -148,10 +148,10 @@ module InputsHelper
       #   Override to mark the input as required (or not)
       #
       # @option options :input_html [Hash]  
-      #   Override the HTML attributes to be passed down to the `<input>` tag
+      #   Override or add to the HTML attributes to be passed down to the `<input>` tag
       #
       # @option options :wrapper_html [Hash] 
-      #   Override the HTML attributes to be passed down to the wrapping `<li>` tag
+      #   Override or add to the HTML attributes to be passed down to the wrapping `<li>` tag
       #
       # @option options :collection [Array<ActiveModel, String, Symbol>, Hash{String => String, Boolean}, OrderedHash{String => String, Boolean}]
       #   Override collection of objects in the association (`:select`, `:radio` & `:check_boxes` inputs only)
@@ -258,15 +258,15 @@ def input(method, options = {})
       #
       #     # With a block:
       #     <% semantic_form_for @post do |form| %>
-      #       <% form.inputs do %>
-      #         <%= form.input :title %>
-      #         <%= form.input :body %>
+      #       <% f.inputs do %>
+      #         <%= f.input :title %>
+      #         <%= f.input :body %>
       #       <% end %>
       #     <% end %>
       #     
       #     # With a list of fields:
       #     <% semantic_form_for @post do |form| %>
-      #       <%= form.inputs :title, :body %>
+      #       <%= f.inputs :title, :body %>
       #     <% end %>
       #     
       #     # Output:
@@ -287,12 +287,12 @@ def input(method, options = {})
       # later to customise the form with a field list or a block of inputs.  Example:
       #
       #     <% semantic_form_for @post do |form| %>
-      #       <%= form.inputs %>
+      #       <%= f.inputs %>
       #     <% end %>
       #     
       #     With a few arguments:
       #     <% semantic_form_for @post do |form| %>
-      #       <%= form.inputs "Post details", :title, :body %>
+      #       <%= f.inputs "Post details", :title, :body %>
       #     <% end %>
       #
       # **Options**
@@ -303,19 +303,19 @@ def input(method, options = {})
       #
       #     # With a block:
       #     <% semantic_form_for @post do |form| %>
-      #       <% form.inputs :name => "Create a new post", :style => "border:1px;" do %>
+      #       <% f.inputs :name => "Create a new post", :style => "border:1px;" do %>
       #         ...
       #       <% end %>
       #     <% end %>
       #     
       #     # With a list (the options must come after the field list):
       #     <% semantic_form_for @post do |form| %>
-      #       <%= form.inputs :title, :body, :name => "Create a new post", :style => "border:1px;" %>
+      #       <%= f.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;" %>
+      #       <%= f.inputs "Create a new post", :title, :body, :style => "border:1px;" %>
       #     <% end %>
       #
       # **It's basically a fieldset!**
@@ -365,12 +365,12 @@ def input(method, options = {})
       # As in Rails, you can use semantic_fields_for to nest attributes:
       #
       #     <% semantic_form_for @post do |form| %>
-      #       <%= form.inputs :title, :body %>
+      #       <%= f.inputs :title, :body %>
       #     
-      #       <% form.semantic_fields_for :author, @bob do |author_form| %>
-      #         <% author_form.inputs do %>
-      #           <%= author_form.input :first_name, :required => false %>
-      #           <%= author_form.input :last_name %>
+      #       <% f.semantic_fields_for :author, @bob do |author| %>
+      #         <% author.inputs do %>
+      #           <%= author.input :first_name, :required => false %>
+      #           <%= author.input :last_name %>
       #         <% end %>
       #       <% end %>
       #     <% end %>
@@ -378,10 +378,10 @@ def input(method, options = {})
       # But this does not look formtastic! This is equivalent:
       #
       #     <% semantic_form_for @post do |form| %>
-      #       <%= form.inputs :title, :body %>
-      #       <% form.inputs :for => [ :author, @bob ] do |author_form| %>
-      #         <%= author_form.input :first_name, :required => false %>
-      #         <%= author_form.input :last_name %>
+      #       <%= f.inputs :title, :body %>
+      #       <% f.inputs :for => [ :author, @bob ] do |author| %>
+      #         <%= author.input :first_name, :required => false %>
+      #         <%= author.input :last_name %>
       #       <% end %>
       #     <% end %>
       #
@@ -389,8 +389,8 @@ def input(method, options = {})
       # in just one line:
       #
       #     <% semantic_form_for @post do |form| %>
-      #       <%= form.inputs :title, :body %>
-      #       <%= form.inputs :first_name, :last_name, :for => @bob %>
+      #       <%= f.inputs :title, :body %>
+      #       <%= f.inputs :first_name, :last_name, :for => @bob %>
       #     <% end %>
       #
       # Just remember that calling inputs generates a new fieldset to wrap your

From 41bb6381cb44ab0d5e239e81ba9e2ade869f6a62 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 11 Feb 2011 10:24:19 +1100
Subject: [PATCH 519/992] more ButtonsHelper docs

---
 lib/formtastic/helpers/buttons_helper.rb | 68 ++++++++++++++++++++----
 1 file changed, 57 insertions(+), 11 deletions(-)

diff --git a/lib/formtastic/helpers/buttons_helper.rb b/lib/formtastic/helpers/buttons_helper.rb
index 9da7fa0ef..0c0ab2715 100644
--- a/lib/formtastic/helpers/buttons_helper.rb
+++ b/lib/formtastic/helpers/buttons_helper.rb
@@ -93,6 +93,7 @@ module ButtonsHelper
       #
       #     # With no args:
       #     <% semantic_form_for @post do |f| %>
+      #       ...
       #       <%= f.buttons %>
       #     <% end %>
       #
@@ -101,28 +102,72 @@ module ButtonsHelper
       # cancel buttons or links, reset buttons and even alternate actions like 'save and continue 
       # editing').
       #
-      # **Options**
+      # All options except `:name` and `:title` are passed down to the fieldset as HTML
+      # attributes (`id`, `class`, `style`...). If provided, the `:name` or `:title` option is 
+      # passed into a `<legend>` inside the `<fieldset>` to name the set of buttons.
       #
-      # 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.
+      # @example Quickly add button(s) to the form, accepting all default values, options and behaviors
+      #     <% semantic_form_for @post do |f| %>
+      #       ...
+      #       <%= f.buttons %>
+      #     <% end %>
       #
-      #     # With a block:
+      # @example Specify which named buttons you want, accepting all default values, options and behaviors
       #     <% semantic_form_for @post do |f| %>
       #       ...
-      #       <% f.buttons :name => "Actions", :style => "border:1px;" do %>
-      #         ...
+      #       <%= f.buttons :commit %>
+      #     <% end %>
+      #
+      # @example Specify which named buttons you want, and name the fieldset
+      #     <% semantic_form_for @post do |f| %>
+      #       ...
+      #       <%= f.buttons :commit, :name => "Actions" %>
+      #       or
+      #       <%= f.buttons :commit, :label => "Actions" %>
+      #     <% end %>
+      #
+      # @example Get full control over the commit_button options
+      #     <% semantic_form_for @post do |f| %>
+      #       ...
+      #       <%= f.buttons do %>
+      #         <%= f.commit_button :label => "Go", :input_html => { ... }, :wrapper_html => { ... }
       #       <% end %>
       #     <% end %>
-      #     
-      #     # With a list of named buttons (the options must come after the button list list):
+      #
+      # @example Make your own custom buttons, links or actions with standard Rails helpers or HTML
       #     <% semantic_form_for @post do |f| %>
       #       ...
-      #       <%= f.buttons :commit, :name => "Create a new post", :style => "border:1px;" %>
+      #       <%= f.buttons do %>
+      #         <li class="submit">
+      #           <%= f.submit "Submit" %>
+      #         </li>
+      #         <li class="reset">
+      #           <input type="reset" value="Reset">
+      #         </li>
+      #         <li class="cancel">
+      #           <%= link_to "Cancel", posts_url %>
+      #         </li>
+      #       <% end %>
       #     <% end %>
       #
-      # @todo convert to YARD documentation syntax
+      # @example Add HTML attributes to the fieldset
+      #     <% semantic_form_for @post do |f| %>
+      #       ...
+      #       <%= f.buttons :commit, :style => "border:1px;" %>
+      #       or
+      #       <%= f.buttons :style => "border:1px;" do %>
+      #         ...
+      #       <% end %>
+      #     <% end %>
+      #
+      # @option args :label [String, Symbol]
+      #   Optionally specify text for the legend of the fieldset
+      #
+      # @option args :name [String, Symbol]
+      #   Optionally specify text for the legend of the fieldset (alias for `:label`)
+      #
       # @todo document i18n keys
+      # @todo YARD @option tags aren't rendering
       def buttons(*args, &block)
         html_options = args.extract_options!
         html_options[:class] ||= "buttons"
@@ -193,6 +238,7 @@ def buttons(*args, &block)
       #
       # @todo document i18n keys
       # @todo strange that `:accesskey` seems to be supported in the top level args as well as `:button_html`
+      # @todo YARD @option tags aren't rendering
       def commit_button(*args)
         options = args.extract_options!
         text = options.delete(:label) || args.shift

From ad5bdf9bacf921a47fc24ed4631d4806ee1b3e78 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 14 Feb 2011 07:49:28 +1100
Subject: [PATCH 520/992] InputsHelper#inputs documentation

---
 lib/formtastic/helpers/inputs_helper.rb | 269 +++++++++++++++---------
 1 file changed, 168 insertions(+), 101 deletions(-)

diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index f21ad24f9..13410ecb8 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -168,12 +168,23 @@ module InputsHelper
       # @option options :error_class [String]
       #   Override the `class` attribute applied to the `<p>` or `<ol>` tag used when inline errors are rendered for an input
       #
-      # @option options :multiple [Boolean] TODO
-      # @option options :group_by [Symbol] TODO
-      # @option options :find_options [Symbol] TODO
-      # @option options :group_label_method [Symbol] TODO
-      # @option options :include_blank [Boolean] TODO
-      # @option options :prompt [String] TODO
+      # @option options :multiple [Boolean]
+      #   Specify if the `:select` input should allow multiple selections or not (defaults to `belongs_to` associations, and `true` for `has_many` and `has_and_belongs_to_many` associations)
+      #
+      # @option options :group_by [Symbol]
+      #   TODO will probably be deprecated
+      #
+      # @option options :find_options [Symbol]
+      #   TODO will probably be deprecated
+      #
+      # @option options :group_label_method [Symbol]
+      #   TODO will probably be deprecated
+      #
+      # @option options :include_blank [Boolean]
+      #   Specify if a `:select` input should include a blank option or not (defaults to `include_blank_for_select_by_default` configuration)
+      #
+      # @option options :prompt [String]
+      #   Specify the text in the first ('blank') `:select` input `<option>` to prompt a user to make a selection (implicitly sets `:include_blank` to `true`)
       #
       # @todo Can we kill `:hint_class` & `:error_class`? What's the use case for input-by-input? Shift to config or burn!
       # @todo Can we kill `:group_by` & `:group_label_method`? Should be done with :collection => grouped_options_for_select(...)
@@ -223,6 +234,13 @@ module InputsHelper
       #   <%= f.input :cateogies, :as => :select, :multiple => true %>
       #   <%= f.input :cateogies, :as => :select, :multiple => false %>
       #
+      # @example Specifying if a `:select` should have a 'blank' first option to prompt selection:
+      #   <%= f.input :author, :as => :select, :include_blank => true %>
+      #   <%= f.input :author, :as => :select, :include_blank => false %>
+      #
+      # @example Specifying the text for a `:select` input's 'blank' first option to prompt selection:
+      #   <%= f.input :author, :as => :select, :prompt => "Select an Author" %>
+      #
       # @todo Many many more examples. Some of the detail probably needs to be pushed out to the relevant methods too.
       def input(method, options = {})
         options = options.dup # Allow options to be shared without being tainted by Formtastic
@@ -251,10 +269,11 @@ def input(method, options = {})
     
         return template.content_tag(:li, Formtastic::Util.html_safe(list_item_content), wrapper_html)
       end
-    
-      # Creates an input fieldset and ol tag wrapping for use around a set of inputs.  It can be
+      
+      # {#inputs} creates an input fieldset and ol tag wrapping for use around a set of inputs.  It can be
       # called either with a block (in which you can do the usual Rails form stuff, HTML, ERB, etc),
-      # or with a list of fields.  These two examples are functionally equivalent:
+      # or with a list of fields (accepting all default arguments and options). These two examples 
+      # are functionally equivalent:
       #
       #     # With a block:
       #     <% semantic_form_for @post do |form| %>
@@ -264,7 +283,7 @@ def input(method, options = {})
       #       <% end %>
       #     <% end %>
       #     
-      #     # With a list of fields:
+      #     # With a list of fields (short hand syntax):
       #     <% semantic_form_for @post do |form| %>
       #       <%= f.inputs :title, :body %>
       #     <% end %>
@@ -281,124 +300,172 @@ def input(method, options = {})
       #
       # **Quick Forms**
       #
-      # When called without a block or a field list, an input is rendered for each column in the
-      # model's database table, just like Rails' scaffolding.  You'll obviously want more control
-      # than this in a production application, but it's a great way to get started, then come back
-      # later to customise the form with a field list or a block of inputs.  Example:
+      # Quick, scaffolding-style forms can be easily rendered for rapid early development if called
+      # without a block or a field list. In the case an input is rendered for **most** columns in
+      # the model's database table (like Rails' scaffolding) plus inputs for some model associations.
+      #
+      # In this case, all inputs are rendered with default options and arguments. You'll want more 
+      # control than this in a production application, but it's a great way to get started, then 
+      # come back later to customise the form with a field list or a block of inputs.  Example:
       #
       #     <% semantic_form_for @post do |form| %>
       #       <%= f.inputs %>
       #     <% end %>
-      #     
-      #     With a few arguments:
-      #     <% semantic_form_for @post do |form| %>
-      #       <%= f.inputs "Post details", :title, :body %>
-      #     <% end %>
       #
-      # **Options**
+      # **Nested Attributes**
       #
-      # 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.
+      # One of the most complicated parts of Rails forms comes when nesting the inputs for 
+      # attrinbutes on associated models. Formtastic can take the pain away for many (but not all)
+      # situations.
       #
-      #     # With a block:
-      #     <% semantic_form_for @post do |form| %>
-      #       <% f.inputs :name => "Create a new post", :style => "border:1px;" do %>
-      #         ...
+      # Given the following models:
+      #
+      #     # Models
+      #     class User < ActiveRecord::Base
+      #       has_one :profile
+      #       accepts_nested_attributes_for :profile
+      #     end
+      #     class Profile < ActiveRecord::Base
+      #       belongs_to :user
+      #     end
+      #
+      # Formtastic provides a helper called `semantic_fields_for`, which wraps around Rails' built-in
+      # `fields_for` helper, allowing you to combine Rails-style nested fields with Formtastic inputs:
+      #
+      #     <% semantic_form_for @user do |form| %>
+      #       <%= f.inputs :name, :email %>
+      #     
+      #       <% f.semantic_fields_for :profile do |profile| %>
+      #         <% profile.inputs do %>
+      #           <%= profile.input :biography %>
+      #           <%= profile.input :twitter_name %>
+      #           <%= profile.input :shoe_size %>
+      #         <% end %>
       #       <% end %>
       #     <% end %>
+      #
+      # {#inputs} also provides a DSL similar to `semantic_fields_for` to reduce the lines of code a
+      # little:
+      #
+      #     <% semantic_form_for @user do |f| %>
+      #       <%= f.inputs :name, :email %>
       #     
-      #     # With a list (the options must come after the field list):
-      #     <% semantic_form_for @post do |form| %>
-      #       <%= f.inputs :title, :body, :name => "Create a new post", :style => "border:1px;" %>
+      #       <% f.inputs :for => :profile do %>
+      #         <%= profile.input :biography %>
+      #         <%= profile.input :twitter_name %>
+      #         <%= profile.input :shoe_size %>
+      #       <% end %>
       #     <% end %>
-      #     
-      #     # ...or the equivalent:
+      #
+      # The `:for` option also works with short hand syntax:
+      #
       #     <% semantic_form_for @post do |form| %>
-      #       <%= f.inputs "Create a new post", :title, :body, :style => "border:1px;" %>
+      #       <%= f.inputs :name, :email %>
+      #       <%= f.inputs :biography, :twitter_name, :shoe_size, :for => :profile %>
       #     <% end %>
       #
-      # **It's basically a fieldset!**
+      # {#inputs} will always create a new `<fieldset>` wrapping, so only use it when it makes sense
+      # in the document structure and semantics (using `semantic_fields_for` otherwise).
       #
-      # Instead of hard-coding fieldsets & legends into your form to logically group related fields,
-      # use inputs:
+      # All options except `:name`, `:title` and `:for` will be passed down to the fieldset as HTML
+      # attributes (id, class, style, etc).
       #
-      #     <% semantic_form_for @post do |f| %>
-      #       <% f.inputs do %>
-      #         <%= f.input :title %>
-      #         <%= f.input :body %>
-      #       <% end %>
-      #       <% f.inputs :name => "Advanced", :id => "advanced" do %>
-      #         <%= f.input :created_at %>
-      #         <%= f.input :user_id, :label => "Author" %>
-      #       <% end %>
-      #       <% f.inputs "Extra" do %>
-      #         <%= f.input :update_at %>
-      #       <% end %>
-      #     <% end %>
-      #     
-      #     # Output:
-      #     <form ...>
-      #       <fieldset class="inputs">
-      #         <ol>
-      #           <li class="string">...</li>
-      #           <li class="text">...</li>
-      #         </ol>
-      #       </fieldset>
-      #       <fieldset class="inputs" id="advanced">
-      #         <legend><span>Advanced</span></legend>
-      #         <ol>
-      #           <li class="datetime">...</li>
-      #           <li class="select">...</li>
-      #         </ol>
-      #       </fieldset>
-      #       <fieldset class="inputs">
-      #         <legend><span>Extra</span></legend>
-      #         <ol>
-      #           <li class="datetime">...</li>
-      #         </ol>
-      #       </fieldset>
-      #     </form>
       #
-      # **Nested attributes**
+      # @option args :for [Symbol, ActiveModel, Array]
+      #   The contents of this option is passed down to Rails' fields_for() helper, so it accepts the same values.
       #
-      # As in Rails, you can use semantic_fields_for to nest attributes:
+      # @option args :name [String] 
+      #   The optional name passed into the `<legend>` tag within the fieldset (alias of `:title`)
       #
-      #     <% semantic_form_for @post do |form| %>
-      #       <%= f.inputs :title, :body %>
-      #     
-      #       <% f.semantic_fields_for :author, @bob do |author| %>
-      #         <% author.inputs do %>
-      #           <%= author.input :first_name, :required => false %>
-      #           <%= author.input :last_name %>
-      #         <% end %>
-      #       <% end %>
-      #     <% end %>
+      # @option args :title [String] 
+      #   The optional name passed into the `<legend>` tag within the fieldset (alias of `:name`)
       #
-      # But this does not look formtastic! This is equivalent:
       #
-      #     <% semantic_form_for @post do |form| %>
-      #       <%= f.inputs :title, :body %>
-      #       <% f.inputs :for => [ :author, @bob ] do |author| %>
-      #         <%= author.input :first_name, :required => false %>
-      #         <%= author.input :last_name %>
-      #       <% end %>
+      # @example Quick form: Render a scaffold-like set of inputs for automatically guessed attributes and simple associations on the model, with all default arguments and options
+      #   <% semantic_form_for @post do |form| %>
+      #     <%= f.inputs %>
+      #   <% end %>
+      #
+      # @example Short hand: Render inputs for a named set of attributes and simple associations on the model, with all default arguments and options
+      #   <% semantic_form_for @post do |form| %>
+      #     <%= f.inputs, :title, :body, :user, :categories %>
+      #   <% end %>
+      #
+      # @example Block: Render inputs for attributes and simple associations with full control over arguments and options
+      #   <% semantic_form_for @post do |form| %>
+      #     <%= f.inputs do %>
+      #       <%= f.input :title ... %>
+      #       <%= f.input :body ... %>
+      #       <%= f.input :user ... %>
+      #       <%= f.input :categories ... %>
       #     <% end %>
+      #   <% end %>
       #
-      # And if you don't need to give options to your input call, you could do it
-      # in just one line:
+      # @example Multiple blocks: Render inputs in multiple fieldsets
+      #   <% semantic_form_for @post do |form| %>
+      #     <%= f.inputs do %>
+      #       <%= f.input :title ... %>
+      #       <%= f.input :body ... %>
+      #     <% end %>
+      #     <%= f.inputs do %>
+      #       <%= f.input :user ... %>
+      #       <%= f.input :categories ... %>
+      #     <% end %>
+      #   <% end %>
       #
-      #     <% semantic_form_for @post do |form| %>
-      #       <%= f.inputs :title, :body %>
-      #       <%= f.inputs :first_name, :last_name, :for => @bob %>
+      # @example Provide text for the `<legend>` to name a fieldset (with a block)
+      #   <% semantic_form_for @post do |form| %>
+      #     <%= f.inputs :name => 'Write something:' do %>
+      #       <%= f.input :title ... %>
+      #       <%= f.input :body ... %>
+      #     <% end %>
+      #     <%= f.inputs do :name => 'Advanced options:' do %>
+      #       <%= f.input :user ... %>
+      #       <%= f.input :categories ... %>
+      #     <% end %>
+      #   <% end %>
+      #
+      # @example Provide text for the `<legend>` to name a fieldset (with short hand)
+      #   <% semantic_form_for @post do |form| %>
+      #     <%= f.inputs :title, :body, :name => 'Write something:'%>
+      #     <%= f.inputs :user, :cateogies, :name => 'Advanced options:' %>
+      #   <% end %>
+      #
+      # @example Inputs for nested attributes (don't forget `accepts_nested_attributes_for` in your model, see Rails' `fields_for` documentation)
+      #   <% semantic_form_for @user do |form| %>
+      #     <%= f.inputs do %>
+      #       <%= f.input :name ... %>
+      #       <%= f.input :email ... %>
+      #     <% end %>
+      #     <%= f.inputs :for => :profile do |profile| %>
+      #       <%= profile.input :user ... %>
+      #       <%= profile.input :categories ... %>
       #     <% end %>
+      #   <% end %>
       #
-      # Just remember that calling inputs generates a new fieldset to wrap your
-      # inputs. If you have two separate models, but, semantically, on the page
-      # they are part of the same fieldset, you should use semantic_fields_for
-      # instead (just as you would do with Rails' form builder).
+      # @example Inputs for nested record (don't forget `accepts_nested_attributes_for` in your model, see Rails' `fields_for` documentation)
+      #   <% semantic_form_for @user do |form| %>
+      #     <%= f.inputs do %>
+      #       <%= f.input :name ... %>
+      #       <%= f.input :email ... %>
+      #     <% end %>
+      #     <%= f.inputs :for => @user.profile do |profile| %>
+      #       <%= profile.input :user ... %>
+      #       <%= profile.input :categories ... %>
+      #     <% end %>
+      #   <% end %>
       #
-      # @todo convert to YARD documentation syntax
+      # @example Inputs for nested record with a different name (don't forget `accepts_nested_attributes_for` in your model, see Rails' `fields_for` documentation)
+      #   <% semantic_form_for @user do |form| %>
+      #     <%= f.inputs do %>
+      #       <%= f.input :name ... %>
+      #       <%= f.input :email ... %>
+      #     <% end %>
+      #     <%= f.inputs :for => [:user_profile, @user.profile] do |profile| %>
+      #       <%= profile.input :user ... %>
+      #       <%= profile.input :categories ... %>
+      #     <% end %>
+      #   <% end %>
       def inputs(*args, &block)
         title = field_set_title_from_args(*args)
         html_options = args.extract_options!

From d355046ba1e39c9996d3f8acd73021810b2ab7a5 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 14 Feb 2011 08:01:22 +1100
Subject: [PATCH 521/992] more InputsHelper docs

---
 lib/formtastic/helpers/inputs_helper.rb | 78 +++++++++++++++----------
 1 file changed, 48 insertions(+), 30 deletions(-)

diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 13410ecb8..88bfab12c 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -466,6 +466,20 @@ def input(method, options = {})
       #       <%= profile.input :categories ... %>
       #     <% end %>
       #   <% end %>
+      #
+      # @example Nesting {#inputs} blocks requires an extra `<li>` tag for valid markup
+      #   <% semantic_form_for @user do |form| %>
+      #     <%= f.inputs do %>
+      #       <%= f.input :name ... %>
+      #       <%= f.input :email ... %>
+      #       <li>
+      #         <%= f.inputs :for => [:user_profile, @user.profile] do |profile| %>
+      #           <%= profile.input :user ... %>
+      #           <%= profile.input :categories ... %>
+      #         <% end %>
+      #       </li>
+      #     <% end %>
+      #   <% end %>
       def inputs(*args, &block)
         title = field_set_title_from_args(*args)
         html_options = args.extract_options!
@@ -491,26 +505,24 @@ def inputs(*args, &block)
         end
       end
       
-      # A thin wrapper around #fields_for to set :builder => Formtastic::FormBuilder
-      # for nesting forms:
-      #
-      #     # Example:
-      #     <% semantic_form_for @post do |post| %>
-      #       <% post.semantic_fields_for :author do |author| %>
-      #         <% author.inputs :name %>
-      #       <% end %>
+      # A thin wrapper around Rails' `fields_for` helper to set :builder => Formtastic::FormBuilder
+      # for nesting forms. Can be used in the same way as `fields_for` (see the Rails documentation),
+      # but you'll also have access to Formtastic's helpers ({#input}, etc) inside the block.
+      #
+      # @example
+      #   <% semantic_form_for @post do |post| %>
+      #     <% post.semantic_fields_for :author do |author| %>
+      #       <% author.inputs :name %>
       #     <% end %>
+      #   <% end %>
       #     
-      #     # Output:
-      #     <form ...>
-      #       <fieldset class="inputs">
-      #         <ol>
-      #           <li class="string"><input type='text' name='post[author][name]' id='post_author_name' /></li>
-      #         </ol>
-      #       </fieldset>
-      #     </form>
-      #
-      # @todo convert to YARD syntax
+      #   <form ...>
+      #     <fieldset class="inputs">
+      #       <ol>
+      #         <li class="string"><input type='text' name='post[author][name]' id='post_author_name' /></li>
+      #       </ol>
+      #     </fieldset>
+      #   </form>
       def semantic_fields_for(record_or_name_or_array, *args, &block)
         opts = args.extract_options!
         opts[:builder] ||= self.class
@@ -518,18 +530,24 @@ def semantic_fields_for(record_or_name_or_array, *args, &block)
         fields_for(record_or_name_or_array, *args, &block)
       end
       
-      # 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.
-      #
-      # 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
-      #
-      # @todo convert to YARD syntax
+      # Generates error messages for the given method, used for displaying errors right near the 
+      # field for data entry. Uses the `:inline_errors` config to determin the right presentation,
+      # which may be an ordered list, a paragraph sentence containing all errors, or a paragraph
+      # containing just the first error. If configred to `:none`, no error is shown.
+      #
+      # See the `:inline_errors` config documentation for more details. 
+      #
+      # This method is mostly used internally, but can be used in your forms when creating your own
+      # custom inputs, so it's been made public and aliased to `errors_on`.
+      #
+      # @example
+      #   <%= semantic_form_for @post do |f| %>
+      #     <li class='my-custom-text-input'>
+      #       <%= f.label(:body) %>
+      #       <%= f.text_field(:body) %>
+      #       <%= f.errors_on(:body) %>
+      #     </li>
+      #   <% end %>
       def inline_errors_for(method, options = {}) #:nodoc:
         if render_inline_errors?
           errors = error_keys(method, options).map{|x| @object.errors[x] }.flatten.compact.uniq

From 265377d1e3edce3b819dbe5bdb707ef8110d38dc Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 14 Feb 2011 08:07:21 +1100
Subject: [PATCH 522/992] doc formatting

---
 lib/formtastic/helpers/inputs_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 88bfab12c..21a480ee7 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -505,7 +505,7 @@ def inputs(*args, &block)
         end
       end
       
-      # A thin wrapper around Rails' `fields_for` helper to set :builder => Formtastic::FormBuilder
+      # A thin wrapper around Rails' `fields_for` helper to set `:builder => Formtastic::FormBuilder`
       # for nesting forms. Can be used in the same way as `fields_for` (see the Rails documentation),
       # but you'll also have access to Formtastic's helpers ({#input}, etc) inside the block.
       #

From d5a12c6950c1233cc64f04cc3e0b2a8252d0e194 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 14 Feb 2011 08:07:58 +1100
Subject: [PATCH 523/992] small todo

---
 lib/formtastic/helpers/inputs_helper.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 21a480ee7..c10d5b202 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -480,6 +480,8 @@ def input(method, options = {})
       #       </li>
       #     <% end %>
       #   <% end %>
+      #
+      # @todo args are not being rendered in YARD documentation
       def inputs(*args, &block)
         title = field_set_title_from_args(*args)
         html_options = args.extract_options!

From e055aede3bd3f31e35835d83222fdfed25c3c292 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 14 Feb 2011 16:16:16 +1100
Subject: [PATCH 524/992] documentation for ErrorsHelper

---
 lib/formtastic/helpers/errors_helper.rb | 34 ++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/lib/formtastic/helpers/errors_helper.rb b/lib/formtastic/helpers/errors_helper.rb
index ab33af255..577eb7999 100644
--- a/lib/formtastic/helpers/errors_helper.rb
+++ b/lib/formtastic/helpers/errors_helper.rb
@@ -11,15 +11,37 @@ module ErrorsHelper
       
       INLINE_ERROR_TYPES = [:sentence, :list, :first]
       
-      # Generates error messages for given method names and for base.
-      # You can pass a hash with html options that will be added to ul tag
+      # Generates an unordered list of error messages on the base object and optionally for a given 
+      # set of named attribute. This is idea for rendering a block of error messages at the top of 
+      # the form for hidden/special/virtual attributes (the Paperclip Rails plugin does this), or 
+      # errors on the base model.
       #
-      # == Examples
+      # A hash can be used as the last set of arguments to pass HTML attributes to the `<ul>` 
+      # wrapper.
       #
-      #  f.semantic_errors # This will show only errors on base
-      #  f.semantic_errors :state # This will show errors on base and state
-      #  f.semantic_errors :state, :class => "awesome" # errors will be rendered in ul.awesome
+      # @example A list of errors on the base model
+      #   <%= semantic_form_for ... %>
+      #     <%= f.semantic_errors %>
+      #     ...
+      #   <% end %>
       #
+      # @example A list of errors on the base and named attributes
+      #   <%= semantic_form_for ... %>
+      #     <%= f.semantic_errors :something_special %>
+      #     ...
+      #   <% end %>
+      #
+      # @example A list of errors on the base model, with custom HTML attributes
+      #   <%= semantic_form_for ... %>
+      #     <%= f.semantic_errors :class => "awesome" %>
+      #     ...
+      #   <% end %>
+      #
+      # @example A list of errors on the base model and named attributes, with custom HTML attributes
+      #   <%= semantic_form_for ... %>
+      #     <%= f.semantic_errors :something_special, :something_else, :class => "awesome", :onclick => "Awesome();" %>
+      #     ...
+      #   <% end %>
       def semantic_errors(*args)
         html_options = args.extract_options!
         full_errors = args.inject([]) do |array, method|

From c084a1f8ce2b7453af82fc67e2c37cb62b108d05 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 14 Feb 2011 16:34:13 +1100
Subject: [PATCH 525/992] FormHelper refactored to remove eval'd code:

* explicitly define semantic_form_for etc so that they can be easily documented, can be searched for in the code, etc
* defer all the code inside each form helper to a new method
* marked FIELD_ERROR_PROC with_custom_field_error_proc as protected
* added some TODOs and WTFs
---
 lib/formtastic/helpers/form_helper.rb | 99 ++++++++++++++++-----------
 1 file changed, 58 insertions(+), 41 deletions(-)

diff --git a/lib/formtastic/helpers/form_helper.rb b/lib/formtastic/helpers/form_helper.rb
index 5cbf12f99..1e8f4c354 100644
--- a/lib/formtastic/helpers/form_helper.rb
+++ b/lib/formtastic/helpers/form_helper.rb
@@ -32,27 +32,29 @@ module Helpers
     #   <% semantic_form_for :post, Post.new, :url => posts_path do |f| %>
     #     ...
     #   <% end %>
+    #
+    # @todo Documentation
     module FormHelper
       @@builder = Formtastic::FormBuilder
       @@default_form_class = 'formtastic'
       mattr_accessor :builder, :default_form_class
   
-      # 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
+      # @todo Documentation
+      def semantic_form_for(record_or_name_or_array, *args, &proc)
+        form_helper_wrapper(:form_for, record_or_name_or_array, *args, &proc)
       end
-  
-      def with_custom_field_error_proc(&block)
-        default_field_error_proc = ::ActionView::Base.field_error_proc
-        ::ActionView::Base.field_error_proc = FIELD_ERROR_PROC
-        yield
-      ensure
-        ::ActionView::Base.field_error_proc = default_field_error_proc
+
+      # @todo Documentation
+      def semantic_fields_for(record_or_name_or_array, *args, &proc)
+        form_helper_wrapper(:fields_for, record_or_name_or_array, *args, &proc)
       end
-  
+
+      # @todo Documentation
+      def semantic_remote_form_for(record_or_name_or_array, *args, &proc)
+        form_helper_wrapper(:remote_form_for, record_or_name_or_array, *args, &proc)
+      end
+      
+      # TODO WTF is this mess?
       def semantic_remote_form_for_wrapper(record_or_name_or_array, *args, &proc)
         options = args.extract_options!
         if respond_to? :remote_form_for
@@ -62,36 +64,51 @@ def semantic_remote_form_for_wrapper(record_or_name_or_array, *args, &proc)
           semantic_form_for(record_or_name_or_array, *(args << options), &proc)
         end
       end
-  
-      [:form_for, :fields_for, :remote_form_for].each do |meth|
-        module_eval <<-END_SRC, __FILE__, __LINE__ + 1
-          def semantic_#{meth}(record_or_name_or_array, *args, &proc)
-            options = args.extract_options!
-            options[:builder] ||= @@builder
-            options[:html] ||= {}
-            @@builder.custom_namespace = options[:namespace].to_s
-  
-            singularizer = defined?(ActiveModel::Naming.singular) ? ActiveModel::Naming.method(:singular) : ActionController::RecordIdentifier.method(:singular_class_name)
-  
-            class_names = options[:html][:class] ? options[:html][:class].split(" ") : []
-            class_names << @@default_form_class
-            class_names << case record_or_name_or_array
-              when String, Symbol then record_or_name_or_array.to_s                                  # :post => "post"
-              when Array then options[:as] || singularizer.call(record_or_name_or_array.last.class)  # [@post, @comment] # => "comment"
-              else options[:as] || singularizer.call(record_or_name_or_array.class)                  # @post => "post"
-            end
-            options[:html][:class] = class_names.join(" ")
-  
-            with_custom_field_error_proc do
-              #{meth}(record_or_name_or_array, *(args << options), &proc)
-            end
-          end
-        END_SRC
-      end
       alias :semantic_remote_form_for_real :semantic_remote_form_for
       alias :semantic_remote_form_for :semantic_remote_form_for_wrapper
       alias :semantic_form_remote_for :semantic_remote_form_for
+
+      protected
+      
+      def form_helper_wrapper(rails_helper_method_name, record_or_name_or_array, *args, &proc)
+        options = args.extract_options!
+        options[:builder] ||= @@builder
+        options[:html] ||= {}
+        @@builder.custom_namespace = options[:namespace].to_s
+
+        singularizer = defined?(ActiveModel::Naming.singular) ? ActiveModel::Naming.method(:singular) : ActionController::RecordIdentifier.method(:singular_class_name)
+
+        class_names = options[:html][:class] ? options[:html][:class].split(" ") : []
+        class_names << @@default_form_class
+        class_names << case record_or_name_or_array
+          when String, Symbol then record_or_name_or_array.to_s                                  # :post => "post"
+          when Array then options[:as] || singularizer.call(record_or_name_or_array.last.class)  # [@post, @comment] # => "comment"
+          else options[:as] || singularizer.call(record_or_name_or_array.class)                  # @post => "post"
+        end
+        options[:html][:class] = class_names.join(" ")
+
+        with_custom_field_error_proc do
+          self.send(rails_helper_method_name, record_or_name_or_array, *(args << options), &proc)
+        end
+      end
+    
+      # 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
+
+      def with_custom_field_error_proc(&block)
+        default_field_error_proc = ::ActionView::Base.field_error_proc
+        ::ActionView::Base.field_error_proc = FIELD_ERROR_PROC
+        yield
+      ensure
+        ::ActionView::Base.field_error_proc = default_field_error_proc
+      end
+
+
     end
   end
-  
 end
\ No newline at end of file

From 4d36cbf496dc551f95e5e78f41345fb18507fec2 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 15 Feb 2011 08:44:31 +1100
Subject: [PATCH 526/992] FormHelper documentation (semantic_form_for, etc)

---
 lib/formtastic/helpers/form_helper.rb | 169 +++++++++++++++++++++-----
 1 file changed, 138 insertions(+), 31 deletions(-)

diff --git a/lib/formtastic/helpers/form_helper.rb b/lib/formtastic/helpers/form_helper.rb
index 1e8f4c354..2c1e59b0a 100644
--- a/lib/formtastic/helpers/form_helper.rb
+++ b/lib/formtastic/helpers/form_helper.rb
@@ -1,60 +1,166 @@
 module Formtastic
   module Helpers
-    # Wrappers around form_for (etc) with :builder => Formtastic::FormBuilder.
+    
+    # FormHelper provides a handful of wrappers around Rails' built-in form helpers methods to set
+    # the `:builder` option to `Formtastic::FormBuilder` and apply some class names to the `<form>`
+    # tag.
+    #
+    # The following methods are wrapped:
     #
-    # * semantic_form_for(@post)
-    # * semantic_fields_for(@post)
-    # * semantic_form_remote_for(@post)
-    # * semantic_remote_form_for(@post)
+    # * `semantic_form_for` to `form_for`
+    # * `semantic_fields_for` to `fields_for`
+    # * `semantic_remote_form_for` and `semantic_form_remote_for` to `remote_form_for`
     #
-    # Each of which are the equivalent of:
+    # The following two examples are effectively equivalent:
     #
-    # * form_for(@post, :builder => Formtastic::FormBuilder))
-    # * fields_for(@post, :builder => Formtastic::FormBuilder))
-    # * form_remote_for(@post, :builder => Formtastic::FormBuilder))
-    # * remote_form_for(@post, :builder => Formtastic::FormBuilder))
+    #     <%= form_for(@post, :builder => Formtastic::FormBuilder, :class => 'formtastic post') do |f| %>
+    #       #...
+    #     <% end %>
     #
-    # Example Usage:
+    #     <%= semantic_form_for(@post) do |f| %>
+    #       #...
+    #     <% end %>
     #
-    #   <% semantic_form_for @post do |f| %>
-    #     <%= f.input :title %>
-    #     <%= f.input :body %>
-    #   <% end %>
+    # This simple wrapping means that all arguments, options and variations supported by Rails' own
+    # helpers are also supported by Formtastic.
     #
-    # 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, as are forms with
-    # inline objects (Post.new) rather than objects with instance variables (@post):
+    # Since `Formtastic::FormBuilder` subclasses Rails' own `FormBuilder`, you have access to all
+    # of Rails' built-in form helper methods such as `text_field`, `check_box`, `radio_button`, 
+    # etc **in addition to** all of Formtastic's additional helpers like {InputsHelper#inputs inputs}, 
+    # {InputsHelper#input input}, {ButtonsHelper#buttons buttons}, etc:
     #
-    #   <% semantic_form_for :post, @post, :url => posts_path do |f| %>
-    #     ...
-    #   <% end %>
+    #     <%= semantic_form_for(@post) do |f| %>
     #
-    #   <% semantic_form_for :post, Post.new, :url => posts_path do |f| %>
-    #     ...
-    #   <% end %>
+    #       <!-- Formtastic -->       
+    #       <%= f.input :title %>
     #
-    # @todo Documentation
+    #       <!-- Rails -->
+    #       <li class='something-custom'>
+    #         <%= f.label :title %>
+    #         <%= f.text_field :title %>
+    #         <p class='hints'>...</p>
+    #       </li>
+    #     <% end %>
+    #
+    # Formtastic is a superset of Rails' FormBuilder. It deliberately avoids overriding or modifying 
+    # the behavior of Rails' own form helpers so that you can use Formtastic helpers when suited, 
+    # and fall back to regular Rails helpers, ERB and HTML when needed. In other words, you're never
+    # fully committed to The Formtastic Way.
     module FormHelper
+      
+      # Allows the `:builder` option on `form_for` etc to be changed to your own which subclasses
+      # `Formtastic::FormBuilder`. Change this from `config/initializers/formtastic.rb`.
       @@builder = Formtastic::FormBuilder
+      mattr_accessor :builder
+      
+      # Allows the default class we add to all `<form>` tags to be changed from `formtastic` to 
+      # `whatever`. Change this from `config/initializers/formtastic.rb`.
       @@default_form_class = 'formtastic'
-      mattr_accessor :builder, :default_form_class
+      mattr_accessor :default_form_class
   
-      # @todo Documentation
+      # Wrapper around Rails' own `form_for` helper to set the `:builder` option to 
+      # `Formtastic::FormBuilder` and to set some class names on the `<form>` tag such as 
+      # `formtastic` and the downcased and underscored model name (eg `post`).
+      #
+      # See Rails' `form_for` for full documentation of all supported arguments and options.
+      #
+      # Since `Formtastic::FormBuilder` subclasses Rails' own FormBuilder, you have access to all
+      # of Rails' built-in form helper methods such as `text_field`, `check_box`, `radio_button`, 
+      # etc **in addition to** all of Formtastic's additional helpers like {InputsHelper#inputs inputs}, 
+      # {InputsHelper#input input}, {ButtonsHelper#buttons buttons}, etc.
+      #
+      # Most of the examples below have been adapted from the examples found in the Rails `form_for` 
+      # documentation.
+      #
+      # @see http://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html Rails' FormHelper documentation (`form_for`, etc)
+      # @see http://api.rubyonrails.org/classes/ActionView/Helpers/FormBuilder.html Rails' FormBuilder documentaion (`text_field`, etc)
+      # @see FormHelper The overview of the FormBuilder module
+      #
+      # @example Resource-oriented form generation
+      #   <%= semantic_form_for @user do |f| %>
+      #     <%= f.input :name %>
+      #     <%= f.input :email %>
+      #     <%= f.input :password %>
+      #   <% end %>
+      #
+      # @example Generic form generation
+      #   <%= semantic_form_for :user do |f| %>
+      #     <%= f.input :name %>
+      #     <%= f.input :email %>
+      #     <%= f.input :password %>
+      #   <% end %>
+      #
+      # @example Resource-oriented with custom URL
+      #   <%= semantic_form_for(@post, :url => super_post_path(@post)) do |f| %>
+      #     ...
+      #   <% end %>
+      #
+      # @example Resource-oriented with namespaced routes
+      #   <%= semantic_form_for([:admin, @post]) do |f| %>
+      #     ...
+      #   <% end %>
+      #
+      # @example Resource-oriented with nested routes
+      #   <%= semantic_form_for([@user, @post]) do |f| %>
+      #     ...
+      #   <% end %>
+      #
+      # @example Rename the resource
+      #   <%= semantic_form_for(@post, :as => :article) do |f| %>
+      #     ...
+      #   <% end %>
+      #
+      # @example Remote forms (unobtrusive JavaScript)
+      #   <%= semantic_form_for(@post, :remote => true) do |f| %>
+      #     ...
+      #   <% end %>
+      #
+      # @example Namespaced forms all multiple Formtastic forms to exist on the one page without DOM id clashes and invalid HTML documents.
+      #   <%= semantic_form_for(@post, :namespace => 'first') do |f| %>
+      #     ...
+      #   <% end %>
+      #
+      # @example Accessing a mixture of Formtastic helpers and Rails FormBuilder helpers.
+      #   <%= semantic_form_for(@post) do |f| %>
+      #     <%= f.input :title %>
+      #     <%= f.input :body %>
+      #     <li class="something-custom">
+      #       <label><%= f.check_box :published %></label>
+      #     </li>
+      #   <% end %>
+      #
+      # @param record_or_name_or_array
+      #   Same behavior as Rails' `form_for`
+      #
+      # @option *args [Hash] :html
+      #   Pass HTML attributes into the `<form>` tag. Same behavior as Rails' `form_for`, except we add in some of our own classes.
+      #
+      # @option *args [String, Hash] :url
+      #   A hash of URL components just like you pass into `link_to` or `url_for`, or a named route (eg `posts_path`). Same behavior as Rails' `form_for`.
+      #
+      # @option *args [String] :namespace
       def semantic_form_for(record_or_name_or_array, *args, &proc)
         form_helper_wrapper(:form_for, record_or_name_or_array, *args, &proc)
       end
 
-      # @todo Documentation
+      # Wrapper around Rails' own `fields_for` helper to set the `:builder` option to 
+      # `Formtastic::FormBuilder`.
+      #
+      # @see #semantic_form_for
       def semantic_fields_for(record_or_name_or_array, *args, &proc)
         form_helper_wrapper(:fields_for, record_or_name_or_array, *args, &proc)
       end
 
-      # @todo Documentation
+      # Wrapper around Rails' own `remote_form_for` helper to set the `:builder` option to 
+      # `Formtastic::FormBuilder` and to set some class names on the `<form>` tag such as 
+      # `formtastic` and the downcased and underscored model name.
+      #
+      # @see #semantic_form_for
+      # @todo why isn't YARD rendering this method?
       def semantic_remote_form_for(record_or_name_or_array, *args, &proc)
         form_helper_wrapper(:remote_form_for, record_or_name_or_array, *args, &proc)
       end
       
-      # TODO WTF is this mess?
       def semantic_remote_form_for_wrapper(record_or_name_or_array, *args, &proc)
         options = args.extract_options!
         if respond_to? :remote_form_for
@@ -70,6 +176,7 @@ def semantic_remote_form_for_wrapper(record_or_name_or_array, *args, &proc)
 
       protected
       
+      # @todo pretty sure some of this (like HTML classes and record naming are exlusive to `form_for`)
       def form_helper_wrapper(rails_helper_method_name, record_or_name_or_array, *args, &proc)
         options = args.extract_options!
         options[:builder] ||= @@builder
@@ -95,7 +202,7 @@ def form_helper_wrapper(rails_helper_method_name, record_or_name_or_array, *args
       # 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.
-      #
+      # @private
       FIELD_ERROR_PROC = proc do |html_tag, instance_tag|
         html_tag
       end

From 5b3fbfdbbaa0ac0a4066deed0bf8bb09d15eede4 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 15 Feb 2011 08:44:53 +1100
Subject: [PATCH 527/992] figured out why some @option tags weren't rendering
 in YARD

---
 lib/formtastic/helpers/buttons_helper.rb | 12 +++++-------
 lib/formtastic/helpers/inputs_helper.rb  |  6 +++---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/formtastic/helpers/buttons_helper.rb b/lib/formtastic/helpers/buttons_helper.rb
index 0c0ab2715..5cc03f163 100644
--- a/lib/formtastic/helpers/buttons_helper.rb
+++ b/lib/formtastic/helpers/buttons_helper.rb
@@ -160,14 +160,13 @@ module ButtonsHelper
       #       <% end %>
       #     <% end %>
       #
-      # @option args :label [String, Symbol]
+      # @option *args :label [String, Symbol]
       #   Optionally specify text for the legend of the fieldset
       #
-      # @option args :name [String, Symbol]
+      # @option *args :name [String, Symbol]
       #   Optionally specify text for the legend of the fieldset (alias for `:label`)
       #
       # @todo document i18n keys
-      # @todo YARD @option tags aren't rendering
       def buttons(*args, &block)
         html_options = args.extract_options!
         html_options[:class] ||= "buttons"
@@ -227,18 +226,17 @@ def buttons(*args, &block)
       #   <%= f.commit_button :label => "Go", :button_html => { :class => 'special', :id => 'whatever' } %>
       #   <%= f.commit_button "Go", :button_html => { :class => 'special', :id => 'whatever' } %>
       #
-      # @option args :label [String, Symbol]  
+      # @option *args :label [String, Symbol]  
       #   Override the label text with a String or a symbold for an i18n translation key
       #
-      # @option args :button_html [Hash]  
+      # @option *args :button_html [Hash]  
       #   Override or add to the HTML attributes to be passed down to the `<input>` tag
       #
-      # @option args :wrapper_html [Hash] 
+      # @option *args :wrapper_html [Hash] 
       #   Override or add to the HTML attributes to be passed down to the wrapping `<li>` tag
       #
       # @todo document i18n keys
       # @todo strange that `:accesskey` seems to be supported in the top level args as well as `:button_html`
-      # @todo YARD @option tags aren't rendering
       def commit_button(*args)
         options = args.extract_options!
         text = options.delete(:label) || args.shift
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index c10d5b202..ce79af2db 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -371,13 +371,13 @@ def input(method, options = {})
       # attributes (id, class, style, etc).
       #
       #
-      # @option args :for [Symbol, ActiveModel, Array]
+      # @option *args :for [Symbol, ActiveModel, Array]
       #   The contents of this option is passed down to Rails' fields_for() helper, so it accepts the same values.
       #
-      # @option args :name [String] 
+      # @option *args :name [String] 
       #   The optional name passed into the `<legend>` tag within the fieldset (alias of `:title`)
       #
-      # @option args :title [String] 
+      # @option *args :title [String] 
       #   The optional name passed into the `<legend>` tag within the fieldset (alias of `:name`)
       #
       #

From 814490fc910f8936f9705f4447a6386fa995f862 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 15 Feb 2011 17:34:48 +1100
Subject: [PATCH 528/992] LabelHelper documentation

---
 lib/formtastic/helpers/label_helper.rb | 61 ++++++++++++++++++++------
 1 file changed, 48 insertions(+), 13 deletions(-)

diff --git a/lib/formtastic/helpers/label_helper.rb b/lib/formtastic/helpers/label_helper.rb
index d7da0ccc6..4c1c96282 100644
--- a/lib/formtastic/helpers/label_helper.rb
+++ b/lib/formtastic/helpers/label_helper.rb
@@ -5,25 +5,60 @@ module Helpers
     module LabelHelper
       include Formtastic::LocalizedString
       
-      # 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:
+      # Generates the label for the input. It's a superset of the functionality of Rails' own `label`
+      # helper, meaning that it accepts the same arguments and options, plus some new arguments that
+      # are exclusive to Formtastic.
       #
-      # * :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's unlikely you will need call this method direct from your views, but it's been made 
+      # public to document the changes made to the Rails method, for the rare occasions when you 
+      # might build your own input in the view using regular form helpers.
       #
-      # == Examples
+      # @param [Symbol] method
+      #   The method or attribute on the model this label is for (eg `:title` on a `Post`)
       #
-      #  f.label :title # like in rails, except that it searches the label on I18n API too
+      # @param [String, Hash] options_or_text
+      #   A string for the text to appear as the content of the `<label>` tag, or a Hash of options (see below)
       #
-      #  f.label :title, "Your post title"
-      #  f.label :title, :label => "Your post title" # Added for formtastic API
+      # @param [Hash] options
+      #   A Hash of options (see below)
       #
-      #  f.label :title, :required => true # Returns <label>Title<abbr title="required">*</abbr></label>
+      # @option options [String] :label
+      #   Override the text for the contents of the `<label>` tag
       #
+      # @option options [true, false] :required
+      #   Specify if the field required or not. By default this value is "guessed" by reflecting on 
+      #   the model validations, with a fallback to `all_fields_required_by_default` configuration. 
+      #   Required and optional labels have the `required_string` (defaults to an asterix wrapped 
+      #   in an `<abbr>` tag) or `optional_string` configuration variables appended to them.
+      #
+      # @option options [Symbol] :input_name
+      #   Gives the input to match for. This is needed when you want to call `f.label :authors` but 
+      #   it should match `:author_ids`.
+      #
+      #
+      # @example Basic usage, just like Rails (except that it searches i18n for the label text too)
+      #   <%= semantic_form_for @post do |f| %>
+      #     <%= f.label :title %>
+      #   <% end %>
+      #
+      # @example Basic usage with string for label text, just like Rails
+      #   <%= semantic_form_for @post do |f| %>
+      #     <%= f.label :title, "Your title" %>
+      #   <% end %>
+      #
+      # @example Alternative for label text using `:label` option to match the rest of the Formtastic API
+      #   <%= semantic_form_for @post do |f| %>
+      #     <%= f.label :title, :label => "Your title" %>
+      #   <% end %>
+      #
+      # @example Mark the label as required or not, regardless of DB, validations and default config.
+      #   <%= semantic_form_for @post do |f| %>
+      #     <%= f.label :title, :required => true %>
+      #     <%= f.label :body, :required => false %>
+      #   <% end %>
+      #
+      #
+      # @todo i18n documentation
       def label(method, options_or_text=nil, options=nil)
         if options_or_text.is_a?(Hash)
           return "" if options_or_text[:label] == false

From c74ff62ceaa5a0936d69cb53d48348bba7218c4f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 15 Feb 2011 17:34:54 +1100
Subject: [PATCH 529/992] rm a TODO

---
 lib/formtastic/helpers/inputs_helper.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index ce79af2db..d14af10a1 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -480,8 +480,6 @@ def input(method, options = {})
       #       </li>
       #     <% end %>
       #   <% end %>
-      #
-      # @todo args are not being rendered in YARD documentation
       def inputs(*args, &block)
         title = field_set_title_from_args(*args)
         html_options = args.extract_options!

From 0500a1a11f36080d626aa96fd8f2f95395771f9b Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 16 Feb 2011 07:40:48 +1100
Subject: [PATCH 530/992] documented BooleanInput

---
 lib/formtastic/inputs/boolean_input.rb | 32 +++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic/inputs/boolean_input.rb b/lib/formtastic/inputs/boolean_input.rb
index 23c9b02b8..73d683aa9 100644
--- a/lib/formtastic/inputs/boolean_input.rb
+++ b/lib/formtastic/inputs/boolean_input.rb
@@ -2,12 +2,38 @@
 
 module Formtastic
   module Inputs
+    # Boolean inputs are used to render an input for a single checkbox, typically for attributes
+    # with a simple yes/no or true/false value. Boolean inputs are used by default for boolean
+    # database columns.
+    #
+    # @example Full form context and markup
+    #   <%= semantic_form_for @post %>
+    #     <%= f.inputs do %>
+    #       <%= f.input :published, :as => :boolean %>
+    #     <% end %>
+    #   <% end %>
+    #   
+    #   <form...>
+    #     <fieldset>
+    #       <ol>
+    #         <li class="boolean" id="post_published_input">
+    #           <input type="hidden" name="post[published]" id="post_published" value="0">
+    #           <label for="post_published">
+    #             <input type="checkbox" name="post[published]" id="post_published" value="1">
+    #             Published?
+    #           </label>
+    #         </li>
+    #       </ol>
+    #     </fieldset>
+    #   </form>
+    #
+    # @example Set the values for the checked and unchecked states
+    #   <%= f.input :published, :checked_value => "yes", :unchecked_value => "no" %> 
+    #
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     module BooleanInput
       include Formtastic::Inputs::Base
       
-      # 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) || {}
         checked_value = options.delete(:checked_value) || '1'

From 276a0e2beee9db21ab39b4c439ac0a8d8e4ea89c Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 16 Feb 2011 21:21:20 +1100
Subject: [PATCH 531/992] documentation for CheckBoxesInput

---
 lib/formtastic/inputs/check_boxes_input.rb | 140 ++++++++++-----------
 1 file changed, 66 insertions(+), 74 deletions(-)

diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index bed9b8eda..269b5b1cf 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -2,82 +2,74 @@
 
 module Formtastic
   module Inputs
+    # Boolean inputs are used to render a series of checkboxes. This is an alternative input choice 
+    # for `has_many` or `has_and_belongs_to_many` associations like a `Post` belonging to many 
+    # `categories` (by default, a {SelectInput `:select`} input is used, allowing multiple selections).
+    #
+    # Within the standard `<li>` wrapper, the output is a `<fieldset>` with a `<legend>` to
+    # represent the "label" for the input, and an `<ol>` containing `<li>`s for each choice in 
+    # the association. Each `<li>` choice contains a hidden `<input>` tag for the "unchecked"
+    # value (like Rails), and a `<label>` containing the checkbox `<input>` and the label text 
+    # for each choice.
+    #
+    # @example Basic example with full form context
+    #
+    #   <%= semantic_form_for @post do |f| %>
+    #     <%= f.inputs do %>
+    #       <%= f.input :categories, :as => :check_boxes %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   <li class='check_boxes'>
+    #     <fieldset>
+    #       <legend class="label"><label>Categories</label></legend>
+    #       <ol>
+    #         <li>
+    #           <input type="hidden" name="post[category_ids][1]" value="">
+    #           <label for="post_category_ids_1"><input id="post_category_ids_1" name="post[category_ids][1]" type="checkbox" value="1" /> Ruby</label>
+    #         </li>
+    #         <li>
+    #           <input type="hidden" name="post[category_ids][2]" value="">
+    #           <label for="post_category_ids_2"><input id="post_category_ids_2" name="post[category_ids][2]" type="checkbox" value="2" /> Rails</label>
+    #         </li>
+    #       </ol>
+    #     </fieldset>
+    #   </li>
+    #
+    # @example `:collection` can be used to customize the choices
+    #   <%= f.input :categories, :as => :check_boxes, :collection => @categories %>
+    #   <%= f.input :categories, :as => :check_boxes, :collection => Category.all %>
+    #   <%= f.input :categories, :as => :check_boxes, :collection => Category.some_named_scope %>
+    #   <%= f.input :categories, :as => :check_boxes, :collection => [Category.find_by_name("Ruby"), Category.find_by_name("Rails")] %>
+    #   <%= f.input :categories, :as => :check_boxes, :collection => ["Ruby", "Rails"] %>
+    #   <%= f.input :categories, :as => :check_boxes, :collection => [["Ruby", "ruby"], ["Rails", "rails"]] %>
+    #   <%= f.input :categories, :as => :check_boxes, :collection => [["Ruby", "1"], ["Rails", "2"]] %>
+    #   <%= f.input :categories, :as => :check_boxes, :collection => [["Ruby", 1], ["Rails", 2]] %>
+    #   <%= f.input :categories, :as => :check_boxes, :collection => 1..5 %>
+    #
+    # @example `:hidden_fields` can be used to skip Rails' rendering of a hidden field before every checkbox
+    #   <%= f.input :categories, :as => :check_boxes, :hidden_fields => false %>
+    #
+    # @example `:disabled` can be used to disable any checkboxes with a value found in the given Array
+    #   <%= f.input :categories, :as => :check_boxes, :collection => ["a", "b"], :disabled => ["a"] %>
+    # 
+    # @example `:label_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the label text (it'll try the methods like `to_s` in `collection_label_methods` config by default)
+    #   <%= f.input :categories, :as => :check_boxes, :label_method => :name %>
+    #   <%= f.input :categories, :as => :check_boxes, :label_method => :name_with_post_count
+    #   <%= f.input :categories, :as => :check_boxes, :label_method => Proc.new { |c| "#{c.name} (#{pluralize("post", c.posts.count)})" }
+    # 
+    # @example `:value_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the value for each checkbox (it'll try the methods like `id` in `collection_value_methods` config by default)
+    #   <%= f.input :categories, :as => :check_boxes, :value_method => :code %>
+    #   <%= f.input :categories, :as => :check_boxes, :value_method => :isbn
+    #   <%= f.input :categories, :as => :check_boxes, :value_method => Proc.new { |c| c.name.downcase.underscore }
+    # 
+    # @example `:value_as_class` can be used to add a class to the `<li>` wrapped around each choice using the checkbox value for custom styling of each choice
+    #   <%= f.input :categories, :as => :check_boxes, :value_as_class => true %>
+    #
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     module CheckBoxesInput
       include Formtastic::Inputs::Base
       
-      # 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 all on
-      # it (Author.all in the example above).
-      #
-      # Examples:
-      #
-      #   f.input :author, :as => :check_boxes, :collection => @authors
-      #   f.input :author, :as => :check_boxes, :collection => Author.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}" }
-      #
-      # Formtastic works around a bug in rails handling of check box collections by
-      # not generating the hidden fields for state checking of the checkboxes
-      # The :hidden_fields option provides a way to re-enable these hidden inputs by
-      # setting it to true.
-      #
-      #   f.input :authors, :as => :check_boxes, :hidden_fields => false
-      #   f.input :authors, :as => :check_boxes, :hidden_fields => true
-      #
-      # 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) || {}
@@ -144,7 +136,7 @@ def create_hidden_field_for_check_boxes(method, value_as_class) #:nodoc:
         template.hidden_field_tag(input_name, '', options)
       end
   
-      # Outputs a checkbox tag. If called with no_hidden_input = true a plain check_box_tag is returned,
+      # Outputs a checkbox tag. If called with hidden_fields = true a plain check_box_tag is returned,
       # otherwise the helper uses the output generated by the rails check_box method.
       def create_check_boxes(input_name, html_options = {}, checked_value = "1", unchecked_value = "0", hidden_fields = false) #:nodoc:
         return template.check_box_tag(input_name, checked_value, html_options[:checked], html_options) unless hidden_fields == true

From 59d3f75a84f41bda6667e6ada634e32827761c55 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 21 Feb 2011 07:52:54 +1100
Subject: [PATCH 532/992] documented CountryInput

---
 lib/formtastic/inputs/country_input.rb | 50 +++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/lib/formtastic/inputs/country_input.rb b/lib/formtastic/inputs/country_input.rb
index 46e3d5420..c38bc0ca5 100644
--- a/lib/formtastic/inputs/country_input.rb
+++ b/lib/formtastic/inputs/country_input.rb
@@ -6,19 +6,51 @@ module CountryInput
       include Formtastic::Inputs::Base
       
       # 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.
+      # Rails doesn't come with a `country_select` helper by default any more, so you'll need to do 
+      # one of the following:
+      # 
+      # * install [the official Rails plugin](http://github.com/rails/iso-3166-country-select)
+      # * install any other country_select plugin that behaves in a similar way
+      # * roll your own `country_select` helper with the same args and options as the Rails one
       #
-      # 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 can be set in the `priority_countries` configuration array in the 
+      # formtastic.rb initializer to suit your market and user base (see README for more info on 
+      # configuration). Additionally, it is possible to set the :priority_countries on a per-input 
+      # basis through the `:priority_countries` option. These priority countries will be passed down
+      # to the `country_select` helper of your choice, and may or may not be used by the helper.
       #
-      # 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).
+      # @example Basic example with full form context using `priority_countries` from config
       #
-      # Examples:
-      #   f.input :location, :as => :country # use Formtastic::FormBuilder.priority_countries array for the priority countries
-      #   f.input :location, :as => :country, :priority_countries => /Australia/ # set your own
+      #   <%= semantic_form_for @user do |f| %>
+      #     <%= f.inputs do %>
+      #       <%= f.input :nationality, :as => :country %>
+      #     <% end %>
+      #   <% end %>
       #
+      #   <li class='country'>
+      #     <label for="user_nationality">Country</label>
+      #     <select id="user_nationality" name="user[nationality]">
+      #       <option value="...">...</option>
+      #       # ...
+      #   </li>
+      #
+      # @example `:priority_countries` set on a specific input
+      #
+      #   <%= semantic_form_for @user do |f| %>
+      #     <%= f.inputs do %>
+      #       <%= f.input :nationality, :as => :country, :priority_countries => ["Australia", "New Zealand"] %>
+      #     <% end %>
+      #   <% end %>
+      #
+      #   <li class='country'>
+      #     <label for="user_nationality">Country</label>
+      #     <select id="user_nationality" name="user[nationality]">
+      #       <option value="...">...</option>
+      #       # ...
+      #   </li>
+      #
+      # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
       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 respond_to?(:country_select)
   

From 92c7d523b6cf1c9757df89d901c25de867cb0a09 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 22 Feb 2011 07:48:03 +1100
Subject: [PATCH 533/992] move docs around

---
 lib/formtastic/inputs/country_input.rb | 92 +++++++++++++-------------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/lib/formtastic/inputs/country_input.rb b/lib/formtastic/inputs/country_input.rb
index c38bc0ca5..32c494e24 100644
--- a/lib/formtastic/inputs/country_input.rb
+++ b/lib/formtastic/inputs/country_input.rb
@@ -2,55 +2,55 @@
 
 module Formtastic
   module Inputs
+    # 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 do 
+    # one of the following:
+    # 
+    # * install [the official Rails plugin](http://github.com/rails/iso-3166-country-select)
+    # * install any other country_select plugin that behaves in a similar way
+    # * roll your own `country_select` helper with the same args and options as the Rails one
+    #
+    # By default, Formtastic includes a handfull of English-speaking countries as "priority 
+    # counties", which can be set in the `priority_countries` configuration array in the 
+    # formtastic.rb initializer to suit your market and user base (see README for more info on 
+    # configuration). Additionally, it is possible to set the :priority_countries on a per-input 
+    # basis through the `:priority_countries` option. These priority countries will be passed down
+    # to the `country_select` helper of your choice, and may or may not be used by the helper.
+    #
+    # @example Basic example with full form context using `priority_countries` from config
+    #
+    #   <%= semantic_form_for @user do |f| %>
+    #     <%= f.inputs do %>
+    #       <%= f.input :nationality, :as => :country %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   <li class='country'>
+    #     <label for="user_nationality">Country</label>
+    #     <select id="user_nationality" name="user[nationality]">
+    #       <option value="...">...</option>
+    #       # ...
+    #   </li>
+    #
+    # @example `:priority_countries` set on a specific input
+    #
+    #   <%= semantic_form_for @user do |f| %>
+    #     <%= f.inputs do %>
+    #       <%= f.input :nationality, :as => :country, :priority_countries => ["Australia", "New Zealand"] %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   <li class='country'>
+    #     <label for="user_nationality">Country</label>
+    #     <select id="user_nationality" name="user[nationality]">
+    #       <option value="...">...</option>
+    #       # ...
+    #   </li>
+    #
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     module CountryInput
       include Formtastic::Inputs::Base
       
-      # 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 do 
-      # one of the following:
-      # 
-      # * install [the official Rails plugin](http://github.com/rails/iso-3166-country-select)
-      # * install any other country_select plugin that behaves in a similar way
-      # * roll your own `country_select` helper with the same args and options as the Rails one
-      #
-      # By default, Formtastic includes a handfull of English-speaking countries as "priority 
-      # counties", which can be set in the `priority_countries` configuration array in the 
-      # formtastic.rb initializer to suit your market and user base (see README for more info on 
-      # configuration). Additionally, it is possible to set the :priority_countries on a per-input 
-      # basis through the `:priority_countries` option. These priority countries will be passed down
-      # to the `country_select` helper of your choice, and may or may not be used by the helper.
-      #
-      # @example Basic example with full form context using `priority_countries` from config
-      #
-      #   <%= semantic_form_for @user do |f| %>
-      #     <%= f.inputs do %>
-      #       <%= f.input :nationality, :as => :country %>
-      #     <% end %>
-      #   <% end %>
-      #
-      #   <li class='country'>
-      #     <label for="user_nationality">Country</label>
-      #     <select id="user_nationality" name="user[nationality]">
-      #       <option value="...">...</option>
-      #       # ...
-      #   </li>
-      #
-      # @example `:priority_countries` set on a specific input
-      #
-      #   <%= semantic_form_for @user do |f| %>
-      #     <%= f.inputs do %>
-      #       <%= f.input :nationality, :as => :country, :priority_countries => ["Australia", "New Zealand"] %>
-      #     <% end %>
-      #   <% end %>
-      #
-      #   <li class='country'>
-      #     <label for="user_nationality">Country</label>
-      #     <select id="user_nationality" name="user[nationality]">
-      #       <option value="...">...</option>
-      #       # ...
-      #   </li>
-      #
-      # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
       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 respond_to?(:country_select)
   

From 20aa457f925b665139249e51b1fdaf652f12cff0 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 22 Feb 2011 07:48:27 +1100
Subject: [PATCH 534/992] documented Timeish, DateInput, TimeInput,
 DateTimeInput

---
 lib/formtastic/inputs/date_input.rb     |  10 +-
 lib/formtastic/inputs/datetime_input.rb |  10 +-
 lib/formtastic/inputs/time_input.rb     |   9 +-
 lib/formtastic/inputs/timeish.rb        | 195 ++++++++++++++++++------
 4 files changed, 155 insertions(+), 69 deletions(-)

diff --git a/lib/formtastic/inputs/date_input.rb b/lib/formtastic/inputs/date_input.rb
index b281de9ae..bfc77c64e 100644
--- a/lib/formtastic/inputs/date_input.rb
+++ b/lib/formtastic/inputs/date_input.rb
@@ -3,18 +3,10 @@
 
 module Formtastic
   module Inputs
+    # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
     module DateInput
       include Formtastic::Inputs::Base
       include Formtastic::Inputs::Timeish
-      
-      # 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. Overwriting the label is possible by adding the :labels option.
-      # :labels should be a hash with the field (e.g. day) as key and the label text as value.
-      # See date_or_datetime_input for a more detailed output example.
-      #
-      # Some of Rails' options for select_date are supported, but not everything yet, see
-      # documentation of date_or_datetime_input() for more information.
       def date_input(method, options)
         options = set_include_blank(options)
         date_or_datetime_input(method, options.merge(:discard_hour => true))
diff --git a/lib/formtastic/inputs/datetime_input.rb b/lib/formtastic/inputs/datetime_input.rb
index 5845b0b10..8ee30ee12 100644
--- a/lib/formtastic/inputs/datetime_input.rb
+++ b/lib/formtastic/inputs/datetime_input.rb
@@ -3,18 +3,10 @@
 
 module Formtastic
   module Inputs
+    # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
     module DatetimeInput
       include Formtastic::Inputs::Base
       include Formtastic::Inputs::Timeish
-      
-      # 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. Overwriting the label is possible by adding
-      # the :labels option. :labels should be a hash with the field (e.g. day) as key and the label
-      # text as value.  See date_or_datetime_input for a more detailed output example.
-      #
-      # Some of Rails' options for select_date are supported, but not everything yet, see
-      # documentation of date_or_datetime_input() for more information.
       def datetime_input(method, options)
         options = set_include_blank(options)
         date_or_datetime_input(method, options)
diff --git a/lib/formtastic/inputs/time_input.rb b/lib/formtastic/inputs/time_input.rb
index 269ca8fda..dd90209db 100644
--- a/lib/formtastic/inputs/time_input.rb
+++ b/lib/formtastic/inputs/time_input.rb
@@ -2,16 +2,9 @@
 
 module Formtastic
   module Inputs
+    # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
     module TimeInput
       include Formtastic::Inputs::Timeish
-      # 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. Overwriting the label is possible by adding the :labels option.
-      # :labels should be a hash with the field (e.g. day) as key and the label text as value.
-      # See date_or_datetime_input for a more detailed output example.
-      #
-      # Some of Rails' options for select_time are supported, but not everything yet, see
-      # documentation of date_or_datetime_input() for more information.
       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))
diff --git a/lib/formtastic/inputs/timeish.rb b/lib/formtastic/inputs/timeish.rb
index 879303ece..e51274156 100644
--- a/lib/formtastic/inputs/timeish.rb
+++ b/lib/formtastic/inputs/timeish.rb
@@ -1,50 +1,158 @@
 module Formtastic
   module Inputs
-    # @private
+
+    # Outputs a complex input consisting of multiple select boxes for each fragment of a date 
+    # (year, month, day), time (hour, min, sec) or date time (year, month, day, hour, min, sec).
+    #
+    # The output of this helper **looks** quite similar to Rails' own `date_select`, 
+    # `date_time_select` and `time_select` helpers in the browser, but under the hood the HTML 
+    # produced is quite different, trying to address many issues with the Rails helper's HTML 
+    # validity, semantics and accessibility.
+    #
+    # By default, Rails will return a series of `<select>` tags without a corresponding `<label>`
+    # for each. Formtastic chooses to rendering these date fragments much like it does each form
+    # input by wrapping each in an `<li>` with a `<label>` and a `<select>` in each.
+    #
+    # The `<li>` date fragments are wrapped in an `<ol>` and a `<fieldset>` to indicate that the
+    # fragments are part of a set of fields that should be grouped together.
+    #
+    # The `<fieldset>` is then "labeled" with a `<legend>` tag that describes the set with the 
+    # same string that would normally be used for the `<label>` on a simpler input. The result
+    # is something like this:
+    #
+    #     <li class="date">
+    #       <fieldset>
+    #         <legend class="label">Publish 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>
+    #     </li>
+    #
+    # This obviously would look quite different in a browser to what Rails does, but this is
+    # addressed in the presentation layer with formtastic.css instead:
+    #
+    # * the `<li>` date fragments are floated left against each other so they appear all on one 
+    #   line next to each other
+    # * the `<label>` tags for each fragment are hidden with `display:none`
+    # * the <legend> is positioned and styled to look like a regular `<label>` on simpler inputs
+    #   found elsewhere in the form (to the left of the select tags)
+    # * the `<ol>` is positioned and styled to appear where the `<input>` would usually be on 
+    #   simpler inputs found elsewhere in the form (the the right of the label), as a container
+    #   for the floated `<li>` fragments
+    #
+    # The intent is to support many of Rails' built-in date helper arguments and options, and 
+    # to post the same form data to your controllers.
+    #
+    # @example Basic `:date` example with full form context and output
+    # 
+    #   <%= semantic_form_for(@post) do |f| %>
+    #     <%= f.inputs do %>
+    #       <%= f.input :publish_at, :as => :date %>
+    #     <% end %>
+    #   <% end %<
+    #
+    #   <form ...>
+    #     <fieldset>
+    #       <ol>
+    #         <li class="date">
+    #           <fieldset>
+    #             <legend class="label">Publish 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>
+    #         </li>
+    #       </ol>
+    #     </fieldset>
+    #   </form>
+    #
+    # @example Render as a `:date` (default for `:date` database column types)
+    #   <%= f.input :publish_at, :as => :date %>
+    #
+    # @example Render as a `:datetime` input (default for `:datetime` and `:timestamp` database column types)
+    #   <%= f.input :publish_at, :as => :datetime %>
+    #
+    # @example Render as a `:time` input (default for `:time` database column types)
+    #   <%= f.input :publish_at, :as => :time %>
+    #
+    # @example Re-order the date fragments with `:order`
+    #   <%= f.input :publish_at, :as => :date, :order => [:day, :month, :year] %>
+    #   <%= f.input :publish_at, :as => :datetime, :order => [:hour, :min, :day, :month, :year] %>
+    #
+    # @example Render the (discarded by default) seconds fragment with `:include_seconds` (`:time`, `:datetime` only)
+    #   <%= f.input :publish_at, :as => :datetime, :include_seconds => true %>
+    #
+    # @example `:discard_(year|month|day|hour|minute)` can be set to true to exclude those fragments (Rails will default them)
+    #   <%= f.input :publish_at, :as => :datetime, :discard_minute => true %>
+    #   <%= f.input :publish_at, :as => :date, :discard_day => true %>
+    #
+    # @example Render a blank option at the top of each fragment's select to force the user to make a choice
+    #   <%= f.input :publish_at, :as => :datetime, :include_blank => true %>
+    #
+    # @example Change the labels used for each fragment
+    #   <%= f.input :publish_at, :as => :datetime, :labels => { :year => "The Year" } %>
+    #
+    # @example Disale the labels used for each fragment
+    #   <%= f.input :publish_at, :as => :datetime, :labels => { :year => "", :month => "", :day => "" } %>
+    #
+    # @todo `:labels` could be killed and replaced with i18n
+    # @todo is there i18n for `:labels` already?
+    # @todo is there `:prompt`?
+    # @todo is there any other i18n to document?
+    #
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     module Timeish
-      # Helper method used by :as => (:date|:datetime|:time).  Generates a fieldset containing a
-      # legend (for what would normally be considered the label), and an ordered list of list items
-      # for year, month, day, hour, etc, each containing a label and a select.  Example:
-      #
-      # <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>
+      # Helper method used by :as => (:date|:datetime|:time).
       #
       # This is an absolute abomination, but so is the official Rails select_date().
-      #
-      # Options:
-      #
-      #   * @:order => [:month, :day, :year]@
-      #   * @:include_seconds@ => true@
-      #   * @:discard_(year|month|day|hour|minute) => true@
-      #   * @:include_blank => true@
-      #   * @:labels => {}@
+      # @private
       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])
@@ -90,7 +198,8 @@ def date_or_datetime_input(method, options)
       
       # 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:
+      # @private
+      def field_set_and_list_wrapping_for_method(method, options, contents)
         contents = contents.join if contents.respond_to?(:join)
   
         template.content_tag(:fieldset,

From a11ea855b9299bf5d3e8e5e8c0112c6dc32c782a Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 23 Feb 2011 07:11:21 +1100
Subject: [PATCH 535/992] documented EmailInput

---
 lib/formtastic/inputs/email_input.rb | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/email_input.rb b/lib/formtastic/inputs/email_input.rb
index e9f51caf0..5fab66354 100644
--- a/lib/formtastic/inputs/email_input.rb
+++ b/lib/formtastic/inputs/email_input.rb
@@ -3,11 +3,35 @@
 
 module Formtastic
   module Inputs
+    
+    # Outputs a simple `<label>` with a HTML5 `<input type="email">` wrapped in the standard
+    # `<li>` wrapper. This is the default input choice for attributes with a name matching 
+    # `/email/`, but can be applied to any text-like input with `:as => :email`.
+    #
+    # @example Full form context and output
+    # 
+    #   <%= semantic_form_for(@user) do |f| %>
+    #     <%= f.inputs do %>
+    #       <%= f.input :email_address, :as => :email %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   <form...>
+    #     <fieldset>
+    #       <ol>
+    #         <li class="email">
+    #           <label for="user_email_address">Email address</label>
+    #           <input type="email" id="user_email_address" name="user[email_address]">
+    #         </li>
+    #       </ol>
+    #     </fieldset>
+    #   </form>
+    #
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     module EmailInput
       include Formtastic::Inputs::Base
       include Formtastic::Inputs::Basic
       
-      # Outputs a label and a standard Rails email field inside the wrapper.
       def email_input(method, options)
         basic_input_helper(:email_field, :email, method, options)
       end

From f81fdd15ab71b2ea2640009746fd1ebf94678eda Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 23 Feb 2011 07:11:31 +1100
Subject: [PATCH 536/992] documented FileInput

---
 lib/formtastic/inputs/file_input.rb | 30 ++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/file_input.rb b/lib/formtastic/inputs/file_input.rb
index 2197eda49..be8c660ef 100644
--- a/lib/formtastic/inputs/file_input.rb
+++ b/lib/formtastic/inputs/file_input.rb
@@ -3,11 +3,39 @@
 
 module Formtastic
   module Inputs
+    
+    # Outputs a simple `<label>` with a `<input type="file">` wrapped in the standard
+    # `<li>` wrapper. This is the default input choice for objects with attributes that appear
+    # to be for file uploads, by detecting some common method names used by popular file upload
+    # libraries such as Paperclip and CarrierWave. You can add to or alter these method names 
+    # through the `file_methods` config, but can be applied to any input with `:as => :file`.
+    #
+    # Don't forget to set the multipart attribute in your `<form>` tag!
+    #
+    # @example Full form context and output
+    # 
+    #   <%= semantic_form_for(@user, :html => { :multipart => true }) do |f| %>
+    #     <%= f.inputs do %>
+    #       <%= f.input :email_address, :as => :email %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   <form...>
+    #     <fieldset>
+    #       <ol>
+    #         <li class="email">
+    #           <label for="user_email_address">Email address</label>
+    #           <input type="email" id="user_email_address" name="user[email_address]">
+    #         </li>
+    #       </ol>
+    #     </fieldset>
+    #   </form>
+    #
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     module FileInput
       include Formtastic::Inputs::Base
       include Formtastic::Inputs::Basic
       
-      # 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

From e4cc59927fdc72a7ebe3f0bdfeee741576a504de Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 23 Feb 2011 07:11:48 +1100
Subject: [PATCH 537/992] documented HiddenInput

---
 lib/formtastic/inputs/hidden_input.rb | 33 +++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/lib/formtastic/inputs/hidden_input.rb b/lib/formtastic/inputs/hidden_input.rb
index 4aa94f761..0385ba1cc 100644
--- a/lib/formtastic/inputs/hidden_input.rb
+++ b/lib/formtastic/inputs/hidden_input.rb
@@ -1,13 +1,36 @@
 module Formtastic
   module Inputs
+    
+    # Outputs a simple `<input type="hidden">` wrapped in the standard `<li>` wrapper. This is
+    # provided for situations where a hidden field needs to be rendered in the flow of a form with
+    # many inputs that form an `<ol>`. Wrapping the hidden input inside the `<li>` maintains the 
+    # HTML validity. The `<li>` is marked with a `class` of `hidden` so that stylesheet authors can
+    # hide these list items with CSS (formtastic.css does this out of the box).
+    # 
+    # @example Full form context, output and CSS
+    # 
+    #   <%= semantic_form_for(@something) do |f| %>
+    #     <%= f.inputs do %>
+    #       <%= f.input :secret, :as => :hidden %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   <form...>
+    #     <fieldset>
+    #       <ol>
+    #         <li class="hidden">
+    #           <input type="hidden" id="something_secret" name="something[secret]">
+    #         </li>
+    #       </ol>
+    #     </fieldset>
+    #   </form>
+    #
+    #   form.formtastic li.hidden { display:none; }
+    #
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     module HiddenInput
       include Formtastic::Inputs::Base
       
-      # Outputs a hidden field inside the wrapper, which should be hidden with CSS.
-      # Additionals options can be given using :input_hml. Should :input_html not be
-      # specified every option except for formtastic options will be sent straight
-      # to hidden input element.
-      #
       def hidden_input(method, options)
         options ||= {}
         html_options = options.delete(:input_html) || strip_formtastic_options(options)

From 80134ac17739db26123b1bb8a5481fb751601017 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 23 Feb 2011 07:17:02 +1100
Subject: [PATCH 538/992] documented NumericInput

---
 lib/formtastic/inputs/numeric_input.rb | 30 +++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/numeric_input.rb b/lib/formtastic/inputs/numeric_input.rb
index 847eb0169..2003f4da6 100644
--- a/lib/formtastic/inputs/numeric_input.rb
+++ b/lib/formtastic/inputs/numeric_input.rb
@@ -2,11 +2,39 @@
 
 module Formtastic
   module Inputs
+    
+    # Outputs a simple `<label>` with a HTML5 `<input type="number">` wrapped in the standard
+    # `<li>` wrapper. This is the default input choice for all database columns of the type `:float`
+    # and `:decimal`, as well as `:integer` columns that aren't used for `belongs_to` associations`, 
+    # but can be applied to any text-like input with `:as => :numeric`.
+    #
+    # @example Full form context and output
+    # 
+    #   <%= semantic_form_for(@user) do |f| %>
+    #     <%= f.inputs do %>
+    #       <%= f.input :shoe_size, :as => :numeric %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   <form...>
+    #     <fieldset>
+    #       <ol>
+    #         <li class="numeric">
+    #           <label for="user_shoe_size">Shoe size</label>
+    #           <input type="number" id="user_shoe_size" name="user[shoe_size]">
+    #         </li>
+    #       </ol>
+    #     </fieldset>
+    #   </form>
+    #
+    # @example Pass new HTML5 attrbutes down to the `<input>` tag
+    #  <%= f.input :shoe_size, :as => :numeric, :input_html => { :min => 3, :max => 15, :step => 1 } %>
+    #
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     module NumericInput
       include Formtastic::Inputs::Base
       include Formtastic::Inputs::Basic
       
-      # 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

From f76ff647189d608abe9a0eab96e084b70cc7c970 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 23 Feb 2011 07:17:18 +1100
Subject: [PATCH 539/992] documented PasswordInput

---
 lib/formtastic/inputs/password_input.rb | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/lib/formtastic/inputs/password_input.rb b/lib/formtastic/inputs/password_input.rb
index c15b1cd20..534fb93bd 100644
--- a/lib/formtastic/inputs/password_input.rb
+++ b/lib/formtastic/inputs/password_input.rb
@@ -2,6 +2,31 @@
 
 module Formtastic
   module Inputs
+    
+    # Outputs a simple `<label>` with a `<input type="password">` wrapped in the standard
+    # `<li>` wrapper. This is the default input choice for all attributes matching `/password/`, but 
+    # can be applied to any text-like input with `:as => :password`.
+    #
+    # @example Full form context and output
+    # 
+    #   <%= semantic_form_for(@user) do |f| %>
+    #     <%= f.inputs do %>
+    #       <%= f.input :password, :as => :password %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   <form...>
+    #     <fieldset>
+    #       <ol>
+    #         <li class="password">
+    #           <label for="user_password">Password</label>
+    #           <input type="password" id="user_password" name="user[password]">
+    #         </li>
+    #       </ol>
+    #     </fieldset>
+    #   </form>
+    #
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     module PasswordInput
       include Formtastic::Inputs::Base
       include Formtastic::Inputs::Basic

From 6d71d3a2cd2b94d2fbc95fcd2f8012f11c33c0bd Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 23 Feb 2011 07:17:30 +1100
Subject: [PATCH 540/992] documented PhoneInput

---
 lib/formtastic/inputs/phone_input.rb | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/lib/formtastic/inputs/phone_input.rb b/lib/formtastic/inputs/phone_input.rb
index 3800608f8..095c65d94 100644
--- a/lib/formtastic/inputs/phone_input.rb
+++ b/lib/formtastic/inputs/phone_input.rb
@@ -2,6 +2,31 @@
 
 module Formtastic
   module Inputs
+    
+    # Outputs a simple `<label>` with a HTML5 `<input type="phone">` wrapped in the standard
+    # `<li>` wrapper. This is the default input choice for attributes with a name matching 
+    # `/(phone|fax)/`, but can be applied to any text-like input with `:as => :phone`.
+    #
+    # @example Full form context and output
+    # 
+    #   <%= semantic_form_for(@user) do |f| %>
+    #     <%= f.inputs do %>
+    #       <%= f.input :mobile, :as => :phone %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   <form...>
+    #     <fieldset>
+    #       <ol>
+    #         <li class="phone">
+    #           <label for="user_mobile">Mobile</label>
+    #           <input type="phone" id="user_mobile" name="user[mobile]">
+    #         </li>
+    #       </ol>
+    #     </fieldset>
+    #   </form>
+    #
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     module PhoneInput
       include Formtastic::Inputs::Base
       include Formtastic::Inputs::Basic

From 73de7b70fc95b5a32e8911c4f0c8e631d4b90b69 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 23 Feb 2011 07:17:42 +1100
Subject: [PATCH 541/992] documented SearchInput

---
 lib/formtastic/inputs/search_input.rb | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/search_input.rb b/lib/formtastic/inputs/search_input.rb
index 3012b44d2..0ca93f1d5 100644
--- a/lib/formtastic/inputs/search_input.rb
+++ b/lib/formtastic/inputs/search_input.rb
@@ -2,11 +2,34 @@
 
 module Formtastic
   module Inputs
+    
+    # Outputs a simple `<label>` with a HTML5 `<input type="search">` wrapped in the standard
+    # `<li>` wrapper. This is the default input choice for attributes with a name matching 
+    # `/^search$/`, but can be applied to any text-like input with `:as => :search`.
+    #
+    # @example Full form context and output
+    # 
+    #   <%= semantic_form_for(@search, :html => { :method => :get }) do |f| %>
+    #     <%= f.inputs do %>
+    #       <%= f.input :q, :as => :search, :label => false, :input_html => { :name => "q" } %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   <form...>
+    #     <fieldset>
+    #       <ol>
+    #         <li class="search">
+    #           <input type="search" id="search_q" name="q">
+    #         </li>
+    #       </ol>
+    #     </fieldset>
+    #   </form>
+    #
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     module SearchInput
       include Formtastic::Inputs::Base
       include Formtastic::Inputs::Basic
       
-      # Outputs a label and a standard Rails search field inside the wrapper.
       def search_input(method, options)
         basic_input_helper(:search_field, :search, method, options)
       end

From 914677b5a829229b6d2fec6b0c41dd856e1f106a Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 23 Feb 2011 07:17:52 +1100
Subject: [PATCH 542/992] documented StringInput

---
 lib/formtastic/inputs/string_input.rb | 28 ++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/string_input.rb b/lib/formtastic/inputs/string_input.rb
index b051cc507..51dddfef8 100644
--- a/lib/formtastic/inputs/string_input.rb
+++ b/lib/formtastic/inputs/string_input.rb
@@ -2,10 +2,36 @@
 
 module Formtastic
   module Inputs
+    
+    # Outputs a simple `<label>` with a `<input type="text">` wrapped in the standard
+    # `<li>` wrapper. This is the default input choice for database columns of the `:string` type,
+    # and is the default choice for all inputs when no other logical input type can be inferred.
+    # You can force any input to be a string input with `:as => :string`.
+    #
+    # @example Full form context and output
+    # 
+    #   <%= semantic_form_for(@user) do |f| %>
+    #     <%= f.inputs do %>
+    #       <%= f.input :first_name, :as => :string %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   <form...>
+    #     <fieldset>
+    #       <ol>
+    #         <li class="string">
+    #           <label for="user_first_name">First name</label>
+    #           <input type="text" id="user_first_name" name="user[first_name]">
+    #         </li>
+    #       </ol>
+    #     </fieldset>
+    #   </form>
+    #
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     module StringInput
       include Formtastic::Inputs::Base
       include Formtastic::Inputs::Basic
-      # 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

From db3dfc1ddf7d25ff88d77dbe0deea54c7af40188 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 23 Feb 2011 07:18:01 +1100
Subject: [PATCH 543/992] documented TextInput

---
 lib/formtastic/inputs/text_input.rb | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/text_input.rb b/lib/formtastic/inputs/text_input.rb
index 22f5748f3..cab9e12d4 100644
--- a/lib/formtastic/inputs/text_input.rb
+++ b/lib/formtastic/inputs/text_input.rb
@@ -2,10 +2,34 @@
 
 module Formtastic
   module Inputs
+    
+    # Outputs a simple `<label>` with a `<textarea>` wrapped in the standard
+    # `<li>` wrapper. This is the default input choice for database columns of the `:text` type,
+    # but can forced on any text-like input with `:as => :text`.
+    #
+    # @example Full form context and output
+    # 
+    #   <%= semantic_form_for(@user) do |f| %>
+    #     <%= f.inputs do %>
+    #       <%= f.input :first_name, :as => :string %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   <form...>
+    #     <fieldset>
+    #       <ol>
+    #         <li class="string">
+    #           <label for="user_first_name">First name</label>
+    #           <input type="text" id="user_first_name" name="user[first_name]">
+    #         </li>
+    #       </ol>
+    #     </fieldset>
+    #   </form>
+    #
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     module TextInput
       include Formtastic::Inputs::Basic
       
-      # 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

From 7dbce96353d1df7047460244a50b25ee54068c91 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 23 Feb 2011 07:18:15 +1100
Subject: [PATCH 544/992] documented TimeZoneInput

---
 lib/formtastic/inputs/time_zone_input.rb | 34 +++++++++++++++++++-----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/lib/formtastic/inputs/time_zone_input.rb b/lib/formtastic/inputs/time_zone_input.rb
index 7917e355b..98a8284f9 100644
--- a/lib/formtastic/inputs/time_zone_input.rb
+++ b/lib/formtastic/inputs/time_zone_input.rb
@@ -1,12 +1,34 @@
 module Formtastic
   module Inputs
+    
+    # Outputs a `<label>` with a `<select>` containing a series of time zones (using Rails' own 
+    # `time_zone_select` helper), wrapped in the standard `<li>` wrapper.
+    
+    # This is the default input choice for attributes matching /time_zone/, but can be applied to
+    # any text-like input with `:as => :time_zone`.
+    #
+    # @example Full form context and output
+    # 
+    #   <%= semantic_form_for(@user) do |f| %>
+    #     <%= f.inputs do %>
+    #       <%= f.input :time_zone, :as => :time_zone %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   <form...>
+    #     <fieldset>
+    #       <ol>
+    #         <li class="time_zone">
+    #           <label for="user_time_zone">Time zone</label>
+    #           <input type="text" id="user_time_zone" name="user[time_zone]">
+    #         </li>
+    #       </ol>
+    #     </fieldset>
+    #   </form>
+    #
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
+    
     module TimeZoneInput
-      # 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) || {}
         field_id = generate_html_id(method, "")

From b917145d90d54605290e1b2378ce026eaf47ad2c Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 23 Feb 2011 07:18:26 +1100
Subject: [PATCH 545/992] documented UrlInput

---
 lib/formtastic/inputs/url_input.rb | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/url_input.rb b/lib/formtastic/inputs/url_input.rb
index 9e0a8045a..a62890018 100644
--- a/lib/formtastic/inputs/url_input.rb
+++ b/lib/formtastic/inputs/url_input.rb
@@ -1,9 +1,33 @@
 module Formtastic
   module Inputs
+    
+    # Outputs a simple `<label>` with a HTML5 `<input type="url">` wrapped in the standard
+    # `<li>` wrapper. This is the default input choice for all attributes matching 
+    # `/^url$|^website$|_url$/`, but can be applied to any text-like input with `:as => :url`.
+    #
+    # @example Full form context and output
+    # 
+    #   <%= semantic_form_for(@user) do |f| %>
+    #     <%= f.inputs do %>
+    #       <%= f.input :home_page, :as => :url %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   <form...>
+    #     <fieldset>
+    #       <ol>
+    #         <li class="url">
+    #           <label for="user_home_page">Home page</label>
+    #           <input type="number" id="user_home_page" name="user[home_page]">
+    #         </li>
+    #       </ol>
+    #     </fieldset>
+    #   </form>
+    #
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     module UrlInput
       include Formtastic::Inputs::Basic
       
-      # Outputs a label and a standard Rails url field inside the wrapper.
       def url_input(method, options)
         basic_input_helper(:url_field, :url, method, options)
       end

From e5081f4660c865116919c47a095dc5cbe9aab0c6 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 24 Feb 2011 20:42:34 +1100
Subject: [PATCH 546/992] documented SelectInput

---
 lib/formtastic/inputs/select_input.rb | 231 +++++++++++++++-----------
 1 file changed, 132 insertions(+), 99 deletions(-)

diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index 85f22001f..1a4498bfc 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -2,105 +2,142 @@
 
 module Formtastic
   module Inputs
+    # A select input is used to render a `<select>` tag with a series of options to choose from. 
+    # It works for both single selections (like a `belongs_to` relationship, or "yes/no" boolean),
+    # as well as multiple selections (like a `has_and_belongs_to_many`/`has_many` relationship, 
+    # for assigning many genres to a song, for example).
+    #
+    # This is the default input choice when:
+    #
+    # * the database column type is an `:integer` and there is an association (`belongs_to`)
+    # * the database column type is a `:string` and the `:collection` option is used
+    # * there an object with an association, but no database column on the object (`has_many`, etc)
+    # * there is no object and the `:collection` option is used
+    #
+    # The flexibility of the `:collection` option (see examples) makes the :select input viable as
+    # an alternative for many other input types. For example, instead of...
+    #
+    # * a `:string` input (where you want to force the user to choose from a few specific strings rather than entering anything)
+    # * a `:boolean` checkbox input (where the user could choose yes or no, rather than checking a box)
+    # * a `:date`, `:time` or `:datetime` input (where the user could choose from pre-selected dates)
+    # * a `:numeric` input (where the user could choose from a set of pre-defined numbers)
+    # * a `:time_zone` input (where you want to provide your own set of choices instead of relying on Rails)
+    # * a `:country` input (no need for a plugin really)
+    #
+    # Within the standard `<li>` wrapper, the output is a `<label>` tag followed by a `<select>` 
+    # tag containing `<option>` tags.
+    #
+    # For inputs that map to associations on the object model, Formtastic will automatically load
+    # in a collection of objects on the association as options to choose from. This might be an 
+    # `Author.all` on a `Post` form with an input for a `belongs_to :user` association, or a 
+    # `Tag.all` for a `Post` form with an input for a `has_and_belongs_to_many :tags` association. 
+    # You can override or customise this collection and the `<option>` tags it will render through
+    # the `:collection` option (see examples).
+    #
+    # The way on which Formtastic renders the `value` attribute and content of each `<option>` tag
+    # is customisable through the `:label_method` and `:value_method` options. When not provided,
+    # we fall back to a list of methods to try on each object such as `:to_label`, `:name` and 
+    # `:to_s`, which are defined in the configurations `collection_label_methods` and 
+    # `collection_value_methods` (see examples below).
+    #
+    # @example Basic `belongs_to` example with full form context
+    #
+    #     <%= semantic_form_for @post do |f| %>
+    #       <%= f.inputs do %>
+    #         <%= f.input :author, :as => :select %>
+    #       <% end %>
+    #     <% end %>
+    #     
+    #     <form...>
+    #       <fieldset>
+    #         <ol>
+    #           <li class='select'>
+    #             <label for="post_author_id">Author</label>
+    #             <select id="post_author_id" name="post[post_author_id]">
+    #               <option value=""></option>
+    #               <option value="1">Justin</option>
+    #               <option value="3">Kate</option>
+    #               <option value="2">Amelia</option>
+    #             </select>
+    #           </li>
+    #         </ol>
+    #       </fieldset>
+    #     </form>
+    #
+    # @example Basic `has_many` or `has_and_belongs_to_many` example with full form context
+    #
+    #     <%= semantic_form_for @post do |f| %>
+    #       <%= f.inputs do %>
+    #         <%= f.input :tags, :as => :select %>
+    #       <% end %>
+    #     <% end %>
+    #     
+    #     <form...>
+    #       <fieldset>
+    #         <ol>
+    #           <li class='select'>
+    #             <label for="post_tag_ids">Author</label>
+    #             <select id="post_tag_ids" name="post[tag_ids]" multiple="true">
+    #               <option value="1">Ruby</option>
+    #               <option value="6">Rails</option>
+    #               <option value="3">Forms</option>
+    #               <option value="4">Awesome</option>
+    #             </select>
+    #           </li>
+    #         </ol>
+    #       </fieldset>
+    #     </form>
+    #
+    # @example Override Formtastic's assumption on when you need a multi select
+    #   <%= f.input :authors, :as => :select, :input_html => { :multiple => true } %>
+    #   <%= f.input :authors, :as => :select, :input_html => { :multiple => false } %>
+    #
+    # @example The `:collection` option can be used to customize the choices
+    #   <%= f.input :author, :as => :select, :collection => @categories %>
+    #   <%= f.input :author, :as => :select, :collection => Category.all %>
+    #   <%= f.input :author, :as => :select, :collection => Category.some_named_scope %>
+    #   <%= f.input :author, :as => :select, :collection => [Category.find_by_name("Ruby"), Category.find_by_name("Rails")] %>
+    #   <%= f.input :author, :as => :select, :collection => ["Ruby", "Rails"] %>
+    #   <%= f.input :author, :as => :select, :collection => [["Ruby", "ruby"], ["Rails", "rails"]] %>
+    #   <%= f.input :author, :as => :select, :collection => [["Ruby", "1"], ["Rails", "2"]] %>
+    #   <%= f.input :author, :as => :select, :collection => [["Ruby", 1], ["Rails", 2]] %>
+    #   <%= f.input :author, :as => :select, :collection => 1..5 %>
+    #   <%= f.input :author, :as => :select, :collection => "<option>your own options HTML string</option>" %>
+    #   <%= f.input :author, :as => :select, :collection => options_for_select(...) %>
+    #   <%= f.input :author, :as => :select, :collection => options_from_collection_for_select(...) %>
+    #   <%= f.input :author, :as => :select, :collection => grouped_options_for_select(...) %>
+    #   <%= f.input :author, :as => :select, :collection => time_zone_options_for_select(...) %>
+    # 
+    # @example The `:label_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the label text (it'll try the methods like `to_s` in `collection_label_methods` config by default)
+    #   <%= f.input :author, :as => :select, :label_method => :name %>
+    #   <%= f.input :author, :as => :select, :label_method => :name_with_post_count
+    #   <%= f.input :author, :as => :select, :label_method => Proc.new { |a| "#{c.name} (#{pluralize("post", a.posts.count)})" }
+    # 
+    # @example The `:value_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the value for each checkbox (it'll try the methods like `id` in `collection_value_methods` config by default)
+    #   <%= f.input :author, :as => :select, :value_method => :login %>
+    #   <%= f.input :author, :as => :select, :value_method => Proc.new { |c| c.full_name.downcase.underscore }
+    # 
+    # @example Set HTML attributes on the `<select>` tag with `:input_html`
+    #   <%= f.input :authors, :input_html => { :size => 20, :multiple => true, :class => "special" } %>
+    # 
+    # @example Set HTML attributes on the `<li>` wrapper with `:wrapper_html`
+    #   <%= f.input :authors, :input_html => { :size => 20, :multiple => true, :class => "special" } %>
+    #
+    # @example Exclude or include the blank option at the top of the select, or change the prompt
+    #   <%= f.input :author, :input_html => { :include_blank => false } %>
+    #   <%= f.input :author, :input_html => { :include_blank => true } %>
+    #   <%= f.input :author, :input_html => { :prompt => "Please select an Author..." } %>
+    #
+    # @example Group options an `<optgroup>` with the `:group_by` and `:group_label_method` options (`belongs_to` associations only)
+    #   <%= f.input :author, :group_by => :continent %>
+    #
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
+    # @see Formtastic::Inputs::CheckBoxesInput CheckBoxesInput as an alternative for `has_many` and `has_and_belongs_to_many` associations
+    # @see Formtastic::Inputs::RadioInput RadioInput as an alternative for `belongs_to` associations
     module SelectInput
       include Formtastic::Inputs::Base
       include Formtastic::Reflection
       
-      # 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. A collection can be given
-      # as an Array, a Hash or as a String (containing pre-rendered HTML options). If not provided, the choices are
-      # found by inferring the parent's class name from the method name and simply calling all on it
-      # (VehicleOwner.all in the example above).
-      #
-      # Examples:
-      #
-      #   f.input :author, :collection => @authors
-      #   f.input :author, :collection => Author.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"]
-      #   f.input :author, :collection => grouped_options_for_select(["North America",[["United States","US"],["Canada","CA"]]])
-      #
-      # 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 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) || {}
         html_options[:multiple] = html_options[:multiple] || options.delete(:multiple)
@@ -145,7 +182,6 @@ def select_input(method, options)
       protected
       
       # 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)
@@ -172,7 +208,6 @@ def find_raw_collection_for_column(column, options) #:nodoc:
       
       # 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)
@@ -183,13 +218,11 @@ def create_boolean_collection(options) #:nodoc:
       
       # Return the label collection method when none is supplied using the
       # values set in collection_label_methods.
-      #
       def detect_label_method(collection) #:nodoc:
         detect_label_and_value_method!(collection).first
       end
       
       # 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 = reflection_for(method)
         method_class = object_to_method_reflection.klass

From dc06e0c805da983718361868ee27a4b86fdd5601 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 24 Feb 2011 20:44:32 +1100
Subject: [PATCH 547/992] tweak copy-paste fail in CheckBoxesInput docs

---
 lib/formtastic/inputs/check_boxes_input.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index 269b5b1cf..c2015eff8 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -2,7 +2,8 @@
 
 module Formtastic
   module Inputs
-    # Boolean inputs are used to render a series of checkboxes. This is an alternative input choice 
+    
+    # A CheckBoxes input is used to render a series of checkboxes. This is an alternative input choice 
     # for `has_many` or `has_and_belongs_to_many` associations like a `Post` belonging to many 
     # `categories` (by default, a {SelectInput `:select`} input is used, allowing multiple selections).
     #

From 8c92c115fdf585155e6eed2b57b06f625a4e24df Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 24 Feb 2011 20:46:25 +1100
Subject: [PATCH 548/992] link to BooleanInput from CheckBoxesInput

---
 lib/formtastic/inputs/check_boxes_input.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index c2015eff8..c5fa81fda 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -68,6 +68,7 @@ module Inputs
     #   <%= f.input :categories, :as => :check_boxes, :value_as_class => true %>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
+    # @see Formtastic::Inputs::BooleanInput BooleanInput for a single checkbox for boolean (checked = true) inputs
     module CheckBoxesInput
       include Formtastic::Inputs::Base
       

From dbe4d81318e4e32abf1cfd1d188359cfa68ad21e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 25 Feb 2011 08:58:07 +1100
Subject: [PATCH 549/992] documented RadioInput

---
 lib/formtastic/inputs/radio_input.rb | 158 ++++++++++++++++++---------
 1 file changed, 105 insertions(+), 53 deletions(-)

diff --git a/lib/formtastic/inputs/radio_input.rb b/lib/formtastic/inputs/radio_input.rb
index fd57915f7..d7aaa0bbf 100644
--- a/lib/formtastic/inputs/radio_input.rb
+++ b/lib/formtastic/inputs/radio_input.rb
@@ -1,61 +1,113 @@
 module Formtastic
   module Inputs
+    
+    # A radio input is used to render a series of radio inputs. This is an alternative input choice 
+    # for `belongs_to` associations like a `Post` belonging to a `Section` or an `Author`, or any 
+    # case where the user needs to make a single selection from a pre-defined collectioon of choices.
+    #
+    # Within the standard `<li>` wrapper, the output is a `<fieldset>` with a `<legend>` to
+    # represent the "label" for the input, and an `<ol>` containing `<li>`s for each choice in 
+    # the association. Each `<li>` choice has a `<label>` containing an `<input type="radio">` and 
+    # the label text to describe each choice.
+    #
+    # Radio inputs can be considered as an alternative where a (non-multi) select input is used, 
+    # especially in cases where there are only a few choices, however they are not used by default 
+    # for any type of association or model attribute. You can choose to use a radio input instead of
+    # a select with `:as => :radio`.
+    #
+    # Like a select input, the flexibility of the `:collection` option (see examples) makes the 
+    # :radio input viable as an alternative for many other input types. For example, instead of...
+    #
+    # * a `:string` input (where you want to force the user to choose from a few specific strings rather than entering anything)
+    # * a `:boolean` checkbox input (where the user could choose yes or no, rather than checking a box)
+    # * a `:date`, `:time` or `:datetime` input (where the user could choose from a small set of pre-determined dates)
+    # * a `:numeric` input (where the user could choose from a small set of pre-defined numbers)
+    # * a `:time_zone` input (where you want to provide your own small set of choices instead of relying on Rails)
+    # * a `:country` input (where you want to provide a small set of choices, no need for a plugin really)
+    #
+    # For radio inputs that map to associations on the object model, Formtastic will automatically 
+    # load in a collection of objects on the association as options to choose from. This might be an 
+    # `Author.all` on a `Post` form with an input for a `belongs_to :user` association, or a
+    # `Section.all` for a `Post` form with an input for a `belongs_to :section` association. 
+    # You can override or customise this collection through the `:collection` option (see examples).
+    #
+    # The way on which Formtastic renders the `value` attribute and label for each choice is 
+    # customisable through the `:label_method` and `:value_method` options (see examples below).
+    # When not provided, we fall back to a list of methods to try on each object such as 
+    # `:to_label`, `:name` and `:to_s`, which are defined in the configurations 
+    # `collection_label_methods` and `collection_value_methods`.
+    #
+    # @example Basic `belongs_to` example with full form context
+    #
+    #     <%= semantic_form_for @post do |f| %>
+    #       <%= f.inputs do %>
+    #         <%= f.input :author, :as => :radio %>
+    #       <% end %>
+    #     <% end %>
+    #     
+    #     <form...>
+    #       <fieldset>
+    #         <ol>
+    #           <li class='radio'>
+    #             <fieldset>
+    #               <legend class="label"><label>Categories</label></legend>
+    #               <ol>
+    #                 <li>
+    #                   <label for="post_author_id_1">
+    #                     <input type="radio" id="post_author_id_1" value="1"> Justin
+    #                   </label>
+    #                 </li>
+    #                 <li>
+    #                   <label for="post_author_id_3">
+    #                     <input type="radio" id="post_author_id_3" value="3"> Kate
+    #                   </label>
+    #                 </li>
+    #                 <li>
+    #                   <label for="post_author_id_2">
+    #                     <input type="radio" id="post_author_id_2" value="2"> Amelia
+    #                   </label>
+    #                 </li>
+    #               </ol>
+    #             </fieldset>
+    #           </li>
+    #         </ol>
+    #       </fieldset>
+    #     </form>
+    #
+    # @example The `:collection` option can be used to customize the choices
+    #   <%= f.input :author, :as => :radio, :collection => @authors %>
+    #   <%= f.input :author, :as => :radio, :collection => Author.all %>
+    #   <%= f.input :author, :as => :radio, :collection => Author.some_named_scope %>
+    #   <%= f.input :author, :as => :radio, :collection => [Author.find_by_login("justin"), Category.find_by_name("kate")] %>
+    #   <%= f.input :author, :as => :radio, :collection => ["Justin", "Kate"] %>
+    #   <%= f.input :author, :as => :radio, :collection => [["Justin", "justin"], ["Kate", "kate"]] %>
+    #   <%= f.input :author, :as => :radio, :collection => [["Justin", "1"], ["Kate", "3"]] %>
+    #   <%= f.input :author, :as => :radio, :collection => [["Justin", 1], ["Kate", 3]] %>
+    #   <%= f.input :author, :as => :radio, :collection => 1..5 %>
+    # 
+    # @example The `:label_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the label text (it'll try the methods like `to_s` in `collection_label_methods` config by default)
+    #   <%= f.input :author, :as => :radio, :label_method => :name %>
+    #   <%= f.input :author, :as => :radio, :label_method => :name_with_post_count
+    #   <%= f.input :author, :as => :radio, :label_method => Proc.new { |a| "#{c.name} (#{pluralize("post", a.posts.count)})" }
+    # 
+    # @example The `:value_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the value for each checkbox (it'll try the methods like `id` in `collection_value_methods` config by default)
+    #   <%= f.input :author, :as => :radio, :value_method => :login %>
+    #   <%= f.input :author, :as => :radio, :value_method => Proc.new { |c| c.full_name.downcase.underscore }
+    # 
+    # @example Set HTML attributes on each `<input type="radio">` tag with `:input_html`
+    #   <%= f.input :author, :as => :radio, :input_html => { :size => 20, :multiple => true, :class => "special" } %>
+    # 
+    # @example Set HTML attributes on the `<li>` wrapper with `:wrapper_html`
+    #   <%= f.input :author, :as => :radio, :wrapper_html => { :class => "special" } %>
+    #
+    # @example `:value_as_class` can be used to add a class to the `<li>` wrapped around each choice using the radio value for custom styling of each choice
+    #   <%= f.input :author, :as => :radio, :value_as_class => true %>
+    #
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
+    # @see Formtastic::Inputs::Select RadioInput as an alternative for `belongs_to` associations
     module RadioInput
       include Formtastic::Inputs::Base
       
-      # 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.all in the example above).
-      #
-      # Examples:
-      #
-      #   f.input :author, :as => :radio, :collection => @authors
-      #   f.input :author, :as => :radio, :collection => Author.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}" }
-      #
       # 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).

From 1e417629283e5b0c6aff2b02f1d31d2ff0fa60b2 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 25 Feb 2011 08:58:21 +1100
Subject: [PATCH 550/992] corrections and fixes to SelectInout documentation

---
 lib/formtastic/inputs/select_input.rb | 28 +++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index 1a4498bfc..f6bcf5c78 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -93,14 +93,14 @@ module Inputs
     #   <%= f.input :authors, :as => :select, :input_html => { :multiple => false } %>
     #
     # @example The `:collection` option can be used to customize the choices
-    #   <%= f.input :author, :as => :select, :collection => @categories %>
-    #   <%= f.input :author, :as => :select, :collection => Category.all %>
-    #   <%= f.input :author, :as => :select, :collection => Category.some_named_scope %>
-    #   <%= f.input :author, :as => :select, :collection => [Category.find_by_name("Ruby"), Category.find_by_name("Rails")] %>
-    #   <%= f.input :author, :as => :select, :collection => ["Ruby", "Rails"] %>
-    #   <%= f.input :author, :as => :select, :collection => [["Ruby", "ruby"], ["Rails", "rails"]] %>
-    #   <%= f.input :author, :as => :select, :collection => [["Ruby", "1"], ["Rails", "2"]] %>
-    #   <%= f.input :author, :as => :select, :collection => [["Ruby", 1], ["Rails", 2]] %>
+    #   <%= f.input :author, :as => :select, :collection => @authors %>
+    #   <%= f.input :author, :as => :select, :collection => Author.all %>
+    #   <%= f.input :author, :as => :select, :collection => Author.some_named_scope %>
+    #   <%= f.input :author, :as => :select, :collection => [Author.find_by_login("justin"), Category.find_by_name("kate")] %>
+    #   <%= f.input :author, :as => :select, :collection => ["Justin", "Kate"] %>
+    #   <%= f.input :author, :as => :select, :collection => [["Justin", "justin"], ["Kate", "kate"]] %>
+    #   <%= f.input :author, :as => :select, :collection => [["Justin", "1"], ["Kate", "3"]] %>
+    #   <%= f.input :author, :as => :select, :collection => [["Justin", 1], ["Kate", 3]] %>
     #   <%= f.input :author, :as => :select, :collection => 1..5 %>
     #   <%= f.input :author, :as => :select, :collection => "<option>your own options HTML string</option>" %>
     #   <%= f.input :author, :as => :select, :collection => options_for_select(...) %>
@@ -118,18 +118,18 @@ module Inputs
     #   <%= f.input :author, :as => :select, :value_method => Proc.new { |c| c.full_name.downcase.underscore }
     # 
     # @example Set HTML attributes on the `<select>` tag with `:input_html`
-    #   <%= f.input :authors, :input_html => { :size => 20, :multiple => true, :class => "special" } %>
+    #   <%= f.input :authors, :as => :select, :input_html => { :size => 20, :multiple => true, :class => "special" } %>
     # 
     # @example Set HTML attributes on the `<li>` wrapper with `:wrapper_html`
-    #   <%= f.input :authors, :input_html => { :size => 20, :multiple => true, :class => "special" } %>
+    #   <%= f.input :authors, :as => :select, :wrapper_html => { :class => "special" } %>
     #
     # @example Exclude or include the blank option at the top of the select, or change the prompt
-    #   <%= f.input :author, :input_html => { :include_blank => false } %>
-    #   <%= f.input :author, :input_html => { :include_blank => true } %>
-    #   <%= f.input :author, :input_html => { :prompt => "Please select an Author..." } %>
+    #   <%= f.input :author, :as => :select, :input_html => { :include_blank => false } %>
+    #   <%= f.input :author, :as => :select, :input_html => { :include_blank => true } %>
+    #   <%= f.input :author, :as => :select, :input_html => { :prompt => "Please select an Author..." } %>
     #
     # @example Group options an `<optgroup>` with the `:group_by` and `:group_label_method` options (`belongs_to` associations only)
-    #   <%= f.input :author, :group_by => :continent %>
+    #   <%= f.input :author, :as => :select, :group_by => :continent %>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     # @see Formtastic::Inputs::CheckBoxesInput CheckBoxesInput as an alternative for `has_many` and `has_and_belongs_to_many` associations

From 4347a852a52cf6b51c8e16555a10786a6b822412 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Fri, 25 Feb 2011 19:36:09 -0300
Subject: [PATCH 551/992] Strip whitespaces

---
 CHANGELOG                                     |  14 +-
 lib/formtastic/form_builder.rb                |  16 +--
 lib/formtastic/helpers/buttons_helper.rb      |  50 +++----
 lib/formtastic/helpers/errors_helper.rb       |  26 ++--
 lib/formtastic/helpers/fieldset_wrapper.rb    |  16 +--
 .../helpers/file_column_detection.rb          |   4 +-
 lib/formtastic/helpers/form_helper.rb         |  42 +++---
 lib/formtastic/helpers/inputs_helper.rb       | 136 +++++++++---------
 lib/formtastic/helpers/label_helper.rb        |  28 ++--
 lib/formtastic/html_attributes.rb             |  10 +-
 lib/formtastic/inputs/base.rb                 |  30 ++--
 lib/formtastic/inputs/basic.rb                |  22 +--
 lib/formtastic/inputs/boolean_input.rb        |  14 +-
 lib/formtastic/inputs/check_boxes_input.rb    |  44 +++---
 lib/formtastic/inputs/country_input.rb        |  20 +--
 lib/formtastic/inputs/email_input.rb          |   8 +-
 lib/formtastic/inputs/file_input.rb           |   8 +-
 lib/formtastic/inputs/hidden_input.rb         |  10 +-
 lib/formtastic/inputs/numeric_input.rb        |   8 +-
 lib/formtastic/inputs/password_input.rb       |   8 +-
 lib/formtastic/inputs/phone_input.rb          |   6 +-
 lib/formtastic/inputs/radio_input.rb          |  52 +++----
 lib/formtastic/inputs/search_input.rb         |   8 +-
 lib/formtastic/inputs/select_input.rb         |  70 ++++-----
 lib/formtastic/inputs/string_input.rb         |   4 +-
 lib/formtastic/inputs/text_input.rb           |   6 +-
 lib/formtastic/inputs/time_zone_input.rb      |  10 +-
 lib/formtastic/inputs/timeish.rb              |  42 +++---
 lib/formtastic/inputs/url_input.rb            |   8 +-
 lib/formtastic/localized_string.rb            |  20 +--
 lib/formtastic/util.rb                        |   2 +-
 .../formtastic/form/form_generator.rb         |   6 +-
 lib/generators/templates/formtastic.css       |  14 +-
 lib/generators/templates/formtastic.rb        |   8 +-
 34 files changed, 385 insertions(+), 385 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index dab9246d9..438639a68 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,8 +16,8 @@
 * Changed :boolean inputs to use Rails' check_box_checked? instead of our own logic
 * Changed developer instructions in README
 * Fixed :boolean inputs to disable the included hidden input when disabling the actual checkbox
-* Fixed that Formtastic was making changes to the options hash directly instead of on a duplicate, causing problems for those trying to reuse options on multiple inputs in the view 
-* Fixed that tiny scroll bars were appearing on legends in date/time/radio/cbheckboxes fielsets (GH-477)    
+* Fixed that Formtastic was making changes to the options hash directly instead of on a duplicate, causing problems for those trying to reuse options on multiple inputs in the view
+* Fixed that tiny scroll bars were appearing on legends in date/time/radio/cbheckboxes fielsets (GH-477)
 * Fixed an issue when formtastic fails to determine if a checkbox is checked with custom checked and unchecked values (thanks to Eugene Bolshakov)
 * Fixed that the hidden input rendered with a boolean checkbox did nt use the custom :name from :input_html options hash
 
@@ -41,7 +41,7 @@
 * Removed deprecated aliased method names (input_field_set, button_field_set)
 * Removed deprecated :class => 'whatever' on commit_button
 * Fixed that classes in :button_html were being merged into :wrapper_html
-* Fixed that :include_blank was being ignored (always false) for multi selects 
+* Fixed that :include_blank was being ignored (always false) for multi selects
 * Fixed that we should reflect on allow_blank option to determine required status with validates_inclusion_of
 * Added the ability to pass :input_html options be passed to the checkbox on a boolean input
 * Developers: Added bundler support to for developer/contribution
@@ -87,7 +87,7 @@
   * Added a fallback to Rails' helpers.label key if Formtastic label translation are not found
   * Added support for default_text_area_width
   * Added support for #persisted? over #new_record? (ActiveModel)
-  * Added the 'required' logic to attributes with validates_inclusion_of validation, in addition to validates_presence_of 
+  * Added the 'required' logic to attributes with validates_inclusion_of validation, in addition to validates_presence_of
   * Added new HTML5 :as => :email input (Rails 3)
   * Added new HTML5 :as => :phone input (Rails 3)
   * Added new HTML5 :as => :search input (Rails 3)
@@ -101,7 +101,7 @@
   * Added custom_inline_order to allow inline ordering per input type
   * Added the ability to override the generator templates in Rails 3
 
-* Fixes 
+* Fixes
 
   * Fixed invalid HTML generated by Rails' hidden inputs on checkboxes (by rendering our own hidden tag in a more deliberate place)
   * Fixed a bunch of invalid i18n key defaults
@@ -109,7 +109,7 @@
   * Fixed CSS bugs around Firefox's quirks with form elements that resulted in overflow/scroll bar issues
   * Fixed that errors on fields with association were not marking the wrapping tag with the error class
   * Fixed CSS where FF was displaying extra scroll bars on .check_boxes and .radio inputs (and the choices within them)
-  
+
 * Changes
 
   * Changed that we were defaulting to a :select input for columns ending in _id, instead of columns with an appropriate associations
@@ -159,7 +159,7 @@
 
 1.0.0.rc
 
-* Fixed that :checked_value and :unchecked_value options were being passed down into the HTML tags as attributes 
+* Fixed that :checked_value and :unchecked_value options were being passed down into the HTML tags as attributes
 
 1.0.0.beta4
 
diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 58dbd05c9..7e1ecd224 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -29,12 +29,12 @@
 
 module Formtastic
   class FormBuilder < ActionView::Helpers::FormBuilder
-  
+
     def self.configure(name, value = nil)
       class_attribute(name)
-      self.send(:"#{name}=", value)  
+      self.send(:"#{name}=", value)
     end
-  
+
     configure :custom_namespace
     configure :default_text_field_size
     configure :default_text_area_height, 20
@@ -58,11 +58,11 @@ def self.configure(name, value = nil)
     configure :default_inline_error_class, 'inline-errors'
     configure :default_error_list_class, 'errors'
     configure :default_hint_class, 'inline-hints'
-  
+
     attr_accessor :template
-    
+
     include Formtastic::HtmlAttributes
-    
+
     include Formtastic::Helpers::InputsHelper
     include Formtastic::Helpers::ButtonsHelper
     include Formtastic::Helpers::LabelHelper
@@ -87,7 +87,7 @@ def self.configure(name, value = nil)
     include Formtastic::Inputs::TimeInput
     include Formtastic::Inputs::TimeZoneInput
     include Formtastic::Inputs::UrlInput
-    
+
   end
-  
+
 end
\ No newline at end of file
diff --git a/lib/formtastic/helpers/buttons_helper.rb b/lib/formtastic/helpers/buttons_helper.rb
index 5cc03f163..adbfa11aa 100644
--- a/lib/formtastic/helpers/buttons_helper.rb
+++ b/lib/formtastic/helpers/buttons_helper.rb
@@ -3,11 +3,11 @@
 
 module Formtastic
   module Helpers
-    
-    # ButtonsHelper encapsulates the responsibilties of the {#buttons} and {#commit_button} helpers 
+
+    # ButtonsHelper encapsulates the responsibilties of the {#buttons} and {#commit_button} helpers
     # for submitting forms.
     #
-    # {#buttons} is used to wrap the form's button(s) and actions in a `<fieldset>` and `<ol>`, 
+    # {#buttons} is used to wrap the form's button(s) and actions in a `<fieldset>` and `<ol>`,
     # with each item in the list containing the markup representing a single button.
     #
     # {#buttons} is usually called with a block containing a single {#commit_button} call:
@@ -34,12 +34,12 @@ module Helpers
     #
     # While this may seem slightly over-engineered, it is consistent with the way form inputs are
     # handled, and makes room for other types of buttons and actions in future versions (such as
-    # cancel buttons or links, reset buttons and even alternate actions like 'save and continue 
+    # cancel buttons or links, reset buttons and even alternate actions like 'save and continue
     # editing').
     #
     # It's important to note that the `semantic_form_for` and {#buttons} blocks wrap the
     # standard Rails `form_for` helper and form builder, so you have full access to every standard
-    # Rails form helper, with any HTML markup and ERB syntax, allowing you to "break free" from 
+    # Rails form helper, with any HTML markup and ERB syntax, allowing you to "break free" from
     # Formtastic when it doesn't suit to create your own buttons, links and actions:
     #
     #     <%= semantic_form_for @post do |f| %>
@@ -59,7 +59,7 @@ module Helpers
     module ButtonsHelper
       include Formtastic::Helpers::FieldsetWrapper
       include Formtastic::LocalizedString
-      
+
       # Creates a fieldset and ol tag wrapping for use around a set of buttons. It can be
       # called either with a block (in which you can do the usual Rails form stuff, HTML, ERB, etc),
       # or with a list of named buttons. These two examples are functionally equivalent:
@@ -71,12 +71,12 @@ module ButtonsHelper
       #         <%= f.commit_button %>
       #       <% end %>
       #     <% end %>
-      #     
+      #
       #     # With a list of fields:
       #     <% semantic_form_for @post do |f| %>
       #       <%= f.buttons :commit %>
       #     <% end %>
-      #     
+      #
       #     # Output:
       #     <form ...>
       #       <fieldset class="inputs">
@@ -88,7 +88,7 @@ module ButtonsHelper
       #       </fieldset>
       #     </form>
       #
-      # Only one type of named button is supported at this time (:commit), and it's assumed to be 
+      # Only one type of named button is supported at this time (:commit), and it's assumed to be
       # the default choice, so this is also functionally equivalent, but may change in the future:
       #
       #     # With no args:
@@ -99,11 +99,11 @@ module ButtonsHelper
       #
       # While this may seem slightly over-engineered, it is consistent with the way form inputs are
       # handled, and makes room for other types of buttons and actions in future versions (such as
-      # cancel buttons or links, reset buttons and even alternate actions like 'save and continue 
+      # cancel buttons or links, reset buttons and even alternate actions like 'save and continue
       # editing').
       #
       # All options except `:name` and `:title` are passed down to the fieldset as HTML
-      # attributes (`id`, `class`, `style`...). If provided, the `:name` or `:title` option is 
+      # attributes (`id`, `class`, `style`...). If provided, the `:name` or `:title` option is
       # passed into a `<legend>` inside the `<fieldset>` to name the set of buttons.
       #
       # @example Quickly add button(s) to the form, accepting all default values, options and behaviors
@@ -170,7 +170,7 @@ module ButtonsHelper
       def buttons(*args, &block)
         html_options = args.extract_options!
         html_options[:class] ||= "buttons"
-    
+
         if block_given?
           field_set_and_list_wrapping(html_options, &block)
         else
@@ -179,18 +179,18 @@ def buttons(*args, &block)
           field_set_and_list_wrapping(html_options, contents)
         end
       end
-    
+
       # Creates a submit input tag with the value "Save [model name]" (for existing records) or
-      # "Create [model name]" (for new records) by default. The output is an `<input>` tag with the 
+      # "Create [model name]" (for new records) by default. The output is an `<input>` tag with the
       # `type` of `submit` and a class of either `create` or `update` (if Formtastic can determin if)
       # the record is new or not) with `submit` as a fallback class. The submit button is wrapped in
       # an `<li>` tag with a class of `commit`, and is intended to be rendered inside a {#buttons}
       # block which wraps the button in a `fieldset` and `ol`.
       #
-      # The textual value of the label can be changed from this default through the `:label` 
+      # The textual value of the label can be changed from this default through the `:label`
       # argument or through i18n.
       #
-      # You can pass HTML attributes down to the `<input>` tag with the `:button_html` option, and 
+      # You can pass HTML attributes down to the `<input>` tag with the `:button_html` option, and
       # pass HTML attributes to the wrapping `<li>` tag with the `:wrapper_html` option.
       #
       # @example Basic usage
@@ -226,13 +226,13 @@ def buttons(*args, &block)
       #   <%= f.commit_button :label => "Go", :button_html => { :class => 'special', :id => 'whatever' } %>
       #   <%= f.commit_button "Go", :button_html => { :class => 'special', :id => 'whatever' } %>
       #
-      # @option *args :label [String, Symbol]  
+      # @option *args :label [String, Symbol]
       #   Override the label text with a String or a symbold for an i18n translation key
       #
-      # @option *args :button_html [Hash]  
+      # @option *args :button_html [Hash]
       #   Override or add to the HTML attributes to be passed down to the `<input>` tag
       #
-      # @option *args :wrapper_html [Hash] 
+      # @option *args :wrapper_html [Hash]
       #   Override or add to the HTML attributes to be passed down to the wrapping `<li>` tag
       #
       # @todo document i18n keys
@@ -240,10 +240,10 @@ def buttons(*args, &block)
       def commit_button(*args)
         options = args.extract_options!
         text = options.delete(:label) || args.shift
-    
+
         if @object && (@object.respond_to?(:persisted?) || @object.respond_to?(:new_record?))
           key = @object.persisted? ? :update : :create
-    
+
           # Deal with some complications with ActiveRecord::Base.human_name and two name models (eg UserPost)
           # ActiveRecord::Base.human_name falls back to ActiveRecord::Base.name.humanize ("Userpost")
           # if there's no i18n, which is pretty crappy.  In this circumstance we want to detect this
@@ -260,17 +260,17 @@ def commit_button(*args)
           key = :submit
           object_name = @object_name.to_s.send(label_str_method)
         end
-    
+
         text = (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) || {}
         button_html.merge!(:class => [button_html[:class], key].compact.join(' '))
-    
+
         wrapper_html_class = ['commit'] # TODO: Add class reflecting on form action.
         wrapper_html = options.delete(:wrapper_html) || {}
         wrapper_html[:class] = (wrapper_html_class << wrapper_html[:class]).flatten.compact.join(' ')
-    
+
         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, Formtastic::Util.html_safe(submit(text, button_html)), wrapper_html)
diff --git a/lib/formtastic/helpers/errors_helper.rb b/lib/formtastic/helpers/errors_helper.rb
index 577eb7999..b7a4097cf 100644
--- a/lib/formtastic/helpers/errors_helper.rb
+++ b/lib/formtastic/helpers/errors_helper.rb
@@ -8,15 +8,15 @@ module ErrorsHelper
       include Formtastic::Helpers::FileColumnDetection
       include Formtastic::Reflection
       include Formtastic::LocalizedString
-      
+
       INLINE_ERROR_TYPES = [:sentence, :list, :first]
-      
-      # Generates an unordered list of error messages on the base object and optionally for a given 
-      # set of named attribute. This is idea for rendering a block of error messages at the top of 
-      # the form for hidden/special/virtual attributes (the Paperclip Rails plugin does this), or 
+
+      # Generates an unordered list of error messages on the base object and optionally for a given
+      # set of named attribute. This is idea for rendering a block of error messages at the top of
+      # the form for hidden/special/virtual attributes (the Paperclip Rails plugin does this), or
       # errors on the base model.
       #
-      # A hash can be used as the last set of arguments to pass HTML attributes to the `<ul>` 
+      # A hash can be used as the last set of arguments to pass HTML attributes to the `<ul>`
       # wrapper.
       #
       # @example A list of errors on the base model
@@ -58,9 +58,9 @@ def semantic_errors(*args)
           Formtastic::Util.html_safe(full_errors.map { |error| template.content_tag(:li, Formtastic::Util.html_safe(error)) }.join)
         end
       end
-    
+
       protected
-    
+
       def error_keys(method, options)
         @methods_for_error ||= {}
         @methods_for_error[method] ||= begin
@@ -70,27 +70,27 @@ def error_keys(method, options)
           methods_for_error.flatten.compact.uniq
         end
       end
-      
+
       def has_errors?(method, options)
         methods_for_error = error_keys(method,options)
         @object && @object.respond_to?(:errors) && methods_for_error.any?{|error| !@object.errors[error].blank?}
       end
-      
+
       def render_inline_errors?
         @object && @object.respond_to?(:errors) && Formtastic::FormBuilder::INLINE_ERROR_TYPES.include?(inline_errors)
       end
-      
+
       def association_macro_for_method(method) #:nodoc:
         reflection = reflection_for(method)
         reflection.macro if reflection
       end
-      
+
       def association_primary_key(method)
         reflection = reflection_for(method)
         reflection.options[:foreign_key] if reflection && !reflection.options[:foreign_key].blank?
         :"#{method}_id"
       end
-  
+
     end
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/helpers/fieldset_wrapper.rb b/lib/formtastic/helpers/fieldset_wrapper.rb
index 3f3b4a23b..4c7805e0b 100644
--- a/lib/formtastic/helpers/fieldset_wrapper.rb
+++ b/lib/formtastic/helpers/fieldset_wrapper.rb
@@ -2,9 +2,9 @@ module Formtastic
   module Helpers
     # @private
     module FieldsetWrapper
-    
+
       protected
-      
+
       # Generates a fieldset and wraps the content in an ordered list. When working
       # with nested attributes, it allows %i as interpolation option in :name. So you can do:
       #
@@ -24,11 +24,11 @@ module FieldsetWrapper
       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.dup.delete(:name).to_s
         legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
         legend  = template.content_tag(:legend, template.content_tag(:span, Formtastic::Util.html_safe(legend))) unless legend.blank?
-      
+
         if block_given?
           contents = if template.respond_to?(:is_haml?) && template.is_haml?
             template.capture_haml(&block)
@@ -36,22 +36,22 @@ def field_set_and_list_wrapping(*args, &block) #:nodoc:
             template.capture(&block)
           end
         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,
           Formtastic::Util.html_safe(legend) << template.content_tag(:ol, Formtastic::Util.html_safe(contents)),
           html_options.except(:builder, :parent)
         )
-      
+
         fieldset
       end
-      
+
       # Gets the nested_child_index value from the parent builder. 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')
-  
+
         child = parent[:for]
         child = child.first if child.respond_to?(:first)
         duck[child].to_i + 1
diff --git a/lib/formtastic/helpers/file_column_detection.rb b/lib/formtastic/helpers/file_column_detection.rb
index 42a26e157..48c39b12b 100644
--- a/lib/formtastic/helpers/file_column_detection.rb
+++ b/lib/formtastic/helpers/file_column_detection.rb
@@ -2,7 +2,7 @@ module Formtastic
   module Helpers
     # @private
     module FileColumnDetection
-      
+
       def is_file?(method, options = {})
         @files ||= {}
         @files[method] ||= (options[:as].present? && options[:as] == :file) || begin
@@ -10,7 +10,7 @@ def is_file?(method, options = {})
           file && file_methods.any?{|m| file.respond_to?(m)}
         end
       end
-    
+
     end
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/helpers/form_helper.rb b/lib/formtastic/helpers/form_helper.rb
index 2c1e59b0a..80b04b0f3 100644
--- a/lib/formtastic/helpers/form_helper.rb
+++ b/lib/formtastic/helpers/form_helper.rb
@@ -1,6 +1,6 @@
 module Formtastic
   module Helpers
-    
+
     # FormHelper provides a handful of wrappers around Rails' built-in form helpers methods to set
     # the `:builder` option to `Formtastic::FormBuilder` and apply some class names to the `<form>`
     # tag.
@@ -25,13 +25,13 @@ module Helpers
     # helpers are also supported by Formtastic.
     #
     # Since `Formtastic::FormBuilder` subclasses Rails' own `FormBuilder`, you have access to all
-    # of Rails' built-in form helper methods such as `text_field`, `check_box`, `radio_button`, 
-    # etc **in addition to** all of Formtastic's additional helpers like {InputsHelper#inputs inputs}, 
+    # of Rails' built-in form helper methods such as `text_field`, `check_box`, `radio_button`,
+    # etc **in addition to** all of Formtastic's additional helpers like {InputsHelper#inputs inputs},
     # {InputsHelper#input input}, {ButtonsHelper#buttons buttons}, etc:
     #
     #     <%= semantic_form_for(@post) do |f| %>
     #
-    #       <!-- Formtastic -->       
+    #       <!-- Formtastic -->
     #       <%= f.input :title %>
     #
     #       <!-- Rails -->
@@ -42,34 +42,34 @@ module Helpers
     #       </li>
     #     <% end %>
     #
-    # Formtastic is a superset of Rails' FormBuilder. It deliberately avoids overriding or modifying 
-    # the behavior of Rails' own form helpers so that you can use Formtastic helpers when suited, 
+    # Formtastic is a superset of Rails' FormBuilder. It deliberately avoids overriding or modifying
+    # the behavior of Rails' own form helpers so that you can use Formtastic helpers when suited,
     # and fall back to regular Rails helpers, ERB and HTML when needed. In other words, you're never
     # fully committed to The Formtastic Way.
     module FormHelper
-      
+
       # Allows the `:builder` option on `form_for` etc to be changed to your own which subclasses
       # `Formtastic::FormBuilder`. Change this from `config/initializers/formtastic.rb`.
       @@builder = Formtastic::FormBuilder
       mattr_accessor :builder
-      
-      # Allows the default class we add to all `<form>` tags to be changed from `formtastic` to 
+
+      # Allows the default class we add to all `<form>` tags to be changed from `formtastic` to
       # `whatever`. Change this from `config/initializers/formtastic.rb`.
       @@default_form_class = 'formtastic'
       mattr_accessor :default_form_class
-  
-      # Wrapper around Rails' own `form_for` helper to set the `:builder` option to 
-      # `Formtastic::FormBuilder` and to set some class names on the `<form>` tag such as 
+
+      # Wrapper around Rails' own `form_for` helper to set the `:builder` option to
+      # `Formtastic::FormBuilder` and to set some class names on the `<form>` tag such as
       # `formtastic` and the downcased and underscored model name (eg `post`).
       #
       # See Rails' `form_for` for full documentation of all supported arguments and options.
       #
       # Since `Formtastic::FormBuilder` subclasses Rails' own FormBuilder, you have access to all
-      # of Rails' built-in form helper methods such as `text_field`, `check_box`, `radio_button`, 
-      # etc **in addition to** all of Formtastic's additional helpers like {InputsHelper#inputs inputs}, 
+      # of Rails' built-in form helper methods such as `text_field`, `check_box`, `radio_button`,
+      # etc **in addition to** all of Formtastic's additional helpers like {InputsHelper#inputs inputs},
       # {InputsHelper#input input}, {ButtonsHelper#buttons buttons}, etc.
       #
-      # Most of the examples below have been adapted from the examples found in the Rails `form_for` 
+      # Most of the examples below have been adapted from the examples found in the Rails `form_for`
       # documentation.
       #
       # @see http://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html Rails' FormHelper documentation (`form_for`, etc)
@@ -143,7 +143,7 @@ def semantic_form_for(record_or_name_or_array, *args, &proc)
         form_helper_wrapper(:form_for, record_or_name_or_array, *args, &proc)
       end
 
-      # Wrapper around Rails' own `fields_for` helper to set the `:builder` option to 
+      # Wrapper around Rails' own `fields_for` helper to set the `:builder` option to
       # `Formtastic::FormBuilder`.
       #
       # @see #semantic_form_for
@@ -151,8 +151,8 @@ def semantic_fields_for(record_or_name_or_array, *args, &proc)
         form_helper_wrapper(:fields_for, record_or_name_or_array, *args, &proc)
       end
 
-      # Wrapper around Rails' own `remote_form_for` helper to set the `:builder` option to 
-      # `Formtastic::FormBuilder` and to set some class names on the `<form>` tag such as 
+      # Wrapper around Rails' own `remote_form_for` helper to set the `:builder` option to
+      # `Formtastic::FormBuilder` and to set some class names on the `<form>` tag such as
       # `formtastic` and the downcased and underscored model name.
       #
       # @see #semantic_form_for
@@ -160,7 +160,7 @@ def semantic_fields_for(record_or_name_or_array, *args, &proc)
       def semantic_remote_form_for(record_or_name_or_array, *args, &proc)
         form_helper_wrapper(:remote_form_for, record_or_name_or_array, *args, &proc)
       end
-      
+
       def semantic_remote_form_for_wrapper(record_or_name_or_array, *args, &proc)
         options = args.extract_options!
         if respond_to? :remote_form_for
@@ -175,7 +175,7 @@ def semantic_remote_form_for_wrapper(record_or_name_or_array, *args, &proc)
       alias :semantic_form_remote_for :semantic_remote_form_for
 
       protected
-      
+
       # @todo pretty sure some of this (like HTML classes and record naming are exlusive to `form_for`)
       def form_helper_wrapper(rails_helper_method_name, record_or_name_or_array, *args, &proc)
         options = args.extract_options!
@@ -198,7 +198,7 @@ def form_helper_wrapper(rails_helper_method_name, record_or_name_or_array, *args
           self.send(rails_helper_method_name, record_or_name_or_array, *(args << options), &proc)
         end
       end
-    
+
       # 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.
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index d14af10a1..1ad2f2e5c 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -5,8 +5,8 @@
 
 module Formtastic
   module Helpers
-    
-    # InputsHelper encapsulates the responsibilties of the {#inputs} and {#input} helpers at the core of the 
+
+    # InputsHelper encapsulates the responsibilties of the {#inputs} and {#input} helpers at the core of the
     # Formtastic DSL.
     #
     # {#inputs} is used to wrap a series of form items in a `<fieldset>` and `<ol>`, with each item
@@ -40,7 +40,7 @@ module Helpers
     #
     # It's important to note that the `semantic_form_for` and {#inputs} blocks wrap the
     # standard Rails `form_for` helper and form builder, so you have full access to every standard
-    # Rails form helper, with any HTML markup and ERB syntax, allowing you to "break free" from 
+    # Rails form helper, with any HTML markup and ERB syntax, allowing you to "break free" from
     # Formtastic when it doesn't suit:
     #
     #     <%= semantic_form_for @post do |f| %>
@@ -59,10 +59,10 @@ module InputsHelper
       include Formtastic::Helpers::FileColumnDetection
       include Formtastic::Reflection
       include Formtastic::LocalizedString
-      
+
       # Which columns to skip when automatically rendering a form without any fields specified.
       SKIPPED_COLUMNS = [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
-      
+
       # Returns a chunk of HTML markup for a given `method` on the form object, wrapped in
       # an `<li>` wrapper tag with appropriate `class` and `id` attribute hooks for CSS and JS.
       # In many cases, the contents of the wrapper will be as simple as a `<label>` and an `<input>`:
@@ -74,8 +74,8 @@ module InputsHelper
       #       <input type="text" name="post[title]" value="" id="post_title">
       #     </li>
       #
-      # In other cases (like a series of checkboxes for a `has_many` relationship), the wrapper may 
-      # include more complex markup, like a nested `<fieldset>` with a `<legend>` and an `<ol>` of 
+      # In other cases (like a series of checkboxes for a `has_many` relationship), the wrapper may
+      # include more complex markup, like a nested `<fieldset>` with a `<legend>` and an `<ol>` of
       # checkbox/label pairs for each choice:
       #
       #     <%= f.input :categories, :as => :check_boxes, :collection => Category.active.ordered %>
@@ -97,15 +97,15 @@ module InputsHelper
       #       </fieldset>
       #     </li>
       #
-      # Sensible defaults for all options are guessed by looking at the method name, database column 
+      # Sensible defaults for all options are guessed by looking at the method name, database column
       # information, association information, validation information, etc. For example, a `:string`
       # database column will map to a `:string` input, but if the method name contains 'email', will
       # map to an `:email` input instead. `belongs_to` associations will have a `:select` input, etc.
-      #             
+      #
       # Formtastic supports many different styles of inputs, and you can/should override the default
-      # with the `:as` option. Internally, the symbol is used to map to a protected method 
-      # responsible for the details. For example, `:as => :string` will map to `string_input`, 
-      # defined in a module of the same name. Detailed documentation for each input style and it's 
+      # with the `:as` option. Internally, the symbol is used to map to a protected method
+      # responsible for the details. For example, `:as => :string` will map to `string_input`,
+      # defined in a module of the same name. Detailed documentation for each input style and it's
       # supported options is available on the `*_input` method in each module (links provided below).
       #
       # Available input styles:
@@ -132,25 +132,25 @@ module InputsHelper
       #
       # @todo document the "guessing" of input style
       #
-      # @param [Symbol] method 
+      # @param [Symbol] method
       #   The database column or method name on the form object that this input represents
       #
-      # @option options :as [Symbol] 
+      # @option options :as [Symbol]
       #   Override the style of input should be rendered
       #
-      # @option options :label [String, Symbol, false] 
+      # @option options :label [String, Symbol, false]
       #   Override the label text
       #
-      # @option options :hint [String, Symbol, false]  
+      # @option options :hint [String, Symbol, false]
       #   Override hint text
       #
-      # @option options :required [Boolean] 
+      # @option options :required [Boolean]
       #   Override to mark the input as required (or not)
       #
-      # @option options :input_html [Hash]  
+      # @option options :input_html [Hash]
       #   Override or add to the HTML attributes to be passed down to the `<input>` tag
       #
-      # @option options :wrapper_html [Hash] 
+      # @option options :wrapper_html [Hash]
       #   Override or add to the HTML attributes to be passed down to the wrapping `<li>` tag
       #
       # @option options :collection [Array<ActiveModel, String, Symbol>, Hash{String => String, Boolean}, OrderedHash{String => String, Boolean}]
@@ -244,35 +244,35 @@ module InputsHelper
       # @todo Many many more examples. Some of the detail probably needs to be pushed out to the relevant methods too.
       def input(method, options = {})
         options = options.dup # Allow options to be shared without being tainted by Formtastic
-        
+
         options[:required] = method_required?(method) unless options.key?(:required)
         options[:as]     ||= default_input_type(method, options)
-    
+
         html_class = [ options[:as], (options[:required] ? :required : :optional) ]
         html_class << 'error' if has_errors?(method, options)
-    
+
         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 options[:input_html] && options[:input_html][:id]
           options[:label_html] ||= {}
           options[:label_html][:for] ||= options[:input_html][:id]
         end
-    
+
         input_parts = (custom_inline_order[options[:as]] || inline_order).dup
         input_parts = input_parts - [:errors, :hints] if options[:as] == :hidden
-    
+
         list_item_content = input_parts.map do |type|
           send(:"inline_#{type}_for", method, options)
         end.compact.join("\n")
-    
+
         return template.content_tag(:li, Formtastic::Util.html_safe(list_item_content), wrapper_html)
       end
-      
+
       # {#inputs} creates an input fieldset and ol tag wrapping for use around a set of inputs.  It can be
       # called either with a block (in which you can do the usual Rails form stuff, HTML, ERB, etc),
-      # or with a list of fields (accepting all default arguments and options). These two examples 
+      # or with a list of fields (accepting all default arguments and options). These two examples
       # are functionally equivalent:
       #
       #     # With a block:
@@ -282,12 +282,12 @@ def input(method, options = {})
       #         <%= f.input :body %>
       #       <% end %>
       #     <% end %>
-      #     
+      #
       #     # With a list of fields (short hand syntax):
       #     <% semantic_form_for @post do |form| %>
       #       <%= f.inputs :title, :body %>
       #     <% end %>
-      #     
+      #
       #     # Output:
       #     <form ...>
       #       <fieldset class="inputs">
@@ -304,8 +304,8 @@ def input(method, options = {})
       # without a block or a field list. In the case an input is rendered for **most** columns in
       # the model's database table (like Rails' scaffolding) plus inputs for some model associations.
       #
-      # In this case, all inputs are rendered with default options and arguments. You'll want more 
-      # control than this in a production application, but it's a great way to get started, then 
+      # In this case, all inputs are rendered with default options and arguments. You'll want more
+      # control than this in a production application, but it's a great way to get started, then
       # come back later to customise the form with a field list or a block of inputs.  Example:
       #
       #     <% semantic_form_for @post do |form| %>
@@ -314,7 +314,7 @@ def input(method, options = {})
       #
       # **Nested Attributes**
       #
-      # One of the most complicated parts of Rails forms comes when nesting the inputs for 
+      # One of the most complicated parts of Rails forms comes when nesting the inputs for
       # attrinbutes on associated models. Formtastic can take the pain away for many (but not all)
       # situations.
       #
@@ -334,7 +334,7 @@ def input(method, options = {})
       #
       #     <% semantic_form_for @user do |form| %>
       #       <%= f.inputs :name, :email %>
-      #     
+      #
       #       <% f.semantic_fields_for :profile do |profile| %>
       #         <% profile.inputs do %>
       #           <%= profile.input :biography %>
@@ -349,7 +349,7 @@ def input(method, options = {})
       #
       #     <% semantic_form_for @user do |f| %>
       #       <%= f.inputs :name, :email %>
-      #     
+      #
       #       <% f.inputs :for => :profile do %>
       #         <%= profile.input :biography %>
       #         <%= profile.input :twitter_name %>
@@ -374,10 +374,10 @@ def input(method, options = {})
       # @option *args :for [Symbol, ActiveModel, Array]
       #   The contents of this option is passed down to Rails' fields_for() helper, so it accepts the same values.
       #
-      # @option *args :name [String] 
+      # @option *args :name [String]
       #   The optional name passed into the `<legend>` tag within the fieldset (alias of `:title`)
       #
-      # @option *args :title [String] 
+      # @option *args :title [String]
       #   The optional name passed into the `<legend>` tag within the fieldset (alias of `:name`)
       #
       #
@@ -485,7 +485,7 @@ def inputs(*args, &block)
         html_options = args.extract_options!
         html_options[:class] ||= "inputs"
         html_options[:name] = title
-        
+
         if html_options[:for] # Nested form
           inputs_for_nested_attributes(*(args << html_options), &block)
         elsif block_given?
@@ -500,11 +500,11 @@ def inputs(*args, &block)
           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
-      
+
       # A thin wrapper around Rails' `fields_for` helper to set `:builder => Formtastic::FormBuilder`
       # for nesting forms. Can be used in the same way as `fields_for` (see the Rails documentation),
       # but you'll also have access to Formtastic's helpers ({#input}, etc) inside the block.
@@ -515,7 +515,7 @@ def inputs(*args, &block)
       #       <% author.inputs :name %>
       #     <% end %>
       #   <% end %>
-      #     
+      #
       #   <form ...>
       #     <fieldset class="inputs">
       #       <ol>
@@ -529,13 +529,13 @@ def semantic_fields_for(record_or_name_or_array, *args, &block)
         args.push(opts)
         fields_for(record_or_name_or_array, *args, &block)
       end
-      
-      # Generates error messages for the given method, used for displaying errors right near the 
+
+      # Generates error messages for the given method, used for displaying errors right near the
       # field for data entry. Uses the `:inline_errors` config to determin the right presentation,
       # which may be an ordered list, a paragraph sentence containing all errors, or a paragraph
       # containing just the first error. If configred to `:none`, no error is shown.
       #
-      # See the `:inline_errors` config documentation for more details. 
+      # See the `:inline_errors` config documentation for more details.
       #
       # This method is mostly used internally, but can be used in your forms when creating your own
       # custom inputs, so it's been made public and aliased to `errors_on`.
@@ -557,9 +557,9 @@ def inline_errors_for(method, options = {}) #:nodoc:
         end
       end
       alias :errors_on :inline_errors_for
-      
+
       protected
-      
+
       # Collects association columns (relation columns) for the current form object class.
       def association_columns(*by_associations) #:nodoc:
         if @object.present? && @object.class.respond_to?(:reflections)
@@ -574,12 +574,12 @@ def association_columns(*by_associations) #:nodoc:
           []
         end
       end
-      
+
       # Collects content columns (non-relation columns) for the current form object class.
       def content_columns #:nodoc:
         model_name.constantize.content_columns.collect { |c| c.name.to_sym }.compact rescue []
       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.
@@ -588,7 +588,7 @@ def content_columns #:nodoc:
       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
@@ -602,11 +602,11 @@ def inputs_for_nested_attributes(*args, &block) #:nodoc:
             template.concat(contents)
           end
         end
-  
+
         fields_for_args = [options.delete(:for), options.delete(:for_options) || {}].flatten
         semantic_fields_for(*fields_for_args, &fields_for_block)
       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
@@ -622,7 +622,7 @@ def inputs_for_nested_attributes(*args, &block) #:nodoc:
       #   configuration option all_fields_required_by_default is used.
       def method_required?(attribute) #:nodoc:
         attribute_sym = attribute.to_s.sub(/_id$/, '').to_sym
-  
+
         if @object && @object.class.respond_to?(:reflect_on_validations_for)
           @object.class.reflect_on_validations_for(attribute_sym).any? do |validation|
             (validation.macro == :validates_presence_of || validation.macro == :validates_inclusion_of) &&
@@ -637,14 +637,14 @@ def method_required?(attribute) #:nodoc:
           end
         end
       end
-      
+
       # Determines whether the given options evaluate to true
       def options_require_validation?(options) #nodoc
         allow_blank = options[:allow_blank]
         return !allow_blank unless allow_blank.nil?
         if_condition = !options[:if].nil?
         condition = if_condition ? options[:if] : options[:unless]
-  
+
         condition = if condition.respond_to?(:call)
                       condition.call(@object)
                     elsif condition.is_a?(::Symbol) && @object.respond_to?(condition)
@@ -652,10 +652,10 @@ def options_require_validation?(options) #nodoc
                     else
                       condition
                     end
-  
+
         if_condition ? !!condition : !condition
       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
@@ -683,7 +683,7 @@ def default_input_type(method, options = {}) #:nodoc:
           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).
@@ -691,26 +691,26 @@ def default_input_type(method, options = {}) #:nodoc:
         else
           if @object
             return :select  if reflection_for(method)
-  
+
             return :file    if is_file?(method, options)
           end
-  
+
           return :select    if options.key?(:collection)
           return :password  if method.to_s =~ /password/
           return :string
         end
       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
-      
+
       # 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
-  
+
       # 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)
@@ -718,13 +718,13 @@ def inline_hints_for(method, options) #:nodoc:
         hint_class = options[:hint_class] || default_hint_class
         template.content_tag(:p, Formtastic::Util.html_safe(options[:hint]), :class => hint_class)
       end
-      
+
       # Creates an error sentence by calling to_sentence on the errors array.
       def error_sentence(errors, options = {}) #:nodoc:
         error_class = options[:error_class] || default_inline_error_class
         template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.untaint), :class => error_class)
       end
-  
+
       # Creates an error li list.
       def error_list(errors, options = {}) #:nodoc:
         error_class = options[:error_class] || default_error_list_class
@@ -734,18 +734,18 @@ def error_list(errors, options = {}) #:nodoc:
         end
         template.content_tag(:ul, Formtastic::Util.html_safe(list_elements.join("\n")), :class => error_class)
       end
-  
+
       # Creates an error sentence containing only the first error
       def error_first(errors, options = {}) #:nodoc:
         error_class = options[:error_class] || default_inline_error_class
         template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => error_class)
       end
-      
+
       def field_set_title_from_args(*args) #:nodoc:
         options = args.extract_options!
         options[:name] ||= options.delete(:title)
         title = options[:name]
-  
+
         if title.blank?
           valid_name_classes = [::String, ::Symbol]
           valid_name_classes.delete(::Symbol) if !block_given? && (args.first.is_a?(::Symbol) && content_columns.include?(args.first))
@@ -754,7 +754,7 @@ def field_set_title_from_args(*args) #:nodoc:
         title = localized_string(title, title, :title) if title.is_a?(::Symbol)
         title
       end
-      
+
     end
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/helpers/label_helper.rb b/lib/formtastic/helpers/label_helper.rb
index 4c1c96282..d3f0a110a 100644
--- a/lib/formtastic/helpers/label_helper.rb
+++ b/lib/formtastic/helpers/label_helper.rb
@@ -4,13 +4,13 @@ module Formtastic
   module Helpers
     module LabelHelper
       include Formtastic::LocalizedString
-      
+
       # Generates the label for the input. It's a superset of the functionality of Rails' own `label`
       # helper, meaning that it accepts the same arguments and options, plus some new arguments that
       # are exclusive to Formtastic.
       #
-      # It's unlikely you will need call this method direct from your views, but it's been made 
-      # public to document the changes made to the Rails method, for the rare occasions when you 
+      # It's unlikely you will need call this method direct from your views, but it's been made
+      # public to document the changes made to the Rails method, for the rare occasions when you
       # might build your own input in the view using regular form helpers.
       #
       # @param [Symbol] method
@@ -26,13 +26,13 @@ module LabelHelper
       #   Override the text for the contents of the `<label>` tag
       #
       # @option options [true, false] :required
-      #   Specify if the field required or not. By default this value is "guessed" by reflecting on 
-      #   the model validations, with a fallback to `all_fields_required_by_default` configuration. 
-      #   Required and optional labels have the `required_string` (defaults to an asterix wrapped 
+      #   Specify if the field required or not. By default this value is "guessed" by reflecting on
+      #   the model validations, with a fallback to `all_fields_required_by_default` configuration.
+      #   Required and optional labels have the `required_string` (defaults to an asterix wrapped
       #   in an `<abbr>` tag) or `optional_string` configuration variables appended to them.
       #
       # @option options [Symbol] :input_name
-      #   Gives the input to match for. This is needed when you want to call `f.label :authors` but 
+      #   Gives the input to match for. This is needed when you want to call `f.label :authors` but
       #   it should match `:author_ids`.
       #
       #
@@ -68,22 +68,22 @@ def label(method, options_or_text=nil, options=nil)
           text = options_or_text
           options ||= {}
         end
-      
+
         text = localized_string(method, text, :label) || humanized_attribute_name(method)
         text += required_or_optional_string(options.delete(:required))
         text = Formtastic::Util.html_safe(text)
-      
+
         # special case for boolean (checkbox) labels, which have a nested input
         if options.key?(:label_prefix_for_nested_input)
           text = options.delete(:label_prefix_for_nested_input) + text
         end
-      
+
         input_name = options.delete(:input_name) || method
         super(input_name, text, options)
       end
-      
+
       protected
-      
+
       # Generates the required or optional string. If the value set is a proc,
       # it evaluates the proc first.
       #
@@ -96,14 +96,14 @@ def required_or_optional_string(required) #:nodoc:
           else
             required
         end
-  
+
         if string_or_proc.is_a?(Proc)
           string_or_proc.call
         else
           string_or_proc.to_s
         end
       end
-      
+
     end
   end
 end
diff --git a/lib/formtastic/html_attributes.rb b/lib/formtastic/html_attributes.rb
index 87a1fe3de..1421e8c0d 100644
--- a/lib/formtastic/html_attributes.rb
+++ b/lib/formtastic/html_attributes.rb
@@ -1,9 +1,9 @@
 module Formtastic
   # @private
   module HtmlAttributes
-    
+
     protected
-    
+
     # 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
@@ -23,12 +23,12 @@ def generate_html_id(method_name, value='input') #:nodoc:
 
       [custom_namespace, sanitized_object_name, index, sanitized_method_name, value].reject{|x|x.blank?}.join('_')
     end
-    
+
     # Used by FormBuilder generate_html_id
     def sanitized_object_name #:nodoc:
       @sanitized_object_name ||= @object_name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
     end
-    
+
     def humanized_attribute_name(method)
       if @object && @object.class.respond_to?(:human_attribute_name)
         humanized_name = @object.class.human_attribute_name(method.to_s)
@@ -41,6 +41,6 @@ def humanized_attribute_name(method)
         method.to_s.send(label_str_method)
       end
     end
-  
+
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/base.rb b/lib/formtastic/inputs/base.rb
index a7315dce9..0f2372721 100644
--- a/lib/formtastic/inputs/base.rb
+++ b/lib/formtastic/inputs/base.rb
@@ -7,14 +7,14 @@ module Inputs
     module Base
       include Formtastic::Reflection
       include Formtastic::LocalizedString
-    
+
       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
-      
+
       def escape_html_entities(string) #:nodoc:
         if escape_html_entities_in_hints_and_labels
           # Acceppt html_safe flag as indicator to skip escaping
@@ -22,18 +22,18 @@ def escape_html_entities(string) #:nodoc:
         end
         string
       end
-      
+
       # Prepare options to be sent to label
       def options_for_label(options) #:nodoc:
         options.slice(:label, :required).merge!(options.fetch(:label_html, {}))
       end
-      
+
       # 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, :find_options, :class)
       end
-      
+
       # Generates the legend for radiobuttons and checkboxes
       def legend_tag(method, options = {})
         if options[:label] == false
@@ -45,7 +45,7 @@ def legend_tag(method, options = {})
           template.content_tag :legend, template.label_tag(nil, text, :for => nil), :class => :label
         end
       end
-      
+
       # Used by select and radio inputs. The collection can be retrieved by
       # three ways:
       #
@@ -59,19 +59,19 @@ def legend_tag(method, options = {})
       #
       def find_collection_for_column(column, options) #:nodoc:
         collection = find_raw_collection_for_column(column, options)
-    
+
         # Return if we have a plain string
         return collection if collection.instance_of?(String) || collection.instance_of?(ActiveSupport::SafeBuffer)
-    
+
         # 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) &&
                              !(options.include?(:label_method) || options.include?(:value_method))
-    
+
         label, value = detect_label_and_value_method!(collection, options)
         collection.map { |o| [send_or_call(label, o), send_or_call(value, o)] }
       end
-      
+
       # Detects the label and value methods from a collection using methods set in
       # collection_label_methods and collection_value_methods. For some ruby core
       # classes sensible defaults have been defined. It will use and delete the options
@@ -79,7 +79,7 @@ def find_collection_for_column(column, options) #:nodoc:
       #
       def detect_label_and_value_method!(collection, options = {})
         sample = collection.first || collection.last
-    
+
         case sample
         when Array
           label, value = :first, :last
@@ -88,14 +88,14 @@ def detect_label_and_value_method!(collection, options = {})
         when String, NilClass
           label, value = :to_s, :to_s
         end
-    
+
         # Order of preference: user supplied method, class defaults, auto-detect
         label = options[:label_method] || label || collection_label_methods.find { |m| sample.respond_to?(m) }
         value = options[:value_method] || value || collection_value_methods.find { |m| sample.respond_to?(m) }
-    
+
         [label, value]
       end
-      
+
       # Used by association inputs (select, radio) to generate the name that should
       # be used for the input
       #
@@ -117,7 +117,7 @@ def generate_association_input_name(method) #:nodoc:
           method
         end.to_sym
       end
-    
+
     end
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/basic.rb b/lib/formtastic/inputs/basic.rb
index 114667c40..cb4584e02 100644
--- a/lib/formtastic/inputs/basic.rb
+++ b/lib/formtastic/inputs/basic.rb
@@ -2,7 +2,7 @@ module Formtastic
   module Inputs
     # @private
     module Basic
-      
+
       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, :text, :phone, :search, :url, :email].include?(type)
@@ -13,9 +13,9 @@ def basic_input_helper(form_helper_method, type, method, options) #:nodoc:
         label(method, label_options) <<
           send(respond_to?(form_helper_method) ? form_helper_method : :text_field, method, html_options)
       end
-      
+
       protected
-      
+
       # Generates default_string_options by retrieving column information from
       # the database.
       #
@@ -25,19 +25,19 @@ def get_maxlength_for(method)
             (validation.respond_to?(:macro) && validation.macro == :validates_length_of) || # Rails 2 + 3 style validation
             (validation.respond_to?(:kind) && validation.kind == :length) # Rails 3 style validator
           end
-  
+
           if validation
             validation.options[:maximum] || (validation.options[:within].present? ? validation.options[:within].max : nil)
           else
             nil
           end
         end
-  
+
         validation_max_limit = get_maxlength_for(method)
         column = column_for(method)
-  
+
         if type == :text
-          { :rows => default_text_area_height, 
+          { :rows => default_text_area_height,
             :cols => default_text_area_width }
         elsif type == :numeric || column.nil? || !column.respond_to?(:limit) || column.limit.nil?
           { :maxlength => validation_max_limit,
@@ -47,7 +47,7 @@ def get_maxlength_for(method)
             :size => default_text_field_size }
         end
       end
-      
+
       # Returns the active validations for the given method or an empty Array if no validations are
       # found for the method.
       #
@@ -70,14 +70,14 @@ def validations_for(method, mode = :active)
             []
           end
         end
-  
+
         validations = validations.select do |validation|
           (validation.options.present? ? options_require_validation?(validation.options) : true)
         end unless mode == :all
-  
+
         return validations
       end
-      
+
     end
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/boolean_input.rb b/lib/formtastic/inputs/boolean_input.rb
index 73d683aa9..52cdcdfd2 100644
--- a/lib/formtastic/inputs/boolean_input.rb
+++ b/lib/formtastic/inputs/boolean_input.rb
@@ -12,7 +12,7 @@ module Inputs
     #       <%= f.input :published, :as => :boolean %>
     #     <% end %>
     #   <% end %>
-    #   
+    #
     #   <form...>
     #     <fieldset>
     #       <ol>
@@ -28,18 +28,18 @@ module Inputs
     #   </form>
     #
     # @example Set the values for the checked and unchecked states
-    #   <%= f.input :published, :checked_value => "yes", :unchecked_value => "no" %> 
+    #   <%= f.input :published, :checked_value => "yes", :unchecked_value => "no" %>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     module BooleanInput
       include Formtastic::Inputs::Base
-      
+
       def boolean_input(method, options)
         html_options  = options.delete(:input_html) || {}
         checked_value = options.delete(:checked_value) || '1'
         unchecked_value = options.delete(:unchecked_value) || '0'
         checked = @object && ActionView::Helpers::InstanceTag.check_box_checked?(@object.send(:"#{method}"), checked_value)
-  
+
         html_options[:id] = html_options[:id] || generate_html_id(method, "")
         input = template.check_box_tag(
           "#{@object_name}[#{method}]",
@@ -47,13 +47,13 @@ def boolean_input(method, options)
           checked,
           html_options
         )
-        
+
         options = options_for_label(options)
         options[:for] ||= html_options[:id]
-  
+
         # the label() method will insert this nested input into the label at the last minute
         options[:label_prefix_for_nested_input] = input
-  
+
         template.hidden_field_tag((html_options[:name] || "#{@object_name}[#{method}]"), unchecked_value, :id => nil) << label(method, options)
       end
     end
diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index c5fa81fda..9e308437f 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -2,15 +2,15 @@
 
 module Formtastic
   module Inputs
-    
-    # A CheckBoxes input is used to render a series of checkboxes. This is an alternative input choice 
-    # for `has_many` or `has_and_belongs_to_many` associations like a `Post` belonging to many 
+
+    # A CheckBoxes input is used to render a series of checkboxes. This is an alternative input choice
+    # for `has_many` or `has_and_belongs_to_many` associations like a `Post` belonging to many
     # `categories` (by default, a {SelectInput `:select`} input is used, allowing multiple selections).
     #
     # Within the standard `<li>` wrapper, the output is a `<fieldset>` with a `<legend>` to
-    # represent the "label" for the input, and an `<ol>` containing `<li>`s for each choice in 
+    # represent the "label" for the input, and an `<ol>` containing `<li>`s for each choice in
     # the association. Each `<li>` choice contains a hidden `<input>` tag for the "unchecked"
-    # value (like Rails), and a `<label>` containing the checkbox `<input>` and the label text 
+    # value (like Rails), and a `<label>` containing the checkbox `<input>` and the label text
     # for each choice.
     #
     # @example Basic example with full form context
@@ -53,17 +53,17 @@ module Inputs
     #
     # @example `:disabled` can be used to disable any checkboxes with a value found in the given Array
     #   <%= f.input :categories, :as => :check_boxes, :collection => ["a", "b"], :disabled => ["a"] %>
-    # 
+    #
     # @example `:label_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the label text (it'll try the methods like `to_s` in `collection_label_methods` config by default)
     #   <%= f.input :categories, :as => :check_boxes, :label_method => :name %>
     #   <%= f.input :categories, :as => :check_boxes, :label_method => :name_with_post_count
     #   <%= f.input :categories, :as => :check_boxes, :label_method => Proc.new { |c| "#{c.name} (#{pluralize("post", c.posts.count)})" }
-    # 
+    #
     # @example `:value_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the value for each checkbox (it'll try the methods like `id` in `collection_value_methods` config by default)
     #   <%= f.input :categories, :as => :check_boxes, :value_method => :code %>
     #   <%= f.input :categories, :as => :check_boxes, :value_method => :isbn
     #   <%= f.input :categories, :as => :check_boxes, :value_method => Proc.new { |c| c.name.downcase.underscore }
-    # 
+    #
     # @example `:value_as_class` can be used to add a class to the `<li>` wrapped around each choice using the checkbox value for custom styling of each choice
     #   <%= f.input :categories, :as => :check_boxes, :value_as_class => true %>
     #
@@ -71,51 +71,51 @@ module Inputs
     # @see Formtastic::Inputs::BooleanInput BooleanInput for a single checkbox for boolean (checked = true) inputs
     module CheckBoxesInput
       include Formtastic::Inputs::Base
-      
+
       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)
         hidden_fields   = options.delete(:hidden_fields)
         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_values = find_selected_values_for_column(method, options)
         disabled_option_is_present = options.key?(:disabled)
         disabled_values = [*options[:disabled]] if disabled_option_is_present
-  
+
         li_options = value_as_class ? { :class => [method.to_s.singularize, 'default'].join('_') } : {}
-  
+
         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)
           html_options[:disabled] = disabled_values.include?(value) if disabled_option_is_present
           html_options[:id] = input_id
-  
+
           li_content = template.content_tag(:label,
             Formtastic::Util.html_safe("#{create_check_boxes(input_name, html_options, value, unchecked_value, hidden_fields)} #{escape_html_entities(label)}"),
             :for => input_id
           )
-  
+
           li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
           template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
         end
-  
+
         fieldset_content = legend_tag(method, options)
         fieldset_content << create_hidden_field_for_check_boxes(input_name, value_as_class) unless hidden_fields
         fieldset_content << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
         template.content_tag(:fieldset, fieldset_content)
       end
-      
+
       protected
-      
+
       # Used by check_boxes input. The selected values will be set by retrieving the value
       # through the association.
       #
@@ -130,21 +130,21 @@ def find_selected_values_for_column(method, options)
           []
         end
       end
-      
+
       # Outputs a custom hidden field for check_boxes
       def create_hidden_field_for_check_boxes(method, value_as_class) #:nodoc:
         options = value_as_class ? { :class => [method.to_s.singularize, 'default'].join('_') } : {}
         input_name = "#{object_name}[#{method.to_s}][]"
         template.hidden_field_tag(input_name, '', options)
       end
-  
+
       # Outputs a checkbox tag. If called with hidden_fields = true a plain check_box_tag is returned,
       # otherwise the helper uses the output generated by the rails check_box method.
       def create_check_boxes(input_name, html_options = {}, checked_value = "1", unchecked_value = "0", hidden_fields = false) #:nodoc:
         return template.check_box_tag(input_name, checked_value, html_options[:checked], html_options) unless hidden_fields == true
         check_box(input_name, html_options, checked_value, unchecked_value)
       end
-      
+
       def send_or_call(duck, object)
         if duck.is_a?(Proc)
           duck.call(object)
diff --git a/lib/formtastic/inputs/country_input.rb b/lib/formtastic/inputs/country_input.rb
index 32c494e24..db6d863f0 100644
--- a/lib/formtastic/inputs/country_input.rb
+++ b/lib/formtastic/inputs/country_input.rb
@@ -3,17 +3,17 @@
 module Formtastic
   module Inputs
     # 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 do 
+    # Rails doesn't come with a `country_select` helper by default any more, so you'll need to do
     # one of the following:
-    # 
+    #
     # * install [the official Rails plugin](http://github.com/rails/iso-3166-country-select)
     # * install any other country_select plugin that behaves in a similar way
     # * roll your own `country_select` helper with the same args and options as the Rails one
     #
-    # By default, Formtastic includes a handfull of English-speaking countries as "priority 
-    # counties", which can be set in the `priority_countries` configuration array in the 
-    # formtastic.rb initializer to suit your market and user base (see README for more info on 
-    # configuration). Additionally, it is possible to set the :priority_countries on a per-input 
+    # By default, Formtastic includes a handfull of English-speaking countries as "priority
+    # counties", which can be set in the `priority_countries` configuration array in the
+    # formtastic.rb initializer to suit your market and user base (see README for more info on
+    # configuration). Additionally, it is possible to set the :priority_countries on a per-input
     # basis through the `:priority_countries` option. These priority countries will be passed down
     # to the `country_select` helper of your choice, and may or may not be used by the helper.
     #
@@ -50,18 +50,18 @@ module Inputs
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     module CountryInput
       include Formtastic::Inputs::Base
-      
+
       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 respond_to?(:country_select)
-  
+
         html_options = options.delete(:input_html) || {}
         priority_countries = options.delete(:priority_countries) || self.priority_countries
-  
+
         field_id = generate_html_id(method, "")
         html_options[:id] ||= field_id
         label_options = options_for_label(options)
         label_options[:for] ||= html_options[:id]
-  
+
         label(method, label_options) <<
         country_select(method, priority_countries, strip_formtastic_options(options), html_options)
       end
diff --git a/lib/formtastic/inputs/email_input.rb b/lib/formtastic/inputs/email_input.rb
index 5fab66354..86dd41b13 100644
--- a/lib/formtastic/inputs/email_input.rb
+++ b/lib/formtastic/inputs/email_input.rb
@@ -3,13 +3,13 @@
 
 module Formtastic
   module Inputs
-    
+
     # Outputs a simple `<label>` with a HTML5 `<input type="email">` wrapped in the standard
-    # `<li>` wrapper. This is the default input choice for attributes with a name matching 
+    # `<li>` wrapper. This is the default input choice for attributes with a name matching
     # `/email/`, but can be applied to any text-like input with `:as => :email`.
     #
     # @example Full form context and output
-    # 
+    #
     #   <%= semantic_form_for(@user) do |f| %>
     #     <%= f.inputs do %>
     #       <%= f.input :email_address, :as => :email %>
@@ -31,7 +31,7 @@ module Inputs
     module EmailInput
       include Formtastic::Inputs::Base
       include Formtastic::Inputs::Basic
-      
+
       def email_input(method, options)
         basic_input_helper(:email_field, :email, method, options)
       end
diff --git a/lib/formtastic/inputs/file_input.rb b/lib/formtastic/inputs/file_input.rb
index be8c660ef..407e1d3de 100644
--- a/lib/formtastic/inputs/file_input.rb
+++ b/lib/formtastic/inputs/file_input.rb
@@ -3,17 +3,17 @@
 
 module Formtastic
   module Inputs
-    
+
     # Outputs a simple `<label>` with a `<input type="file">` wrapped in the standard
     # `<li>` wrapper. This is the default input choice for objects with attributes that appear
     # to be for file uploads, by detecting some common method names used by popular file upload
-    # libraries such as Paperclip and CarrierWave. You can add to or alter these method names 
+    # libraries such as Paperclip and CarrierWave. You can add to or alter these method names
     # through the `file_methods` config, but can be applied to any input with `:as => :file`.
     #
     # Don't forget to set the multipart attribute in your `<form>` tag!
     #
     # @example Full form context and output
-    # 
+    #
     #   <%= semantic_form_for(@user, :html => { :multipart => true }) do |f| %>
     #     <%= f.inputs do %>
     #       <%= f.input :email_address, :as => :email %>
@@ -35,7 +35,7 @@ module Inputs
     module FileInput
       include Formtastic::Inputs::Base
       include Formtastic::Inputs::Basic
-      
+
       def file_input(method, options)
         basic_input_helper(:file_field, :file, method, options)
       end
diff --git a/lib/formtastic/inputs/hidden_input.rb b/lib/formtastic/inputs/hidden_input.rb
index 0385ba1cc..e114b91f5 100644
--- a/lib/formtastic/inputs/hidden_input.rb
+++ b/lib/formtastic/inputs/hidden_input.rb
@@ -1,14 +1,14 @@
 module Formtastic
   module Inputs
-    
+
     # Outputs a simple `<input type="hidden">` wrapped in the standard `<li>` wrapper. This is
     # provided for situations where a hidden field needs to be rendered in the flow of a form with
-    # many inputs that form an `<ol>`. Wrapping the hidden input inside the `<li>` maintains the 
+    # many inputs that form an `<ol>`. Wrapping the hidden input inside the `<li>` maintains the
     # HTML validity. The `<li>` is marked with a `class` of `hidden` so that stylesheet authors can
     # hide these list items with CSS (formtastic.css does this out of the box).
-    # 
+    #
     # @example Full form context, output and CSS
-    # 
+    #
     #   <%= semantic_form_for(@something) do |f| %>
     #     <%= f.inputs do %>
     #       <%= f.input :secret, :as => :hidden %>
@@ -30,7 +30,7 @@ module Inputs
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     module HiddenInput
       include Formtastic::Inputs::Base
-      
+
       def hidden_input(method, options)
         options ||= {}
         html_options = options.delete(:input_html) || strip_formtastic_options(options)
diff --git a/lib/formtastic/inputs/numeric_input.rb b/lib/formtastic/inputs/numeric_input.rb
index 2003f4da6..6c370b6e9 100644
--- a/lib/formtastic/inputs/numeric_input.rb
+++ b/lib/formtastic/inputs/numeric_input.rb
@@ -2,14 +2,14 @@
 
 module Formtastic
   module Inputs
-    
+
     # Outputs a simple `<label>` with a HTML5 `<input type="number">` wrapped in the standard
     # `<li>` wrapper. This is the default input choice for all database columns of the type `:float`
-    # and `:decimal`, as well as `:integer` columns that aren't used for `belongs_to` associations`, 
+    # and `:decimal`, as well as `:integer` columns that aren't used for `belongs_to` associations`,
     # but can be applied to any text-like input with `:as => :numeric`.
     #
     # @example Full form context and output
-    # 
+    #
     #   <%= semantic_form_for(@user) do |f| %>
     #     <%= f.inputs do %>
     #       <%= f.input :shoe_size, :as => :numeric %>
@@ -34,7 +34,7 @@ module Inputs
     module NumericInput
       include Formtastic::Inputs::Base
       include Formtastic::Inputs::Basic
-      
+
       def numeric_input(method, options)
         basic_input_helper(:text_field, :numeric, method, options)
       end
diff --git a/lib/formtastic/inputs/password_input.rb b/lib/formtastic/inputs/password_input.rb
index 534fb93bd..b7ea5c9b9 100644
--- a/lib/formtastic/inputs/password_input.rb
+++ b/lib/formtastic/inputs/password_input.rb
@@ -2,13 +2,13 @@
 
 module Formtastic
   module Inputs
-    
+
     # Outputs a simple `<label>` with a `<input type="password">` wrapped in the standard
-    # `<li>` wrapper. This is the default input choice for all attributes matching `/password/`, but 
+    # `<li>` wrapper. This is the default input choice for all attributes matching `/password/`, but
     # can be applied to any text-like input with `:as => :password`.
     #
     # @example Full form context and output
-    # 
+    #
     #   <%= semantic_form_for(@user) do |f| %>
     #     <%= f.inputs do %>
     #       <%= f.input :password, :as => :password %>
@@ -30,7 +30,7 @@ module Inputs
     module PasswordInput
       include Formtastic::Inputs::Base
       include Formtastic::Inputs::Basic
-      
+
       # Outputs a label and standard Rails password field inside the wrapper.
       def password_input(method, options)
         basic_input_helper(:password_field, :password, method, options)
diff --git a/lib/formtastic/inputs/phone_input.rb b/lib/formtastic/inputs/phone_input.rb
index 095c65d94..c1a1d7340 100644
--- a/lib/formtastic/inputs/phone_input.rb
+++ b/lib/formtastic/inputs/phone_input.rb
@@ -2,13 +2,13 @@
 
 module Formtastic
   module Inputs
-    
+
     # Outputs a simple `<label>` with a HTML5 `<input type="phone">` wrapped in the standard
-    # `<li>` wrapper. This is the default input choice for attributes with a name matching 
+    # `<li>` wrapper. This is the default input choice for attributes with a name matching
     # `/(phone|fax)/`, but can be applied to any text-like input with `:as => :phone`.
     #
     # @example Full form context and output
-    # 
+    #
     #   <%= semantic_form_for(@user) do |f| %>
     #     <%= f.inputs do %>
     #       <%= f.input :mobile, :as => :phone %>
diff --git a/lib/formtastic/inputs/radio_input.rb b/lib/formtastic/inputs/radio_input.rb
index d7aaa0bbf..d3ce95888 100644
--- a/lib/formtastic/inputs/radio_input.rb
+++ b/lib/formtastic/inputs/radio_input.rb
@@ -1,21 +1,21 @@
 module Formtastic
   module Inputs
-    
-    # A radio input is used to render a series of radio inputs. This is an alternative input choice 
-    # for `belongs_to` associations like a `Post` belonging to a `Section` or an `Author`, or any 
+
+    # A radio input is used to render a series of radio inputs. This is an alternative input choice
+    # for `belongs_to` associations like a `Post` belonging to a `Section` or an `Author`, or any
     # case where the user needs to make a single selection from a pre-defined collectioon of choices.
     #
     # Within the standard `<li>` wrapper, the output is a `<fieldset>` with a `<legend>` to
-    # represent the "label" for the input, and an `<ol>` containing `<li>`s for each choice in 
-    # the association. Each `<li>` choice has a `<label>` containing an `<input type="radio">` and 
+    # represent the "label" for the input, and an `<ol>` containing `<li>`s for each choice in
+    # the association. Each `<li>` choice has a `<label>` containing an `<input type="radio">` and
     # the label text to describe each choice.
     #
-    # Radio inputs can be considered as an alternative where a (non-multi) select input is used, 
-    # especially in cases where there are only a few choices, however they are not used by default 
+    # Radio inputs can be considered as an alternative where a (non-multi) select input is used,
+    # especially in cases where there are only a few choices, however they are not used by default
     # for any type of association or model attribute. You can choose to use a radio input instead of
     # a select with `:as => :radio`.
     #
-    # Like a select input, the flexibility of the `:collection` option (see examples) makes the 
+    # Like a select input, the flexibility of the `:collection` option (see examples) makes the
     # :radio input viable as an alternative for many other input types. For example, instead of...
     #
     # * a `:string` input (where you want to force the user to choose from a few specific strings rather than entering anything)
@@ -25,16 +25,16 @@ module Inputs
     # * a `:time_zone` input (where you want to provide your own small set of choices instead of relying on Rails)
     # * a `:country` input (where you want to provide a small set of choices, no need for a plugin really)
     #
-    # For radio inputs that map to associations on the object model, Formtastic will automatically 
-    # load in a collection of objects on the association as options to choose from. This might be an 
+    # For radio inputs that map to associations on the object model, Formtastic will automatically
+    # load in a collection of objects on the association as options to choose from. This might be an
     # `Author.all` on a `Post` form with an input for a `belongs_to :user` association, or a
-    # `Section.all` for a `Post` form with an input for a `belongs_to :section` association. 
+    # `Section.all` for a `Post` form with an input for a `belongs_to :section` association.
     # You can override or customise this collection through the `:collection` option (see examples).
     #
-    # The way on which Formtastic renders the `value` attribute and label for each choice is 
+    # The way on which Formtastic renders the `value` attribute and label for each choice is
     # customisable through the `:label_method` and `:value_method` options (see examples below).
-    # When not provided, we fall back to a list of methods to try on each object such as 
-    # `:to_label`, `:name` and `:to_s`, which are defined in the configurations 
+    # When not provided, we fall back to a list of methods to try on each object such as
+    # `:to_label`, `:name` and `:to_s`, which are defined in the configurations
     # `collection_label_methods` and `collection_value_methods`.
     #
     # @example Basic `belongs_to` example with full form context
@@ -44,7 +44,7 @@ module Inputs
     #         <%= f.input :author, :as => :radio %>
     #       <% end %>
     #     <% end %>
-    #     
+    #
     #     <form...>
     #       <fieldset>
     #         <ol>
@@ -84,19 +84,19 @@ module Inputs
     #   <%= f.input :author, :as => :radio, :collection => [["Justin", "1"], ["Kate", "3"]] %>
     #   <%= f.input :author, :as => :radio, :collection => [["Justin", 1], ["Kate", 3]] %>
     #   <%= f.input :author, :as => :radio, :collection => 1..5 %>
-    # 
+    #
     # @example The `:label_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the label text (it'll try the methods like `to_s` in `collection_label_methods` config by default)
     #   <%= f.input :author, :as => :radio, :label_method => :name %>
     #   <%= f.input :author, :as => :radio, :label_method => :name_with_post_count
     #   <%= f.input :author, :as => :radio, :label_method => Proc.new { |a| "#{c.name} (#{pluralize("post", a.posts.count)})" }
-    # 
+    #
     # @example The `:value_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the value for each checkbox (it'll try the methods like `id` in `collection_value_methods` config by default)
     #   <%= f.input :author, :as => :radio, :value_method => :login %>
     #   <%= f.input :author, :as => :radio, :value_method => Proc.new { |c| c.full_name.downcase.underscore }
-    # 
+    #
     # @example Set HTML attributes on each `<input type="radio">` tag with `:input_html`
     #   <%= f.input :author, :as => :radio, :input_html => { :size => 20, :multiple => true, :class => "special" } %>
-    # 
+    #
     # @example Set HTML attributes on the `<li>` wrapper with `:wrapper_html`
     #   <%= f.input :author, :as => :radio, :wrapper_html => { :class => "special" } %>
     #
@@ -107,35 +107,35 @@ module Inputs
     # @see Formtastic::Inputs::Select RadioInput as an alternative for `belongs_to` associations
     module RadioInput
       include Formtastic::Inputs::Base
-      
+
       # 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 = []
-  
+
         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[:id] = input_id
-  
+
           li_content = template.content_tag(:label,
             Formtastic::Util.html_safe("#{radio_button(input_name, value, html_options)} #{escape_html_entities(label)}"),
             :for => input_id
           )
-  
+
           li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
           template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
         end
-  
+
         template.content_tag(:fieldset,
           legend_tag(method, options) << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
         )
diff --git a/lib/formtastic/inputs/search_input.rb b/lib/formtastic/inputs/search_input.rb
index 0ca93f1d5..e8b80a96d 100644
--- a/lib/formtastic/inputs/search_input.rb
+++ b/lib/formtastic/inputs/search_input.rb
@@ -2,13 +2,13 @@
 
 module Formtastic
   module Inputs
-    
+
     # Outputs a simple `<label>` with a HTML5 `<input type="search">` wrapped in the standard
-    # `<li>` wrapper. This is the default input choice for attributes with a name matching 
+    # `<li>` wrapper. This is the default input choice for attributes with a name matching
     # `/^search$/`, but can be applied to any text-like input with `:as => :search`.
     #
     # @example Full form context and output
-    # 
+    #
     #   <%= semantic_form_for(@search, :html => { :method => :get }) do |f| %>
     #     <%= f.inputs do %>
     #       <%= f.input :q, :as => :search, :label => false, :input_html => { :name => "q" } %>
@@ -29,7 +29,7 @@ module Inputs
     module SearchInput
       include Formtastic::Inputs::Base
       include Formtastic::Inputs::Basic
-      
+
       def search_input(method, options)
         basic_input_helper(:search_field, :search, method, options)
       end
diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index f6bcf5c78..d2aaac13b 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -2,9 +2,9 @@
 
 module Formtastic
   module Inputs
-    # A select input is used to render a `<select>` tag with a series of options to choose from. 
+    # A select input is used to render a `<select>` tag with a series of options to choose from.
     # It works for both single selections (like a `belongs_to` relationship, or "yes/no" boolean),
-    # as well as multiple selections (like a `has_and_belongs_to_many`/`has_many` relationship, 
+    # as well as multiple selections (like a `has_and_belongs_to_many`/`has_many` relationship,
     # for assigning many genres to a song, for example).
     #
     # This is the default input choice when:
@@ -24,20 +24,20 @@ module Inputs
     # * a `:time_zone` input (where you want to provide your own set of choices instead of relying on Rails)
     # * a `:country` input (no need for a plugin really)
     #
-    # Within the standard `<li>` wrapper, the output is a `<label>` tag followed by a `<select>` 
+    # Within the standard `<li>` wrapper, the output is a `<label>` tag followed by a `<select>`
     # tag containing `<option>` tags.
     #
     # For inputs that map to associations on the object model, Formtastic will automatically load
-    # in a collection of objects on the association as options to choose from. This might be an 
-    # `Author.all` on a `Post` form with an input for a `belongs_to :user` association, or a 
-    # `Tag.all` for a `Post` form with an input for a `has_and_belongs_to_many :tags` association. 
+    # in a collection of objects on the association as options to choose from. This might be an
+    # `Author.all` on a `Post` form with an input for a `belongs_to :user` association, or a
+    # `Tag.all` for a `Post` form with an input for a `has_and_belongs_to_many :tags` association.
     # You can override or customise this collection and the `<option>` tags it will render through
     # the `:collection` option (see examples).
     #
     # The way on which Formtastic renders the `value` attribute and content of each `<option>` tag
     # is customisable through the `:label_method` and `:value_method` options. When not provided,
-    # we fall back to a list of methods to try on each object such as `:to_label`, `:name` and 
-    # `:to_s`, which are defined in the configurations `collection_label_methods` and 
+    # we fall back to a list of methods to try on each object such as `:to_label`, `:name` and
+    # `:to_s`, which are defined in the configurations `collection_label_methods` and
     # `collection_value_methods` (see examples below).
     #
     # @example Basic `belongs_to` example with full form context
@@ -47,7 +47,7 @@ module Inputs
     #         <%= f.input :author, :as => :select %>
     #       <% end %>
     #     <% end %>
-    #     
+    #
     #     <form...>
     #       <fieldset>
     #         <ol>
@@ -71,7 +71,7 @@ module Inputs
     #         <%= f.input :tags, :as => :select %>
     #       <% end %>
     #     <% end %>
-    #     
+    #
     #     <form...>
     #       <fieldset>
     #         <ol>
@@ -107,19 +107,19 @@ module Inputs
     #   <%= f.input :author, :as => :select, :collection => options_from_collection_for_select(...) %>
     #   <%= f.input :author, :as => :select, :collection => grouped_options_for_select(...) %>
     #   <%= f.input :author, :as => :select, :collection => time_zone_options_for_select(...) %>
-    # 
+    #
     # @example The `:label_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the label text (it'll try the methods like `to_s` in `collection_label_methods` config by default)
     #   <%= f.input :author, :as => :select, :label_method => :name %>
     #   <%= f.input :author, :as => :select, :label_method => :name_with_post_count
     #   <%= f.input :author, :as => :select, :label_method => Proc.new { |a| "#{c.name} (#{pluralize("post", a.posts.count)})" }
-    # 
+    #
     # @example The `:value_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the value for each checkbox (it'll try the methods like `id` in `collection_value_methods` config by default)
     #   <%= f.input :author, :as => :select, :value_method => :login %>
     #   <%= f.input :author, :as => :select, :value_method => Proc.new { |c| c.full_name.downcase.underscore }
-    # 
+    #
     # @example Set HTML attributes on the `<select>` tag with `:input_html`
     #   <%= f.input :authors, :as => :select, :input_html => { :size => 20, :multiple => true, :class => "special" } %>
-    # 
+    #
     # @example Set HTML attributes on the `<li>` wrapper with `:wrapper_html`
     #   <%= f.input :authors, :as => :select, :wrapper_html => { :class => "special" } %>
     #
@@ -137,12 +137,12 @@ module Inputs
     module SelectInput
       include Formtastic::Inputs::Base
       include Formtastic::Reflection
-      
+
       def select_input(method, options)
         html_options = options.delete(:input_html) || {}
         html_options[:multiple] = html_options[:multiple] || options.delete(:multiple)
         html_options.delete(:multiple) if html_options[:multiple].nil?
-  
+
         reflection = reflection_for(method)
         if reflection && [ :has_many, :has_and_belongs_to_many ].include?(reflection.macro)
           html_options[:multiple] = true if html_options[:multiple].nil?
@@ -152,7 +152,7 @@ def select_input(method, options)
         options = set_include_blank(options)
         input_name = generate_association_input_name(method)
         html_options[:id] ||= generate_html_id(input_name, "")
-  
+
         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.
@@ -162,7 +162,7 @@ def select_input(method, options)
           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
           grouped_collection_select(input_name, group_collection,
                                          group_association, group_label_method,
@@ -170,24 +170,24 @@ def select_input(method, options)
                                          strip_formtastic_options(options), html_options)
         else
           collection = find_collection_for_column(method, options)
-  
+
           select(input_name, collection, strip_formtastic_options(options), html_options)
         end
-  
+
         label_options = options_for_label(options).merge(:input_name => input_name)
         label_options[:for] ||= html_options[:id]
         label(method, label_options) << select_html
       end
-      
+
       protected
-      
+
       # 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 = reflection_for(column)
           options[:find_options] ||= {}
-  
+
           if conditions = reflection.options[:conditions]
             if reflection.klass.respond_to?(:merge_conditions)
               options[:find_options][:conditions] = reflection.klass.merge_conditions(conditions, options[:find_options][:conditions])
@@ -201,38 +201,38 @@ def find_raw_collection_for_column(column, options) #:nodoc:
         else
           create_boolean_collection(options)
         end
-  
+
         collection = collection.to_a if collection.is_a?(Hash)
         collection
       end
-      
+
       # 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)
-  
+
         [ [ options.delete(:true), true], [ options.delete(:false), false ] ]
       end
-      
+
       # Return the label collection method when none is supplied using the
       # values set in collection_label_methods.
       def detect_label_method(collection) #:nodoc:
         detect_label_and_value_method!(collection).first
       end
-      
+
       # 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 = 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.
@@ -245,7 +245,7 @@ def detect_group_association(method, group_by)
         # 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
@@ -257,11 +257,11 @@ def detect_group_association(method, group_by)
         # 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
-  
+
     end
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/string_input.rb b/lib/formtastic/inputs/string_input.rb
index 51dddfef8..4a604ff31 100644
--- a/lib/formtastic/inputs/string_input.rb
+++ b/lib/formtastic/inputs/string_input.rb
@@ -2,14 +2,14 @@
 
 module Formtastic
   module Inputs
-    
+
     # Outputs a simple `<label>` with a `<input type="text">` wrapped in the standard
     # `<li>` wrapper. This is the default input choice for database columns of the `:string` type,
     # and is the default choice for all inputs when no other logical input type can be inferred.
     # You can force any input to be a string input with `:as => :string`.
     #
     # @example Full form context and output
-    # 
+    #
     #   <%= semantic_form_for(@user) do |f| %>
     #     <%= f.inputs do %>
     #       <%= f.input :first_name, :as => :string %>
diff --git a/lib/formtastic/inputs/text_input.rb b/lib/formtastic/inputs/text_input.rb
index cab9e12d4..81612ee91 100644
--- a/lib/formtastic/inputs/text_input.rb
+++ b/lib/formtastic/inputs/text_input.rb
@@ -2,13 +2,13 @@
 
 module Formtastic
   module Inputs
-    
+
     # Outputs a simple `<label>` with a `<textarea>` wrapped in the standard
     # `<li>` wrapper. This is the default input choice for database columns of the `:text` type,
     # but can forced on any text-like input with `:as => :text`.
     #
     # @example Full form context and output
-    # 
+    #
     #   <%= semantic_form_for(@user) do |f| %>
     #     <%= f.inputs do %>
     #       <%= f.input :first_name, :as => :string %>
@@ -29,7 +29,7 @@ module Inputs
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     module TextInput
       include Formtastic::Inputs::Basic
-      
+
       def text_input(method, options)
         basic_input_helper(:text_area, :text, method, options)
       end
diff --git a/lib/formtastic/inputs/time_zone_input.rb b/lib/formtastic/inputs/time_zone_input.rb
index 98a8284f9..c00b25191 100644
--- a/lib/formtastic/inputs/time_zone_input.rb
+++ b/lib/formtastic/inputs/time_zone_input.rb
@@ -1,14 +1,14 @@
 module Formtastic
   module Inputs
-    
-    # Outputs a `<label>` with a `<select>` containing a series of time zones (using Rails' own 
+
+    # Outputs a `<label>` with a `<select>` containing a series of time zones (using Rails' own
     # `time_zone_select` helper), wrapped in the standard `<li>` wrapper.
-    
+
     # This is the default input choice for attributes matching /time_zone/, but can be applied to
     # any text-like input with `:as => :time_zone`.
     #
     # @example Full form context and output
-    # 
+    #
     #   <%= semantic_form_for(@user) do |f| %>
     #     <%= f.inputs do %>
     #       <%= f.input :time_zone, :as => :time_zone %>
@@ -27,7 +27,7 @@ module Inputs
     #   </form>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    
+
     module TimeZoneInput
       def time_zone_input(method, options)
         html_options = options.delete(:input_html) || {}
diff --git a/lib/formtastic/inputs/timeish.rb b/lib/formtastic/inputs/timeish.rb
index e51274156..911e0e64c 100644
--- a/lib/formtastic/inputs/timeish.rb
+++ b/lib/formtastic/inputs/timeish.rb
@@ -1,12 +1,12 @@
 module Formtastic
   module Inputs
 
-    # Outputs a complex input consisting of multiple select boxes for each fragment of a date 
+    # Outputs a complex input consisting of multiple select boxes for each fragment of a date
     # (year, month, day), time (hour, min, sec) or date time (year, month, day, hour, min, sec).
     #
-    # The output of this helper **looks** quite similar to Rails' own `date_select`, 
-    # `date_time_select` and `time_select` helpers in the browser, but under the hood the HTML 
-    # produced is quite different, trying to address many issues with the Rails helper's HTML 
+    # The output of this helper **looks** quite similar to Rails' own `date_select`,
+    # `date_time_select` and `time_select` helpers in the browser, but under the hood the HTML
+    # produced is quite different, trying to address many issues with the Rails helper's HTML
     # validity, semantics and accessibility.
     #
     # By default, Rails will return a series of `<select>` tags without a corresponding `<label>`
@@ -16,7 +16,7 @@ module Inputs
     # The `<li>` date fragments are wrapped in an `<ol>` and a `<fieldset>` to indicate that the
     # fragments are part of a set of fields that should be grouped together.
     #
-    # The `<fieldset>` is then "labeled" with a `<legend>` tag that describes the set with the 
+    # The `<fieldset>` is then "labeled" with a `<legend>` tag that describes the set with the
     # same string that would normally be used for the `<label>` on a simpler input. The result
     # is something like this:
     #
@@ -55,20 +55,20 @@ module Inputs
     # This obviously would look quite different in a browser to what Rails does, but this is
     # addressed in the presentation layer with formtastic.css instead:
     #
-    # * the `<li>` date fragments are floated left against each other so they appear all on one 
+    # * the `<li>` date fragments are floated left against each other so they appear all on one
     #   line next to each other
     # * the `<label>` tags for each fragment are hidden with `display:none`
     # * the <legend> is positioned and styled to look like a regular `<label>` on simpler inputs
     #   found elsewhere in the form (to the left of the select tags)
-    # * the `<ol>` is positioned and styled to appear where the `<input>` would usually be on 
+    # * the `<ol>` is positioned and styled to appear where the `<input>` would usually be on
     #   simpler inputs found elsewhere in the form (the the right of the label), as a container
     #   for the floated `<li>` fragments
     #
-    # The intent is to support many of Rails' built-in date helper arguments and options, and 
+    # The intent is to support many of Rails' built-in date helper arguments and options, and
     # to post the same form data to your controllers.
     #
     # @example Basic `:date` example with full form context and output
-    # 
+    #
     #   <%= semantic_form_for(@post) do |f| %>
     #     <%= f.inputs do %>
     #       <%= f.input :publish_at, :as => :date %>
@@ -160,31 +160,31 @@ def date_or_datetime_input(method, options)
         inputs   = options.delete(:order) || i18n_date_order || [:year, :month, :day]
         inputs   = [] if options[:ignore_date]
         labels   = options.delete(:labels) || {}
-      
+
         time_inputs = [:hour, :minute]
         time_inputs << :second if options[:include_seconds]
-      
+
         list_items_capture = ""
         hidden_fields_capture = ""
-      
+
         datetime = @object.send(method) if @object && @object.send(method)
-      
+
         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) : 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 = labels[input] || ::I18n.t(input.to_s, :default => input.to_s.humanize, :scope => [:datetime, :prompts])
-      
+
             list_items_capture << template.content_tag(:li, Formtastic::Util.html_safe([
                 !item_label_text.blank? ? template.content_tag(:label, Formtastic::Util.html_safe(item_label_text), :for => input_id) : "",
                 template.send(:"select_#{input}", datetime, opts, html_options.merge(:id => input_id))
@@ -192,16 +192,16 @@ def date_or_datetime_input(method, options)
             )
           end
         end
-      
+
         hidden_fields_capture << field_set_and_list_wrapping_for_method(method, options.merge(:label_for => input_ids.first), list_items_capture)
       end
-      
+
       # Generates a fieldset and an ordered list but with label based in
       # method. This methods is currently used by radio and datetime inputs.
       # @private
       def field_set_and_list_wrapping_for_method(method, options, contents)
         contents = contents.join if contents.respond_to?(:join)
-  
+
         template.content_tag(:fieldset,
             template.content_tag(:legend,
                 label(method, options_for_label(options).merge(:for => options.delete(:label_for))), :class => 'label'
@@ -209,7 +209,7 @@ def field_set_and_list_wrapping_for_method(method, options, contents)
             template.content_tag(:ol, Formtastic::Util.html_safe(contents))
           )
       end
-  
+
     end
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/url_input.rb b/lib/formtastic/inputs/url_input.rb
index a62890018..a9ff3296f 100644
--- a/lib/formtastic/inputs/url_input.rb
+++ b/lib/formtastic/inputs/url_input.rb
@@ -1,12 +1,12 @@
 module Formtastic
   module Inputs
-    
+
     # Outputs a simple `<label>` with a HTML5 `<input type="url">` wrapped in the standard
-    # `<li>` wrapper. This is the default input choice for all attributes matching 
+    # `<li>` wrapper. This is the default input choice for all attributes matching
     # `/^url$|^website$|_url$/`, but can be applied to any text-like input with `:as => :url`.
     #
     # @example Full form context and output
-    # 
+    #
     #   <%= semantic_form_for(@user) do |f| %>
     #     <%= f.inputs do %>
     #       <%= f.input :home_page, :as => :url %>
@@ -27,7 +27,7 @@ module Inputs
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     module UrlInput
       include Formtastic::Inputs::Basic
-      
+
       def url_input(method, options)
         basic_input_helper(:url_field, :url, method, options)
       end
diff --git a/lib/formtastic/localized_string.rb b/lib/formtastic/localized_string.rb
index 6223adf69..29ad7427d 100644
--- a/lib/formtastic/localized_string.rb
+++ b/lib/formtastic/localized_string.rb
@@ -1,9 +1,9 @@
 module Formtastic
   # @private
   module LocalizedString
-    
+
     protected
-    
+
     # Internal generic method for looking up localized values within Formtastic
     # using I18n, if no explicit value is set and I18n-lookups are enabled.
     #
@@ -27,17 +27,17 @@ module LocalizedString
     #
     def localized_string(key, value, type, options = {}) #:nodoc:
       key = value if value.is_a?(::Symbol)
-    
+
       if value.is_a?(::String)
         escape_html_entities(value)
       else
         use_i18n = value.nil? ? i18n_lookups_by_default : (value != false)
-    
+
         if use_i18n
           model_name, nested_model_name  = normalize_model_name(self.model_name.underscore)
           action_name = template.params[:action].to_s rescue ''
           attribute_name = key.to_s
-    
+
           defaults = Formtastic::I18n::SCOPES.reject do |i18n_scope|
             nested_model_name.nil? && i18n_scope.match(/nested_model/)
           end.collect do |i18n_scope|
@@ -50,9 +50,9 @@ def localized_string(key, value, type, options = {}) #:nodoc:
             i18n_path.to_sym
           end
           defaults << ''
-    
+
           defaults.uniq!
-    
+
           default_key = defaults.shift
           i18n_value = Formtastic::I18n.t(default_key,
             options.merge(:default => defaults, :scope => type.to_s.pluralize.to_sym))
@@ -67,11 +67,11 @@ def localized_string(key, value, type, options = {}) #:nodoc:
         end
       end
     end
-    
+
     def model_name
       @object.present? ? @object.class.name : @object_name.to_s.classify
     end
-    
+
     def normalize_model_name(name)
       if name =~ /(.+)\[(.+)\]/
         [$1, $2]
@@ -79,6 +79,6 @@ def normalize_model_name(name)
         [name]
       end
     end
-    
+
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/util.rb b/lib/formtastic/util.rb
index 96bc5ed3a..d9a9016a7 100644
--- a/lib/formtastic/util.rb
+++ b/lib/formtastic/util.rb
@@ -20,6 +20,6 @@ def html_safe(text)
         text
       end
     end
-    
+
   end
 end
diff --git a/lib/generators/formtastic/form/form_generator.rb b/lib/generators/formtastic/form/form_generator.rb
index ee52bab37..4e58403c7 100644
--- a/lib/generators/formtastic/form/form_generator.rb
+++ b/lib/generators/formtastic/form/form_generator.rb
@@ -7,11 +7,11 @@ module Formtastic
   #   $ rails generate formtastic:form Post
   # @example Copy the partial code to the pasteboard rather than generating a partial
   #   $ rails generate formtastic:form Post --copy
-  # @example Return HAML output instead of ERB 
+  # @example Return HAML output instead of ERB
   #   $ rails generate formtastic:form Post --haml
-  # @example Generate a form for specific model attributes 
+  # @example Generate a form for specific model attributes
   #   $ rails generate formtastic:form Post title:string body:text
-  # @example Generate a form for a specific controller 
+  # @example Generate a form for a specific controller
   #   $ rails generate formtastic:form Post --controller admin/posts
   class FormGenerator < Rails::Generators::NamedBase
     desc "Generates a Formtastic form partial based on an existing model."
diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index 988487835..d10237b83 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -44,7 +44,7 @@ form.formtastic fieldset > ol > li { overflow:auto; } /* clearing contained floa
 form.formtastic fieldset > ol > li.required { }
 form.formtastic fieldset > ol > li.optional { }
 form.formtastic fieldset > ol > li.error { }
-  
+
 
 /* LABELS
 --------------------------------------------------------------------------------------------------*/
@@ -77,16 +77,16 @@ form.formtastic fieldset > ol > li ul.errors li { padding:0; border:none; displa
 
 /* STRING, NUMERIC, PASSWORD, EMAIL, URL, PHONE & SEARCH OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol > li.string input, 
-form.formtastic fieldset > ol > li.password input, 
+form.formtastic fieldset > ol > li.string input,
+form.formtastic fieldset > ol > li.password input,
 form.formtastic fieldset > ol > li.numeric input,
 form.formtastic fieldset > ol > li.email input,
 form.formtastic fieldset > ol > li.url input,
 form.formtastic fieldset > ol > li.phone input,
 form.formtastic fieldset > ol > li.search input { width:72%; }
 
-form.formtastic fieldset > ol > li.string input[size], 
-form.formtastic fieldset > ol > li.password input[size], 
+form.formtastic fieldset > ol > li.string input[size],
+form.formtastic fieldset > ol > li.password input[size],
 form.formtastic fieldset > ol > li.numeric input[size],
 form.formtastic fieldset > ol > li.email input[size],
 form.formtastic fieldset > ol > li.url input[size],
@@ -140,6 +140,6 @@ form.formtastic fieldset > ol > li.date fieldset ol li label,
 form.formtastic fieldset > ol > li.time fieldset ol li label,
 form.formtastic fieldset > ol > li.datetime fieldset ol li label { display:none; }
 
-form.formtastic fieldset > ol > li.date fieldset ol li label input, 
-form.formtastic fieldset > ol > li.time fieldset ol li label input, 
+form.formtastic fieldset > ol > li.date fieldset ol li label input,
+form.formtastic fieldset > ol > li.time fieldset ol li label input,
 form.formtastic fieldset > ol > li.datetime fieldset ol li label input { display:inline; margin:0; padding:0;  }
diff --git a/lib/generators/templates/formtastic.rb b/lib/generators/templates/formtastic.rb
index dca628b2c..f5ebd799b 100644
--- a/lib/generators/templates/formtastic.rb
+++ b/lib/generators/templates/formtastic.rb
@@ -1,10 +1,10 @@
 # encoding: utf-8
 
 # --------------------------------------------------------------------------------------------------
-# Please note: If you're subclassing Formtastic::FormBuilder, Formtastic uses 
-# class_attribute for these configuration attributes instead of the deprecated 
-# class_inheritable_attribute. The behaviour is slightly different with subclasses (especially 
-# around attributes with Hash or Array) values, so make sure you understand what's happening. 
+# Please note: If you're subclassing Formtastic::FormBuilder, Formtastic uses
+# class_attribute for these configuration attributes instead of the deprecated
+# class_inheritable_attribute. The behaviour is slightly different with subclasses (especially
+# around attributes with Hash or Array) values, so make sure you understand what's happening.
 # See the documentation for class_attribute in ActiveSupport for more information.
 # --------------------------------------------------------------------------------------------------
 

From 02c449ac837a88f2990f5b46317df4bf98ec93bc Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Fri, 25 Feb 2011 20:15:57 -0300
Subject: [PATCH 552/992] with_deprecation_silenced is not used

---
 spec/support/deprecation.rb | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 spec/support/deprecation.rb

diff --git a/spec/support/deprecation.rb b/spec/support/deprecation.rb
deleted file mode 100644
index e21242b7a..000000000
--- a/spec/support/deprecation.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-def with_deprecation_silenced(&block)
-  ::ActiveSupport::Deprecation.silence do
-    yield
-  end
-end
-

From cb9449a20e329ac86524928620e5a6b2df1320d7 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Fri, 25 Feb 2011 20:16:19 -0300
Subject: [PATCH 553/992] Remove requires in favor of autoload

---
 lib/formtastic.rb                          | 17 ++++++++-----
 lib/formtastic/form_builder.rb             | 29 ----------------------
 lib/formtastic/helpers.rb                  | 12 +++++++++
 lib/formtastic/helpers/buttons_helper.rb   |  3 ---
 lib/formtastic/helpers/errors_helper.rb    |  4 ---
 lib/formtastic/helpers/inputs_helper.rb    |  5 ----
 lib/formtastic/helpers/label_helper.rb     |  2 --
 lib/formtastic/inputs.rb                   | 28 +++++++++++++++++++++
 lib/formtastic/inputs/base.rb              |  3 ---
 lib/formtastic/inputs/boolean_input.rb     |  2 --
 lib/formtastic/inputs/check_boxes_input.rb |  2 --
 lib/formtastic/inputs/country_input.rb     |  2 --
 lib/formtastic/inputs/date_input.rb        |  3 ---
 lib/formtastic/inputs/datetime_input.rb    |  3 ---
 lib/formtastic/inputs/email_input.rb       |  3 ---
 lib/formtastic/inputs/file_input.rb        |  3 ---
 lib/formtastic/inputs/numeric_input.rb     |  2 --
 lib/formtastic/inputs/password_input.rb    |  2 --
 lib/formtastic/inputs/phone_input.rb       |  2 --
 lib/formtastic/inputs/search_input.rb      |  2 --
 lib/formtastic/inputs/select_input.rb      |  2 --
 lib/formtastic/inputs/string_input.rb      |  2 --
 lib/formtastic/inputs/text_input.rb        |  2 --
 lib/formtastic/inputs/time_input.rb        |  2 --
 lib/formtastic/railtie.rb                  |  3 ---
 25 files changed, 51 insertions(+), 89 deletions(-)
 create mode 100644 lib/formtastic/helpers.rb
 create mode 100644 lib/formtastic/inputs.rb

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 093d231e7..d8410680c 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1,8 +1,13 @@
 # encoding: utf-8
 
-require 'formtastic/i18n'
-require 'formtastic/util'
-require 'formtastic/railtie' if defined?(::Rails::Railtie)
-require 'formtastic/form_builder'
-require 'formtastic/semantic_form_builder' # TODO remove from 2.0
-require 'formtastic/helpers/form_helper'
+module Formtastic
+  extend ActiveSupport::Autoload
+
+  autoload :FormBuilder
+  autoload :Helpers
+  autoload :HtmlAttributes
+  autoload :I18n
+  autoload :Inputs
+  autoload :LocalizedString
+  autoload :Reflection
+end
diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 7e1ecd224..67a45c079 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -1,32 +1,3 @@
-$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__))))
-
-require 'html_attributes'
-
-require 'helpers/inputs_helper'
-require 'helpers/buttons_helper'
-require 'helpers/label_helper'
-require 'helpers/errors_helper'
-
-require 'inputs/boolean_input'
-require 'inputs/check_boxes_input'
-require 'inputs/country_input'
-require 'inputs/datetime_input'
-require 'inputs/date_input'
-require 'inputs/email_input'
-require 'inputs/file_input'
-require 'inputs/hidden_input'
-require 'inputs/numeric_input'
-require 'inputs/password_input'
-require 'inputs/phone_input'
-require 'inputs/radio_input'
-require 'inputs/search_input'
-require 'inputs/select_input'
-require 'inputs/string_input'
-require 'inputs/text_input'
-require 'inputs/time_input'
-require 'inputs/time_zone_input'
-require 'inputs/url_input'
-
 module Formtastic
   class FormBuilder < ActionView::Helpers::FormBuilder
 
diff --git a/lib/formtastic/helpers.rb b/lib/formtastic/helpers.rb
new file mode 100644
index 000000000..6f7b1237a
--- /dev/null
+++ b/lib/formtastic/helpers.rb
@@ -0,0 +1,12 @@
+module Formtastic
+  module Helpers
+    autoload :ButtonsHelper, 'formtastic/helpers/buttons_helper'
+    autoload :ErrorsHelper, 'formtastic/helpers/errors_helper'
+    autoload :FieldsetWrapper, 'formtastic/helpers/fieldset_wrapper'
+    autoload :FileColumnDetection, 'formtastic/helpers/file_column_detection'
+    autoload :FormHelper, 'formtastic/helpers/form_helper'
+    autoload :InputsHelper, 'formtastic/helpers/inputs_helper'
+    autoload :LabelHelper, 'formtastic/helpers/label_helper'
+    autoload :SemanticFormHelper, 'formtastic/helpers/semantic_form_helper'
+  end
+end
diff --git a/lib/formtastic/helpers/buttons_helper.rb b/lib/formtastic/helpers/buttons_helper.rb
index adbfa11aa..abae1ac54 100644
--- a/lib/formtastic/helpers/buttons_helper.rb
+++ b/lib/formtastic/helpers/buttons_helper.rb
@@ -1,6 +1,3 @@
-require 'helpers/fieldset_wrapper'
-require 'localized_string'
-
 module Formtastic
   module Helpers
 
diff --git a/lib/formtastic/helpers/errors_helper.rb b/lib/formtastic/helpers/errors_helper.rb
index b7a4097cf..48c216b29 100644
--- a/lib/formtastic/helpers/errors_helper.rb
+++ b/lib/formtastic/helpers/errors_helper.rb
@@ -1,7 +1,3 @@
-require 'helpers/file_column_detection'
-require 'reflection'
-require 'localized_string'
-
 module Formtastic
   module Helpers
     module ErrorsHelper
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 1ad2f2e5c..0ae5f406f 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -1,8 +1,3 @@
-require 'helpers/fieldset_wrapper'
-require 'helpers/file_column_detection'
-require 'reflection'
-require 'localized_string'
-
 module Formtastic
   module Helpers
 
diff --git a/lib/formtastic/helpers/label_helper.rb b/lib/formtastic/helpers/label_helper.rb
index d3f0a110a..648836651 100644
--- a/lib/formtastic/helpers/label_helper.rb
+++ b/lib/formtastic/helpers/label_helper.rb
@@ -1,5 +1,3 @@
-require 'localized_string'
-
 module Formtastic
   module Helpers
     module LabelHelper
diff --git a/lib/formtastic/inputs.rb b/lib/formtastic/inputs.rb
new file mode 100644
index 000000000..745439107
--- /dev/null
+++ b/lib/formtastic/inputs.rb
@@ -0,0 +1,28 @@
+module Formtastic
+  module Inputs
+    extend ActiveSupport::Autoload
+
+    autoload :Base
+    autoload :Basic
+    autoload :BooleanInput
+    autoload :CheckBoxesInput
+    autoload :CountryInput
+    autoload :DateInput
+    autoload :DatetimeInput
+    autoload :EmailInput
+    autoload :FileInput
+    autoload :HiddenInput
+    autoload :NumericInput
+    autoload :PasswordInput
+    autoload :PhoneInput
+    autoload :RadioInput
+    autoload :SearchInput
+    autoload :SelectInput
+    autoload :StringInput
+    autoload :TextInput
+    autoload :TimeInput
+    autoload :TimeZoneInput
+    autoload :Timeish
+    autoload :UrlInput
+  end
+end
diff --git a/lib/formtastic/inputs/base.rb b/lib/formtastic/inputs/base.rb
index 0f2372721..f82e58b0f 100644
--- a/lib/formtastic/inputs/base.rb
+++ b/lib/formtastic/inputs/base.rb
@@ -1,6 +1,3 @@
-require 'reflection'
-require 'localized_string'
-
 module Formtastic
   module Inputs
     # @private
diff --git a/lib/formtastic/inputs/boolean_input.rb b/lib/formtastic/inputs/boolean_input.rb
index 52cdcdfd2..b10ad96c5 100644
--- a/lib/formtastic/inputs/boolean_input.rb
+++ b/lib/formtastic/inputs/boolean_input.rb
@@ -1,5 +1,3 @@
-require 'inputs/base'
-
 module Formtastic
   module Inputs
     # Boolean inputs are used to render an input for a single checkbox, typically for attributes
diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index 9e308437f..579f53d83 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -1,5 +1,3 @@
-require 'inputs/base'
-
 module Formtastic
   module Inputs
 
diff --git a/lib/formtastic/inputs/country_input.rb b/lib/formtastic/inputs/country_input.rb
index db6d863f0..1b245ef03 100644
--- a/lib/formtastic/inputs/country_input.rb
+++ b/lib/formtastic/inputs/country_input.rb
@@ -1,5 +1,3 @@
-require 'inputs/base'
-
 module Formtastic
   module Inputs
     # Outputs a country select input, wrapping around a regular country_select helper.
diff --git a/lib/formtastic/inputs/date_input.rb b/lib/formtastic/inputs/date_input.rb
index bfc77c64e..d91a02aa9 100644
--- a/lib/formtastic/inputs/date_input.rb
+++ b/lib/formtastic/inputs/date_input.rb
@@ -1,6 +1,3 @@
-require 'inputs/timeish'
-require 'inputs/base'
-
 module Formtastic
   module Inputs
     # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
diff --git a/lib/formtastic/inputs/datetime_input.rb b/lib/formtastic/inputs/datetime_input.rb
index 8ee30ee12..abc8a340a 100644
--- a/lib/formtastic/inputs/datetime_input.rb
+++ b/lib/formtastic/inputs/datetime_input.rb
@@ -1,6 +1,3 @@
-require 'inputs/timeish'
-require 'inputs/base'
-
 module Formtastic
   module Inputs
     # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
diff --git a/lib/formtastic/inputs/email_input.rb b/lib/formtastic/inputs/email_input.rb
index 86dd41b13..8f6249115 100644
--- a/lib/formtastic/inputs/email_input.rb
+++ b/lib/formtastic/inputs/email_input.rb
@@ -1,6 +1,3 @@
-require 'inputs/basic'
-require 'inputs/base'
-
 module Formtastic
   module Inputs
 
diff --git a/lib/formtastic/inputs/file_input.rb b/lib/formtastic/inputs/file_input.rb
index 407e1d3de..ba51977a2 100644
--- a/lib/formtastic/inputs/file_input.rb
+++ b/lib/formtastic/inputs/file_input.rb
@@ -1,6 +1,3 @@
-require 'inputs/basic'
-require 'inputs/base'
-
 module Formtastic
   module Inputs
 
diff --git a/lib/formtastic/inputs/numeric_input.rb b/lib/formtastic/inputs/numeric_input.rb
index 6c370b6e9..422895079 100644
--- a/lib/formtastic/inputs/numeric_input.rb
+++ b/lib/formtastic/inputs/numeric_input.rb
@@ -1,5 +1,3 @@
-require 'inputs/basic'
-
 module Formtastic
   module Inputs
 
diff --git a/lib/formtastic/inputs/password_input.rb b/lib/formtastic/inputs/password_input.rb
index b7ea5c9b9..0a8a300db 100644
--- a/lib/formtastic/inputs/password_input.rb
+++ b/lib/formtastic/inputs/password_input.rb
@@ -1,5 +1,3 @@
-require 'inputs/basic'
-
 module Formtastic
   module Inputs
 
diff --git a/lib/formtastic/inputs/phone_input.rb b/lib/formtastic/inputs/phone_input.rb
index c1a1d7340..e9a253af3 100644
--- a/lib/formtastic/inputs/phone_input.rb
+++ b/lib/formtastic/inputs/phone_input.rb
@@ -1,5 +1,3 @@
-require 'inputs/basic'
-
 module Formtastic
   module Inputs
 
diff --git a/lib/formtastic/inputs/search_input.rb b/lib/formtastic/inputs/search_input.rb
index e8b80a96d..6523cf81e 100644
--- a/lib/formtastic/inputs/search_input.rb
+++ b/lib/formtastic/inputs/search_input.rb
@@ -1,5 +1,3 @@
-require 'inputs/basic'
-
 module Formtastic
   module Inputs
 
diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index d2aaac13b..039f53899 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -1,5 +1,3 @@
-require 'reflection'
-
 module Formtastic
   module Inputs
     # A select input is used to render a `<select>` tag with a series of options to choose from.
diff --git a/lib/formtastic/inputs/string_input.rb b/lib/formtastic/inputs/string_input.rb
index 4a604ff31..d38a0e1b8 100644
--- a/lib/formtastic/inputs/string_input.rb
+++ b/lib/formtastic/inputs/string_input.rb
@@ -1,5 +1,3 @@
-require 'inputs/basic'
-
 module Formtastic
   module Inputs
 
diff --git a/lib/formtastic/inputs/text_input.rb b/lib/formtastic/inputs/text_input.rb
index 81612ee91..f36a75a79 100644
--- a/lib/formtastic/inputs/text_input.rb
+++ b/lib/formtastic/inputs/text_input.rb
@@ -1,5 +1,3 @@
-require 'inputs/basic'
-
 module Formtastic
   module Inputs
 
diff --git a/lib/formtastic/inputs/time_input.rb b/lib/formtastic/inputs/time_input.rb
index dd90209db..0c3135914 100644
--- a/lib/formtastic/inputs/time_input.rb
+++ b/lib/formtastic/inputs/time_input.rb
@@ -1,5 +1,3 @@
-require 'inputs/timeish'
-
 module Formtastic
   module Inputs
     # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
diff --git a/lib/formtastic/railtie.rb b/lib/formtastic/railtie.rb
index 33bcf6351..9d2a617a5 100644
--- a/lib/formtastic/railtie.rb
+++ b/lib/formtastic/railtie.rb
@@ -1,8 +1,5 @@
 # encoding: utf-8
 
-require 'formtastic'
-require 'rails'
-
 module Formtastic
   # @private
   class Railtie < Rails::Railtie

From d5a035c627895563a369b299b75e1ef325da7820 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 2 Mar 2011 21:50:06 +1100
Subject: [PATCH 554/992] first swing at a class-based input, using StringInput
 as a starting point

---
 README.textile                          |   5 -
 lib/formtastic/form_builder.rb          |   1 -
 lib/formtastic/helpers/inputs_helper.rb |   5 +-
 lib/formtastic/inputs/new_base.rb       | 266 ++++++++++++++++++++++++
 lib/formtastic/inputs/string_input.rb   |  16 +-
 spec/inputs/string_input_spec.rb        |  59 ++----
 6 files changed, 295 insertions(+), 57 deletions(-)
 create mode 100644 lib/formtastic/inputs/new_base.rb

diff --git a/README.textile b/README.textile
index 4eaf60ed0..066e7b8ca 100644
--- a/README.textile
+++ b/README.textile
@@ -490,11 +490,6 @@ You can show errors on base (by default) and any other attribute just passing it
 </pre>
 
 
-h2. ValidationReflection plugin
-
-If you have the "ValidationReflection":http://github.com/redinger/validation_reflection plugin installed, you won't have to specify the @:required@ option (it checks the validations on the model instead).
-
-
 h2. Configuration
 
 Run @rails generate formtastic:install@ to copy a commented out config file into @config/initializers/formtastic.rb@. You can "view the configuration file on GitHub":http://github.com/justinfrench/formtastic/blob/master/generators/formtastic/templates/formtastic.rb
diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 58dbd05c9..b30200a0f 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -82,7 +82,6 @@ def self.configure(name, value = nil)
     include Formtastic::Inputs::RadioInput
     include Formtastic::Inputs::SearchInput
     include Formtastic::Inputs::SelectInput
-    include Formtastic::Inputs::StringInput
     include Formtastic::Inputs::TextInput
     include Formtastic::Inputs::TimeInput
     include Formtastic::Inputs::TimeZoneInput
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index d14af10a1..1510d86b4 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -245,8 +245,11 @@ module InputsHelper
       def input(method, options = {})
         options = options.dup # Allow options to be shared without being tainted by Formtastic
         
-        options[:required] = method_required?(method) unless options.key?(:required)
         options[:as]     ||= default_input_type(method, options)
+
+        return Formtastic::Inputs::StringInput.new(self, template, @object, @object_name, method, options).to_html if options[:as] == :string
+        
+        options[:required] = method_required?(method) unless options.key?(:required)
     
         html_class = [ options[:as], (options[:required] ? :required : :optional) ]
         html_class << 'error' if has_errors?(method, options)
diff --git a/lib/formtastic/inputs/new_base.rb b/lib/formtastic/inputs/new_base.rb
new file mode 100644
index 000000000..09b8dca8f
--- /dev/null
+++ b/lib/formtastic/inputs/new_base.rb
@@ -0,0 +1,266 @@
+module Formtastic
+  module Inputs
+    class NewBase
+      
+      attr_accessor :builder, :template, :object, :object_name, :method, :options
+      
+      def initialize(builder, template, object, object_name, method, options)
+        @builder = builder
+        @template = template
+        @object = object
+        @object_name = object_name
+        @method = method
+        @options = options.dup
+      end
+      
+      def to_html
+        input_wrapping do
+          builder.label(method, label_html_options) <<
+          builder.text_field(method, input_html_options)
+        end
+      end
+      
+      def column
+        object.column_for_attribute(method) if object.respond_to?(:column_for_attribute)
+      end
+      
+      def column?
+        !column.nil?
+      end
+      
+      def column_limit
+        column.limit if column?
+      end
+      
+      def limit
+        validation_limit || column_limit
+      end
+      
+      
+      def input_html_options
+        opts = options[:input_html] || {}
+        opts[:id] ||= input_dom_id
+        
+        opts
+      end
+      
+      def input_dom_id
+        options[:input_html].try(:[], :id) || dom_id('')
+      end
+      
+      def label_html_options
+        # opts = options_for_label(options) # TODO
+        opts = {}
+        opts[:for] ||= input_dom_id
+        
+        opts
+      end
+      
+      
+      # TODO doesn't cover custom ordering
+      def input_wrapping(&block)
+        template.content_tag(:li, 
+          [template.capture(&block), error_html, hint_html].join("\n").html_safe, 
+          wrapper_html_options
+        )
+      end
+      
+      
+      def wrapper_html_options
+        opts = options[:wrapper_html] || {}
+        opts[:class] ||= []
+        opts[:class] = opts[:class].to_a if opts[:class].is_a?(String)
+        opts[:class] << as
+        opts[:class] << "error" if errors?
+        opts[:class] << "optional" if optional?
+        #opts[:class] << "required" if required?
+        opts[:class] = opts[:class].join(' ')
+        
+        opts[:id] = dom_id
+
+        opts
+      end
+      
+      
+      
+      def error_html
+        errors? ? send(:"error_#{builder.inline_errors}_html") : ""
+      end
+      
+      def error_sentence_html
+        error_class = options[:error_class] || builder.default_inline_error_class
+        template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.html_safe), :class => error_class)
+      end
+              
+      def error_list_html
+        error_class = options[:error_class] || builder.default_error_list_class
+        list_elements = []
+        errors.each do |error|
+          list_elements << template.content_tag(:li, Formtastic::Util.html_safe(error.html_safe))
+        end
+        template.content_tag(:ul, Formtastic::Util.html_safe(list_elements.join("\n")), :class => error_class)
+      end
+
+      def error_first_html
+        error_class = options[:error_class] || builder.default_inline_error_class
+        template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => error_class)
+      end
+      
+      def errors?
+        !errors.blank?
+      end
+      
+      def errors
+        errors = []
+        if object && object.respond_to?(:errors)
+          error_keys.each do |key| 
+            errors << object.errors[key] unless object.errors[key].blank?
+          end
+        end
+        errors.flatten
+      end
+      
+      def error_keys
+        keys = [method.to_sym]
+        keys << file_metadata_suffixes.map{|suffix| "#{method}_#{suffix}".to_sym} if file?
+        keys << [association_primary_key(method)] if belongs_to?
+        keys.flatten.compact.uniq
+      end
+      
+      
+      
+      
+      def hint_html
+        if hint?
+          template.content_tag(:p, "", :class => "hint")
+        end
+      end
+      
+      def hint?
+        true
+      end
+      
+      
+      def as
+        "string" # TODO
+      end
+              
+      def sanitized_object_name
+        object_name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
+      end
+      
+      def sanitized_method_name
+        method.to_s.gsub(/[\?\/\-]$/, '')
+      end
+      
+      def attributized_method_name
+        method.to_s.gsub(/_id$/, '').to_sym
+      end
+      
+      def dom_id(value='input')
+        [
+          builder.custom_namespace, 
+          sanitized_object_name, 
+          dom_index, 
+          sanitized_method_name, 
+          value
+        ].reject { |x| x.blank? }.join('_')
+      end
+      
+      def dom_index
+        if options.has_key?(:index)
+          options[:index]
+        elsif defined?(@auto_index)
+          @auto_index
+        else
+          ""
+        end
+      end
+      
+      
+      def validations
+        if object && object.class.respond_to?(:validators_on) 
+          object.class.validators_on(attributized_method_name).select do |validator|
+            validator_relevant?(validator)
+          end
+        else
+          []
+        end
+      end
+      
+      def validator_relevant?(validator)
+        return true unless validator.options.key?(:if) || validator.options.key?(:unless)
+        conditional = validator.options[:if] || validator.options[:unless]
+        
+        result = if conditional.respond_to?(:call)
+          conditional.call(object)
+        elsif conditional.is_a?(::Symbol) && object.respond_to?(conditional)
+          object.send(conditional)
+        else
+          conditional
+        end
+        
+        validator.options.key?(:unless) ? !result : !!result
+      end
+      
+      
+      def validation_limit
+        validation = validations? && validations.find do |validation|
+          validation.kind == :length
+        end
+        if validation
+          validation.options[:maximum] || (validation.options[:within].present? ? validation.options[:within].max : nil)
+        else
+          nil
+        end
+      end
+      
+      def validations?
+        !validations.empty?
+      end
+      
+      def required?
+        if validations?
+          !validations.find { |validator| [:presence, :inclusion, :length].include?(validator.kind) }.nil?
+        else
+          builder.all_fields_required_by_default
+        end
+      end
+      
+      def optional?
+        !required?
+      end
+
+
+      
+      def file?
+        @file ||= begin
+          # TODO return true if self.is_a?(Formtastic::Inputs::FileInput::Woo)
+          object && object.respond_to?(method) && builder.file_methods.any? { |m| object.send(method).respond_to?(m) }
+        end
+      end
+              
+
+
+
+
+
+      
+      # :belongs_to, etc
+      def association
+        @association ||= reflection.macro if reflection
+      end
+      
+      def reflection
+        @reflection ||= object.class.reflect_on_association(method) if object.class.respond_to?(:reflect_on_association)
+      end
+      
+      def belongs_to?
+        association == :belongs_to
+      end
+      
+      
+    end
+  end
+end
+  
\ No newline at end of file
diff --git a/lib/formtastic/inputs/string_input.rb b/lib/formtastic/inputs/string_input.rb
index 51dddfef8..608edeb19 100644
--- a/lib/formtastic/inputs/string_input.rb
+++ b/lib/formtastic/inputs/string_input.rb
@@ -1,4 +1,4 @@
-require 'inputs/basic'
+require 'inputs/new_base'
 
 module Formtastic
   module Inputs
@@ -28,13 +28,15 @@ module Inputs
     #   </form>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    module StringInput
-      include Formtastic::Inputs::Base
-      include Formtastic::Inputs::Basic
-
-      def string_input(method, options)
-        basic_input_helper(:text_field, :string, method, options)
+    class StringInput < NewBase
+      
+      def input_html_options
+        super.merge(
+          :maxlength => options[:input_html].try(:[], :maxlength) || limit,
+          :size => builder.default_text_field_size
+        )
       end
+    
     end
   end
 end
\ No newline at end of file
diff --git a/spec/inputs/string_input_spec.rb b/spec/inputs/string_input_spec.rb
index 5b0d7ae59..013fccef3 100644
--- a/spec/inputs/string_input_spec.rb
+++ b/spec/inputs/string_input_spec.rb
@@ -16,7 +16,7 @@
         concat(builder.input(:title, :as => :string))
       end)
     end
-
+    
     it_should_have_input_wrapper_with_class(:string)
     it_should_have_input_wrapper_with_id("post_title_input")
     it_should_have_label_with_text(/Title/)
@@ -30,7 +30,7 @@
     it_should_apply_custom_input_attributes_when_input_html_provided(:string)
     it_should_apply_custom_for_to_label_when_input_html_id_provided(:string)
     it_should_apply_error_logic_for_input_type(:string)
-
+    
     def input_field_for_method_should_have_maxlength(method, maxlength)
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(method))
@@ -38,33 +38,6 @@ def input_field_for_method_should_have_maxlength(method, maxlength)
       output_buffer.should have_tag("form li input[@maxlength='#{maxlength}']")
     end
 
-    describe 'and the validation reflection plugin is available' do
-
-      describe 'and validates_length_of was called for the method' do
-        it 'should have a maxlength matching validation range top' do
-          @new_post.class.should_receive(:reflect_on_validations_for).with(:title).any_number_of_times.and_return([
-            mock('MacroReflection', :macro => :validates_length_of, :name => :title, :options => {:within => 5..42})
-          ])
-
-          input_field_for_method_should_have_maxlength :title, 42
-        end
-
-        it 'should have a maxlength matching validation maximum' do
-          @new_post.class.should_receive(:reflect_on_validations_for).with(:title).any_number_of_times.and_return([
-            mock('MacroReflection', :macro => :validates_length_of, :name => :title, :options => {:maximum => 42})
-          ])
-          input_field_for_method_should_have_maxlength :title, 42
-        end
-      end
-
-      describe 'and validates_length_of was not called for the method' do
-        it "should use default maxlength" do
-          @new_post.class.should_receive(:reflect_on_validations_for).with(:title).at_least(1).and_return([])
-          input_field_for_method_should_have_maxlength :title, 50
-        end
-      end
-    end
-
     describe 'and its a ActiveModel' do
       let(:default_maxlength) { 50 }
 
@@ -92,24 +65,24 @@ def should_have_maxlength(maxlength, options)
         it 'should have maxlength if the optional :if or :unless options are not supplied' do
           should_have_maxlength(42, :options => {:maximum => 42})
         end
-
+        
         it 'should have default maxlength if the optional :if condition is not satisifed' do
           should_have_maxlength(default_maxlength, :options => {:maximum => 42, :if => false})
         end
-
+        
         it 'should have default_maxlength if the optional :if proc evaluates to false' do
           should_have_maxlength(default_maxlength, :options => {:maximum => 42, :if => proc { |record| false }})
         end
-
+        
         it 'should have maxlength if the optional :if proc evaluates to true' do
           should_have_maxlength(42, :options => { :maximum => 42, :if => proc { |record| true } })
         end
-
+        
         it 'should have default maxlength if the optional :if with a method name evaluates to false' do
           @new_post.should_receive(:specify_maxlength).at_least(1).and_return(false)
           should_have_maxlength(default_maxlength, :options => { :maximum => 42, :if => :specify_maxlength })
         end
-
+        
         it 'should have maxlength if the optional :if with a method name evaluates to true' do
           @new_post.should_receive(:specify_maxlength).at_least(1).and_return(true)
           should_have_maxlength(42, :options => { :maximum => 42, :if => :specify_maxlength })
@@ -122,12 +95,12 @@ def should_have_maxlength(maxlength, options)
         it 'should have maxlength if the optional :unless proc evaluates to false' do
           should_have_maxlength(42, :options => { :maximum => 42, :unless => proc { |record| false } })
         end
-
+        
         it 'should have default maxlength if the optional :unless with a method name evaluates to true' do
           @new_post.should_receive(:specify_maxlength).at_least(1).and_return(true)
           should_have_maxlength(default_maxlength, :options => { :maximum => 42, :unless => :specify_maxlength })
         end
-
+        
         it 'should have maxlength if the optional :unless with a method name evaluates to false' do
           @new_post.should_receive(:specify_maxlength).at_least(1).and_return(false)
           should_have_maxlength(42, :options => { :maximum => 42, :unless => :specify_maxlength })
@@ -137,39 +110,39 @@ def should_have_maxlength(maxlength, options)
   end
 
   describe "when namespace is provided" do
-
+  
     before do
       concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         concat(builder.input(:title, :as => :string))
       end)
     end
-
+  
     it_should_have_input_wrapper_with_id("context2_post_title_input")
     it_should_have_label_and_input_with_id("context2_post_title")
-
+  
   end
-
+  
   describe "when no object is provided" do
     before do
       concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
         concat(builder.input(:title, :as => :string))
       end)
     end
-
+  
     it_should_have_label_with_text(/Title/)
     it_should_have_label_for("project_title")
     it_should_have_input_with_id("project_title")
     it_should_have_input_with_type(:text)
     it_should_have_input_with_name("project[title]")
   end
-
+  
   describe "when size is nil" do
     before do
       concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
         concat(builder.input(:title, :as => :string, :input_html => {:size => nil}))
       end)
     end
-
+  
     it "should have no size attribute" do
       output_buffer.should_not have_tag("input[@size]")
     end

From 76ccfd3a2f16614c98d59e399f67e9508569a40b Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 3 Mar 2011 06:54:33 +1100
Subject: [PATCH 555/992] uncomment required class

---
 lib/formtastic/inputs/new_base.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/new_base.rb b/lib/formtastic/inputs/new_base.rb
index 09b8dca8f..b490697b8 100644
--- a/lib/formtastic/inputs/new_base.rb
+++ b/lib/formtastic/inputs/new_base.rb
@@ -73,7 +73,7 @@ def wrapper_html_options
         opts[:class] << as
         opts[:class] << "error" if errors?
         opts[:class] << "optional" if optional?
-        #opts[:class] << "required" if required?
+        opts[:class] << "required" if required?
         opts[:class] = opts[:class].join(' ')
         
         opts[:id] = dom_id

From 002aad62a90b5939ee4b6dd2dfaa81a9e6183d7f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 3 Mar 2011 06:54:55 +1100
Subject: [PATCH 556/992] fix NewBase#as

---
 lib/formtastic/inputs/new_base.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/new_base.rb b/lib/formtastic/inputs/new_base.rb
index b490697b8..873a185f2 100644
--- a/lib/formtastic/inputs/new_base.rb
+++ b/lib/formtastic/inputs/new_base.rb
@@ -142,7 +142,7 @@ def hint?
       
       
       def as
-        "string" # TODO
+        self.class.name.split("::").last.underscore.gsub(/_input$/, '')
       end
               
       def sanitized_object_name

From 2ca221f136aced724f4427b6b235aa28755f8fdb Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 3 Mar 2011 08:04:39 +1100
Subject: [PATCH 557/992] email, file, hidden, numeric, password, phone,
 search, string, text, url and numeric inputs now inherit from NewBase

---
 lib/formtastic/form_builder.rb          | 15 +++++------
 lib/formtastic/helpers/inputs_helper.rb |  9 +++++++
 lib/formtastic/inputs/email_input.rb    | 16 ++++++-----
 lib/formtastic/inputs/file_input.rb     | 15 +++++------
 lib/formtastic/inputs/hidden_input.rb   | 36 ++++++++++++++++++++-----
 lib/formtastic/inputs/numeric_input.rb  | 15 ++++++-----
 lib/formtastic/inputs/password_input.rb | 16 ++++++-----
 lib/formtastic/inputs/phone_input.rb    | 19 +++++++------
 lib/formtastic/inputs/search_input.rb   | 13 +++++----
 lib/formtastic/inputs/string_input.rb   | 10 ++-----
 lib/formtastic/inputs/stringish.rb      | 12 +++++++++
 lib/formtastic/inputs/text_input.rb     | 20 ++++++++++----
 lib/formtastic/inputs/url_input.rb      | 14 +++++++---
 spec/inputs/numeric_input_spec.rb       |  4 +--
 14 files changed, 138 insertions(+), 76 deletions(-)
 create mode 100644 lib/formtastic/inputs/stringish.rb

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index b30200a0f..a6ef23945 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -73,19 +73,16 @@ def self.configure(name, value = nil)
     include Formtastic::Inputs::CountryInput
     include Formtastic::Inputs::DateInput
     include Formtastic::Inputs::DatetimeInput
-    include Formtastic::Inputs::EmailInput
-    include Formtastic::Inputs::FileInput
-    include Formtastic::Inputs::HiddenInput
-    include Formtastic::Inputs::NumericInput
-    include Formtastic::Inputs::PasswordInput
-    include Formtastic::Inputs::PhoneInput
+    #include Formtastic::Inputs::EmailInput
+    #include Formtastic::Inputs::FileInput
+    #include Formtastic::Inputs::HiddenInput
+    #include Formtastic::Inputs::PasswordInput
     include Formtastic::Inputs::RadioInput
-    include Formtastic::Inputs::SearchInput
     include Formtastic::Inputs::SelectInput
-    include Formtastic::Inputs::TextInput
+    #include Formtastic::Inputs::TextInput
     include Formtastic::Inputs::TimeInput
     include Formtastic::Inputs::TimeZoneInput
-    include Formtastic::Inputs::UrlInput
+    #include Formtastic::Inputs::UrlInput
     
   end
   
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 1510d86b4..4e0ad9b74 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -248,6 +248,15 @@ def input(method, options = {})
         options[:as]     ||= default_input_type(method, options)
 
         return Formtastic::Inputs::StringInput.new(self, template, @object, @object_name, method, options).to_html if options[:as] == :string
+        return Formtastic::Inputs::PhoneInput.new(self, template, @object, @object_name, method, options).to_html  if options[:as] == :phone
+        return Formtastic::Inputs::SearchInput.new(self, template, @object, @object_name, method, options).to_html  if options[:as] == :search
+        return Formtastic::Inputs::NumericInput.new(self, template, @object, @object_name, method, options).to_html  if options[:as] == :numeric
+        return Formtastic::Inputs::EmailInput.new(self, template, @object, @object_name, method, options).to_html  if options[:as] == :email
+        return Formtastic::Inputs::FileInput.new(self, template, @object, @object_name, method, options).to_html  if options[:as] == :file
+        return Formtastic::Inputs::HiddenInput.new(self, template, @object, @object_name, method, options).to_html  if options[:as] == :hidden
+        return Formtastic::Inputs::PasswordInput.new(self, template, @object, @object_name, method, options).to_html  if options[:as] == :password
+        return Formtastic::Inputs::TextInput.new(self, template, @object, @object_name, method, options).to_html  if options[:as] == :text
+        return Formtastic::Inputs::UrlInput.new(self, template, @object, @object_name, method, options).to_html  if options[:as] == :url
         
         options[:required] = method_required?(method) unless options.key?(:required)
     
diff --git a/lib/formtastic/inputs/email_input.rb b/lib/formtastic/inputs/email_input.rb
index 5fab66354..bd9a62bfa 100644
--- a/lib/formtastic/inputs/email_input.rb
+++ b/lib/formtastic/inputs/email_input.rb
@@ -1,5 +1,5 @@
-require 'inputs/basic'
-require 'inputs/base'
+require 'inputs/new_base'
+require 'inputs/stringish'
 
 module Formtastic
   module Inputs
@@ -28,12 +28,14 @@ module Inputs
     #   </form>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    module EmailInput
-      include Formtastic::Inputs::Base
-      include Formtastic::Inputs::Basic
+    class EmailInput < NewBase
+      include Stringish
       
-      def email_input(method, options)
-        basic_input_helper(:email_field, :email, method, options)
+      def to_html
+        input_wrapping do
+          builder.label(method, label_html_options) <<
+          builder.email_field(method, input_html_options)
+        end
       end
     end
   end
diff --git a/lib/formtastic/inputs/file_input.rb b/lib/formtastic/inputs/file_input.rb
index be8c660ef..6d89f4fc3 100644
--- a/lib/formtastic/inputs/file_input.rb
+++ b/lib/formtastic/inputs/file_input.rb
@@ -1,5 +1,4 @@
-require 'inputs/basic'
-require 'inputs/base'
+require 'inputs/new_base'
 
 module Formtastic
   module Inputs
@@ -32,12 +31,12 @@ module Inputs
     #   </form>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    module FileInput
-      include Formtastic::Inputs::Base
-      include Formtastic::Inputs::Basic
-      
-      def file_input(method, options)
-        basic_input_helper(:file_field, :file, method, options)
+    class FileInput < NewBase
+      def to_html
+        input_wrapping do
+          builder.label(method, label_html_options) <<
+          builder.file_field(method, input_html_options)
+        end
       end
     end
   end
diff --git a/lib/formtastic/inputs/hidden_input.rb b/lib/formtastic/inputs/hidden_input.rb
index 0385ba1cc..2cec97f6c 100644
--- a/lib/formtastic/inputs/hidden_input.rb
+++ b/lib/formtastic/inputs/hidden_input.rb
@@ -1,3 +1,5 @@
+require 'inputs/new_base'
+
 module Formtastic
   module Inputs
     
@@ -28,15 +30,35 @@ module Inputs
     #   form.formtastic li.hidden { display:none; }
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    module HiddenInput
-      include Formtastic::Inputs::Base
+    class HiddenInput < NewBase
       
-      def hidden_input(method, options)
-        options ||= {}
-        html_options = options.delete(:input_html) || strip_formtastic_options(options)
-        html_options[:id] ||= generate_html_id(method, "")
-        hidden_field(method, html_options)
+      def input_html_options
+        return {:value => options[:value]}.merge(super) if options.key?(:value)
+        super
       end
+      
+      def to_html
+        input_wrapping do
+          builder.hidden_field(method, input_html_options)
+        end
+      end
+      
+      def error_html
+        ""
+      end
+      
+      def errors?
+        false
+      end
+      
+      def hint_html
+        ""
+      end
+      
+      def hint?
+        false
+      end
+
     end
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/numeric_input.rb b/lib/formtastic/inputs/numeric_input.rb
index 2003f4da6..32d4e318d 100644
--- a/lib/formtastic/inputs/numeric_input.rb
+++ b/lib/formtastic/inputs/numeric_input.rb
@@ -1,4 +1,5 @@
-require 'inputs/basic'
+require 'inputs/new_base'
+require 'inputs/stringish'
 
 module Formtastic
   module Inputs
@@ -31,12 +32,14 @@ module Inputs
     #  <%= f.input :shoe_size, :as => :numeric, :input_html => { :min => 3, :max => 15, :step => 1 } %>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    module NumericInput
-      include Formtastic::Inputs::Base
-      include Formtastic::Inputs::Basic
+    class NumericInput < NewBase
+      include Stringish
       
-      def numeric_input(method, options)
-        basic_input_helper(:text_field, :numeric, method, options)
+      def to_html
+        input_wrapping do
+          builder.label(method, label_html_options) <<
+          builder.number_field(method, input_html_options)
+        end
       end
     end
   end
diff --git a/lib/formtastic/inputs/password_input.rb b/lib/formtastic/inputs/password_input.rb
index 534fb93bd..e9a38493e 100644
--- a/lib/formtastic/inputs/password_input.rb
+++ b/lib/formtastic/inputs/password_input.rb
@@ -1,4 +1,5 @@
-require 'inputs/basic'
+require 'inputs/new_base'
+require 'inputs/stringish'
 
 module Formtastic
   module Inputs
@@ -27,13 +28,14 @@ module Inputs
     #   </form>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    module PasswordInput
-      include Formtastic::Inputs::Base
-      include Formtastic::Inputs::Basic
+    class PasswordInput < NewBase
+      include Stringish
       
-      # Outputs a label and standard Rails password field inside the wrapper.
-      def password_input(method, options)
-        basic_input_helper(:password_field, :password, method, options)
+      def to_html
+        input_wrapping do
+          builder.label(method, label_html_options) <<
+          builder.password_field(method, input_html_options)
+        end
       end
     end
   end
diff --git a/lib/formtastic/inputs/phone_input.rb b/lib/formtastic/inputs/phone_input.rb
index 095c65d94..79c45e252 100644
--- a/lib/formtastic/inputs/phone_input.rb
+++ b/lib/formtastic/inputs/phone_input.rb
@@ -1,4 +1,5 @@
-require 'inputs/basic'
+require 'inputs/new_base'
+require 'inputs/stringish'
 
 module Formtastic
   module Inputs
@@ -27,14 +28,16 @@ module Inputs
     #   </form>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    module PhoneInput
-      include Formtastic::Inputs::Base
-      include Formtastic::Inputs::Basic
-
-      # Outputs a label and a standard Rails phone field inside the wrapper.
-      def phone_input(method, options)
-        basic_input_helper(:phone_field, :phone, method, options)
+    class PhoneInput < NewBase
+      include Stringish
+      
+      def to_html
+        input_wrapping do
+          builder.label(method, label_html_options) <<
+          builder.phone_field(method, input_html_options)
+        end
       end
     end
+    
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/search_input.rb b/lib/formtastic/inputs/search_input.rb
index 0ca93f1d5..b133da358 100644
--- a/lib/formtastic/inputs/search_input.rb
+++ b/lib/formtastic/inputs/search_input.rb
@@ -26,13 +26,16 @@ module Inputs
     #   </form>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    module SearchInput
-      include Formtastic::Inputs::Base
-      include Formtastic::Inputs::Basic
+    class SearchInput < NewBase
+      include Stringish
       
-      def search_input(method, options)
-        basic_input_helper(:search_field, :search, method, options)
+      def to_html
+        input_wrapping do
+          builder.label(method, label_html_options) <<
+          builder.search_field(method, input_html_options)
+        end
       end
     end
+
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/string_input.rb b/lib/formtastic/inputs/string_input.rb
index 608edeb19..a33d3cfb6 100644
--- a/lib/formtastic/inputs/string_input.rb
+++ b/lib/formtastic/inputs/string_input.rb
@@ -1,4 +1,5 @@
 require 'inputs/new_base'
+require 'inputs/stringish'
 
 module Formtastic
   module Inputs
@@ -29,14 +30,7 @@ module Inputs
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     class StringInput < NewBase
-      
-      def input_html_options
-        super.merge(
-          :maxlength => options[:input_html].try(:[], :maxlength) || limit,
-          :size => builder.default_text_field_size
-        )
-      end
-    
+      include Stringish
     end
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/stringish.rb b/lib/formtastic/inputs/stringish.rb
new file mode 100644
index 000000000..e6eccfd3a
--- /dev/null
+++ b/lib/formtastic/inputs/stringish.rb
@@ -0,0 +1,12 @@
+module Formtastic
+  module Inputs
+    module Stringish
+      def input_html_options
+        super.merge(
+          :maxlength => options[:input_html].try(:[], :maxlength) || limit,
+          :size => builder.default_text_field_size
+        )
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/text_input.rb b/lib/formtastic/inputs/text_input.rb
index cab9e12d4..60d4678fd 100644
--- a/lib/formtastic/inputs/text_input.rb
+++ b/lib/formtastic/inputs/text_input.rb
@@ -1,4 +1,4 @@
-require 'inputs/basic'
+require 'inputs/new_base'
 
 module Formtastic
   module Inputs
@@ -27,12 +27,22 @@ module Inputs
     #   </form>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    module TextInput
-      include Formtastic::Inputs::Basic
+    class TextInput < NewBase
       
-      def text_input(method, options)
-        basic_input_helper(:text_area, :text, method, options)
+      def input_html_options
+        { 
+          :cols => builder.default_text_area_width,
+          :rows => builder.default_text_area_height
+        }.merge(super)
       end
+      
+      def to_html
+        input_wrapping do
+          builder.label(method, label_html_options) <<
+          builder.text_area(method, input_html_options)
+        end
+      end
+    
     end
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/url_input.rb b/lib/formtastic/inputs/url_input.rb
index a62890018..ea0c3765f 100644
--- a/lib/formtastic/inputs/url_input.rb
+++ b/lib/formtastic/inputs/url_input.rb
@@ -1,3 +1,6 @@
+require 'inputs/new_base'
+require 'inputs/stringish'
+
 module Formtastic
   module Inputs
     
@@ -25,11 +28,14 @@ module Inputs
     #   </form>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    module UrlInput
-      include Formtastic::Inputs::Basic
+    class UrlInput < NewBase
+      include Stringish
       
-      def url_input(method, options)
-        basic_input_helper(:url_field, :url, method, options)
+      def to_html
+        input_wrapping do
+          builder.label(method, label_html_options) <<
+          builder.url_field(method, input_html_options)
+        end
       end
     end
   end
diff --git a/spec/inputs/numeric_input_spec.rb b/spec/inputs/numeric_input_spec.rb
index ede943aff..399ba36fb 100644
--- a/spec/inputs/numeric_input_spec.rb
+++ b/spec/inputs/numeric_input_spec.rb
@@ -19,7 +19,7 @@
   it_should_have_label_with_text(/Title/)
   it_should_have_label_for("post_title")
   it_should_have_input_with_id("post_title")
-  it_should_have_input_with_type(:text)
+  it_should_have_input_with_type(:number)
   it_should_have_input_with_name("post[title]")
   it_should_use_default_text_field_size_when_not_nil(:string)
   it_should_not_use_default_text_field_size_when_nil(:string)
@@ -37,7 +37,7 @@
     it_should_have_label_with_text(/Title/)
     it_should_have_label_for("project_title")
     it_should_have_input_with_id("project_title")
-    it_should_have_input_with_type(:text)
+    it_should_have_input_with_type(:number)
     it_should_have_input_with_name("project[title]")
   end
 

From 265f4738aeb4713251912584544d2dbfaae0ed32 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 3 Mar 2011 17:35:01 +1100
Subject: [PATCH 558/992] no longer need Inputs::Basic

---
 lib/formtastic/inputs/basic.rb        | 83 ---------------------------
 lib/formtastic/inputs/search_input.rb |  2 -
 2 files changed, 85 deletions(-)
 delete mode 100644 lib/formtastic/inputs/basic.rb

diff --git a/lib/formtastic/inputs/basic.rb b/lib/formtastic/inputs/basic.rb
deleted file mode 100644
index 114667c40..000000000
--- a/lib/formtastic/inputs/basic.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-module Formtastic
-  module Inputs
-    # @private
-    module Basic
-      
-      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, :text, :phone, :search, :url, :email].include?(type)
-        field_id = generate_html_id(method, "")
-        html_options[:id] ||= field_id
-        label_options = options_for_label(options)
-        label_options[:for] ||= html_options[:id]
-        label(method, label_options) <<
-          send(respond_to?(form_helper_method) ? form_helper_method : :text_field, method, html_options)
-      end
-      
-      protected
-      
-      # Generates default_string_options by retrieving column information from
-      # the database.
-      #
-      def default_string_options(method, type) #:nodoc:
-        def get_maxlength_for(method)
-          validation = validations_for(method).find do |validation|
-            (validation.respond_to?(:macro) && validation.macro == :validates_length_of) || # Rails 2 + 3 style validation
-            (validation.respond_to?(:kind) && validation.kind == :length) # Rails 3 style validator
-          end
-  
-          if validation
-            validation.options[:maximum] || (validation.options[:within].present? ? validation.options[:within].max : nil)
-          else
-            nil
-          end
-        end
-  
-        validation_max_limit = get_maxlength_for(method)
-        column = column_for(method)
-  
-        if type == :text
-          { :rows => default_text_area_height, 
-            :cols => default_text_area_width }
-        elsif type == :numeric || column.nil? || !column.respond_to?(:limit) || column.limit.nil?
-          { :maxlength => validation_max_limit,
-            :size => default_text_field_size }
-        else
-          { :maxlength => validation_max_limit || column.limit,
-            :size => default_text_field_size }
-        end
-      end
-      
-      # Returns the active validations for the given method or an empty Array if no validations are
-      # found for the method.
-      #
-      # By default, the if/unless options of the validations are evaluated and only the validations
-      # that should be run for the current object state are returned. Pass :all to the last
-      # parameter to return :all validations regardless of if/unless options.
-      #
-      # Requires the ValidationReflection plugin to be present or an ActiveModel. Returns an epmty
-      # Array if neither is the case.
-      #
-      def validations_for(method, mode = :active)
-        # ActiveModel?
-        validations = if @object && @object.class.respond_to?(:validators_on)
-          @object.class.validators_on(method)
-        else
-          # ValidationReflection plugin?
-          if @object && @object.class.respond_to?(:reflect_on_validations_for)
-            @object.class.reflect_on_validations_for(method)
-          else
-            []
-          end
-        end
-  
-        validations = validations.select do |validation|
-          (validation.options.present? ? options_require_validation?(validation.options) : true)
-        end unless mode == :all
-  
-        return validations
-      end
-      
-    end
-  end
-end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/search_input.rb b/lib/formtastic/inputs/search_input.rb
index b133da358..ebed1b748 100644
--- a/lib/formtastic/inputs/search_input.rb
+++ b/lib/formtastic/inputs/search_input.rb
@@ -1,5 +1,3 @@
-require 'inputs/basic'
-
 module Formtastic
   module Inputs
     

From 24da1b188fc0d1ed8361b561866a0bd92b1cf751 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 3 Mar 2011 17:46:11 +1100
Subject: [PATCH 559/992] DRY up inputs helper

---
 lib/formtastic/helpers/inputs_helper.rb | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 4e0ad9b74..5664c03e0 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -247,16 +247,10 @@ def input(method, options = {})
         
         options[:as]     ||= default_input_type(method, options)
 
-        return Formtastic::Inputs::StringInput.new(self, template, @object, @object_name, method, options).to_html if options[:as] == :string
-        return Formtastic::Inputs::PhoneInput.new(self, template, @object, @object_name, method, options).to_html  if options[:as] == :phone
-        return Formtastic::Inputs::SearchInput.new(self, template, @object, @object_name, method, options).to_html  if options[:as] == :search
-        return Formtastic::Inputs::NumericInput.new(self, template, @object, @object_name, method, options).to_html  if options[:as] == :numeric
-        return Formtastic::Inputs::EmailInput.new(self, template, @object, @object_name, method, options).to_html  if options[:as] == :email
-        return Formtastic::Inputs::FileInput.new(self, template, @object, @object_name, method, options).to_html  if options[:as] == :file
-        return Formtastic::Inputs::HiddenInput.new(self, template, @object, @object_name, method, options).to_html  if options[:as] == :hidden
-        return Formtastic::Inputs::PasswordInput.new(self, template, @object, @object_name, method, options).to_html  if options[:as] == :password
-        return Formtastic::Inputs::TextInput.new(self, template, @object, @object_name, method, options).to_html  if options[:as] == :text
-        return Formtastic::Inputs::UrlInput.new(self, template, @object, @object_name, method, options).to_html  if options[:as] == :url
+        [:string, :phone, :search, :numeric, :email, :file, :hidden, :password, :text, :url].each do |i|
+          klass = "Formtastic::Inputs::#{options[:as].to_s.camelize}Input".constantize
+          return klass.new(self, template, @object, @object_name, method, options).to_html
+        end
         
         options[:required] = method_required?(method) unless options.key?(:required)
     

From 7f72a675e18653286317391a2d2e1d19b1cc665d Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 3 Mar 2011 17:57:28 +1100
Subject: [PATCH 560/992] added NewBase#input_options which strips out
 formtastic_options

---
 lib/formtastic/inputs/new_base.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/formtastic/inputs/new_base.rb b/lib/formtastic/inputs/new_base.rb
index 873a185f2..87c536e8a 100644
--- a/lib/formtastic/inputs/new_base.rb
+++ b/lib/formtastic/inputs/new_base.rb
@@ -37,6 +37,18 @@ def limit
       end
       
       
+      
+      def input_options
+        options.except(*formtastic_options)
+      end
+      
+      def formtastic_options
+        [:priority_countries, :value_method, :label_method, :collection, :required, :label, :as, :hint, :input_html, :label_html, :value_as_class, :find_options, :class]
+      end
+      
+      
+      
+      
       def input_html_options
         opts = options[:input_html] || {}
         opts[:id] ||= input_dom_id

From 40d311e1474fd6d91918941b4a45c908415767a9 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 3 Mar 2011 17:58:03 +1100
Subject: [PATCH 561/992] country input now inherits from NewBase

---
 lib/formtastic/form_builder.rb          |  2 +-
 lib/formtastic/helpers/inputs_helper.rb |  2 +-
 lib/formtastic/inputs/country_input.rb  | 29 +++++++++++--------------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index a6ef23945..34cb0024b 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -70,7 +70,7 @@ def self.configure(name, value = nil)
 
     include Formtastic::Inputs::BooleanInput
     include Formtastic::Inputs::CheckBoxesInput
-    include Formtastic::Inputs::CountryInput
+    #include Formtastic::Inputs::CountryInput
     include Formtastic::Inputs::DateInput
     include Formtastic::Inputs::DatetimeInput
     #include Formtastic::Inputs::EmailInput
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 5664c03e0..d8f02792f 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -247,7 +247,7 @@ def input(method, options = {})
         
         options[:as]     ||= default_input_type(method, options)
 
-        [:string, :phone, :search, :numeric, :email, :file, :hidden, :password, :text, :url].each do |i|
+        [:string, :country, :phone, :search, :numeric, :email, :file, :hidden, :password, :text, :url].each do |i|
           klass = "Formtastic::Inputs::#{options[:as].to_s.camelize}Input".constantize
           return klass.new(self, template, @object, @object_name, method, options).to_html
         end
diff --git a/lib/formtastic/inputs/country_input.rb b/lib/formtastic/inputs/country_input.rb
index 32c494e24..53429ca27 100644
--- a/lib/formtastic/inputs/country_input.rb
+++ b/lib/formtastic/inputs/country_input.rb
@@ -1,4 +1,4 @@
-require 'inputs/base'
+require 'inputs/new_base'
 
 module Formtastic
   module Inputs
@@ -48,23 +48,20 @@ module Inputs
     #   </li>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    module CountryInput
-      include Formtastic::Inputs::Base
+    class CountryInput < NewBase
+
+      def to_html
+        raise "To use the :country input, please install a country_select plugin, like this one: http://github.com/rails/iso-3166-country-select" unless builder.respond_to?(:country_select)
+        input_wrapping do
+          builder.label(method, label_html_options) <<
+          builder.country_select(method, priority_countries, input_options, input_html_options)
+        end
+      end
       
-      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 respond_to?(:country_select)
-  
-        html_options = options.delete(:input_html) || {}
-        priority_countries = options.delete(:priority_countries) || self.priority_countries
-  
-        field_id = generate_html_id(method, "")
-        html_options[:id] ||= field_id
-        label_options = options_for_label(options)
-        label_options[:for] ||= html_options[:id]
-  
-        label(method, label_options) <<
-        country_select(method, priority_countries, strip_formtastic_options(options), html_options)
+      def priority_countries
+        options[:priority_countries] || builder.priority_countries
       end
+
     end
   end
 end
\ No newline at end of file

From 004728c038465cac449e42f775d26571e2a15479 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 3 Mar 2011 17:59:17 +1100
Subject: [PATCH 562/992] remove commented out lines in builder

---
 lib/formtastic/form_builder.rb | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 34cb0024b..baf470f2e 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -70,19 +70,12 @@ def self.configure(name, value = nil)
 
     include Formtastic::Inputs::BooleanInput
     include Formtastic::Inputs::CheckBoxesInput
-    #include Formtastic::Inputs::CountryInput
     include Formtastic::Inputs::DateInput
     include Formtastic::Inputs::DatetimeInput
-    #include Formtastic::Inputs::EmailInput
-    #include Formtastic::Inputs::FileInput
-    #include Formtastic::Inputs::HiddenInput
-    #include Formtastic::Inputs::PasswordInput
     include Formtastic::Inputs::RadioInput
     include Formtastic::Inputs::SelectInput
-    #include Formtastic::Inputs::TextInput
     include Formtastic::Inputs::TimeInput
     include Formtastic::Inputs::TimeZoneInput
-    #include Formtastic::Inputs::UrlInput
     
   end
   

From 47e1d5f5d889df608ae9490ee71f4cb7fb2be4f0 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 3 Mar 2011 18:07:17 +1100
Subject: [PATCH 563/992] time_zone input now inherits from NewBase

---
 lib/formtastic/form_builder.rb           |  1 -
 lib/formtastic/helpers/inputs_helper.rb  |  2 +-
 lib/formtastic/inputs/new_base.rb        |  2 +-
 lib/formtastic/inputs/time_zone_input.rb | 27 ++++++++++++++----------
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index baf470f2e..18861bcdd 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -75,7 +75,6 @@ def self.configure(name, value = nil)
     include Formtastic::Inputs::RadioInput
     include Formtastic::Inputs::SelectInput
     include Formtastic::Inputs::TimeInput
-    include Formtastic::Inputs::TimeZoneInput
     
   end
   
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index d8f02792f..b5efb4333 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -247,7 +247,7 @@ def input(method, options = {})
         
         options[:as]     ||= default_input_type(method, options)
 
-        [:string, :country, :phone, :search, :numeric, :email, :file, :hidden, :password, :text, :url].each do |i|
+        [:string, :country, :time_zone, :phone, :search, :numeric, :email, :file, :hidden, :password, :text, :url].each do |i|
           klass = "Formtastic::Inputs::#{options[:as].to_s.camelize}Input".constantize
           return klass.new(self, template, @object, @object_name, method, options).to_html
         end
diff --git a/lib/formtastic/inputs/new_base.rb b/lib/formtastic/inputs/new_base.rb
index 87c536e8a..a42f7388f 100644
--- a/lib/formtastic/inputs/new_base.rb
+++ b/lib/formtastic/inputs/new_base.rb
@@ -43,7 +43,7 @@ def input_options
       end
       
       def formtastic_options
-        [:priority_countries, :value_method, :label_method, :collection, :required, :label, :as, :hint, :input_html, :label_html, :value_as_class, :find_options, :class]
+        [:priority_countries, :priority_zones, :value_method, :label_method, :collection, :required, :label, :as, :hint, :input_html, :label_html, :value_as_class, :find_options, :class]
       end
       
       
diff --git a/lib/formtastic/inputs/time_zone_input.rb b/lib/formtastic/inputs/time_zone_input.rb
index 98a8284f9..afa552400 100644
--- a/lib/formtastic/inputs/time_zone_input.rb
+++ b/lib/formtastic/inputs/time_zone_input.rb
@@ -1,3 +1,5 @@
+require 'inputs/new_base'
+
 module Formtastic
   module Inputs
     
@@ -27,17 +29,20 @@ module Inputs
     #   </form>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    
-    module TimeZoneInput
-      def time_zone_input(method, options)
-        html_options = options.delete(:input_html) || {}
-        field_id = generate_html_id(method, "")
-        html_options[:id] ||= field_id
-        label_options = options_for_label(options)
-        label_options[:for] ||= html_options[:id]
-        label(method, label_options) <<
-        time_zone_select(method, options.delete(:priority_zones),
-          strip_formtastic_options(options), html_options)
+    #
+    # @todo document :priority_zones option
+    # @todo configurable default :priority_zones?
+    class TimeZoneInput < NewBase
+
+      def to_html
+        input_wrapping do
+          builder.label(method, label_html_options) <<
+          builder.time_zone_select(method, priority_zones, input_options, input_html_options)
+        end
+      end
+      
+      def priority_zones
+        options[:priority_zones] || [] # TODO config?
       end
     end
   end

From d4fd5c6bb3bbf141934e67fa88fb8301a4120d27 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 3 Mar 2011 21:52:44 +1100
Subject: [PATCH 564/992] implemented hint_html

---
 lib/formtastic/inputs/new_base.rb | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/lib/formtastic/inputs/new_base.rb b/lib/formtastic/inputs/new_base.rb
index a42f7388f..8c03c67d9 100644
--- a/lib/formtastic/inputs/new_base.rb
+++ b/lib/formtastic/inputs/new_base.rb
@@ -138,21 +138,31 @@ def error_keys
         keys << [association_primary_key(method)] if belongs_to?
         keys.flatten.compact.uniq
       end
-      
-      
-      
+
+
+
       
       def hint_html
         if hint?
-          template.content_tag(:p, "", :class => "hint")
+          template.content_tag(
+            :p, 
+            Formtastic::Util.html_safe(options[:hint]), 
+            :class => (options[:hint_class] || builder.default_hint_class)
+          )
         end
       end
       
       def hint?
-        true
+        !hint.blank? && !hint.kind_of?(Hash)
+      end
+      
+      def hint
+        builder.send(:localized_string, method, options[:hint], :hint)
       end
       
       
+      
+      
       def as
         self.class.name.split("::").last.underscore.gsub(/_input$/, '')
       end

From 24cdf0f1ed06f92cf37911eb213f9633a9d988c9 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 3 Mar 2011 21:53:05 +1100
Subject: [PATCH 565/992] boolean now subclasses NewBase

---
 lib/formtastic/form_builder.rb          |  1 -
 lib/formtastic/helpers/inputs_helper.rb |  2 +-
 lib/formtastic/inputs/boolean_input.rb  | 67 ++++++++++++++++---------
 3 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 18861bcdd..061a66338 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -68,7 +68,6 @@ def self.configure(name, value = nil)
     include Formtastic::Helpers::LabelHelper
     include Formtastic::Helpers::ErrorsHelper
 
-    include Formtastic::Inputs::BooleanInput
     include Formtastic::Inputs::CheckBoxesInput
     include Formtastic::Inputs::DateInput
     include Formtastic::Inputs::DatetimeInput
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index b5efb4333..ee33a23de 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -247,7 +247,7 @@ def input(method, options = {})
         
         options[:as]     ||= default_input_type(method, options)
 
-        [:string, :country, :time_zone, :phone, :search, :numeric, :email, :file, :hidden, :password, :text, :url].each do |i|
+        [:string, :country, :boolean, :time_zone, :phone, :search, :numeric, :email, :file, :hidden, :password, :text, :url].each do |i|
           klass = "Formtastic::Inputs::#{options[:as].to_s.camelize}Input".constantize
           return klass.new(self, template, @object, @object_name, method, options).to_html
         end
diff --git a/lib/formtastic/inputs/boolean_input.rb b/lib/formtastic/inputs/boolean_input.rb
index 73d683aa9..2e0daaed4 100644
--- a/lib/formtastic/inputs/boolean_input.rb
+++ b/lib/formtastic/inputs/boolean_input.rb
@@ -1,4 +1,4 @@
-require 'inputs/base'
+require 'inputs/new_base'
 
 module Formtastic
   module Inputs
@@ -31,31 +31,50 @@ module Inputs
     #   <%= f.input :published, :checked_value => "yes", :unchecked_value => "no" %> 
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    module BooleanInput
-      include Formtastic::Inputs::Base
-      
-      def boolean_input(method, options)
-        html_options  = options.delete(:input_html) || {}
-        checked_value = options.delete(:checked_value) || '1'
-        unchecked_value = options.delete(:unchecked_value) || '0'
-        checked = @object && ActionView::Helpers::InstanceTag.check_box_checked?(@object.send(:"#{method}"), checked_value)
-  
-        html_options[:id] = html_options[:id] || generate_html_id(method, "")
-        input = template.check_box_tag(
-          "#{@object_name}[#{method}]",
-          checked_value,
-          checked,
-          html_options
+    class BooleanInput < NewBase
+      
+      def to_html
+        input_wrapping do
+          hidden_field << 
+          label_with_nested_checkbox
+        end
+      end
+      
+      def hidden_field
+        template.hidden_field_tag(input_html_options[:name], unchecked_value, :id => nil)
+      end
+      
+      def label_with_nested_checkbox
+        builder.label(
+          method, 
+          input_html_options.merge(
+            :id => nil,
+            :for => input_html_options[:id],
+            :label_prefix_for_nested_input => check_box # the label() method will insert this nested input into the label at the last minute
+          )
         )
-        
-        options = options_for_label(options)
-        options[:for] ||= html_options[:id]
-  
-        # the label() method will insert this nested input into the label at the last minute
-        options[:label_prefix_for_nested_input] = input
-  
-        template.hidden_field_tag((html_options[:name] || "#{@object_name}[#{method}]"), unchecked_value, :id => nil) << label(method, options)
       end
+      
+      def check_box
+        template.check_box_tag("#{object_name}[#{method}]", checked_value, checked?, input_html_options)
+      end
+      
+      def unchecked_value
+        options[:unchecked_value] || '0'
+      end
+      
+      def checked_value
+        options[:checked_value] || '1'
+      end
+      
+      def input_html_options
+        {:name => "#{object_name}[#{method}]"}.merge(super)
+      end
+      
+      def checked?
+        object && ActionView::Helpers::InstanceTag.check_box_checked?(object.send(method), checked_value)
+      end
+
     end
   end
 end
\ No newline at end of file

From f3ddf5904b2eac7995bd1d669ca87ed5492b381d Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 4 Mar 2011 16:54:22 +1100
Subject: [PATCH 566/992] date_time inherits from base and includes NewTimeish

---
 lib/formtastic/form_builder.rb          |   1 -
 lib/formtastic/helpers/inputs_helper.rb |   4 +-
 lib/formtastic/inputs/date_input.rb     |  15 ++--
 lib/formtastic/inputs/new_timeish.rb    | 107 ++++++++++++++++++++++++
 4 files changed, 116 insertions(+), 11 deletions(-)
 create mode 100644 lib/formtastic/inputs/new_timeish.rb

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 061a66338..687f845b6 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -69,7 +69,6 @@ def self.configure(name, value = nil)
     include Formtastic::Helpers::ErrorsHelper
 
     include Formtastic::Inputs::CheckBoxesInput
-    include Formtastic::Inputs::DateInput
     include Formtastic::Inputs::DatetimeInput
     include Formtastic::Inputs::RadioInput
     include Formtastic::Inputs::SelectInput
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index ee33a23de..9492dd6f0 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -247,9 +247,9 @@ def input(method, options = {})
         
         options[:as]     ||= default_input_type(method, options)
 
-        [:string, :country, :boolean, :time_zone, :phone, :search, :numeric, :email, :file, :hidden, :password, :text, :url].each do |i|
+        [:string, :country, :boolean, :time_zone, :date, :phone, :search, :numeric, :email, :file, :hidden, :password, :text, :url].each do |i|
           klass = "Formtastic::Inputs::#{options[:as].to_s.camelize}Input".constantize
-          return klass.new(self, template, @object, @object_name, method, options).to_html
+          return klass.new(self, template, @object, @object_name, method, options).to_html if options[:as] == i
         end
         
         options[:required] = method_required?(method) unless options.key?(:required)
diff --git a/lib/formtastic/inputs/date_input.rb b/lib/formtastic/inputs/date_input.rb
index bfc77c64e..5bc2d5c01 100644
--- a/lib/formtastic/inputs/date_input.rb
+++ b/lib/formtastic/inputs/date_input.rb
@@ -1,15 +1,14 @@
-require 'inputs/timeish'
-require 'inputs/base'
+require 'inputs/new_base'
+require 'inputs/new_timeish'
 
 module Formtastic
   module Inputs
     # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
-    module DateInput
-      include Formtastic::Inputs::Base
-      include Formtastic::Inputs::Timeish
-      def date_input(method, options)
-        options = set_include_blank(options)
-        date_or_datetime_input(method, options.merge(:discard_hour => true))
+    class DateInput < NewBase
+      include NewTimeish
+      
+      def default_fragments
+        [:year, :month, :day]
       end
     end
   end
diff --git a/lib/formtastic/inputs/new_timeish.rb b/lib/formtastic/inputs/new_timeish.rb
new file mode 100644
index 000000000..e9daa2dc9
--- /dev/null
+++ b/lib/formtastic/inputs/new_timeish.rb
@@ -0,0 +1,107 @@
+module Formtastic
+  module Inputs
+    module NewTimeish
+      
+      def to_html
+        input_wrapping do
+          fragments_wrapping do
+            fragments_label <<
+            template.content_tag(:fieldset,
+              template.content_tag(:ol,
+                fragments.map do |fragment|
+                  fragment_wrapping do
+                    fragment_label_html(fragment) <<
+                    fragment_input_html(fragment)
+                  end
+                end.join.html_safe # TODO is this safe?
+              )
+            )
+          end
+        end
+      end
+      
+      def fragments
+        options[:order] || i18n_date_order || default_fragments
+      end
+      
+      def default_fragments
+        raise "please implement default_fragments (eg [:year, :month, :day])"
+      end
+      
+      def fragment_wrapping(&block)
+        template.content_tag(:li, template.capture(&block))
+      end
+      
+      def fragment_label(fragment)
+        labels_from_options = options[:labels] || {}
+        if labels_from_options.key?(fragment)
+          labels_from_options[fragment]
+        else
+          ::I18n.t(fragment.to_s, :default => fragment.to_s.humanize, :scope => [:datetime, :prompts])
+        end
+      end
+      
+      def fragment_id(fragment)
+        "#{input_html_options[:id]}_#{position(fragment)}i"
+      end
+      
+      def fragment_name(fragment)
+        "#{method}(#{position(fragment)}i)"
+      end
+      
+      def fragment_label_html(fragment)
+        text = fragment_label(fragment)
+        text.blank? ? "" : template.content_tag(:label, text, :for => fragment_id(fragment))
+      end
+      
+      def value
+        object.send(method) if object && object.respond_to?(method)
+      end
+      
+      def fragment_input_html(fragment)
+        opts = input_options.merge(:prefix => object_name, :field_name => fragment_name(fragment), :default => value)
+        
+        template.send(:"select_#{fragment}", value, opts, input_html_options.merge(:id => fragment_id(fragment)))
+      end
+      
+      def positions
+        { :year => 1, :month => 2, :day => 3, :hour => 4, :minute => 5, :second => 6 }
+      end
+      
+      def position(fragment)
+        positions[fragment]
+      end
+      
+      def i18n_date_order
+        order = ::I18n.t(:order, :scope => [:date])
+        order = nil unless order.is_a?(Array)
+        order
+      end
+      
+      def fragments_wrapping(&block)
+        template.content_tag(:fieldset,
+          template.capture(&block).html_safe, 
+          fragments_wrapping_html_options
+        )
+      end
+      
+      def fragments_wrapping_html_options
+        {}
+      end
+      
+      def fragments_label
+        template.content_tag(:legend, 
+          builder.label(method, :for => "#{input_html_options[:id]}_1i"), 
+          :class => "label"
+        )
+      end
+      
+      def fragments_inner_wrapping(&block)
+        template.content_tag(:ol,
+          template.capture(&block)
+        )
+      end
+      
+    end
+  end
+end
\ No newline at end of file

From 2e70256146179493c72b5e93089a638e5cc28f25 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 9 Mar 2011 09:01:54 +1300
Subject: [PATCH 567/992] added datetime_input_spec (WTF?) and implemented it
 with NewBase and NewTimeish

---
 lib/formtastic/form_builder.rb          |   1 -
 lib/formtastic/helpers/inputs_helper.rb |   2 +-
 lib/formtastic/inputs/date_input.rb     |   5 +-
 lib/formtastic/inputs/datetime_input.rb |  15 ++--
 lib/formtastic/inputs/new_timeish.rb    |  16 +++-
 spec/inputs/datetime_input_spec.rb      | 103 ++++++++++++++++++++++++
 6 files changed, 125 insertions(+), 17 deletions(-)
 create mode 100644 spec/inputs/datetime_input_spec.rb

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 687f845b6..20f7cb0a1 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -69,7 +69,6 @@ def self.configure(name, value = nil)
     include Formtastic::Helpers::ErrorsHelper
 
     include Formtastic::Inputs::CheckBoxesInput
-    include Formtastic::Inputs::DatetimeInput
     include Formtastic::Inputs::RadioInput
     include Formtastic::Inputs::SelectInput
     include Formtastic::Inputs::TimeInput
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 9492dd6f0..7b20ade71 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -247,7 +247,7 @@ def input(method, options = {})
         
         options[:as]     ||= default_input_type(method, options)
 
-        [:string, :country, :boolean, :time_zone, :date, :phone, :search, :numeric, :email, :file, :hidden, :password, :text, :url].each do |i|
+        [:string, :country, :boolean, :time_zone, :date, :datetime, :phone, :search, :numeric, :email, :file, :hidden, :password, :text, :url].each do |i|
           klass = "Formtastic::Inputs::#{options[:as].to_s.camelize}Input".constantize
           return klass.new(self, template, @object, @object_name, method, options).to_html if options[:as] == i
         end
diff --git a/lib/formtastic/inputs/date_input.rb b/lib/formtastic/inputs/date_input.rb
index 5bc2d5c01..b97fbc72d 100644
--- a/lib/formtastic/inputs/date_input.rb
+++ b/lib/formtastic/inputs/date_input.rb
@@ -7,8 +7,9 @@ module Inputs
     class DateInput < NewBase
       include NewTimeish
       
-      def default_fragments
-        [:year, :month, :day]
+      # We don't want hour and minute fragments on a date input
+      def time_fragments
+        []
       end
     end
   end
diff --git a/lib/formtastic/inputs/datetime_input.rb b/lib/formtastic/inputs/datetime_input.rb
index 8ee30ee12..d9d089331 100644
--- a/lib/formtastic/inputs/datetime_input.rb
+++ b/lib/formtastic/inputs/datetime_input.rb
@@ -1,16 +1,13 @@
-require 'inputs/timeish'
-require 'inputs/base'
+require 'inputs/new_timeish'
+require 'inputs/new_base'
 
 module Formtastic
   module Inputs
     # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
-    module DatetimeInput
-      include Formtastic::Inputs::Base
-      include Formtastic::Inputs::Timeish
-      def datetime_input(method, options)
-        options = set_include_blank(options)
-        date_or_datetime_input(method, options)
-      end
+    class DatetimeInput < NewBase
+      include NewTimeish
+
+      
     end
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/new_timeish.rb b/lib/formtastic/inputs/new_timeish.rb
index e9daa2dc9..ad6a00799 100644
--- a/lib/formtastic/inputs/new_timeish.rb
+++ b/lib/formtastic/inputs/new_timeish.rb
@@ -21,11 +21,19 @@ def to_html
       end
       
       def fragments
-        options[:order] || i18n_date_order || default_fragments
+        date_fragments + time_fragments
       end
       
-      def default_fragments
-        raise "please implement default_fragments (eg [:year, :month, :day])"
+      def time_fragments
+        options[:include_seconds] ? [:hour, :minute, :second] : [:hour, :minute]
+      end
+      
+      def date_fragments
+        options[:order] || i18n_date_fragments || default_date_fragments
+      end
+      
+      def default_date_fragments
+        [:year, :month, :day]
       end
       
       def fragment_wrapping(&block)
@@ -72,7 +80,7 @@ def position(fragment)
         positions[fragment]
       end
       
-      def i18n_date_order
+      def i18n_date_fragments
         order = ::I18n.t(:order, :scope => [:date])
         order = nil unless order.is_a?(Array)
         order
diff --git a/spec/inputs/datetime_input_spec.rb b/spec/inputs/datetime_input_spec.rb
new file mode 100644
index 000000000..8bb2a7f79
--- /dev/null
+++ b/spec/inputs/datetime_input_spec.rb
@@ -0,0 +1,103 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe 'datetime input' do
+
+  include FormtasticSpecHelper
+
+  before do
+    @output_buffer = ''
+    mock_everything
+  end
+
+  describe "general" do
+
+    before do
+      ::I18n.backend.store_translations :en, {}
+      output_buffer.replace ''
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:publish_at, :as => :datetime))
+      end)
+    end
+
+    it_should_have_input_wrapper_with_class("datetime")
+    it_should_have_input_wrapper_with_id("post_publish_at_input")
+    it_should_have_a_nested_fieldset
+    it_should_apply_error_logic_for_input_type(:datetime)
+    
+    it 'should have a legend and label with the label text inside the fieldset' do
+      output_buffer.should have_tag('form li.datetime fieldset legend.label label', /Publish at/)
+    end
+    
+    it 'should associate the legend label with the first select' do
+      output_buffer.should have_tag('form li.datetime fieldset legend.label')
+      output_buffer.should have_tag('form li.datetime fieldset legend.label label')
+      output_buffer.should have_tag('form li.datetime fieldset legend.label label[@for]')
+      output_buffer.should have_tag('form li.datetime fieldset legend.label label[@for="post_publish_at_1i"]')
+    end
+    
+    it 'should have an ordered list of five items inside the fieldset' do
+      output_buffer.should have_tag('form li.datetime fieldset ol')
+      output_buffer.should have_tag('form li.datetime fieldset ol li', :count => 5)
+    end
+
+    it 'should have five labels for year, month and day' do
+      output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => 5)
+      output_buffer.should have_tag('form li.datetime fieldset ol li label', /year/i)
+      output_buffer.should have_tag('form li.datetime fieldset ol li label', /month/i)
+      output_buffer.should have_tag('form li.datetime fieldset ol li label', /day/i)
+      output_buffer.should have_tag('form li.datetime fieldset ol li label', /hour/i)
+      output_buffer.should have_tag('form li.datetime fieldset ol li label', /min/i)
+    end
+    
+    it 'should have five selects' do
+      output_buffer.should have_tag('form li.datetime fieldset ol li select', :count => 5)
+    end
+  end
+
+  describe "when namespace is provided" do
+  
+    before do
+      output_buffer.replace ''
+      concat(semantic_form_for(@new_post, :namespace => "context2") do |builder|
+        concat(builder.input(:publish_at, :as => :datetime))
+      end)
+    end
+  
+    it_should_have_input_wrapper_with_id("context2_post_publish_at_input")
+    it_should_have_select_with_id("context2_post_publish_at_1i")
+    it_should_have_select_with_id("context2_post_publish_at_2i")
+    it_should_have_select_with_id("context2_post_publish_at_3i")
+    it_should_have_select_with_id("context2_post_publish_at_4i")
+    it_should_have_select_with_id("context2_post_publish_at_5i")
+  
+  end
+  
+  describe ':labels option' do
+    fields = [:year, :month, :day, :hour, :minute]
+    fields.each do |field|
+      it "should replace the #{field} label with the specified text if :labels[:#{field}] is set" do
+        output_buffer.replace ''
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:created_at, :as => :datetime, :labels => { field => "another #{field} label" }))
+        end)
+        output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => fields.length)
+        fields.each do |f|
+          output_buffer.should have_tag('form li.datetime fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
+        end
+      end
+  
+      #it "should not display the label for the #{field} field when :labels[:#{field}] is blank" do
+      #  output_buffer.replace ''
+      #  concat(semantic_form_for(@new_post) do |builder|
+      #    concat(builder.input(:created_at, :as => :datetime, :labels => { field => "" }))
+      #  end)
+      #  output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => fields.length-1)
+      #  fields.each do |f|
+      #    output_buffer.should have_tag('form li.datetime fieldset ol li label', /#{f}/i) unless field == f
+      #  end
+      #end
+    end
+  end
+
+end

From 8694bd421c5b03044d52f9a9ffe3d39a6ab5e93b Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 9 Mar 2011 09:12:45 +1300
Subject: [PATCH 568/992] implemented time input from NewBase with NewTimeish

---
 lib/formtastic/form_builder.rb          |  1 -
 lib/formtastic/helpers/inputs_helper.rb |  2 +-
 lib/formtastic/inputs/time_input.rb     | 11 ++++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 20f7cb0a1..f8fbb69b5 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -71,7 +71,6 @@ def self.configure(name, value = nil)
     include Formtastic::Inputs::CheckBoxesInput
     include Formtastic::Inputs::RadioInput
     include Formtastic::Inputs::SelectInput
-    include Formtastic::Inputs::TimeInput
     
   end
   
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 7b20ade71..d6d2278b2 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -247,7 +247,7 @@ def input(method, options = {})
         
         options[:as]     ||= default_input_type(method, options)
 
-        [:string, :country, :boolean, :time_zone, :date, :datetime, :phone, :search, :numeric, :email, :file, :hidden, :password, :text, :url].each do |i|
+        [:string, :country, :boolean, :time_zone, :date, :datetime, :time, :phone, :search, :numeric, :email, :file, :hidden, :password, :text, :url].each do |i|
           klass = "Formtastic::Inputs::#{options[:as].to_s.camelize}Input".constantize
           return klass.new(self, template, @object, @object_name, method, options).to_html if options[:as] == i
         end
diff --git a/lib/formtastic/inputs/time_input.rb b/lib/formtastic/inputs/time_input.rb
index dd90209db..cee81ecae 100644
--- a/lib/formtastic/inputs/time_input.rb
+++ b/lib/formtastic/inputs/time_input.rb
@@ -3,11 +3,12 @@
 module Formtastic
   module Inputs
     # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
-    module TimeInput
-      include Formtastic::Inputs::Timeish
-      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))
+    class TimeInput < NewBase
+      include NewTimeish
+      
+      # we don't want year / month / day fragments in a time select
+      def date_fragments
+        []
       end
     end
   end

From b66da92555eecd9b723303cc6b096dd2d5709693 Mon Sep 17 00:00:00 2001
From: Kent Fenwick <kent.fenwick@gmail.com>
Date: Tue, 1 Mar 2011 08:43:07 +0800
Subject: [PATCH 569/992] Minor change that references the newer, more
 maintained country_select plugin.

---
 lib/formtastic/inputs/country_input.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/country_input.rb b/lib/formtastic/inputs/country_input.rb
index 1b245ef03..8fbc0289f 100644
--- a/lib/formtastic/inputs/country_input.rb
+++ b/lib/formtastic/inputs/country_input.rb
@@ -50,7 +50,7 @@ module CountryInput
       include Formtastic::Inputs::Base
 
       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 respond_to?(:country_select)
+        raise "To use the :country input, please install a country_select plugin, like this one: https://github.com/chrislerum/country_select.git" unless respond_to?(:country_select)
 
         html_options = options.delete(:input_html) || {}
         priority_countries = options.delete(:priority_countries) || self.priority_countries

From a7ec9a002c43f006c196983cbfff792c71ec9c14 Mon Sep 17 00:00:00 2001
From: Kent Fenwick <kent.fenwick@gmail.com>
Date: Tue, 1 Mar 2011 21:19:21 +0800
Subject: [PATCH 570/992] Removed .git from country_select url

---
 lib/formtastic/inputs/country_input.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/country_input.rb b/lib/formtastic/inputs/country_input.rb
index 8fbc0289f..b2f448df8 100644
--- a/lib/formtastic/inputs/country_input.rb
+++ b/lib/formtastic/inputs/country_input.rb
@@ -50,7 +50,7 @@ module CountryInput
       include Formtastic::Inputs::Base
 
       def country_input(method, options)
-        raise "To use the :country input, please install a country_select plugin, like this one: https://github.com/chrislerum/country_select.git" unless respond_to?(:country_select)
+        raise "To use the :country input, please install a country_select plugin, like this one: https://github.com/chrislerum/country_select" unless respond_to?(:country_select)
 
         html_options = options.delete(:input_html) || {}
         priority_countries = options.delete(:priority_countries) || self.priority_countries

From 198381696b1701573729948c178cc943f8c9a684 Mon Sep 17 00:00:00 2001
From: Konstantin Shabanov <etehtsea@gmail.com>
Date: Thu, 10 Mar 2011 19:06:47 +0600
Subject: [PATCH 571/992] Minor change that references the newer, more
 maintained country_select plugin.

---
 README.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.textile b/README.textile
index 4eaf60ed0..37edb6b30 100644
--- a/README.textile
+++ b/README.textile
@@ -584,7 +584,7 @@ h2. Dependencies
 There are none, but...
 
 * if you have the "ValidationReflection":http://github.com/redinger/validation_reflection plugin is installed, you won't have to specify the @:required@ option (it checks the validations on the model instead).
-* if you want to use the @:country@ input, you'll need to install the "iso-3166-country-select plugin":http://github.com/rails/iso-3166-country-select (or any other country_select plugin with the same API).
+* if you want to use the @:country@ input, you'll need to install the "country-select plugin":https://github.com/chrislerum/country_select.git (or any other country_select plugin with the same API).
 * "rspec":http://github.com/dchelimsky/rspec/, "rspec_hpricot_matchers":http://rubyforge.org/projects/rspec-hpricot/ and "rcov":http://github.com/relevance/rcov gems (plus any of their own dependencies) are required for the test suite.
 
 

From fe2fec0ecc6f109c736896e3dd47cf2582b11016 Mon Sep 17 00:00:00 2001
From: Konstantin Shabanov <etehtsea@gmail.com>
Date: Thu, 10 Mar 2011 19:07:56 +0600
Subject: [PATCH 572/992] typo fix

---
 README.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.textile b/README.textile
index 37edb6b30..5fb6471e3 100644
--- a/README.textile
+++ b/README.textile
@@ -584,7 +584,7 @@ h2. Dependencies
 There are none, but...
 
 * if you have the "ValidationReflection":http://github.com/redinger/validation_reflection plugin is installed, you won't have to specify the @:required@ option (it checks the validations on the model instead).
-* if you want to use the @:country@ input, you'll need to install the "country-select plugin":https://github.com/chrislerum/country_select.git (or any other country_select plugin with the same API).
+* if you want to use the @:country@ input, you'll need to install the "country-select plugin":https://github.com/chrislerum/country_select (or any other country_select plugin with the same API).
 * "rspec":http://github.com/dchelimsky/rspec/, "rspec_hpricot_matchers":http://rubyforge.org/projects/rspec-hpricot/ and "rcov":http://github.com/relevance/rcov gems (plus any of their own dependencies) are required for the test suite.
 
 

From 18f22bff3d531c6a8c4d570f2d0bed880bce722c Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Thu, 10 Mar 2011 10:24:17 -0300
Subject: [PATCH 573/992] Fix description of partial option on formtastic:form
 generator

---
 lib/generators/formtastic/form/form_generator.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/generators/formtastic/form/form_generator.rb b/lib/generators/formtastic/form/form_generator.rb
index 4e58403c7..37ec3c988 100644
--- a/lib/generators/formtastic/form/form_generator.rb
+++ b/lib/generators/formtastic/form/form_generator.rb
@@ -23,7 +23,7 @@ class FormGenerator < Rails::Generators::NamedBase
                  :desc => "Generate HAML instead of ERB"
 
     class_option :partial, :type => :boolean, :default => true, :group => :formtastic,
-                 :desc => 'Generate a form partial in the model views path (eg `posts/_form.html.erb`'
+                 :desc => 'Generate a form partial in the model views path (eg `posts/_form.html.erb`)'
 
     class_option :copy, :type => :boolean, :default => false, :group => :formtastic,
                  :desc => 'Copy the generated code the clipboard instead of generating a partial file."'

From eff4451f0593dc95c7a14dd573a347040176c648 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Thu, 10 Mar 2011 10:26:45 -0300
Subject: [PATCH 574/992] Change formtastic:form generator to reflect on model
 associations

---
 lib/generators/formtastic/form/form_generator.rb | 15 ++++++++++-----
 lib/generators/templates/_form.html.erb          |  4 ++--
 lib/generators/templates/_form.html.haml         |  4 ++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/lib/generators/formtastic/form/form_generator.rb b/lib/generators/formtastic/form/form_generator.rb
index 37ec3c988..17b7fa09e 100644
--- a/lib/generators/formtastic/form/form_generator.rb
+++ b/lib/generators/formtastic/form/form_generator.rb
@@ -34,7 +34,8 @@ class FormGenerator < Rails::Generators::NamedBase
     source_root File.expand_path('../../../templates', __FILE__)
 
     def create_or_show
-      @attributes = self.columns if @attributes.empty?
+      @attributes = reflected_attributes if @attributes.empty?
+      
       if options[:copy]
         template = File.read("#{self.class.source_root}/_form.html.#{template_type}")
         erb = ERB.new(template, nil, '-')
@@ -49,8 +50,6 @@ def create_or_show
 
     protected
 
-    IGNORED_COLUMNS = [:updated_at, :created_at].freeze
-
     def template_type
       @template_type ||= options[:haml] ? :haml : :erb
     end
@@ -63,8 +62,14 @@ def controller_path
       end
     end
 
-    def columns
-      @columns ||= self.name.camelize.constantize.content_columns.reject { |column| IGNORED_COLUMNS.include?(column.name.to_sym) }
+    def reflected_attributes
+      columns = model.content_columns.map{|column| column.name}
+      columns += model.reflect_on_all_associations.map{|association| association.name.to_s}
+      columns -= %w(created_at updated_at)
+    end
+
+    def model
+      @model ||= name.camelize.constantize
     end
 
     def save_to_clipboard(data)
diff --git a/lib/generators/templates/_form.html.erb b/lib/generators/templates/_form.html.erb
index 9469fded4..a03c83555 100644
--- a/lib/generators/templates/_form.html.erb
+++ b/lib/generators/templates/_form.html.erb
@@ -1,7 +1,7 @@
 <%%= semantic_form_for @<%= name.underscore %> do |f| %>
   <%%= f.inputs do %>
-  <% attributes.each do |attribute| -%>
-    <%%= f.input :<%= attribute.name %> %>
+  <% @attributes.each do |attribute| -%>
+    <%%= f.input :<%= attribute %> %>
   <% end -%>
   <%% end %>
 <%% end %>
diff --git a/lib/generators/templates/_form.html.haml b/lib/generators/templates/_form.html.haml
index 8879e1336..ff173c5cd 100644
--- a/lib/generators/templates/_form.html.haml
+++ b/lib/generators/templates/_form.html.haml
@@ -1,5 +1,5 @@
 = semantic_form_for @<%= name.underscore %> do |f|
   = f.inputs do
-  <% attributes.each do |attribute| -%>
-    = f.input :<%= attribute.name %>
+  <% @attributes.each do |attribute| -%>
+    = f.input :<%= attribute %>
   <% end -%>

From 9e2bee7faec060b397eddf9344ddd0b21aba8234 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Thu, 10 Mar 2011 10:27:35 -0300
Subject: [PATCH 575/992] Update attributes banner on formtastic:form generator

---
 lib/generators/formtastic/form/form_generator.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/generators/formtastic/form/form_generator.rb b/lib/generators/formtastic/form/form_generator.rb
index 17b7fa09e..3962858d9 100644
--- a/lib/generators/formtastic/form/form_generator.rb
+++ b/lib/generators/formtastic/form/form_generator.rb
@@ -17,7 +17,7 @@ class FormGenerator < Rails::Generators::NamedBase
     desc "Generates a Formtastic form partial based on an existing model."
 
     argument :name, :type => :string, :required => true, :banner => 'MyExistingModel'
-    argument :attributes, :type => :array, :default => [], :banner => 'attribute:type attribute:type'
+    argument :attributes, :type => :array, :default => [], :banner => 'attribute attribute'
 
     class_option :haml, :type => :boolean, :default => false, :group => :formtastic,
                  :desc => "Generate HAML instead of ERB"

From afc0b0b6bdcbdbd0be27a006ea8f7f24a5397301 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sat, 12 Mar 2011 22:21:23 -0300
Subject: [PATCH 576/992] Improve example and move to sample folder

---
 sample/basic_inputs.html           | 158 +++++++++++++++++++++++++++++
 stylesheet_tests/basic_inputs.html | 123 ----------------------
 2 files changed, 158 insertions(+), 123 deletions(-)
 create mode 100644 sample/basic_inputs.html
 delete mode 100644 stylesheet_tests/basic_inputs.html

diff --git a/sample/basic_inputs.html b/sample/basic_inputs.html
new file mode 100644
index 000000000..787578dcf
--- /dev/null
+++ b/sample/basic_inputs.html
@@ -0,0 +1,158 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta content="noindex,nofollow" name="robots">
+    <meta charset="utf-8">
+    <title>Formtastic</title>
+    <link href="../lib/generators/templates/formtastic.css" rel="stylesheet" type="text/css" />
+    <style>
+      body {
+        font-family: helvetica, arial;
+        font-size: 12px;
+      }
+    </style>
+  </head>
+</html>
+<body>
+  <h1>Formtastic</h1>
+
+  <form action="basic_inputs.html" class="formtastic gem" id="new_gem" method="get">
+    <fieldset class="inputs">
+      <ol>
+        <li class="string optional" id="gem_summary_input">
+          <label for="gem_summary">Summary</label>
+          <input id="gem_summary" name="gem[summary]" type="text" value="A Rails form builder plugin/gem with semantically rich and accessible markup" maxlength="255">
+        </li>
+
+        <li class="text optional" id="gem_description_input">
+          <label for="gem_description">Description</label>
+          <textarea id="gem_description" rows="5">A Rails form builder plugin/gem with semantically rich and accessible markup</textarea>
+        </li>
+
+        <li class="url optional" id="gem_url_input">
+          <label for="gem_url">URL</label>
+          <input id="gem_url" name="gem[url]" type="url">
+          <p class="inline-hints">Example: https://github.com/justinfrench/formtastic</p>
+        </li>
+
+        <li class="password required" id="gem_password_input">
+          <label for="gem_password">Password<abbr title="required">*</abbr></label>
+          <input id="gem_password" name="gem[password]" type="password">
+          <p class="inline-errors">can't be blank</p>
+        </li>
+
+        <li class="password required" id="gem_password_input">
+          <label for="gem_password_confirmation">Password confirmation<abbr title="required">*</abbr></label>
+          <input id="gem_password_confirmation" name="gem[password_confirmation]" type="password">
+          <p class="inline-errors">can't be blank</p>
+        </li>
+
+        <li class="numeric optional" id="gem_downloads_input">
+          <label for="gem_downloads">Downloads</label>
+          <input id="gem_downloads" name="gem[downloads]" type="numeric" value="209,354">
+        </li>
+
+        <li class="file optional" id="gem_file_input">
+          <label for="gem_file">File</label>
+          <input id="gem_file" name="gem[file]" type="file" value="value">
+        </li>
+
+        <li class="email optional" id="gem_email_input">
+          <label for="gem_email">Email</label>
+          <input id="gem_email" name="gem[email]" type="email">
+        </li>
+
+        <li class="phone optional" id="gem_phone_input">
+          <label for="gem_phone">Phone</label>
+          <input id="gem_phone" name="gem[phone]" type="phone">
+        </li>
+
+        <li class="search optional" id="gem_search_input">
+          <label for="gem_search">Search</label>
+          <input id="gem_search" name="gem[search]" type="search">
+        </li>
+
+        <li class="date optional">
+          <fieldset>
+            <legend class="label"><label>First release</label></legend>
+            <ol>
+              <li>
+                <label>Year</label>
+                <select id="gem_first_release_1i" name="gem[first_release][1i]">
+                  <option>2009</option>
+                </select>
+              </li>
+              <li>
+                <label>Month</label>
+                <select id="gem_first_release_2i" name="gem[first_release][2i]">
+                  <option>October</option>
+                </select>
+              </li>
+              <li>
+                <label>Day</label>
+                <select id="gem_first_release_3i" name="gem[first_release][3i]">
+                  <option>15</option>
+                </select>
+              </li>
+            </ol>
+          </fieldset>
+        </li>
+
+        <li class="radio optional">
+          <fieldset>
+            <legend class="label"><label>Rate</label></legend>
+            <ol>
+              <li>
+                <label><input id="gem_rate_five" name="gem[rate]" type="radio" checked="checked"> Five</label></label>
+              </li>
+              <li>
+                <label><input id="gem_rate_four" name="gem[rate]" type="radio"> Four</label></label>
+              </li>
+              <li>
+                <label><input id="gem_rate_three" name="gem[rate]" type="radio"> Three</label></label>
+              </li>
+              <li>
+                <label><input id="gem_rate_two" name="gem[rate]" type="radio"> Two</label></label>
+              </li>
+              <li>
+                <label><input id="gem_rate_one" name="gem[rate]" type="radio"> One</label></label>
+              </li>
+            </ol>
+          </fieldset>
+        </li>
+
+        <li class="check_boxes optional">
+          <fieldset>
+            <legend class="label"><label>Browsers</label></legend>
+            <ol>
+              <li>
+                <label><input id="gem_browser_google_chrome" name="gem[browser][]" type="checkbox"> Google Chrome</label></label>
+              </li>
+              <li>
+                <label><input id="gem_browser_apple_safari" name="gem[browser][]" type="checkbox"> Apple Safari</label></label>
+              </li>
+              <li>
+                <label><input id="gem_browser_mozilla_firefox" name="gem[browser][]" type="checkbox"> Mozilla Firefox</label></label>
+              </li>
+              <li>
+                <label><input id="gem_browser_opera" name="gem[browser][]" type="checkbox"> Opera</label></label>
+              </li>
+              <li>
+                <label><input id="gem_browser_internet_explorer" name="gem[browser][]" type="checkbox"> Internet Explorer</label></label>
+              </li>
+            </ol>
+          </fieldset>
+        </li>
+      </ol>
+    </fieldset>
+
+    <fieldset class="buttons">
+      <ol>
+        <li class="commit">
+          <input class="create" id="gem_submit" type="submit">
+        </li>
+      </ol>
+    </fieldset>
+  </form>
+</body>
+</html>
diff --git a/stylesheet_tests/basic_inputs.html b/stylesheet_tests/basic_inputs.html
deleted file mode 100644
index c83644410..000000000
--- a/stylesheet_tests/basic_inputs.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
-   "http://www.w3.org/TR/html4/strict.dtd">
-
-<html lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title>index</title>
-	<link rel="stylesheet" href="../lib/generators/templates/formtastic.css" type="text/css">
-	<style>
-	  body { font-family:helvetica, arial; }
-	</style>
-</head>
-<body>
-  
-  <form class='formtastic'>
-    <fieldset>
-      <ol>
-        
-        <li class="string">
-          <label>String</label>
-          <input type="text" value="value" size="5" maxlength="2">
-        </li>
-        
-        <li class="url">
-          <label>URL</label>
-          <input type="url" value="value">
-        </li>
-        
-        <li class="password">
-          <label>Password</label>
-          <input type="password" value="value">
-        </li>
-        
-        <li class="numeric">
-          <label>Numeric</label>
-          <input type="numeric" value="value">
-        </li>
-        
-        <li class="file">
-          <label>File</label>
-          <input type="file" value="value">
-        </li>
-        
-        <li class="email">
-          <label>Email</label>
-          <input type="email" value="value">
-        </li>
-        
-        <li class="phone">
-          <label>Phone</label>
-          <input type="phone" value="value">
-        </li>
-        
-        <li class="search">
-          <label>Search</label>
-          <input type="search" value="value">
-        </li>
-        
-        <li class="text">
-          <label>Text</label>
-          <textarea>value</textarea>
-        </li>
-        
-        <li class="date">
-          <fieldset>
-            <legend class="label"><label>Date</label></legend>
-            <ol>
-              <li>
-                <label>Year</label>
-                <select>
-                  <option>Foo</option>
-                </select>
-              </li>
-              <li>
-                <label>Month</label>
-                <select>
-                  <option>Foo</option>
-                </select>
-              </li>
-              <li>
-                <label>Day</label>
-                <select>
-                  <option>Foo</option>
-                </select>
-              </li>
-            </ol>
-          </fieldset>
-        </li>
-        
-        <li class="radio">
-          <fieldset>
-            <legend class="label"><label>Radio</label></legend>
-            <ol>
-              <li>
-                <label><input type="radio"> Foo</label></label>
-              </li>
-              <li>
-                <label><input type="radio"> Bah</label></label>
-              </li>
-            </ol>
-          </fieldset>
-        </li>
-        
-        <li class="check_boxes">
-          <fieldset>
-            <legend class="label"><label>Radio</label></legend>
-            <ol>
-              <li>
-                <label><input type="checkbox"> Foo</label></label>
-              </li>
-              <li>
-                <label><input type="checkbox"> Bah</label></label>
-              </li>
-            </ol>
-          </fieldset>
-        </li>
-
-      </ol>
-    </fieldset>
-  </form>
-
-</body>
-</html>

From bdda26f96b6e264f3720a302879924cec64ae93a Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 15 Mar 2011 06:38:37 +1100
Subject: [PATCH 577/992] make NewBase a module and include it in *Input
 instead of inheriting

---
 lib/formtastic/inputs/boolean_input.rb   | 3 ++-
 lib/formtastic/inputs/country_input.rb   | 3 ++-
 lib/formtastic/inputs/date_input.rb      | 3 ++-
 lib/formtastic/inputs/datetime_input.rb  | 3 ++-
 lib/formtastic/inputs/email_input.rb     | 3 ++-
 lib/formtastic/inputs/file_input.rb      | 3 ++-
 lib/formtastic/inputs/hidden_input.rb    | 3 ++-
 lib/formtastic/inputs/new_base.rb        | 9 ++++++++-
 lib/formtastic/inputs/numeric_input.rb   | 3 ++-
 lib/formtastic/inputs/password_input.rb  | 3 ++-
 lib/formtastic/inputs/phone_input.rb     | 3 ++-
 lib/formtastic/inputs/search_input.rb    | 3 ++-
 lib/formtastic/inputs/string_input.rb    | 3 ++-
 lib/formtastic/inputs/text_input.rb      | 3 ++-
 lib/formtastic/inputs/time_input.rb      | 3 ++-
 lib/formtastic/inputs/time_zone_input.rb | 3 ++-
 lib/formtastic/inputs/url_input.rb       | 3 ++-
 17 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/lib/formtastic/inputs/boolean_input.rb b/lib/formtastic/inputs/boolean_input.rb
index 2e0daaed4..3b47f2c46 100644
--- a/lib/formtastic/inputs/boolean_input.rb
+++ b/lib/formtastic/inputs/boolean_input.rb
@@ -31,7 +31,8 @@ module Inputs
     #   <%= f.input :published, :checked_value => "yes", :unchecked_value => "no" %> 
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    class BooleanInput < NewBase
+    class BooleanInput
+      include NewBase
       
       def to_html
         input_wrapping do
diff --git a/lib/formtastic/inputs/country_input.rb b/lib/formtastic/inputs/country_input.rb
index 53429ca27..1d00e5c10 100644
--- a/lib/formtastic/inputs/country_input.rb
+++ b/lib/formtastic/inputs/country_input.rb
@@ -48,7 +48,8 @@ module Inputs
     #   </li>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    class CountryInput < NewBase
+    class CountryInput 
+      include NewBase
 
       def to_html
         raise "To use the :country input, please install a country_select plugin, like this one: http://github.com/rails/iso-3166-country-select" unless builder.respond_to?(:country_select)
diff --git a/lib/formtastic/inputs/date_input.rb b/lib/formtastic/inputs/date_input.rb
index b97fbc72d..fcd36f354 100644
--- a/lib/formtastic/inputs/date_input.rb
+++ b/lib/formtastic/inputs/date_input.rb
@@ -4,7 +4,8 @@
 module Formtastic
   module Inputs
     # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
-    class DateInput < NewBase
+    class DateInput 
+      include NewBase
       include NewTimeish
       
       # We don't want hour and minute fragments on a date input
diff --git a/lib/formtastic/inputs/datetime_input.rb b/lib/formtastic/inputs/datetime_input.rb
index d9d089331..098179731 100644
--- a/lib/formtastic/inputs/datetime_input.rb
+++ b/lib/formtastic/inputs/datetime_input.rb
@@ -4,7 +4,8 @@
 module Formtastic
   module Inputs
     # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
-    class DatetimeInput < NewBase
+    class DatetimeInput 
+      include NewBase
       include NewTimeish
 
       
diff --git a/lib/formtastic/inputs/email_input.rb b/lib/formtastic/inputs/email_input.rb
index bd9a62bfa..80683c7d6 100644
--- a/lib/formtastic/inputs/email_input.rb
+++ b/lib/formtastic/inputs/email_input.rb
@@ -28,7 +28,8 @@ module Inputs
     #   </form>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    class EmailInput < NewBase
+    class EmailInput 
+      include NewBase
       include Stringish
       
       def to_html
diff --git a/lib/formtastic/inputs/file_input.rb b/lib/formtastic/inputs/file_input.rb
index 6d89f4fc3..aa5a8afb9 100644
--- a/lib/formtastic/inputs/file_input.rb
+++ b/lib/formtastic/inputs/file_input.rb
@@ -31,7 +31,8 @@ module Inputs
     #   </form>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    class FileInput < NewBase
+    class FileInput 
+      include NewBase
       def to_html
         input_wrapping do
           builder.label(method, label_html_options) <<
diff --git a/lib/formtastic/inputs/hidden_input.rb b/lib/formtastic/inputs/hidden_input.rb
index 2cec97f6c..b8f540dd2 100644
--- a/lib/formtastic/inputs/hidden_input.rb
+++ b/lib/formtastic/inputs/hidden_input.rb
@@ -30,7 +30,8 @@ module Inputs
     #   form.formtastic li.hidden { display:none; }
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    class HiddenInput < NewBase
+    class HiddenInput 
+      include NewBase
       
       def input_html_options
         return {:value => options[:value]}.merge(super) if options.key?(:value)
diff --git a/lib/formtastic/inputs/new_base.rb b/lib/formtastic/inputs/new_base.rb
index 8c03c67d9..4ab7a3131 100644
--- a/lib/formtastic/inputs/new_base.rb
+++ b/lib/formtastic/inputs/new_base.rb
@@ -1,6 +1,6 @@
 module Formtastic
   module Inputs
-    class NewBase
+    module NewBase
       
       attr_accessor :builder, :template, :object, :object_name, :method, :options
       
@@ -20,6 +20,9 @@ def to_html
         end
       end
       
+      
+      
+      
       def column
         object.column_for_attribute(method) if object.respond_to?(:column_for_attribute)
       end
@@ -28,6 +31,10 @@ def column?
         !column.nil?
       end
       
+      
+      
+      
+      
       def column_limit
         column.limit if column?
       end
diff --git a/lib/formtastic/inputs/numeric_input.rb b/lib/formtastic/inputs/numeric_input.rb
index 32d4e318d..0afcbf529 100644
--- a/lib/formtastic/inputs/numeric_input.rb
+++ b/lib/formtastic/inputs/numeric_input.rb
@@ -32,7 +32,8 @@ module Inputs
     #  <%= f.input :shoe_size, :as => :numeric, :input_html => { :min => 3, :max => 15, :step => 1 } %>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    class NumericInput < NewBase
+    class NumericInput 
+      include NewBase
       include Stringish
       
       def to_html
diff --git a/lib/formtastic/inputs/password_input.rb b/lib/formtastic/inputs/password_input.rb
index e9a38493e..92837efd3 100644
--- a/lib/formtastic/inputs/password_input.rb
+++ b/lib/formtastic/inputs/password_input.rb
@@ -28,7 +28,8 @@ module Inputs
     #   </form>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    class PasswordInput < NewBase
+    class PasswordInput 
+      include NewBase
       include Stringish
       
       def to_html
diff --git a/lib/formtastic/inputs/phone_input.rb b/lib/formtastic/inputs/phone_input.rb
index 79c45e252..d21e02e54 100644
--- a/lib/formtastic/inputs/phone_input.rb
+++ b/lib/formtastic/inputs/phone_input.rb
@@ -28,7 +28,8 @@ module Inputs
     #   </form>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    class PhoneInput < NewBase
+    class PhoneInput 
+      include NewBase
       include Stringish
       
       def to_html
diff --git a/lib/formtastic/inputs/search_input.rb b/lib/formtastic/inputs/search_input.rb
index ebed1b748..97e0d9111 100644
--- a/lib/formtastic/inputs/search_input.rb
+++ b/lib/formtastic/inputs/search_input.rb
@@ -24,7 +24,8 @@ module Inputs
     #   </form>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    class SearchInput < NewBase
+    class SearchInput 
+      include NewBase
       include Stringish
       
       def to_html
diff --git a/lib/formtastic/inputs/string_input.rb b/lib/formtastic/inputs/string_input.rb
index a33d3cfb6..184010059 100644
--- a/lib/formtastic/inputs/string_input.rb
+++ b/lib/formtastic/inputs/string_input.rb
@@ -29,7 +29,8 @@ module Inputs
     #   </form>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    class StringInput < NewBase
+    class StringInput 
+      include NewBase
       include Stringish
     end
   end
diff --git a/lib/formtastic/inputs/text_input.rb b/lib/formtastic/inputs/text_input.rb
index 60d4678fd..4213a2f66 100644
--- a/lib/formtastic/inputs/text_input.rb
+++ b/lib/formtastic/inputs/text_input.rb
@@ -27,7 +27,8 @@ module Inputs
     #   </form>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    class TextInput < NewBase
+    class TextInput 
+      include NewBase
       
       def input_html_options
         { 
diff --git a/lib/formtastic/inputs/time_input.rb b/lib/formtastic/inputs/time_input.rb
index cee81ecae..de13ee49d 100644
--- a/lib/formtastic/inputs/time_input.rb
+++ b/lib/formtastic/inputs/time_input.rb
@@ -3,7 +3,8 @@
 module Formtastic
   module Inputs
     # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
-    class TimeInput < NewBase
+    class TimeInput 
+      include NewBase
       include NewTimeish
       
       # we don't want year / month / day fragments in a time select
diff --git a/lib/formtastic/inputs/time_zone_input.rb b/lib/formtastic/inputs/time_zone_input.rb
index afa552400..dca67c68f 100644
--- a/lib/formtastic/inputs/time_zone_input.rb
+++ b/lib/formtastic/inputs/time_zone_input.rb
@@ -32,7 +32,8 @@ module Inputs
     #
     # @todo document :priority_zones option
     # @todo configurable default :priority_zones?
-    class TimeZoneInput < NewBase
+    class TimeZoneInput 
+      include NewBase
 
       def to_html
         input_wrapping do
diff --git a/lib/formtastic/inputs/url_input.rb b/lib/formtastic/inputs/url_input.rb
index ea0c3765f..570ce10ba 100644
--- a/lib/formtastic/inputs/url_input.rb
+++ b/lib/formtastic/inputs/url_input.rb
@@ -28,7 +28,8 @@ module Inputs
     #   </form>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    class UrlInput < NewBase
+    class UrlInput 
+      include NewBase
       include Stringish
       
       def to_html

From 54ce8e2c3661200856b9ddc38202152f0b42f6ce Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 15 Mar 2011 07:04:30 +1100
Subject: [PATCH 578/992] attempt to break-up NewBase into smaller components

---
 lib/formtastic/inputs/new_base.rb             | 294 ++----------------
 .../inputs/new_base/associations.rb           |  22 ++
 lib/formtastic/inputs/new_base/database.rb    |  17 +
 lib/formtastic/inputs/new_base/errors.rb      |  31 ++
 lib/formtastic/inputs/new_base/fileish.rb     |  23 ++
 lib/formtastic/inputs/new_base/hints.rb       |  17 +
 lib/formtastic/inputs/new_base/html.rb        | 111 +++++++
 lib/formtastic/inputs/new_base/naming.rb      |  25 ++
 lib/formtastic/inputs/new_base/options.rb     |  18 ++
 lib/formtastic/inputs/new_base/validations.rb |  71 +++++
 10 files changed, 354 insertions(+), 275 deletions(-)
 create mode 100644 lib/formtastic/inputs/new_base/associations.rb
 create mode 100644 lib/formtastic/inputs/new_base/database.rb
 create mode 100644 lib/formtastic/inputs/new_base/errors.rb
 create mode 100644 lib/formtastic/inputs/new_base/fileish.rb
 create mode 100644 lib/formtastic/inputs/new_base/hints.rb
 create mode 100644 lib/formtastic/inputs/new_base/html.rb
 create mode 100644 lib/formtastic/inputs/new_base/naming.rb
 create mode 100644 lib/formtastic/inputs/new_base/options.rb
 create mode 100644 lib/formtastic/inputs/new_base/validations.rb

diff --git a/lib/formtastic/inputs/new_base.rb b/lib/formtastic/inputs/new_base.rb
index 4ab7a3131..d0f0f9f64 100644
--- a/lib/formtastic/inputs/new_base.rb
+++ b/lib/formtastic/inputs/new_base.rb
@@ -1,3 +1,13 @@
+require 'inputs/new_base/associations'
+require 'inputs/new_base/fileish'
+require 'inputs/new_base/validations'
+require 'inputs/new_base/naming'
+require 'inputs/new_base/hints'
+require 'inputs/new_base/errors'
+require 'inputs/new_base/database'
+require 'inputs/new_base/options'
+require 'inputs/new_base/html'
+
 module Formtastic
   module Inputs
     module NewBase
@@ -13,282 +23,16 @@ def initialize(builder, template, object, object_name, method, options)
         @options = options.dup
       end
       
-      def to_html
-        input_wrapping do
-          builder.label(method, label_html_options) <<
-          builder.text_field(method, input_html_options)
-        end
-      end
-      
-      
-      
-      
-      def column
-        object.column_for_attribute(method) if object.respond_to?(:column_for_attribute)
-      end
-      
-      def column?
-        !column.nil?
-      end
-      
-      
-      
-      
-      
-      def column_limit
-        column.limit if column?
-      end
-      
-      def limit
-        validation_limit || column_limit
-      end
-      
-      
-      
-      def input_options
-        options.except(*formtastic_options)
-      end
-      
-      def formtastic_options
-        [:priority_countries, :priority_zones, :value_method, :label_method, :collection, :required, :label, :as, :hint, :input_html, :label_html, :value_as_class, :find_options, :class]
-      end
-      
-      
-      
-      
-      def input_html_options
-        opts = options[:input_html] || {}
-        opts[:id] ||= input_dom_id
-        
-        opts
-      end
-      
-      def input_dom_id
-        options[:input_html].try(:[], :id) || dom_id('')
-      end
-      
-      def label_html_options
-        # opts = options_for_label(options) # TODO
-        opts = {}
-        opts[:for] ||= input_dom_id
-        
-        opts
-      end
-      
-      
-      # TODO doesn't cover custom ordering
-      def input_wrapping(&block)
-        template.content_tag(:li, 
-          [template.capture(&block), error_html, hint_html].join("\n").html_safe, 
-          wrapper_html_options
-        )
-      end
-      
-      
-      def wrapper_html_options
-        opts = options[:wrapper_html] || {}
-        opts[:class] ||= []
-        opts[:class] = opts[:class].to_a if opts[:class].is_a?(String)
-        opts[:class] << as
-        opts[:class] << "error" if errors?
-        opts[:class] << "optional" if optional?
-        opts[:class] << "required" if required?
-        opts[:class] = opts[:class].join(' ')
-        
-        opts[:id] = dom_id
-
-        opts
-      end
-      
-      
-      
-      def error_html
-        errors? ? send(:"error_#{builder.inline_errors}_html") : ""
-      end
-      
-      def error_sentence_html
-        error_class = options[:error_class] || builder.default_inline_error_class
-        template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.html_safe), :class => error_class)
-      end
-              
-      def error_list_html
-        error_class = options[:error_class] || builder.default_error_list_class
-        list_elements = []
-        errors.each do |error|
-          list_elements << template.content_tag(:li, Formtastic::Util.html_safe(error.html_safe))
-        end
-        template.content_tag(:ul, Formtastic::Util.html_safe(list_elements.join("\n")), :class => error_class)
-      end
-
-      def error_first_html
-        error_class = options[:error_class] || builder.default_inline_error_class
-        template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => error_class)
-      end
-      
-      def errors?
-        !errors.blank?
-      end
-      
-      def errors
-        errors = []
-        if object && object.respond_to?(:errors)
-          error_keys.each do |key| 
-            errors << object.errors[key] unless object.errors[key].blank?
-          end
-        end
-        errors.flatten
-      end
-      
-      def error_keys
-        keys = [method.to_sym]
-        keys << file_metadata_suffixes.map{|suffix| "#{method}_#{suffix}".to_sym} if file?
-        keys << [association_primary_key(method)] if belongs_to?
-        keys.flatten.compact.uniq
-      end
+      include Html
+      include Options
+      include Database
+      include Errors
+      include Hints
+      include Naming
+      include Validations
+      include Fileish
+      include Associations
 
-
-
-      
-      def hint_html
-        if hint?
-          template.content_tag(
-            :p, 
-            Formtastic::Util.html_safe(options[:hint]), 
-            :class => (options[:hint_class] || builder.default_hint_class)
-          )
-        end
-      end
-      
-      def hint?
-        !hint.blank? && !hint.kind_of?(Hash)
-      end
-      
-      def hint
-        builder.send(:localized_string, method, options[:hint], :hint)
-      end
-      
-      
-      
-      
-      def as
-        self.class.name.split("::").last.underscore.gsub(/_input$/, '')
-      end
-              
-      def sanitized_object_name
-        object_name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
-      end
-      
-      def sanitized_method_name
-        method.to_s.gsub(/[\?\/\-]$/, '')
-      end
-      
-      def attributized_method_name
-        method.to_s.gsub(/_id$/, '').to_sym
-      end
-      
-      def dom_id(value='input')
-        [
-          builder.custom_namespace, 
-          sanitized_object_name, 
-          dom_index, 
-          sanitized_method_name, 
-          value
-        ].reject { |x| x.blank? }.join('_')
-      end
-      
-      def dom_index
-        if options.has_key?(:index)
-          options[:index]
-        elsif defined?(@auto_index)
-          @auto_index
-        else
-          ""
-        end
-      end
-      
-      
-      def validations
-        if object && object.class.respond_to?(:validators_on) 
-          object.class.validators_on(attributized_method_name).select do |validator|
-            validator_relevant?(validator)
-          end
-        else
-          []
-        end
-      end
-      
-      def validator_relevant?(validator)
-        return true unless validator.options.key?(:if) || validator.options.key?(:unless)
-        conditional = validator.options[:if] || validator.options[:unless]
-        
-        result = if conditional.respond_to?(:call)
-          conditional.call(object)
-        elsif conditional.is_a?(::Symbol) && object.respond_to?(conditional)
-          object.send(conditional)
-        else
-          conditional
-        end
-        
-        validator.options.key?(:unless) ? !result : !!result
-      end
-      
-      
-      def validation_limit
-        validation = validations? && validations.find do |validation|
-          validation.kind == :length
-        end
-        if validation
-          validation.options[:maximum] || (validation.options[:within].present? ? validation.options[:within].max : nil)
-        else
-          nil
-        end
-      end
-      
-      def validations?
-        !validations.empty?
-      end
-      
-      def required?
-        if validations?
-          !validations.find { |validator| [:presence, :inclusion, :length].include?(validator.kind) }.nil?
-        else
-          builder.all_fields_required_by_default
-        end
-      end
-      
-      def optional?
-        !required?
-      end
-
-
-      
-      def file?
-        @file ||= begin
-          # TODO return true if self.is_a?(Formtastic::Inputs::FileInput::Woo)
-          object && object.respond_to?(method) && builder.file_methods.any? { |m| object.send(method).respond_to?(m) }
-        end
-      end
-              
-
-
-
-
-
-      
-      # :belongs_to, etc
-      def association
-        @association ||= reflection.macro if reflection
-      end
-      
-      def reflection
-        @reflection ||= object.class.reflect_on_association(method) if object.class.respond_to?(:reflect_on_association)
-      end
-      
-      def belongs_to?
-        association == :belongs_to
-      end
-      
-      
     end
   end
 end
diff --git a/lib/formtastic/inputs/new_base/associations.rb b/lib/formtastic/inputs/new_base/associations.rb
new file mode 100644
index 000000000..6c86abeca
--- /dev/null
+++ b/lib/formtastic/inputs/new_base/associations.rb
@@ -0,0 +1,22 @@
+module Formtastic
+  module Inputs
+    module NewBase
+      module Associations
+
+        # :belongs_to, etc
+        def association
+          @association ||= reflection.macro if reflection
+        end
+        
+        def reflection
+          @reflection ||= object.class.reflect_on_association(method) if object.class.respond_to?(:reflect_on_association)
+        end
+        
+        def belongs_to?
+          association == :belongs_to
+        end
+      
+      end
+    end
+  end
+end
diff --git a/lib/formtastic/inputs/new_base/database.rb b/lib/formtastic/inputs/new_base/database.rb
new file mode 100644
index 000000000..62ffefffe
--- /dev/null
+++ b/lib/formtastic/inputs/new_base/database.rb
@@ -0,0 +1,17 @@
+module Formtastic
+  module Inputs
+    module NewBase
+      module Database
+        
+        def column
+          object.column_for_attribute(method) if object.respond_to?(:column_for_attribute)
+        end
+        
+        def column?
+          !column.nil?
+        end
+        
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/new_base/errors.rb b/lib/formtastic/inputs/new_base/errors.rb
new file mode 100644
index 000000000..134ed85bc
--- /dev/null
+++ b/lib/formtastic/inputs/new_base/errors.rb
@@ -0,0 +1,31 @@
+module Formtastic
+  module Inputs
+    module NewBase
+      module Errors
+
+        def errors?
+          !errors.blank?
+        end
+        
+        def errors
+          errors = []
+          if object && object.respond_to?(:errors)
+            error_keys.each do |key| 
+              errors << object.errors[key] unless object.errors[key].blank?
+            end
+          end
+          errors.flatten
+        end
+        
+        def error_keys
+          keys = [method.to_sym]
+          keys << file_metadata_suffixes.map{|suffix| "#{method}_#{suffix}".to_sym} if file?
+          keys << [association_primary_key(method)] if belongs_to?
+          keys.flatten.compact.uniq
+        end
+        
+      end
+    end
+  end
+end
+        
diff --git a/lib/formtastic/inputs/new_base/fileish.rb b/lib/formtastic/inputs/new_base/fileish.rb
new file mode 100644
index 000000000..03afca065
--- /dev/null
+++ b/lib/formtastic/inputs/new_base/fileish.rb
@@ -0,0 +1,23 @@
+module Formtastic
+  module Inputs
+    module NewBase
+      module Fileish
+      
+        def file?
+          @file ||= begin
+            # TODO return true if self.is_a?(Formtastic::Inputs::FileInput::Woo)
+            object && object.respond_to?(method) && builder.file_methods.any? { |m| object.send(method).respond_to?(m) }
+          end
+        end
+      
+      end
+    end
+  end
+end
+
+
+
+        
+
+
+
diff --git a/lib/formtastic/inputs/new_base/hints.rb b/lib/formtastic/inputs/new_base/hints.rb
new file mode 100644
index 000000000..d5bf10b9c
--- /dev/null
+++ b/lib/formtastic/inputs/new_base/hints.rb
@@ -0,0 +1,17 @@
+module Formtastic
+  module Inputs
+    module NewBase
+      module Hints
+
+        def hint?
+          !hint.blank? && !hint.kind_of?(Hash)
+        end
+
+        def hint
+          builder.send(:localized_string, method, options[:hint], :hint)
+        end
+
+      end
+    end
+  end
+end
diff --git a/lib/formtastic/inputs/new_base/html.rb b/lib/formtastic/inputs/new_base/html.rb
new file mode 100644
index 000000000..739d60d9f
--- /dev/null
+++ b/lib/formtastic/inputs/new_base/html.rb
@@ -0,0 +1,111 @@
+module Formtastic
+  module Inputs
+    module NewBase
+      module Html
+  
+        def to_html
+          input_wrapping do
+            builder.label(method, label_html_options) <<
+            builder.text_field(method, input_html_options)
+          end
+        end
+        
+        def input_html_options
+          opts = options[:input_html] || {}
+          opts[:id] ||= input_dom_id
+          
+          opts
+        end
+        
+        def input_dom_id
+          options[:input_html].try(:[], :id) || dom_id('')
+        end
+        
+        def label_html_options
+          # opts = options_for_label(options) # TODO
+          opts = {}
+          opts[:for] ||= input_dom_id
+          
+          opts
+        end
+        
+        # TODO doesn't cover custom ordering
+        def input_wrapping(&block)
+          template.content_tag(:li, 
+            [template.capture(&block), error_html, hint_html].join("\n").html_safe, 
+            wrapper_html_options
+          )
+        end
+        
+        def wrapper_html_options
+          opts = options[:wrapper_html] || {}
+          opts[:class] ||= []
+          opts[:class] = opts[:class].to_a if opts[:class].is_a?(String)
+          opts[:class] << as
+          opts[:class] << "error" if errors?
+          opts[:class] << "optional" if optional?
+          opts[:class] << "required" if required?
+          opts[:class] = opts[:class].join(' ')
+          
+          opts[:id] = dom_id
+        
+          opts
+        end
+        
+        def error_html
+          errors? ? send(:"error_#{builder.inline_errors}_html") : ""
+        end
+        
+        def error_sentence_html
+          error_class = options[:error_class] || builder.default_inline_error_class
+          template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.html_safe), :class => error_class)
+        end
+                
+        def error_list_html
+          error_class = options[:error_class] || builder.default_error_list_class
+          list_elements = []
+          errors.each do |error|
+            list_elements << template.content_tag(:li, Formtastic::Util.html_safe(error.html_safe))
+          end
+          template.content_tag(:ul, Formtastic::Util.html_safe(list_elements.join("\n")), :class => error_class)
+        end
+        
+        def error_first_html
+          error_class = options[:error_class] || builder.default_inline_error_class
+          template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => error_class)
+        end
+        
+        def hint_html
+          if hint?
+            template.content_tag(
+              :p, 
+              Formtastic::Util.html_safe(options[:hint]), 
+              :class => (options[:hint_class] || builder.default_hint_class)
+            )
+          end
+        end
+        
+        def dom_id(value='input')
+          [
+            builder.custom_namespace, 
+            sanitized_object_name, 
+            dom_index, 
+            sanitized_method_name, 
+            value
+          ].reject { |x| x.blank? }.join('_')
+        end
+        
+        def dom_index
+          if options.has_key?(:index)
+            options[:index]
+          elsif defined?(@auto_index)
+            @auto_index
+          else
+            ""
+          end
+        end
+        
+      end
+    end
+  end
+end
diff --git a/lib/formtastic/inputs/new_base/naming.rb b/lib/formtastic/inputs/new_base/naming.rb
new file mode 100644
index 000000000..73abef62d
--- /dev/null
+++ b/lib/formtastic/inputs/new_base/naming.rb
@@ -0,0 +1,25 @@
+module Formtastic
+  module Inputs
+    module NewBase
+      module Naming
+
+        def as
+          self.class.name.split("::").last.underscore.gsub(/_input$/, '')
+        end
+        
+        def sanitized_object_name
+          object_name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
+        end
+
+        def sanitized_method_name
+          method.to_s.gsub(/[\?\/\-]$/, '')
+        end
+
+        def attributized_method_name
+          method.to_s.gsub(/_id$/, '').to_sym
+        end
+      
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/new_base/options.rb b/lib/formtastic/inputs/new_base/options.rb
new file mode 100644
index 000000000..f976239ab
--- /dev/null
+++ b/lib/formtastic/inputs/new_base/options.rb
@@ -0,0 +1,18 @@
+module Formtastic
+  module Inputs
+    module NewBase
+      module Options
+        
+        def input_options
+          options.except(*formtastic_options)
+        end
+        
+        def formtastic_options
+          [:priority_countries, :priority_zones, :value_method, :label_method, :collection, :required, :label, :as, :hint, :input_html, :label_html, :value_as_class, :find_options, :class]
+        end
+      
+      end
+    end
+  end
+end
+
diff --git a/lib/formtastic/inputs/new_base/validations.rb b/lib/formtastic/inputs/new_base/validations.rb
new file mode 100644
index 000000000..9eb9c768c
--- /dev/null
+++ b/lib/formtastic/inputs/new_base/validations.rb
@@ -0,0 +1,71 @@
+module Formtastic
+  module Inputs
+    module NewBase
+      module Validations
+
+        def validations
+          if object && object.class.respond_to?(:validators_on) 
+            object.class.validators_on(attributized_method_name).select do |validator|
+              validator_relevant?(validator)
+            end
+          else
+            []
+          end
+        end
+        
+        def validator_relevant?(validator)
+          return true unless validator.options.key?(:if) || validator.options.key?(:unless)
+          conditional = validator.options[:if] || validator.options[:unless]
+          
+          result = if conditional.respond_to?(:call)
+            conditional.call(object)
+          elsif conditional.is_a?(::Symbol) && object.respond_to?(conditional)
+            object.send(conditional)
+          else
+            conditional
+          end
+          
+          validator.options.key?(:unless) ? !result : !!result
+        end
+        
+        def validation_limit
+          validation = validations? && validations.find do |validation|
+            validation.kind == :length
+          end
+          if validation
+            validation.options[:maximum] || (validation.options[:within].present? ? validation.options[:within].max : nil)
+          else
+            nil
+          end
+        end
+        
+        def validations?
+          !validations.empty?
+        end
+        
+        def required?
+          if validations?
+            !validations.find { |validator| [:presence, :inclusion, :length].include?(validator.kind) }.nil?
+          else
+            builder.all_fields_required_by_default
+          end
+        end
+        
+        def optional?
+          !required?
+        end
+        
+        def column_limit
+          column.limit if column?
+        end
+        
+        def limit
+          validation_limit || column_limit
+        end
+        
+      end
+    end
+  end
+end
+        
+        
\ No newline at end of file

From 27a4772e5d8b695ad170f728b0df2635741949c7 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 15 Mar 2011 07:53:45 +1100
Subject: [PATCH 579/992] very rough work in progress select input
 implementation against NewBase, lots and lots of fails

---
 lib/formtastic/form_builder.rb                |   1 -
 lib/formtastic/helpers/inputs_helper.rb       |   2 +-
 lib/formtastic/inputs/collections.rb          | 101 ++++++++++
 lib/formtastic/inputs/grouped_collections.rb  |  75 +++++++
 .../inputs/new_base/associations.rb           |   5 +
 lib/formtastic/inputs/new_base/errors.rb      |   9 +-
 lib/formtastic/inputs/select_input.rb         | 186 +++++++-----------
 spec/inputs/select_input_spec.rb              | 174 ++++++++--------
 8 files changed, 346 insertions(+), 207 deletions(-)
 create mode 100644 lib/formtastic/inputs/collections.rb
 create mode 100644 lib/formtastic/inputs/grouped_collections.rb

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index f8fbb69b5..389d96980 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -70,7 +70,6 @@ def self.configure(name, value = nil)
 
     include Formtastic::Inputs::CheckBoxesInput
     include Formtastic::Inputs::RadioInput
-    include Formtastic::Inputs::SelectInput
     
   end
   
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index d6d2278b2..8aa7f01ff 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -247,7 +247,7 @@ def input(method, options = {})
         
         options[:as]     ||= default_input_type(method, options)
 
-        [:string, :country, :boolean, :time_zone, :date, :datetime, :time, :phone, :search, :numeric, :email, :file, :hidden, :password, :text, :url].each do |i|
+        [:string, :country, :boolean, :time_zone, :date, :datetime, :time, :select, :phone, :search, :numeric, :email, :file, :hidden, :password, :text, :url].each do |i|
           klass = "Formtastic::Inputs::#{options[:as].to_s.camelize}Input".constantize
           return klass.new(self, template, @object, @object_name, method, options).to_html if options[:as] == i
         end
diff --git a/lib/formtastic/inputs/collections.rb b/lib/formtastic/inputs/collections.rb
new file mode 100644
index 000000000..d0253ef4d
--- /dev/null
+++ b/lib/formtastic/inputs/collections.rb
@@ -0,0 +1,101 @@
+module Formtastic
+  module Inputs
+    module Collections
+      def label_method
+        label_and_value_method(raw_collection).first
+      end
+      
+      def value_method
+        label_and_value_method(raw_collection).last
+      end
+      
+      def label_and_value_method(_collection)
+        sample = _collection.first || _collection.last
+      
+        case sample
+        when Array
+          label, value = :first, :last
+        when Integer
+          label, value = :to_s, :to_i
+        when String, NilClass
+          label, value = :to_s, :to_s
+        end
+      
+        # Order of preference: user supplied method, class defaults, auto-detect
+        label = options[:label_method] || label || builder.collection_label_methods.find { |m| sample.respond_to?(m) }
+        value = options[:value_method] || value || builder.collection_value_methods.find { |m| sample.respond_to?(m) }
+      
+        [label, value]
+      end
+            
+      def raw_collection
+        @raw_collection ||= (collection_from_options || collection_from_association || collection_for_boolean)
+      end
+      
+      def collection
+        # Return if we have a plain string
+        return raw_collection if raw_collection.instance_of?(String) || raw_collection.instance_of?(ActiveSupport::SafeBuffer)
+        
+        # Return if we have an Array of strings, fixnums or arrays
+        return raw_collection if (raw_collection.instance_of?(Array) || raw_collection.instance_of?(Range)) &&
+                             [Array, Fixnum, String, Symbol].include?(raw_collection.first.class) &&
+                             !(options.include?(:label_method) || options.include?(:value_method))
+                       
+        raw_collection.map { |o| [send_or_call(label_method, o), send_or_call(value_method, o)] }
+      end
+      
+      def collection_from_options
+        items = options[:collection]
+        items = items.to_a if items.is_a?(Hash)
+        items
+      end
+      
+      def collection_from_association
+        if reflection
+          find_options_from_options = options[:find_options] || {}
+          conditions_from_options = find_options_from_options[:conditions]
+          conditions_from_reflection = reflection.options[:conditions]
+          
+          if conditions_from_options
+            reflection.klass.where(conditions_from_reflection).where(conditions_from_options)
+          else
+            reflection.klass.all(find_options_from_options)
+          end
+        end
+      end
+        
+      def collection_for_boolean
+        true_text = options[:true] || Formtastic::I18n.t(:yes)
+        false_text = options[:false] || Formtastic::I18n.t(:no)
+        
+        # TODO options[:value_as_class] = true unless options.key?(:value_as_class)
+      
+        [ [true_text, true], [false_text, false] ]
+      end
+      
+      def send_or_call(duck, object)
+        if duck.is_a?(Proc)
+          duck.call(object)
+        else
+          object.send(duck)
+        end
+      end
+      
+      
+      def input_name
+        if reflection
+          if [:has_and_belongs_to_many, :has_many].include?(reflection.macro)
+            "#{method.to_s.singularize}_ids"
+          elsif reflection.respond_to? :foreign_key
+            reflection.foreign_key
+          else
+            reflection.options[:foreign_key] || "#{method}_id"
+          end
+        else
+          method
+        end.to_sym
+      end
+
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/grouped_collections.rb b/lib/formtastic/inputs/grouped_collections.rb
new file mode 100644
index 000000000..1dc37d8d8
--- /dev/null
+++ b/lib/formtastic/inputs/grouped_collections.rb
@@ -0,0 +1,75 @@
+module Formtastic
+  module Inputs
+    module GroupedCollections
+      
+      def raw_grouped_collection
+        @raw_grouped_collection ||= raw_collection.map { |option| option.send(options[:group_by]) }.uniq
+      end
+      
+      def grouped_collection
+        @grouped_collection ||= raw_grouped_collection.sort_by { |group_item| group_item.send(group_label_method) }
+      end
+      
+      def group_label_method
+        @group_label_method ||= (group_label_method_from_options || group_label_method_from_grouped_collection)
+      end
+      
+      def group_label_method_from_options
+        options[:group_label_method]
+      end
+      
+      def group_label_method_from_grouped_collection
+        label_and_value_method(raw_grouped_collection).first
+      end
+      
+      def group_association
+        @group_association ||= (group_association_from_options || group_association_from_reflection)
+      end
+      
+      def group_association_from_options
+        options[:group_association]
+      end
+      
+      def group_by
+        options[:group_by]
+      end
+      
+      def group_association_from_reflection
+        method_to_group_association_by = reflection.klass.reflect_on_association(group_by)
+        group_class = method_to_group_association_by.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 = group_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
+      
+    end
+  end
+end
+      
\ No newline at end of file
diff --git a/lib/formtastic/inputs/new_base/associations.rb b/lib/formtastic/inputs/new_base/associations.rb
index 6c86abeca..0b8cc06c1 100644
--- a/lib/formtastic/inputs/new_base/associations.rb
+++ b/lib/formtastic/inputs/new_base/associations.rb
@@ -15,6 +15,11 @@ def reflection
         def belongs_to?
           association == :belongs_to
         end
+        
+        def association_primary_key
+          return reflection.options[:foreign_key] if reflection && !reflection.options[:foreign_key].blank?
+          :"#{method}_id"
+        end
       
       end
     end
diff --git a/lib/formtastic/inputs/new_base/errors.rb b/lib/formtastic/inputs/new_base/errors.rb
index 134ed85bc..ad78bc313 100644
--- a/lib/formtastic/inputs/new_base/errors.rb
+++ b/lib/formtastic/inputs/new_base/errors.rb
@@ -20,10 +20,17 @@ def errors
         def error_keys
           keys = [method.to_sym]
           keys << file_metadata_suffixes.map{|suffix| "#{method}_#{suffix}".to_sym} if file?
-          keys << [association_primary_key(method)] if belongs_to?
+          keys << association_primary_key if belongs_to?
           keys.flatten.compact.uniq
         end
         
+        def error_keys
+          keys = [method.to_sym]
+          keys << file_metadata_suffixes.map{|suffix| "#{method}_#{suffix}".to_sym} if file?
+          keys << [association_primary_key] if belongs_to?
+          keys.flatten.compact.uniq
+        end
+
       end
     end
   end
diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index f6bcf5c78..f8d443827 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -1,4 +1,5 @@
-require 'reflection'
+require 'inputs/new_base'
+require 'inputs/collections'
 
 module Formtastic
   module Inputs
@@ -134,134 +135,85 @@ module Inputs
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     # @see Formtastic::Inputs::CheckBoxesInput CheckBoxesInput as an alternative for `has_many` and `has_and_belongs_to_many` associations
     # @see Formtastic::Inputs::RadioInput RadioInput as an alternative for `belongs_to` associations
-    module SelectInput
-      include Formtastic::Inputs::Base
-      include Formtastic::Reflection
+    class SelectInput
+      include NewBase
+      include Collections
+      include GroupedCollections
       
-      def select_input(method, options)
-        html_options = options.delete(:input_html) || {}
-        html_options[:multiple] = html_options[:multiple] || options.delete(:multiple)
-        html_options.delete(:multiple) if html_options[:multiple].nil?
-  
-        reflection = reflection_for(method)
-        if reflection && [ :has_many, :has_and_belongs_to_many ].include?(reflection.macro)
-          html_options[:multiple] = true if html_options[:multiple].nil?
-          html_options[:size]     ||= 5
-          options[:include_blank] ||= false
+      def to_html
+        input_wrapping do
+          builder.label(method, label_html_options) <<
+          select_html_or_grouped_select_html
         end
-        options = set_include_blank(options)
-        input_name = generate_association_input_name(method)
-        html_options[:id] ||= generate_html_id(input_name, "")
-  
-        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, options)
-          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
-          grouped_collection_select(input_name, group_collection,
-                                         group_association, group_label_method,
-                                         value, label,
-                                         strip_formtastic_options(options), html_options)
-        else
-          collection = find_collection_for_column(method, options)
-  
-          select(input_name, collection, strip_formtastic_options(options), html_options)
-        end
-  
-        label_options = options_for_label(options).merge(:input_name => input_name)
-        label_options[:for] ||= html_options[:id]
-        label(method, label_options) << select_html
       end
       
-      protected
+      def label_html_options
+        super.merge(:for => input_html_options[:id])
+      end
       
-      # 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 = reflection_for(column)
-          options[:find_options] ||= {}
-  
-          if conditions = reflection.options[:conditions]
-            if reflection.klass.respond_to?(:merge_conditions)
-              options[:find_options][:conditions] = reflection.klass.merge_conditions(conditions, options[:find_options][:conditions])
-              reflection.klass.all(options[:find_options])
-            else
-              reflection.klass.where(conditions).where(options[:find_options][:conditions])
-            end
-          else
-            reflection.klass.all(options[:find_options])
-          end
-        else
-          create_boolean_collection(options)
-        end
-  
-        collection = collection.to_a if collection.is_a?(Hash)
-        collection
+      def select_html_or_grouped_select_html
+        options[:group_by] ? grouped_select_html : select_html
+      end
+      
+      def select_html
+        builder.select(method, collection, input_options, input_html_options)
+      end
+      
+      def include_blank?
+        return options[:prompt] if options.key?(:prompt)
+        return options[:include_blank] if options.key?(:include_blank)
+        return true if (single? && builder.include_blank_for_select_by_default)
+        false
+      end
+      
+      def grouped_select_html
+        builder.grouped_collection_select(
+          input_name, 
+          grouped_collection,
+          group_association, 
+          group_label_method,
+          value_method, 
+          label_method,
+          input_options, 
+          input_html_options
+        )
+      end
+      
+      def input_dom_id
+        return "#{object_name}_#{association_primary_key}" if belongs_to?
+        super
+      end
+      
+      def input_options
+        out = super
+        out = out.merge(:include_blank => include_blank?)
+        out
+      end
+      
+      def input_html_options
+        out = super
+        out = out.merge(:multiple => multiple_by_association?) unless out.key?(:multiple)
+        out = out.merge(:name => "#{object_name}[#{association_primary_key}]") unless out.key?(:named)
+        out = out.merge(:include_blank => include_blank?)
+        out
+      end
+      
+      def multiple_by_association?
+        reflection && [ :has_many, :has_and_belongs_to_many ].include?(reflection.macro)
       end
       
-      # 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)
-  
-        [ [ options.delete(:true), true], [ options.delete(:false), false ] ]
+      def multiple_by_options?
+        options[:multiple]
       end
       
-      # Return the label collection method when none is supplied using the
-      # values set in collection_label_methods.
-      def detect_label_method(collection) #:nodoc:
-        detect_label_and_value_method!(collection).first
+      def multiple?
+        multiple_by_options? || multiple_by_association? 
       end
       
-      # 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 = 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"
-  
+      def single?
+        !multiple?
       end
-  
+        
     end
   end
 end
\ No newline at end of file
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 8fe0f7a27..a8fa57ca7 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -9,7 +9,7 @@
     @output_buffer = ''
     mock_everything
   end
-
+  
   describe 'explicit values' do
     describe 'using an array of values' do
       before do
@@ -20,7 +20,7 @@
           concat(builder.input(:title, :as => :select, :collection => @array_with_keys_and_values))
         end)
       end
-
+  
       it 'should have a option for each key and/or value' do
         @array_with_values.each do |v|
           output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
@@ -31,7 +31,7 @@
       end
     end
     
-    describe "using a related model without reflection's options(Mongoid Document)" do
+    describe "using a related model without reflection's options (Mongoid Document)" do
       before do        
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:mongoid_reviewer, :as => :select))
@@ -43,7 +43,7 @@
         output_buffer.should have_tag('form li select#post_reviewer_id')
       end
     end
-
+  
     describe 'using a range' do
       before do
         @range_with_values = 1..5
@@ -51,14 +51,14 @@
           concat(builder.input(:title, :as => :select, :collection => @range_with_values))
         end)
       end
-
+  
       it 'should have an option for each value' do
         @range_with_values.each do |v|
           output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
         end
       end
     end
-
+  
     describe 'using a string' do
       before do
         @string ="<option value='0'>0</option><option value='1'>1</option>"
@@ -66,7 +66,7 @@
           concat(builder.input(:title, :as => :select, :collection => @string))
         end)
       end
-
+  
       it 'should render select options using provided HTML string' do
         2.times do |v|
           output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
@@ -74,50 +74,50 @@
       end
     end
   end
-
+  
   describe 'for boolean columns' do
     describe 'default formtastic locale' do
       before do
         # Note: Works, but something like Formtastic.root.join(...) would probably be "safer".
         ::I18n.load_path = [File.join(File.dirname(__FILE__), *%w[.. .. lib locale en.yml])]
         ::I18n.backend.send(:init_translations)
-
+  
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:published, :as => :select))
         end)
       end
-
+  
       after do
         ::I18n.backend.store_translations :en, {}
       end
-
+  
       it 'should render a select with at least options: true/false' do
         output_buffer.should have_tag("form li select option[@value='true']", /^Yes$/)
         output_buffer.should have_tag("form li select option[@value='false']", /^No$/)
       end
     end
-
+  
     describe 'custom locale' do
       before do
         @boolean_select_labels = {:yes => 'Yep', :no => 'Nope'}
         ::I18n.backend.store_translations :en, :formtastic => @boolean_select_labels
-
+  
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:published, :as => :select))
         end)
       end
-
+  
       after do
         ::I18n.backend.store_translations :en, {}
       end
-
+  
       it 'should render a select with at least options: true/false' do
         output_buffer.should have_tag("form li select option[@value='true']", /#{@boolean_select_labels[:yes]}/)
         output_buffer.should have_tag("form li select option[@value='false']", /#{@boolean_select_labels[:no]}/)
       end
     end
   end
-
+  
   describe 'for a belongs_to association' do
     before do
       concat(semantic_form_for(@new_post) do |builder|
@@ -125,7 +125,7 @@
         concat(builder.input(:reviewer, :as => :select))
       end)
     end
-
+  
     it_should_have_input_wrapper_with_class("select")
     it_should_have_input_wrapper_with_id("post_author_input")
     it_should_have_label_with_text(/Author/)
@@ -133,66 +133,66 @@
     it_should_apply_error_logic_for_input_type(:select)
     it_should_call_find_on_association_class_when_no_collection_is_provided(:select)
     it_should_use_the_collection_when_provided(:select, 'option')
-
+    
     it 'should have a select inside the wrapper' do
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#post_author_id')
       output_buffer.should have_tag('form li select#post_reviewer_id')
     end
-
+    
     it 'should have a valid name' do
       output_buffer.should have_tag("form li select[@name='post[author_id]']")
       output_buffer.should_not have_tag("form li select[@name='post[author_id][]']")
       output_buffer.should_not have_tag("form li select[@name='post[reviewer_id][]']")
     end
-
+    
     it 'should not create a multi-select' do
       output_buffer.should_not have_tag('form li select[@multiple]')
     end
-
+    
     it 'should create a select without size' do
       output_buffer.should_not have_tag('form li select[@size]')
     end
-
+    
     it 'should have a blank option' do
       output_buffer.should have_tag("form li select option[@value='']")
     end
-
+    
     it 'should have a select option for each Author' do
       output_buffer.should have_tag("form li select[@name='post[author_id]'] option", :count => ::Author.all.size + 1)
       ::Author.all.each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
       end
     end
-
-    it 'should have one option with a "selected" attribute' do
+    
+    it 'should have one option with a "selected" attribute (bob)' do
       output_buffer.should have_tag("form li select[@name='post[author_id]'] option[@selected]", :count => 1)
     end
-
+    
     it 'should not singularize the association name' do
       @new_post.stub!(:author_status).and_return(@bob)
       @new_post.stub!(:author_status_id).and_return(@bob.id)
       @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => :integer, :limit => 255))
-
+    
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author_status, :as => :select))
       end)
-
+    
       output_buffer.should have_tag('form li select#post_author_status_id')
     end
   end
-
+  
   describe "for a belongs_to association with :group_by => :author" do
     it "should call author.posts" do
       [@freds_post].each { |post| post.stub!(:to_label).and_return("Post - #{post.id}") }
       @fred.should_receive(:posts)
-
+  
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:main_post, :as => :select, :group_by => :author ) )
       end)
     end
   end
-
+  
   describe "for a belongs_to association with :conditions" do
     before do
       ::Post.stub!(:reflect_on_association).with(:author).and_return do
@@ -201,26 +201,26 @@
         mock
       end
     end
-
+  
     it "should call author.find with association conditions" do
       ::Author.should_receive(:merge_conditions).with({:active => true}, nil).and_return(:active => true)
       ::Author.should_receive(:all).with(:conditions => {:active => true})
-
+  
       semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select))
       end
     end
-
+  
     it "should call author.find with association conditions and find_options conditions" do
       ::Author.should_receive(:merge_conditions).with({:active => true}, {:publisher => true}).and_return(:active => true, :publisher => true)
       ::Author.should_receive(:all).with(:conditions => {:active => true, :publisher => true})
-
+  
       semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select, :find_options => {:conditions => {:publisher => true}}))
       end
     end
   end
-
+  
   describe 'for a belongs_to association with :group_by => :continent' do
     before do
       @authors = [@bob, @fred, @fred, @fred]
@@ -231,13 +231,13 @@
       ::Continent.stub!(:reflect_on_all_associations).and_return {|macro| mock('reflection', :klass => Author) if macro == :has_many}
       ::Continent.stub!(:reflect_on_association).and_return {|column_name| mock('reflection', :klass => Author) if column_name == :authors}
       ::Author.stub!(:reflect_on_association).and_return { |column_name| mock('reflection', :options => {}, :klass => Continent, :macro => :belongs_to) if column_name == :continent }
-
-
+  
+  
       @continents.each_with_index do |continent, i|
         continent.stub!(:to_label).and_return(@continent_names[i])
         continent.stub!(:authors).and_return([@authors[i]])
       end
-
+  
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select, :group_by => :continent ) )
         concat(builder.input(:author, :as => :select, :group_by => :continent, :group_label_method => :id ) )
@@ -245,57 +245,57 @@
         concat(builder.input(:author, :as => :select, :group_by => :continent, :label_method => :login, :group_label_method => :id ) )
       end)
     end
-
+  
     it_should_have_input_wrapper_with_class("select")
     it_should_have_input_wrapper_with_id("post_author_input")
     it_should_have_label_with_text(/Author/)
     it_should_have_label_for('post_author_id')
-
+  
     # TODO, need to find a way to repeat some of the specs and logic from the belongs_to specs without grouping
-
+  
     0.upto(1) do |i|
       it 'should have all option groups and the right values' do
         output_buffer.should have_tag("form li select optgroup[@label='#{@continent_names[i]}']", @authors[i].to_label)
       end
-
+  
       it 'should have custom group labels' do
         output_buffer.should have_tag("form li select optgroup[@label='#{@continents[i].id}']", @authors[i].to_label)
       end
-
+  
       it 'should have custom author labels' do
         output_buffer.should have_tag("form li select optgroup[@label='#{@continent_names[i]}']", @authors[i].login)
       end
-
+  
       it 'should have custom author and group labels' do
         output_buffer.should have_tag("form li select optgroup[@label='#{@continents[i].id}']", @authors[i].login)
       end
     end
-
+  
     it 'should have no duplicate groups' do
       output_buffer.should have_tag('form li select optgroup', :count => 8)
     end
-
+  
     it 'should sort the groups on the label method' do
       output_buffer.should have_tag("form li select optgroup[@label='Africa']")
       output_buffer.should have_tag("form li select optgroup[@label='99']")
     end
-
+  
     it 'should call find with :include for more optimized queries' do
       Author.should_receive(:all).with(:include => :continent)
-
+  
       semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select, :group_by => :continent ) )
       end
     end
   end
-
+  
   describe 'for a has_many association' do
     before do
       concat(semantic_form_for(@fred) do |builder|
         concat(builder.input(:posts, :as => :select))
       end)
     end
-
+  
     it_should_have_input_wrapper_with_class("select")
     it_should_have_input_wrapper_with_id("author_posts_input")
     it_should_have_label_with_text(/Post/)
@@ -303,55 +303,55 @@
     it_should_apply_error_logic_for_input_type(:select)
     it_should_call_find_on_association_class_when_no_collection_is_provided(:select)
     it_should_use_the_collection_when_provided(:select, 'option')
-
+  
     it 'should have a select inside the wrapper' do
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#author_post_ids')
     end
-
+  
     it 'should have a multi-select select' do
       output_buffer.should have_tag('form li select[@multiple="multiple"]')
     end
-
+  
     it 'should have a select option for each Post' do
       output_buffer.should have_tag('form li select option', :count => ::Post.all.size)
       ::Post.all.each do |post|
         output_buffer.should have_tag("form li select option[@value='#{post.id}']", /#{post.to_label}/)
       end
     end
-
+  
     it 'should not have a blank option by default' do
       output_buffer.should_not have_tag("form li select option[@value='']")
     end
-
+  
     it 'should respect the :include_blank option for single selects' do
       concat(semantic_form_for(@fred) do |builder|
         concat(builder.input(:posts, :as => :select, :multiple => false, :include_blank => true))
       end)
-
+  
       output_buffer.should have_tag("form li select option[@value='']")
     end
-
+  
     it 'should respect the :include_blank option for multiple selects' do
       concat(semantic_form_for(@fred) do |builder|
         concat(builder.input(:posts, :as => :select, :multiple => true, :include_blank => true))
       end)
-
+  
       output_buffer.should have_tag("form li select option[@value='']")
     end
-
+  
     it 'should have one option with a "selected" attribute' do
       output_buffer.should have_tag('form li select option[@selected]', :count => 1)
     end
   end
-
+  
   describe 'for a has_and_belongs_to_many association' do
     before do
       concat(semantic_form_for(@freds_post) do |builder|
         concat(builder.input(:authors, :as => :select))
       end)
     end
-
+  
     it_should_have_input_wrapper_with_class("select")
     it_should_have_input_wrapper_with_id("post_authors_input")
     it_should_have_label_with_text(/Author/)
@@ -359,48 +359,48 @@
     it_should_apply_error_logic_for_input_type(:select)
     it_should_call_find_on_association_class_when_no_collection_is_provided(:select)
     it_should_use_the_collection_when_provided(:select, 'option')
-
+  
     it 'should have a select inside the wrapper' do
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#post_author_ids')
     end
-
+  
     it 'should have a multi-select select' do
       output_buffer.should have_tag('form li select[@multiple="multiple"]')
     end
-
+  
     it 'should have a select option for each Author' do
       output_buffer.should have_tag('form li select option', :count => ::Author.all.size)
       ::Author.all.each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
       end
     end
-
+  
     it 'should not have a blank option by default' do
       output_buffer.should_not have_tag("form li select option[@value='']")
     end
-
+  
     it 'should respect the :include_blank option for single selects' do
       concat(semantic_form_for(@freds_post) do |builder|
         concat(builder.input(:authors, :as => :select, :multiple => false, :include_blank => true))
       end)
-
+  
       output_buffer.should have_tag("form li select option[@value='']")
     end
-
+  
     it 'should respect the :include_blank option for multiple selects' do
       concat(semantic_form_for(@freds_post) do |builder|
         concat(builder.input(:authors, :as => :select, :multiple => true, :include_blank => true))
       end)
-
+  
       output_buffer.should have_tag("form li select option[@value='']")
     end
-
+  
     it 'should have one option with a "selected" attribute' do
       output_buffer.should have_tag('form li select option[@selected]', :count => 1)
     end
   end
-
+  
   describe 'when :prompt => "choose something" is set' do
     before do
       @new_post.stub!(:author_id).and_return(nil)
@@ -408,40 +408,40 @@
         concat(builder.input(:author, :as => :select, :prompt => "choose author"))
       end)
     end
-
+  
     it 'should have a select with prompt' do
       output_buffer.should have_tag("form li select option[@value='']", /choose author/)
     end
-
+  
     it 'should not have a blank select option' do
       output_buffer.should_not have_tag("form li select option[@value='']", "")
     end
   end
-
+  
   describe 'when no object is given' do
     before(:each) do
       concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:author, :as => :select, :collection => ::Author.all))
       end)
     end
-
+  
     it 'should generate label' do
       output_buffer.should have_tag('form li label', /Author/)
       output_buffer.should have_tag("form li label[@for='project_author']")
     end
-
+  
     it 'should generate select inputs' do
       output_buffer.should have_tag('form li select#project_author')
       output_buffer.should have_tag('form li select option', :count => ::Author.all.size + 1)
     end
-
+  
     it 'should generate an option to each item' do
       ::Author.all.each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
       end
     end
   end
-
+  
   describe 'when a grouped collection collection is given' do
     before(:each) do
       concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
@@ -451,7 +451,7 @@
         concat(builder.input(:author, :as => :select, :collection => grouped_options_for_select(@grouped_opts, "hands")))
       end)
     end
-
+  
     it 'should generate an option to each item' do
       @grouped_opts.each do |opt_pair|
         output_buffer.should have_tag("form li select optgroup[@label='#{opt_pair[0]}']")
@@ -462,14 +462,14 @@
       output_buffer.should have_tag("form li select optgroup option[@selected]","hands")
     end
   end
-
+  
   describe "enum" do
     before do
       @output_buffer = ''
       @some_meta_descriptions = ["One", "Two", "Three"]
       @new_post.stub!(:meta_description).any_number_of_times
     end
-
+  
     describe ":as is not set" do
       before do
         concat(semantic_form_for(@new_post) do |builder|
@@ -479,12 +479,12 @@
           concat(builder.input(:meta_description, :collection => @some_meta_descriptions))
         end)
       end
-
+  
       it "should render a select field" do
         output_buffer.should have_tag("form li select", :count => 2)
       end
     end
-
+  
     describe ":as is set" do
       before do
         # Should not be a case, but just checking :as got highest priority in setting input type.
@@ -495,13 +495,13 @@
           concat(builder.input(:meta_description, :as => :string, :collection => @some_meta_descriptions))
         end)
       end
-
+  
       it "should render a text field" do
         output_buffer.should have_tag("form li input[@type='text']", :count => 2)
       end
     end
   end
-
+  
   describe 'when a namespace is provided' do
     before do
       concat(semantic_form_for(@freds_post, :namespace => 'context2') do |builder|
@@ -512,5 +512,5 @@
     it_should_have_select_with_id("context2_post_author_ids")
     it_should_have_label_for("context2_post_author_ids")
   end
-
+  
 end

From dbe9a07f2cfdb2125d9f9f060ebbd858d89e9e4d Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 15 Mar 2011 17:18:19 +1100
Subject: [PATCH 580/992] fix incorrect require

---
 lib/formtastic/inputs/time_input.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/time_input.rb b/lib/formtastic/inputs/time_input.rb
index de13ee49d..ffb646f08 100644
--- a/lib/formtastic/inputs/time_input.rb
+++ b/lib/formtastic/inputs/time_input.rb
@@ -1,4 +1,4 @@
-require 'inputs/timeish'
+require 'inputs/new_timeish'
 
 module Formtastic
   module Inputs

From 83e7da50708b23fb90e132342adc4e68da8e13dd Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 15 Mar 2011 17:21:48 +1100
Subject: [PATCH 581/992] we no longer need Timeish, so shift NewTimeish into
 it's place and rename

---
 lib/formtastic/inputs/date_input.rb     |   4 +-
 lib/formtastic/inputs/datetime_input.rb |   4 +-
 lib/formtastic/inputs/new_timeish.rb    | 115 ---------
 lib/formtastic/inputs/time_input.rb     |   4 +-
 lib/formtastic/inputs/timeish.rb        | 302 ++++++++----------------
 5 files changed, 107 insertions(+), 322 deletions(-)
 delete mode 100644 lib/formtastic/inputs/new_timeish.rb

diff --git a/lib/formtastic/inputs/date_input.rb b/lib/formtastic/inputs/date_input.rb
index fcd36f354..a64f8f55c 100644
--- a/lib/formtastic/inputs/date_input.rb
+++ b/lib/formtastic/inputs/date_input.rb
@@ -1,12 +1,12 @@
 require 'inputs/new_base'
-require 'inputs/new_timeish'
+require 'inputs/timeish'
 
 module Formtastic
   module Inputs
     # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
     class DateInput 
       include NewBase
-      include NewTimeish
+      include Timeish
       
       # We don't want hour and minute fragments on a date input
       def time_fragments
diff --git a/lib/formtastic/inputs/datetime_input.rb b/lib/formtastic/inputs/datetime_input.rb
index 098179731..5bcc819c4 100644
--- a/lib/formtastic/inputs/datetime_input.rb
+++ b/lib/formtastic/inputs/datetime_input.rb
@@ -1,4 +1,4 @@
-require 'inputs/new_timeish'
+require 'inputs/timeish'
 require 'inputs/new_base'
 
 module Formtastic
@@ -6,7 +6,7 @@ module Inputs
     # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
     class DatetimeInput 
       include NewBase
-      include NewTimeish
+      include Timeish
 
       
     end
diff --git a/lib/formtastic/inputs/new_timeish.rb b/lib/formtastic/inputs/new_timeish.rb
deleted file mode 100644
index ad6a00799..000000000
--- a/lib/formtastic/inputs/new_timeish.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-module Formtastic
-  module Inputs
-    module NewTimeish
-      
-      def to_html
-        input_wrapping do
-          fragments_wrapping do
-            fragments_label <<
-            template.content_tag(:fieldset,
-              template.content_tag(:ol,
-                fragments.map do |fragment|
-                  fragment_wrapping do
-                    fragment_label_html(fragment) <<
-                    fragment_input_html(fragment)
-                  end
-                end.join.html_safe # TODO is this safe?
-              )
-            )
-          end
-        end
-      end
-      
-      def fragments
-        date_fragments + time_fragments
-      end
-      
-      def time_fragments
-        options[:include_seconds] ? [:hour, :minute, :second] : [:hour, :minute]
-      end
-      
-      def date_fragments
-        options[:order] || i18n_date_fragments || default_date_fragments
-      end
-      
-      def default_date_fragments
-        [:year, :month, :day]
-      end
-      
-      def fragment_wrapping(&block)
-        template.content_tag(:li, template.capture(&block))
-      end
-      
-      def fragment_label(fragment)
-        labels_from_options = options[:labels] || {}
-        if labels_from_options.key?(fragment)
-          labels_from_options[fragment]
-        else
-          ::I18n.t(fragment.to_s, :default => fragment.to_s.humanize, :scope => [:datetime, :prompts])
-        end
-      end
-      
-      def fragment_id(fragment)
-        "#{input_html_options[:id]}_#{position(fragment)}i"
-      end
-      
-      def fragment_name(fragment)
-        "#{method}(#{position(fragment)}i)"
-      end
-      
-      def fragment_label_html(fragment)
-        text = fragment_label(fragment)
-        text.blank? ? "" : template.content_tag(:label, text, :for => fragment_id(fragment))
-      end
-      
-      def value
-        object.send(method) if object && object.respond_to?(method)
-      end
-      
-      def fragment_input_html(fragment)
-        opts = input_options.merge(:prefix => object_name, :field_name => fragment_name(fragment), :default => value)
-        
-        template.send(:"select_#{fragment}", value, opts, input_html_options.merge(:id => fragment_id(fragment)))
-      end
-      
-      def positions
-        { :year => 1, :month => 2, :day => 3, :hour => 4, :minute => 5, :second => 6 }
-      end
-      
-      def position(fragment)
-        positions[fragment]
-      end
-      
-      def i18n_date_fragments
-        order = ::I18n.t(:order, :scope => [:date])
-        order = nil unless order.is_a?(Array)
-        order
-      end
-      
-      def fragments_wrapping(&block)
-        template.content_tag(:fieldset,
-          template.capture(&block).html_safe, 
-          fragments_wrapping_html_options
-        )
-      end
-      
-      def fragments_wrapping_html_options
-        {}
-      end
-      
-      def fragments_label
-        template.content_tag(:legend, 
-          builder.label(method, :for => "#{input_html_options[:id]}_1i"), 
-          :class => "label"
-        )
-      end
-      
-      def fragments_inner_wrapping(&block)
-        template.content_tag(:ol,
-          template.capture(&block)
-        )
-      end
-      
-    end
-  end
-end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/time_input.rb b/lib/formtastic/inputs/time_input.rb
index ffb646f08..39664716f 100644
--- a/lib/formtastic/inputs/time_input.rb
+++ b/lib/formtastic/inputs/time_input.rb
@@ -1,11 +1,11 @@
-require 'inputs/new_timeish'
+require 'inputs/timeish'
 
 module Formtastic
   module Inputs
     # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
     class TimeInput 
       include NewBase
-      include NewTimeish
+      include Timeish
       
       # we don't want year / month / day fragments in a time select
       def date_fragments
diff --git a/lib/formtastic/inputs/timeish.rb b/lib/formtastic/inputs/timeish.rb
index e51274156..1c70cb317 100644
--- a/lib/formtastic/inputs/timeish.rb
+++ b/lib/formtastic/inputs/timeish.rb
@@ -1,215 +1,115 @@
 module Formtastic
   module Inputs
-
-    # Outputs a complex input consisting of multiple select boxes for each fragment of a date 
-    # (year, month, day), time (hour, min, sec) or date time (year, month, day, hour, min, sec).
-    #
-    # The output of this helper **looks** quite similar to Rails' own `date_select`, 
-    # `date_time_select` and `time_select` helpers in the browser, but under the hood the HTML 
-    # produced is quite different, trying to address many issues with the Rails helper's HTML 
-    # validity, semantics and accessibility.
-    #
-    # By default, Rails will return a series of `<select>` tags without a corresponding `<label>`
-    # for each. Formtastic chooses to rendering these date fragments much like it does each form
-    # input by wrapping each in an `<li>` with a `<label>` and a `<select>` in each.
-    #
-    # The `<li>` date fragments are wrapped in an `<ol>` and a `<fieldset>` to indicate that the
-    # fragments are part of a set of fields that should be grouped together.
-    #
-    # The `<fieldset>` is then "labeled" with a `<legend>` tag that describes the set with the 
-    # same string that would normally be used for the `<label>` on a simpler input. The result
-    # is something like this:
-    #
-    #     <li class="date">
-    #       <fieldset>
-    #         <legend class="label">Publish 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>
-    #     </li>
-    #
-    # This obviously would look quite different in a browser to what Rails does, but this is
-    # addressed in the presentation layer with formtastic.css instead:
-    #
-    # * the `<li>` date fragments are floated left against each other so they appear all on one 
-    #   line next to each other
-    # * the `<label>` tags for each fragment are hidden with `display:none`
-    # * the <legend> is positioned and styled to look like a regular `<label>` on simpler inputs
-    #   found elsewhere in the form (to the left of the select tags)
-    # * the `<ol>` is positioned and styled to appear where the `<input>` would usually be on 
-    #   simpler inputs found elsewhere in the form (the the right of the label), as a container
-    #   for the floated `<li>` fragments
-    #
-    # The intent is to support many of Rails' built-in date helper arguments and options, and 
-    # to post the same form data to your controllers.
-    #
-    # @example Basic `:date` example with full form context and output
-    # 
-    #   <%= semantic_form_for(@post) do |f| %>
-    #     <%= f.inputs do %>
-    #       <%= f.input :publish_at, :as => :date %>
-    #     <% end %>
-    #   <% end %<
-    #
-    #   <form ...>
-    #     <fieldset>
-    #       <ol>
-    #         <li class="date">
-    #           <fieldset>
-    #             <legend class="label">Publish 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>
-    #         </li>
-    #       </ol>
-    #     </fieldset>
-    #   </form>
-    #
-    # @example Render as a `:date` (default for `:date` database column types)
-    #   <%= f.input :publish_at, :as => :date %>
-    #
-    # @example Render as a `:datetime` input (default for `:datetime` and `:timestamp` database column types)
-    #   <%= f.input :publish_at, :as => :datetime %>
-    #
-    # @example Render as a `:time` input (default for `:time` database column types)
-    #   <%= f.input :publish_at, :as => :time %>
-    #
-    # @example Re-order the date fragments with `:order`
-    #   <%= f.input :publish_at, :as => :date, :order => [:day, :month, :year] %>
-    #   <%= f.input :publish_at, :as => :datetime, :order => [:hour, :min, :day, :month, :year] %>
-    #
-    # @example Render the (discarded by default) seconds fragment with `:include_seconds` (`:time`, `:datetime` only)
-    #   <%= f.input :publish_at, :as => :datetime, :include_seconds => true %>
-    #
-    # @example `:discard_(year|month|day|hour|minute)` can be set to true to exclude those fragments (Rails will default them)
-    #   <%= f.input :publish_at, :as => :datetime, :discard_minute => true %>
-    #   <%= f.input :publish_at, :as => :date, :discard_day => true %>
-    #
-    # @example Render a blank option at the top of each fragment's select to force the user to make a choice
-    #   <%= f.input :publish_at, :as => :datetime, :include_blank => true %>
-    #
-    # @example Change the labels used for each fragment
-    #   <%= f.input :publish_at, :as => :datetime, :labels => { :year => "The Year" } %>
-    #
-    # @example Disale the labels used for each fragment
-    #   <%= f.input :publish_at, :as => :datetime, :labels => { :year => "", :month => "", :day => "" } %>
-    #
-    # @todo `:labels` could be killed and replaced with i18n
-    # @todo is there i18n for `:labels` already?
-    # @todo is there `:prompt`?
-    # @todo is there any other i18n to document?
-    #
-    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     module Timeish
-      # Helper method used by :as => (:date|:datetime|:time).
-      #
-      # This is an absolute abomination, but so is the official Rails select_date().
-      # @private
-      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]
-        inputs   = [] if options[:ignore_date]
-        labels   = options.delete(:labels) || {}
-      
-        time_inputs = [:hour, :minute]
-        time_inputs << :second if options[:include_seconds]
-      
-        list_items_capture = ""
-        hidden_fields_capture = ""
-      
-        datetime = @object.send(method) if @object && @object.send(method)
-      
-        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) : 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 = labels[input] || ::I18n.t(input.to_s, :default => input.to_s.humanize, :scope => [:datetime, :prompts])
-      
-            list_items_capture << template.content_tag(:li, Formtastic::Util.html_safe([
-                !item_label_text.blank? ? template.content_tag(:label, Formtastic::Util.html_safe(item_label_text), :for => input_id) : "",
-                template.send(:"select_#{input}", datetime, opts, html_options.merge(:id => input_id))
-              ].join(""))
+      
+      def to_html
+        input_wrapping do
+          fragments_wrapping do
+            fragments_label <<
+            template.content_tag(:fieldset,
+              template.content_tag(:ol,
+                fragments.map do |fragment|
+                  fragment_wrapping do
+                    fragment_label_html(fragment) <<
+                    fragment_input_html(fragment)
+                  end
+                end.join.html_safe # TODO is this safe?
+              )
             )
           end
         end
+      end
+      
+      def fragments
+        date_fragments + time_fragments
+      end
+      
+      def time_fragments
+        options[:include_seconds] ? [:hour, :minute, :second] : [:hour, :minute]
+      end
+      
+      def date_fragments
+        options[:order] || i18n_date_fragments || default_date_fragments
+      end
+      
+      def default_date_fragments
+        [:year, :month, :day]
+      end
+      
+      def fragment_wrapping(&block)
+        template.content_tag(:li, template.capture(&block))
+      end
+      
+      def fragment_label(fragment)
+        labels_from_options = options[:labels] || {}
+        if labels_from_options.key?(fragment)
+          labels_from_options[fragment]
+        else
+          ::I18n.t(fragment.to_s, :default => fragment.to_s.humanize, :scope => [:datetime, :prompts])
+        end
+      end
+      
+      def fragment_id(fragment)
+        "#{input_html_options[:id]}_#{position(fragment)}i"
+      end
+      
+      def fragment_name(fragment)
+        "#{method}(#{position(fragment)}i)"
+      end
+      
+      def fragment_label_html(fragment)
+        text = fragment_label(fragment)
+        text.blank? ? "" : template.content_tag(:label, text, :for => fragment_id(fragment))
+      end
+      
+      def value
+        object.send(method) if object && object.respond_to?(method)
+      end
+      
+      def fragment_input_html(fragment)
+        opts = input_options.merge(:prefix => object_name, :field_name => fragment_name(fragment), :default => value)
+        
+        template.send(:"select_#{fragment}", value, opts, input_html_options.merge(:id => fragment_id(fragment)))
+      end
+      
+      def positions
+        { :year => 1, :month => 2, :day => 3, :hour => 4, :minute => 5, :second => 6 }
+      end
       
-        hidden_fields_capture << field_set_and_list_wrapping_for_method(method, options.merge(:label_for => input_ids.first), list_items_capture)
+      def position(fragment)
+        positions[fragment]
       end
       
-      # Generates a fieldset and an ordered list but with label based in
-      # method. This methods is currently used by radio and datetime inputs.
-      # @private
-      def field_set_and_list_wrapping_for_method(method, options, contents)
-        contents = contents.join if contents.respond_to?(:join)
-  
+      def i18n_date_fragments
+        order = ::I18n.t(:order, :scope => [:date])
+        order = nil unless order.is_a?(Array)
+        order
+      end
+      
+      def fragments_wrapping(&block)
         template.content_tag(:fieldset,
-            template.content_tag(:legend,
-                label(method, options_for_label(options).merge(:for => options.delete(:label_for))), :class => 'label'
-              ) <<
-            template.content_tag(:ol, Formtastic::Util.html_safe(contents))
-          )
+          template.capture(&block).html_safe, 
+          fragments_wrapping_html_options
+        )
       end
-  
+      
+      def fragments_wrapping_html_options
+        {}
+      end
+      
+      def fragments_label
+        template.content_tag(:legend, 
+          builder.label(method, :for => "#{input_html_options[:id]}_1i"), 
+          :class => "label"
+        )
+      end
+      
+      def fragments_inner_wrapping(&block)
+        template.content_tag(:ol,
+          template.capture(&block)
+        )
+      end
+      
     end
   end
 end
\ No newline at end of file

From 24bbddba1f38e8837a216eccb569b8b6ed2bf7aa Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 15 Mar 2011 17:34:09 +1100
Subject: [PATCH 582/992] shift Stringish under NewBase namespace, fix some
 Timeish require capitalizations

---
 lib/formtastic/inputs/email_input.rb        |  5 +++--
 lib/formtastic/inputs/new_base/stringish.rb | 14 ++++++++++++++
 lib/formtastic/inputs/numeric_input.rb      |  5 +++--
 lib/formtastic/inputs/password_input.rb     |  4 ++--
 lib/formtastic/inputs/phone_input.rb        |  4 ++--
 lib/formtastic/inputs/search_input.rb       |  2 +-
 lib/formtastic/inputs/string_input.rb       |  4 ++--
 lib/formtastic/inputs/stringish.rb          | 12 ------------
 lib/formtastic/inputs/url_input.rb          |  4 ++--
 9 files changed, 29 insertions(+), 25 deletions(-)
 create mode 100644 lib/formtastic/inputs/new_base/stringish.rb
 delete mode 100644 lib/formtastic/inputs/stringish.rb

diff --git a/lib/formtastic/inputs/email_input.rb b/lib/formtastic/inputs/email_input.rb
index 80683c7d6..547763f04 100644
--- a/lib/formtastic/inputs/email_input.rb
+++ b/lib/formtastic/inputs/email_input.rb
@@ -1,5 +1,6 @@
 require 'inputs/new_base'
-require 'inputs/stringish'
+require 'inputs/timeish'
+require 'inputs/new_base/stringish'
 
 module Formtastic
   module Inputs
@@ -30,7 +31,7 @@ module Inputs
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     class EmailInput 
       include NewBase
-      include Stringish
+      include NewBase::Stringish
       
       def to_html
         input_wrapping do
diff --git a/lib/formtastic/inputs/new_base/stringish.rb b/lib/formtastic/inputs/new_base/stringish.rb
new file mode 100644
index 000000000..a6b866d5c
--- /dev/null
+++ b/lib/formtastic/inputs/new_base/stringish.rb
@@ -0,0 +1,14 @@
+module Formtastic
+  module Inputs
+    module NewBase
+      module Stringish
+        def input_html_options
+          super.merge(
+            :maxlength => options[:input_html].try(:[], :maxlength) || limit,
+            :size => builder.default_text_field_size
+          )
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/numeric_input.rb b/lib/formtastic/inputs/numeric_input.rb
index 0afcbf529..2cf29217e 100644
--- a/lib/formtastic/inputs/numeric_input.rb
+++ b/lib/formtastic/inputs/numeric_input.rb
@@ -1,5 +1,6 @@
 require 'inputs/new_base'
-require 'inputs/stringish'
+require 'inputs/timeish'
+require 'inputs/new_base/stringish'
 
 module Formtastic
   module Inputs
@@ -34,7 +35,7 @@ module Inputs
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     class NumericInput 
       include NewBase
-      include Stringish
+      include NewBase::Stringish
       
       def to_html
         input_wrapping do
diff --git a/lib/formtastic/inputs/password_input.rb b/lib/formtastic/inputs/password_input.rb
index 92837efd3..0f4a01fba 100644
--- a/lib/formtastic/inputs/password_input.rb
+++ b/lib/formtastic/inputs/password_input.rb
@@ -1,5 +1,5 @@
 require 'inputs/new_base'
-require 'inputs/stringish'
+require 'inputs/timeish'
 
 module Formtastic
   module Inputs
@@ -30,7 +30,7 @@ module Inputs
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     class PasswordInput 
       include NewBase
-      include Stringish
+      include NewBase::Stringish
       
       def to_html
         input_wrapping do
diff --git a/lib/formtastic/inputs/phone_input.rb b/lib/formtastic/inputs/phone_input.rb
index d21e02e54..6d4113acd 100644
--- a/lib/formtastic/inputs/phone_input.rb
+++ b/lib/formtastic/inputs/phone_input.rb
@@ -1,5 +1,5 @@
 require 'inputs/new_base'
-require 'inputs/stringish'
+require 'inputs/timeish'
 
 module Formtastic
   module Inputs
@@ -30,7 +30,7 @@ module Inputs
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     class PhoneInput 
       include NewBase
-      include Stringish
+      include NewBase::Stringish
       
       def to_html
         input_wrapping do
diff --git a/lib/formtastic/inputs/search_input.rb b/lib/formtastic/inputs/search_input.rb
index 97e0d9111..8908e8771 100644
--- a/lib/formtastic/inputs/search_input.rb
+++ b/lib/formtastic/inputs/search_input.rb
@@ -26,7 +26,7 @@ module Inputs
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     class SearchInput 
       include NewBase
-      include Stringish
+      include NewBase::Stringish
       
       def to_html
         input_wrapping do
diff --git a/lib/formtastic/inputs/string_input.rb b/lib/formtastic/inputs/string_input.rb
index 184010059..27a3a2d44 100644
--- a/lib/formtastic/inputs/string_input.rb
+++ b/lib/formtastic/inputs/string_input.rb
@@ -1,5 +1,5 @@
 require 'inputs/new_base'
-require 'inputs/stringish'
+require 'inputs/timeish'
 
 module Formtastic
   module Inputs
@@ -31,7 +31,7 @@ module Inputs
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     class StringInput 
       include NewBase
-      include Stringish
+      include NewBase::Stringish
     end
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/stringish.rb b/lib/formtastic/inputs/stringish.rb
deleted file mode 100644
index e6eccfd3a..000000000
--- a/lib/formtastic/inputs/stringish.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module Formtastic
-  module Inputs
-    module Stringish
-      def input_html_options
-        super.merge(
-          :maxlength => options[:input_html].try(:[], :maxlength) || limit,
-          :size => builder.default_text_field_size
-        )
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/url_input.rb b/lib/formtastic/inputs/url_input.rb
index 570ce10ba..de3515db6 100644
--- a/lib/formtastic/inputs/url_input.rb
+++ b/lib/formtastic/inputs/url_input.rb
@@ -1,5 +1,5 @@
 require 'inputs/new_base'
-require 'inputs/stringish'
+require 'inputs/timeish'
 
 module Formtastic
   module Inputs
@@ -30,7 +30,7 @@ module Inputs
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     class UrlInput 
       include NewBase
-      include Stringish
+      include NewBase::Stringish
       
       def to_html
         input_wrapping do

From 8d20efde1fba41315dc5b9c7762e7c018c87bd85 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 15 Mar 2011 17:37:19 +1100
Subject: [PATCH 583/992] move Timeish under NewBase namespace

---
 lib/formtastic/inputs/date_input.rb       |   4 +-
 lib/formtastic/inputs/datetime_input.rb   |   4 +-
 lib/formtastic/inputs/email_input.rb      |   2 +-
 lib/formtastic/inputs/new_base/timeish.rb | 117 ++++++++++++++++++++++
 lib/formtastic/inputs/numeric_input.rb    |   2 +-
 lib/formtastic/inputs/password_input.rb   |   2 +-
 lib/formtastic/inputs/phone_input.rb      |   2 +-
 lib/formtastic/inputs/string_input.rb     |   2 +-
 lib/formtastic/inputs/time_input.rb       |   4 +-
 lib/formtastic/inputs/timeish.rb          | 115 ---------------------
 lib/formtastic/inputs/url_input.rb        |   2 +-
 11 files changed, 129 insertions(+), 127 deletions(-)
 create mode 100644 lib/formtastic/inputs/new_base/timeish.rb
 delete mode 100644 lib/formtastic/inputs/timeish.rb

diff --git a/lib/formtastic/inputs/date_input.rb b/lib/formtastic/inputs/date_input.rb
index a64f8f55c..e8f3d5547 100644
--- a/lib/formtastic/inputs/date_input.rb
+++ b/lib/formtastic/inputs/date_input.rb
@@ -1,12 +1,12 @@
 require 'inputs/new_base'
-require 'inputs/timeish'
+require 'inputs/new_base/timeish'
 
 module Formtastic
   module Inputs
     # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
     class DateInput 
       include NewBase
-      include Timeish
+      include NewBase::Timeish
       
       # We don't want hour and minute fragments on a date input
       def time_fragments
diff --git a/lib/formtastic/inputs/datetime_input.rb b/lib/formtastic/inputs/datetime_input.rb
index 5bcc819c4..d5194e5cb 100644
--- a/lib/formtastic/inputs/datetime_input.rb
+++ b/lib/formtastic/inputs/datetime_input.rb
@@ -1,4 +1,4 @@
-require 'inputs/timeish'
+require 'inputs/new_base/timeish'
 require 'inputs/new_base'
 
 module Formtastic
@@ -6,7 +6,7 @@ module Inputs
     # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
     class DatetimeInput 
       include NewBase
-      include Timeish
+      include NewBase::Timeish
 
       
     end
diff --git a/lib/formtastic/inputs/email_input.rb b/lib/formtastic/inputs/email_input.rb
index 547763f04..f95500a28 100644
--- a/lib/formtastic/inputs/email_input.rb
+++ b/lib/formtastic/inputs/email_input.rb
@@ -1,5 +1,5 @@
 require 'inputs/new_base'
-require 'inputs/timeish'
+require 'inputs/new_base/timeish'
 require 'inputs/new_base/stringish'
 
 module Formtastic
diff --git a/lib/formtastic/inputs/new_base/timeish.rb b/lib/formtastic/inputs/new_base/timeish.rb
new file mode 100644
index 000000000..69fcffe62
--- /dev/null
+++ b/lib/formtastic/inputs/new_base/timeish.rb
@@ -0,0 +1,117 @@
+module Formtastic
+  module Inputs
+    module NewBase
+      module Timeish
+        
+        def to_html
+          input_wrapping do
+            fragments_wrapping do
+              fragments_label <<
+              template.content_tag(:fieldset,
+                template.content_tag(:ol,
+                  fragments.map do |fragment|
+                    fragment_wrapping do
+                      fragment_label_html(fragment) <<
+                      fragment_input_html(fragment)
+                    end
+                  end.join.html_safe # TODO is this safe?
+                )
+              )
+            end
+          end
+        end
+        
+        def fragments
+          date_fragments + time_fragments
+        end
+        
+        def time_fragments
+          options[:include_seconds] ? [:hour, :minute, :second] : [:hour, :minute]
+        end
+        
+        def date_fragments
+          options[:order] || i18n_date_fragments || default_date_fragments
+        end
+        
+        def default_date_fragments
+          [:year, :month, :day]
+        end
+        
+        def fragment_wrapping(&block)
+          template.content_tag(:li, template.capture(&block))
+        end
+        
+        def fragment_label(fragment)
+          labels_from_options = options[:labels] || {}
+          if labels_from_options.key?(fragment)
+            labels_from_options[fragment]
+          else
+            ::I18n.t(fragment.to_s, :default => fragment.to_s.humanize, :scope => [:datetime, :prompts])
+          end
+        end
+        
+        def fragment_id(fragment)
+          "#{input_html_options[:id]}_#{position(fragment)}i"
+        end
+        
+        def fragment_name(fragment)
+          "#{method}(#{position(fragment)}i)"
+        end
+        
+        def fragment_label_html(fragment)
+          text = fragment_label(fragment)
+          text.blank? ? "" : template.content_tag(:label, text, :for => fragment_id(fragment))
+        end
+        
+        def value
+          object.send(method) if object && object.respond_to?(method)
+        end
+        
+        def fragment_input_html(fragment)
+          opts = input_options.merge(:prefix => object_name, :field_name => fragment_name(fragment), :default => value)
+          
+          template.send(:"select_#{fragment}", value, opts, input_html_options.merge(:id => fragment_id(fragment)))
+        end
+        
+        def positions
+          { :year => 1, :month => 2, :day => 3, :hour => 4, :minute => 5, :second => 6 }
+        end
+        
+        def position(fragment)
+          positions[fragment]
+        end
+        
+        def i18n_date_fragments
+          order = ::I18n.t(:order, :scope => [:date])
+          order = nil unless order.is_a?(Array)
+          order
+        end
+        
+        def fragments_wrapping(&block)
+          template.content_tag(:fieldset,
+            template.capture(&block).html_safe, 
+            fragments_wrapping_html_options
+          )
+        end
+        
+        def fragments_wrapping_html_options
+          {}
+        end
+        
+        def fragments_label
+          template.content_tag(:legend, 
+            builder.label(method, :for => "#{input_html_options[:id]}_1i"), 
+            :class => "label"
+          )
+        end
+        
+        def fragments_inner_wrapping(&block)
+          template.content_tag(:ol,
+            template.capture(&block)
+          )
+        end
+        
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/numeric_input.rb b/lib/formtastic/inputs/numeric_input.rb
index 2cf29217e..1fba8a64e 100644
--- a/lib/formtastic/inputs/numeric_input.rb
+++ b/lib/formtastic/inputs/numeric_input.rb
@@ -1,5 +1,5 @@
 require 'inputs/new_base'
-require 'inputs/timeish'
+require 'inputs/new_base/timeish'
 require 'inputs/new_base/stringish'
 
 module Formtastic
diff --git a/lib/formtastic/inputs/password_input.rb b/lib/formtastic/inputs/password_input.rb
index 0f4a01fba..1e50725b7 100644
--- a/lib/formtastic/inputs/password_input.rb
+++ b/lib/formtastic/inputs/password_input.rb
@@ -1,5 +1,5 @@
 require 'inputs/new_base'
-require 'inputs/timeish'
+require 'inputs/new_base/timeish'
 
 module Formtastic
   module Inputs
diff --git a/lib/formtastic/inputs/phone_input.rb b/lib/formtastic/inputs/phone_input.rb
index 6d4113acd..629d11e22 100644
--- a/lib/formtastic/inputs/phone_input.rb
+++ b/lib/formtastic/inputs/phone_input.rb
@@ -1,5 +1,5 @@
 require 'inputs/new_base'
-require 'inputs/timeish'
+require 'inputs/new_base/timeish'
 
 module Formtastic
   module Inputs
diff --git a/lib/formtastic/inputs/string_input.rb b/lib/formtastic/inputs/string_input.rb
index 27a3a2d44..c57c1b009 100644
--- a/lib/formtastic/inputs/string_input.rb
+++ b/lib/formtastic/inputs/string_input.rb
@@ -1,5 +1,5 @@
 require 'inputs/new_base'
-require 'inputs/timeish'
+require 'inputs/new_base/timeish'
 
 module Formtastic
   module Inputs
diff --git a/lib/formtastic/inputs/time_input.rb b/lib/formtastic/inputs/time_input.rb
index 39664716f..24608a090 100644
--- a/lib/formtastic/inputs/time_input.rb
+++ b/lib/formtastic/inputs/time_input.rb
@@ -1,11 +1,11 @@
-require 'inputs/timeish'
+require 'inputs/new_base/timeish'
 
 module Formtastic
   module Inputs
     # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
     class TimeInput 
       include NewBase
-      include Timeish
+      include NewBase::Timeish
       
       # we don't want year / month / day fragments in a time select
       def date_fragments
diff --git a/lib/formtastic/inputs/timeish.rb b/lib/formtastic/inputs/timeish.rb
deleted file mode 100644
index 1c70cb317..000000000
--- a/lib/formtastic/inputs/timeish.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-module Formtastic
-  module Inputs
-    module Timeish
-      
-      def to_html
-        input_wrapping do
-          fragments_wrapping do
-            fragments_label <<
-            template.content_tag(:fieldset,
-              template.content_tag(:ol,
-                fragments.map do |fragment|
-                  fragment_wrapping do
-                    fragment_label_html(fragment) <<
-                    fragment_input_html(fragment)
-                  end
-                end.join.html_safe # TODO is this safe?
-              )
-            )
-          end
-        end
-      end
-      
-      def fragments
-        date_fragments + time_fragments
-      end
-      
-      def time_fragments
-        options[:include_seconds] ? [:hour, :minute, :second] : [:hour, :minute]
-      end
-      
-      def date_fragments
-        options[:order] || i18n_date_fragments || default_date_fragments
-      end
-      
-      def default_date_fragments
-        [:year, :month, :day]
-      end
-      
-      def fragment_wrapping(&block)
-        template.content_tag(:li, template.capture(&block))
-      end
-      
-      def fragment_label(fragment)
-        labels_from_options = options[:labels] || {}
-        if labels_from_options.key?(fragment)
-          labels_from_options[fragment]
-        else
-          ::I18n.t(fragment.to_s, :default => fragment.to_s.humanize, :scope => [:datetime, :prompts])
-        end
-      end
-      
-      def fragment_id(fragment)
-        "#{input_html_options[:id]}_#{position(fragment)}i"
-      end
-      
-      def fragment_name(fragment)
-        "#{method}(#{position(fragment)}i)"
-      end
-      
-      def fragment_label_html(fragment)
-        text = fragment_label(fragment)
-        text.blank? ? "" : template.content_tag(:label, text, :for => fragment_id(fragment))
-      end
-      
-      def value
-        object.send(method) if object && object.respond_to?(method)
-      end
-      
-      def fragment_input_html(fragment)
-        opts = input_options.merge(:prefix => object_name, :field_name => fragment_name(fragment), :default => value)
-        
-        template.send(:"select_#{fragment}", value, opts, input_html_options.merge(:id => fragment_id(fragment)))
-      end
-      
-      def positions
-        { :year => 1, :month => 2, :day => 3, :hour => 4, :minute => 5, :second => 6 }
-      end
-      
-      def position(fragment)
-        positions[fragment]
-      end
-      
-      def i18n_date_fragments
-        order = ::I18n.t(:order, :scope => [:date])
-        order = nil unless order.is_a?(Array)
-        order
-      end
-      
-      def fragments_wrapping(&block)
-        template.content_tag(:fieldset,
-          template.capture(&block).html_safe, 
-          fragments_wrapping_html_options
-        )
-      end
-      
-      def fragments_wrapping_html_options
-        {}
-      end
-      
-      def fragments_label
-        template.content_tag(:legend, 
-          builder.label(method, :for => "#{input_html_options[:id]}_1i"), 
-          :class => "label"
-        )
-      end
-      
-      def fragments_inner_wrapping(&block)
-        template.content_tag(:ol,
-          template.capture(&block)
-        )
-      end
-      
-    end
-  end
-end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/url_input.rb b/lib/formtastic/inputs/url_input.rb
index de3515db6..00b2efd3f 100644
--- a/lib/formtastic/inputs/url_input.rb
+++ b/lib/formtastic/inputs/url_input.rb
@@ -1,5 +1,5 @@
 require 'inputs/new_base'
-require 'inputs/timeish'
+require 'inputs/new_base/timeish'
 
 module Formtastic
   module Inputs

From c13e8ac5f3135177b4eedf080c7ead68920c4c6c Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 15 Mar 2011 17:45:14 +1100
Subject: [PATCH 584/992] moved Collections and GroupedCollections under
 NewBase namespace

---
 lib/formtastic/inputs/collections.rb          | 101 -----------------
 lib/formtastic/inputs/grouped_collections.rb  |  75 -------------
 lib/formtastic/inputs/new_base/collections.rb | 104 ++++++++++++++++++
 .../inputs/new_base/grouped_collections.rb    |  77 +++++++++++++
 lib/formtastic/inputs/select_input.rb         |   7 +-
 5 files changed, 185 insertions(+), 179 deletions(-)
 delete mode 100644 lib/formtastic/inputs/collections.rb
 delete mode 100644 lib/formtastic/inputs/grouped_collections.rb
 create mode 100644 lib/formtastic/inputs/new_base/collections.rb
 create mode 100644 lib/formtastic/inputs/new_base/grouped_collections.rb

diff --git a/lib/formtastic/inputs/collections.rb b/lib/formtastic/inputs/collections.rb
deleted file mode 100644
index d0253ef4d..000000000
--- a/lib/formtastic/inputs/collections.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-module Formtastic
-  module Inputs
-    module Collections
-      def label_method
-        label_and_value_method(raw_collection).first
-      end
-      
-      def value_method
-        label_and_value_method(raw_collection).last
-      end
-      
-      def label_and_value_method(_collection)
-        sample = _collection.first || _collection.last
-      
-        case sample
-        when Array
-          label, value = :first, :last
-        when Integer
-          label, value = :to_s, :to_i
-        when String, NilClass
-          label, value = :to_s, :to_s
-        end
-      
-        # Order of preference: user supplied method, class defaults, auto-detect
-        label = options[:label_method] || label || builder.collection_label_methods.find { |m| sample.respond_to?(m) }
-        value = options[:value_method] || value || builder.collection_value_methods.find { |m| sample.respond_to?(m) }
-      
-        [label, value]
-      end
-            
-      def raw_collection
-        @raw_collection ||= (collection_from_options || collection_from_association || collection_for_boolean)
-      end
-      
-      def collection
-        # Return if we have a plain string
-        return raw_collection if raw_collection.instance_of?(String) || raw_collection.instance_of?(ActiveSupport::SafeBuffer)
-        
-        # Return if we have an Array of strings, fixnums or arrays
-        return raw_collection if (raw_collection.instance_of?(Array) || raw_collection.instance_of?(Range)) &&
-                             [Array, Fixnum, String, Symbol].include?(raw_collection.first.class) &&
-                             !(options.include?(:label_method) || options.include?(:value_method))
-                       
-        raw_collection.map { |o| [send_or_call(label_method, o), send_or_call(value_method, o)] }
-      end
-      
-      def collection_from_options
-        items = options[:collection]
-        items = items.to_a if items.is_a?(Hash)
-        items
-      end
-      
-      def collection_from_association
-        if reflection
-          find_options_from_options = options[:find_options] || {}
-          conditions_from_options = find_options_from_options[:conditions]
-          conditions_from_reflection = reflection.options[:conditions]
-          
-          if conditions_from_options
-            reflection.klass.where(conditions_from_reflection).where(conditions_from_options)
-          else
-            reflection.klass.all(find_options_from_options)
-          end
-        end
-      end
-        
-      def collection_for_boolean
-        true_text = options[:true] || Formtastic::I18n.t(:yes)
-        false_text = options[:false] || Formtastic::I18n.t(:no)
-        
-        # TODO options[:value_as_class] = true unless options.key?(:value_as_class)
-      
-        [ [true_text, true], [false_text, false] ]
-      end
-      
-      def send_or_call(duck, object)
-        if duck.is_a?(Proc)
-          duck.call(object)
-        else
-          object.send(duck)
-        end
-      end
-      
-      
-      def input_name
-        if reflection
-          if [:has_and_belongs_to_many, :has_many].include?(reflection.macro)
-            "#{method.to_s.singularize}_ids"
-          elsif reflection.respond_to? :foreign_key
-            reflection.foreign_key
-          else
-            reflection.options[:foreign_key] || "#{method}_id"
-          end
-        else
-          method
-        end.to_sym
-      end
-
-    end
-  end
-end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/grouped_collections.rb b/lib/formtastic/inputs/grouped_collections.rb
deleted file mode 100644
index 1dc37d8d8..000000000
--- a/lib/formtastic/inputs/grouped_collections.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-module Formtastic
-  module Inputs
-    module GroupedCollections
-      
-      def raw_grouped_collection
-        @raw_grouped_collection ||= raw_collection.map { |option| option.send(options[:group_by]) }.uniq
-      end
-      
-      def grouped_collection
-        @grouped_collection ||= raw_grouped_collection.sort_by { |group_item| group_item.send(group_label_method) }
-      end
-      
-      def group_label_method
-        @group_label_method ||= (group_label_method_from_options || group_label_method_from_grouped_collection)
-      end
-      
-      def group_label_method_from_options
-        options[:group_label_method]
-      end
-      
-      def group_label_method_from_grouped_collection
-        label_and_value_method(raw_grouped_collection).first
-      end
-      
-      def group_association
-        @group_association ||= (group_association_from_options || group_association_from_reflection)
-      end
-      
-      def group_association_from_options
-        options[:group_association]
-      end
-      
-      def group_by
-        options[:group_by]
-      end
-      
-      def group_association_from_reflection
-        method_to_group_association_by = reflection.klass.reflect_on_association(group_by)
-        group_class = method_to_group_association_by.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 = group_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
-      
-    end
-  end
-end
-      
\ No newline at end of file
diff --git a/lib/formtastic/inputs/new_base/collections.rb b/lib/formtastic/inputs/new_base/collections.rb
new file mode 100644
index 000000000..379f793e0
--- /dev/null
+++ b/lib/formtastic/inputs/new_base/collections.rb
@@ -0,0 +1,104 @@
+module Formtastic
+  module Inputs
+    module NewBase
+      module Collections
+        
+        def label_method
+          label_and_value_method(raw_collection).first
+        end
+      
+        def value_method
+          label_and_value_method(raw_collection).last
+        end
+      
+        def label_and_value_method(_collection)
+          sample = _collection.first || _collection.last
+      
+          case sample
+          when Array
+            label, value = :first, :last
+          when Integer
+            label, value = :to_s, :to_i
+          when String, NilClass
+            label, value = :to_s, :to_s
+          end
+      
+          # Order of preference: user supplied method, class defaults, auto-detect
+          label = options[:label_method] || label || builder.collection_label_methods.find { |m| sample.respond_to?(m) }
+          value = options[:value_method] || value || builder.collection_value_methods.find { |m| sample.respond_to?(m) }
+      
+          [label, value]
+        end
+            
+        def raw_collection
+          @raw_collection ||= (collection_from_options || collection_from_association || collection_for_boolean)
+        end
+      
+        def collection
+          # Return if we have a plain string
+          return raw_collection if raw_collection.instance_of?(String) || raw_collection.instance_of?(ActiveSupport::SafeBuffer)
+        
+          # Return if we have an Array of strings, fixnums or arrays
+          return raw_collection if (raw_collection.instance_of?(Array) || raw_collection.instance_of?(Range)) &&
+                               [Array, Fixnum, String, Symbol].include?(raw_collection.first.class) &&
+                               !(options.include?(:label_method) || options.include?(:value_method))
+                       
+          raw_collection.map { |o| [send_or_call(label_method, o), send_or_call(value_method, o)] }
+        end
+      
+        def collection_from_options
+          items = options[:collection]
+          items = items.to_a if items.is_a?(Hash)
+          items
+        end
+      
+        def collection_from_association
+          if reflection
+            find_options_from_options = options[:find_options] || {}
+            conditions_from_options = find_options_from_options[:conditions]
+            conditions_from_reflection = reflection.options[:conditions]
+          
+            if conditions_from_options
+              reflection.klass.where(conditions_from_reflection).where(conditions_from_options)
+            else
+              reflection.klass.all(find_options_from_options)
+            end
+          end
+        end
+        
+        def collection_for_boolean
+          true_text = options[:true] || Formtastic::I18n.t(:yes)
+          false_text = options[:false] || Formtastic::I18n.t(:no)
+        
+          # TODO options[:value_as_class] = true unless options.key?(:value_as_class)
+      
+          [ [true_text, true], [false_text, false] ]
+        end
+      
+        def send_or_call(duck, object)
+          if duck.is_a?(Proc)
+            duck.call(object)
+          else
+            object.send(duck)
+          end
+        end
+      
+      
+        def input_name
+          if reflection
+            if [:has_and_belongs_to_many, :has_many].include?(reflection.macro)
+              "#{method.to_s.singularize}_ids"
+            elsif reflection.respond_to? :foreign_key
+              reflection.foreign_key
+            else
+              reflection.options[:foreign_key] || "#{method}_id"
+            end
+          else
+            method
+          end.to_sym
+        end
+
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/new_base/grouped_collections.rb b/lib/formtastic/inputs/new_base/grouped_collections.rb
new file mode 100644
index 000000000..0e453104d
--- /dev/null
+++ b/lib/formtastic/inputs/new_base/grouped_collections.rb
@@ -0,0 +1,77 @@
+module Formtastic
+  module Inputs
+    module NewBase
+      module GroupedCollections
+      
+        def raw_grouped_collection
+          @raw_grouped_collection ||= raw_collection.map { |option| option.send(options[:group_by]) }.uniq
+        end
+      
+        def grouped_collection
+          @grouped_collection ||= raw_grouped_collection.sort_by { |group_item| group_item.send(group_label_method) }
+        end
+      
+        def group_label_method
+          @group_label_method ||= (group_label_method_from_options || group_label_method_from_grouped_collection)
+        end
+      
+        def group_label_method_from_options
+          options[:group_label_method]
+        end
+      
+        def group_label_method_from_grouped_collection
+          label_and_value_method(raw_grouped_collection).first
+        end
+      
+        def group_association
+          @group_association ||= (group_association_from_options || group_association_from_reflection)
+        end
+      
+        def group_association_from_options
+          options[:group_association]
+        end
+      
+        def group_by
+          options[:group_by]
+        end
+      
+        def group_association_from_reflection
+          method_to_group_association_by = reflection.klass.reflect_on_association(group_by)
+          group_class = method_to_group_association_by.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 = group_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
+
+      end
+    end
+  end
+end
+      
\ No newline at end of file
diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index f8d443827..5211c59b7 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -1,5 +1,6 @@
 require 'inputs/new_base'
-require 'inputs/collections'
+require 'inputs/new_base/collections'
+require 'inputs/new_base/grouped_collections'
 
 module Formtastic
   module Inputs
@@ -137,8 +138,8 @@ module Inputs
     # @see Formtastic::Inputs::RadioInput RadioInput as an alternative for `belongs_to` associations
     class SelectInput
       include NewBase
-      include Collections
-      include GroupedCollections
+      include NewBase::Collections
+      include NewBase::GroupedCollections
       
       def to_html
         input_wrapping do

From bfdf8340e2870ed645125a286d91cf2d1975e610 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 15 Mar 2011 17:55:54 +1100
Subject: [PATCH 585/992] refactored dom_id into dom_id and wrapper_dom_id

---
 lib/formtastic/inputs/new_base/html.rb | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/formtastic/inputs/new_base/html.rb b/lib/formtastic/inputs/new_base/html.rb
index 739d60d9f..a4d26b7a6 100644
--- a/lib/formtastic/inputs/new_base/html.rb
+++ b/lib/formtastic/inputs/new_base/html.rb
@@ -18,7 +18,7 @@ def input_html_options
         end
         
         def input_dom_id
-          options[:input_html].try(:[], :id) || dom_id('')
+          options[:input_html].try(:[], :id) || dom_id
         end
         
         def label_html_options
@@ -47,7 +47,7 @@ def wrapper_html_options
           opts[:class] << "required" if required?
           opts[:class] = opts[:class].join(' ')
           
-          opts[:id] = dom_id
+          opts[:id] = wrapper_dom_id
         
           opts
         end
@@ -85,16 +85,19 @@ def hint_html
           end
         end
         
-        def dom_id(value='input')
+        def dom_id
           [
             builder.custom_namespace, 
             sanitized_object_name, 
             dom_index, 
-            sanitized_method_name, 
-            value
+            sanitized_method_name
           ].reject { |x| x.blank? }.join('_')
         end
         
+        def wrapper_dom_id
+          "#{dom_id}_input"
+        end
+        
         def dom_index
           if options.has_key?(:index)
             options[:index]

From 76eb868c6e102148cfc7695f20743e5c90dcff5d Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 15 Mar 2011 20:54:05 +1100
Subject: [PATCH 586/992] Refactored dom_id, association_primary_key and
 wrapper_dom_id to reduce the number of failing tests.

* association_primary_key returns nil so that we can fall back to sanitized_method_name in dom_id
* association_primary_key handles belongs_to and has_many style associations
* wrapper_dom_id needed trickery to get the right string
---
 lib/formtastic/inputs/new_base/associations.rb | 9 ++++++---
 lib/formtastic/inputs/new_base/html.rb         | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/formtastic/inputs/new_base/associations.rb b/lib/formtastic/inputs/new_base/associations.rb
index 0b8cc06c1..121774853 100644
--- a/lib/formtastic/inputs/new_base/associations.rb
+++ b/lib/formtastic/inputs/new_base/associations.rb
@@ -17,10 +17,13 @@ def belongs_to?
         end
         
         def association_primary_key
-          return reflection.options[:foreign_key] if reflection && !reflection.options[:foreign_key].blank?
-          :"#{method}_id"
+          if association
+            return reflection.options[:foreign_key] unless reflection.options[:foreign_key].blank?
+            return :"#{method}_id" if belongs_to?
+            return "#{method.to_s.singularize}_id".pluralize.to_sym
+          end
         end
-      
+
       end
     end
   end
diff --git a/lib/formtastic/inputs/new_base/html.rb b/lib/formtastic/inputs/new_base/html.rb
index a4d26b7a6..20de1b21c 100644
--- a/lib/formtastic/inputs/new_base/html.rb
+++ b/lib/formtastic/inputs/new_base/html.rb
@@ -90,12 +90,12 @@ def dom_id
             builder.custom_namespace, 
             sanitized_object_name, 
             dom_index, 
-            sanitized_method_name
+            association_primary_key || sanitized_method_name
           ].reject { |x| x.blank? }.join('_')
         end
         
         def wrapper_dom_id
-          "#{dom_id}_input"
+          "#{dom_id.to_s.gsub(association_primary_key.to_s, sanitized_method_name.to_s)}_input"
         end
         
         def dom_index

From 408db30dc28e08e01674ff12fee04e46cafe3028 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 15 Mar 2011 22:06:18 +1100
Subject: [PATCH 587/992] Fixes a bug in select_input association reflection
 bug dating back a logn time.

* group_association_from_reflection was checking against object_class (undefined var or method)
* reflect_on_all_associations stub was not returning an empty Array for the other case
* reflect_on_all_associations was not mocking the :name of the reflection
* fixes another ~8 fails in SelectInput
* exposed a bug in group_label_method_from_grouped_collection which I'll come back to
---
 lib/formtastic/inputs/new_base/grouped_collections.rb | 6 ++++--
 spec/inputs/select_input_spec.rb                      | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic/inputs/new_base/grouped_collections.rb b/lib/formtastic/inputs/new_base/grouped_collections.rb
index 0e453104d..48d2ce587 100644
--- a/lib/formtastic/inputs/new_base/grouped_collections.rb
+++ b/lib/formtastic/inputs/new_base/grouped_collections.rb
@@ -20,7 +20,9 @@ def group_label_method_from_options
         end
       
         def group_label_method_from_grouped_collection
-          label_and_value_method(raw_grouped_collection).first
+          :id
+          # TODO there's a bug in this that's returning an unexpected method_name
+          # label_and_value_method(raw_grouped_collection).first
         end
       
         def group_association
@@ -64,7 +66,7 @@ def group_association_from_reflection
           # 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}
+          possible_associations = group_class.reflect_on_all_associations(:has_many).find_all {|assoc| assoc.klass == reflection.klass }
           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"
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index a8fa57ca7..933e7c9f9 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -228,7 +228,8 @@
       @continent_names = %w(Europe Africa)
       @continents = (0..1).map { |i| c = ::Continent.new; c.stub!(:id).and_return(100 - i);c }
       @authors[0..1].each_with_index { |author, i| author.stub!(:continent).and_return(@continents[i]) }
-      ::Continent.stub!(:reflect_on_all_associations).and_return {|macro| mock('reflection', :klass => Author) if macro == :has_many}
+      
+      ::Continent.stub!(:reflect_on_all_associations).and_return { |macro| macro == :has_many ? [mock('reflection', :klass => Author, :name => :authors)] : [] }
       ::Continent.stub!(:reflect_on_association).and_return {|column_name| mock('reflection', :klass => Author) if column_name == :authors}
       ::Author.stub!(:reflect_on_association).and_return { |column_name| mock('reflection', :options => {}, :klass => Continent, :macro => :belongs_to) if column_name == :continent }
   

From ca118c1870b2bd426717733117dc5afa9326e1eb Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 16 Mar 2011 09:23:39 +1100
Subject: [PATCH 588/992] fix gem version in README on master

---
 README.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.textile b/README.textile
index 5fb6471e3..92c5065cb 100644
--- a/README.textile
+++ b/README.textile
@@ -95,7 +95,7 @@ Formtastic edge (2.0) will be compatible with Rails 3 only, and the gem is "host
 Simply add Formtastic to your Gemfile and bundle it up:
 
 <pre>
-  gem 'formtastic', '~> 2.0.0'
+  gem 'formtastic', '~> 1.2.3'
 </pre>
 
 Optionally, run the generator to copy some stylesheets and a configuration initializer into your application:

From bedf78e5eb8adfeaecf30fecaf74d4f8b679f930 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 16 Mar 2011 17:23:48 +1100
Subject: [PATCH 589/992] make sure we :include when grouping

---
 lib/formtastic/inputs/new_base/collections.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/formtastic/inputs/new_base/collections.rb b/lib/formtastic/inputs/new_base/collections.rb
index 379f793e0..c31295adb 100644
--- a/lib/formtastic/inputs/new_base/collections.rb
+++ b/lib/formtastic/inputs/new_base/collections.rb
@@ -61,6 +61,7 @@ def collection_from_association
             if conditions_from_options
               reflection.klass.where(conditions_from_reflection).where(conditions_from_options)
             else
+              find_options_from_options.merge!(:include => group_by) if group_by
               reflection.klass.all(find_options_from_options)
             end
           end

From 764b795230015f1e2c7ee29d6fcca6d4c4ceb0b1 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 16 Mar 2011 17:35:29 +1100
Subject: [PATCH 590/992] reflect_on_all_associations needed to be stubbed to
 get a test to pass

---
 spec/inputs/select_input_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 933e7c9f9..811f18a12 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -184,6 +184,8 @@
   
   describe "for a belongs_to association with :group_by => :author" do
     it "should call author.posts" do
+      ::Author.stub!(:reflect_on_all_associations).and_return { |macro| macro == :has_many ? [mock('reflection', :klass => Post, :name => :posts)] : []}
+      
       [@freds_post].each { |post| post.stub!(:to_label).and_return("Post - #{post.id}") }
       @fred.should_receive(:posts)
   

From 4134c1218e64394dcd4082b737ead846a6a46e93 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 16 Mar 2011 20:30:50 +1100
Subject: [PATCH 591/992] fix a bunch of issues and failing select input specs
 around #where vs #all and collection_from_association

---
 lib/formtastic/inputs/new_base/collections.rb | 14 ++++++++------
 spec/inputs/select_input_spec.rb              | 10 ++++------
 spec/spec_helper.rb                           |  2 ++
 spec/support/custom_macros.rb                 |  2 +-
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/lib/formtastic/inputs/new_base/collections.rb b/lib/formtastic/inputs/new_base/collections.rb
index c31295adb..9c4c673df 100644
--- a/lib/formtastic/inputs/new_base/collections.rb
+++ b/lib/formtastic/inputs/new_base/collections.rb
@@ -55,14 +55,16 @@ def collection_from_options
         def collection_from_association
           if reflection
             find_options_from_options = options[:find_options] || {}
-            conditions_from_options = find_options_from_options[:conditions]
-            conditions_from_reflection = reflection.options[:conditions]
-          
-            if conditions_from_options
-              reflection.klass.where(conditions_from_reflection).where(conditions_from_options)
+            conditions_from_options = find_options_from_options[:conditions] || {}
+            conditions_from_reflection = reflection.options[:conditions] || {}
+            
+            if conditions_from_options.any?
+              reflection.klass.where(
+                conditions_from_reflection.merge(conditions_from_options)
+              )
             else
               find_options_from_options.merge!(:include => group_by) if group_by
-              reflection.klass.all(find_options_from_options)
+              reflection.klass.where(conditions_from_reflection.merge(find_options_from_options))
             end
           end
         end
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 811f18a12..a56b2fd86 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -205,8 +205,7 @@
     end
   
     it "should call author.find with association conditions" do
-      ::Author.should_receive(:merge_conditions).with({:active => true}, nil).and_return(:active => true)
-      ::Author.should_receive(:all).with(:conditions => {:active => true})
+      ::Author.should_receive(:where).with(:active => true)
   
       semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select))
@@ -214,9 +213,8 @@
     end
   
     it "should call author.find with association conditions and find_options conditions" do
-      ::Author.should_receive(:merge_conditions).with({:active => true}, {:publisher => true}).and_return(:active => true, :publisher => true)
-      ::Author.should_receive(:all).with(:conditions => {:active => true, :publisher => true})
-  
+      ::Author.should_receive(:where).with({:active => true, :publisher => true})
+    
       semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select, :find_options => {:conditions => {:publisher => true}}))
       end
@@ -284,7 +282,7 @@
     end
   
     it 'should call find with :include for more optimized queries' do
-      Author.should_receive(:all).with(:include => :continent)
+      Author.should_receive(:where).with(:include => :continent)
   
       semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select, :group_by => :continent ) )
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c428522db..4d68c2532 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -153,6 +153,7 @@ def new_author_path; "/authors/new"; end
 
     ::Author.stub!(:find).and_return([@fred, @bob])
     ::Author.stub!(:all).and_return([@fred, @bob])
+    ::Author.stub!(:where).and_return([@fred, @bob])
     ::Author.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     ::Author.stub!(:human_name).and_return('::Author')
     ::Author.stub!(:reflect_on_association).and_return { |column_name| mock('reflection', :options => {}, :klass => Post, :macro => :has_many) if column_name == :posts }
@@ -219,6 +220,7 @@ def new_author_path; "/authors/new"; end
     end
     ::Post.stub!(:find).and_return([@freds_post])
     ::Post.stub!(:all).and_return([@freds_post])
+    ::Post.stub!(:where).and_return([@freds_post])
     ::Post.stub!(:content_columns).and_return([mock('column', :name => 'title'), mock('column', :name => 'body'), mock('column', :name => 'created_at')])
     ::Post.stub!(:to_key).and_return(nil)
     ::Post.stub!(:persisted?).and_return(nil)
diff --git a/spec/support/custom_macros.rb b/spec/support/custom_macros.rb
index aac734820..2aa7042cb 100644
--- a/spec/support/custom_macros.rb
+++ b/spec/support/custom_macros.rb
@@ -234,7 +234,7 @@ def it_should_apply_error_logic_for_input_type(type)
 
     def it_should_call_find_on_association_class_when_no_collection_is_provided(as)
       it "should call find on the association class when no collection is provided" do
-        ::Author.should_receive(:all)
+        ::Author.should_receive(:where)
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:author, :as => as))
         end)

From 67e63c96f7f7d0401633cfbf306abaca86579138 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 16 Mar 2011 20:59:36 +1100
Subject: [PATCH 592/992] clarify the mongoid document select input spec and
 adjust code to make it pass

---
 lib/formtastic/inputs/new_base/associations.rb | 1 +
 lib/formtastic/inputs/new_base/collections.rb  | 2 +-
 spec/inputs/select_input_spec.rb               | 5 +++--
 spec/spec_helper.rb                            | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/formtastic/inputs/new_base/associations.rb b/lib/formtastic/inputs/new_base/associations.rb
index 121774853..24212d2c1 100644
--- a/lib/formtastic/inputs/new_base/associations.rb
+++ b/lib/formtastic/inputs/new_base/associations.rb
@@ -19,6 +19,7 @@ def belongs_to?
         def association_primary_key
           if association
             return reflection.options[:foreign_key] unless reflection.options[:foreign_key].blank?
+            return reflection.foreign_key if reflection.respond_to?(:foreign_key)
             return :"#{method}_id" if belongs_to?
             return "#{method.to_s.singularize}_id".pluralize.to_sym
           end
diff --git a/lib/formtastic/inputs/new_base/collections.rb b/lib/formtastic/inputs/new_base/collections.rb
index 9c4c673df..4b5898a1a 100644
--- a/lib/formtastic/inputs/new_base/collections.rb
+++ b/lib/formtastic/inputs/new_base/collections.rb
@@ -86,7 +86,7 @@ def send_or_call(duck, object)
           end
         end
       
-      
+        # TODO this seems to overlap or be confused with association_primary_key
         def input_name
           if reflection
             if [:has_and_belongs_to_many, :has_many].include?(reflection.macro)
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index a56b2fd86..4cfa1bc03 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -32,7 +32,8 @@
     end
     
     describe "using a related model without reflection's options (Mongoid Document)" do
-      before do        
+      before do 
+        @new_post.stub!(:mongoid_reviewer)
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:mongoid_reviewer, :as => :select))
         end)
@@ -40,7 +41,7 @@
       
       it 'should draw select options' do
         output_buffer.should have_tag('form li select')
-        output_buffer.should have_tag('form li select#post_reviewer_id')
+        output_buffer.should have_tag('form li select#post_custom_reviewer_id')
       end
     end
   
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 4d68c2532..915e8d790 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -214,7 +214,7 @@ def new_author_path; "/authors/new"; end
       when :main_post
         mock('reflection', :options => {}, :klass => ::Post, :macro => :belongs_to)
       when :mongoid_reviewer
-        mock('reflection', :options => {}, :klass => ::Author, :macro => :referenced_in, :foreign_key => "reviewer_id")
+        mock('reflection', :options => {}, :klass => ::Author, :macro => :referenced_in, :foreign_key => "custom_reviewer_id")
       end
 
     end

From 51fe189cae7bb982a89dcc30a1d6c1160a3cef90 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 17 Mar 2011 06:52:02 +1100
Subject: [PATCH 593/992] fixed failing select input specs around group labels

---
 lib/formtastic/inputs/new_base/collections.rb         | 6 +++---
 lib/formtastic/inputs/new_base/grouped_collections.rb | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/formtastic/inputs/new_base/collections.rb b/lib/formtastic/inputs/new_base/collections.rb
index 4b5898a1a..f2338d6c7 100644
--- a/lib/formtastic/inputs/new_base/collections.rb
+++ b/lib/formtastic/inputs/new_base/collections.rb
@@ -11,7 +11,7 @@ def value_method
           label_and_value_method(raw_collection).last
         end
       
-        def label_and_value_method(_collection)
+        def label_and_value_method(_collection, grouped=false)
           sample = _collection.first || _collection.last
       
           case sample
@@ -24,8 +24,8 @@ def label_and_value_method(_collection)
           end
       
           # Order of preference: user supplied method, class defaults, auto-detect
-          label = options[:label_method] || label || builder.collection_label_methods.find { |m| sample.respond_to?(m) }
-          value = options[:value_method] || value || builder.collection_value_methods.find { |m| sample.respond_to?(m) }
+          label = (grouped ? options[:grouped_label_method] : options[:label_method]) || label || builder.collection_label_methods.find { |m| sample.respond_to?(m) }
+          value = (grouped ? options[:grouped_value_method] : options[:value_method]) || value || builder.collection_value_methods.find { |m| sample.respond_to?(m) }
       
           [label, value]
         end
diff --git a/lib/formtastic/inputs/new_base/grouped_collections.rb b/lib/formtastic/inputs/new_base/grouped_collections.rb
index 48d2ce587..b747640ee 100644
--- a/lib/formtastic/inputs/new_base/grouped_collections.rb
+++ b/lib/formtastic/inputs/new_base/grouped_collections.rb
@@ -20,9 +20,7 @@ def group_label_method_from_options
         end
       
         def group_label_method_from_grouped_collection
-          :id
-          # TODO there's a bug in this that's returning an unexpected method_name
-          # label_and_value_method(raw_grouped_collection).first
+          label_and_value_method(raw_grouped_collection, true).first
         end
       
         def group_association

From 7b751af586153904acd903e3daec5a245b51cd34 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 17 Mar 2011 08:21:07 +1100
Subject: [PATCH 594/992] change mongoid select spec to use a foreign key for
 which the model already responds to (otherwise i'll need to stub it for the
 next tests to pass)

---
 spec/inputs/select_input_spec.rb | 3 ++-
 spec/spec_helper.rb              | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 4cfa1bc03..6b444c489 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -41,7 +41,8 @@
       
       it 'should draw select options' do
         output_buffer.should have_tag('form li select')
-        output_buffer.should have_tag('form li select#post_custom_reviewer_id')
+        output_buffer.should have_tag('form li select#post_reviewer_id')
+        output_buffer.should_not have_tag('form li select#post_mongoid_reviewer_id')
       end
     end
   
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 915e8d790..51e2961ae 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -214,7 +214,7 @@ def new_author_path; "/authors/new"; end
       when :main_post
         mock('reflection', :options => {}, :klass => ::Post, :macro => :belongs_to)
       when :mongoid_reviewer
-        mock('reflection', :options => {}, :klass => ::Author, :macro => :referenced_in, :foreign_key => "custom_reviewer_id")
+        mock('reflection', :options => {}, :klass => ::Author, :macro => :referenced_in, :foreign_key => "reviewer_id") # custom id
       end
 
     end

From 0fed844447b8cacc8dbd06b86de40cd9fe42ade6 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 17 Mar 2011 08:21:44 +1100
Subject: [PATCH 595/992] use input_name instead of method in builder.select to
 get the options correctly selected in associations

---
 lib/formtastic/inputs/select_input.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index 5211c59b7..935847b63 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -157,7 +157,7 @@ def select_html_or_grouped_select_html
       end
       
       def select_html
-        builder.select(method, collection, input_options, input_html_options)
+        builder.select(input_name, collection, input_options, input_html_options)
       end
       
       def include_blank?

From 3d055c21e9653665cd7e7b3be5af09805ec68347 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 17 Mar 2011 17:29:36 +1100
Subject: [PATCH 596/992] Refactoring SelectInput

* cleaner input_html_options merge
* correct priority merging input_options
* don't add include_blank to input_html_options
---
 lib/formtastic/inputs/select_input.rb | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index 935847b63..c19e67263 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -186,17 +186,18 @@ def input_dom_id
       end
       
       def input_options
-        out = super
-        out = out.merge(:include_blank => include_blank?)
-        out
+        {:include_blank => include_blank?}.merge(super)
       end
       
       def input_html_options
-        out = super
-        out = out.merge(:multiple => multiple_by_association?) unless out.key?(:multiple)
-        out = out.merge(:name => "#{object_name}[#{association_primary_key}]") unless out.key?(:named)
-        out = out.merge(:include_blank => include_blank?)
-        out
+        extra_input_html_options.merge(super)
+      end
+      
+      def extra_input_html_options
+        {
+          :multiple => multiple_by_association?,
+          :name => "#{object_name}[#{association_primary_key}]"
+        }
       end
       
       def multiple_by_association?

From 6ba7215b0f036bd3d673405cdb1deb4849aae886 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 17 Mar 2011 17:32:45 +1100
Subject: [PATCH 597/992] remove the select_html_or_grouped_select_html method,
 too far

---
 lib/formtastic/inputs/select_input.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index c19e67263..028e2a8b8 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -144,7 +144,7 @@ class SelectInput
       def to_html
         input_wrapping do
           builder.label(method, label_html_options) <<
-          select_html_or_grouped_select_html
+          (options[:group_by] ? grouped_select_html : select_html)
         end
       end
       
@@ -152,10 +152,6 @@ def label_html_options
         super.merge(:for => input_html_options[:id])
       end
       
-      def select_html_or_grouped_select_html
-        options[:group_by] ? grouped_select_html : select_html
-      end
-      
       def select_html
         builder.select(input_name, collection, input_options, input_html_options)
       end

From de7f69cc20045bd680da4ced555040dd2ec9f333 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 17 Mar 2011 17:35:20 +1100
Subject: [PATCH 598/992] shift method order around

---
 lib/formtastic/inputs/select_input.rb | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index 028e2a8b8..b516822d7 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -148,21 +148,10 @@ def to_html
         end
       end
       
-      def label_html_options
-        super.merge(:for => input_html_options[:id])
-      end
-      
       def select_html
         builder.select(input_name, collection, input_options, input_html_options)
       end
       
-      def include_blank?
-        return options[:prompt] if options.key?(:prompt)
-        return options[:include_blank] if options.key?(:include_blank)
-        return true if (single? && builder.include_blank_for_select_by_default)
-        false
-      end
-      
       def grouped_select_html
         builder.grouped_collection_select(
           input_name, 
@@ -176,6 +165,17 @@ def grouped_select_html
         )
       end
       
+      def include_blank?
+        return options[:prompt] if options.key?(:prompt)
+        return options[:include_blank] if options.key?(:include_blank)
+        return true if (single? && builder.include_blank_for_select_by_default)
+        false
+      end
+
+      def label_html_options
+        super.merge(:for => input_html_options[:id])
+      end
+      
       def input_dom_id
         return "#{object_name}_#{association_primary_key}" if belongs_to?
         super

From b9bb864548cc0327b040e944d33d7c9e20ffbefc Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 17 Mar 2011 21:23:54 +1100
Subject: [PATCH 599/992] ensure Collections can be used without
 GroupedCollections

---
 lib/formtastic/inputs/new_base/collections.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/new_base/collections.rb b/lib/formtastic/inputs/new_base/collections.rb
index f2338d6c7..4d80edc43 100644
--- a/lib/formtastic/inputs/new_base/collections.rb
+++ b/lib/formtastic/inputs/new_base/collections.rb
@@ -63,7 +63,7 @@ def collection_from_association
                 conditions_from_reflection.merge(conditions_from_options)
               )
             else
-              find_options_from_options.merge!(:include => group_by) if group_by
+              find_options_from_options.merge!(:include => group_by) if self.respond_to?(:group_by) && group_by
               reflection.klass.where(conditions_from_reflection.merge(find_options_from_options))
             end
           end

From aee41a965ac49e275fb96ed37cd6c2c2a2bafbfa Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 17 Mar 2011 21:26:09 +1100
Subject: [PATCH 600/992] implemented RadioInput off NewBase (i18n label specs
 aren't passing yet)

---
 lib/formtastic/form_builder.rb          |  1 -
 lib/formtastic/helpers/inputs_helper.rb |  2 +-
 lib/formtastic/inputs/radio_input.rb    | 91 ++++++++++++++++---------
 3 files changed, 61 insertions(+), 33 deletions(-)

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 389d96980..8f8d15e34 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -69,7 +69,6 @@ def self.configure(name, value = nil)
     include Formtastic::Helpers::ErrorsHelper
 
     include Formtastic::Inputs::CheckBoxesInput
-    include Formtastic::Inputs::RadioInput
     
   end
   
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 8aa7f01ff..6798792b4 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -247,7 +247,7 @@ def input(method, options = {})
         
         options[:as]     ||= default_input_type(method, options)
 
-        [:string, :country, :boolean, :time_zone, :date, :datetime, :time, :select, :phone, :search, :numeric, :email, :file, :hidden, :password, :text, :url].each do |i|
+        [:string, :country, :boolean, :time_zone, :date, :datetime, :time, :select, :phone, :search, :numeric, :email, :file, :hidden, :password, :text, :url, :radio].each do |i|
           klass = "Formtastic::Inputs::#{options[:as].to_s.camelize}Input".constantize
           return klass.new(self, template, @object, @object_name, method, options).to_html if options[:as] == i
         end
diff --git a/lib/formtastic/inputs/radio_input.rb b/lib/formtastic/inputs/radio_input.rb
index d7aaa0bbf..29353be63 100644
--- a/lib/formtastic/inputs/radio_input.rb
+++ b/lib/formtastic/inputs/radio_input.rb
@@ -1,3 +1,6 @@
+require 'inputs/new_base'
+require 'inputs/new_base/collections'
+
 module Formtastic
   module Inputs
     
@@ -105,41 +108,67 @@ module Inputs
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     # @see Formtastic::Inputs::Select RadioInput as an alternative for `belongs_to` associations
-    module RadioInput
-      include Formtastic::Inputs::Base
+    class RadioInput
+      include NewBase
+      include NewBase::Collections
       
-      # 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 = []
-  
-        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[:id] = input_id
-  
-          li_content = template.content_tag(:label,
-            Formtastic::Util.html_safe("#{radio_button(input_name, value, html_options)} #{escape_html_entities(label)}"),
-            :for => input_id
+      def to_html
+        input_wrapping do
+          template.content_tag(:fieldset,
+            legend_html <<
+            template.content_tag(:ol,
+              collection.map { |choice| 
+
+                label = choice.is_a?(Array) ? choice.first : choice
+                value = choice.is_a?(Array) ? choice.last : choice
+
+                html_safe_value = value.to_s.gsub(/\s/, '_').gsub(/\W/, '').downcase
+                radio_input_id = "#{sanitized_object_name}_#{input_name}_#{html_safe_value}"
+                radio_input_id = "#{builder.custom_namespace}_#{radio_input_id}" unless builder.custom_namespace.blank?
+                
+                template.content_tag(:li, 
+                  template.content_tag(:label,
+                    builder.radio_button(input_name, value, input_html_options.merge(:id => radio_input_id)) << label,
+                    :for => radio_input_id
+                  ),
+                  :class => (value_as_class? ? "#{sanitized_method_name}_#{html_safe_value}" : nil)
+                ) 
+              }.join.html_safe
+            )
           )
-  
-          li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
-          template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
         end
-  
-        template.content_tag(:fieldset,
-          legend_tag(method, options) << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
-        )
       end
+
+      def value_as_class?
+        options[:value_as_class]
+      end
+      
+      def legend_html
+        if options[:label] == false
+          ""
+        else
+          template.content_tag(:legend,
+            template.content_tag(:label, label_text, label_html_options),
+            :class => "label"
+          )
+        end
+      end
+      
+      # Override to remove the for attribute since this isn't associated with any element, as it's
+      # nested inside the legend.
+      def label_html_options
+        super.merge(:for => nil)
+      end
+      
+      # TODO move to NewBase
+      # TODO i18n
+      # abbr tag from config
+      def label_text
+        text = method.to_s.humanize
+        text << template.content_tag(:abbr, "*")
+        text.html_safe
+      end
+            
     end
   end
 end
\ No newline at end of file

From 4a2cc5905bfd84e9166f4541a38b1554903270b8 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 18 Mar 2011 07:47:25 +1100
Subject: [PATCH 601/992] i18n specs on radio input are passing, but I've
 noticed heaps of other inputs are now broken

---
 lib/formtastic/inputs/new_base/html.rb   |  2 +-
 lib/formtastic/inputs/new_base/naming.rb |  8 +++++++
 lib/formtastic/inputs/radio_input.rb     | 27 ++++++++++++++++++------
 lib/formtastic/localized_string.rb       | 19 +++++++++++++++++
 4 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/lib/formtastic/inputs/new_base/html.rb b/lib/formtastic/inputs/new_base/html.rb
index 20de1b21c..99a3fe4fc 100644
--- a/lib/formtastic/inputs/new_base/html.rb
+++ b/lib/formtastic/inputs/new_base/html.rb
@@ -5,7 +5,7 @@ module Html
   
         def to_html
           input_wrapping do
-            builder.label(method, label_html_options) <<
+            builder.label(input_name, label_text, label_html_options) <<
             builder.text_field(method, input_html_options)
           end
         end
diff --git a/lib/formtastic/inputs/new_base/naming.rb b/lib/formtastic/inputs/new_base/naming.rb
index 73abef62d..1664f16ac 100644
--- a/lib/formtastic/inputs/new_base/naming.rb
+++ b/lib/formtastic/inputs/new_base/naming.rb
@@ -18,6 +18,14 @@ def sanitized_method_name
         def attributized_method_name
           method.to_s.gsub(/_id$/, '').to_sym
         end
+        
+        def humanized_method_name
+          if object && object.class.respond_to?(:human_attribute_name)
+            object.class.human_attribute_name(method.to_s)
+          else
+            method.to_s.send(builder.label_str_method)
+          end
+        end
       
       end
     end
diff --git a/lib/formtastic/inputs/radio_input.rb b/lib/formtastic/inputs/radio_input.rb
index 29353be63..f47e599fc 100644
--- a/lib/formtastic/inputs/radio_input.rb
+++ b/lib/formtastic/inputs/radio_input.rb
@@ -111,6 +111,7 @@ module Inputs
     class RadioInput
       include NewBase
       include NewBase::Collections
+      include Formtastic::LocalizedString
       
       def to_html
         input_wrapping do
@@ -160,15 +161,27 @@ def label_html_options
         super.merge(:for => nil)
       end
       
-      # TODO move to NewBase
-      # TODO i18n
-      # abbr tag from config
+      # TODO move labeling to NewBase
       def label_text
-        text = method.to_s.humanize
-        text << template.content_tag(:abbr, "*")
-        text.html_safe
+        ((localized_label || humanized_method_name) << required_or_optional_string).html_safe
       end
-            
+      
+      def required_or_optional_string
+        case required?
+          when true then builder.required_string.call
+          when false then builder.optional_string.call
+          else options[:required] # TODO why?
+        end
+      end
+      
+      def label_from_options
+        options[:label]
+      end
+      
+      def localized_label
+        localized_string(method, label_from_options, :label)
+      end
+      
     end
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/localized_string.rb b/lib/formtastic/localized_string.rb
index 6223adf69..6662c31f6 100644
--- a/lib/formtastic/localized_string.rb
+++ b/lib/formtastic/localized_string.rb
@@ -80,5 +80,24 @@ def normalize_model_name(name)
       end
     end
     
+    # TODO: Temporarily make this work when included inside an Input instead of FormBuilder
+    def escape_html_entities(string) #:nodoc:
+      if builder
+        if builder.escape_html_entities_in_hints_and_labels
+          # Acceppt html_safe flag as indicator to skip escaping
+          string = template.escape_once(string) unless string.respond_to?(:html_safe?) && string.html_safe? == true
+        end
+        string
+      else
+        super
+      end
+    end
+    
+    # TODO: Temporarily make this work when included inside an Input instead of FormBuilder
+    def i18n_lookups_by_default
+      respond_to?(:builder) ? builder.i18n_lookups_by_default : super
+    end
+    
+    
   end
 end
\ No newline at end of file

From bd81cc7410acfaa2ec29b413747b1c55940eafc8 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 18 Mar 2011 19:05:53 +1100
Subject: [PATCH 602/992] Added a rspec:inputs task for testing just the inputs
 that I'm focusing on right now.

---
 Rakefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Rakefile b/Rakefile
index 050b3655f..f33048e32 100644
--- a/Rakefile
+++ b/Rakefile
@@ -21,6 +21,11 @@ RSpec::Core::RakeTask.new('spec') do |t|
   t.pattern = FileList['spec/**/*_spec.rb']
 end
 
+desc 'Test the formtastic inputs.'
+RSpec::Core::RakeTask.new('spec:inputs') do |t|
+  t.pattern = FileList['spec/inputs/*_spec.rb'] - ["spec/inputs/check_boxes_input_spec.rb"]
+end
+
 desc 'Test the formtastic plugin with specdoc formatting and colors'
 RSpec::Core::RakeTask.new('specdoc') do |t|
   t.pattern = FileList['spec/**/*_spec.rb']

From 5a4fcadd1ba71a3eb0b6d4d42100da6c97039250 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 18 Mar 2011 19:11:16 +1100
Subject: [PATCH 603/992] extract labelling logic out to Labelling module for
 more inputs to share, make more tests pass again

---
 lib/formtastic/inputs/new_base.rb             |  4 ++-
 lib/formtastic/inputs/new_base/collections.rb | 15 ---------
 lib/formtastic/inputs/new_base/html.rb        |  2 +-
 lib/formtastic/inputs/new_base/labelling.rb   | 31 +++++++++++++++++++
 lib/formtastic/inputs/new_base/naming.rb      | 16 ++++++++++
 lib/formtastic/inputs/radio_input.rb          | 22 -------------
 6 files changed, 51 insertions(+), 39 deletions(-)
 create mode 100644 lib/formtastic/inputs/new_base/labelling.rb

diff --git a/lib/formtastic/inputs/new_base.rb b/lib/formtastic/inputs/new_base.rb
index d0f0f9f64..bf8a16a12 100644
--- a/lib/formtastic/inputs/new_base.rb
+++ b/lib/formtastic/inputs/new_base.rb
@@ -7,6 +7,7 @@
 require 'inputs/new_base/database'
 require 'inputs/new_base/options'
 require 'inputs/new_base/html'
+require 'inputs/new_base/labelling'
 
 module Formtastic
   module Inputs
@@ -32,7 +33,8 @@ def initialize(builder, template, object, object_name, method, options)
       include Validations
       include Fileish
       include Associations
-
+      include Labelling
+      
     end
   end
 end
diff --git a/lib/formtastic/inputs/new_base/collections.rb b/lib/formtastic/inputs/new_base/collections.rb
index 4d80edc43..456585eb5 100644
--- a/lib/formtastic/inputs/new_base/collections.rb
+++ b/lib/formtastic/inputs/new_base/collections.rb
@@ -86,21 +86,6 @@ def send_or_call(duck, object)
           end
         end
       
-        # TODO this seems to overlap or be confused with association_primary_key
-        def input_name
-          if reflection
-            if [:has_and_belongs_to_many, :has_many].include?(reflection.macro)
-              "#{method.to_s.singularize}_ids"
-            elsif reflection.respond_to? :foreign_key
-              reflection.foreign_key
-            else
-              reflection.options[:foreign_key] || "#{method}_id"
-            end
-          else
-            method
-          end.to_sym
-        end
-
       end
     end
   end
diff --git a/lib/formtastic/inputs/new_base/html.rb b/lib/formtastic/inputs/new_base/html.rb
index 99a3fe4fc..08e3bb869 100644
--- a/lib/formtastic/inputs/new_base/html.rb
+++ b/lib/formtastic/inputs/new_base/html.rb
@@ -95,7 +95,7 @@ def dom_id
         end
         
         def wrapper_dom_id
-          "#{dom_id.to_s.gsub(association_primary_key.to_s, sanitized_method_name.to_s)}_input"
+          @wrapper_dom_id ||= "#{dom_id.to_s.gsub((association_primary_key || method).to_s, sanitized_method_name.to_s)}_input"
         end
         
         def dom_index
diff --git a/lib/formtastic/inputs/new_base/labelling.rb b/lib/formtastic/inputs/new_base/labelling.rb
new file mode 100644
index 000000000..01713f421
--- /dev/null
+++ b/lib/formtastic/inputs/new_base/labelling.rb
@@ -0,0 +1,31 @@
+module Formtastic
+  module Inputs
+    module NewBase
+      module Labelling
+        
+        include Formtastic::LocalizedString
+        
+        def label_text
+          ((localized_label || humanized_method_name) << required_or_optional_string).html_safe
+        end
+
+        def required_or_optional_string
+          case required?
+            when true then builder.required_string.call
+            when false then builder.optional_string.call
+            else options[:required] # TODO why?
+          end
+        end
+
+        def label_from_options
+          options[:label]
+        end
+
+        def localized_label
+          localized_string(method, label_from_options, :label)
+        end
+        
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/new_base/naming.rb b/lib/formtastic/inputs/new_base/naming.rb
index 1664f16ac..9d4f578ea 100644
--- a/lib/formtastic/inputs/new_base/naming.rb
+++ b/lib/formtastic/inputs/new_base/naming.rb
@@ -26,6 +26,22 @@ def humanized_method_name
             method.to_s.send(builder.label_str_method)
           end
         end
+        
+        # TODO this seems to overlap or be confused with association_primary_key
+        def input_name
+          if reflection
+            if [:has_and_belongs_to_many, :has_many].include?(reflection.macro)
+              "#{method.to_s.singularize}_ids"
+            elsif reflection.respond_to? :foreign_key
+              reflection.foreign_key
+            else
+              reflection.options[:foreign_key] || "#{method}_id"
+            end
+          else
+            method
+          end.to_sym
+        end
+        
       
       end
     end
diff --git a/lib/formtastic/inputs/radio_input.rb b/lib/formtastic/inputs/radio_input.rb
index f47e599fc..a7ef7e63b 100644
--- a/lib/formtastic/inputs/radio_input.rb
+++ b/lib/formtastic/inputs/radio_input.rb
@@ -111,7 +111,6 @@ module Inputs
     class RadioInput
       include NewBase
       include NewBase::Collections
-      include Formtastic::LocalizedString
       
       def to_html
         input_wrapping do
@@ -161,27 +160,6 @@ def label_html_options
         super.merge(:for => nil)
       end
       
-      # TODO move labeling to NewBase
-      def label_text
-        ((localized_label || humanized_method_name) << required_or_optional_string).html_safe
-      end
-      
-      def required_or_optional_string
-        case required?
-          when true then builder.required_string.call
-          when false then builder.optional_string.call
-          else options[:required] # TODO why?
-        end
-      end
-      
-      def label_from_options
-        options[:label]
-      end
-      
-      def localized_label
-        localized_string(method, label_from_options, :label)
-      end
-      
     end
   end
 end
\ No newline at end of file

From 8be4fee8c3e6a379ec9d9eaa559f47283f2a9209 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 18 Mar 2011 19:11:46 +1100
Subject: [PATCH 604/992] memoizing

---
 lib/formtastic/inputs/new_base/naming.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/new_base/naming.rb b/lib/formtastic/inputs/new_base/naming.rb
index 9d4f578ea..458f1a26f 100644
--- a/lib/formtastic/inputs/new_base/naming.rb
+++ b/lib/formtastic/inputs/new_base/naming.rb
@@ -12,7 +12,7 @@ def sanitized_object_name
         end
 
         def sanitized_method_name
-          method.to_s.gsub(/[\?\/\-]$/, '')
+          @sanitized_method_name ||= method.to_s.gsub(/[\?\/\-]$/, '')
         end
 
         def attributized_method_name

From bafd98bc4af65a2e2a3a8ffca3e3dc99cb4d37ba Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 18 Mar 2011 19:40:15 +1100
Subject: [PATCH 605/992] special case for input_html[:id] on hidden input, NFI
 why... all inputs pass except check_boxes

---
 lib/formtastic/inputs/hidden_input.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/formtastic/inputs/hidden_input.rb b/lib/formtastic/inputs/hidden_input.rb
index b8f540dd2..36d1a7585 100644
--- a/lib/formtastic/inputs/hidden_input.rb
+++ b/lib/formtastic/inputs/hidden_input.rb
@@ -34,6 +34,7 @@ class HiddenInput
       include NewBase
       
       def input_html_options
+        super[:id] = super[:id].gsub(/_id$/, '') # TODO: special case because we seem to test hidden input differently
         return {:value => options[:value]}.merge(super) if options.key?(:value)
         super
       end

From 10b7d3a972704cce3834326e6f985d1b6f13e3fd Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 18 Mar 2011 19:41:23 +1100
Subject: [PATCH 606/992] include check_boxes in inputs spec rake task

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index f33048e32..b8a3b0a80 100644
--- a/Rakefile
+++ b/Rakefile
@@ -23,7 +23,7 @@ end
 
 desc 'Test the formtastic inputs.'
 RSpec::Core::RakeTask.new('spec:inputs') do |t|
-  t.pattern = FileList['spec/inputs/*_spec.rb'] - ["spec/inputs/check_boxes_input_spec.rb"]
+  t.pattern = FileList['spec/inputs/*_spec.rb']
 end
 
 desc 'Test the formtastic plugin with specdoc formatting and colors'

From fa945ec27bf556f1822c94b290de3bb832c728e8 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 18 Mar 2011 22:12:53 +1100
Subject: [PATCH 607/992] upgrade to rspec 2.5

---
 formtastic.gemspec               | 2 +-
 spec/support/test_environment.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 250b56daf..5ae51d55e 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency(%q<rails>, ["~> 3.0.0"])
 
-  s.add_development_dependency(%q<rspec-rails>, ["~> 2.0.0"])
+  s.add_development_dependency(%q<rspec-rails>, ["~> 2.5"])
   s.add_development_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])
   s.add_development_dependency(%q<hpricot>, ["~> 0.8.3"])
   s.add_development_dependency(%q<BlueCloth>) # for YARD
diff --git a/spec/support/test_environment.rb b/spec/support/test_environment.rb
index 7d77d7afa..3d4aa2ddf 100644
--- a/spec/support/test_environment.rb
+++ b/spec/support/test_environment.rb
@@ -25,5 +25,5 @@ class Application < Rails::Application
 
 # Quick hack to avoid the 'Spec' deprecation warnings from rspec_tag_matchers
 module Spec
-  include Rspec
+  include RSpec
 end

From 094c7fc435bcf5b1112e2ec38fdb6c6bace17f85 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 21 Mar 2011 06:31:37 +1100
Subject: [PATCH 608/992] implemented CheckBoxesInput off NewBase

---
 lib/formtastic/form_builder.rb             |   4 -
 lib/formtastic/helpers/inputs_helper.rb    |   2 +-
 lib/formtastic/helpers/label_helper.rb     | 109 -------------
 lib/formtastic/inputs/check_boxes_input.rb | 175 +++++++++++++--------
 lib/formtastic/inputs/new_base/hints.rb    |   2 +-
 spec/inputs/check_boxes_input_spec.rb      |   2 +-
 6 files changed, 109 insertions(+), 185 deletions(-)
 delete mode 100644 lib/formtastic/helpers/label_helper.rb

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 8f8d15e34..fe1e592b0 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -4,7 +4,6 @@
 
 require 'helpers/inputs_helper'
 require 'helpers/buttons_helper'
-require 'helpers/label_helper'
 require 'helpers/errors_helper'
 
 require 'inputs/boolean_input'
@@ -65,10 +64,7 @@ def self.configure(name, value = nil)
     
     include Formtastic::Helpers::InputsHelper
     include Formtastic::Helpers::ButtonsHelper
-    include Formtastic::Helpers::LabelHelper
     include Formtastic::Helpers::ErrorsHelper
-
-    include Formtastic::Inputs::CheckBoxesInput
     
   end
   
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 6798792b4..516a0e891 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -247,7 +247,7 @@ def input(method, options = {})
         
         options[:as]     ||= default_input_type(method, options)
 
-        [:string, :country, :boolean, :time_zone, :date, :datetime, :time, :select, :phone, :search, :numeric, :email, :file, :hidden, :password, :text, :url, :radio].each do |i|
+        [:check_boxes, :string, :country, :boolean, :time_zone, :date, :datetime, :time, :select, :phone, :search, :numeric, :email, :file, :hidden, :password, :text, :url, :radio].each do |i|
           klass = "Formtastic::Inputs::#{options[:as].to_s.camelize}Input".constantize
           return klass.new(self, template, @object, @object_name, method, options).to_html if options[:as] == i
         end
diff --git a/lib/formtastic/helpers/label_helper.rb b/lib/formtastic/helpers/label_helper.rb
deleted file mode 100644
index 4c1c96282..000000000
--- a/lib/formtastic/helpers/label_helper.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-require 'localized_string'
-
-module Formtastic
-  module Helpers
-    module LabelHelper
-      include Formtastic::LocalizedString
-      
-      # Generates the label for the input. It's a superset of the functionality of Rails' own `label`
-      # helper, meaning that it accepts the same arguments and options, plus some new arguments that
-      # are exclusive to Formtastic.
-      #
-      # It's unlikely you will need call this method direct from your views, but it's been made 
-      # public to document the changes made to the Rails method, for the rare occasions when you 
-      # might build your own input in the view using regular form helpers.
-      #
-      # @param [Symbol] method
-      #   The method or attribute on the model this label is for (eg `:title` on a `Post`)
-      #
-      # @param [String, Hash] options_or_text
-      #   A string for the text to appear as the content of the `<label>` tag, or a Hash of options (see below)
-      #
-      # @param [Hash] options
-      #   A Hash of options (see below)
-      #
-      # @option options [String] :label
-      #   Override the text for the contents of the `<label>` tag
-      #
-      # @option options [true, false] :required
-      #   Specify if the field required or not. By default this value is "guessed" by reflecting on 
-      #   the model validations, with a fallback to `all_fields_required_by_default` configuration. 
-      #   Required and optional labels have the `required_string` (defaults to an asterix wrapped 
-      #   in an `<abbr>` tag) or `optional_string` configuration variables appended to them.
-      #
-      # @option options [Symbol] :input_name
-      #   Gives the input to match for. This is needed when you want to call `f.label :authors` but 
-      #   it should match `:author_ids`.
-      #
-      #
-      # @example Basic usage, just like Rails (except that it searches i18n for the label text too)
-      #   <%= semantic_form_for @post do |f| %>
-      #     <%= f.label :title %>
-      #   <% end %>
-      #
-      # @example Basic usage with string for label text, just like Rails
-      #   <%= semantic_form_for @post do |f| %>
-      #     <%= f.label :title, "Your title" %>
-      #   <% end %>
-      #
-      # @example Alternative for label text using `:label` option to match the rest of the Formtastic API
-      #   <%= semantic_form_for @post do |f| %>
-      #     <%= f.label :title, :label => "Your title" %>
-      #   <% end %>
-      #
-      # @example Mark the label as required or not, regardless of DB, validations and default config.
-      #   <%= semantic_form_for @post do |f| %>
-      #     <%= f.label :title, :required => true %>
-      #     <%= f.label :body, :required => false %>
-      #   <% end %>
-      #
-      #
-      # @todo i18n documentation
-      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_string(method, text, :label) || humanized_attribute_name(method)
-        text += required_or_optional_string(options.delete(:required))
-        text = Formtastic::Util.html_safe(text)
-      
-        # special case for boolean (checkbox) labels, which have a nested input
-        if options.key?(:label_prefix_for_nested_input)
-          text = options.delete(:label_prefix_for_nested_input) + text
-        end
-      
-        input_name = options.delete(:input_name) || method
-        super(input_name, text, options)
-      end
-      
-      protected
-      
-      # 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
-  
-        if string_or_proc.is_a?(Proc)
-          string_or_proc.call
-        else
-          string_or_proc.to_s
-        end
-      end
-      
-    end
-  end
-end
diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index c5fa81fda..f3d3f217e 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -1,4 +1,5 @@
-require 'inputs/base'
+require 'inputs/new_base'
+require 'inputs/new_base/collections'
 
 module Formtastic
   module Inputs
@@ -69,90 +70,126 @@ module Inputs
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     # @see Formtastic::Inputs::BooleanInput BooleanInput for a single checkbox for boolean (checked = true) inputs
-    module CheckBoxesInput
-      include Formtastic::Inputs::Base
+    class CheckBoxesInput
+      include NewBase
+      include NewBase::Collections
       
-      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)
-        hidden_fields   = options.delete(:hidden_fields)
-        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_values = find_selected_values_for_column(method, options)
-        disabled_option_is_present = options.key?(:disabled)
-        disabled_values = [*options[:disabled]] if disabled_option_is_present
-  
-        li_options = value_as_class ? { :class => [method.to_s.singularize, 'default'].join('_') } : {}
-  
-        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)
-          html_options[:disabled] = disabled_values.include?(value) if disabled_option_is_present
-          html_options[:id] = input_id
-  
-          li_content = template.content_tag(:label,
-            Formtastic::Util.html_safe("#{create_check_boxes(input_name, html_options, value, unchecked_value, hidden_fields)} #{escape_html_entities(label)}"),
-            :for => input_id
+      def to_html
+        input_wrapping do
+          template.content_tag(:fieldset, 
+            legend_html <<
+            hidden_field_for_all <<
+            template.content_tag(:ol,
+              collection.map { |choice|
+                
+                check_box_label = choice.is_a?(Array) ? choice.first : choice
+                check_box_value = choice.is_a?(Array) ? choice.last : choice
+                
+                html_safe_value = check_box_value.to_s.gsub(/\s/, '_').gsub(/\W/, '').downcase
+                check_box_input_id = "#{sanitized_object_name}_#{association_primary_key || method}_#{html_safe_value}"
+                check_box_input_id = "#{builder.custom_namespace}_#{check_box_input_id}" unless builder.custom_namespace.blank?
+                
+                template.content_tag(:li,
+                  template.content_tag(:label,
+                    hidden_fields? ? 
+                      check_box_with_hidden_input(check_box_value, check_box_input_id) : 
+                      check_box_without_hidden_input(check_box_value, check_box_input_id) <<
+                    check_box_label,
+                    label_html_options.merge(:for => check_box_input_id)
+                  ),
+                  :class => value_as_class? ? "#{sanitized_method_name.singularize}_#{html_safe_value}" : ''
+                )
+              }.join("\n").html_safe
+            )
           )
-  
-          li_options = value_as_class ? { :class => [method.to_s.singularize, value.to_s.downcase].join('_') } : {}
-          template.content_tag(:li, Formtastic::Util.html_safe(li_content), li_options)
         end
-  
-        fieldset_content = legend_tag(method, options)
-        fieldset_content << create_hidden_field_for_check_boxes(input_name, value_as_class) unless hidden_fields
-        fieldset_content << template.content_tag(:ol, Formtastic::Util.html_safe(list_item_content.join))
-        template.content_tag(:fieldset, fieldset_content)
       end
       
-      protected
+      def hidden_field_for_all
+        if hidden_fields?
+          ""
+        else
+          options = {}
+          options[:class] = [method.to_s.singularize, 'default'].join('_') if value_as_class?
+          options[:id] = [object_name, method, 'none'].join('_')
+          template.hidden_field_tag(input_name, '', options)
+        end
+      end
       
-      # Used by check_boxes input. The selected values will be set by retrieving the value
-      # through the association.
-      #
-      # If the collection is not a hash or an array of strings, fixnums or symbols,
-      # we use value_method to retrieve an array with the values
-      def find_selected_values_for_column(method, options)
-        if object.respond_to?(method)
-          collection = [object.send(method)].compact.flatten
-          label, value = detect_label_and_value_method!(collection, options)
-          [*collection.map { |o| send_or_call(value, o) }].compact
+      def legend_html
+        if options[:label] == false
+          ""
         else
-          []
+          template.content_tag(:legend,
+            template.content_tag(:label, label_text),
+            label_html_options.merge(:class => "label")
+          )
         end
       end
       
-      # Outputs a custom hidden field for check_boxes
-      def create_hidden_field_for_check_boxes(method, value_as_class) #:nodoc:
-        options = value_as_class ? { :class => [method.to_s.singularize, 'default'].join('_') } : {}
-        input_name = "#{object_name}[#{method.to_s}][]"
-        template.hidden_field_tag(input_name, '', options)
+      def value_as_class?
+        options[:value_as_class]
+      end
+      
+      def hidden_fields?
+        options[:hidden_fields]
+      end
+      
+      def check_box_with_hidden_input(value, check_box_input_id)
+        builder.check_box(
+          association_primary_key || method, 
+          input_html_options.merge(:id => check_box_input_id, :name => input_name, :disabled => disabled?(value)), 
+          value, 
+          unchecked_value
+        )
       end
-  
-      # Outputs a checkbox tag. If called with hidden_fields = true a plain check_box_tag is returned,
-      # otherwise the helper uses the output generated by the rails check_box method.
-      def create_check_boxes(input_name, html_options = {}, checked_value = "1", unchecked_value = "0", hidden_fields = false) #:nodoc:
-        return template.check_box_tag(input_name, checked_value, html_options[:checked], html_options) unless hidden_fields == true
-        check_box(input_name, html_options, checked_value, unchecked_value)
+      
+      def check_box_without_hidden_input(value, check_box_input_id)
+        template.check_box_tag(
+          input_name, 
+          value, 
+          checked?(value), 
+          input_html_options.merge(:id => check_box_input_id, :disabled => disabled?(value))
+        ) 
       end
       
-      def send_or_call(duck, object)
-        if duck.is_a?(Proc)
-          duck.call(object)
+      def checked?(value)
+        selected_values.include?(value)
+      end
+      
+      def disabled?(value)
+        disabled_values.include?(value)
+      end
+      
+      def selected_values
+        if object.respond_to?(method)
+          selected_items = [object.send(method)].compact.flatten
+          [*selected_items.map { |o| send_or_call(value_method, o) }].compact
         else
-          object.send(duck)
+          []
         end
       end
-
+      
+      def disabled_values
+        vals = options[:disabled] || []
+        vals = [vals] unless vals.is_a?(Array)
+        vals
+      end
+      
+      def unchecked_value
+        options[:unchecked_value] || ''
+      end
+      
+      # Override to remove the for attribute since this isn't associated with any element, as it's
+      # nested inside the legend.
+      def label_html_options
+        super.merge(:for => nil)
+      end
+      
+      def input_name
+        "#{object_name}[#{association_primary_key || method}][]"
+      end
+      
     end
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/new_base/hints.rb b/lib/formtastic/inputs/new_base/hints.rb
index d5bf10b9c..418f573a3 100644
--- a/lib/formtastic/inputs/new_base/hints.rb
+++ b/lib/formtastic/inputs/new_base/hints.rb
@@ -8,7 +8,7 @@ def hint?
         end
 
         def hint
-          builder.send(:localized_string, method, options[:hint], :hint)
+          localized_string(method, options[:hint], :hint)
         end
 
       end
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index a251e55b9..6f1077259 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -332,7 +332,7 @@
         item.should_not_receive(:id)
         item.stub!(:custom_value).and_return('custom_value')
         item.should_receive(:custom_value).exactly(3).times
-        @new_post.author.should_receive(:custom_value)
+        @new_post.author.should_receive(:custom_value).exactly(3).times
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:author, :as => :check_boxes, :value_method => :custom_value, :collection => [item, item, item]))
         end)

From 309dbc34ac7a869431177afdd4cf3fa9402d9348 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 21 Mar 2011 06:32:19 +1100
Subject: [PATCH 609/992] quick TODO

---
 lib/formtastic/form_builder.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index fe1e592b0..c2176c247 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -6,6 +6,7 @@
 require 'helpers/buttons_helper'
 require 'helpers/errors_helper'
 
+# TODO are these required any more?
 require 'inputs/boolean_input'
 require 'inputs/check_boxes_input'
 require 'inputs/country_input'

From f1b4228461a9665929240025732cb77905936c08 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 21 Mar 2011 06:37:20 +1100
Subject: [PATCH 610/992] burn heaps of crap from InputsHelper

---
 lib/formtastic/helpers/inputs_helper.rb | 110 +-----------------------
 1 file changed, 2 insertions(+), 108 deletions(-)

diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 516a0e891..d36f20a76 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -251,29 +251,7 @@ def input(method, options = {})
           klass = "Formtastic::Inputs::#{options[:as].to_s.camelize}Input".constantize
           return klass.new(self, template, @object, @object_name, method, options).to_html if options[:as] == i
         end
-        
-        options[:required] = method_required?(method) unless options.key?(:required)
-    
-        html_class = [ options[:as], (options[:required] ? :required : :optional) ]
-        html_class << 'error' if has_errors?(method, options)
-    
-        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 options[:input_html] && options[:input_html][:id]
-          options[:label_html] ||= {}
-          options[:label_html][:for] ||= options[:input_html][:id]
-        end
-    
-        input_parts = (custom_inline_order[options[:as]] || inline_order).dup
-        input_parts = input_parts - [:errors, :hints] if options[:as] == :hidden
-    
-        list_item_content = input_parts.map do |type|
-          send(:"inline_#{type}_for", method, options)
-        end.compact.join("\n")
-    
-        return template.content_tag(:li, Formtastic::Util.html_safe(list_item_content), wrapper_html)
+      
       end
       
       # {#inputs} creates an input fieldset and ol tag wrapping for use around a set of inputs.  It can be
@@ -613,55 +591,6 @@ def inputs_for_nested_attributes(*args, &block) #:nodoc:
         semantic_fields_for(*fields_for_args, &fields_for_block)
       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), or the object is
-      #   an ActiveModel, 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 validates_presence_of can't be determined, the
-      #   configuration option all_fields_required_by_default is used.
-      def method_required?(attribute) #:nodoc:
-        attribute_sym = attribute.to_s.sub(/_id$/, '').to_sym
-  
-        if @object && @object.class.respond_to?(:reflect_on_validations_for)
-          @object.class.reflect_on_validations_for(attribute_sym).any? do |validation|
-            (validation.macro == :validates_presence_of || validation.macro == :validates_inclusion_of) &&
-            validation.name == attribute_sym &&
-            (validation.options.present? ? options_require_validation?(validation.options) : true)
-          end
-        else
-          if @object && @object.class.respond_to?(:validators_on)
-            !@object.class.validators_on(attribute_sym).find{|validator| (validator.kind == :presence || validator.kind == :inclusion) && (validator.options.present? ? options_require_validation?(validator.options) : true)}.nil?
-          else
-            all_fields_required_by_default
-          end
-        end
-      end
-      
-      # Determines whether the given options evaluate to true
-      def options_require_validation?(options) #nodoc
-        allow_blank = options[:allow_blank]
-        return !allow_blank unless allow_blank.nil?
-        if_condition = !options[:if].nil?
-        condition = if_condition ? options[:if] : options[:unless]
-  
-        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
-      
       # 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
@@ -711,42 +640,7 @@ def default_input_type(method, options = {}) #:nodoc:
       def column_for(method) #:nodoc:
         @object.column_for_attribute(method) if @object.respond_to?(:column_for_attribute)
       end
-      
-      # 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
-  
-      # 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? or options[:hint].kind_of? Hash
-        hint_class = options[:hint_class] || default_hint_class
-        template.content_tag(:p, Formtastic::Util.html_safe(options[:hint]), :class => hint_class)
-      end
-      
-      # Creates an error sentence by calling to_sentence on the errors array.
-      def error_sentence(errors, options = {}) #:nodoc:
-        error_class = options[:error_class] || default_inline_error_class
-        template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.untaint), :class => error_class)
-      end
-  
-      # Creates an error li list.
-      def error_list(errors, options = {}) #:nodoc:
-        error_class = options[:error_class] || default_error_list_class
-        list_elements = []
-        errors.each do |error|
-          list_elements <<  template.content_tag(:li, Formtastic::Util.html_safe(error.untaint))
-        end
-        template.content_tag(:ul, Formtastic::Util.html_safe(list_elements.join("\n")), :class => error_class)
-      end
-  
-      # Creates an error sentence containing only the first error
-      def error_first(errors, options = {}) #:nodoc:
-        error_class = options[:error_class] || default_inline_error_class
-        template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => error_class)
-      end
-      
+            
       def field_set_title_from_args(*args) #:nodoc:
         options = args.extract_options!
         options[:name] ||= options.delete(:title)

From 2d4c16c56b8c446aa41787d648fdbdfe198810a1 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 21 Mar 2011 06:43:11 +1100
Subject: [PATCH 611/992] burn some methods no longer used

---
 lib/formtastic/html_attributes.rb | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/lib/formtastic/html_attributes.rb b/lib/formtastic/html_attributes.rb
index 87a1fe3de..54842fd4b 100644
--- a/lib/formtastic/html_attributes.rb
+++ b/lib/formtastic/html_attributes.rb
@@ -4,31 +4,6 @@ module HtmlAttributes
     
     protected
     
-    # 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.
-    #
-    # For those of you wondering (like me), options is part of the fields_for
-    # and Builder scope, which is why you can't see it passed in as an arg.
-    def generate_html_id(method_name, value='input') #:nodoc:
-      index = if options.has_key?(:index)
-                options[:index]
-              elsif defined?(@auto_index)
-                @auto_index
-              else
-                ""
-              end
-      sanitized_method_name = method_name.to_s.gsub(/[\?\/\-]$/, '')
-
-      [custom_namespace, sanitized_object_name, index, sanitized_method_name, value].reject{|x|x.blank?}.join('_')
-    end
-    
-    # Used by FormBuilder generate_html_id
-    def sanitized_object_name #:nodoc:
-      @sanitized_object_name ||= @object_name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
-    end
-    
     def humanized_attribute_name(method)
       if @object && @object.class.respond_to?(:human_attribute_name)
         humanized_name = @object.class.human_attribute_name(method.to_s)

From ae34be15d4ae00a3559f32ef392be01478cf799f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 21 Mar 2011 07:27:07 +1100
Subject: [PATCH 612/992] BooleanInput passing again.

We've removed FormBuilder's hacky label with extra functionality, which means the BooleanInput label didn't work any more, now it does.
---
 lib/formtastic/inputs/boolean_input.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic/inputs/boolean_input.rb b/lib/formtastic/inputs/boolean_input.rb
index 3b47f2c46..dc74ba709 100644
--- a/lib/formtastic/inputs/boolean_input.rb
+++ b/lib/formtastic/inputs/boolean_input.rb
@@ -47,15 +47,19 @@ def hidden_field
       
       def label_with_nested_checkbox
         builder.label(
-          method, 
+          method,
+          label_text_with_embedded_checkbox, 
           input_html_options.merge(
             :id => nil,
-            :for => input_html_options[:id],
-            :label_prefix_for_nested_input => check_box # the label() method will insert this nested input into the label at the last minute
+            :for => input_html_options[:id]
           )
         )
       end
       
+      def label_text_with_embedded_checkbox
+        label_text << " " << check_box
+      end
+      
       def check_box
         template.check_box_tag("#{object_name}[#{method}]", checked_value, checked?, input_html_options)
       end

From 2e8b1f940f99925feed6d9a6c48f2a967fe95bb9 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 21 Mar 2011 07:31:56 +1100
Subject: [PATCH 613/992] correctly call builder.label with the method name AND
 the label text

---
 lib/formtastic/inputs/country_input.rb   | 2 +-
 lib/formtastic/inputs/email_input.rb     | 2 +-
 lib/formtastic/inputs/file_input.rb      | 2 +-
 lib/formtastic/inputs/numeric_input.rb   | 2 +-
 lib/formtastic/inputs/password_input.rb  | 2 +-
 lib/formtastic/inputs/phone_input.rb     | 2 +-
 lib/formtastic/inputs/search_input.rb    | 2 +-
 lib/formtastic/inputs/select_input.rb    | 2 +-
 lib/formtastic/inputs/text_input.rb      | 2 +-
 lib/formtastic/inputs/time_zone_input.rb | 2 +-
 lib/formtastic/inputs/url_input.rb       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/formtastic/inputs/country_input.rb b/lib/formtastic/inputs/country_input.rb
index 1d00e5c10..f1409d932 100644
--- a/lib/formtastic/inputs/country_input.rb
+++ b/lib/formtastic/inputs/country_input.rb
@@ -54,7 +54,7 @@ class CountryInput
       def to_html
         raise "To use the :country input, please install a country_select plugin, like this one: http://github.com/rails/iso-3166-country-select" unless builder.respond_to?(:country_select)
         input_wrapping do
-          builder.label(method, label_html_options) <<
+          builder.label(method, label_text, label_html_options) <<
           builder.country_select(method, priority_countries, input_options, input_html_options)
         end
       end
diff --git a/lib/formtastic/inputs/email_input.rb b/lib/formtastic/inputs/email_input.rb
index f95500a28..774e65e1e 100644
--- a/lib/formtastic/inputs/email_input.rb
+++ b/lib/formtastic/inputs/email_input.rb
@@ -35,7 +35,7 @@ class EmailInput
       
       def to_html
         input_wrapping do
-          builder.label(method, label_html_options) <<
+          builder.label(method, label_text, label_html_options) <<
           builder.email_field(method, input_html_options)
         end
       end
diff --git a/lib/formtastic/inputs/file_input.rb b/lib/formtastic/inputs/file_input.rb
index aa5a8afb9..ea164fd1a 100644
--- a/lib/formtastic/inputs/file_input.rb
+++ b/lib/formtastic/inputs/file_input.rb
@@ -35,7 +35,7 @@ class FileInput
       include NewBase
       def to_html
         input_wrapping do
-          builder.label(method, label_html_options) <<
+          builder.label(method, label_text, label_html_options) <<
           builder.file_field(method, input_html_options)
         end
       end
diff --git a/lib/formtastic/inputs/numeric_input.rb b/lib/formtastic/inputs/numeric_input.rb
index 1fba8a64e..4c2969e81 100644
--- a/lib/formtastic/inputs/numeric_input.rb
+++ b/lib/formtastic/inputs/numeric_input.rb
@@ -39,7 +39,7 @@ class NumericInput
       
       def to_html
         input_wrapping do
-          builder.label(method, label_html_options) <<
+          builder.label(method, label_text, label_html_options) <<
           builder.number_field(method, input_html_options)
         end
       end
diff --git a/lib/formtastic/inputs/password_input.rb b/lib/formtastic/inputs/password_input.rb
index 1e50725b7..81aa14681 100644
--- a/lib/formtastic/inputs/password_input.rb
+++ b/lib/formtastic/inputs/password_input.rb
@@ -34,7 +34,7 @@ class PasswordInput
       
       def to_html
         input_wrapping do
-          builder.label(method, label_html_options) <<
+          builder.label(method, label_text, label_html_options) <<
           builder.password_field(method, input_html_options)
         end
       end
diff --git a/lib/formtastic/inputs/phone_input.rb b/lib/formtastic/inputs/phone_input.rb
index 629d11e22..e511f4373 100644
--- a/lib/formtastic/inputs/phone_input.rb
+++ b/lib/formtastic/inputs/phone_input.rb
@@ -34,7 +34,7 @@ class PhoneInput
       
       def to_html
         input_wrapping do
-          builder.label(method, label_html_options) <<
+          builder.label(method, label_text, label_html_options) <<
           builder.phone_field(method, input_html_options)
         end
       end
diff --git a/lib/formtastic/inputs/search_input.rb b/lib/formtastic/inputs/search_input.rb
index 8908e8771..a878ba1e0 100644
--- a/lib/formtastic/inputs/search_input.rb
+++ b/lib/formtastic/inputs/search_input.rb
@@ -30,7 +30,7 @@ class SearchInput
       
       def to_html
         input_wrapping do
-          builder.label(method, label_html_options) <<
+          builder.label(method, label_text, label_html_options) <<
           builder.search_field(method, input_html_options)
         end
       end
diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index b516822d7..a474afed2 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -143,7 +143,7 @@ class SelectInput
       
       def to_html
         input_wrapping do
-          builder.label(method, label_html_options) <<
+          builder.label(method, label_text, label_html_options) <<
           (options[:group_by] ? grouped_select_html : select_html)
         end
       end
diff --git a/lib/formtastic/inputs/text_input.rb b/lib/formtastic/inputs/text_input.rb
index 4213a2f66..f33fd93d3 100644
--- a/lib/formtastic/inputs/text_input.rb
+++ b/lib/formtastic/inputs/text_input.rb
@@ -39,7 +39,7 @@ def input_html_options
       
       def to_html
         input_wrapping do
-          builder.label(method, label_html_options) <<
+          builder.label(method, label_text, label_html_options) <<
           builder.text_area(method, input_html_options)
         end
       end
diff --git a/lib/formtastic/inputs/time_zone_input.rb b/lib/formtastic/inputs/time_zone_input.rb
index dca67c68f..a05d520e4 100644
--- a/lib/formtastic/inputs/time_zone_input.rb
+++ b/lib/formtastic/inputs/time_zone_input.rb
@@ -37,7 +37,7 @@ class TimeZoneInput
 
       def to_html
         input_wrapping do
-          builder.label(method, label_html_options) <<
+          builder.label(method, label_text, label_html_options) <<
           builder.time_zone_select(method, priority_zones, input_options, input_html_options)
         end
       end
diff --git a/lib/formtastic/inputs/url_input.rb b/lib/formtastic/inputs/url_input.rb
index 00b2efd3f..69a1f9e1f 100644
--- a/lib/formtastic/inputs/url_input.rb
+++ b/lib/formtastic/inputs/url_input.rb
@@ -34,7 +34,7 @@ class UrlInput
       
       def to_html
         input_wrapping do
-          builder.label(method, label_html_options) <<
+          builder.label(method, label_text, label_html_options) <<
           builder.url_field(method, input_html_options)
         end
       end

From ff6cd9646a02533b01c0e672d7b16aad957c6f5e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 21 Mar 2011 07:35:48 +1100
Subject: [PATCH 614/992] note we removed FormBuilder#label

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index dab9246d9..40d64bac5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 [v2 branch]
 
+* Removed the "special" implementation of label() from FormBuilder, so builder.label will call Rails' label helper, not ours
 * Changed formtastic:form generator include the wrapping semantic_form_for block
 * Changed formtastic:form generator to generate a partial by default (instead of copying to clipboard, which can be done with --copy)
 * Removed formtastic_stylesheet_link_tag

From 185126fcd9cfb97271be097a7700913f6a6f3591 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 21 Mar 2011 07:43:30 +1100
Subject: [PATCH 615/992] hack to make LocalizedString work when included
 inside an Input, or inside a FormBuilder

---
 lib/formtastic/localized_string.rb | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/lib/formtastic/localized_string.rb b/lib/formtastic/localized_string.rb
index 6662c31f6..7bc41ce07 100644
--- a/lib/formtastic/localized_string.rb
+++ b/lib/formtastic/localized_string.rb
@@ -80,24 +80,16 @@ def normalize_model_name(name)
       end
     end
     
-    # TODO: Temporarily make this work when included inside an Input instead of FormBuilder
     def escape_html_entities(string) #:nodoc:
-      if builder
-        if builder.escape_html_entities_in_hints_and_labels
-          # Acceppt html_safe flag as indicator to skip escaping
-          string = template.escape_once(string) unless string.respond_to?(:html_safe?) && string.html_safe? == true
-        end
-        string
-      else
-        super
+      if (respond_to?(:builder) && builder.escape_html_entities_in_hints_and_labels) || escape_html_entities_in_hints_and_labels
+        string = template.escape_once(string) unless string.respond_to?(:html_safe?) && string.html_safe? == true # Acceppt html_safe flag as indicator to skip escaping
       end
+      string
     end
     
-    # TODO: Temporarily make this work when included inside an Input instead of FormBuilder
     def i18n_lookups_by_default
-      respond_to?(:builder) ? builder.i18n_lookups_by_default : super
+      respond_to?(:builder) ? builder.i18n_lookups_by_default : i18n_lookups_by_default
     end
     
-    
   end
 end
\ No newline at end of file

From 39055be8de06fdde01b8dfd5f0cbb9c5c0b59ef2 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 21 Mar 2011 17:10:24 +1100
Subject: [PATCH 616/992] custom_builder_spec.rb is passing again

---
 spec/custom_builder_spec.rb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/spec/custom_builder_spec.rb b/spec/custom_builder_spec.rb
index 3972374ea..57e7f84e7 100644
--- a/spec/custom_builder_spec.rb
+++ b/spec/custom_builder_spec.rb
@@ -6,9 +6,11 @@
   include FormtasticSpecHelper
 
   class MyCustomFormBuilder < Formtastic::FormBuilder
-    def awesome_input(method, options)
-      self.text_field(method)
-    end
+  end
+  
+  # TODO should be a separate spec for custom inputs
+  class Formtastic::Inputs::AwesomeInput
+    include Formtastic::Inputs::NewBase
   end
 
   before do
@@ -57,7 +59,8 @@ def awesome_input(method, options)
           builder.class.should == MyCustomFormBuilder
         end
       end
-
+      
+      # TODO should be a separate spec for custom inputs
       it "should allow me to call my custom input" do
         semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :awesome))

From ab6b52197663128f300ad03c7e9bbe72a246b16d Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 21 Mar 2011 17:30:40 +1100
Subject: [PATCH 617/992] errors_spec.rb now passes, mostly by testing the HTML
 outcome instead of the internal implementation

---
 lib/formtastic/inputs/new_base/errors.rb | 11 +---
 lib/formtastic/inputs/new_base/html.rb   |  4 ++
 spec/errors_spec.rb                      | 79 ++++++++++++++----------
 3 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/lib/formtastic/inputs/new_base/errors.rb b/lib/formtastic/inputs/new_base/errors.rb
index ad78bc313..e8c9a3dc7 100644
--- a/lib/formtastic/inputs/new_base/errors.rb
+++ b/lib/formtastic/inputs/new_base/errors.rb
@@ -14,23 +14,16 @@ def errors
               errors << object.errors[key] unless object.errors[key].blank?
             end
           end
-          errors.flatten
+          errors.flatten.compact.uniq
         end
         
         def error_keys
           keys = [method.to_sym]
-          keys << file_metadata_suffixes.map{|suffix| "#{method}_#{suffix}".to_sym} if file?
+          keys << builder.file_metadata_suffixes.map{|suffix| "#{method}_#{suffix}".to_sym} if file?
           keys << association_primary_key if belongs_to?
           keys.flatten.compact.uniq
         end
         
-        def error_keys
-          keys = [method.to_sym]
-          keys << file_metadata_suffixes.map{|suffix| "#{method}_#{suffix}".to_sym} if file?
-          keys << [association_primary_key] if belongs_to?
-          keys.flatten.compact.uniq
-        end
-
       end
     end
   end
diff --git a/lib/formtastic/inputs/new_base/html.rb b/lib/formtastic/inputs/new_base/html.rb
index 08e3bb869..ab16b61a3 100644
--- a/lib/formtastic/inputs/new_base/html.rb
+++ b/lib/formtastic/inputs/new_base/html.rb
@@ -75,6 +75,10 @@ def error_first_html
           template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => error_class)
         end
         
+        def error_none_html
+          ""
+        end
+        
         def hint_html
           if hint?
             template.content_tag(
diff --git a/spec/errors_spec.rb b/spec/errors_spec.rb
index 673f475e7..62759dafe 100644
--- a/spec/errors_spec.rb
+++ b/spec/errors_spec.rb
@@ -25,76 +25,87 @@
 
     it 'should render a paragraph with the errors joined into a sentence when inline_errors config is :sentence' do
       Formtastic::FormBuilder.inline_errors = :sentence
-      semantic_form_for(@new_post) do |builder|
-        builder.errors_on(:title).should have_tag('p.inline-errors', @title_errors.to_sentence)
-      end
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input :title
+      end)
+      output_buffer.should have_tag('p.inline-errors', @title_errors.to_sentence)
     end
 
     it 'should render a paragraph with a overridden default class' do
       Formtastic::FormBuilder.inline_errors = :sentence
       Formtastic::FormBuilder.default_inline_error_class = 'better-errors'
-      semantic_form_for(@new_post) do |builder|
-        builder.errors_on(:title).should have_tag('p.better-errors', @title_errors.to_sentence)
-      end
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title)
+      end)
+      output_buffer.should have_tag('p.better-errors', @title_errors.to_sentence)
     end
 
     it 'should render a paragraph with the errors joined into a sentence when inline_errors config is :sentence with a customized error class' do
       Formtastic::FormBuilder.inline_errors = :sentence
-      semantic_form_for(@new_post) do |builder|
-        builder.errors_on(:title, :error_class => 'better-errors').should have_tag('p.better-errors', @title_errors.to_sentence)
-      end
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :error_class => 'better-errors')
+      end)
+      output_buffer.should have_tag('p.better-errors', @title_errors.to_sentence)
     end
 
     it 'should render an unordered list with the class errors when inline_errors config is :list' do
       Formtastic::FormBuilder.inline_errors = :list
-      semantic_form_for(@new_post) do |builder|
-        builder.errors_on(:title).should have_tag('ul.errors')
-        @title_errors.each do |error|
-          builder.errors_on(:title).should have_tag('ul.errors li', error)
-        end
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title)
+      end)
+      output_buffer.should have_tag('ul.errors')
+      @title_errors.each do |error|
+        output_buffer.should have_tag('ul.errors li', error)
       end
     end
 
     it 'should render an unordered list with the class overridden default class' do
       Formtastic::FormBuilder.inline_errors = :list
       Formtastic::FormBuilder.default_error_list_class = "better-errors"
-      semantic_form_for(@new_post) do |builder|
-        builder.errors_on(:title).should have_tag('ul.better-errors')
-        @title_errors.each do |error|
-          builder.errors_on(:title).should have_tag('ul.better-errors li', error)
-        end
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input :title
+      end)
+      output_buffer.should have_tag('ul.better-errors')
+      @title_errors.each do |error|
+        output_buffer.should have_tag('ul.better-errors li', error)
       end
     end
 
     it 'should render an unordered list with the class errors when inline_errors config is :list with a customized error class' do
       Formtastic::FormBuilder.inline_errors = :list
-      semantic_form_for(@new_post) do |builder|
-        builder.errors_on(:title, :error_class => 'better-errors').should have_tag('ul.better-errors')
-        @title_errors.each do |error|
-          builder.errors_on(:title, :error_class => 'better-errors').should have_tag('ul.better-errors li', error)
-        end
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input :title, :error_class => "better-errors"
+      end)
+      output_buffer.should have_tag('ul.better-errors')
+      @title_errors.each do |error|
+        output_buffer.should have_tag('ul.better-errors li', error)
       end
     end
 
     it 'should render a paragraph with the first error when inline_errors config is :first' do
       Formtastic::FormBuilder.inline_errors = :first
-      semantic_form_for(@new_post) do |builder|
-        builder.errors_on(:title).should have_tag('p.inline-errors', @title_errors.first)
-      end
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input :title
+      end)
+      output_buffer.should have_tag('p.inline-errors', @title_errors.first)
+      
     end
 
     it 'should render a paragraph with the first error when inline_errors config is :first with a customized error class' do
       Formtastic::FormBuilder.inline_errors = :first
-      semantic_form_for(@new_post) do |builder|
-        builder.errors_on(:title, :error_class => 'better-errors').should have_tag('p.better-errors', @title_errors.first)
-      end
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input :title, :error_class => "better-errors"
+      end)
+      output_buffer.should have_tag('p.better-errors', @title_errors.first)
     end
 
     it 'should return nil when inline_errors config is :none' do
       Formtastic::FormBuilder.inline_errors = :none
-      semantic_form_for(@new_post) do |builder|
-        builder.errors_on(:title).should be_nil
-      end
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input :title
+      end)
+      output_buffer.should_not have_tag('p.inine-errors')
+      output_buffer.should_not have_tag('ul.errors')
     end
 
   end
@@ -142,7 +153,7 @@
           concat(builder.input(:document))
         end)
       end 
-      output_buffer.should have_tag("li[@class='file optional error']")
+      output_buffer.should have_tag("li.error")
       output_buffer.should have_tag('p.inline-errors', (['must be an image','must be provided', 'must be less than 4mb']).to_sentence)
     end
   end

From 1397e87751552c606393ccd826a70caed55b7995 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 21 Mar 2011 17:38:25 +1100
Subject: [PATCH 618/992] include_blank_spec.rb now passes with some tweaks to
 Timeish

---
 lib/formtastic/inputs/new_base/timeish.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic/inputs/new_base/timeish.rb b/lib/formtastic/inputs/new_base/timeish.rb
index 69fcffe62..d8a81c3be 100644
--- a/lib/formtastic/inputs/new_base/timeish.rb
+++ b/lib/formtastic/inputs/new_base/timeish.rb
@@ -68,11 +68,15 @@ def value
         end
         
         def fragment_input_html(fragment)
-          opts = input_options.merge(:prefix => object_name, :field_name => fragment_name(fragment), :default => value)
-          
+          opts = input_options.merge(:prefix => object_name, :field_name => fragment_name(fragment), :default => value, :include_blank => include_blank?)
           template.send(:"select_#{fragment}", value, opts, input_html_options.merge(:id => fragment_id(fragment)))
         end
         
+        # TODO extract to BlankOptions or similar -- Select uses similar code
+        def include_blank?
+          options.key?(:include_blank) ? options[:include_blank] : builder.include_blank_for_select_by_default
+        end
+        
         def positions
           { :year => 1, :month => 2, :day => 3, :hour => 4, :minute => 5, :second => 6 }
         end

From 1d8d5a655a50be266fc70751ffd6d15a2c2923f8 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 21 Mar 2011 17:53:58 +1100
Subject: [PATCH 619/992] removed the inline_order configuration, override
 input_wrapping instead

---
 CHANGELOG                              |  1 +
 lib/formtastic/form_builder.rb         |  1 -
 lib/formtastic/inputs/new_base/html.rb |  3 +-
 lib/generators/templates/formtastic.rb |  6 ----
 spec/input_spec.rb                     | 44 ++------------------------
 5 files changed, 6 insertions(+), 49 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 40d64bac5..6fb5a2d6a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 [v2 branch]
 
+* Removed the "inline_order" configuration (redefine input_wrapping instead)
 * Removed the "special" implementation of label() from FormBuilder, so builder.label will call Rails' label helper, not ours
 * Changed formtastic:form generator include the wrapping semantic_form_for block
 * Changed formtastic:form generator to generate a partial by default (instead of copying to clipboard, which can be done with --copy)
diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index c2176c247..acf2d3ee9 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -47,7 +47,6 @@ def self.configure(name, value = nil)
     configure :label_str_method, :humanize
     configure :collection_label_methods, %w[to_label display_name full_name name title username login value to_s]
     configure :collection_value_methods, %w[id to_s]
-    configure :inline_order, [ :input, :hints, :errors ]
     configure :custom_inline_order, {}
     configure :file_methods, [ :file?, :public_filename, :filename ]
     configure :file_metadata_suffixes, ['content_type', 'file_name', 'file_size']
diff --git a/lib/formtastic/inputs/new_base/html.rb b/lib/formtastic/inputs/new_base/html.rb
index ab16b61a3..d1844fb5a 100644
--- a/lib/formtastic/inputs/new_base/html.rb
+++ b/lib/formtastic/inputs/new_base/html.rb
@@ -29,7 +29,8 @@ def label_html_options
           opts
         end
         
-        # TODO doesn't cover custom ordering
+        # Override this method if you want to change the display order (for example, rendering the
+        # errors before the body of the input).
         def input_wrapping(&block)
           template.content_tag(:li, 
             [template.capture(&block), error_html, hint_html].join("\n").html_safe, 
diff --git a/lib/generators/templates/formtastic.rb b/lib/generators/templates/formtastic.rb
index dca628b2c..a638348aa 100644
--- a/lib/generators/templates/formtastic.rb
+++ b/lib/generators/templates/formtastic.rb
@@ -58,12 +58,6 @@
 # Formtastic::FormBuilder.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::FormBuilder.inline_order = [:input, :hints, :errors]
-
 # Additionally, you can customize the order for specific types of inputs.
 # This is configured on a type basis and if a type is not found it will
 # fall back to the default order as defined by #inline_order
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index fbeb3c812..4f93bd8d6 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -8,47 +8,9 @@
   before do
     @output_buffer = ''
     mock_everything
-  end
-
-  describe 'with inline order customization' do
-    it 'should allow input, hints, errors as order' do
-      Formtastic::FormBuilder.inline_order = [:input, :hints, :errors]
-
-      semantic_form_for(@new_post) do |builder|
-        builder.should_receive(:inline_input_for).once.ordered
-        builder.should_receive(:inline_hints_for).once.ordered
-        builder.should_receive(:inline_errors_for).once.ordered
-        concat(builder.input(:title))
-      end
-    end
-
-    it 'should allow hints, input, errors as order' do
-      Formtastic::FormBuilder.inline_order = [:hints, :input, :errors]
-
-      semantic_form_for(@new_post) do |builder|
-        builder.should_receive(:inline_hints_for).once.ordered
-        builder.should_receive(:inline_input_for).once.ordered
-        builder.should_receive(:inline_errors_for).once.ordered
-        concat(builder.input(:title))
-      end
-    end
-
-    it 'should allow errors, input, hint for a custom type while preserving original inline order' do
-      Formtastic::FormBuilder.custom_inline_order[:checkbox] = [:errors, :input, :hints]
-      Formtastic::FormBuilder.inline_order = [:hints, :input, :errors]
-
-      semantic_form_for(@new_post) do |builder|
-        builder.should_receive(:inline_errors_for).once.ordered
-        builder.should_receive(:inline_input_for).once.ordered
-        builder.should_receive(:inline_hints_for).once.ordered
-        concat(builder.input(:title, :as => :checkbox))
-        builder.should_receive(:inline_hints_for).once.ordered
-        builder.should_receive(:inline_input_for).once.ordered
-        builder.should_receive(:inline_errors_for).once.ordered
-        concat(builder.input(:title))
-      end
-    end
-
+    
+    @errors = mock('errors')
+    @new_post.stub!(:errors).and_return(@errors)
   end
 
   describe 'arguments and options' do

From 8a709459a060ab9a5e81294ccb22f7b951dfbee2 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 22 Mar 2011 18:44:53 +1100
Subject: [PATCH 620/992] all inputs will now skip rendering of the label (or
 legend) with :label => false again

---
 lib/formtastic/inputs/check_boxes_input.rb  |  6 +++---
 lib/formtastic/inputs/country_input.rb      |  2 +-
 lib/formtastic/inputs/email_input.rb        |  2 +-
 lib/formtastic/inputs/file_input.rb         |  2 +-
 lib/formtastic/inputs/new_base/html.rb      |  6 +++++-
 lib/formtastic/inputs/new_base/labelling.rb |  5 +++++
 lib/formtastic/inputs/new_base/timeish.rb   | 12 ++++++++----
 lib/formtastic/inputs/numeric_input.rb      |  2 +-
 lib/formtastic/inputs/password_input.rb     |  2 +-
 lib/formtastic/inputs/phone_input.rb        |  2 +-
 lib/formtastic/inputs/search_input.rb       |  2 +-
 lib/formtastic/inputs/select_input.rb       |  2 +-
 lib/formtastic/inputs/text_input.rb         |  2 +-
 lib/formtastic/inputs/time_zone_input.rb    |  2 +-
 lib/formtastic/inputs/url_input.rb          |  2 +-
 15 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index f3d3f217e..1ad6a75da 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -117,13 +117,13 @@ def hidden_field_for_all
       end
       
       def legend_html
-        if options[:label] == false
-          ""
-        else
+        if render_label?
           template.content_tag(:legend,
             template.content_tag(:label, label_text),
             label_html_options.merge(:class => "label")
           )
+        else
+          ""
         end
       end
       
diff --git a/lib/formtastic/inputs/country_input.rb b/lib/formtastic/inputs/country_input.rb
index f1409d932..45e4421af 100644
--- a/lib/formtastic/inputs/country_input.rb
+++ b/lib/formtastic/inputs/country_input.rb
@@ -54,7 +54,7 @@ class CountryInput
       def to_html
         raise "To use the :country input, please install a country_select plugin, like this one: http://github.com/rails/iso-3166-country-select" unless builder.respond_to?(:country_select)
         input_wrapping do
-          builder.label(method, label_text, label_html_options) <<
+          label_html <<
           builder.country_select(method, priority_countries, input_options, input_html_options)
         end
       end
diff --git a/lib/formtastic/inputs/email_input.rb b/lib/formtastic/inputs/email_input.rb
index 774e65e1e..421301d71 100644
--- a/lib/formtastic/inputs/email_input.rb
+++ b/lib/formtastic/inputs/email_input.rb
@@ -35,7 +35,7 @@ class EmailInput
       
       def to_html
         input_wrapping do
-          builder.label(method, label_text, label_html_options) <<
+          label_html <<
           builder.email_field(method, input_html_options)
         end
       end
diff --git a/lib/formtastic/inputs/file_input.rb b/lib/formtastic/inputs/file_input.rb
index ea164fd1a..5db605491 100644
--- a/lib/formtastic/inputs/file_input.rb
+++ b/lib/formtastic/inputs/file_input.rb
@@ -35,7 +35,7 @@ class FileInput
       include NewBase
       def to_html
         input_wrapping do
-          builder.label(method, label_text, label_html_options) <<
+          label_html <<
           builder.file_field(method, input_html_options)
         end
       end
diff --git a/lib/formtastic/inputs/new_base/html.rb b/lib/formtastic/inputs/new_base/html.rb
index d1844fb5a..2dece43e4 100644
--- a/lib/formtastic/inputs/new_base/html.rb
+++ b/lib/formtastic/inputs/new_base/html.rb
@@ -5,11 +5,15 @@ module Html
   
         def to_html
           input_wrapping do
-            builder.label(input_name, label_text, label_html_options) <<
+            label_html <<
             builder.text_field(method, input_html_options)
           end
         end
         
+        def label_html
+          render_label? ? builder.label(input_name, label_text, label_html_options) : ""
+        end
+        
         def input_html_options
           opts = options[:input_html] || {}
           opts[:id] ||= input_dom_id
diff --git a/lib/formtastic/inputs/new_base/labelling.rb b/lib/formtastic/inputs/new_base/labelling.rb
index 01713f421..42f649066 100644
--- a/lib/formtastic/inputs/new_base/labelling.rb
+++ b/lib/formtastic/inputs/new_base/labelling.rb
@@ -25,6 +25,11 @@ def localized_label
           localized_string(method, label_from_options, :label)
         end
         
+        def render_label?
+          return false if options[:label] == false
+          true
+        end
+        
       end
     end
   end
diff --git a/lib/formtastic/inputs/new_base/timeish.rb b/lib/formtastic/inputs/new_base/timeish.rb
index d8a81c3be..919a8e992 100644
--- a/lib/formtastic/inputs/new_base/timeish.rb
+++ b/lib/formtastic/inputs/new_base/timeish.rb
@@ -103,10 +103,14 @@ def fragments_wrapping_html_options
         end
         
         def fragments_label
-          template.content_tag(:legend, 
-            builder.label(method, :for => "#{input_html_options[:id]}_1i"), 
-            :class => "label"
-          )
+          if render_label?
+            template.content_tag(:legend, 
+              builder.label(method, :for => "#{input_html_options[:id]}_1i"), 
+              :class => "label"
+            )
+          else
+            ""
+          end
         end
         
         def fragments_inner_wrapping(&block)
diff --git a/lib/formtastic/inputs/numeric_input.rb b/lib/formtastic/inputs/numeric_input.rb
index 4c2969e81..a088bacaa 100644
--- a/lib/formtastic/inputs/numeric_input.rb
+++ b/lib/formtastic/inputs/numeric_input.rb
@@ -39,7 +39,7 @@ class NumericInput
       
       def to_html
         input_wrapping do
-          builder.label(method, label_text, label_html_options) <<
+          label_html <<
           builder.number_field(method, input_html_options)
         end
       end
diff --git a/lib/formtastic/inputs/password_input.rb b/lib/formtastic/inputs/password_input.rb
index 81aa14681..48d1d6531 100644
--- a/lib/formtastic/inputs/password_input.rb
+++ b/lib/formtastic/inputs/password_input.rb
@@ -34,7 +34,7 @@ class PasswordInput
       
       def to_html
         input_wrapping do
-          builder.label(method, label_text, label_html_options) <<
+          label_html <<
           builder.password_field(method, input_html_options)
         end
       end
diff --git a/lib/formtastic/inputs/phone_input.rb b/lib/formtastic/inputs/phone_input.rb
index e511f4373..7e2153e16 100644
--- a/lib/formtastic/inputs/phone_input.rb
+++ b/lib/formtastic/inputs/phone_input.rb
@@ -34,7 +34,7 @@ class PhoneInput
       
       def to_html
         input_wrapping do
-          builder.label(method, label_text, label_html_options) <<
+          label_html <<
           builder.phone_field(method, input_html_options)
         end
       end
diff --git a/lib/formtastic/inputs/search_input.rb b/lib/formtastic/inputs/search_input.rb
index a878ba1e0..f9fe2898d 100644
--- a/lib/formtastic/inputs/search_input.rb
+++ b/lib/formtastic/inputs/search_input.rb
@@ -30,7 +30,7 @@ class SearchInput
       
       def to_html
         input_wrapping do
-          builder.label(method, label_text, label_html_options) <<
+          label_html <<
           builder.search_field(method, input_html_options)
         end
       end
diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index a474afed2..7612db3e8 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -143,7 +143,7 @@ class SelectInput
       
       def to_html
         input_wrapping do
-          builder.label(method, label_text, label_html_options) <<
+          label_html <<
           (options[:group_by] ? grouped_select_html : select_html)
         end
       end
diff --git a/lib/formtastic/inputs/text_input.rb b/lib/formtastic/inputs/text_input.rb
index f33fd93d3..e7a67bca1 100644
--- a/lib/formtastic/inputs/text_input.rb
+++ b/lib/formtastic/inputs/text_input.rb
@@ -39,7 +39,7 @@ def input_html_options
       
       def to_html
         input_wrapping do
-          builder.label(method, label_text, label_html_options) <<
+          label_html <<
           builder.text_area(method, input_html_options)
         end
       end
diff --git a/lib/formtastic/inputs/time_zone_input.rb b/lib/formtastic/inputs/time_zone_input.rb
index a05d520e4..384ab3755 100644
--- a/lib/formtastic/inputs/time_zone_input.rb
+++ b/lib/formtastic/inputs/time_zone_input.rb
@@ -37,7 +37,7 @@ class TimeZoneInput
 
       def to_html
         input_wrapping do
-          builder.label(method, label_text, label_html_options) <<
+          label_html <<
           builder.time_zone_select(method, priority_zones, input_options, input_html_options)
         end
       end
diff --git a/lib/formtastic/inputs/url_input.rb b/lib/formtastic/inputs/url_input.rb
index 69a1f9e1f..7dcf5b77e 100644
--- a/lib/formtastic/inputs/url_input.rb
+++ b/lib/formtastic/inputs/url_input.rb
@@ -34,7 +34,7 @@ class UrlInput
       
       def to_html
         input_wrapping do
-          builder.label(method, label_text, label_html_options) <<
+          label_html <<
           builder.url_field(method, input_html_options)
         end
       end

From 840c87e6f1842f1647680b3f98d71b0de84fe8ce Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 22 Mar 2011 18:45:51 +1100
Subject: [PATCH 621/992] label spec now passes with a few tweaks and some
 alterations to the specs to test the outcome instead of the implementation

---
 lib/formtastic/localized_string.rb |  3 +-
 spec/label_spec.rb                 | 49 +++++++++++++++---------------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/lib/formtastic/localized_string.rb b/lib/formtastic/localized_string.rb
index 7bc41ce07..9d1064c79 100644
--- a/lib/formtastic/localized_string.rb
+++ b/lib/formtastic/localized_string.rb
@@ -81,7 +81,8 @@ def normalize_model_name(name)
     end
     
     def escape_html_entities(string) #:nodoc:
-      if (respond_to?(:builder) && builder.escape_html_entities_in_hints_and_labels) || escape_html_entities_in_hints_and_labels
+      if (respond_to?(:builder) && builder.escape_html_entities_in_hints_and_labels) || 
+         (self.respond_to?(:escape_html_entities_in_hints_and_labels) && escape_html_entities_in_hints_and_labels)
         string = template.escape_once(string) unless string.respond_to?(:html_safe?) && string.html_safe? == true # Acceppt html_safe flag as indicator to skip escaping
       end
       string
diff --git a/spec/label_spec.rb b/spec/label_spec.rb
index 28b92396b..f09e338f2 100644
--- a/spec/label_spec.rb
+++ b/spec/label_spec.rb
@@ -11,22 +11,18 @@
   end
 
   it 'should humanize the given attribute' do
-    semantic_form_for(@new_post) do |builder|
-      builder.label(:login).should have_tag('label', :with => /Login/)
-    end
+    concat(semantic_form_for(@new_post) do |builder|
+      builder.input(:title)
+    end)
+    output_buffer.should have_tag('label', :with => /Login/)
   end
 
   describe 'when required is given' do
     it 'should append a required note' do
-      semantic_form_for(@new_post) do |builder|
-        builder.label(:login, nil, :required => true).should have_tag('label abbr')
-      end
-    end
-
-    it 'should allow require option to be given as second argument' do
-      semantic_form_for(@new_post) do |builder|
-        builder.label(:login, :required => true).should have_tag('label abbr')
-      end
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :required => true)
+      end)
+      output_buffer.should have_tag('label abbr', '*')
     end
   end
 
@@ -56,29 +52,34 @@
     end
 
     it 'should return nil if label is false' do
-      semantic_form_for(@new_post) do |builder|
-        builder.label(:login, :label => false).should be_blank
-      end
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :label => false)
+      end)
+      output_buffer.should_not have_tag('label')
     end
 
     it 'should html escape the label string by default' do
-      semantic_form_for(@new_post) do |builder|
-        builder.label(:login, :required => false, :label => '<b>My label</b>').should == "<label for=\"post_login\">&lt;b&gt;My label&lt;/b&gt;</label>"
-      end
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :label => '<b>My label</b>')
+      end)
+      output_buffer.should include('&lt;b&gt;')
+      output_buffer.should_not include('<b>')
     end
 
     it 'should not html escape the label if configured that way' do
       Formtastic::FormBuilder.escape_html_entities_in_hints_and_labels = false
-      semantic_form_for(@new_post) do |builder|
-        builder.label(:login, :required => false, :label => '<b>My label</b>').should == "<label for=\"post_login\"><b>My label</b></label>"
-      end
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :label => '<b>My label</b>')
+      end)
+      output_buffer.should have_tag("label b", "My label")
     end
 
     it 'should not html escape the label string for html_safe strings' do
       Formtastic::FormBuilder.escape_html_entities_in_hints_and_labels = true
-      semantic_form_for(@new_post) do |builder|
-        builder.label(:login, :required => false, :label => '<b>My label</b>'.html_safe).should == "<label for=\"post_login\"><b>My label</b></label>"
-      end
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :label => '<b>My label</b>'.html_safe)
+      end)
+      output_buffer.should have_tag('label b')
     end
 
   end

From 2ab4fbc0a7e70a11d99206fde85c30b571e71bfe Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 23 Mar 2011 06:39:21 +1100
Subject: [PATCH 622/992] missed one label spec

---
 spec/label_spec.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/spec/label_spec.rb b/spec/label_spec.rb
index f09e338f2..87332d08e 100644
--- a/spec/label_spec.rb
+++ b/spec/label_spec.rb
@@ -46,9 +46,10 @@
 
   describe 'when label is given' do
     it 'should allow the text to be given as label option' do
-      semantic_form_for(@new_post) do |builder|
-        builder.label(:login, :required => true, :label => 'My label').should have_tag('label', :with => /My label/)
-      end
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :label => 'My label')
+      end)
+      output_buffer.should have_tag('label', :with => /My label/)
     end
 
     it 'should return nil if label is false' do

From ee78620eeee038e3055bfa230ffbf445f3ad5b95 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 23 Mar 2011 07:45:01 +1100
Subject: [PATCH 623/992] fix a bunch of issues with required_string, procs,
 etc, makes a lot of stuff greener

---
 lib/formtastic/inputs/new_base/labelling.rb   | 16 +++++---
 lib/formtastic/inputs/new_base/validations.rb |  6 ++-
 spec/input_spec.rb                            | 37 ++++++++-----------
 3 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/lib/formtastic/inputs/new_base/labelling.rb b/lib/formtastic/inputs/new_base/labelling.rb
index 42f649066..4893212ba 100644
--- a/lib/formtastic/inputs/new_base/labelling.rb
+++ b/lib/formtastic/inputs/new_base/labelling.rb
@@ -6,14 +6,18 @@ module Labelling
         include Formtastic::LocalizedString
         
         def label_text
-          ((localized_label || humanized_method_name) << required_or_optional_string).html_safe
+          ((localized_label || humanized_method_name) << requirement_text).html_safe
         end
 
-        def required_or_optional_string
-          case required?
-            when true then builder.required_string.call
-            when false then builder.optional_string.call
-            else options[:required] # TODO why?
+        def requirement_text_or_proc
+          required? ? builder.required_string : builder.optional_string
+        end
+        
+        def requirement_text
+          if requirement_text_or_proc.respond_to?(:call)
+            requirement_text_or_proc.call
+          else
+            requirement_text_or_proc
           end
         end
 
diff --git a/lib/formtastic/inputs/new_base/validations.rb b/lib/formtastic/inputs/new_base/validations.rb
index 9eb9c768c..b590b2e52 100644
--- a/lib/formtastic/inputs/new_base/validations.rb
+++ b/lib/formtastic/inputs/new_base/validations.rb
@@ -47,7 +47,9 @@ def required?
           if validations?
             !validations.find { |validator| [:presence, :inclusion, :length].include?(validator.kind) }.nil?
           else
-            builder.all_fields_required_by_default
+            return false if options[:required] == false
+            return true if options[:required] == true
+            return builder.all_fields_required_by_default
           end
         end
         
@@ -56,7 +58,7 @@ def optional?
         end
         
         def column_limit
-          column.limit if column?
+          column.limit if column? && column.respond_to?(:limit)
         end
         
         def limit
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 4f93bd8d6..7535b5b9a 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -10,11 +10,12 @@
     mock_everything
     
     @errors = mock('errors')
+    @errors.stub!(:[]).and_return([])
     @new_post.stub!(:errors).and_return(@errors)
   end
 
   describe 'arguments and options' do
-
+  
     it 'should require the first argument (the method on form\'s object)' do
       lambda {
         concat(semantic_form_for(@new_post) do |builder|
@@ -26,30 +27,24 @@
     describe ':required option' do
 
       describe 'when true' do
-
-        before do
-          @old_string = Formtastic::FormBuilder.required_string
-          @new_string = Formtastic::FormBuilder.required_string = " required yo!" # ensure there's something in the string
-          @new_post.class.should_not_receive(:reflect_on_all_validations)
-        end
-
-        after do
-          Formtastic::FormBuilder.required_string = @old_string
-        end
-
+        
         it 'should set a "required" class' do
-          concat(semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:title, :required => true))
-          end)
-          output_buffer.should_not have_tag('form li.optional')
-          output_buffer.should have_tag('form li.required')
+          with_config :required_string, " required yo!" do
+            concat(semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:title, :required => true))
+            end)
+            output_buffer.should_not have_tag('form li.optional')
+            output_buffer.should have_tag('form li.required')
+          end
         end
 
         it 'should append the "required" string to the label' do
-          concat(semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:title, :required => true))
-          end)
-          output_buffer.should have_tag('form li.required label', /#{@new_string}$/)
+          with_config :required_string, " required yo!" do
+            concat(semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:title, :required => true))
+            end)
+            output_buffer.should have_tag('form li.required label', /required yo/)
+          end
         end
 
       end

From d32d9660c8f9a8655f34c0e1689dbb57f57be294 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 23 Mar 2011 07:47:24 +1100
Subject: [PATCH 624/992] fix input specs to reflect that we now call an input
 class, not an input method

---
 spec/input_spec.rb | 57 ++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 30 deletions(-)

diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 7535b5b9a..a62ff8943 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -400,107 +400,104 @@ def should_be_required(options)
           default_input_type(:integer, :user_id).should == :select
           default_input_type(:integer, :section_id).should == :select
         end
-
+  
         it 'should default to :password for :string column types with "password" in the method name' do
           default_input_type(:string, :password).should == :password
           default_input_type(:string, :hashed_password).should == :password
           default_input_type(:string, :password_hash).should == :password
         end
-
+  
         it 'should default to :text for :text column types' do
           default_input_type(:text).should == :text
         end
-
+  
         it 'should default to :date for :date column types' do
           default_input_type(:date).should == :date
         end
-
+  
         it 'should default to :datetime for :datetime and :timestamp column types' do
           default_input_type(:datetime).should == :datetime
           default_input_type(:timestamp).should == :datetime
         end
-
+  
         it 'should default to :time for :time column types' do
           default_input_type(:time).should == :time
         end
-
+  
         it 'should default to :boolean for :boolean column types' do
           default_input_type(:boolean).should == :boolean
         end
-
+  
         it 'should default to :string for :string column types' do
           default_input_type(:string).should == :string
         end
-
+  
         it 'should default to :numeric for :integer, :float and :decimal column types' do
           default_input_type(:integer).should == :numeric
           default_input_type(:float).should == :numeric
           default_input_type(:decimal).should == :numeric
         end
-
+  
         it 'should default to :country for :string columns named country' do
           default_input_type(:string, :country).should == :country
         end
-
+  
         it 'should default to :email for :string columns matching email' do
           default_input_type(:string, :email).should == :email
           default_input_type(:string, :customer_email).should == :email
           default_input_type(:string, :email_work).should == :email
         end
-
+  
         it 'should default to :url for :string columns named url or website' do
           default_input_type(:string, :url).should == :url
           default_input_type(:string, :website).should == :url
           default_input_type(:string, :my_url).should == :url
           default_input_type(:string, :hurl).should_not == :url
         end
-
+  
         it 'should default to :phone for :string columns named phone or fax' do
           default_input_type(:string, :phone).should == :phone
           default_input_type(:string, :fax).should == :phone
         end
-
+  
         it 'should default to :search for :string columns named search' do
           default_input_type(:string, :search).should == :search
         end
-
+  
         describe 'defaulting to file column' do
           Formtastic::FormBuilder.file_methods.each do |method|
             it "should default to :file for attributes that respond to ##{method}" do
               @new_post.stub!(:column_for_attribute).and_return(nil)
               column = mock('column')
-
+  
               Formtastic::FormBuilder.file_methods.each do |test|
                 ### TODO: Check if this is ok
                 column.stub!(method).with(test).and_return(method == test)
               end
-
+  
               @new_post.should_receive(method).and_return(column)
-
+  
               semantic_form_for(@new_post) do |builder|
                 builder.send(:default_input_type, method).should == :file
               end
             end
           end
-
+  
         end
       end
-
-      it 'should call the corresponding input method' do
-        [:select, :time_zone, :radio, :date, :datetime, :time, :boolean, :check_boxes, :hidden].each do |input_style|
+  
+      it 'should call the corresponding input class with .to_html' do
+        [:select, :time_zone, :radio, :date, :datetime, :time, :boolean, :check_boxes, :hidden, :string, :password, :numeric, :text, :file].each do |input_style|
           @new_post.stub!(:generic_column_name)
           @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
           semantic_form_for(@new_post) do |builder|
-            builder.should_receive(:"#{input_style}_input").once.and_return("fake HTML output from #input")
-            concat(builder.input(:generic_column_name, :as => input_style))
-          end
-        end
+            input_instance = mock('Input instance')
+            input_class = "#{input_style.to_s}_input".classify
+            input_constant = "Formtastic::Inputs::#{input_class}".constantize
+            
+            input_constant.should_receive(:new).and_return(input_instance)
+            input_instance.should_receive(:to_html).and_return("some HTML")
 
-        [:string, :password, :numeric, :text, :file].each do |input_style|
-          @new_post.stub!(:generic_column_name)
-          @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
-          semantic_form_for(@new_post) do |builder|
-            builder.should_receive(:basic_input_helper).once.and_return("fake HTML output from #input")
             concat(builder.input(:generic_column_name, :as => input_style))
           end
         end

From 606c63322cfe08b1fbb3737df5a0a29aae782f85 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 23 Mar 2011 07:54:10 +1100
Subject: [PATCH 625/992] remove specs covering validation_reflection plugin,
 rename remaining specs to cover new ActiveModel intent

---
 spec/input_spec.rb | 108 +--------------------------------------------
 1 file changed, 2 insertions(+), 106 deletions(-)

diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index a62ff8943..6592b1994 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -96,109 +96,7 @@
 
         end
 
-        describe 'and an object was given' do
-
-          describe 'and the validation reflection plugin is available' do
-
-            before do
-              ::Post.stub!(:reflect_on_validations_for).and_return([])
-              @new_post.class.stub!(:method_defined?).with(:reflect_on_validations_for).and_return(true)
-            end
-
-            describe 'and validates_presence_of was called for the method' do
-              it 'should be required' do
-                @new_post.class.should_receive(:reflect_on_validations_for).with(:title).and_return([
-                  mock('MacroReflection', :macro => :validates_presence_of, :name => :title, :options => nil)
-                ])
-                @new_post.class.should_receive(:reflect_on_validations_for).with(:body).and_return([
-                  mock('MacroReflection', :macro => :validates_presence_of, :name => :body, :options => {:if => true})
-                ])
-
-                concat(semantic_form_for(@new_post) do |builder|
-                  concat(builder.input(:title))
-                  concat(builder.input(:body))
-                end)
-                output_buffer.should have_tag('form li.required')
-                output_buffer.should_not have_tag('form li.optional')
-              end
-
-              it 'should be not be required if the optional :if condition is not satisifed' do
-                should_be_required(:required => false, :options => { :if => false })
-              end
-
-              it 'should not be required if the optional :if proc evaluates to false' do
-                should_be_required(:required => false, :options => { :if => proc { |record| false } })
-              end
-
-              it 'should be required if the optional :if proc evaluates to true' do
-                should_be_required(:required => true, :options => { :if => proc { |record| true } })
-              end
-
-              it 'should not be required if the optional :unless proc evaluates to true' do
-                should_be_required(:required => false, :options => { :unless => proc { |record| true } })
-              end
-
-              it 'should be required if the optional :unless proc evaluates to false' do
-                should_be_required(:required => true, :options => { :unless => proc { |record| false } })
-              end
-
-              it 'should be required if the optional :if with a method string evaluates to true' do
-                @new_post.should_receive(:required_condition).and_return(true)
-                should_be_required(:required => true, :options => { :if => :required_condition })
-              end
-
-              it 'should be required if the optional :if with a method string evaluates to false' do
-                @new_post.should_receive(:required_condition).and_return(false)
-                should_be_required(:required => false, :options => { :if => :required_condition })
-              end
-
-              it 'should not be required if the optional :unless with a method string evaluates to false' do
-                 @new_post.should_receive(:required_condition).and_return(false)
-                should_be_required(:required => true, :options => { :unless => :required_condition })
-              end
-
-               it 'should be required if the optional :unless with a method string evaluates to true' do
-                 @new_post.should_receive(:required_condition).and_return(true)
-                 should_be_required(:required => false, :options => { :unless => :required_condition })
-               end
-            end
-
-            # TODO make a matcher for this?
-            def should_be_required(options)
-              @new_post.class.should_receive(:reflect_on_validations_for).with(:body).and_return([
-                mock('MacroReflection', :macro => :validates_presence_of, :name => :body, :options => options[:options])
-              ])
-
-              concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:body))
-              end)
-
-              if options[:required]
-                output_buffer.should_not have_tag('form li.optional')
-                output_buffer.should have_tag('form li.required')
-              else
-                output_buffer.should have_tag('form li.optional')
-                output_buffer.should_not have_tag('form li.required')
-              end
-            end
-
-            describe 'and validates_presence_of was not called for the method' do
-              before do
-                @new_post.class.should_receive(:reflect_on_validations_for).with(:title).and_return([])
-              end
-
-              it 'should not be required' do
-                concat(semantic_form_for(@new_post) do |builder|
-                  concat(builder.input(:title))
-                end)
-                output_buffer.should_not have_tag('form li.required')
-                output_buffer.should have_tag('form li.optional')
-              end
-            end
-
-          end
-
-          describe 'and its a ActiveModel' do
+          describe 'and an object with :validators_on was given (ActiveModel, Active Resource)' do
             before do
               @new_post.stub!(:class).and_return(::PostModel)
             end
@@ -327,7 +225,7 @@ def should_be_required(options)
 
           end
 
-          describe 'and the validation reflection plugin is not available' do
+          describe 'and an object without :validators_on' do
 
             it 'should use the default value' do
               Formtastic::FormBuilder.all_fields_required_by_default.should == true
@@ -344,8 +242,6 @@ def should_be_required(options)
 
           end
 
-        end
-
       end
 
     end

From 0557622fd090b55e182539e533d710eb00880d49 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 23 Mar 2011 07:54:24 +1100
Subject: [PATCH 626/992] whitepace only

---
 spec/input_spec.rb | 240 ++++++++++++++++++++++-----------------------
 1 file changed, 120 insertions(+), 120 deletions(-)

diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 6592b1994..e01646fdb 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -96,136 +96,136 @@
 
         end
 
-          describe 'and an object with :validators_on was given (ActiveModel, Active Resource)' do
-            before do
-              @new_post.stub!(:class).and_return(::PostModel)
+        describe 'and an object with :validators_on was given (ActiveModel, Active Resource)' do
+          before do
+            @new_post.stub!(:class).and_return(::PostModel)
+          end
+        
+          after do
+            @new_post.stub!(:class).and_return(::Post)
+          end
+          describe 'and validates_presence_of was called for the method' do
+            it 'should be required' do
+        
+              @new_post.class.should_receive(:validators_on).with(:title).any_number_of_times.and_return([
+                active_model_presence_validator([:title])
+              ])
+        
+              @new_post.class.should_receive(:validators_on).with(:body).any_number_of_times.and_return([
+                active_model_presence_validator([:body], {:if => true})
+              ])
+        
+              concat(semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title))
+                concat(builder.input(:body))
+              end)
+              output_buffer.should have_tag('form li.required')
+              output_buffer.should_not have_tag('form li.optional')
             end
-
-            after do
-              @new_post.stub!(:class).and_return(::Post)
+        
+            it 'should be not be required if the optional :if condition is not satisifed' do
+              should_be_required(:required => false, :options => { :if => false })
             end
-            describe 'and validates_presence_of was called for the method' do
-              it 'should be required' do
-
-                @new_post.class.should_receive(:validators_on).with(:title).any_number_of_times.and_return([
-                  active_model_presence_validator([:title])
-                ])
-
-                @new_post.class.should_receive(:validators_on).with(:body).any_number_of_times.and_return([
-                  active_model_presence_validator([:body], {:if => true})
-                ])
-
-                concat(semantic_form_for(@new_post) do |builder|
-                  concat(builder.input(:title))
-                  concat(builder.input(:body))
-                end)
-                output_buffer.should have_tag('form li.required')
-                output_buffer.should_not have_tag('form li.optional')
-              end
-
-              it 'should be not be required if the optional :if condition is not satisifed' do
-                should_be_required(:required => false, :options => { :if => false })
-              end
-
-              it 'should not be required if the optional :if proc evaluates to false' do
-                should_be_required(:required => false, :options => { :if => proc { |record| false } })
-              end
-
-              it 'should be required if the optional :if proc evaluates to true' do
-                should_be_required(:required => true, :options => { :if => proc { |record| true } })
-              end
-
-              it 'should not be required if the optional :unless proc evaluates to true' do
-                should_be_required(:required => false, :options => { :unless => proc { |record| true } })
-              end
-
-              it 'should be required if the optional :unless proc evaluates to false' do
-                should_be_required(:required => true, :options => { :unless => proc { |record| false } })
-              end
-
-              it 'should be required if the optional :if with a method string evaluates to true' do
-                @new_post.should_receive(:required_condition).at_least(2).and_return(true)
-                should_be_required(:required => true, :options => { :if => :required_condition })
-              end
-
-              it 'should be required if the optional :if with a method string evaluates to false' do
-                @new_post.should_receive(:required_condition).at_least(2).and_return(false)
-                should_be_required(:required => false, :options => { :if => :required_condition })
-              end
-
-              it 'should not be required if the optional :unless with a method string evaluates to false' do
-                 @new_post.should_receive(:required_condition).at_least(2).and_return(false)
-                should_be_required(:required => true, :options => { :unless => :required_condition })
-              end
-
-               it 'should be required if the optional :unless with a method string evaluates to true' do
-                 @new_post.should_receive(:required_condition).at_least(2).and_return(true)
-                 should_be_required(:required => false, :options => { :unless => :required_condition })
-               end
+        
+            it 'should not be required if the optional :if proc evaluates to false' do
+              should_be_required(:required => false, :options => { :if => proc { |record| false } })
             end
-
-            describe 'and validates_inclusion_of was called for the method' do
-              it 'should be required' do
-                @new_post.class.should_receive(:validators_on).with(:published).any_number_of_times.and_return([
-                  active_model_inclusion_validator([:published], {:in => [false, true]})
-                ])
-
-                concat(semantic_form_for(@new_post) do |builder|
-                  concat(builder.input(:published))
-                end)
-                output_buffer.should have_tag('form li.required')
-                output_buffer.should_not have_tag('form li.optional')
-              end
-              
-              it 'should not be required if allow_blank is true' do
-                @new_post.class.should_receive(:validators_on).with(:published).any_number_of_times.and_return([
-                  active_model_inclusion_validator([:published], {:in => [false, true], :allow_blank => true})
-                ])
-
-                concat(semantic_form_for(@new_post) do |builder|
-                  concat(builder.input(:published))
-                end)
-                output_buffer.should_not have_tag('form li.required')
-                output_buffer.should have_tag('form li.optional')
-              end
+        
+            it 'should be required if the optional :if proc evaluates to true' do
+              should_be_required(:required => true, :options => { :if => proc { |record| true } })
             end
-
-            # TODO make a matcher for this?
-            def should_be_required(options)
-              @new_post.class.should_receive(:validators_on).with(:body).at_least(2).and_return([
-                active_model_presence_validator([:body], options[:options])
+        
+            it 'should not be required if the optional :unless proc evaluates to true' do
+              should_be_required(:required => false, :options => { :unless => proc { |record| true } })
+            end
+        
+            it 'should be required if the optional :unless proc evaluates to false' do
+              should_be_required(:required => true, :options => { :unless => proc { |record| false } })
+            end
+        
+            it 'should be required if the optional :if with a method string evaluates to true' do
+              @new_post.should_receive(:required_condition).at_least(2).and_return(true)
+              should_be_required(:required => true, :options => { :if => :required_condition })
+            end
+        
+            it 'should be required if the optional :if with a method string evaluates to false' do
+              @new_post.should_receive(:required_condition).at_least(2).and_return(false)
+              should_be_required(:required => false, :options => { :if => :required_condition })
+            end
+        
+            it 'should not be required if the optional :unless with a method string evaluates to false' do
+               @new_post.should_receive(:required_condition).at_least(2).and_return(false)
+              should_be_required(:required => true, :options => { :unless => :required_condition })
+            end
+        
+             it 'should be required if the optional :unless with a method string evaluates to true' do
+               @new_post.should_receive(:required_condition).at_least(2).and_return(true)
+               should_be_required(:required => false, :options => { :unless => :required_condition })
+             end
+          end
+        
+          describe 'and validates_inclusion_of was called for the method' do
+            it 'should be required' do
+              @new_post.class.should_receive(:validators_on).with(:published).any_number_of_times.and_return([
+                active_model_inclusion_validator([:published], {:in => [false, true]})
               ])
-
+        
               concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:body))
+                concat(builder.input(:published))
               end)
-
-              if options[:required]
-                output_buffer.should_not have_tag('form li.optional')
-                output_buffer.should have_tag('form li.required')
-              else
-                output_buffer.should have_tag('form li.optional')
-                output_buffer.should_not have_tag('form li.required')
-              end
+              output_buffer.should have_tag('form li.required')
+              output_buffer.should_not have_tag('form li.optional')
             end
-
-            describe 'and validates_presence_of was not called for the method' do
-              before do
-                @new_post.class.should_receive(:validators_on).with(:title).at_least(2).and_return([])
-              end
-
-              it 'should not be required' do
-                concat(semantic_form_for(@new_post) do |builder|
-                  concat(builder.input(:title))
-                end)
-                output_buffer.should_not have_tag('form li.required')
-                output_buffer.should have_tag('form li.optional')
-              end
+            
+            it 'should not be required if allow_blank is true' do
+              @new_post.class.should_receive(:validators_on).with(:published).any_number_of_times.and_return([
+                active_model_inclusion_validator([:published], {:in => [false, true], :allow_blank => true})
+              ])
+        
+              concat(semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:published))
+              end)
+              output_buffer.should_not have_tag('form li.required')
+              output_buffer.should have_tag('form li.optional')
             end
-
           end
-
-          describe 'and an object without :validators_on' do
+        
+          # TODO make a matcher for this?
+          def should_be_required(options)
+            @new_post.class.should_receive(:validators_on).with(:body).at_least(2).and_return([
+              active_model_presence_validator([:body], options[:options])
+            ])
+        
+            concat(semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:body))
+            end)
+        
+            if options[:required]
+              output_buffer.should_not have_tag('form li.optional')
+              output_buffer.should have_tag('form li.required')
+            else
+              output_buffer.should have_tag('form li.optional')
+              output_buffer.should_not have_tag('form li.required')
+            end
+          end
+        
+          describe 'and validates_presence_of was not called for the method' do
+            before do
+              @new_post.class.should_receive(:validators_on).with(:title).at_least(2).and_return([])
+            end
+        
+            it 'should not be required' do
+              concat(semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title))
+              end)
+              output_buffer.should_not have_tag('form li.required')
+              output_buffer.should have_tag('form li.optional')
+            end
+          end
+        
+        end
+        
+        describe 'and an object without :validators_on' do
 
             it 'should use the default value' do
               Formtastic::FormBuilder.all_fields_required_by_default.should == true

From 35690f1ab140844cdfa6e4007d4936231b37a754 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 23 Mar 2011 17:14:54 +1100
Subject: [PATCH 627/992] fixed an input_spec.rb test around requirements; an
 input should be optional (not default to the builder config) when the
 validation :if/:unless condition negates the validation. hairy stuff, a bit
 puzzled that I needed to memoize some stuff.

---
 lib/formtastic/inputs/new_base/labelling.rb   |  5 +++--
 lib/formtastic/inputs/new_base/validations.rb | 22 ++++++++++++++-----
 spec/input_spec.rb                            |  2 +-
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/lib/formtastic/inputs/new_base/labelling.rb b/lib/formtastic/inputs/new_base/labelling.rb
index 4893212ba..35670f40c 100644
--- a/lib/formtastic/inputs/new_base/labelling.rb
+++ b/lib/formtastic/inputs/new_base/labelling.rb
@@ -8,9 +8,10 @@ module Labelling
         def label_text
           ((localized_label || humanized_method_name) << requirement_text).html_safe
         end
-
+        
+        # TODO: why does this need to be memoized in order to make the inputs_spec tests pass? 
         def requirement_text_or_proc
-          required? ? builder.required_string : builder.optional_string
+          @requirement_text_or_proc ||= required? ? builder.required_string : builder.optional_string
         end
         
         def requirement_text
diff --git a/lib/formtastic/inputs/new_base/validations.rb b/lib/formtastic/inputs/new_base/validations.rb
index b590b2e52..2fd875e4e 100644
--- a/lib/formtastic/inputs/new_base/validations.rb
+++ b/lib/formtastic/inputs/new_base/validations.rb
@@ -2,9 +2,9 @@ module Formtastic
   module Inputs
     module NewBase
       module Validations
-
+        
         def validations
-          if object && object.class.respond_to?(:validators_on) 
+          @validations ||= if object && object.class.respond_to?(:validators_on) 
             object.class.validators_on(attributized_method_name).select do |validator|
               validator_relevant?(validator)
             end
@@ -15,7 +15,7 @@ def validations
         
         def validator_relevant?(validator)
           return true unless validator.options.key?(:if) || validator.options.key?(:unless)
-          conditional = validator.options[:if] || validator.options[:unless]
+          conditional = validator.options.key?(:if) ? validator.options[:if] : validator.options[:unless]
           
           result = if conditional.respond_to?(:call)
             conditional.call(object)
@@ -25,7 +25,10 @@ def validator_relevant?(validator)
             conditional
           end
           
-          validator.options.key?(:unless) ? !result : !!result
+          result = validator.options.key?(:unless) ? !result : !!result
+          not_required_through_negated_validation! if !result && [:presence, :inclusion, :length].include?(validator.kind)
+
+          result
         end
         
         def validation_limit
@@ -44,15 +47,24 @@ def validations?
         end
         
         def required?
+          return false if not_required_through_negated_validation?
           if validations?
             !validations.find { |validator| [:presence, :inclusion, :length].include?(validator.kind) }.nil?
           else
             return false if options[:required] == false
             return true if options[:required] == true
-            return builder.all_fields_required_by_default
+            return !!builder.all_fields_required_by_default
           end
         end
         
+        def not_required_through_negated_validation?
+          @not_required_through_negated_validation
+        end
+        
+        def not_required_through_negated_validation!
+          @not_required_through_negated_validation = true
+        end
+        
         def optional?
           !required?
         end
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index e01646fdb..fb1b18317 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -192,7 +192,7 @@
         
           # TODO make a matcher for this?
           def should_be_required(options)
-            @new_post.class.should_receive(:validators_on).with(:body).at_least(2).and_return([
+            @new_post.class.stub!(:validators_on).with(:body).and_return([
               active_model_presence_validator([:body], options[:options])
             ])
         

From 331229a380e527efaf9192afc2721d80dd1b5723 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 24 Mar 2011 06:29:01 +1100
Subject: [PATCH 628/992] stop testing the implementation and inner workings :)

---
 spec/input_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index fb1b18317..4b8d3fd78 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -144,22 +144,22 @@
             end
         
             it 'should be required if the optional :if with a method string evaluates to true' do
-              @new_post.should_receive(:required_condition).at_least(2).and_return(true)
+              @new_post.should_receive(:required_condition).and_return(true)
               should_be_required(:required => true, :options => { :if => :required_condition })
             end
         
             it 'should be required if the optional :if with a method string evaluates to false' do
-              @new_post.should_receive(:required_condition).at_least(2).and_return(false)
+              @new_post.should_receive(:required_condition).and_return(false)
               should_be_required(:required => false, :options => { :if => :required_condition })
             end
         
             it 'should not be required if the optional :unless with a method string evaluates to false' do
-               @new_post.should_receive(:required_condition).at_least(2).and_return(false)
+               @new_post.should_receive(:required_condition).and_return(false)
               should_be_required(:required => true, :options => { :unless => :required_condition })
             end
         
              it 'should be required if the optional :unless with a method string evaluates to true' do
-               @new_post.should_receive(:required_condition).at_least(2).and_return(true)
+               @new_post.should_receive(:required_condition).and_return(true)
                should_be_required(:required => false, :options => { :unless => :required_condition })
              end
           end

From 0fcd767531a6f138456ccb6e7ba0526d4e7992c9 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 24 Mar 2011 06:30:23 +1100
Subject: [PATCH 629/992] required? should take :allow_blank => true into
 account

---
 lib/formtastic/inputs/new_base/validations.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/new_base/validations.rb b/lib/formtastic/inputs/new_base/validations.rb
index 2fd875e4e..691a97859 100644
--- a/lib/formtastic/inputs/new_base/validations.rb
+++ b/lib/formtastic/inputs/new_base/validations.rb
@@ -49,7 +49,10 @@ def validations?
         def required?
           return false if not_required_through_negated_validation?
           if validations?
-            !validations.find { |validator| [:presence, :inclusion, :length].include?(validator.kind) }.nil?
+            validations.select { |validator| 
+              [:presence, :inclusion, :length].include?(validator.kind) &&
+              validator.options[:allow_blank] != true
+            }.any?
           else
             return false if options[:required] == false
             return true if options[:required] == true

From 09b221098d9bc773153fff523aa9f01cdfd40ec7 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 24 Mar 2011 06:36:46 +1100
Subject: [PATCH 630/992] [REVIEW] I think that test is wrong, so I reversed

---
 spec/input_spec.rb | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 4b8d3fd78..322cf44e2 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -208,18 +208,19 @@ def should_be_required(options)
               output_buffer.should_not have_tag('form li.required')
             end
           end
-        
-          describe 'and validates_presence_of was not called for the method' do
+          
+          # TODO JF reversed this during refactor, need to make sure
+          describe 'and there are no requirement validations on the method' do
             before do
-              @new_post.class.should_receive(:validators_on).with(:title).at_least(2).and_return([])
+              @new_post.class.should_receive(:validators_on).with(:title).and_return([])
             end
         
-            it 'should not be required' do
+            it 'should use the default value' do
               concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title))
               end)
-              output_buffer.should_not have_tag('form li.required')
-              output_buffer.should have_tag('form li.optional')
+              output_buffer.should have_tag('form li.required')
+              output_buffer.should_not have_tag('form li.optional')
             end
           end
         

From 0c354e1cedb5ff576942a9fb1945952aa672ba36 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 24 Mar 2011 06:45:47 +1100
Subject: [PATCH 631/992] [REVIEW] made a test less specific and added a note
 questioning it's validity

---
 spec/input_spec.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 322cf44e2..121b11abb 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -428,6 +428,7 @@ def should_be_required(options)
       end
 
       describe 'when not provided' do
+        # TODO this test isn't really routing through i18n, is it valid?
         describe 'when localized label is provided' do
           describe 'and object is given' do
             describe 'and label_str_method not default' do
@@ -440,7 +441,7 @@ def should_be_required(options)
                   concat(semantic_form_for(@new_post) do |builder|
                     concat(builder.input(:meta_description))
                   end)
-                  output_buffer.should have_tag('form li label', Regexp.new('^' + @localized_label_text))
+                  output_buffer.should have_tag('form li label', /Localized title/)
                 end
               end
             end

From 574859dc805b1a249d8507f196891a7e34ff7f04 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 24 Mar 2011 17:43:58 +1100
Subject: [PATCH 632/992] [REVIEW] some hacks to get the existing label specs
 to pass, can't wait to rip this shit out

---
 lib/formtastic/inputs/new_base/labelling.rb |  2 +-
 lib/formtastic/inputs/new_base/naming.rb    |  9 ++++--
 spec/input_spec.rb                          | 33 +++++++++++++--------
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/lib/formtastic/inputs/new_base/labelling.rb b/lib/formtastic/inputs/new_base/labelling.rb
index 35670f40c..b776feb12 100644
--- a/lib/formtastic/inputs/new_base/labelling.rb
+++ b/lib/formtastic/inputs/new_base/labelling.rb
@@ -27,7 +27,7 @@ def label_from_options
         end
 
         def localized_label
-          localized_string(method, label_from_options, :label)
+          localized_string(method, label_from_options || method, :label)
         end
         
         def render_label?
diff --git a/lib/formtastic/inputs/new_base/naming.rb b/lib/formtastic/inputs/new_base/naming.rb
index 458f1a26f..b419e73ad 100644
--- a/lib/formtastic/inputs/new_base/naming.rb
+++ b/lib/formtastic/inputs/new_base/naming.rb
@@ -20,8 +20,13 @@ def attributized_method_name
         end
         
         def humanized_method_name
-          if object && object.class.respond_to?(:human_attribute_name)
-            object.class.human_attribute_name(method.to_s)
+          if builder.label_str_method != :humanize
+            # Special case where label_str_method should trump the human_attribute_name
+            # TODO: is this actually a desired bheavior, or should we ditch label_str_method and
+            # rely purely on :human_attribute_name.
+            method.to_s.send(builder.label_str_method)
+          elsif object && object.class.respond_to?(:human_attribute_name)
+            object.class.human_attribute_name(method.to_s).send(builder.label_str_method)
           else
             method.to_s.send(builder.label_str_method)
           end
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 121b11abb..dbc5e0a1c 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -13,7 +13,11 @@
     @errors.stub!(:[]).and_return([])
     @new_post.stub!(:errors).and_return(@errors)
   end
-
+  
+  after do
+    ::I18n.backend.reload!
+  end
+  
   describe 'arguments and options' do
   
     it 'should require the first argument (the method on form\'s object)' do
@@ -428,15 +432,19 @@ def should_be_required(options)
       end
 
       describe 'when not provided' do
-        # TODO this test isn't really routing through i18n, is it valid?
         describe 'when localized label is provided' do
           describe 'and object is given' do
-            describe 'and label_str_method not default' do
-              it 'should render a label with localized label (I18n)' do
-                with_config :label_str_method, :capitalize do
+            describe 'and label_str_method not :humanize' do
+              it 'should render a label with localized text and not apply the label_str_method' do
+                with_config :label_str_method, :reverse do
                   @localized_label_text = 'Localized title'
                   @new_post.stub!(:meta_description)
-                  @new_post.class.should_receive(:human_attribute_name).with('meta_description').and_return(@localized_label_text)
+                  ::I18n.backend.store_translations :en,
+                    :formtastic => {
+                      :labels => {
+                        :meta_description => @localized_label_text
+                      }
+                    }
 
                   concat(semantic_form_for(@new_post) do |builder|
                     concat(builder.input(:meta_description))
@@ -451,12 +459,13 @@ def should_be_required(options)
         describe 'when localized label is NOT provided' do
           describe 'and object is not given' do
             it 'should default the humanized method name, passing it down to the label tag' do
-              Formtastic::FormBuilder.label_str_method = :humanize
-
-              concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
-                concat(builder.input(:meta_description))
-              end)
-              output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
+              ::I18n.backend.store_translations :en, :formtastic => {}
+              with_config :label_str_method, :humanize do
+                concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
+                  concat(builder.input(:meta_description))
+                end)
+                output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
+              end
             end
           end
 

From fbac98a21575df869c039188b9f8671774459434 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 24 Mar 2011 17:49:02 +1100
Subject: [PATCH 633/992] fix hint specs in input_spec

---
 lib/formtastic/inputs/new_base/hints.rb | 8 ++++++--
 lib/formtastic/inputs/new_base/html.rb  | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic/inputs/new_base/hints.rb b/lib/formtastic/inputs/new_base/hints.rb
index 418f573a3..07379b830 100644
--- a/lib/formtastic/inputs/new_base/hints.rb
+++ b/lib/formtastic/inputs/new_base/hints.rb
@@ -4,12 +4,16 @@ module NewBase
       module Hints
 
         def hint?
-          !hint.blank? && !hint.kind_of?(Hash)
+          !hint_text.blank? && !hint_text.kind_of?(Hash)
         end
 
-        def hint
+        def hint_text
           localized_string(method, options[:hint], :hint)
         end
+        
+        def hint_text_from_options
+          options[:hint]
+        end
 
       end
     end
diff --git a/lib/formtastic/inputs/new_base/html.rb b/lib/formtastic/inputs/new_base/html.rb
index 2dece43e4..b9eba5c34 100644
--- a/lib/formtastic/inputs/new_base/html.rb
+++ b/lib/formtastic/inputs/new_base/html.rb
@@ -88,7 +88,7 @@ def hint_html
           if hint?
             template.content_tag(
               :p, 
-              Formtastic::Util.html_safe(options[:hint]), 
+              Formtastic::Util.html_safe(hint_text), 
               :class => (options[:hint_class] || builder.default_hint_class)
             )
           end

From adf7fa395532d29740dad4dbce7f18d2bf468e8f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 24 Mar 2011 17:50:49 +1100
Subject: [PATCH 634/992] a custom wrapper id HTML attribute can again be used

---
 lib/formtastic/inputs/new_base/html.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/new_base/html.rb b/lib/formtastic/inputs/new_base/html.rb
index b9eba5c34..2368c6ab0 100644
--- a/lib/formtastic/inputs/new_base/html.rb
+++ b/lib/formtastic/inputs/new_base/html.rb
@@ -52,7 +52,7 @@ def wrapper_html_options
           opts[:class] << "required" if required?
           opts[:class] = opts[:class].join(' ')
           
-          opts[:id] = wrapper_dom_id
+          opts[:id] ||= wrapper_dom_id
         
           opts
         end

From 99f2b027375d0c904818cac1df90cb8d2cdf2e8d Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 24 Mar 2011 17:53:15 +1100
Subject: [PATCH 635/992] cater for wrapper HTML class as symbol instead of
 string, and some clean-up

---
 lib/formtastic/inputs/new_base/html.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/new_base/html.rb b/lib/formtastic/inputs/new_base/html.rb
index 2368c6ab0..9a9c08128 100644
--- a/lib/formtastic/inputs/new_base/html.rb
+++ b/lib/formtastic/inputs/new_base/html.rb
@@ -45,7 +45,7 @@ def input_wrapping(&block)
         def wrapper_html_options
           opts = options[:wrapper_html] || {}
           opts[:class] ||= []
-          opts[:class] = opts[:class].to_a if opts[:class].is_a?(String)
+          opts[:class] = [opts[:class].to_s] unless opts[:class].is_a?(Array)
           opts[:class] << as
           opts[:class] << "error" if errors?
           opts[:class] << "optional" if optional?

From 3b7bc44906fc3bdace9db88e20d119d206cf5f00 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 28 Mar 2011 19:40:58 +1100
Subject: [PATCH 636/992] an :for_options => { :index => 10 } now works again

---
 lib/formtastic/inputs/new_base/html.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/new_base/html.rb b/lib/formtastic/inputs/new_base/html.rb
index 9a9c08128..a6cf65221 100644
--- a/lib/formtastic/inputs/new_base/html.rb
+++ b/lib/formtastic/inputs/new_base/html.rb
@@ -108,7 +108,9 @@ def wrapper_dom_id
         end
         
         def dom_index
-          if options.has_key?(:index)
+          if builder.options.has_key?(:index)
+            builder.options[:index]
+          elsif options.has_key?(:index)
             options[:index]
           elsif defined?(@auto_index)
             @auto_index

From 1aea99cb7ee330861c738b1dfead0f9768e96da7 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 28 Mar 2011 21:19:23 +1100
Subject: [PATCH 637/992] we don't need Inputs::Base any more

---
 lib/formtastic/inputs/base.rb | 120 ----------------------------------
 1 file changed, 120 deletions(-)
 delete mode 100644 lib/formtastic/inputs/base.rb

diff --git a/lib/formtastic/inputs/base.rb b/lib/formtastic/inputs/base.rb
deleted file mode 100644
index f82e58b0f..000000000
--- a/lib/formtastic/inputs/base.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-module Formtastic
-  module Inputs
-    # @private
-    module Base
-      include Formtastic::Reflection
-      include Formtastic::LocalizedString
-
-      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
-
-      def escape_html_entities(string) #:nodoc:
-        if escape_html_entities_in_hints_and_labels
-          # Acceppt html_safe flag as indicator to skip escaping
-          string = template.escape_once(string) unless string.respond_to?(:html_safe?) && string.html_safe? == true
-        end
-        string
-      end
-
-      # Prepare options to be sent to label
-      def options_for_label(options) #:nodoc:
-        options.slice(:label, :required).merge!(options.fetch(:label_html, {}))
-      end
-
-      # 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, :find_options, :class)
-      end
-
-      # Generates the legend for radiobuttons and checkboxes
-      def legend_tag(method, options = {})
-        if options[:label] == false
-          Formtastic::Util.html_safe("")
-        else
-          text = localized_string(method, options[:label], :label) || humanized_attribute_name(method)
-          text += required_or_optional_string(options.delete(:required))
-          text = Formtastic::Util.html_safe(text)
-          template.content_tag :legend, template.label_tag(nil, text, :for => nil), :class => :label
-        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 a plain string
-        return collection if collection.instance_of?(String) || collection.instance_of?(ActiveSupport::SafeBuffer)
-
-        # 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) &&
-                             !(options.include?(:label_method) || options.include?(:value_method))
-
-        label, value = detect_label_and_value_method!(collection, options)
-        collection.map { |o| [send_or_call(label, o), send_or_call(value, o)] }
-      end
-
-      # Detects the label and value methods from a collection using methods set in
-      # collection_label_methods and collection_value_methods. For some ruby core
-      # classes sensible defaults have been defined. It will use and delete the options
-      # :label_method and :value_methods when present.
-      #
-      def detect_label_and_value_method!(collection, options = {})
-        sample = collection.first || collection.last
-
-        case sample
-        when Array
-          label, value = :first, :last
-        when Integer
-          label, value = :to_s, :to_i
-        when String, NilClass
-          label, value = :to_s, :to_s
-        end
-
-        # Order of preference: user supplied method, class defaults, auto-detect
-        label = options[:label_method] || label || collection_label_methods.find { |m| sample.respond_to?(m) }
-        value = options[:value_method] || value || collection_value_methods.find { |m| sample.respond_to?(m) }
-
-        [label, value]
-      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 = reflection_for(method)
-          if [:has_and_belongs_to_many, :has_many].include?(reflection.macro)
-            "#{method.to_s.singularize}_ids"
-          elsif reflection.respond_to? :foreign_key
-            reflection.foreign_key
-          else
-            reflection.options[:foreign_key] || "#{method}_id"
-          end
-        else
-          method
-        end.to_sym
-      end
-
-    end
-  end
-end
\ No newline at end of file

From 050ef12645560e4fa179a9ef161b3434dc2fea81 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 29 Mar 2011 06:42:32 +1100
Subject: [PATCH 638/992] Added new rcov tasks, made spec_and_verify_coverage
 the default rake task.

Coverage set to current coverage.
---
 .gitignore                       |  1 +
 Rakefile                         | 16 +++++++++---
 formtastic.gemspec               |  2 ++
 lib/tasks/verify_rcov.rb         | 42 ++++++++++++++++++++++++++++++++
 spec/support/test_environment.rb |  1 +
 5 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 lib/tasks/verify_rcov.rb

diff --git a/.gitignore b/.gitignore
index 6acfab863..8fddd2b96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 .rvmrc
 coverage
+coverage.data
 pkg
 *~
 *watchr.rb
diff --git a/Rakefile b/Rakefile
index b8a3b0a80..87726310d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -3,9 +3,10 @@ require 'rubygems'
 require 'rake'
 require 'rake/rdoctask'
 require 'rspec/core/rake_task'
+require 'tasks/verify_rcov'
 
 desc 'Default: run unit specs.'
-task :default => :spec
+task :default => :spec_and_verify_coverage
 
 desc 'Generate documentation for the formtastic plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
@@ -32,8 +33,17 @@ RSpec::Core::RakeTask.new('specdoc') do |t|
 end
 
 desc 'Run all examples with RCov'
-RSpec::Core::RakeTask.new('examples_with_rcov') do |t|
+RSpec::Core::RakeTask.new('rcov') do |t|
   t.pattern = FileList['spec/**/*_spec.rb']
   t.rcov = true
-  t.rcov_opts = ['--exclude', 'spec,Library']
+  t.rcov_opts = %w(--exclude gems/*,spec/*,.bundle/*, --aggregate coverage.data)
+end
+
+RCov::VerifyTask.new(:verify_coverage) do |t|
+  t.require_exact_threshold = false
+  t.threshold = 94.98
+end
+
+desc "Run all examples and verify coverage"
+task :spec_and_verify_coverage => [:rcov, :verify_coverage] do
 end
diff --git a/formtastic.gemspec b/formtastic.gemspec
index 5ae51d55e..f2558b223 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -41,5 +41,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<hpricot>, ["~> 0.8.3"])
   s.add_development_dependency(%q<BlueCloth>) # for YARD
   s.add_development_dependency(%q<yard>, ["~> 0.6"])
+  s.add_development_dependency(%q<rcov>, ["~> 0.9.9"])
+  s.add_development_dependency(%q<colored>)
 
 end
diff --git a/lib/tasks/verify_rcov.rb b/lib/tasks/verify_rcov.rb
new file mode 100644
index 000000000..c76579875
--- /dev/null
+++ b/lib/tasks/verify_rcov.rb
@@ -0,0 +1,42 @@
+require 'colored'
+module RCov
+
+  class VerifyTask < Rake::TaskLib
+
+    attr_accessor :name
+    attr_accessor :index_html
+    attr_accessor :verbose
+    attr_accessor :threshold
+    attr_accessor :require_exact_threshold
+
+    def initialize(name=:verify_rcov)
+      @name = name
+      @index_html = 'coverage/index.html'
+      @verbose = true
+      @require_exact_threshold = true
+      yield self if block_given?
+      raise "Threshold must be set" if @threshold.nil?
+      define
+    end
+
+    def define
+      desc "Verify that rcov coverage is at least #{threshold}%"
+      task @name do
+        total_coverage = 0
+        File.open(index_html).each_line do |line|
+          if line =~ /<tt class='coverage_total'>\s*(\d+\.\d+)%\s*<\/tt>/
+            total_coverage = $1.to_f
+            break
+          end
+        end
+        output_coverage(total_coverage)
+      end
+    end
+
+    def output_coverage(total_coverage)
+      puts "Coverage: #{total_coverage}% (threshold: #{threshold}%)".green if verbose && total_coverage >= threshold
+      raise "Coverage must be at least #{threshold}% but was #{total_coverage}%".red if total_coverage < threshold
+      raise "Coverage has increased above the threshold of #{threshold}% to #{total_coverage}%. You should update your threshold value.".red if (total_coverage > threshold) and require_exact_threshold
+    end
+  end
+end
diff --git a/spec/support/test_environment.rb b/spec/support/test_environment.rb
index 3d4aa2ddf..b90868345 100644
--- a/spec/support/test_environment.rb
+++ b/spec/support/test_environment.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'rspec'
 require 'rspec_tag_matchers'
 
 RSpec.configure do |config|

From bef00d4be9e5b0dd7355f152d033c416d56f908f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 29 Mar 2011 17:08:05 +1100
Subject: [PATCH 639/992] #dom_index doesn't need to check the input's options
 hash

---
 lib/formtastic/inputs/new_base/html.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/formtastic/inputs/new_base/html.rb b/lib/formtastic/inputs/new_base/html.rb
index a6cf65221..a08d42764 100644
--- a/lib/formtastic/inputs/new_base/html.rb
+++ b/lib/formtastic/inputs/new_base/html.rb
@@ -110,8 +110,6 @@ def wrapper_dom_id
         def dom_index
           if builder.options.has_key?(:index)
             builder.options[:index]
-          elsif options.has_key?(:index)
-            options[:index]
           elsif defined?(@auto_index)
             @auto_index
           else

From 93ea3982ae7e2fc7ac35cdbb3863d9da97024944 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 29 Mar 2011 17:19:33 +1100
Subject: [PATCH 640/992] FormBuilder#template only needs to be a reader, not
 an accessor

---
 lib/formtastic/form_builder.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 21af718d5..a640f8a5d 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -29,7 +29,7 @@ def self.configure(name, value = nil)
     configure :default_error_list_class, 'errors'
     configure :default_hint_class, 'inline-hints'
 
-    attr_accessor :template
+    attr_reader :template
 
     include Formtastic::HtmlAttributes
 

From 6c561fcd38ade8c36c974fb03e037c0bb26fafce Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 29 Mar 2011 17:31:26 +1100
Subject: [PATCH 641/992] expose @auto_index as an attr_reader on the builder
 which should make the Html module work as intended, but I have no idea how to
 test and there's no coverage

---
 lib/formtastic/form_builder.rb         | 2 ++
 lib/formtastic/inputs/new_base/html.rb | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index a640f8a5d..37977da64 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -30,6 +30,8 @@ def self.configure(name, value = nil)
     configure :default_hint_class, 'inline-hints'
 
     attr_reader :template
+    
+    attr_reader :auto_index
 
     include Formtastic::HtmlAttributes
 
diff --git a/lib/formtastic/inputs/new_base/html.rb b/lib/formtastic/inputs/new_base/html.rb
index a08d42764..7d77a1fca 100644
--- a/lib/formtastic/inputs/new_base/html.rb
+++ b/lib/formtastic/inputs/new_base/html.rb
@@ -110,8 +110,9 @@ def wrapper_dom_id
         def dom_index
           if builder.options.has_key?(:index)
             builder.options[:index]
-          elsif defined?(@auto_index)
-            @auto_index
+          elsif !builder.auto_index.blank?
+            # TODO there's no coverage for this case, not sure how to create a scenario for it
+            builder.auto_index
           else
             ""
           end

From f71928b95621c7e168f5762b8954a8a490f5d5c4 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 29 Mar 2011 17:42:52 +1100
Subject: [PATCH 642/992] refactored BooleanInput a bit more

---
 lib/formtastic/inputs/boolean_input.rb | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/formtastic/inputs/boolean_input.rb b/lib/formtastic/inputs/boolean_input.rb
index 893e96eed..16199e880 100644
--- a/lib/formtastic/inputs/boolean_input.rb
+++ b/lib/formtastic/inputs/boolean_input.rb
@@ -34,12 +34,12 @@ class BooleanInput
       
       def to_html
         input_wrapping do
-          hidden_field << 
+          hidden_field_html << 
           label_with_nested_checkbox
         end
       end
       
-      def hidden_field
+      def hidden_field_html
         template.hidden_field_tag(input_html_options[:name], unchecked_value, :id => nil)
       end
       
@@ -47,18 +47,22 @@ def label_with_nested_checkbox
         builder.label(
           method,
           label_text_with_embedded_checkbox, 
-          input_html_options.merge(
-            :id => nil,
-            :for => input_html_options[:id]
-          )
+          label_html_options
+        )
+      end
+      
+      def label_html_options
+        input_html_options.merge(
+          :id => nil,
+          :for => input_html_options[:id]
         )
       end
       
       def label_text_with_embedded_checkbox
-        label_text << " " << check_box
+        label_text << " " << check_box_html
       end
       
-      def check_box
+      def check_box_html
         template.check_box_tag("#{object_name}[#{method}]", checked_value, checked?, input_html_options)
       end
       

From 2ef4595d7db78f2ebf4926c7d123596dda6ba501 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 30 Mar 2011 17:47:48 +1100
Subject: [PATCH 643/992] refactored CheckBoxesInput#to_html into a bunch of
 smaller methods

---
 lib/formtastic/inputs/check_boxes_input.rb | 105 +++++++++++++++------
 1 file changed, 78 insertions(+), 27 deletions(-)

diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index f0751960e..4804fbafb 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -73,35 +73,84 @@ class CheckBoxesInput
       
       def to_html
         input_wrapping do
-          template.content_tag(:fieldset, 
+          choices_wrapping do
             legend_html <<
             hidden_field_for_all <<
-            template.content_tag(:ol,
-              collection.map { |choice|
-                
-                check_box_label = choice.is_a?(Array) ? choice.first : choice
-                check_box_value = choice.is_a?(Array) ? choice.last : choice
-                
-                html_safe_value = check_box_value.to_s.gsub(/\s/, '_').gsub(/\W/, '').downcase
-                check_box_input_id = "#{sanitized_object_name}_#{association_primary_key || method}_#{html_safe_value}"
-                check_box_input_id = "#{builder.custom_namespace}_#{check_box_input_id}" unless builder.custom_namespace.blank?
-                
-                template.content_tag(:li,
-                  template.content_tag(:label,
-                    hidden_fields? ? 
-                      check_box_with_hidden_input(check_box_value, check_box_input_id) : 
-                      check_box_without_hidden_input(check_box_value, check_box_input_id) <<
-                    check_box_label,
-                    label_html_options.merge(:for => check_box_input_id)
-                  ),
-                  :class => value_as_class? ? "#{sanitized_method_name.singularize}_#{html_safe_value}" : ''
-                )
+            choices_group_wrapping do
+              collection.map { |choice| 
+                choice_wrapping(choice_wrapping_html_options(choice)) do
+                  choice_html(choice)
+                end
               }.join("\n").html_safe
-            )
-          )
+            end
+          end
         end
       end
       
+      def choices_wrapping(&block)
+        template.content_tag(:fieldset, 
+          template.capture(&block),
+          choices_wrapping_html_options
+        )
+      end
+      
+      def choices_wrapping_html_options
+        {}
+      end
+      
+      def choices_group_wrapping(&block)
+        template.content_tag(:ol, 
+          template.capture(&block),
+          choices_group_wrapping_html_options
+        )
+      end
+      
+      def choices_group_wrapping_html_options
+        {}
+      end
+      
+      def choice_wrapping(html_options, &block)
+        template.content_tag(:li, 
+          template.capture(&block),
+          html_options
+        )
+      end
+      
+      def choice_wrapping_html_options(choice)
+        { :class => value_as_class? ? "#{sanitized_method_name.singularize}_#{choice_html_safe_value(choice)}" : '' }
+      end
+      
+      def choice_html(choice)        
+        template.content_tag(:label,
+          hidden_fields? ? 
+            check_box_with_hidden_input(choice) : 
+            check_box_without_hidden_input(choice) <<
+          choice_label(choice),
+          label_html_options.merge(:for => choice_input_dom_id(choice))
+        )
+      end
+      
+      def choice_label(choice)
+        choice.is_a?(Array) ? choice.first : choice
+      end
+      
+      def choice_value(choice)
+        choice.is_a?(Array) ? choice.last : choice
+      end
+      
+      def choice_html_safe_value(choice)
+        choice_value(choice).to_s.gsub(/\s/, '_').gsub(/\W/, '').downcase
+      end
+      
+      def choice_input_dom_id(choice)
+        [
+          builder.custom_namespace,
+          sanitized_object_name,
+          association_primary_key || method,
+          choice_html_safe_value(choice)
+        ].compact.reject { |i| i.blank? }.join("_")
+      end
+      
       def hidden_field_for_all
         if hidden_fields?
           ""
@@ -132,21 +181,23 @@ def hidden_fields?
         options[:hidden_fields]
       end
       
-      def check_box_with_hidden_input(value, check_box_input_id)
+      def check_box_with_hidden_input(choice)
+        value = choice_value(choice)
         builder.check_box(
           association_primary_key || method, 
-          input_html_options.merge(:id => check_box_input_id, :name => input_name, :disabled => disabled?(value)), 
+          input_html_options.merge(:id => choice_input_dom_id(choice), :name => input_name, :disabled => disabled?(value)), 
           value, 
           unchecked_value
         )
       end
       
-      def check_box_without_hidden_input(value, check_box_input_id)
+      def check_box_without_hidden_input(choice)
+        value = choice_value(choice)
         template.check_box_tag(
           input_name, 
           value, 
           checked?(value), 
-          input_html_options.merge(:id => check_box_input_id, :disabled => disabled?(value))
+          input_html_options.merge(:id => choice_input_dom_id(choice), :disabled => disabled?(value))
         ) 
       end
       

From 748c87f892523e044b87e918228ba9d5bb9dd91a Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 30 Mar 2011 20:21:01 +1100
Subject: [PATCH 644/992] shifted most of the choices logic out to a Choices
 module

---
 lib/formtastic/inputs/check_boxes_input.rb | 67 +-------------------
 lib/formtastic/inputs/new_base.rb          |  1 +
 lib/formtastic/inputs/new_base/choices.rb  | 73 ++++++++++++++++++++++
 3 files changed, 76 insertions(+), 65 deletions(-)
 create mode 100644 lib/formtastic/inputs/new_base/choices.rb

diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index 4804fbafb..398e3d796 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -70,6 +70,7 @@ module Inputs
     class CheckBoxesInput
       include NewBase
       include NewBase::Collections
+      include NewBase::Choices
       
       def to_html
         input_wrapping do
@@ -86,71 +87,7 @@ def to_html
           end
         end
       end
-      
-      def choices_wrapping(&block)
-        template.content_tag(:fieldset, 
-          template.capture(&block),
-          choices_wrapping_html_options
-        )
-      end
-      
-      def choices_wrapping_html_options
-        {}
-      end
-      
-      def choices_group_wrapping(&block)
-        template.content_tag(:ol, 
-          template.capture(&block),
-          choices_group_wrapping_html_options
-        )
-      end
-      
-      def choices_group_wrapping_html_options
-        {}
-      end
-      
-      def choice_wrapping(html_options, &block)
-        template.content_tag(:li, 
-          template.capture(&block),
-          html_options
-        )
-      end
-      
-      def choice_wrapping_html_options(choice)
-        { :class => value_as_class? ? "#{sanitized_method_name.singularize}_#{choice_html_safe_value(choice)}" : '' }
-      end
-      
-      def choice_html(choice)        
-        template.content_tag(:label,
-          hidden_fields? ? 
-            check_box_with_hidden_input(choice) : 
-            check_box_without_hidden_input(choice) <<
-          choice_label(choice),
-          label_html_options.merge(:for => choice_input_dom_id(choice))
-        )
-      end
-      
-      def choice_label(choice)
-        choice.is_a?(Array) ? choice.first : choice
-      end
-      
-      def choice_value(choice)
-        choice.is_a?(Array) ? choice.last : choice
-      end
-      
-      def choice_html_safe_value(choice)
-        choice_value(choice).to_s.gsub(/\s/, '_').gsub(/\W/, '').downcase
-      end
-      
-      def choice_input_dom_id(choice)
-        [
-          builder.custom_namespace,
-          sanitized_object_name,
-          association_primary_key || method,
-          choice_html_safe_value(choice)
-        ].compact.reject { |i| i.blank? }.join("_")
-      end
-      
+
       def hidden_field_for_all
         if hidden_fields?
           ""
diff --git a/lib/formtastic/inputs/new_base.rb b/lib/formtastic/inputs/new_base.rb
index f9b4526b5..e65bdf9ff 100644
--- a/lib/formtastic/inputs/new_base.rb
+++ b/lib/formtastic/inputs/new_base.rb
@@ -17,6 +17,7 @@ def initialize(builder, template, object, object_name, method, options)
       
       autoload :Associations
       autoload :Collections
+      autoload :Choices
       autoload :Database
       autoload :Errors
       autoload :Fileish
diff --git a/lib/formtastic/inputs/new_base/choices.rb b/lib/formtastic/inputs/new_base/choices.rb
new file mode 100644
index 000000000..4beb0e412
--- /dev/null
+++ b/lib/formtastic/inputs/new_base/choices.rb
@@ -0,0 +1,73 @@
+module Formtastic
+  module Inputs
+    module NewBase
+      module Choices
+        
+        def choices_wrapping(&block)
+          template.content_tag(:fieldset, 
+            template.capture(&block),
+            choices_wrapping_html_options
+          )
+        end
+
+        def choices_wrapping_html_options
+          {}
+        end
+
+        def choices_group_wrapping(&block)
+          template.content_tag(:ol, 
+            template.capture(&block),
+            choices_group_wrapping_html_options
+          )
+        end
+
+        def choices_group_wrapping_html_options
+          {}
+        end
+
+        def choice_wrapping(html_options, &block)
+          template.content_tag(:li, 
+            template.capture(&block),
+            html_options
+          )
+        end
+
+        def choice_wrapping_html_options(choice)
+          { :class => value_as_class? ? "#{sanitized_method_name.singularize}_#{choice_html_safe_value(choice)}" : '' }
+        end
+
+        def choice_html(choice)        
+          template.content_tag(:label,
+            hidden_fields? ? 
+              check_box_with_hidden_input(choice) : 
+              check_box_without_hidden_input(choice) <<
+            choice_label(choice),
+            label_html_options.merge(:for => choice_input_dom_id(choice))
+          )
+        end
+
+        def choice_label(choice)
+          choice.is_a?(Array) ? choice.first : choice
+        end
+
+        def choice_value(choice)
+          choice.is_a?(Array) ? choice.last : choice
+        end
+
+        def choice_html_safe_value(choice)
+          choice_value(choice).to_s.gsub(/\s/, '_').gsub(/\W/, '').downcase
+        end
+
+        def choice_input_dom_id(choice)
+          [
+            builder.custom_namespace,
+            sanitized_object_name,
+            association_primary_key || method,
+            choice_html_safe_value(choice)
+          ].compact.reject { |i| i.blank? }.join("_")
+        end
+        
+      end
+    end
+  end
+end
\ No newline at end of file

From 9237bc0de5f69291d2adeb509bb755d9ac757aa5 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 30 Mar 2011 21:16:54 +1100
Subject: [PATCH 645/992] extracted a few more methods from CheckBoxInput to
 Choices and implemented RadioInput with Choices

---
 lib/formtastic/inputs/check_boxes_input.rb | 33 +++++--------
 lib/formtastic/inputs/new_base/choices.rb  | 29 +++++++++---
 lib/formtastic/inputs/radio_input.rb       | 54 ++++++++--------------
 3 files changed, 52 insertions(+), 64 deletions(-)

diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index 398e3d796..6fe4a6ca9 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -87,7 +87,17 @@ def to_html
           end
         end
       end
-
+      
+      def choice_html(choice)        
+        template.content_tag(:label,
+          hidden_fields? ? 
+            check_box_with_hidden_input(choice) : 
+            check_box_without_hidden_input(choice) <<
+          choice_label(choice),
+          label_html_options.merge(:for => choice_input_dom_id(choice))
+        )
+      end
+      
       def hidden_field_for_all
         if hidden_fields?
           ""
@@ -99,21 +109,6 @@ def hidden_field_for_all
         end
       end
       
-      def legend_html
-        if render_label?
-          template.content_tag(:legend,
-            template.content_tag(:label, label_text),
-            label_html_options.merge(:class => "label")
-          )
-        else
-          ""
-        end
-      end
-      
-      def value_as_class?
-        options[:value_as_class]
-      end
-      
       def hidden_fields?
         options[:hidden_fields]
       end
@@ -165,12 +160,6 @@ def unchecked_value
         options[:unchecked_value] || ''
       end
       
-      # Override to remove the for attribute since this isn't associated with any element, as it's
-      # nested inside the legend.
-      def label_html_options
-        super.merge(:for => nil)
-      end
-      
       def input_name
         "#{object_name}[#{association_primary_key || method}][]"
       end
diff --git a/lib/formtastic/inputs/new_base/choices.rb b/lib/formtastic/inputs/new_base/choices.rb
index 4beb0e412..a4df684be 100644
--- a/lib/formtastic/inputs/new_base/choices.rb
+++ b/lib/formtastic/inputs/new_base/choices.rb
@@ -37,13 +37,7 @@ def choice_wrapping_html_options(choice)
         end
 
         def choice_html(choice)        
-          template.content_tag(:label,
-            hidden_fields? ? 
-              check_box_with_hidden_input(choice) : 
-              check_box_without_hidden_input(choice) <<
-            choice_label(choice),
-            label_html_options.merge(:for => choice_input_dom_id(choice))
-          )
+          raise "choice_html() needs to be implemented when including Formtastic::Inputs::NewBase::Choices"
         end
 
         def choice_label(choice)
@@ -67,6 +61,27 @@ def choice_input_dom_id(choice)
           ].compact.reject { |i| i.blank? }.join("_")
         end
         
+        def value_as_class?
+          options[:value_as_class]
+        end
+
+        def legend_html
+          if render_label?
+            template.content_tag(:legend,
+              template.content_tag(:label, label_text),
+              label_html_options.merge(:class => "label")
+            )
+          else
+            ""
+          end
+        end
+        
+        # Override to remove the for attribute since this isn't associated with any element, as it's
+        # nested inside the legend.
+        def label_html_options
+          super.merge(:for => nil)
+        end
+
       end
     end
   end
diff --git a/lib/formtastic/inputs/radio_input.rb b/lib/formtastic/inputs/radio_input.rb
index c98f3604a..74f1d3830 100644
--- a/lib/formtastic/inputs/radio_input.rb
+++ b/lib/formtastic/inputs/radio_input.rb
@@ -104,51 +104,35 @@ module Inputs
     #   <%= f.input :author, :as => :radio, :value_as_class => true %>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    # @see Formtastic::Inputs::Select RadioInput as an alternative for `belongs_to` associations
+    # @see Formtastic::Inputs::RadioInput as an alternative for `belongs_to` associations
+    #
+    # @todo :disabled like CheckBoxes?
     class RadioInput
       include NewBase
       include NewBase::Collections
+      include NewBase::Choices
       
       def to_html
         input_wrapping do
-          template.content_tag(:fieldset,
+          choices_wrapping do
             legend_html <<
-            template.content_tag(:ol,
+            choices_group_wrapping do
               collection.map { |choice| 
-
-                label = choice.is_a?(Array) ? choice.first : choice
-                value = choice.is_a?(Array) ? choice.last : choice
-
-                html_safe_value = value.to_s.gsub(/\s/, '_').gsub(/\W/, '').downcase
-                radio_input_id = "#{sanitized_object_name}_#{input_name}_#{html_safe_value}"
-                radio_input_id = "#{builder.custom_namespace}_#{radio_input_id}" unless builder.custom_namespace.blank?
-                
-                template.content_tag(:li, 
-                  template.content_tag(:label,
-                    builder.radio_button(input_name, value, input_html_options.merge(:id => radio_input_id)) << label,
-                    :for => radio_input_id
-                  ),
-                  :class => (value_as_class? ? "#{sanitized_method_name}_#{html_safe_value}" : nil)
-                ) 
-              }.join.html_safe
-            )
-          )
+                choice_wrapping(choice_wrapping_html_options(choice)) do
+                  choice_html(choice)
+                end
+              }.join("\n").html_safe
+            end
+          end
         end
       end
 
-      def value_as_class?
-        options[:value_as_class]
-      end
-      
-      def legend_html
-        if options[:label] == false
-          ""
-        else
-          template.content_tag(:legend,
-            template.content_tag(:label, label_text, label_html_options),
-            :class => "label"
-          )
-        end
+      def choice_html(choice)        
+        template.content_tag(:label,
+          builder.radio_button(input_name, choice_value(choice), input_html_options.merge(:id => choice_input_dom_id(choice))) << 
+          choice_label(choice),
+          label_html_options.merge(:for => choice_input_dom_id(choice))
+        )
       end
       
       # Override to remove the for attribute since this isn't associated with any element, as it's
@@ -156,7 +140,7 @@ def legend_html
       def label_html_options
         super.merge(:for => nil)
       end
-      
+
     end
   end
 end
\ No newline at end of file

From 5cc5cc1b5e2f237dc879b58d86994c77bdfe321a Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 30 Mar 2011 21:30:44 +1100
Subject: [PATCH 646/992] crank the coverage threshold up

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index 87726310d..f7cf899b2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -41,7 +41,7 @@ end
 
 RCov::VerifyTask.new(:verify_coverage) do |t|
   t.require_exact_threshold = false
-  t.threshold = 94.98
+  t.threshold = 95.11
 end
 
 desc "Run all examples and verify coverage"

From 4df789411f77c82cafb926c95b7562018ade4c79 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 31 Mar 2011 07:15:53 +1100
Subject: [PATCH 647/992] extracted the input wrapping methods into Wrapping
 module

---
 lib/formtastic/inputs/new_base.rb          |  4 +--
 lib/formtastic/inputs/new_base/html.rb     | 28 ----------------
 lib/formtastic/inputs/new_base/wrapping.rb | 38 ++++++++++++++++++++++
 3 files changed, 40 insertions(+), 30 deletions(-)
 create mode 100644 lib/formtastic/inputs/new_base/wrapping.rb

diff --git a/lib/formtastic/inputs/new_base.rb b/lib/formtastic/inputs/new_base.rb
index e65bdf9ff..a977df8b1 100644
--- a/lib/formtastic/inputs/new_base.rb
+++ b/lib/formtastic/inputs/new_base.rb
@@ -30,6 +30,7 @@ def initialize(builder, template, object, object_name, method, options)
       autoload :Stringish
       autoload :Timeish
       autoload :Validations
+      autoload :Wrapping
       
       include Html
       include Options
@@ -41,8 +42,7 @@ def initialize(builder, template, object, object_name, method, options)
       include Fileish
       include Associations
       include Labelling
-      
-      
+      include Wrapping
       
     end
   end
diff --git a/lib/formtastic/inputs/new_base/html.rb b/lib/formtastic/inputs/new_base/html.rb
index 7d77a1fca..ba62d7951 100644
--- a/lib/formtastic/inputs/new_base/html.rb
+++ b/lib/formtastic/inputs/new_base/html.rb
@@ -33,30 +33,6 @@ def label_html_options
           opts
         end
         
-        # Override this method if you want to change the display order (for example, rendering the
-        # errors before the body of the input).
-        def input_wrapping(&block)
-          template.content_tag(:li, 
-            [template.capture(&block), error_html, hint_html].join("\n").html_safe, 
-            wrapper_html_options
-          )
-        end
-        
-        def wrapper_html_options
-          opts = options[:wrapper_html] || {}
-          opts[:class] ||= []
-          opts[:class] = [opts[:class].to_s] unless opts[:class].is_a?(Array)
-          opts[:class] << as
-          opts[:class] << "error" if errors?
-          opts[:class] << "optional" if optional?
-          opts[:class] << "required" if required?
-          opts[:class] = opts[:class].join(' ')
-          
-          opts[:id] ||= wrapper_dom_id
-        
-          opts
-        end
-        
         def error_html
           errors? ? send(:"error_#{builder.inline_errors}_html") : ""
         end
@@ -103,10 +79,6 @@ def dom_id
           ].reject { |x| x.blank? }.join('_')
         end
         
-        def wrapper_dom_id
-          @wrapper_dom_id ||= "#{dom_id.to_s.gsub((association_primary_key || method).to_s, sanitized_method_name.to_s)}_input"
-        end
-        
         def dom_index
           if builder.options.has_key?(:index)
             builder.options[:index]
diff --git a/lib/formtastic/inputs/new_base/wrapping.rb b/lib/formtastic/inputs/new_base/wrapping.rb
new file mode 100644
index 000000000..6a1b0a14e
--- /dev/null
+++ b/lib/formtastic/inputs/new_base/wrapping.rb
@@ -0,0 +1,38 @@
+module Formtastic
+  module Inputs
+    module NewBase
+      # @todo relies on `dom_id`, `required?`, `optional`, `errors?`, `association_primary_key` & `sanitized_method_name` methods from another module
+      module Wrapping
+        
+        # Override this method if you want to change the display order (for example, rendering the
+        # errors before the body of the input).
+        def input_wrapping(&block)
+          template.content_tag(:li, 
+            [template.capture(&block), error_html, hint_html].join("\n").html_safe, 
+            wrapper_html_options
+          )
+        end
+        
+        def wrapper_html_options
+          opts = options[:wrapper_html] || {}
+          opts[:class] ||= []
+          opts[:class] = [opts[:class].to_s] unless opts[:class].is_a?(Array)
+          opts[:class] << as
+          opts[:class] << "error" if errors?
+          opts[:class] << "optional" if optional?
+          opts[:class] << "required" if required?
+          opts[:class] = opts[:class].join(' ')
+          
+          opts[:id] ||= wrapper_dom_id
+        
+          opts
+        end
+        
+        def wrapper_dom_id
+          @wrapper_dom_id ||= "#{dom_id.to_s.gsub((association_primary_key || method).to_s, sanitized_method_name.to_s)}_input"
+        end
+                
+      end
+    end
+  end
+end

From f552dcb834c0fb62313ad1cdd098a2c0ac1d914d Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 31 Mar 2011 07:18:00 +1100
Subject: [PATCH 648/992] shifted label_html into the Lablling module

---
 lib/formtastic/inputs/new_base/html.rb      | 12 ------------
 lib/formtastic/inputs/new_base/labelling.rb | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/formtastic/inputs/new_base/html.rb b/lib/formtastic/inputs/new_base/html.rb
index ba62d7951..e77a3eefa 100644
--- a/lib/formtastic/inputs/new_base/html.rb
+++ b/lib/formtastic/inputs/new_base/html.rb
@@ -10,10 +10,6 @@ def to_html
           end
         end
         
-        def label_html
-          render_label? ? builder.label(input_name, label_text, label_html_options) : ""
-        end
-        
         def input_html_options
           opts = options[:input_html] || {}
           opts[:id] ||= input_dom_id
@@ -25,14 +21,6 @@ def input_dom_id
           options[:input_html].try(:[], :id) || dom_id
         end
         
-        def label_html_options
-          # opts = options_for_label(options) # TODO
-          opts = {}
-          opts[:for] ||= input_dom_id
-          
-          opts
-        end
-        
         def error_html
           errors? ? send(:"error_#{builder.inline_errors}_html") : ""
         end
diff --git a/lib/formtastic/inputs/new_base/labelling.rb b/lib/formtastic/inputs/new_base/labelling.rb
index b776feb12..8dc044669 100644
--- a/lib/formtastic/inputs/new_base/labelling.rb
+++ b/lib/formtastic/inputs/new_base/labelling.rb
@@ -5,6 +5,18 @@ module Labelling
         
         include Formtastic::LocalizedString
         
+        def label_html
+          render_label? ? builder.label(input_name, label_text, label_html_options) : ""
+        end
+        
+        def label_html_options
+          # opts = options_for_label(options) # TODO
+          opts = {}
+          opts[:for] ||= input_dom_id
+          
+          opts
+        end
+        
         def label_text
           ((localized_label || humanized_method_name) << requirement_text).html_safe
         end

From ab5e4105fe1f1a9a8837c6c2f3eef8dcf586b048 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 31 Mar 2011 07:20:37 +1100
Subject: [PATCH 649/992] shifted error_html methods to Errors module

---
 lib/formtastic/inputs/new_base/errors.rb | 29 +++++++++++++++++++++++-
 lib/formtastic/inputs/new_base/html.rb   | 27 ----------------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/lib/formtastic/inputs/new_base/errors.rb b/lib/formtastic/inputs/new_base/errors.rb
index e8c9a3dc7..4e213fda9 100644
--- a/lib/formtastic/inputs/new_base/errors.rb
+++ b/lib/formtastic/inputs/new_base/errors.rb
@@ -2,7 +2,34 @@ module Formtastic
   module Inputs
     module NewBase
       module Errors
-
+        
+        def error_html
+          errors? ? send(:"error_#{builder.inline_errors}_html") : ""
+        end
+        
+        def error_sentence_html
+          error_class = options[:error_class] || builder.default_inline_error_class
+          template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.html_safe), :class => error_class)
+        end
+                
+        def error_list_html
+          error_class = options[:error_class] || builder.default_error_list_class
+          list_elements = []
+          errors.each do |error|
+            list_elements << template.content_tag(:li, Formtastic::Util.html_safe(error.html_safe))
+          end
+          template.content_tag(:ul, Formtastic::Util.html_safe(list_elements.join("\n")), :class => error_class)
+        end
+        
+        def error_first_html
+          error_class = options[:error_class] || builder.default_inline_error_class
+          template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => error_class)
+        end
+        
+        def error_none_html
+          ""
+        end
+        
         def errors?
           !errors.blank?
         end
diff --git a/lib/formtastic/inputs/new_base/html.rb b/lib/formtastic/inputs/new_base/html.rb
index e77a3eefa..4cc3d7058 100644
--- a/lib/formtastic/inputs/new_base/html.rb
+++ b/lib/formtastic/inputs/new_base/html.rb
@@ -21,33 +21,6 @@ def input_dom_id
           options[:input_html].try(:[], :id) || dom_id
         end
         
-        def error_html
-          errors? ? send(:"error_#{builder.inline_errors}_html") : ""
-        end
-        
-        def error_sentence_html
-          error_class = options[:error_class] || builder.default_inline_error_class
-          template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.html_safe), :class => error_class)
-        end
-                
-        def error_list_html
-          error_class = options[:error_class] || builder.default_error_list_class
-          list_elements = []
-          errors.each do |error|
-            list_elements << template.content_tag(:li, Formtastic::Util.html_safe(error.html_safe))
-          end
-          template.content_tag(:ul, Formtastic::Util.html_safe(list_elements.join("\n")), :class => error_class)
-        end
-        
-        def error_first_html
-          error_class = options[:error_class] || builder.default_inline_error_class
-          template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => error_class)
-        end
-        
-        def error_none_html
-          ""
-        end
-        
         def hint_html
           if hint?
             template.content_tag(

From 46b136186236057d6e59b9fa29f90a2a5d310e29 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 31 Mar 2011 07:21:48 +1100
Subject: [PATCH 650/992] shifted hint_html methods to Hints module

---
 lib/formtastic/inputs/new_base/hints.rb | 12 +++++++++++-
 lib/formtastic/inputs/new_base/html.rb  | 10 ----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/formtastic/inputs/new_base/hints.rb b/lib/formtastic/inputs/new_base/hints.rb
index 07379b830..a9ca8057f 100644
--- a/lib/formtastic/inputs/new_base/hints.rb
+++ b/lib/formtastic/inputs/new_base/hints.rb
@@ -2,7 +2,17 @@ module Formtastic
   module Inputs
     module NewBase
       module Hints
-
+        
+        def hint_html
+          if hint?
+            template.content_tag(
+              :p, 
+              Formtastic::Util.html_safe(hint_text), 
+              :class => (options[:hint_class] || builder.default_hint_class)
+            )
+          end
+        end
+        
         def hint?
           !hint_text.blank? && !hint_text.kind_of?(Hash)
         end
diff --git a/lib/formtastic/inputs/new_base/html.rb b/lib/formtastic/inputs/new_base/html.rb
index 4cc3d7058..6d2f2d028 100644
--- a/lib/formtastic/inputs/new_base/html.rb
+++ b/lib/formtastic/inputs/new_base/html.rb
@@ -21,16 +21,6 @@ def input_dom_id
           options[:input_html].try(:[], :id) || dom_id
         end
         
-        def hint_html
-          if hint?
-            template.content_tag(
-              :p, 
-              Formtastic::Util.html_safe(hint_text), 
-              :class => (options[:hint_class] || builder.default_hint_class)
-            )
-          end
-        end
-        
         def dom_id
           [
             builder.custom_namespace, 

From b46028c51febd5a811bc3805d8caa490223b8fc2 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 1 Apr 2011 17:34:16 +1100
Subject: [PATCH 651/992] clean up and simplify input_html_options[:id],
 required small changes to the id on hidden inputs

---
 lib/formtastic/inputs/hidden_input.rb       | 8 +++++---
 lib/formtastic/inputs/new_base/html.rb      | 9 +--------
 lib/formtastic/inputs/new_base/labelling.rb | 2 +-
 lib/formtastic/inputs/select_input.rb       | 5 -----
 spec/inputs/hidden_input_spec.rb            | 4 ++--
 5 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/lib/formtastic/inputs/hidden_input.rb b/lib/formtastic/inputs/hidden_input.rb
index 3aa43be03..23d3e729c 100644
--- a/lib/formtastic/inputs/hidden_input.rb
+++ b/lib/formtastic/inputs/hidden_input.rb
@@ -31,10 +31,12 @@ module Inputs
     class HiddenInput 
       include NewBase
       
+      # Override to include :value set directly from options hash. The :value set in :input_html 
+      # hash will be preferred over :value set directly in the options.
+      #
+      # @todo this is inconsistent with all other inputs, deprecate and remove
       def input_html_options
-        super[:id] = super[:id].gsub(/_id$/, '') # TODO: special case because we seem to test hidden input differently
-        return {:value => options[:value]}.merge(super) if options.key?(:value)
-        super
+        {:value => options[:value]}.merge(super)
       end
       
       def to_html
diff --git a/lib/formtastic/inputs/new_base/html.rb b/lib/formtastic/inputs/new_base/html.rb
index 6d2f2d028..9d5823fdd 100644
--- a/lib/formtastic/inputs/new_base/html.rb
+++ b/lib/formtastic/inputs/new_base/html.rb
@@ -11,14 +11,7 @@ def to_html
         end
         
         def input_html_options
-          opts = options[:input_html] || {}
-          opts[:id] ||= input_dom_id
-          
-          opts
-        end
-        
-        def input_dom_id
-          options[:input_html].try(:[], :id) || dom_id
+          { :id => dom_id }.merge(options[:input_html] || {})
         end
         
         def dom_id
diff --git a/lib/formtastic/inputs/new_base/labelling.rb b/lib/formtastic/inputs/new_base/labelling.rb
index 8dc044669..150ebaae3 100644
--- a/lib/formtastic/inputs/new_base/labelling.rb
+++ b/lib/formtastic/inputs/new_base/labelling.rb
@@ -12,7 +12,7 @@ def label_html
         def label_html_options
           # opts = options_for_label(options) # TODO
           opts = {}
-          opts[:for] ||= input_dom_id
+          opts[:for] ||= input_html_options[:id]
           
           opts
         end
diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index b37b863fd..d4f98c34d 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -172,11 +172,6 @@ def label_html_options
         super.merge(:for => input_html_options[:id])
       end
       
-      def input_dom_id
-        return "#{object_name}_#{association_primary_key}" if belongs_to?
-        super
-      end
-      
       def input_options
         {:include_blank => include_blank?}.merge(super)
       end
diff --git a/spec/inputs/hidden_input_spec.rb b/spec/inputs/hidden_input_spec.rb
index f8914edc7..9b2a5687b 100644
--- a/spec/inputs/hidden_input_spec.rb
+++ b/spec/inputs/hidden_input_spec.rb
@@ -42,7 +42,7 @@
   end
 
   it "should prefer :input_html over directly supplied options" do
-    output_buffer.should have_tag("form li input#post_author[@type=\"hidden\"][@value=\"formtastic_value\"]")
+    output_buffer.should have_tag("form li input#post_author_id[@type=\"hidden\"][@value=\"formtastic_value\"]")
   end
 
   it "should not render inline errors" do
@@ -82,7 +82,7 @@
       end)
     end
 
-    attributes_to_check = [:secret, :author_id, :published, :reviewer, :author]
+    attributes_to_check = [:secret, :author_id, :published, :reviewer]
     attributes_to_check.each do |a|
       it_should_have_input_wrapper_with_id("context2_post_#{a}_input")
     end

From 87529a8b50272a65f2e9e1c3d01420eb26a5829e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 1 Apr 2011 17:37:21 +1100
Subject: [PATCH 652/992] note change to hidden input id in changelog

---
 CHANGELOG | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1f3875caa..7586f7c4e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,8 @@
-[v2 branch]
+[refactor branch]
 
 * Removed the "inline_order" configuration (redefine input_wrapping instead)
 * Removed the "special" implementation of label() from FormBuilder, so builder.label will call Rails' label helper, not ours
+* Changed the HTML id attribute used for hidden inputs to be consistent with all other inputs
 * Changed formtastic:form generator include the wrapping semantic_form_for block
 * Changed formtastic:form generator to generate a partial by default (instead of copying to clipboard, which can be done with --copy)
 * Removed formtastic_stylesheet_link_tag

From 8519016594defefdc52c0ee1471b2c47823cc38f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 1 Apr 2011 17:40:49 +1100
Subject: [PATCH 653/992] autoload SemanticFormBuilder for backwards compat for
 now

---
 lib/formtastic.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index d8410680c..e0f187b92 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -4,6 +4,7 @@ module Formtastic
   extend ActiveSupport::Autoload
 
   autoload :FormBuilder
+  autoload :SemanticFormBuilder
   autoload :Helpers
   autoload :HtmlAttributes
   autoload :I18n

From 3e8fbf1687c98ac9af4d0fdf3bbfa5882723f6dd Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 1 Apr 2011 17:43:43 +1100
Subject: [PATCH 654/992] require railtie so that the autoloaded helpers are
 actually loaded into the app

---
 lib/formtastic.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index e0f187b92..b5c1243de 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'formtastic/railtie.rb' if defined?(Rails)
 
 module Formtastic
   extend ActiveSupport::Autoload

From db95739892f2eeeda32585c4aa0fb473a569b45c Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 1 Apr 2011 17:45:04 +1100
Subject: [PATCH 655/992] we also need to autoload Util

---
 lib/formtastic.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index b5c1243de..d8649a14b 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -12,4 +12,5 @@ module Formtastic
   autoload :Inputs
   autoload :LocalizedString
   autoload :Reflection
+  autoload :Util
 end

From 27faf9a068cad5f302099586fb4f70765d4863ed Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 2 Apr 2011 15:13:22 +1100
Subject: [PATCH 656/992] #to_html now raises an unimplemented error if the
 input doesn't have an implementation. Shifted the previous implementation to
 Stringish.

---
 lib/formtastic/inputs/new_base/html.rb      | 18 +++++++++++++-----
 lib/formtastic/inputs/new_base/stringish.rb | 10 ++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/lib/formtastic/inputs/new_base/html.rb b/lib/formtastic/inputs/new_base/html.rb
index 9d5823fdd..b151ecfc0 100644
--- a/lib/formtastic/inputs/new_base/html.rb
+++ b/lib/formtastic/inputs/new_base/html.rb
@@ -2,12 +2,20 @@ module Formtastic
   module Inputs
     module NewBase
       module Html
-  
+        
+        # Defines how the instance of an input should be rendered to a HTML string.
+        #
+        # @abstract Implement this method in your input class to describe how the input should render itself.
+        #
+        # @example A basic label and text field input inside a standard wrapping might look like this:
+        #     def to_html
+        #       input_wrapping do
+        #         label_html <<
+        #         builder.text_field(method, input_html_options)
+        #       end
+        #     end
         def to_html
-          input_wrapping do
-            label_html <<
-            builder.text_field(method, input_html_options)
-          end
+          raise NotImplementedError
         end
         
         def input_html_options
diff --git a/lib/formtastic/inputs/new_base/stringish.rb b/lib/formtastic/inputs/new_base/stringish.rb
index a6b866d5c..84d072862 100644
--- a/lib/formtastic/inputs/new_base/stringish.rb
+++ b/lib/formtastic/inputs/new_base/stringish.rb
@@ -2,6 +2,16 @@ module Formtastic
   module Inputs
     module NewBase
       module Stringish
+        
+        # @abstract Override this method in your input class to describe how the input should render itself.
+        def to_html
+          input_wrapping do
+            label_html <<
+            builder.text_field(method, input_html_options)
+          end
+        end
+        
+        # Overrides standard `input_html_options` to provide a `maxlength` and `size` attribute.
         def input_html_options
           super.merge(
             :maxlength => options[:input_html].try(:[], :maxlength) || limit,

From c6f05f52f20ef75133b5f1a8297d7eca58c1c090 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 2 Apr 2011 21:44:22 +1100
Subject: [PATCH 657/992] added in some 'new' tests, testing previous commit

---
 spec/new/custom_input_spec.rb | 52 +++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 spec/new/custom_input_spec.rb

diff --git a/spec/new/custom_input_spec.rb b/spec/new/custom_input_spec.rb
new file mode 100644
index 000000000..3e71366b7
--- /dev/null
+++ b/spec/new/custom_input_spec.rb
@@ -0,0 +1,52 @@
+# encoding: utf-8
+require 'spec_helper'
+
+# TODO extract out
+module TestInputs
+
+  def input_args
+    @template = self
+    @object = ::Post.new
+    @object_name = 'post'
+    @method = :title
+    @options = {}
+    @proc = Proc.new {}
+    @builder = Formtastic::FormBuilder.new(@object_name, @object, @template, @options, @proc)
+    
+    [@builder, @template, @object, @object_name, @method, @options]
+  end
+  
+  class ::UnimplementedInput
+    include Formtastic::Inputs::NewBase
+  end
+
+  class ::ImplementedInput < UnimplementedInput
+    def to_html
+      "some HTML output"
+    end
+  end
+  
+end
+
+describe 'AnyCustomInput' do
+  
+  include TestInputs
+  
+  describe "#to_html" do
+
+    describe 'without an implementation' do
+      it "should raise a NotImplementedError exception" do
+        expect { ::UnimplementedInput.new(*input_args).to_html }.to raise_error(NotImplementedError)
+      end
+    end    
+
+    describe 'with an implementation' do
+      it "should raise a NotImplementedError exception" do
+        expect { ::ImplementedInput.new(*input_args).to_html }.to_not raise_error(NotImplementedError)
+      end
+    end
+    
+  end
+    
+end
+

From d484dcc713f13ee1920f324f21d9c0097f9e2d84 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 2 Apr 2011 21:50:48 +1100
Subject: [PATCH 658/992] Renamed NewBase to Base.

---
 lib/formtastic/inputs.rb                                    | 2 +-
 lib/formtastic/inputs/{new_base.rb => base.rb}              | 2 +-
 lib/formtastic/inputs/{new_base => base}/associations.rb    | 2 +-
 lib/formtastic/inputs/{new_base => base}/choices.rb         | 4 ++--
 lib/formtastic/inputs/{new_base => base}/collections.rb     | 2 +-
 lib/formtastic/inputs/{new_base => base}/database.rb        | 2 +-
 lib/formtastic/inputs/{new_base => base}/errors.rb          | 2 +-
 lib/formtastic/inputs/{new_base => base}/fileish.rb         | 2 +-
 .../inputs/{new_base => base}/grouped_collections.rb        | 2 +-
 lib/formtastic/inputs/{new_base => base}/hints.rb           | 2 +-
 lib/formtastic/inputs/{new_base => base}/html.rb            | 2 +-
 lib/formtastic/inputs/{new_base => base}/labelling.rb       | 2 +-
 lib/formtastic/inputs/{new_base => base}/naming.rb          | 2 +-
 lib/formtastic/inputs/{new_base => base}/options.rb         | 2 +-
 lib/formtastic/inputs/{new_base => base}/stringish.rb       | 2 +-
 lib/formtastic/inputs/{new_base => base}/timeish.rb         | 2 +-
 lib/formtastic/inputs/{new_base => base}/validations.rb     | 2 +-
 lib/formtastic/inputs/{new_base => base}/wrapping.rb        | 2 +-
 lib/formtastic/inputs/boolean_input.rb                      | 2 +-
 lib/formtastic/inputs/check_boxes_input.rb                  | 6 +++---
 lib/formtastic/inputs/country_input.rb                      | 2 +-
 lib/formtastic/inputs/date_input.rb                         | 4 ++--
 lib/formtastic/inputs/datetime_input.rb                     | 4 ++--
 lib/formtastic/inputs/email_input.rb                        | 4 ++--
 lib/formtastic/inputs/file_input.rb                         | 2 +-
 lib/formtastic/inputs/hidden_input.rb                       | 2 +-
 lib/formtastic/inputs/numeric_input.rb                      | 4 ++--
 lib/formtastic/inputs/password_input.rb                     | 4 ++--
 lib/formtastic/inputs/phone_input.rb                        | 4 ++--
 lib/formtastic/inputs/radio_input.rb                        | 6 +++---
 lib/formtastic/inputs/search_input.rb                       | 4 ++--
 lib/formtastic/inputs/select_input.rb                       | 6 +++---
 lib/formtastic/inputs/string_input.rb                       | 4 ++--
 lib/formtastic/inputs/text_input.rb                         | 2 +-
 lib/formtastic/inputs/time_input.rb                         | 4 ++--
 lib/formtastic/inputs/time_zone_input.rb                    | 2 +-
 lib/formtastic/inputs/url_input.rb                          | 4 ++--
 spec/custom_builder_spec.rb                                 | 2 +-
 spec/new/custom_input_spec.rb                               | 2 +-
 39 files changed, 56 insertions(+), 56 deletions(-)
 rename lib/formtastic/inputs/{new_base.rb => base.rb} (98%)
 rename lib/formtastic/inputs/{new_base => base}/associations.rb (97%)
 rename lib/formtastic/inputs/{new_base => base}/choices.rb (97%)
 rename lib/formtastic/inputs/{new_base => base}/collections.rb (99%)
 rename lib/formtastic/inputs/{new_base => base}/database.rb (93%)
 rename lib/formtastic/inputs/{new_base => base}/errors.rb (98%)
 rename lib/formtastic/inputs/{new_base => base}/fileish.rb (95%)
 rename lib/formtastic/inputs/{new_base => base}/grouped_collections.rb (99%)
 rename lib/formtastic/inputs/{new_base => base}/hints.rb (97%)
 rename lib/formtastic/inputs/{new_base => base}/html.rb (98%)
 rename lib/formtastic/inputs/{new_base => base}/labelling.rb (98%)
 rename lib/formtastic/inputs/{new_base => base}/naming.rb (98%)
 rename lib/formtastic/inputs/{new_base => base}/options.rb (95%)
 rename lib/formtastic/inputs/{new_base => base}/stringish.rb (97%)
 rename lib/formtastic/inputs/{new_base => base}/timeish.rb (99%)
 rename lib/formtastic/inputs/{new_base => base}/validations.rb (99%)
 rename lib/formtastic/inputs/{new_base => base}/wrapping.rb (98%)

diff --git a/lib/formtastic/inputs.rb b/lib/formtastic/inputs.rb
index 50f4fe24e..745439107 100644
--- a/lib/formtastic/inputs.rb
+++ b/lib/formtastic/inputs.rb
@@ -2,7 +2,7 @@ module Formtastic
   module Inputs
     extend ActiveSupport::Autoload
 
-    autoload :NewBase
+    autoload :Base
     autoload :Basic
     autoload :BooleanInput
     autoload :CheckBoxesInput
diff --git a/lib/formtastic/inputs/new_base.rb b/lib/formtastic/inputs/base.rb
similarity index 98%
rename from lib/formtastic/inputs/new_base.rb
rename to lib/formtastic/inputs/base.rb
index a977df8b1..6d4c15938 100644
--- a/lib/formtastic/inputs/new_base.rb
+++ b/lib/formtastic/inputs/base.rb
@@ -1,6 +1,6 @@
 module Formtastic
   module Inputs
-    module NewBase
+    module Base
       
       attr_accessor :builder, :template, :object, :object_name, :method, :options
       
diff --git a/lib/formtastic/inputs/new_base/associations.rb b/lib/formtastic/inputs/base/associations.rb
similarity index 97%
rename from lib/formtastic/inputs/new_base/associations.rb
rename to lib/formtastic/inputs/base/associations.rb
index 24212d2c1..c9c29ec0f 100644
--- a/lib/formtastic/inputs/new_base/associations.rb
+++ b/lib/formtastic/inputs/base/associations.rb
@@ -1,6 +1,6 @@
 module Formtastic
   module Inputs
-    module NewBase
+    module Base
       module Associations
 
         # :belongs_to, etc
diff --git a/lib/formtastic/inputs/new_base/choices.rb b/lib/formtastic/inputs/base/choices.rb
similarity index 97%
rename from lib/formtastic/inputs/new_base/choices.rb
rename to lib/formtastic/inputs/base/choices.rb
index a4df684be..d7e43f7cd 100644
--- a/lib/formtastic/inputs/new_base/choices.rb
+++ b/lib/formtastic/inputs/base/choices.rb
@@ -1,6 +1,6 @@
 module Formtastic
   module Inputs
-    module NewBase
+    module Base
       module Choices
         
         def choices_wrapping(&block)
@@ -37,7 +37,7 @@ def choice_wrapping_html_options(choice)
         end
 
         def choice_html(choice)        
-          raise "choice_html() needs to be implemented when including Formtastic::Inputs::NewBase::Choices"
+          raise "choice_html() needs to be implemented when including Formtastic::Inputs::Base::Choices"
         end
 
         def choice_label(choice)
diff --git a/lib/formtastic/inputs/new_base/collections.rb b/lib/formtastic/inputs/base/collections.rb
similarity index 99%
rename from lib/formtastic/inputs/new_base/collections.rb
rename to lib/formtastic/inputs/base/collections.rb
index 456585eb5..bf3ce051a 100644
--- a/lib/formtastic/inputs/new_base/collections.rb
+++ b/lib/formtastic/inputs/base/collections.rb
@@ -1,6 +1,6 @@
 module Formtastic
   module Inputs
-    module NewBase
+    module Base
       module Collections
         
         def label_method
diff --git a/lib/formtastic/inputs/new_base/database.rb b/lib/formtastic/inputs/base/database.rb
similarity index 93%
rename from lib/formtastic/inputs/new_base/database.rb
rename to lib/formtastic/inputs/base/database.rb
index 62ffefffe..305c8b860 100644
--- a/lib/formtastic/inputs/new_base/database.rb
+++ b/lib/formtastic/inputs/base/database.rb
@@ -1,6 +1,6 @@
 module Formtastic
   module Inputs
-    module NewBase
+    module Base
       module Database
         
         def column
diff --git a/lib/formtastic/inputs/new_base/errors.rb b/lib/formtastic/inputs/base/errors.rb
similarity index 98%
rename from lib/formtastic/inputs/new_base/errors.rb
rename to lib/formtastic/inputs/base/errors.rb
index 4e213fda9..65a5e4eb7 100644
--- a/lib/formtastic/inputs/new_base/errors.rb
+++ b/lib/formtastic/inputs/base/errors.rb
@@ -1,6 +1,6 @@
 module Formtastic
   module Inputs
-    module NewBase
+    module Base
       module Errors
         
         def error_html
diff --git a/lib/formtastic/inputs/new_base/fileish.rb b/lib/formtastic/inputs/base/fileish.rb
similarity index 95%
rename from lib/formtastic/inputs/new_base/fileish.rb
rename to lib/formtastic/inputs/base/fileish.rb
index 03afca065..c2d05b440 100644
--- a/lib/formtastic/inputs/new_base/fileish.rb
+++ b/lib/formtastic/inputs/base/fileish.rb
@@ -1,6 +1,6 @@
 module Formtastic
   module Inputs
-    module NewBase
+    module Base
       module Fileish
       
         def file?
diff --git a/lib/formtastic/inputs/new_base/grouped_collections.rb b/lib/formtastic/inputs/base/grouped_collections.rb
similarity index 99%
rename from lib/formtastic/inputs/new_base/grouped_collections.rb
rename to lib/formtastic/inputs/base/grouped_collections.rb
index b747640ee..aaf1249f2 100644
--- a/lib/formtastic/inputs/new_base/grouped_collections.rb
+++ b/lib/formtastic/inputs/base/grouped_collections.rb
@@ -1,6 +1,6 @@
 module Formtastic
   module Inputs
-    module NewBase
+    module Base
       module GroupedCollections
       
         def raw_grouped_collection
diff --git a/lib/formtastic/inputs/new_base/hints.rb b/lib/formtastic/inputs/base/hints.rb
similarity index 97%
rename from lib/formtastic/inputs/new_base/hints.rb
rename to lib/formtastic/inputs/base/hints.rb
index a9ca8057f..09d01510c 100644
--- a/lib/formtastic/inputs/new_base/hints.rb
+++ b/lib/formtastic/inputs/base/hints.rb
@@ -1,6 +1,6 @@
 module Formtastic
   module Inputs
-    module NewBase
+    module Base
       module Hints
         
         def hint_html
diff --git a/lib/formtastic/inputs/new_base/html.rb b/lib/formtastic/inputs/base/html.rb
similarity index 98%
rename from lib/formtastic/inputs/new_base/html.rb
rename to lib/formtastic/inputs/base/html.rb
index b151ecfc0..05e84a37e 100644
--- a/lib/formtastic/inputs/new_base/html.rb
+++ b/lib/formtastic/inputs/base/html.rb
@@ -1,6 +1,6 @@
 module Formtastic
   module Inputs
-    module NewBase
+    module Base
       module Html
         
         # Defines how the instance of an input should be rendered to a HTML string.
diff --git a/lib/formtastic/inputs/new_base/labelling.rb b/lib/formtastic/inputs/base/labelling.rb
similarity index 98%
rename from lib/formtastic/inputs/new_base/labelling.rb
rename to lib/formtastic/inputs/base/labelling.rb
index 150ebaae3..c4ceaca44 100644
--- a/lib/formtastic/inputs/new_base/labelling.rb
+++ b/lib/formtastic/inputs/base/labelling.rb
@@ -1,6 +1,6 @@
 module Formtastic
   module Inputs
-    module NewBase
+    module Base
       module Labelling
         
         include Formtastic::LocalizedString
diff --git a/lib/formtastic/inputs/new_base/naming.rb b/lib/formtastic/inputs/base/naming.rb
similarity index 98%
rename from lib/formtastic/inputs/new_base/naming.rb
rename to lib/formtastic/inputs/base/naming.rb
index b419e73ad..5d602d7a9 100644
--- a/lib/formtastic/inputs/new_base/naming.rb
+++ b/lib/formtastic/inputs/base/naming.rb
@@ -1,6 +1,6 @@
 module Formtastic
   module Inputs
-    module NewBase
+    module Base
       module Naming
 
         def as
diff --git a/lib/formtastic/inputs/new_base/options.rb b/lib/formtastic/inputs/base/options.rb
similarity index 95%
rename from lib/formtastic/inputs/new_base/options.rb
rename to lib/formtastic/inputs/base/options.rb
index f976239ab..abbbbe070 100644
--- a/lib/formtastic/inputs/new_base/options.rb
+++ b/lib/formtastic/inputs/base/options.rb
@@ -1,6 +1,6 @@
 module Formtastic
   module Inputs
-    module NewBase
+    module Base
       module Options
         
         def input_options
diff --git a/lib/formtastic/inputs/new_base/stringish.rb b/lib/formtastic/inputs/base/stringish.rb
similarity index 97%
rename from lib/formtastic/inputs/new_base/stringish.rb
rename to lib/formtastic/inputs/base/stringish.rb
index 84d072862..586cd251a 100644
--- a/lib/formtastic/inputs/new_base/stringish.rb
+++ b/lib/formtastic/inputs/base/stringish.rb
@@ -1,6 +1,6 @@
 module Formtastic
   module Inputs
-    module NewBase
+    module Base
       module Stringish
         
         # @abstract Override this method in your input class to describe how the input should render itself.
diff --git a/lib/formtastic/inputs/new_base/timeish.rb b/lib/formtastic/inputs/base/timeish.rb
similarity index 99%
rename from lib/formtastic/inputs/new_base/timeish.rb
rename to lib/formtastic/inputs/base/timeish.rb
index 919a8e992..a6bac3572 100644
--- a/lib/formtastic/inputs/new_base/timeish.rb
+++ b/lib/formtastic/inputs/base/timeish.rb
@@ -1,6 +1,6 @@
 module Formtastic
   module Inputs
-    module NewBase
+    module Base
       module Timeish
         
         def to_html
diff --git a/lib/formtastic/inputs/new_base/validations.rb b/lib/formtastic/inputs/base/validations.rb
similarity index 99%
rename from lib/formtastic/inputs/new_base/validations.rb
rename to lib/formtastic/inputs/base/validations.rb
index 691a97859..6115049a9 100644
--- a/lib/formtastic/inputs/new_base/validations.rb
+++ b/lib/formtastic/inputs/base/validations.rb
@@ -1,6 +1,6 @@
 module Formtastic
   module Inputs
-    module NewBase
+    module Base
       module Validations
         
         def validations
diff --git a/lib/formtastic/inputs/new_base/wrapping.rb b/lib/formtastic/inputs/base/wrapping.rb
similarity index 98%
rename from lib/formtastic/inputs/new_base/wrapping.rb
rename to lib/formtastic/inputs/base/wrapping.rb
index 6a1b0a14e..fea35d36b 100644
--- a/lib/formtastic/inputs/new_base/wrapping.rb
+++ b/lib/formtastic/inputs/base/wrapping.rb
@@ -1,6 +1,6 @@
 module Formtastic
   module Inputs
-    module NewBase
+    module Base
       # @todo relies on `dom_id`, `required?`, `optional`, `errors?`, `association_primary_key` & `sanitized_method_name` methods from another module
       module Wrapping
         
diff --git a/lib/formtastic/inputs/boolean_input.rb b/lib/formtastic/inputs/boolean_input.rb
index 16199e880..ce6437693 100644
--- a/lib/formtastic/inputs/boolean_input.rb
+++ b/lib/formtastic/inputs/boolean_input.rb
@@ -30,7 +30,7 @@ module Inputs
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     class BooleanInput
-      include NewBase
+      include Base
       
       def to_html
         input_wrapping do
diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index 6fe4a6ca9..b6d86a41b 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -68,9 +68,9 @@ module Inputs
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     # @see Formtastic::Inputs::BooleanInput BooleanInput for a single checkbox for boolean (checked = true) inputs
     class CheckBoxesInput
-      include NewBase
-      include NewBase::Collections
-      include NewBase::Choices
+      include Base
+      include Base::Collections
+      include Base::Choices
       
       def to_html
         input_wrapping do
diff --git a/lib/formtastic/inputs/country_input.rb b/lib/formtastic/inputs/country_input.rb
index 602854d11..624183f84 100644
--- a/lib/formtastic/inputs/country_input.rb
+++ b/lib/formtastic/inputs/country_input.rb
@@ -47,7 +47,7 @@ module Inputs
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     class CountryInput 
-      include NewBase
+      include Base
 
       def to_html
         raise "To use the :country input, please install a country_select plugin, like this one: http://github.com/rails/iso-3166-country-select" unless builder.respond_to?(:country_select)
diff --git a/lib/formtastic/inputs/date_input.rb b/lib/formtastic/inputs/date_input.rb
index 6bb93d469..f59486725 100644
--- a/lib/formtastic/inputs/date_input.rb
+++ b/lib/formtastic/inputs/date_input.rb
@@ -2,8 +2,8 @@ module Formtastic
   module Inputs
     # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
     class DateInput 
-      include NewBase
-      include NewBase::Timeish
+      include Base
+      include Base::Timeish
       
       # We don't want hour and minute fragments on a date input
       def time_fragments
diff --git a/lib/formtastic/inputs/datetime_input.rb b/lib/formtastic/inputs/datetime_input.rb
index d93392fab..3239b362a 100644
--- a/lib/formtastic/inputs/datetime_input.rb
+++ b/lib/formtastic/inputs/datetime_input.rb
@@ -2,8 +2,8 @@ module Formtastic
   module Inputs
     # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
     class DatetimeInput 
-      include NewBase
-      include NewBase::Timeish
+      include Base
+      include Base::Timeish
     end
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/email_input.rb b/lib/formtastic/inputs/email_input.rb
index e23569bfc..81bf909cb 100644
--- a/lib/formtastic/inputs/email_input.rb
+++ b/lib/formtastic/inputs/email_input.rb
@@ -26,8 +26,8 @@ module Inputs
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     class EmailInput 
-      include NewBase
-      include NewBase::Stringish
+      include Base
+      include Base::Stringish
       
       def to_html
         input_wrapping do
diff --git a/lib/formtastic/inputs/file_input.rb b/lib/formtastic/inputs/file_input.rb
index 1c62f89a3..f298fed02 100644
--- a/lib/formtastic/inputs/file_input.rb
+++ b/lib/formtastic/inputs/file_input.rb
@@ -30,7 +30,7 @@ module Inputs
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     class FileInput 
-      include NewBase
+      include Base
       def to_html
         input_wrapping do
           label_html <<
diff --git a/lib/formtastic/inputs/hidden_input.rb b/lib/formtastic/inputs/hidden_input.rb
index 23d3e729c..4d4f01139 100644
--- a/lib/formtastic/inputs/hidden_input.rb
+++ b/lib/formtastic/inputs/hidden_input.rb
@@ -29,7 +29,7 @@ module Inputs
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     class HiddenInput 
-      include NewBase
+      include Base
       
       # Override to include :value set directly from options hash. The :value set in :input_html 
       # hash will be preferred over :value set directly in the options.
diff --git a/lib/formtastic/inputs/numeric_input.rb b/lib/formtastic/inputs/numeric_input.rb
index fdc987e77..3352d461f 100644
--- a/lib/formtastic/inputs/numeric_input.rb
+++ b/lib/formtastic/inputs/numeric_input.rb
@@ -30,8 +30,8 @@ module Inputs
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     class NumericInput 
-      include NewBase
-      include NewBase::Stringish
+      include Base
+      include Base::Stringish
       
       def to_html
         input_wrapping do
diff --git a/lib/formtastic/inputs/password_input.rb b/lib/formtastic/inputs/password_input.rb
index 8ad220ecc..9249f70c0 100644
--- a/lib/formtastic/inputs/password_input.rb
+++ b/lib/formtastic/inputs/password_input.rb
@@ -26,8 +26,8 @@ module Inputs
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     class PasswordInput 
-      include NewBase
-      include NewBase::Stringish
+      include Base
+      include Base::Stringish
       
       def to_html
         input_wrapping do
diff --git a/lib/formtastic/inputs/phone_input.rb b/lib/formtastic/inputs/phone_input.rb
index ccb82c6d3..eae40be42 100644
--- a/lib/formtastic/inputs/phone_input.rb
+++ b/lib/formtastic/inputs/phone_input.rb
@@ -26,8 +26,8 @@ module Inputs
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     class PhoneInput 
-      include NewBase
-      include NewBase::Stringish
+      include Base
+      include Base::Stringish
       
       def to_html
         input_wrapping do
diff --git a/lib/formtastic/inputs/radio_input.rb b/lib/formtastic/inputs/radio_input.rb
index 74f1d3830..932fc584f 100644
--- a/lib/formtastic/inputs/radio_input.rb
+++ b/lib/formtastic/inputs/radio_input.rb
@@ -108,9 +108,9 @@ module Inputs
     #
     # @todo :disabled like CheckBoxes?
     class RadioInput
-      include NewBase
-      include NewBase::Collections
-      include NewBase::Choices
+      include Base
+      include Base::Collections
+      include Base::Choices
       
       def to_html
         input_wrapping do
diff --git a/lib/formtastic/inputs/search_input.rb b/lib/formtastic/inputs/search_input.rb
index dd5dab664..0ceab29d5 100644
--- a/lib/formtastic/inputs/search_input.rb
+++ b/lib/formtastic/inputs/search_input.rb
@@ -25,8 +25,8 @@ module Inputs
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     class SearchInput 
-      include NewBase
-      include NewBase::Stringish
+      include Base
+      include Base::Stringish
       
       def to_html
         input_wrapping do
diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index d4f98c34d..e73062890 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -133,9 +133,9 @@ module Inputs
     # @see Formtastic::Inputs::CheckBoxesInput CheckBoxesInput as an alternative for `has_many` and `has_and_belongs_to_many` associations
     # @see Formtastic::Inputs::RadioInput RadioInput as an alternative for `belongs_to` associations
     class SelectInput
-      include NewBase
-      include NewBase::Collections
-      include NewBase::GroupedCollections
+      include Base
+      include Base::Collections
+      include Base::GroupedCollections
       
       def to_html
         input_wrapping do
diff --git a/lib/formtastic/inputs/string_input.rb b/lib/formtastic/inputs/string_input.rb
index 5ea63c1ce..87fc67612 100644
--- a/lib/formtastic/inputs/string_input.rb
+++ b/lib/formtastic/inputs/string_input.rb
@@ -27,8 +27,8 @@ module Inputs
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     class StringInput 
-      include NewBase
-      include NewBase::Stringish
+      include Base
+      include Base::Stringish
     end
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/text_input.rb b/lib/formtastic/inputs/text_input.rb
index d415bc428..c626c43c4 100644
--- a/lib/formtastic/inputs/text_input.rb
+++ b/lib/formtastic/inputs/text_input.rb
@@ -26,7 +26,7 @@ module Inputs
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     class TextInput 
-      include NewBase
+      include Base
       
       def input_html_options
         { 
diff --git a/lib/formtastic/inputs/time_input.rb b/lib/formtastic/inputs/time_input.rb
index a14a6ee71..b06eccf41 100644
--- a/lib/formtastic/inputs/time_input.rb
+++ b/lib/formtastic/inputs/time_input.rb
@@ -2,8 +2,8 @@ module Formtastic
   module Inputs
     # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
     class TimeInput 
-      include NewBase
-      include NewBase::Timeish
+      include Base
+      include Base::Timeish
       
       # we don't want year / month / day fragments in a time select
       def date_fragments
diff --git a/lib/formtastic/inputs/time_zone_input.rb b/lib/formtastic/inputs/time_zone_input.rb
index c8a6a58ed..45c067353 100644
--- a/lib/formtastic/inputs/time_zone_input.rb
+++ b/lib/formtastic/inputs/time_zone_input.rb
@@ -31,7 +31,7 @@ module Inputs
     # @todo document :priority_zones option
     # @todo configurable default :priority_zones?
     class TimeZoneInput 
-      include NewBase
+      include Base
 
       def to_html
         input_wrapping do
diff --git a/lib/formtastic/inputs/url_input.rb b/lib/formtastic/inputs/url_input.rb
index 64df696bc..258efc5e5 100644
--- a/lib/formtastic/inputs/url_input.rb
+++ b/lib/formtastic/inputs/url_input.rb
@@ -26,8 +26,8 @@ module Inputs
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     class UrlInput 
-      include NewBase
-      include NewBase::Stringish
+      include Base
+      include Base::Stringish
       
       def to_html
         input_wrapping do
diff --git a/spec/custom_builder_spec.rb b/spec/custom_builder_spec.rb
index 57e7f84e7..34e7b3ac1 100644
--- a/spec/custom_builder_spec.rb
+++ b/spec/custom_builder_spec.rb
@@ -10,7 +10,7 @@ class MyCustomFormBuilder < Formtastic::FormBuilder
   
   # TODO should be a separate spec for custom inputs
   class Formtastic::Inputs::AwesomeInput
-    include Formtastic::Inputs::NewBase
+    include Formtastic::Inputs::Base
   end
 
   before do
diff --git a/spec/new/custom_input_spec.rb b/spec/new/custom_input_spec.rb
index 3e71366b7..1ad9ff202 100644
--- a/spec/new/custom_input_spec.rb
+++ b/spec/new/custom_input_spec.rb
@@ -17,7 +17,7 @@ def input_args
   end
   
   class ::UnimplementedInput
-    include Formtastic::Inputs::NewBase
+    include Formtastic::Inputs::Base
   end
 
   class ::ImplementedInput < UnimplementedInput

From 5f6fa301eca14cf6316b6a73eaaabaec43a18343 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 3 Apr 2011 08:17:46 +1000
Subject: [PATCH 659/992] mark the RCov verification stuff as private to hide
 from Yard

---
 lib/tasks/verify_rcov.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/tasks/verify_rcov.rb b/lib/tasks/verify_rcov.rb
index c76579875..c1ec3087d 100644
--- a/lib/tasks/verify_rcov.rb
+++ b/lib/tasks/verify_rcov.rb
@@ -1,4 +1,6 @@
 require 'colored'
+
+# @private
 module RCov
 
   class VerifyTask < Rake::TaskLib

From 7687bf7648c3c235760a89935bab57c170643a88 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 4 Apr 2011 17:08:14 +1000
Subject: [PATCH 660/992] Added support for modified and custom inputs in
 app/inputs/.

* FooInput will be tried before Formtastic::Inputs::FooInput
* UnknownInputError raised if FooInput and Formtastic::Inputs::FooInput don't exist
* app/* is already in the load path
* docs added
---
 README.textile                          | 48 +++++++++++++++----------
 lib/formtastic.rb                       |  4 +++
 lib/formtastic/helpers/inputs_helper.rb | 37 ++++++++++++++++---
 spec/input_spec.rb                      | 44 +++++++++++++++++++++++
 4 files changed, 110 insertions(+), 23 deletions(-)

diff --git a/README.textile b/README.textile
index f5368969e..cb88c6ced 100644
--- a/README.textile
+++ b/README.textile
@@ -541,31 +541,43 @@ h3. Specifying which attributes need an input
 
 
 
-h2. Custom Inputs
+h2. Modified & Custom Inputs
 
-If you want to add your own input types to encapsulate your own logic or interface patterns, you can do so by subclassing Formtastic::FormBuilder and configuring Formtastic to use your custom builder class.
+If you want to change the behaviour of an input, you can subclass it in your app. For example, to tweak @StringInput@, create a new file @app/inputs/string_input.rb@:
 
-@Formtastic::Helpers::FormHelper.builder = MyCustomBuilder@
+<pre>
+  class StringInput < Formtastic::Inputs::StringInput
+    def to_html
+      puts "this is my modified version of StringInput"
+      super
+    end
+  end
+</pre>
 
-Be aware that you should either set the options on custom builder or require it after setting options on formtastic default builder.
+To create your own new types of inputs based on existing inputs, the process is similar:
 
 <pre>
-  # OK
-  Formtastic::FormBuilder.i18n_lookups_by_default = true
-  require 'formtastic/my_custom_builder'
-  Formtastic::Helpers::FormHelper.builder = Formtastic::MyCustomBuilder
-  
-  # OK
-  require 'formtastic/my_custom_builder'
-  Formtastic::Helpers::FormHelper.builder = Formtastic::MyCustomBuilder
-  Formtastic::MyCustomBuilder.i18n_lookups_by_default = true
-  
-  # WRONG!
-  require 'formtastic/my_custom_builder'
-  Formtastic::FormBuilder.i18n_lookups_by_default = true
-  Formtastic::Helpers::FormHelper.builder = Formtastic::MyCustomBuilder
+  # f.input(:body, :as => :flexible_text)
+  class FlexibleTextInput < Formtastic::Inputs::StringTextInput
+    def input_html_options
+      super.merge(:class => "flexible-text-area")
+    end
+  end
 </pre>
 
+To create your own new types of inputs from scratch:
+
+<pre>
+  # f.input(:created_at, :as => :date_picker)
+  class DatePicker
+    def input_html_options
+      super.merge(:class => "date-picker")
+    end
+  end
+</pre>
+
+It was previously advised to subclass Formtastic::FormBuilder to add your own inputs. This is no longer advised, and may not work as expected.
+
 
 h2. Security
 
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index d8649a14b..dc55390bf 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -13,4 +13,8 @@ module Formtastic
   autoload :LocalizedString
   autoload :Reflection
   autoload :Util
+  
+  class UnknownInputError < NameError
+  end
+  
 end
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 9eaaf0d35..95b7f97c3 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -125,6 +125,11 @@ module InputsHelper
       # * `:time`         (see {Inputs::TimeInput})
       # * `:url`          (see {Inputs::UrlInput})
       #
+      # Calling `:as => :string` (for example) will call `#to_html` on a new instance of 
+      # `Formtastic::Inputs::StringInput`. Before this, Formtastic will try to instantiate a top-level
+      # namespace StringInput, meaning you can subclass and modify `Formtastic::Inputs::StringInput` 
+      # in `app/inputs/`. This also means you can create your own new input types in `app/inputs/`.
+      #
       # @todo document the "guessing" of input style
       #
       # @param [Symbol] method
@@ -236,17 +241,39 @@ module InputsHelper
       # @example Specifying the text for a `:select` input's 'blank' first option to prompt selection:
       #   <%= f.input :author, :as => :select, :prompt => "Select an Author" %>
       #
+      # @example Modifying an input to suit your needs in `app/inputs`:
+      #   class StringInput < Formtastic::Inputs::StringInput
+      #     def to_html
+      #       puts "this is my custom version of StringInput"      
+      #       super
+      #     end
+      #   end
+      #
+      # @example Creating your own input to suit your needs in `app/inputs`:
+      #   class DatePickerInput
+      #     include Formtastic::Inputs::Base
+      #     def to_html
+      #       # ...
+      #     end
+      #   end
+      #
       # @todo Many many more examples. Some of the detail probably needs to be pushed out to the relevant methods too.
       def input(method, options = {})
         options = options.dup # Allow options to be shared without being tainted by Formtastic
         
         options[:as]     ||= default_input_type(method, options)
-
-        [:check_boxes, :string, :country, :boolean, :time_zone, :date, :datetime, :time, :select, :phone, :search, :numeric, :email, :file, :hidden, :password, :text, :url, :radio].each do |i|
-          klass = "Formtastic::Inputs::#{options[:as].to_s.camelize}Input".constantize
-          return klass.new(self, template, @object, @object_name, method, options).to_html if options[:as] == i
+        
+        begin
+          begin
+            klass = "#{options[:as].to_s.camelize}Input".constantize # as :string => StringInput
+          rescue NameError
+            klass = "Formtastic::Inputs::#{options[:as].to_s.camelize}Input".constantize # as :string => Formtastic::Inputs::StringInput
+          end
+        rescue NameError
+          raise Formtastic::UnknownInputError
         end
-      
+        
+        klass.new(self, template, @object, @object_name, method, options).to_html
       end
 
       # {#inputs} creates an input fieldset and ol tag wrapping for use around a set of inputs.  It can be
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index dbc5e0a1c..79301a846 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -744,5 +744,49 @@ def should_be_required(options)
     
   end
   
+  describe 'instantiating an input class' do
+    
+    context 'when a class does not exist' do
+      it "should raise an error" do
+        lambda {
+          concat(semantic_form_for(@new_post) do |builder|
+            builder.input(:title, :as => :non_existant)
+          end)
+        }.should raise_error(Formtastic::UnknownInputError)
+      end
+    end
+    
+    context 'when a customized top-level class does not exist' do
+      
+      it 'should instantiate the Formtastic input' do
+        input = mock('input', :to_html => 'some HTML')
+        Formtastic::Inputs::StringInput.should_receive(:new).and_return(input)
+        concat(semantic_form_for(@new_post) do |builder|
+          builder.input(:title, :as => :string)
+        end)
+      end
+      
+    end
+    
+    describe 'when a top-level input class exists' do
+      it "should instantiate the top-level input instead of the Formtastic one" do
+        class ::StringInput < Formtastic::Inputs::StringInput
+        end
+        
+        input = mock('input', :to_html => 'some HTML')
+        Formtastic::Inputs::StringInput.should_not_receive(:new).and_return(input)
+        ::StringInput.should_receive(:new).and_return(input)
+        
+        concat(semantic_form_for(@new_post) do |builder|
+          builder.input(:title, :as => :string)
+        end)
+      end
+    end
+  
+  end
+  
+  
+  
+  
 end
 

From 034992291ad3d739e7a4bbf059563b5686e18495 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 4 Apr 2011 17:16:06 +1000
Subject: [PATCH 661/992] crank up the coverage

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index f7cf899b2..e75ef0f68 100644
--- a/Rakefile
+++ b/Rakefile
@@ -41,7 +41,7 @@ end
 
 RCov::VerifyTask.new(:verify_coverage) do |t|
   t.require_exact_threshold = false
-  t.threshold = 95.11
+  t.threshold = 95.55
 end
 
 desc "Run all examples and verify coverage"

From 679c4ca2ee759caa80b184b2cbf3fb80a0aa9896 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 4 Apr 2011 17:17:18 +1000
Subject: [PATCH 662/992] fix for failing spec I missed in 27faf9a I think

---
 spec/custom_builder_spec.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spec/custom_builder_spec.rb b/spec/custom_builder_spec.rb
index 34e7b3ac1..ba6639124 100644
--- a/spec/custom_builder_spec.rb
+++ b/spec/custom_builder_spec.rb
@@ -11,6 +11,9 @@ class MyCustomFormBuilder < Formtastic::FormBuilder
   # TODO should be a separate spec for custom inputs
   class Formtastic::Inputs::AwesomeInput
     include Formtastic::Inputs::Base
+    def to_html
+      "Awesome!"
+    end
   end
 
   before do

From 7c4c4f3a6631c83a70ca487119d8540256ae7ed3 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 4 Apr 2011 17:39:01 +1000
Subject: [PATCH 663/992] The hidden field rendered before a BooleanInput
 checkbox should be disabled if the checkbox input is disabled [GH-498]

---
 lib/formtastic/inputs/boolean_input.rb | 4 ++--
 spec/inputs/boolean_input_spec.rb      | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/formtastic/inputs/boolean_input.rb b/lib/formtastic/inputs/boolean_input.rb
index ce6437693..b45bcb2cc 100644
--- a/lib/formtastic/inputs/boolean_input.rb
+++ b/lib/formtastic/inputs/boolean_input.rb
@@ -40,9 +40,9 @@ def to_html
       end
       
       def hidden_field_html
-        template.hidden_field_tag(input_html_options[:name], unchecked_value, :id => nil)
+        template.hidden_field_tag(input_html_options[:name], unchecked_value, :id => nil, :disabled => input_html_options[:disabled] )
       end
-      
+            
       def label_with_nested_checkbox
         builder.label(
           method,
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index a434971d6..8bf5e77ed 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -66,11 +66,12 @@
     output_buffer.should have_tag('form li input[@type="hidden"][@name="foo"]', :count => 1)
   end
   
-  it "should generate a disabled input if :input_html is passed :disabled => 'disabled' " do
+  it "should generate a disabled input and hidden input if :input_html is passed :disabled => 'disabled' " do
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :input_html => {:disabled => 'disabled'}))
     end)
-    output_buffer.should have_tag('form li label input[@disabled="disabled"]')
+    output_buffer.should have_tag('form li label input[@disabled="disabled"]', :count => 1)
+    output_buffer.should have_tag('form li input[@type="hidden"][@disabled="disabled"]', :count => 1)
   end
   
   it 'should generate an input[id] with matching label[for] when id passed in :input_html' do

From 260674bb26e1c1f48b7769e9a43dd5f11c01e94f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 5 Apr 2011 06:19:51 +1000
Subject: [PATCH 664/992] Add the HTML5 required attribute to all inputs except
 HiddenInput, resolves GH-420

---
 README.textile                          |  1 +
 lib/formtastic/helpers/inputs_helper.rb |  8 ++++----
 lib/formtastic/inputs/base/html.rb      |  5 ++++-
 lib/formtastic/inputs/hidden_input.rb   |  2 +-
 spec/input_spec.rb                      |  1 -
 spec/inputs/boolean_input_spec.rb       | 11 ++++++++++-
 spec/inputs/check_boxes_input_spec.rb   |  8 +++++++-
 spec/inputs/country_input_spec.rb       |  6 +++---
 spec/inputs/date_input_spec.rb          | 11 ++++++++++-
 spec/inputs/datetime_input_spec.rb      | 11 ++++++++++-
 spec/inputs/email_input_spec.rb         | 11 ++++++++++-
 spec/inputs/file_input_spec.rb          | 11 ++++++++++-
 spec/inputs/hidden_input_spec.rb        | 11 ++++++++++-
 spec/inputs/numeric_input_spec.rb       | 11 ++++++++++-
 spec/inputs/password_input_spec.rb      | 11 ++++++++++-
 spec/inputs/phone_input_spec.rb         | 11 ++++++++++-
 spec/inputs/radio_input_spec.rb         |  8 +++++++-
 spec/inputs/search_input_spec.rb        | 11 ++++++++++-
 spec/inputs/select_input_spec.rb        |  9 +++++++++
 spec/inputs/string_input_spec.rb        | 10 +++++++++-
 spec/inputs/text_input_spec.rb          | 10 ++++++++++
 spec/inputs/time_input_spec.rb          | 11 ++++++++++-
 spec/inputs/time_zone_input_spec.rb     | 11 ++++++++++-
 spec/inputs/url_input_spec.rb           | 11 ++++++++++-
 24 files changed, 185 insertions(+), 26 deletions(-)

diff --git a/README.textile b/README.textile
index cb88c6ced..2f3323a63 100644
--- a/README.textile
+++ b/README.textile
@@ -63,6 +63,7 @@ h2. It's better than _SomeOtherFormBuilder_ because...
 * it doesn't hijack or change any of the standard Rails form inputs, so you can still use them as expected (even mix and match).
 * it's got absolutely awesome spec coverage.
 * there's a bunch of people using and working on it (it's not just one developer building half a solution).
+* it has growing HTML5 support (new inputs like email, new attributes like required)
 
 
 h2. Why?
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 95b7f97c3..9bc720616 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -23,11 +23,11 @@ module Helpers
     #         <ol>
     #           <li class="string required" id="post_title_input">
     #             <label for="post_title">Title*</label>
-    #             <input type="text" name="post[title]" id="post_title" value="">
+    #             <input type="text" name="post[title]" id="post_title" value="" required="required">
     #           </li>
     #           <li class="text required" id="post_body_input">
     #             <label for="post_title">Title*</label>
-    #             <textarea name="post[body]" id="post_body"></textarea>
+    #             <textarea name="post[body]" id="post_body" required="required"></textarea>
     #           </li>
     #         </ol>
     #       </fieldset>
@@ -66,7 +66,7 @@ module InputsHelper
       #
       #     <li class="string required" id="post_title_input">
       #       <label for="post_title">Title<abbr title="Required">*</abbr></label>
-      #       <input type="text" name="post[title]" value="" id="post_title">
+      #       <input type="text" name="post[title]" value="" id="post_title" required="required">
       #     </li>
       #
       # In other cases (like a series of checkboxes for a `has_many` relationship), the wrapper may
@@ -145,7 +145,7 @@ module InputsHelper
       #   Override hint text
       #
       # @option options :required [Boolean]
-      #   Override to mark the input as required (or not)
+      #   Override to mark the input as required (or not) — adds a required/optional class to the wrapper, and a HTML5 required attribute to the `<input>`
       #
       # @option options :input_html [Hash]
       #   Override or add to the HTML attributes to be passed down to the `<input>` tag
diff --git a/lib/formtastic/inputs/base/html.rb b/lib/formtastic/inputs/base/html.rb
index 05e84a37e..4008f3e5f 100644
--- a/lib/formtastic/inputs/base/html.rb
+++ b/lib/formtastic/inputs/base/html.rb
@@ -19,7 +19,10 @@ def to_html
         end
         
         def input_html_options
-          { :id => dom_id }.merge(options[:input_html] || {})
+          { 
+            :id => dom_id,
+            :required => required?
+          }.merge(options[:input_html] || {})
         end
         
         def dom_id
diff --git a/lib/formtastic/inputs/hidden_input.rb b/lib/formtastic/inputs/hidden_input.rb
index 4d4f01139..134039e0d 100644
--- a/lib/formtastic/inputs/hidden_input.rb
+++ b/lib/formtastic/inputs/hidden_input.rb
@@ -36,7 +36,7 @@ class HiddenInput
       #
       # @todo this is inconsistent with all other inputs, deprecate and remove
       def input_html_options
-        {:value => options[:value]}.merge(super)
+        {:value => options[:value]}.merge(super).merge(:required => nil)
       end
       
       def to_html
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 79301a846..2294a7fed 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -50,7 +50,6 @@
             output_buffer.should have_tag('form li.required label', /required yo/)
           end
         end
-
       end
 
       describe 'when false' do
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index 8bf5e77ed..f54cc32e6 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -144,7 +144,16 @@
     output_buffer.should have_tag('form li label input[@type="checkbox"]')
     output_buffer.should have_tag('form li label input[@name="project[allow_comments]"]')
   end
-
+  
+  context "when required" do
+    it "should add the required attribute to the input's html options" do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:title, :as => :boolean, :required => true))
+      end)
+      output_buffer.should have_tag("input[@required]")
+    end
+  end
+  
   describe "when namespace is provided" do
 
     before do
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 6f1077259..6ad7c7a62 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -11,7 +11,7 @@
       mock_everything
 
       concat(semantic_form_for(@fred) do |builder|
-        concat(builder.input(:posts, :as => :check_boxes, :value_as_class => true))
+        concat(builder.input(:posts, :as => :check_boxes, :value_as_class => true, :required => true))
       end)
     end
 
@@ -66,6 +66,12 @@
           output_buffer.should have_tag("form li fieldset ol li.post_#{post.id} label")
         end
       end
+      
+      it "should add the required attribute to the input's html options" do
+        ::Post.all.each do |post|
+          output_buffer.should have_tag("form li fieldset ol li.post_#{post.id} input[@required]")
+        end
+      end
 
       it 'should have a checkbox input but no hidden field for each post' do
         ::Post.all.each do |post|
diff --git a/spec/inputs/country_input_spec.rb b/spec/inputs/country_input_spec.rb
index 36e44d69d..7d009cd65 100644
--- a/spec/inputs/country_input_spec.rb
+++ b/spec/inputs/country_input_spec.rb
@@ -55,7 +55,7 @@
       priority_countries = ["Foo", "Bah"]
       semantic_form_for(@new_post) do |builder|
         builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
-        builder.should_receive(:country_select).with(:country, priority_countries, {}, {:id => "post_country"}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        builder.should_receive(:country_select).with(:country, priority_countries, {}, {:id => "post_country", :required => true}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
 
         concat(builder.input(:country, :as => :country, :priority_countries => priority_countries))
       end
@@ -68,7 +68,7 @@
 
       semantic_form_for(@new_post) do |builder|
         builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
-        builder.should_receive(:country_select).with(:country, priority_countries, {}, {:id => "post_country"}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        builder.should_receive(:country_select).with(:country, priority_countries, {}, {:id => "post_country", :required => true}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
 
         concat(builder.input(:country, :as => :country))
       end
@@ -84,7 +84,7 @@
 
       concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
-        builder.should_receive(:country_select).with(:country, [], {}, {:id => "context2_post_country"}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        builder.should_receive(:country_select).with(:country, [], {}, {:id => "context2_post_country", :required => true}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         concat(builder.input(:country, :priority_countries => []))
       end)
     end
diff --git a/spec/inputs/date_input_spec.rb b/spec/inputs/date_input_spec.rb
index d9171927a..0790b0bae 100644
--- a/spec/inputs/date_input_spec.rb
+++ b/spec/inputs/date_input_spec.rb
@@ -94,5 +94,14 @@
       end
     end
   end
-
+  
+  describe "when required" do
+    it "should add the required attribute to the input's html options" do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:title, :as => :date, :required => true))
+      end)
+      output_buffer.should have_tag("select[@required]", :count => 3)
+    end
+  end
+  
 end
diff --git a/spec/inputs/datetime_input_spec.rb b/spec/inputs/datetime_input_spec.rb
index 8bb2a7f79..58556c362 100644
--- a/spec/inputs/datetime_input_spec.rb
+++ b/spec/inputs/datetime_input_spec.rb
@@ -99,5 +99,14 @@
       #end
     end
   end
-
+  
+  describe "when required" do
+    it "should add the required attribute to the input's html options" do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:title, :as => :datetime, :required => true))
+      end)
+      output_buffer.should have_tag("select[@required]", :count => 5)
+    end
+  end
+  
 end
diff --git a/spec/inputs/email_input_spec.rb b/spec/inputs/email_input_spec.rb
index 4c664f8a9..328a4e597 100644
--- a/spec/inputs/email_input_spec.rb
+++ b/spec/inputs/email_input_spec.rb
@@ -39,6 +39,15 @@
     it_should_have_label_and_input_with_id("context2_post_email")
 
   end
-
+  
+  describe "when required" do
+    it "should add the required attribute to the input's html options" do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:title, :as => :email, :required => true))
+      end)
+      output_buffer.should have_tag("input[@required]")
+    end
+  end
+  
 end
 
diff --git a/spec/inputs/file_input_spec.rb b/spec/inputs/file_input_spec.rb
index d95f5d0c5..b7da00b73 100644
--- a/spec/inputs/file_input_spec.rb
+++ b/spec/inputs/file_input_spec.rb
@@ -44,6 +44,15 @@
     it_should_have_label_and_input_with_id("context2_post_body")
 
   end
-
+  
+  context "when required" do
+    it "should add the required attribute to the input's html options" do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:title, :as => :file, :required => true))
+      end)
+      output_buffer.should have_tag("input[@required]")
+    end
+  end
+  
 end
 
diff --git a/spec/inputs/hidden_input_spec.rb b/spec/inputs/hidden_input_spec.rb
index 9b2a5687b..4e959e0cb 100644
--- a/spec/inputs/hidden_input_spec.rb
+++ b/spec/inputs/hidden_input_spec.rb
@@ -92,6 +92,15 @@
     end
 
   end
-
+  
+  context "when required" do
+    it "should not add the required attribute to the input's html options" do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:title, :as => :hidden, :required => true))
+      end)
+      output_buffer.should_not have_tag("input[@required]")
+    end
+  end
+  
 end
 
diff --git a/spec/inputs/numeric_input_spec.rb b/spec/inputs/numeric_input_spec.rb
index 399ba36fb..37ac80728 100644
--- a/spec/inputs/numeric_input_spec.rb
+++ b/spec/inputs/numeric_input_spec.rb
@@ -51,6 +51,15 @@
     it_should_have_input_wrapper_with_id("context2_post_title_input")
     it_should_have_label_and_input_with_id("context2_post_title")
   end
-
+  
+  describe "when required" do
+    it "should add the required attribute to the input's html options" do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:title, :as => :numeric, :required => true))
+      end)
+      output_buffer.should have_tag("input[@required]")
+    end
+  end
+  
 end
 
diff --git a/spec/inputs/password_input_spec.rb b/spec/inputs/password_input_spec.rb
index 7516b8abb..09816764e 100644
--- a/spec/inputs/password_input_spec.rb
+++ b/spec/inputs/password_input_spec.rb
@@ -54,5 +54,14 @@
     it_should_have_label_and_input_with_id("context2_post_title")
 
   end
-
+  
+  describe "when required" do
+    it "should add the required attribute to the input's html options" do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:title, :as => :password, :required => true))
+      end)
+      output_buffer.should have_tag("input[@required]")
+    end
+  end
+  
 end
diff --git a/spec/inputs/phone_input_spec.rb b/spec/inputs/phone_input_spec.rb
index f48897e2d..198224e8c 100644
--- a/spec/inputs/phone_input_spec.rb
+++ b/spec/inputs/phone_input_spec.rb
@@ -39,6 +39,15 @@
     it_should_have_label_and_input_with_id("context2_post_phone")
 
   end
-
+  
+  describe "when required" do
+    it "should add the required attribute to the input's html options" do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:title, :as => :phone, :required => true))
+      end)
+      output_buffer.should have_tag("input[@required]")
+    end
+  end
+  
 end
 
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index acd8f29d6..53ad00a46 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -13,7 +13,7 @@
   describe 'for belongs_to association' do
     before do
       concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:author, :as => :radio, :value_as_class => true))
+        concat(builder.input(:author, :as => :radio, :value_as_class => true, :required => true))
       end)
     end
 
@@ -55,6 +55,12 @@
           output_buffer.should have_tag("form li fieldset ol li.author_#{author.id} label")
         end
       end
+      
+      it "should add the required attribute to the input's html options" do
+        ::Author.all.each do |post|
+          output_buffer.should have_tag("form li fieldset ol li.author_#{post.id} input[@required]")
+        end
+      end
 
       it "should have a radio input" do
         ::Author.all.each do |author|
diff --git a/spec/inputs/search_input_spec.rb b/spec/inputs/search_input_spec.rb
index 68800d3d3..8a5fc7fd8 100644
--- a/spec/inputs/search_input_spec.rb
+++ b/spec/inputs/search_input_spec.rb
@@ -39,6 +39,15 @@
     it_should_have_label_and_input_with_id("context2_post_search")
 
   end
-
+  
+  describe "when required" do
+    it "should add the required attribute to the input's html options" do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:title, :as => :search, :required => true))
+      end)
+      output_buffer.should have_tag("input[@required]")
+    end
+  end
+  
 end
 
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 6b444c489..5f9fdce87 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -516,4 +516,13 @@
     it_should_have_label_for("context2_post_author_ids")
   end
   
+  context "when required" do
+    it "should add the required attribute to the select's html options" do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:author, :as => :select, :required => true))
+      end)
+      output_buffer.should have_tag("select[@required]")
+    end
+  end
+  
 end
diff --git a/spec/inputs/string_input_spec.rb b/spec/inputs/string_input_spec.rb
index 013fccef3..f265d5e65 100644
--- a/spec/inputs/string_input_spec.rb
+++ b/spec/inputs/string_input_spec.rb
@@ -147,6 +147,14 @@ def should_have_maxlength(maxlength, options)
       output_buffer.should_not have_tag("input[@size]")
     end
   end
-
+  
+  describe "when required" do
+    it "should add the required attribute to the input's html options" do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:title, :as => :string, :required => true))
+      end)
+      output_buffer.should have_tag("input[@required]")
+    end
+  end
 end
 
diff --git a/spec/inputs/text_input_spec.rb b/spec/inputs/text_input_spec.rb
index f02e50a36..dff0a5a2a 100644
--- a/spec/inputs/text_input_spec.rb
+++ b/spec/inputs/text_input_spec.rb
@@ -79,6 +79,16 @@
     it_should_have_label_for("context2_post_body")
 
   end
+  
+  context "when required" do
+    it "should add the required attribute to the input's html options" do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:title, :as => :text, :required => true))
+      end)
+      output_buffer.should have_tag("input[@required]")
+    end
+  end
+  
 
   context "when :rows is missing in :input_html" do
     before do
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index 716721fe5..82fef8a59 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -139,5 +139,14 @@
       output_buffer.should have_tag('#form2_post_publish_at_5i')
     end
   end
-
+  
+  describe "when required" do
+    it "should add the required attribute to the input's html options" do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:title, :as => :time, :required => true))
+      end)
+      output_buffer.should have_tag("select[@required]", :count => 2)
+    end
+  end
+  
 end
diff --git a/spec/inputs/time_zone_input_spec.rb b/spec/inputs/time_zone_input_spec.rb
index f7b9d811a..fd1ca76c6 100644
--- a/spec/inputs/time_zone_input_spec.rb
+++ b/spec/inputs/time_zone_input_spec.rb
@@ -73,5 +73,14 @@
       output_buffer.should have_tag("form li select[@name=\"project[time_zone]\"]")
     end
   end
-
+  
+  context "when required" do
+    it "should add the required attribute to the input's html options" do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:title, :as => :time_zone, :required => true))
+      end)
+      output_buffer.should have_tag("select[@required]")
+    end
+  end
+  
 end
diff --git a/spec/inputs/url_input_spec.rb b/spec/inputs/url_input_spec.rb
index 077286589..338859f26 100644
--- a/spec/inputs/url_input_spec.rb
+++ b/spec/inputs/url_input_spec.rb
@@ -39,6 +39,15 @@
     it_should_have_label_and_input_with_id("context2_post_url")
 
   end
-
+  
+  describe "when required" do
+    it "should add the required attribute to the input's html options" do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:title, :as => :url, :required => true))
+      end)
+      output_buffer.should have_tag("input[@required]")
+    end
+  end
+  
 end
 

From 368d878fafa384b9f9ed4253dd2205b659763883 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 5 Apr 2011 06:35:41 +1000
Subject: [PATCH 665/992] changelog catch-up

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 7586f7c4e..487338b0f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,8 @@
 * Renamed Formtastic::SemanticFormBuilder to Formtastic::FormBuilder (SemanticFormBuilder still exists as a subclass, need to handle deprecation notices somehow)
 * Massive refactoring of formtastic.rb into around 30 files and modules like StringInput and ButtonsHelper
 * Removed chunks of Rails 2 specific code, tests and documentation
+* Added support for HTML5 required attribute on input, select and textarea tags
+
 
 1.2.4.beta (unreleased)
 

From 050ed235220fbb3a77f9ba627302c97e453d8890 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 5 Apr 2011 17:53:31 +1000
Subject: [PATCH 666/992] fix for required attribute spec on textarea

---
 spec/inputs/text_input_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/inputs/text_input_spec.rb b/spec/inputs/text_input_spec.rb
index dff0a5a2a..d81c80ed7 100644
--- a/spec/inputs/text_input_spec.rb
+++ b/spec/inputs/text_input_spec.rb
@@ -20,7 +20,7 @@
   it_should_have_label_for("post_body")
   it_should_have_textarea_with_id("post_body")
   it_should_have_textarea_with_name("post[body]")
-  it_should_apply_error_logic_for_input_type(:numeric)
+  it_should_apply_error_logic_for_input_type(:number)
 
   it 'should use input_html to style inputs' do
     output_buffer.replace ''
@@ -85,7 +85,7 @@
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:title, :as => :text, :required => true))
       end)
-      output_buffer.should have_tag("input[@required]")
+      output_buffer.should have_tag("textarea[@required]")
     end
   end
   

From d6e62654e8de574f10ef789a64d3a7fded5a1c76 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 5 Apr 2011 07:55:38 +1000
Subject: [PATCH 667/992] NumericInput now provides default min, max and step
 attributes by reflecting on numericality validations

---
 CHANGELOG                                 |   1 +
 README.textile                            |   2 +-
 lib/formtastic/inputs/base/validations.rb |  37 +++++++
 lib/formtastic/inputs/numeric_input.rb    |  32 +++++-
 spec/inputs/numeric_input_spec.rb         | 127 ++++++++++++++++++++++
 spec/spec_helper.rb                       |   4 +
 6 files changed, 200 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 487338b0f..b1a479363 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@
 * Massive refactoring of formtastic.rb into around 30 files and modules like StringInput and ButtonsHelper
 * Removed chunks of Rails 2 specific code, tests and documentation
 * Added support for HTML5 required attribute on input, select and textarea tags
+* Added support for HTML5 min/max/step attributes on NumericInput
 
 
 1.2.4.beta (unreleased)
diff --git a/README.textile b/README.textile
index 2f3323a63..39bf2dbfb 100644
--- a/README.textile
+++ b/README.textile
@@ -63,7 +63,7 @@ h2. It's better than _SomeOtherFormBuilder_ because...
 * it doesn't hijack or change any of the standard Rails form inputs, so you can still use them as expected (even mix and match).
 * it's got absolutely awesome spec coverage.
 * there's a bunch of people using and working on it (it's not just one developer building half a solution).
-* it has growing HTML5 support (new inputs like email, new attributes like required)
+* it has growing HTML5 support (new inputs like email, new attributes like required/min/max/step)
 
 
 h2. Why?
diff --git a/lib/formtastic/inputs/base/validations.rb b/lib/formtastic/inputs/base/validations.rb
index 6115049a9..a9344e770 100644
--- a/lib/formtastic/inputs/base/validations.rb
+++ b/lib/formtastic/inputs/base/validations.rb
@@ -42,6 +42,43 @@ def validation_limit
           end
         end
         
+        # Prefer :greater_than_or_equal_to over :greater_than, for no particular reason.
+        def validation_min
+          validation = validations? && validations.find do |validation|
+            validation.kind == :numericality
+          end
+          if validation
+            return validation.options[:greater_than_or_equal_to] if validation.options[:greater_than_or_equal_to]
+            return (validation.options[:greater_than] + 1) if validation.options[:greater_than]
+          else
+            nil
+          end
+        end
+
+        # Prefer :less_than_or_equal_to over :less_than, for no particular reason.
+        def validation_max
+          validation = validations? && validations.find do |validation|
+            validation.kind == :numericality
+          end
+          if validation
+            return validation.options[:less_than_or_equal_to] if validation.options[:less_than_or_equal_to]
+            return (validation.options[:less_than] - 1) if validation.options[:less_than]
+          else
+            nil
+          end
+        end
+
+        def validation_integer_only?
+          validation = validations? && validations.find do |validation|
+            validation.kind == :numericality
+          end
+          if validation
+            validation.options[:only_integer]
+          else
+            false
+          end
+        end
+        
         def validations?
           !validations.empty?
         end
diff --git a/lib/formtastic/inputs/numeric_input.rb b/lib/formtastic/inputs/numeric_input.rb
index 3352d461f..2a2518091 100644
--- a/lib/formtastic/inputs/numeric_input.rb
+++ b/lib/formtastic/inputs/numeric_input.rb
@@ -25,10 +25,29 @@ module Inputs
     #     </fieldset>
     #   </form>
     #
-    # @example Pass new HTML5 attrbutes down to the `<input>` tag
-    #  <%= f.input :shoe_size, :as => :numeric, :input_html => { :min => 3, :max => 15, :step => 1 } %>
+    # @example Default HTML5 min/max/step attributes are detected from the numericality validations
+    #
+    #   class Person < ActiveRecord::Base
+    #     validates_numericality_of :age, 
+    #       :less_than => 100, 
+    #       :greater_than => 17, 
+    #       :only_integer => true
+    #   end
+    #
+    #   <%= f.input :age, :as => :numeric %>
+    #
+    #   <li class="numeric">
+    #     <label for="persom_age">Age</label>
+    #     <input type="number" id="person_age" name="person[age]" min="18" max="99" step="1">
+    #   </li>
+    #
+    # @example Pass attributes down to the `<input>` tag
+    #  <%= f.input :shoe_size, :as => :numeric, :input_html => { :min => 3, :max => 15, :step => 1, :class => "special" } %>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
+    # @see http://api.rubyonrails.org/classes/ActiveModel/Validations/HelperMethods.html#method-i-validates_numericality_of Rails' Numericality validation documentation
+    #
+    # @todo Rename/Alias to NumberInput
     class NumericInput 
       include Base
       include Base::Stringish
@@ -39,6 +58,15 @@ def to_html
           builder.number_field(method, input_html_options)
         end
       end
+      
+      def input_html_options
+        {
+          :min => validation_min,
+          :max => validation_max,
+          :step => validation_integer_only? ? 1 : nil 
+        }.merge(super)
+      end
+      
     end
   end
 end
\ No newline at end of file
diff --git a/spec/inputs/numeric_input_spec.rb b/spec/inputs/numeric_input_spec.rb
index 37ac80728..b2c40411d 100644
--- a/spec/inputs/numeric_input_spec.rb
+++ b/spec/inputs/numeric_input_spec.rb
@@ -61,5 +61,132 @@
     end
   end
   
+  describe "when validations require a minimum value (:greater_than)" do
+    before do
+      @new_post.class.stub!(:validators_on).with(:title).and_return([
+        active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :greater_than=>2})
+      ])
+    end
+    
+    it "should add a max attribute to the input one greater than the validation" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :numeric)
+      end)
+      output_buffer.should have_tag('input[@min="3"]')
+    end
+    
+    it "should allow :input_html to override :min" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :numeric, :input_html => { :min => 102 })
+      end)
+      output_buffer.should have_tag('input[@min="102"]')
+    end
+  end
+  
+  describe "when validations require a minimum value (:greater_than_or_equal_to)" do
+    before do
+      @new_post.class.stub!(:validators_on).with(:title).and_return([
+        active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :greater_than_or_equal_to=>2})
+      ])
+    end
+    
+    it "should add a max attribute to the input equal to the validation" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :numeric)
+      end)
+      output_buffer.should have_tag('input[@min="2"]')
+    end
+  end
+  
+  describe "when validations require a maximum value (:less_than)" do
+    before do
+      @new_post.class.stub!(:validators_on).with(:title).and_return([
+        active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :less_than=>20})
+      ])
+    end
+    
+    it "should add a min attribute to the input one less than the validation" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :numeric)
+      end)
+      output_buffer.should have_tag('input[@max="19"]')
+    end
+    
+    it "should allow :input_html to override :min" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :numeric, :input_html => { :max => 48 })
+      end)
+      output_buffer.should have_tag('input[@max="48"]')
+    end
+  end  
+
+  describe "when validations require a maximum value (:less_than_or_equal_to)" do
+    before do
+      @new_post.class.stub!(:validators_on).with(:title).and_return([
+        active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :less_than_or_equal_to=>20})
+      ])
+    end
+    
+    it "should add a min attribute to the input one less than the validation" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :numeric)
+      end)
+      output_buffer.should have_tag('input[@max="20"]')
+    end
+  end
+  
+  describe "when validations require conflicting minimum values (:greater_than, :greater_than_or_equal_to)" do
+    before do
+      @new_post.class.stub!(:validators_on).with(:title).and_return([
+        active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :greater_than => 20, :greater_than_or_equal_to=>2})
+      ])
+    end
+    
+    it "should add a max attribute to the input equal to the :greater_than_or_equal_to validation" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :numeric)
+      end)
+      output_buffer.should have_tag('input[@min="2"]')
+    end
+  end
+  
+  describe "when validations require conflicting maximum values (:less_than, :less_than_or_equal_to)" do
+    before do
+      @new_post.class.stub!(:validators_on).with(:title).and_return([
+        active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :less_than => 20, :less_than_or_equal_to=>2})
+      ])
+    end
+    
+    it "should add a max attribute to the input equal to the :greater_than_or_equal_to validation" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :numeric)
+      end)
+      output_buffer.should have_tag('input[@max="2"]')
+    end
+  end
+  
+  describe "when validations require only an integer (:only_integer)" do
+    
+    before do
+      @new_post.class.stub!(:validators_on).with(:title).and_return([
+        active_model_numericality_validator([:title], {:allow_nil=>false, :only_integer=>true})
+      ])
+    end
+    
+    it "should add a step=1 attribute to the input to signify that only whole numbers are allowed" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :numeric)
+      end)
+      output_buffer.should have_tag('input[@step="1"]')
+    end
+    
+    it "should let input_html override :step" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :numeric, :input_html => { :step => 3 })
+      end)
+      output_buffer.should have_tag('input[@step="3"]')
+    end
+  end
+  
 end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 51e2961ae..060da7aa0 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -64,6 +64,10 @@ def active_model_length_validator(attributes, options = {})
   def active_model_inclusion_validator(attributes, options = {})
     active_model_validator(:inclusion, attributes, options)
   end
+  
+  def active_model_numericality_validator(attributes, options = {})
+    active_model_validator(:numericality, attributes, options)
+  end
 
   class ::Post
     extend ActiveModel::Naming if defined?(ActiveModel::Naming)

From a33f4d0bc9ac28f40d54b4b25af3a6cb23bd9094 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 5 Apr 2011 17:54:08 +1000
Subject: [PATCH 668/992] renamed NumericInput (:as => :numeric) to NumberInput
 (:as => :number)

---
 README.textile                                |  2 +-
 lib/formtastic/helpers/inputs_helper.rb       |  8 ++---
 lib/formtastic/inputs.rb                      |  2 +-
 .../{numeric_input.rb => number_input.rb}     | 10 +++---
 lib/formtastic/inputs/radio_input.rb          |  2 +-
 lib/formtastic/inputs/select_input.rb         |  2 +-
 spec/input_spec.rb                            | 14 ++++----
 ...ric_input_spec.rb => number_input_spec.rb} | 34 +++++++++----------
 8 files changed, 37 insertions(+), 37 deletions(-)
 rename lib/formtastic/inputs/{numeric_input.rb => number_input.rb} (89%)
 rename spec/inputs/{numeric_input_spec.rb => number_input_spec.rb} (86%)

diff --git a/README.textile b/README.textile
index 39bf2dbfb..188c45dd0 100644
--- a/README.textile
+++ b/README.textile
@@ -305,7 +305,7 @@ The Formtastic input types:
 * @:time@ - a time select. Default for column types: @:time@.
 * @:boolean@ - a checkbox. Default for column types: @:boolean@.
 * @:string@ - a text field. Default for column types: @:string@.
-* @:numeric@ - a text field (just like string). Default for  column types: @:integer@, @:float@, and @:decimal@.
+* @:number@ - a text field (just like string). Default for  column types: @:integer@, @:float@, and @:decimal@.
 * @:file@ - a file field. Default for file-attachment attributes matching: "paperclip":http://github.com/thoughtbot/paperclip or "attachment_fu":http://github.com/technoweenie/attachment_fu.
 * @:country@ - a select menu of country names. Default for column types: :string with name @"country"@ - requires a *country_select* plugin to be installed.
 * @:email@ - a text field (just like string). Default for columns with name matching @"email"@. New in HTML5. Works on some mobile browsers already.
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 9bc720616..c4f5a60e1 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -113,7 +113,7 @@ module InputsHelper
       # * `:email`        (see {Inputs::EmailInput})
       # * `:file`         (see {Inputs::FileInput})
       # * `:hidden`       (see {Inputs::HiddenInput})
-      # * `:numeric`      (see {Inputs::NumericInput})
+      # * `:number`       (see {Inputs::NumberInput})
       # * `:password`     (see {Inputs::PasswordInput})
       # * `:phone`        (see {Inputs::PhoneInput})
       # * `:radio`        (see {Inputs::RadioInput})
@@ -615,7 +615,7 @@ def inputs_for_nested_attributes(*args, &block) #:nodoc:
 
       # 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
+      # cases it will simplify (like the case of :integer, :float & :decimal to :number), or do
       # something different (like :password and :select).
       #
       # If there is no column for the method (eg "virtual columns" with an attr_accessor), the
@@ -634,9 +634,9 @@ def default_input_type(method, options = {}) #:nodoc:
             return :search    if method.to_s =~ /^search$/
           when :integer
             return :select    if reflection_for(method)
-            return :numeric
+            return :number
           when :float, :decimal
-            return :numeric
+            return :number
           when :timestamp
             return :datetime
           end
diff --git a/lib/formtastic/inputs.rb b/lib/formtastic/inputs.rb
index 745439107..d9e0b5c11 100644
--- a/lib/formtastic/inputs.rb
+++ b/lib/formtastic/inputs.rb
@@ -12,7 +12,7 @@ module Inputs
     autoload :EmailInput
     autoload :FileInput
     autoload :HiddenInput
-    autoload :NumericInput
+    autoload :NumberInput
     autoload :PasswordInput
     autoload :PhoneInput
     autoload :RadioInput
diff --git a/lib/formtastic/inputs/numeric_input.rb b/lib/formtastic/inputs/number_input.rb
similarity index 89%
rename from lib/formtastic/inputs/numeric_input.rb
rename to lib/formtastic/inputs/number_input.rb
index 2a2518091..0bfdb7d51 100644
--- a/lib/formtastic/inputs/numeric_input.rb
+++ b/lib/formtastic/inputs/number_input.rb
@@ -4,13 +4,13 @@ module Inputs
     # Outputs a simple `<label>` with a HTML5 `<input type="number">` wrapped in the standard
     # `<li>` wrapper. This is the default input choice for all database columns of the type `:float`
     # and `:decimal`, as well as `:integer` columns that aren't used for `belongs_to` associations`,
-    # but can be applied to any text-like input with `:as => :numeric`.
+    # but can be applied to any text-like input with `:as => :number`.
     #
     # @example Full form context and output
     #
     #   <%= semantic_form_for(@user) do |f| %>
     #     <%= f.inputs do %>
-    #       <%= f.input :shoe_size, :as => :numeric %>
+    #       <%= f.input :shoe_size, :as => :number %>
     #     <% end %>
     #   <% end %>
     #
@@ -34,7 +34,7 @@ module Inputs
     #       :only_integer => true
     #   end
     #
-    #   <%= f.input :age, :as => :numeric %>
+    #   <%= f.input :age, :as => :number %>
     #
     #   <li class="numeric">
     #     <label for="persom_age">Age</label>
@@ -42,13 +42,13 @@ module Inputs
     #   </li>
     #
     # @example Pass attributes down to the `<input>` tag
-    #  <%= f.input :shoe_size, :as => :numeric, :input_html => { :min => 3, :max => 15, :step => 1, :class => "special" } %>
+    #  <%= f.input :shoe_size, :as => :number, :input_html => { :min => 3, :max => 15, :step => 1, :class => "special" } %>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     # @see http://api.rubyonrails.org/classes/ActiveModel/Validations/HelperMethods.html#method-i-validates_numericality_of Rails' Numericality validation documentation
     #
     # @todo Rename/Alias to NumberInput
-    class NumericInput 
+    class NumberInput 
       include Base
       include Base::Stringish
       
diff --git a/lib/formtastic/inputs/radio_input.rb b/lib/formtastic/inputs/radio_input.rb
index 932fc584f..d8449ed77 100644
--- a/lib/formtastic/inputs/radio_input.rb
+++ b/lib/formtastic/inputs/radio_input.rb
@@ -21,7 +21,7 @@ module Inputs
     # * a `:string` input (where you want to force the user to choose from a few specific strings rather than entering anything)
     # * a `:boolean` checkbox input (where the user could choose yes or no, rather than checking a box)
     # * a `:date`, `:time` or `:datetime` input (where the user could choose from a small set of pre-determined dates)
-    # * a `:numeric` input (where the user could choose from a small set of pre-defined numbers)
+    # * a `:number` input (where the user could choose from a small set of pre-defined numbers)
     # * a `:time_zone` input (where you want to provide your own small set of choices instead of relying on Rails)
     # * a `:country` input (where you want to provide a small set of choices, no need for a plugin really)
     #
diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index e73062890..80aaa2b1e 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -18,7 +18,7 @@ module Inputs
     # * a `:string` input (where you want to force the user to choose from a few specific strings rather than entering anything)
     # * a `:boolean` checkbox input (where the user could choose yes or no, rather than checking a box)
     # * a `:date`, `:time` or `:datetime` input (where the user could choose from pre-selected dates)
-    # * a `:numeric` input (where the user could choose from a set of pre-defined numbers)
+    # * a `:number` input (where the user could choose from a set of pre-defined numbers)
     # * a `:time_zone` input (where you want to provide your own set of choices instead of relying on Rails)
     # * a `:country` input (no need for a plugin really)
     #
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index 2294a7fed..b133b72cd 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -288,10 +288,10 @@ def should_be_required(options)
           default_input_type(nil, :password_method_without_a_database_column).should == :password
         end
 
-        it 'should default to :numeric for "integer" column with name ending in "_id"' do
+        it 'should default to :number for "integer" column with name ending in "_id"' do
           @new_post.stub!(:aws_instance_id)
           @new_post.stub!(:column_for_attribute).with(:aws_instance_id).and_return(mock('column', :type => :integer))
-          default_input_type(:integer, :aws_instance_id).should == :numeric
+          default_input_type(:integer, :aws_instance_id).should == :number
         end
         
         it 'should default to :select for associations' do
@@ -332,10 +332,10 @@ def should_be_required(options)
           default_input_type(:string).should == :string
         end
   
-        it 'should default to :numeric for :integer, :float and :decimal column types' do
-          default_input_type(:integer).should == :numeric
-          default_input_type(:float).should == :numeric
-          default_input_type(:decimal).should == :numeric
+        it 'should default to :number for :integer, :float and :decimal column types' do
+          default_input_type(:integer).should == :number
+          default_input_type(:float).should == :number
+          default_input_type(:decimal).should == :number
         end
   
         it 'should default to :country for :string columns named country' do
@@ -387,7 +387,7 @@ def should_be_required(options)
       end
   
       it 'should call the corresponding input class with .to_html' do
-        [:select, :time_zone, :radio, :date, :datetime, :time, :boolean, :check_boxes, :hidden, :string, :password, :numeric, :text, :file].each do |input_style|
+        [:select, :time_zone, :radio, :date, :datetime, :time, :boolean, :check_boxes, :hidden, :string, :password, :number, :text, :file].each do |input_style|
           @new_post.stub!(:generic_column_name)
           @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
           semantic_form_for(@new_post) do |builder|
diff --git a/spec/inputs/numeric_input_spec.rb b/spec/inputs/number_input_spec.rb
similarity index 86%
rename from spec/inputs/numeric_input_spec.rb
rename to spec/inputs/number_input_spec.rb
index b2c40411d..cac391148 100644
--- a/spec/inputs/numeric_input_spec.rb
+++ b/spec/inputs/number_input_spec.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'numeric input' do
+describe 'number input' do
 
   include FormtasticSpecHelper
 
@@ -10,11 +10,11 @@
     mock_everything
 
     concat(semantic_form_for(@new_post) do |builder|
-      concat(builder.input(:title, :as => :numeric))
+      concat(builder.input(:title, :as => :number))
     end)
   end
 
-  it_should_have_input_wrapper_with_class(:numeric)
+  it_should_have_input_wrapper_with_class(:number)
   it_should_have_input_wrapper_with_id("post_title_input")
   it_should_have_label_with_text(/Title/)
   it_should_have_label_for("post_title")
@@ -25,12 +25,12 @@
   it_should_not_use_default_text_field_size_when_nil(:string)
   it_should_apply_custom_input_attributes_when_input_html_provided(:string)
   it_should_apply_custom_for_to_label_when_input_html_id_provided(:string)
-  it_should_apply_error_logic_for_input_type(:numeric)
+  it_should_apply_error_logic_for_input_type(:number)
 
   describe "when no object is provided" do
     before do
       concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
-        concat(builder.input(:title, :as => :numeric))
+        concat(builder.input(:title, :as => :number))
       end)
     end
 
@@ -44,7 +44,7 @@
   describe "when namespace provided" do
     before do
       concat(semantic_form_for(@new_post, :namespace => :context2) do |builder|
-        concat(builder.input(:title, :as => :numeric))
+        concat(builder.input(:title, :as => :number))
       end)
     end
 
@@ -55,7 +55,7 @@
   describe "when required" do
     it "should add the required attribute to the input's html options" do
       concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:title, :as => :numeric, :required => true))
+        concat(builder.input(:title, :as => :number, :required => true))
       end)
       output_buffer.should have_tag("input[@required]")
     end
@@ -70,14 +70,14 @@
     
     it "should add a max attribute to the input one greater than the validation" do
       concat(semantic_form_for(@new_post) do |builder|
-        builder.input(:title, :as => :numeric)
+        builder.input(:title, :as => :number)
       end)
       output_buffer.should have_tag('input[@min="3"]')
     end
     
     it "should allow :input_html to override :min" do
       concat(semantic_form_for(@new_post) do |builder|
-        builder.input(:title, :as => :numeric, :input_html => { :min => 102 })
+        builder.input(:title, :as => :number, :input_html => { :min => 102 })
       end)
       output_buffer.should have_tag('input[@min="102"]')
     end
@@ -92,7 +92,7 @@
     
     it "should add a max attribute to the input equal to the validation" do
       concat(semantic_form_for(@new_post) do |builder|
-        builder.input(:title, :as => :numeric)
+        builder.input(:title, :as => :number)
       end)
       output_buffer.should have_tag('input[@min="2"]')
     end
@@ -107,14 +107,14 @@
     
     it "should add a min attribute to the input one less than the validation" do
       concat(semantic_form_for(@new_post) do |builder|
-        builder.input(:title, :as => :numeric)
+        builder.input(:title, :as => :number)
       end)
       output_buffer.should have_tag('input[@max="19"]')
     end
     
     it "should allow :input_html to override :min" do
       concat(semantic_form_for(@new_post) do |builder|
-        builder.input(:title, :as => :numeric, :input_html => { :max => 48 })
+        builder.input(:title, :as => :number, :input_html => { :max => 48 })
       end)
       output_buffer.should have_tag('input[@max="48"]')
     end
@@ -129,7 +129,7 @@
     
     it "should add a min attribute to the input one less than the validation" do
       concat(semantic_form_for(@new_post) do |builder|
-        builder.input(:title, :as => :numeric)
+        builder.input(:title, :as => :number)
       end)
       output_buffer.should have_tag('input[@max="20"]')
     end
@@ -144,7 +144,7 @@
     
     it "should add a max attribute to the input equal to the :greater_than_or_equal_to validation" do
       concat(semantic_form_for(@new_post) do |builder|
-        builder.input(:title, :as => :numeric)
+        builder.input(:title, :as => :number)
       end)
       output_buffer.should have_tag('input[@min="2"]')
     end
@@ -159,7 +159,7 @@
     
     it "should add a max attribute to the input equal to the :greater_than_or_equal_to validation" do
       concat(semantic_form_for(@new_post) do |builder|
-        builder.input(:title, :as => :numeric)
+        builder.input(:title, :as => :number)
       end)
       output_buffer.should have_tag('input[@max="2"]')
     end
@@ -175,14 +175,14 @@
     
     it "should add a step=1 attribute to the input to signify that only whole numbers are allowed" do
       concat(semantic_form_for(@new_post) do |builder|
-        builder.input(:title, :as => :numeric)
+        builder.input(:title, :as => :number)
       end)
       output_buffer.should have_tag('input[@step="1"]')
     end
     
     it "should let input_html override :step" do
       concat(semantic_form_for(@new_post) do |builder|
-        builder.input(:title, :as => :numeric, :input_html => { :step => 3 })
+        builder.input(:title, :as => :number, :input_html => { :step => 3 })
       end)
       output_buffer.should have_tag('input[@step="3"]')
     end

From ab09612accaee137cde2d1ae109ec35e7c9156bc Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 5 Apr 2011 18:10:32 +1000
Subject: [PATCH 669/992] Revert "with_deprecation_silenced is not used"

This reverts commit 02c449ac837a88f2990f5b46317df4bf98ec93bc.

Keep this in for when we need it!
---
 spec/support/deprecation.rb | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 spec/support/deprecation.rb

diff --git a/spec/support/deprecation.rb b/spec/support/deprecation.rb
new file mode 100644
index 000000000..e21242b7a
--- /dev/null
+++ b/spec/support/deprecation.rb
@@ -0,0 +1,6 @@
+def with_deprecation_silenced(&block)
+  ::ActiveSupport::Deprecation.silence do
+    yield
+  end
+end
+

From 1a7c5f50018dbeaf852178000984c3b9d509845a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Oko=C5=84ski?= <kuba@okonski.org>
Date: Tue, 5 Apr 2011 10:45:07 +0200
Subject: [PATCH 670/992] Rename ValidationHelper to ValidationsHelper.

---
 lib/formtastic/form_builder.rb                    |  7 ++++---
 ...validation_helper.rb => validations_helper.rb} | 15 ++++++++-------
 2 files changed, 12 insertions(+), 10 deletions(-)
 rename lib/formtastic/helpers/{validation_helper.rb => validations_helper.rb} (94%)

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index ab4b5a211..7f8cde34f 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -8,7 +8,7 @@
 require 'helpers/buttons_helper'
 require 'helpers/label_helper'
 require 'helpers/errors_helper'
-require 'helpers/validation_helper'
+require 'helpers/validations_helper'
 
 require 'inputs/boolean_input'
 require 'inputs/check_boxes_input'
@@ -64,7 +64,7 @@ def self.configure(name, value = nil)
     configure :default_hint_class, 'inline-hints'
 
     attr_reader :template
-    
+
     attr_reader :auto_index
 
     include Formtastic::HtmlAttributes
@@ -74,4 +74,5 @@ def self.configure(name, value = nil)
     include Formtastic::Helpers::ErrorsHelper
   end
 
-end
\ No newline at end of file
+end
+
diff --git a/lib/formtastic/helpers/validation_helper.rb b/lib/formtastic/helpers/validations_helper.rb
similarity index 94%
rename from lib/formtastic/helpers/validation_helper.rb
rename to lib/formtastic/helpers/validations_helper.rb
index 2c1b762f2..80b603bc2 100644
--- a/lib/formtastic/helpers/validation_helper.rb
+++ b/lib/formtastic/helpers/validations_helper.rb
@@ -1,7 +1,7 @@
 module Formtastic
   module Helpers
-    module ValidationHelper
-    
+    module ValidationsHelper
+
       def range_options_for(method, options = {})
         options[:input_html] ||= {}
         if options[:in]
@@ -9,7 +9,7 @@ def range_options_for(method, options = {})
           options[:input_html][:step] = options.delete :step || 1
           return options
         end
-        
+
         reflections = @object.class.reflect_on_validations_for(method) if @object.class.respond_to? :reflect_on_validations_for
         reflections ||= []
         reflections.each do |reflection|
@@ -24,16 +24,17 @@ def range_options_for(method, options = {})
             elsif reflection.options.include?(:less_than_or_equal_to)
               range_end = reflection.options[:less_than_or_equal_to]
             end
-              
+
             options[:input_html][:in] = (range_start..range_end)
           end
         end
-        
+
         options[:input_html][:step] ||= 1
-        
+
         return options
       end
-      
+
     end
   end
 end
+

From e47e6f7af89a43c0bcbd859a8f10963989be8b36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Oko=C5=84ski?= <kuba@okonski.org>
Date: Tue, 5 Apr 2011 10:46:35 +0200
Subject: [PATCH 671/992] Fix previous merge errors and include
 ValidationsHelper in FormBuilder.

---
 lib/formtastic/form_builder.rb | 36 ++--------------------------------
 1 file changed, 2 insertions(+), 34 deletions(-)

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 7f8cde34f..769195c17 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -1,37 +1,3 @@
-<<<<<<< HEAD
-=======
-$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__))))
-
-require 'html_attributes'
-
-require 'helpers/inputs_helper'
-require 'helpers/buttons_helper'
-require 'helpers/label_helper'
-require 'helpers/errors_helper'
-require 'helpers/validations_helper'
-
-require 'inputs/boolean_input'
-require 'inputs/check_boxes_input'
-require 'inputs/country_input'
-require 'inputs/datetime_input'
-require 'inputs/date_input'
-require 'inputs/email_input'
-require 'inputs/file_input'
-require 'inputs/hidden_input'
-require 'inputs/numeric_input'
-require 'inputs/password_input'
-require 'inputs/phone_input'
-require 'inputs/radio_input'
-require 'inputs/range_input'
-require 'inputs/search_input'
-require 'inputs/select_input'
-require 'inputs/string_input'
-require 'inputs/text_input'
-require 'inputs/time_input'
-require 'inputs/time_zone_input'
-require 'inputs/url_input'
-
->>>>>>> okonski/range_helper
 module Formtastic
   class FormBuilder < ActionView::Helpers::FormBuilder
 
@@ -72,6 +38,8 @@ def self.configure(name, value = nil)
     include Formtastic::Helpers::InputsHelper
     include Formtastic::Helpers::ButtonsHelper
     include Formtastic::Helpers::ErrorsHelper
+    include Formtastic::Helpers::ValidationsHelper
+
   end
 
 end

From 840c9afd206f16f0f97234bde5302fc0231273dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Oko=C5=84ski?= <kuba@okonski.org>
Date: Tue, 5 Apr 2011 11:00:25 +0200
Subject: [PATCH 672/992] Further fixes for ValidationsHelper.

---
 lib/formtastic/helpers.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/formtastic/helpers.rb b/lib/formtastic/helpers.rb
index 6f7b1237a..d0e355c36 100644
--- a/lib/formtastic/helpers.rb
+++ b/lib/formtastic/helpers.rb
@@ -8,5 +8,7 @@ module Helpers
     autoload :InputsHelper, 'formtastic/helpers/inputs_helper'
     autoload :LabelHelper, 'formtastic/helpers/label_helper'
     autoload :SemanticFormHelper, 'formtastic/helpers/semantic_form_helper'
+    autoload :ValidationsHelper, 'formtastic/helpers/validations_helper'
   end
 end
+

From 19826cc36bc84e9461842a0b76a267e19070b7e7 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 5 Apr 2011 19:36:08 +1000
Subject: [PATCH 673/992] add NumericInput back in as a deprecated subclass of
 NumberInput

---
 lib/formtastic/inputs.rb               |  1 +
 lib/formtastic/inputs/numeric_input.rb | 20 +++++++++++++
 spec/inputs/numeric_input_spec.rb      | 40 ++++++++++++++++++++++++++
 3 files changed, 61 insertions(+)
 create mode 100644 lib/formtastic/inputs/numeric_input.rb
 create mode 100644 spec/inputs/numeric_input_spec.rb

diff --git a/lib/formtastic/inputs.rb b/lib/formtastic/inputs.rb
index d9e0b5c11..a23db2471 100644
--- a/lib/formtastic/inputs.rb
+++ b/lib/formtastic/inputs.rb
@@ -13,6 +13,7 @@ module Inputs
     autoload :FileInput
     autoload :HiddenInput
     autoload :NumberInput
+    autoload :NumericInput
     autoload :PasswordInput
     autoload :PhoneInput
     autoload :RadioInput
diff --git a/lib/formtastic/inputs/numeric_input.rb b/lib/formtastic/inputs/numeric_input.rb
new file mode 100644
index 000000000..1c2ec6eeb
--- /dev/null
+++ b/lib/formtastic/inputs/numeric_input.rb
@@ -0,0 +1,20 @@
+module Formtastic
+  module Inputs
+    # Alias for NumberInput for backwards compatibility with 1.x.
+    # 
+    # @example:
+    #   f.input :age, :as => :numeric
+    #
+    # @deprecated Use :as => :number instead
+    #
+    # @todo Remove on or after 2.1
+    class NumericInput < NumberInput
+      
+      def initialize(builder, template, object, object_name, method, options)
+        ActiveSupport::Deprecation.warn(':as => :numeric has been deprecated in favor of :as => :number and will be removed on or after version 2.1', caller)
+        super
+      end
+      
+    end
+  end
+end
\ No newline at end of file
diff --git a/spec/inputs/numeric_input_spec.rb b/spec/inputs/numeric_input_spec.rb
new file mode 100644
index 000000000..2ff0e90fb
--- /dev/null
+++ b/spec/inputs/numeric_input_spec.rb
@@ -0,0 +1,40 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe 'numeric input' do
+
+  include FormtasticSpecHelper
+
+  before do
+    @output_buffer = ''
+    mock_everything
+  end
+
+  it "should call NumberInput.new" do
+    input = mock('input', :to_html => "HTML codez")
+    ::Formtastic::Inputs::NumericInput.should_receive(:new).and_return(input)
+    concat(semantic_form_for(@new_post) do |builder|
+      concat(builder.input(:title, :as => :numeric))
+    end)
+  end
+  
+  it "should have an li.numeric" do
+    with_deprecation_silenced do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:title, :as => :numeric))
+      end)
+    end
+    output_buffer.should have_tag('li.numeric')
+  end
+  
+  it "should warn that :numeric is deprecated in favor of :number" do
+    ::ActiveSupport::Deprecation.should_receive(:warn)
+    with_deprecation_silenced do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:title, :as => :numeric))
+      end)
+    end
+  end
+
+end
+

From 5c24345780c4464a066bfc367ec5e8b5d6b19eb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Oko=C5=84ski?= <kuba@okonski.org>
Date: Tue, 5 Apr 2011 11:37:03 +0200
Subject: [PATCH 674/992] Final version of numeric_input and ValidationsHelper,
 now supports `validates_numericality_of` with option `:step`.

---
 lib/formtastic/helpers/validations_helper.rb | 19 +++++++++++++------
 lib/formtastic/inputs/numeric_input.rb       | 16 ++++++----------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/lib/formtastic/helpers/validations_helper.rb b/lib/formtastic/helpers/validations_helper.rb
index 80b603bc2..a7d7ac2e9 100644
--- a/lib/formtastic/helpers/validations_helper.rb
+++ b/lib/formtastic/helpers/validations_helper.rb
@@ -3,16 +3,15 @@ module Helpers
     module ValidationsHelper
 
       def range_options_for(method, options = {})
-        options[:input_html] ||= {}
         if options[:in]
-          options[:input_html][:in] = options.delete :in
-          options[:input_html][:step] = options.delete :step || 1
+          options[:step] = options.delete :step || 1
           return options
         end
 
         reflections = @object.class.reflect_on_validations_for(method) if @object.class.respond_to? :reflect_on_validations_for
         reflections ||= []
         reflections.each do |reflection|
+          p reflection.macro
           if reflection.macro == :validates_numericality_of
             if reflection.options.include?(:greater_than)
               range_start = (reflection.options[:greater_than] + 1)
@@ -25,12 +24,20 @@ def range_options_for(method, options = {})
               range_end = reflection.options[:less_than_or_equal_to]
             end
 
-            options[:input_html][:in] = (range_start..range_end)
+            # This ensures proper and default range,
+            # even if programmer has not entered any details for the macro
+            range_start ||= 0
+            range_end ||= 100
+
+            # When using macro `:validates_numericality_of`, you can
+            # use `:step` option to pre-define step for numeric fields.
+            # However, this is non-standard option for ActiveModel.
+            options[:step] = (reflection.options[:step] || 1)
+
+            options[:in] = (range_start..range_end)
           end
         end
 
-        options[:input_html][:step] ||= 1
-
         return options
       end
 
diff --git a/lib/formtastic/inputs/numeric_input.rb b/lib/formtastic/inputs/numeric_input.rb
index cef3f995b..52fc37e1e 100644
--- a/lib/formtastic/inputs/numeric_input.rb
+++ b/lib/formtastic/inputs/numeric_input.rb
@@ -1,5 +1,3 @@
-require 'inputs/basic'
-
 module Formtastic
   module Inputs
 
@@ -31,21 +29,19 @@ module Inputs
     #  <%= f.input :shoe_size, :as => :numeric, :input_html => { :min => 3, :max => 15, :step => 1 } %>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
-    class NumericInput 
+    class NumericInput
       include Base
       include Base::Stringish
-      
+      include Helpers::ValidationsHelper
+
       def to_html
         input_wrapping do
+          p range_options_for(method, input_html_options)
           label_html <<
-          builder.number_field(method, input_html_options)
+          builder.number_field(method, range_options_for(method, input_html_options))
         end
       end
-
-      # Outputs a label and standard Rails text field inside the wrapper.
-      def numeric_input(method, options)
-        basic_input_helper(:number_field, :numeric, method, range_options_for(method, options))
-      end
     end
   end
 end
+

From 3f9ab6192364f8e4393cf436f3db555e997dce7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Oko=C5=84ski?= <kuba@okonski.org>
Date: Tue, 5 Apr 2011 11:38:39 +0200
Subject: [PATCH 675/992] Delete debug message from numeric_input.

---
 lib/formtastic/inputs/numeric_input.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/formtastic/inputs/numeric_input.rb b/lib/formtastic/inputs/numeric_input.rb
index 52fc37e1e..96d023db5 100644
--- a/lib/formtastic/inputs/numeric_input.rb
+++ b/lib/formtastic/inputs/numeric_input.rb
@@ -36,7 +36,6 @@ class NumericInput
 
       def to_html
         input_wrapping do
-          p range_options_for(method, input_html_options)
           label_html <<
           builder.number_field(method, range_options_for(method, input_html_options))
         end

From 2c6d2a7d326755902d9abdb90aab818f40252c1e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 5 Apr 2011 19:38:59 +1000
Subject: [PATCH 676/992] crank coverage

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index e75ef0f68..3e35f2a11 100644
--- a/Rakefile
+++ b/Rakefile
@@ -41,7 +41,7 @@ end
 
 RCov::VerifyTask.new(:verify_coverage) do |t|
   t.require_exact_threshold = false
-  t.threshold = 95.55
+  t.threshold = 95.69
 end
 
 desc "Run all examples and verify coverage"

From 62b7a6774d843e2d26a876d181faf2c3b1d8c689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Oko=C5=84ski?= <kuba@okonski.org>
Date: Tue, 5 Apr 2011 12:08:51 +0200
Subject: [PATCH 677/992] RangeInput support.

---
 lib/formtastic/inputs.rb             |  2 ++
 lib/formtastic/inputs/range_input.rb | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/lib/formtastic/inputs.rb b/lib/formtastic/inputs.rb
index 745439107..b21fb81aa 100644
--- a/lib/formtastic/inputs.rb
+++ b/lib/formtastic/inputs.rb
@@ -16,6 +16,7 @@ module Inputs
     autoload :PasswordInput
     autoload :PhoneInput
     autoload :RadioInput
+    autoload :RangeInput
     autoload :SearchInput
     autoload :SelectInput
     autoload :StringInput
@@ -26,3 +27,4 @@ module Inputs
     autoload :UrlInput
   end
 end
+
diff --git a/lib/formtastic/inputs/range_input.rb b/lib/formtastic/inputs/range_input.rb
index 21f0668bd..de2cacb76 100644
--- a/lib/formtastic/inputs/range_input.rb
+++ b/lib/formtastic/inputs/range_input.rb
@@ -1,12 +1,18 @@
 module Formtastic
   module Inputs
-    module RangeInput
-      include Formtastic::Inputs::Base
-      
-      def range_input(method, options)
-        basic_input_helper(:range_field, :numeric, method, range_options_for(method, options))
+    class RangeInput
+      include Base
+      include Base::Stringish
+      include Helpers::ValidationsHelper
+
+      def to_html
+        input_wrapping do
+          label_html <<
+          builder.range_field(method, range_options_for(method, input_html_options))
+        end
       end
-  
+
     end
   end
 end
+

From a2ed3e7ffe2f7564a39b324a5021d7f9179f458b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Oko=C5=84ski?= <kuba@okonski.org>
Date: Tue, 5 Apr 2011 12:08:59 +0200
Subject: [PATCH 678/992] Don't allow :greater_than and :less_than in
 #range_options_for when column type is a float.

---
 lib/formtastic/helpers/validations_helper.rb | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/formtastic/helpers/validations_helper.rb b/lib/formtastic/helpers/validations_helper.rb
index a7d7ac2e9..0010a5aac 100644
--- a/lib/formtastic/helpers/validations_helper.rb
+++ b/lib/formtastic/helpers/validations_helper.rb
@@ -1,8 +1,12 @@
 module Formtastic
   module Helpers
     module ValidationsHelper
+      include InputsHelper
 
       def range_options_for(method, options = {})
+        # If :float is detected, work ranges only for _or_equal_to.
+        column_type = column_for(method).type
+
         if options[:in]
           options[:step] = options.delete :step || 1
           return options
@@ -11,14 +15,15 @@ def range_options_for(method, options = {})
         reflections = @object.class.reflect_on_validations_for(method) if @object.class.respond_to? :reflect_on_validations_for
         reflections ||= []
         reflections.each do |reflection|
-          p reflection.macro
           if reflection.macro == :validates_numericality_of
-            if reflection.options.include?(:greater_than)
+            if reflection.options.include?(:greater_than)\
+              and not column_type == :float
               range_start = (reflection.options[:greater_than] + 1)
             elsif reflection.options.include?(:greater_than_or_equal_to)
               range_start = reflection.options[:greater_than_or_equal_to]
             end
-            if reflection.options.include?(:less_than)
+            if reflection.options.include?(:less_than)\
+              and not column_type == :float
               range_end = (reflection.options[:less_than] - 1)
             elsif reflection.options.include?(:less_than_or_equal_to)
               range_end = reflection.options[:less_than_or_equal_to]
@@ -34,7 +39,8 @@ def range_options_for(method, options = {})
             # However, this is non-standard option for ActiveModel.
             options[:step] = (reflection.options[:step] || 1)
 
-            options[:in] = (range_start..range_end)
+            # Taken in parenthesis for Floats to work.
+            options[:in] = ((range_start)..(range_end))
           end
         end
 

From ef9b527b2c5d9c7579cf52e7c8add1f01af9d212 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 5 Apr 2011 21:05:13 +1000
Subject: [PATCH 679/992] i18n look-ups config is now true (perform lookups by
 default)

---
 lib/formtastic/form_builder.rb         |  2 +-
 lib/generators/templates/formtastic.rb |  2 +-
 spec/commit_button_spec.rb             | 10 ++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 37977da64..b976a4a1e 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -22,7 +22,7 @@ def self.configure(name, value = nil)
     configure :file_methods, [ :file?, :public_filename, :filename ]
     configure :file_metadata_suffixes, ['content_type', 'file_name', 'file_size']
     configure :priority_countries, ["Australia", "Canada", "United Kingdom", "United States"]
-    configure :i18n_lookups_by_default, false
+    configure :i18n_lookups_by_default, true
     configure :escape_html_entities_in_hints_and_labels, true
     configure :default_commit_button_accesskey
     configure :default_inline_error_class, 'inline-errors'
diff --git a/lib/generators/templates/formtastic.rb b/lib/generators/templates/formtastic.rb
index e5e3131ab..64df025cd 100644
--- a/lib/generators/templates/formtastic.rb
+++ b/lib/generators/templates/formtastic.rb
@@ -65,7 +65,7 @@
 # Formtastic::FormBuilder.custom_inline_order[:select] = [:hints, :input, :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,
+# Default value: true. Overridden for specific fields by setting value to true,
 # i.e. :label => true, or :hint => true (or opposite depending on initialized value)
 # Formtastic::FormBuilder.i18n_lookups_by_default = false
 
diff --git a/spec/commit_button_spec.rb b/spec/commit_button_spec.rb
index 2f132630b..181ae8aaf 100644
--- a/spec/commit_button_spec.rb
+++ b/spec/commit_button_spec.rb
@@ -19,10 +19,12 @@
     end
 
     it 'should call :persisted?' do
-      @new_post.should_receive(:persisted?)
-      @new_post.should_not_receive(:new_record?)
-      semantic_form_for(@new_post) do |builder|
-        concat(builder.commit_button)
+      with_config :i18n_lookups_by_default, false do
+        @new_post.should_receive(:persisted?)
+        @new_post.should_not_receive(:new_record?)
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.commit_button)
+        end
       end
     end
 

From 13164f7f5372cf48be2709c178ba51b0dd95c3d7 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 5 Apr 2011 20:59:52 +1000
Subject: [PATCH 680/992] Allow HTML5 placeholder attributes to be set on
 String-ish inputs (string, url, phone, search...) just like hints (except ony
 through i18n for now)

---
 CHANGELOG                               |  2 +-
 README.textile                          | 10 +++-
 lib/formtastic/helpers/inputs_helper.rb | 10 ++++
 lib/formtastic/inputs/base/stringish.rb | 12 +++--
 spec/inputs/placeholder_spec.rb         | 71 +++++++++++++++++++++++++
 spec/inputs/string_input_spec.rb        |  1 +
 6 files changed, 100 insertions(+), 6 deletions(-)
 create mode 100644 spec/inputs/placeholder_spec.rb

diff --git a/CHANGELOG b/CHANGELOG
index b1a479363..3ea42dd18 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,7 +15,7 @@
 * Removed chunks of Rails 2 specific code, tests and documentation
 * Added support for HTML5 required attribute on input, select and textarea tags
 * Added support for HTML5 min/max/step attributes on NumericInput
-
+* Added support for HTML5 placeholder attributes on Stringish inputs (string, email, phone, url, search, number, password)
 
 1.2.4.beta (unreleased)
 
diff --git a/README.textile b/README.textile
index 188c45dd0..888e8d36b 100644
--- a/README.textile
+++ b/README.textile
@@ -63,7 +63,7 @@ h2. It's better than _SomeOtherFormBuilder_ because...
 * it doesn't hijack or change any of the standard Rails form inputs, so you can still use them as expected (even mix and match).
 * it's got absolutely awesome spec coverage.
 * there's a bunch of people using and working on it (it's not just one developer building half a solution).
-* it has growing HTML5 support (new inputs like email, new attributes like required/min/max/step)
+* it has growing HTML5 support (new inputs like email/phone/search, new attributes like required/min/max/step/placeholder)
 
 
 h2. Why?
@@ -365,7 +365,7 @@ Formtastic supports localized *labels*, *hints*, *legends*, *actions* using the
         post_details: "Post details"
       labels:
         post:
-          title: "Choose a title..."
+          title: "Your Title"
           body: "Write something..."
           edit:
             title: "Edit title"
@@ -373,6 +373,12 @@ Formtastic supports localized *labels*, *hints*, *legends*, *actions* using the
         post:
           title: "Choose a good title for you post."
           body: "Write something inspiring here."
+      placeholders:
+        post:
+          title: "Title your post"
+          slug: "Leave blank for an automatically generated slug"
+        user:
+          email: "you@yours.com"
       actions:
         create: "Create my %{model}"
         update: "Save changes"
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index c4f5a60e1..330735c97 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -257,7 +257,17 @@ module InputsHelper
       #     end
       #   end
       #
+      # @example Providing HTML5 placeholder text through i18n:
+      #   en:
+      #    formtastic:
+      #      placeholders:
+      #        user:
+      #          email: "you@yours.com"
+      #          first_name: "Joe"
+      #          last_name: "Smith"
+      #
       # @todo Many many more examples. Some of the detail probably needs to be pushed out to the relevant methods too.
+      # @todo More i18n examples.
       def input(method, options = {})
         options = options.dup # Allow options to be shared without being tainted by Formtastic
         
diff --git a/lib/formtastic/inputs/base/stringish.rb b/lib/formtastic/inputs/base/stringish.rb
index 586cd251a..22615a00a 100644
--- a/lib/formtastic/inputs/base/stringish.rb
+++ b/lib/formtastic/inputs/base/stringish.rb
@@ -13,11 +13,17 @@ def to_html
         
         # Overrides standard `input_html_options` to provide a `maxlength` and `size` attribute.
         def input_html_options
-          super.merge(
+          {
             :maxlength => options[:input_html].try(:[], :maxlength) || limit,
-            :size => builder.default_text_field_size
-          )
+            :size => builder.default_text_field_size,
+            :placeholder => placeholder_text
+          }.merge(super)
         end
+        
+        def placeholder_text
+          localized_string(method, options[:placeholder], :placeholder)
+        end
+        
       end
     end
   end
diff --git a/spec/inputs/placeholder_spec.rb b/spec/inputs/placeholder_spec.rb
new file mode 100644
index 000000000..cc2b5a3a6
--- /dev/null
+++ b/spec/inputs/placeholder_spec.rb
@@ -0,0 +1,71 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe 'string input' do
+
+  include FormtasticSpecHelper
+
+  before do
+    @output_buffer = ''
+    mock_everything
+  end
+
+  after do
+    ::I18n.backend.reload!
+  end
+  
+  describe "placeholder text" do
+    
+    [:email, :number, :password, :phone, :search, :string, :url].each do |type|
+      
+      describe "for #{type} inputs" do
+    
+        describe "when found in i18n" do
+          it "should have a placeholder containing i18n text" do
+            with_config :i18n_lookups_by_default, true do
+              ::I18n.backend.store_translations :en, :formtastic => { :placeholders => { :title => 'War and Peace' }}
+              concat(semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title))
+              end)
+              output_buffer.should have_tag('input[@placeholder="War and Peace"]')
+            end
+          end
+        end
+        
+        describe "when not found in i18n" do
+          it "should not have placeholder" do
+            concat(semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:title))
+            end)
+            output_buffer.should_not have_tag('input[@placeholder]')
+          end
+        end
+        
+        describe "when found in i18n and :input_html" do
+          it "should favor :input_html" do
+            with_config :i18n_lookups_by_default, true do
+              ::I18n.backend.store_translations :en, :formtastic => { :placeholders => { :title => 'War and Peace' }}
+              concat(semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title, :input_html => { :placeholder => "Foo" }))
+              end)
+              output_buffer.should have_tag('input[@placeholder="Foo"]')
+            end
+          end
+        end
+        
+        describe "when found in :input_html" do
+          it "should use the :input_html placeholder" do
+            concat(semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:title, :input_html => { :placeholder => "Untitled" }))
+            end)
+            output_buffer.should have_tag('input[@placeholder="Untitled"]')
+          end
+        end
+        
+      end
+      
+    end
+    
+  end
+  
+end
diff --git a/spec/inputs/string_input_spec.rb b/spec/inputs/string_input_spec.rb
index f265d5e65..6e06cb327 100644
--- a/spec/inputs/string_input_spec.rb
+++ b/spec/inputs/string_input_spec.rb
@@ -156,5 +156,6 @@ def should_have_maxlength(maxlength, options)
       output_buffer.should have_tag("input[@required]")
     end
   end
+
 end
 

From 503b22de94d2342b6379272c58e0a57575426a31 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 5 Apr 2011 21:37:01 +1000
Subject: [PATCH 681/992] Tired of fiddling with coverage, 95% will do for now.

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index 3e35f2a11..65c15bfa8 100644
--- a/Rakefile
+++ b/Rakefile
@@ -41,7 +41,7 @@ end
 
 RCov::VerifyTask.new(:verify_coverage) do |t|
   t.require_exact_threshold = false
-  t.threshold = 95.69
+  t.threshold = 95
 end
 
 desc "Run all examples and verify coverage"

From e9e3488eeca4c9e4483bbea6ad9e707afa5261e8 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 6 Apr 2011 17:17:30 +1000
Subject: [PATCH 682/992] refactor the input class detection (with thanks to
 pixeltrix)

---
 lib/formtastic/helpers/inputs_helper.rb | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 330735c97..29aefdfb4 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -273,16 +273,15 @@ def input(method, options = {})
         
         options[:as]     ||= default_input_type(method, options)
         
-        begin
-          begin
-            klass = "#{options[:as].to_s.camelize}Input".constantize # as :string => StringInput
-          rescue NameError
-            klass = "Formtastic::Inputs::#{options[:as].to_s.camelize}Input".constantize # as :string => Formtastic::Inputs::StringInput
-          end
-        rescue NameError
+        klass_name = "#{options[:as].to_s.camelize}Input"
+        if Object.const_defined?(klass_name)
+          klass = Object.const_get(klass_name)
+        elsif Formtastic::Inputs.const_defined?(klass_name)
+          klass = Formtastic::Inputs.const_get(klass_name)
+        else
           raise Formtastic::UnknownInputError
         end
-        
+
         klass.new(self, template, @object, @object_name, method, options).to_html
       end
 

From 5cb39990237d603f574dd563dd1933f198f5d176 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 6 Apr 2011 17:38:37 +1000
Subject: [PATCH 683/992] extracted all that input class noise to it's own
 method

---
 lib/formtastic/helpers/inputs_helper.rb | 38 +++++++++++++++++++------
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 29aefdfb4..6c1e2d59e 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -273,14 +273,7 @@ def input(method, options = {})
         
         options[:as]     ||= default_input_type(method, options)
         
-        klass_name = "#{options[:as].to_s.camelize}Input"
-        if Object.const_defined?(klass_name)
-          klass = Object.const_get(klass_name)
-        elsif Formtastic::Inputs.const_defined?(klass_name)
-          klass = Formtastic::Inputs.const_get(klass_name)
-        else
-          raise Formtastic::UnknownInputError
-        end
+        klass = input_class(options[:as])
 
         klass.new(self, template, @object, @object_name, method, options).to_html
       end
@@ -574,6 +567,35 @@ def inline_errors_for(method, options = {}) #:nodoc:
       alias :errors_on :inline_errors_for
 
       protected
+      
+      # Takes the `:as` option and attempts to return the corresponding input class. In the case of
+      # `:as => :string` it will first attempt to find a top level `StringInput` class (to allow the
+      # application to subclass and modify to suit), falling back to `Formtastic::Inputs::StringInput`.
+      #
+      # This also means that the application can define it's own custom inputs in the top level
+      # namespace (eg `DatepickerInput`).
+      #
+      # @param [Symbol] as A symbol representing the type of input to render
+      # @raise [Formtastic::UnknownInputError] An appropriate input class could not be found
+      # @return [Class] An input class constant
+      #
+      # @example Normal use
+      #   input_class(:string) #=> Formtastic::Inputs::StringInput
+      #   input_class(:date) #=> Formtastic::Inputs::DateInput
+      #
+      # @example When a top-level class is found
+      #   input_class(:string) #=> StringInput
+      #   input_class(:awesome) #=> AwesomeInput
+      def input_class(as)
+        klass_name = "#{as.to_s.camelize}Input"
+        if Object.const_defined?(klass_name)
+          klass = Object.const_get(klass_name)
+        elsif Formtastic::Inputs.const_defined?(klass_name)
+          klass = Formtastic::Inputs.const_get(klass_name)
+        else
+          raise Formtastic::UnknownInputError
+        end
+      end
 
       # Collects association columns (relation columns) for the current form object class.
       def association_columns(*by_associations) #:nodoc:

From 80fb9650328c1a40714c52fc463234643d769af8 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 6 Apr 2011 17:39:05 +1000
Subject: [PATCH 684/992] whitepace only

---
 lib/formtastic/helpers/inputs_helper.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 6c1e2d59e..5f4ed37a0 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -270,11 +270,9 @@ module InputsHelper
       # @todo More i18n examples.
       def input(method, options = {})
         options = options.dup # Allow options to be shared without being tainted by Formtastic
-        
-        options[:as]     ||= default_input_type(method, options)
-        
-        klass = input_class(options[:as])
+        options[:as] ||= default_input_type(method, options)
 
+        klass = input_class(options[:as])
         klass.new(self, template, @object, @object_name, method, options).to_html
       end
 

From 6c71b5a2799da87753232a5c21e5c72dc7565a00 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 8 Apr 2011 17:03:15 +1000
Subject: [PATCH 685/992] fix for failing NumberInput Yard rendering

---
 lib/formtastic/inputs/number_input.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/number_input.rb b/lib/formtastic/inputs/number_input.rb
index 0bfdb7d51..4be7854c9 100644
--- a/lib/formtastic/inputs/number_input.rb
+++ b/lib/formtastic/inputs/number_input.rb
@@ -3,7 +3,7 @@ module Inputs
 
     # Outputs a simple `<label>` with a HTML5 `<input type="number">` wrapped in the standard
     # `<li>` wrapper. This is the default input choice for all database columns of the type `:float`
-    # and `:decimal`, as well as `:integer` columns that aren't used for `belongs_to` associations`,
+    # and `:decimal`, as well as `:integer` columns that aren't used for `belongs_to` associations,
     # but can be applied to any text-like input with `:as => :number`.
     #
     # @example Full form context and output

From f0eada5cfe21a1227604a152dbebdf7af2c2691b Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 8 Apr 2011 17:02:36 +1000
Subject: [PATCH 686/992] fixed that the HTML contents of an input would be
 HTML escaped with :label => false by marking an empty string as html_safe

---
 lib/formtastic/inputs/base/labelling.rb | 2 +-
 spec/label_spec.rb                      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/base/labelling.rb b/lib/formtastic/inputs/base/labelling.rb
index c4ceaca44..adc7ce999 100644
--- a/lib/formtastic/inputs/base/labelling.rb
+++ b/lib/formtastic/inputs/base/labelling.rb
@@ -6,7 +6,7 @@ module Labelling
         include Formtastic::LocalizedString
         
         def label_html
-          render_label? ? builder.label(input_name, label_text, label_html_options) : ""
+          render_label? ? builder.label(input_name, label_text, label_html_options) : "".html_safe
         end
         
         def label_html_options
diff --git a/spec/label_spec.rb b/spec/label_spec.rb
index 87332d08e..8d9e7521a 100644
--- a/spec/label_spec.rb
+++ b/spec/label_spec.rb
@@ -57,6 +57,7 @@
         builder.input(:title, :label => false)
       end)
       output_buffer.should_not have_tag('label')
+      output_buffer.should_not include("&gt;")
     end
 
     it 'should html escape the label string by default' do

From 1be0903e9891d5a847c855c178d0158933236ed9 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 8 Apr 2011 17:37:53 +1000
Subject: [PATCH 687/992] Fixed that custom inputs were not working in
 development mode.

Problem:
* stuff in app is not loaded until needed
* "Whatever".constantize will try to require constants
* const_get does not

Solution for now:
* revert to old implementation where we catch NameError for now
* cached results to address slowness concern (only have to do each input type's lookup once)
---
 lib/formtastic/helpers/inputs_helper.rb | 28 ++++++++++++++++++-------
 spec/input_spec.rb                      | 18 ++++++++++++----
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 5f4ed37a0..8bba8abf4 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -585,15 +585,29 @@ def inline_errors_for(method, options = {}) #:nodoc:
       #   input_class(:string) #=> StringInput
       #   input_class(:awesome) #=> AwesomeInput
       def input_class(as)
-        klass_name = "#{as.to_s.camelize}Input"
-        if Object.const_defined?(klass_name)
-          klass = Object.const_get(klass_name)
-        elsif Formtastic::Inputs.const_defined?(klass_name)
-          klass = Formtastic::Inputs.const_get(klass_name)
-        else
-          raise Formtastic::UnknownInputError
+        @input_classes_cache ||= {}
+        @input_classes_cache[as] ||= begin
+          begin
+            begin
+              custom_input_class_name(as).constantize
+            rescue NameError
+              standard_input_class_name(as).constantize
+            end
+          rescue NameError
+            raise Formtastic::UnknownInputError
+          end
         end
       end
+      
+      # :as => :string # => StringInput
+      def custom_input_class_name(as)
+        "#{as.to_s.camelize}Input"
+      end
+
+      # :as => :string # => Formtastic::Inputs::StringInput
+      def standard_input_class_name(as)
+        "Formtastic::Inputs::#{as.to_s.camelize}Input"
+      end
 
       # Collects association columns (relation columns) for the current form object class.
       def association_columns(*by_associations) #:nodoc:
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index b133b72cd..b2b849214 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -781,11 +781,21 @@ class ::StringInput < Formtastic::Inputs::StringInput
         end)
       end
     end
-  
+    
+    describe 'when instantiated multiple times with the same input type' do
+      
+      it "should be cached (not calling the internal methods)" do
+        # TODO this is really tied to the underlying implementation
+        concat(semantic_form_for(@new_post) do |builder|
+          builder.should_receive(:custom_input_class_name).with(:string).once.and_return(::Formtastic::Inputs::StringInput)
+          builder.input(:title, :as => :string)
+          builder.input(:title, :as => :string)
+        end)
+      end
+      
+    end
+    
   end
   
-  
-  
-  
 end
 

From 0ae3ba07144d5beb8ee903c243672fc860118179 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 8 Apr 2011 20:50:47 +1000
Subject: [PATCH 688/992] fix more cases of tainted/escaped HTML output

---
 lib/formtastic/inputs/base/choices.rb | 2 +-
 spec/inputs/check_boxes_input_spec.rb | 5 +++++
 spec/inputs/radio_input_spec.rb       | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/base/choices.rb b/lib/formtastic/inputs/base/choices.rb
index d7e43f7cd..c6319c921 100644
--- a/lib/formtastic/inputs/base/choices.rb
+++ b/lib/formtastic/inputs/base/choices.rb
@@ -72,7 +72,7 @@ def legend_html
               label_html_options.merge(:class => "label")
             )
           else
-            ""
+            "".html_safe
           end
         end
         
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 6ad7c7a62..5e4b1a42f 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -284,6 +284,11 @@
       it "should not output the legend" do
         output_buffer.should_not have_tag("legend.label")
       end
+      
+      it "should not cause escaped HTML" do
+        output_buffer.should_not include("&gt;")
+      end
+      
     end
 
     describe "when :required option is true" do
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 53ad00a46..f31ed4c0c 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -184,6 +184,11 @@
 
     it "should not output the legend" do
       output_buffer.should_not have_tag("legend.label")
+      output_buffer.should_not include("&gt;")
+    end
+    
+    it "should not cause escaped HTML" do
+      output_buffer.should_not include("&gt;")
     end
   end
 

From 0ed2fdc46c4b1abf06134a88802059e48911629a Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 9 Apr 2011 13:01:19 +1000
Subject: [PATCH 689/992] IntegerInput always has a default min of '0' and step
 is done through validation_step now

---
 lib/formtastic/inputs/number_input.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic/inputs/number_input.rb b/lib/formtastic/inputs/number_input.rb
index 4be7854c9..6032614a4 100644
--- a/lib/formtastic/inputs/number_input.rb
+++ b/lib/formtastic/inputs/number_input.rb
@@ -61,9 +61,9 @@ def to_html
       
       def input_html_options
         {
-          :min => validation_min,
+          :min => validation_min || 0, # always need a min value
           :max => validation_max,
-          :step => validation_integer_only? ? 1 : nil 
+          :step => validation_step || 1 
         }.merge(super)
       end
       

From 925f42e435db527828dd41d793fab6b4dbfc49d1 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 10 Apr 2011 21:19:03 +1000
Subject: [PATCH 690/992] Automatically wrap nested inputs() in an <li> tag to
 preserve HTML validity. Fixes #487

---
 CHANGELOG                               |  2 +
 lib/formtastic/helpers/inputs_helper.rb | 43 +++++++++-----
 spec/inputs_spec.rb                     | 75 +++++++++++++++++++++++++
 3 files changed, 105 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3ea42dd18..7114fe7bf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,8 @@
 * Added support for HTML5 required attribute on input, select and textarea tags
 * Added support for HTML5 min/max/step attributes on NumericInput
 * Added support for HTML5 placeholder attributes on Stringish inputs (string, email, phone, url, search, number, password)
+* Changed nested inputs() blocks to be automatically wrapped in an `<li>` tag to preserve HTML validity
+
 
 1.2.4.beta (unreleased)
 
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 8bba8abf4..422d726cf 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -376,6 +376,10 @@ def input(method, options = {})
       # All options except `:name`, `:title` and `:for` will be passed down to the fieldset as HTML
       # attributes (id, class, style, etc).
       #
+      # When nesting `inputs()` inside another `inputs()` block, the nested content will 
+      # automatically be wrapped in an `<li>` tag to preserve the HTML validity (a `<fieldset>`
+      # cannot be a direct descendant of an `<ol>`.
+      #
       #
       # @option *args :for [Symbol, ActiveModel, Array]
       #   The contents of this option is passed down to Rails' fields_for() helper, so it accepts the same values.
@@ -487,28 +491,37 @@ def input(method, options = {})
       #     <% end %>
       #   <% end %>
       def inputs(*args, &block)
+        wrap_it = @already_in_an_inputs_block ? true : false
+        @already_in_an_inputs_block = true
+        
         title = field_set_title_from_args(*args)
         html_options = args.extract_options!
         html_options[:class] ||= "inputs"
         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(*(args << html_options), &block)
-        else
-          if @object && args.empty?
-            args  = association_columns(:belongs_to)
-            args += content_columns
-            args -= SKIPPED_COLUMNS
-            args.compact!
+        out = begin
+          if html_options[:for] # Nested form
+            inputs_for_nested_attributes(*(args << html_options), &block)
+          elsif block_given?
+            field_set_and_list_wrapping(*(args << html_options), &block)
+          else
+            if @object && args.empty?
+              args  = association_columns(:belongs_to)
+              args += content_columns
+              args -= SKIPPED_COLUMNS
+              args.compact!
+            end
+            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
-          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
+        
+        out = template.content_tag(:li, out) if wrap_it
+        @already_in_an_inputs_block = false
+        out
       end
 
       # A thin wrapper around Rails' `fields_for` helper to set `:builder => Formtastic::FormBuilder`
diff --git a/spec/inputs_spec.rb b/spec/inputs_spec.rb
index c3c94e8d1..37130e1ef 100644
--- a/spec/inputs_spec.rb
+++ b/spec/inputs_spec.rb
@@ -436,4 +436,79 @@
     end
 
   end
+
+  describe 'nesting' do
+    
+    context "when not nested" do
+      it "should not wrap the inputs in an li block" do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.inputs do
+          end)
+        end)
+        output_buffer.should_not have_tag('form > li')
+      end
+    end
+    
+    context "when nested (with block)" do
+      it "should wrap the nested inputs in an li block to maintain HTML validity" do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.inputs do
+            concat(builder.inputs do
+            end)
+          end)
+        end)
+        output_buffer.should have_tag('form > fieldset.inputs > ol > li > fieldset.inputs > ol')
+      end
+    end
+    
+    context "when nested (with block and :for)" do
+      it "should wrap the nested inputs in an li block to maintain HTML validity" do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.inputs do
+            concat(builder.inputs(:for => :author) do |author_builder|
+            end)
+          end)
+        end)
+        output_buffer.should have_tag('form > fieldset.inputs > ol > li > fieldset.inputs > ol')
+      end
+    end
+    
+    context "when nested (without block)" do
+      it "should wrap the nested inputs in an li block to maintain HTML validity" do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.inputs do
+            concat(builder.inputs(:title))
+          end)
+        end)
+        output_buffer.should have_tag('form > fieldset.inputs > ol > li > fieldset.inputs > ol')
+      end
+    end
+
+    context "when nested (without block, with :for)" do
+      it "should wrap the nested inputs in an li block to maintain HTML validity" do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.inputs do
+            concat(builder.inputs(:name, :for => :author))
+          end)
+        end)
+        output_buffer.should have_tag('form > fieldset.inputs > ol > li > fieldset.inputs > ol')
+      end
+    end
+
+    context "when double nested" do
+      it "should wrap the nested inputs in an li block to maintain HTML validity" do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.inputs do
+            concat(builder.inputs do
+              concat(builder.inputs do
+              end)
+            end)
+          end)
+        end)
+        output_buffer.should have_tag('form > fieldset.inputs > ol > li > fieldset.inputs > ol > li > fieldset.inputs > ol')
+      end
+    end
+    
+  end
+
 end

From 96668e897beb0a106e81a1669af1181bedeaa68d Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 10 Apr 2011 21:28:09 +1000
Subject: [PATCH 691/992] changelog tweak

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7114fe7bf..f841f64f5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-[refactor branch]
+[master]
 
 * Removed the "inline_order" configuration (redefine input_wrapping instead)
 * Removed the "special" implementation of label() from FormBuilder, so builder.label will call Rails' label helper, not ours

From 7c93a6add861dad20e57a81ea2deb71190c41f81 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 11 Apr 2011 08:31:05 +1000
Subject: [PATCH 692/992] Better handling of Polymorphic inputs without a
 :collection (fixes #511)

We cannot guess which class to use for the :collection when rendering an input for a polymorphic association, so:

* skip polymorphic associations altogether when rendering inputs with quick form syntax (<%= f.inputs %>)
* raise an error when quick form syntax (<%= f.inputs :title, :body %>) tries to render an input for a polymorphic association
* raise an error when a :collection is not provided in block form syntax (<%= f.inputs do %><%= f.input :foo %><% end %>) on a polymorphic association
---
 lib/formtastic.rb                         |  3 ++
 lib/formtastic/helpers/inputs_helper.rb   | 15 +++++--
 lib/formtastic/inputs/base/collections.rb |  2 +
 spec/input_spec.rb                        | 25 +++++++++++
 spec/inputs_spec.rb                       | 51 +++++++++++++++++++++--
 5 files changed, 90 insertions(+), 6 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index dc55390bf..57de5d332 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -17,4 +17,7 @@ module Formtastic
   class UnknownInputError < NameError
   end
   
+  class PolymorphicInputWithoutCollectionError < ArgumentError
+  end
+  
 end
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 422d726cf..a859b6c73 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -512,7 +512,12 @@ def inputs(*args, &block)
               args.compact!
             end
             legend = args.shift if args.first.is_a?(::String)
-            contents = args.collect { |method| input(method.to_sym) }
+            contents = args.collect do |method| 
+              if @object && (@object.class.reflect_on_association(method.to_sym) && @object.class.reflect_on_association(method.to_sym).options[:polymorphic] == true)
+                raise PolymorphicInputWithoutCollectionError.new("Please provide a collection for :#{method} input (you'll need to use block form syntax). Inputs for polymorphic associations can only be used when an explicit :collection is provided.")
+              end
+              input(method.to_sym)
+            end
             args.unshift(legend) if legend.present?
           
             field_set_and_list_wrapping(*((args << html_options) << contents))
@@ -622,12 +627,16 @@ def standard_input_class_name(as)
         "Formtastic::Inputs::#{as.to_s.camelize}Input"
       end
 
-      # Collects association columns (relation columns) for the current form object class.
+      # Collects association columns (relation columns) for the current form object class. Skips
+      # polymorphic associations because we can't guess which class to use for an automatically
+      # generated input.
       def association_columns(*by_associations) #:nodoc:
         if @object.present? && @object.class.respond_to?(:reflections)
           @object.class.reflections.collect do |name, association_reflection|
             if by_associations.present?
-              name if by_associations.include?(association_reflection.macro)
+              if by_associations.include?(association_reflection.macro) && association_reflection.options[:polymorphic] != true
+                name 
+              end
             else
               name
             end
diff --git a/lib/formtastic/inputs/base/collections.rb b/lib/formtastic/inputs/base/collections.rb
index bf3ce051a..4a34e5e5c 100644
--- a/lib/formtastic/inputs/base/collections.rb
+++ b/lib/formtastic/inputs/base/collections.rb
@@ -54,6 +54,8 @@ def collection_from_options
       
         def collection_from_association
           if reflection
+            raise PolymorphicInputWithoutCollectionError.new("A collection must be supplied for #{method} input. Collections cannot be guessed for polymorphic associations.") if reflection.options[:polymorphic] == true
+
             find_options_from_options = options[:find_options] || {}
             conditions_from_options = find_options_from_options[:conditions] || {}
             conditions_from_reflection = reflection.options[:conditions] || {}
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index b2b849214..8bfd148fc 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -725,6 +725,31 @@ def should_be_required(options)
       end
 
     end
+
+    describe ':collection option' do
+      
+      it "should be required on polymorphic associations" do
+        @new_post.stub!(:commentable)
+        @new_post.class.stub!(:reflections).and_return({ 
+          :commentable => mock('macro_reflection', :options => { :polymorphic => true }, :macro => :belongs_to)
+        })
+        @new_post.stub!(:column_for_attribute).with(:commentable).and_return(
+          mock('column', :type => :integer)
+        )
+        @new_post.class.stub!(:reflect_on_association).with(:commentable).and_return(
+          mock('reflection', :macro => :belongs_to, :options => { :polymorphic => true })
+        )
+        expect { 
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.inputs do 
+              concat(builder.input :commentable)
+            end)
+          end)
+        }.to raise_error(Formtastic::PolymorphicInputWithoutCollectionError)
+      end
+      
+    end
+
   end
   
   describe 'options re-use' do
diff --git a/spec/inputs_spec.rb b/spec/inputs_spec.rb
index 37130e1ef..61d5acf19 100644
--- a/spec/inputs_spec.rb
+++ b/spec/inputs_spec.rb
@@ -10,7 +10,7 @@
     mock_everything
   end
 
-  describe 'with a block' do
+  describe 'with a block (block forms syntax)' do
 
     describe 'when no options are provided' do
       before do
@@ -317,7 +317,7 @@
       @new_post.stub!(:column_for_attribute).with(:author).and_return(nil)
     end
 
-    describe 'with no args' do
+    describe 'with no args (quick forms syntax)' do
       before do
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.inputs)
@@ -361,9 +361,30 @@
       it 'should not render timestamps inputs by default' do
         output_buffer.should_not have_tag('form > fieldset.inputs > ol > li.datetime')
       end
+    
+      context "with a polymorphic association" do
+        
+        before do 
+          @new_post.stub!(:commentable)
+          @new_post.class.stub!(:reflections).and_return({ 
+            :commentable => mock('macro_reflection', :options => { :polymorphic => true }, :macro => :belongs_to)
+          })
+          @new_post.stub!(:column_for_attribute).with(:commentable).and_return(
+            mock('column', :type => :integer)
+          )
+        end
+        
+        it 'should not render an input for the polymorphic association (the collection class cannot be guessed)' do
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.inputs)
+          end)
+          output_buffer.should_not have_tag('li#post_commentable_input')
+        end
+        
+      end
     end
 
-    describe 'with column names as args' do
+    describe 'with column names as args (short hand forms syntax)' do
       describe 'and an object is given' do
         it 'should render a form with a fieldset containing two list items' do
           concat(semantic_form_for(@new_post) do |builder|
@@ -385,6 +406,30 @@
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.string', :count => 2)
         end
       end
+      
+      context "with a polymorphic association" do
+        
+        it 'should raise an error for polymorphic associations (the collection class cannot be guessed)' do
+          @new_post.stub!(:commentable)
+          @new_post.class.stub!(:reflections).and_return({ 
+            :commentable => mock('macro_reflection', :options => { :polymorphic => true }, :macro => :belongs_to)
+          })
+          @new_post.stub!(:column_for_attribute).with(:commentable).and_return(
+            mock('column', :type => :integer)
+          )
+          @new_post.class.stub!(:reflect_on_association).with(:commentable).and_return(
+            mock('reflection', :macro => :belongs_to, :options => { :polymorphic => true })
+          )
+          
+          expect { 
+            concat(semantic_form_for(@new_post) do |builder|
+              concat(builder.inputs :commentable)
+            end)
+          }.to raise_error(Formtastic::PolymorphicInputWithoutCollectionError)
+        end
+        
+      end
+      
     end
 
     describe 'when a :for option is provided' do

From a1280e6f9c87de2e3afb374c814c67e57bf97b81 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 11 Apr 2011 09:58:59 +1000
Subject: [PATCH 693/992] changelog catch-up

---
 CHANGELOG | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index f841f64f5..3e382773a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,7 +17,9 @@
 * Added support for HTML5 min/max/step attributes on NumericInput
 * Added support for HTML5 placeholder attributes on Stringish inputs (string, email, phone, url, search, number, password)
 * Changed nested inputs() blocks to be automatically wrapped in an `<li>` tag to preserve HTML validity
-
+* Changed quick forms to skip polymorphic associations (they didn't work)
+* Changed short hand forms to raise an error when trying to render an input for a polymorphic association (it didn't work, need a collection)
+* Changed input() to raise an error when a :collection is not provided for a polymorphic association (we can't guess which class to use)
 
 1.2.4.beta (unreleased)
 

From efe63420574f34355f0b578666d32bd80f6da87e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 11 Apr 2011 16:23:56 +1000
Subject: [PATCH 694/992] improve documentation of semantic_fields_for in
 FormBuilder

---
 lib/formtastic/helpers/inputs_helper.rb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index a859b6c73..a629327c9 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -529,9 +529,14 @@ def inputs(*args, &block)
         out
       end
 
-      # A thin wrapper around Rails' `fields_for` helper to set `:builder => Formtastic::FormBuilder`
-      # for nesting forms. Can be used in the same way as `fields_for` (see the Rails documentation),
-      # but you'll also have access to Formtastic's helpers ({#input}, etc) inside the block.
+      # A thin wrapper around `ActionView::Helpers::FormBuilder#fields_for` helper to set 
+      # `:builder => Formtastic::FormBuilder` for nesting forms inside the builder. Can be used in 
+      # the same way, but you'll also have access to the helpers in `Formtastic::FormBuilder` 
+      # (such as {#input}, etc) inside the block.
+      #
+      # @see http://api.rubyonrails.org/classes/ActionView/Helpers/FormBuilder.html#method-i-fields_for ActionView::Helpers::FormBuilder#fields_for
+      # @see http://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-fields_for ActionView::Helpers::FormHelper#fields_for
+      # @see Formtastic::Helpers::FormHelper#semantic_fields_for
       #
       # @example
       #   <% semantic_form_for @post do |post| %>

From 801957c83b890988022f57ae3bf9439c646b4d53 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 11 Apr 2011 16:24:54 +1000
Subject: [PATCH 695/992] move semantic_fields_for inside FormBuilder

---
 lib/formtastic/form_builder.rb          | 31 +++++++++++++++++++++++++
 lib/formtastic/helpers/inputs_helper.rb | 30 ------------------------
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index b976a4a1e..ccea284e6 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -38,6 +38,37 @@ def self.configure(name, value = nil)
     include Formtastic::Helpers::InputsHelper
     include Formtastic::Helpers::ButtonsHelper
     include Formtastic::Helpers::ErrorsHelper
+    
+    # A thin wrapper around `ActionView::Helpers::FormBuilder#fields_for` helper to set 
+    # `:builder => Formtastic::FormBuilder` for nesting forms inside the builder. Can be used in 
+    # the same way, but you'll also have access to the helpers in `Formtastic::FormBuilder` 
+    # (such as {#input}, etc) inside the block.
+    #
+    # @see http://api.rubyonrails.org/classes/ActionView/Helpers/FormBuilder.html#method-i-fields_for ActionView::Helpers::FormBuilder#fields_for
+    # @see http://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-fields_for ActionView::Helpers::FormHelper#fields_for
+    # @see Formtastic::Helpers::FormHelper#semantic_fields_for
+    #
+    # @example
+    #   <% semantic_form_for @post do |post| %>
+    #     <% post.semantic_fields_for :author do |author| %>
+    #       <% author.inputs :name %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   <form ...>
+    #     <fieldset class="inputs">
+    #       <ol>
+    #         <li class="string"><input type='text' name='post[author][name]' id='post_author_name' /></li>
+    #       </ol>
+    #     </fieldset>
+    #   </form>
+    def semantic_fields_for(record_or_name_or_array, *args, &block)
+      opts = args.extract_options!
+      opts[:builder] ||= self.class
+      args.push(opts)
+      fields_for(record_or_name_or_array, *args, &block)
+    end
+    
   end
 
 end
\ No newline at end of file
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index a629327c9..5e381d41b 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -529,36 +529,6 @@ def inputs(*args, &block)
         out
       end
 
-      # A thin wrapper around `ActionView::Helpers::FormBuilder#fields_for` helper to set 
-      # `:builder => Formtastic::FormBuilder` for nesting forms inside the builder. Can be used in 
-      # the same way, but you'll also have access to the helpers in `Formtastic::FormBuilder` 
-      # (such as {#input}, etc) inside the block.
-      #
-      # @see http://api.rubyonrails.org/classes/ActionView/Helpers/FormBuilder.html#method-i-fields_for ActionView::Helpers::FormBuilder#fields_for
-      # @see http://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-fields_for ActionView::Helpers::FormHelper#fields_for
-      # @see Formtastic::Helpers::FormHelper#semantic_fields_for
-      #
-      # @example
-      #   <% semantic_form_for @post do |post| %>
-      #     <% post.semantic_fields_for :author do |author| %>
-      #       <% author.inputs :name %>
-      #     <% end %>
-      #   <% end %>
-      #
-      #   <form ...>
-      #     <fieldset class="inputs">
-      #       <ol>
-      #         <li class="string"><input type='text' name='post[author][name]' id='post_author_name' /></li>
-      #       </ol>
-      #     </fieldset>
-      #   </form>
-      def semantic_fields_for(record_or_name_or_array, *args, &block)
-        opts = args.extract_options!
-        opts[:builder] ||= self.class
-        args.push(opts)
-        fields_for(record_or_name_or_array, *args, &block)
-      end
-
       # Generates error messages for the given method, used for displaying errors right near the
       # field for data entry. Uses the `:inline_errors` config to determin the right presentation,
       # which may be an ordered list, a paragraph sentence containing all errors, or a paragraph

From 22ffcd8677dd95cf399de96f7b1036bb0833c89d Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 11 Apr 2011 21:05:13 +1000
Subject: [PATCH 696/992] split input() related methods out of InputsHelper
 into InputHelper

---
 lib/formtastic/form_builder.rb          |   1 +
 lib/formtastic/helpers.rb               |   1 +
 lib/formtastic/helpers/input_helper.rb  | 357 ++++++++++++++++++++++++
 lib/formtastic/helpers/inputs_helper.rb | 328 +---------------------
 4 files changed, 364 insertions(+), 323 deletions(-)
 create mode 100644 lib/formtastic/helpers/input_helper.rb

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index ccea284e6..9223648f6 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -35,6 +35,7 @@ def self.configure(name, value = nil)
 
     include Formtastic::HtmlAttributes
 
+    include Formtastic::Helpers::InputHelper
     include Formtastic::Helpers::InputsHelper
     include Formtastic::Helpers::ButtonsHelper
     include Formtastic::Helpers::ErrorsHelper
diff --git a/lib/formtastic/helpers.rb b/lib/formtastic/helpers.rb
index 6f7b1237a..85d76797b 100644
--- a/lib/formtastic/helpers.rb
+++ b/lib/formtastic/helpers.rb
@@ -5,6 +5,7 @@ module Helpers
     autoload :FieldsetWrapper, 'formtastic/helpers/fieldset_wrapper'
     autoload :FileColumnDetection, 'formtastic/helpers/file_column_detection'
     autoload :FormHelper, 'formtastic/helpers/form_helper'
+    autoload :InputHelper, 'formtastic/helpers/input_helper'
     autoload :InputsHelper, 'formtastic/helpers/inputs_helper'
     autoload :LabelHelper, 'formtastic/helpers/label_helper'
     autoload :SemanticFormHelper, 'formtastic/helpers/semantic_form_helper'
diff --git a/lib/formtastic/helpers/input_helper.rb b/lib/formtastic/helpers/input_helper.rb
new file mode 100644
index 000000000..34fa56e3e
--- /dev/null
+++ b/lib/formtastic/helpers/input_helper.rb
@@ -0,0 +1,357 @@
+module Formtastic
+  module Helpers
+    
+    # {#input} is used to render all content (labels, form widgets, error messages, hints, etc) for 
+    # a single form input (or field), usually representing a single method or attribute on the 
+    # form's object or model.
+    #
+    # The content is wrapped in an `<li>` tag, so it's usually called inside an {Formtastic::Helpers::InputsHelper#inputs inputs} block 
+    # (which renders an `<ol>` inside a `<fieldset>`), which should be inside a {Formtastic::Helpers::FormHelper#semantic_form_for `semantic_form_for`} 
+    # block:
+    #
+    #     <%= semantic_form_for @post do |f| %>
+    #       <%= f.inputs do %>
+    #         <%= f.input :title %>
+    #         <%= f.input :body %>
+    #       <% end %>
+    #     <% end %>
+    #
+    # The HTML output will be something like:
+    #
+    #     <form class="formtastic" method="post" action="...">
+    #       <fieldset>
+    #         <ol>
+    #           <li class="string required" id="post_title_input">
+    #             ...
+    #           </li>
+    #           <li class="text required" id="post_body_input">
+    #             ...
+    #           </li>
+    #         </ol>
+    #       </fieldset>
+    #     </form>
+    #
+    # @see #input
+    # @see Formtastic::Helpers::InputsHelper#inputs
+    # @see Formtastic::Helpers::FormHelper#semantic_form_for
+    module InputHelper
+      include Formtastic::Reflection
+      include Formtastic::Helpers::FileColumnDetection
+      
+      # Returns a chunk of HTML markup for a given `method` on the form object, wrapped in
+      # an `<li>` wrapper tag with appropriate `class` and `id` attribute hooks for CSS and JS.
+      # In many cases, the contents of the wrapper will be as simple as a `<label>` and an `<input>`:
+      #
+      #     <%= f.input :title, :as => :string, :required => true %>
+      #
+      #     <li class="string required" id="post_title_input">
+      #       <label for="post_title">Title<abbr title="Required">*</abbr></label>
+      #       <input type="text" name="post[title]" value="" id="post_title" required="required">
+      #     </li>
+      #
+      # In other cases (like a series of checkboxes for a `has_many` relationship), the wrapper may
+      # include more complex markup, like a nested `<fieldset>` with a `<legend>` and an `<ol>` of
+      # checkbox/label pairs for each choice:
+      #
+      #     <%= f.input :categories, :as => :check_boxes, :collection => Category.active.ordered %>
+      #
+      #     <li class="check_boxes" id="post_categories_input">
+      #       <fieldset>
+      #         <legend>Categories</legend>
+      #         <ol>
+      #           <li>
+      #             <label><input type="checkbox" name="post[categories][1]" value="1"> Ruby</label>
+      #           </li>
+      #           <li>
+      #             <label><input type="checkbox" name="post[categories][2]" value="2"> Rails</label>
+      #           </li>
+      #           <li>
+      #             <label><input type="checkbox" name="post[categories][2]" value="2"> Awesome</label>
+      #           </li>
+      #         </ol>
+      #       </fieldset>
+      #     </li>
+      #
+      # Sensible defaults for all options are guessed by looking at the method name, database column
+      # information, association information, validation information, etc. For example, a `:string`
+      # database column will map to a `:string` input, but if the method name contains 'email', will
+      # map to an `:email` input instead. `belongs_to` associations will have a `:select` input, etc.
+      #
+      # Formtastic supports many different styles of inputs, and you can/should override the default
+      # with the `:as` option. Internally, the symbol is used to map to a protected method
+      # responsible for the details. For example, `:as => :string` will map to `string_input`,
+      # defined in a module of the same name. Detailed documentation for each input style and it's
+      # supported options is available on the `*_input` method in each module (links provided below).
+      #
+      # Available input styles:
+      #
+      # * `:boolean`      (see {Inputs::BooleanInput})
+      # * `:check_boxes`  (see {Inputs::CheckBoxesInput})
+      # * `:country`      (see {Inputs::CountryInput})
+      # * `:datetime`     (see {Inputs::DatetimeInput})
+      # * `:date`         (see {Inputs::DateInput})
+      # * `:email`        (see {Inputs::EmailInput})
+      # * `:file`         (see {Inputs::FileInput})
+      # * `:hidden`       (see {Inputs::HiddenInput})
+      # * `:number`       (see {Inputs::NumberInput})
+      # * `:password`     (see {Inputs::PasswordInput})
+      # * `:phone`        (see {Inputs::PhoneInput})
+      # * `:radio`        (see {Inputs::RadioInput})
+      # * `:search`       (see {Inputs::SearchInput})
+      # * `:select`       (see {Inputs::SelectInput})
+      # * `:string`       (see {Inputs::StringInput})
+      # * `:text`         (see {Inputs::TextInput})
+      # * `:time_zone`    (see {Inputs::TimeZoneInput})
+      # * `:time`         (see {Inputs::TimeInput})
+      # * `:url`          (see {Inputs::UrlInput})
+      #
+      # Calling `:as => :string` (for example) will call `#to_html` on a new instance of 
+      # `Formtastic::Inputs::StringInput`. Before this, Formtastic will try to instantiate a top-level
+      # namespace StringInput, meaning you can subclass and modify `Formtastic::Inputs::StringInput` 
+      # in `app/inputs/`. This also means you can create your own new input types in `app/inputs/`.
+      #
+      # @todo document the "guessing" of input style
+      #
+      # @param [Symbol] method
+      #   The database column or method name on the form object that this input represents
+      #
+      # @option options :as [Symbol]
+      #   Override the style of input should be rendered
+      #
+      # @option options :label [String, Symbol, false]
+      #   Override the label text
+      #
+      # @option options :hint [String, Symbol, false]
+      #   Override hint text
+      #
+      # @option options :required [Boolean]
+      #   Override to mark the input as required (or not) — adds a required/optional class to the wrapper, and a HTML5 required attribute to the `<input>`
+      #
+      # @option options :input_html [Hash]
+      #   Override or add to the HTML attributes to be passed down to the `<input>` tag
+      #
+      # @option options :wrapper_html [Hash]
+      #   Override or add to the HTML attributes to be passed down to the wrapping `<li>` tag
+      #
+      # @option options :collection [Array<ActiveModel, String, Symbol>, Hash{String => String, Boolean}, OrderedHash{String => String, Boolean}]
+      #   Override collection of objects in the association (`:select`, `:radio` & `:check_boxes` inputs only)
+      #
+      # @option options :label_method [Symbol, Proc]
+      #   Override the method called on each object in the `:collection` for use as the `<label>` content (`:check_boxes` & `:radio` inputs) or `<option>` content (`:select` inputs)
+      #
+      # @option options :value_method [Symbol, Proc]
+      #   Override the method called on each object in the `:collection` for use as the `value` attribute in the `<input>` (`:check_boxes` & `:radio` inputs) or `<option>` (`:select` inputs)
+      #
+      # @option options :hint_class [String]
+      #   Override the `class` attribute applied to the `<p>` tag used when a `:hint` is rendered for an input
+      #
+      # @option options :error_class [String]
+      #   Override the `class` attribute applied to the `<p>` or `<ol>` tag used when inline errors are rendered for an input
+      #
+      # @option options :multiple [Boolean]
+      #   Specify if the `:select` input should allow multiple selections or not (defaults to `belongs_to` associations, and `true` for `has_many` and `has_and_belongs_to_many` associations)
+      #
+      # @option options :group_by [Symbol]
+      #   TODO will probably be deprecated
+      #
+      # @option options :find_options [Symbol]
+      #   TODO will probably be deprecated
+      #
+      # @option options :group_label_method [Symbol]
+      #   TODO will probably be deprecated
+      #
+      # @option options :include_blank [Boolean]
+      #   Specify if a `:select` input should include a blank option or not (defaults to `include_blank_for_select_by_default` configuration)
+      #
+      # @option options :prompt [String]
+      #   Specify the text in the first ('blank') `:select` input `<option>` to prompt a user to make a selection (implicitly sets `:include_blank` to `true`)
+      #
+      # @todo Can we kill `:hint_class` & `:error_class`? What's the use case for input-by-input? Shift to config or burn!
+      # @todo Can we kill `:group_by` & `:group_label_method`? Should be done with :collection => grouped_options_for_select(...)
+      # @todo Can we kill `:find_options`? Should be done with MyModel.some_scope.where(...).order(...).whatever_scope
+      # @todo Can we kill `:label`, `:hint` & `:prompt`? All strings could be shifted to i18n!
+      #
+      # @example Accept all default options
+      #   <%= f.input :title %>
+      #
+      # @example Change the input type
+      #   <%= f.input :title, :as => :string %>
+      #
+      # @example Changing the label with a String
+      #   <%= f.input :title, :label => "Post title" %>
+      #
+      # @example Disabling the label with false, even if an i18n translation exists
+      #   <%= f.input :title, :label => false  %>
+      #
+      # @example Changing the hint with a String
+      #   <%= f.input :title, :hint => "Every post needs a title!" %>
+      #
+      # @example Disabling the hint with false, even if an i18n translation exists
+      #   <%= f.input :title, :hint => false  %>
+      #
+      # @example Marking a field as required or not (even if validations do not enforce it)
+      #   <%= f.input :title, :required => true  %>
+      #   <%= f.input :title, :required => false  %>
+      #
+      # @example Changing or adding to HTML attributes in the main `<input>` or `<select>` tag
+      #   <%= f.input :title, :input_html => { :onchange => "somethingAwesome();", :class => 'awesome' } %>
+      #
+      # @example Changing or adding to HTML attributes in the wrapper `<li>` tag
+      #   <%= f.input :title, :wrapper_html => { :class => "important-input" } %>
+      #
+      # @example Changing the association choices with `:collection`
+      #   <%= f.input :author,     :collection => User.active %>
+      #   <%= f.input :categories, :collection => Category.where(...).order(...) %>
+      #   <%= f.input :status,     :collection => ["Draft", "Published"] %>
+      #   <%= f.input :status,     :collection => [:draft, :published] %>
+      #   <%= f.input :status,     :collection => {"Draft" => 0, "Published" => 1} %>
+      #   <%= f.input :status,     :collection => OrderedHash.new("Draft" => 0, "Published" => 1) %>
+      #   <%= f.input :status,     :collection => [["Draft", 0], ["Published", 1]] %>
+      #   <%= f.input :status,     :collection => grouped_options_for_select(...) %>
+      #   <%= f.input :status,     :collection => options_for_select(...) %>
+      #
+      # @example Specifying if a `:select` should allow multiple selections:
+      #   <%= f.input :cateogies, :as => :select, :multiple => true %>
+      #   <%= f.input :cateogies, :as => :select, :multiple => false %>
+      #
+      # @example Specifying if a `:select` should have a 'blank' first option to prompt selection:
+      #   <%= f.input :author, :as => :select, :include_blank => true %>
+      #   <%= f.input :author, :as => :select, :include_blank => false %>
+      #
+      # @example Specifying the text for a `:select` input's 'blank' first option to prompt selection:
+      #   <%= f.input :author, :as => :select, :prompt => "Select an Author" %>
+      #
+      # @example Modifying an input to suit your needs in `app/inputs`:
+      #   class StringInput < Formtastic::Inputs::StringInput
+      #     def to_html
+      #       puts "this is my custom version of StringInput"      
+      #       super
+      #     end
+      #   end
+      #
+      # @example Creating your own input to suit your needs in `app/inputs`:
+      #   class DatePickerInput
+      #     include Formtastic::Inputs::Base
+      #     def to_html
+      #       # ...
+      #     end
+      #   end
+      #
+      # @example Providing HTML5 placeholder text through i18n:
+      #   en:
+      #    formtastic:
+      #      placeholders:
+      #        user:
+      #          email: "you@yours.com"
+      #          first_name: "Joe"
+      #          last_name: "Smith"
+      #
+      # @todo Many many more examples. Some of the detail probably needs to be pushed out to the relevant methods too.
+      # @todo More i18n examples.
+      def input(method, options = {})
+        options = options.dup # Allow options to be shared without being tainted by Formtastic
+        options[:as] ||= default_input_type(method, options)
+      
+        klass = input_class(options[:as])
+        klass.new(self, template, @object, @object_name, method, options).to_html
+      end
+      
+      protected
+      
+      # 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 :number), 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 = 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/
+            return :email     if method.to_s =~ /email/
+            return :url       if method.to_s =~ /^url$|^website$|_url$/
+            return :phone     if method.to_s =~ /(phone|fax)/
+            return :search    if method.to_s =~ /^search$/
+          when :integer
+            return :select    if reflection_for(method)
+            return :number
+          when :float, :decimal
+            return :number
+          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 reflection_for(method)
+
+            return :file    if is_file?(method, options)
+          end
+
+          return :select    if options.key?(:collection)
+          return :password  if method.to_s =~ /password/
+          return :string
+        end
+      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
+
+      # Takes the `:as` option and attempts to return the corresponding input class. In the case of
+      # `:as => :string` it will first attempt to find a top level `StringInput` class (to allow the
+      # application to subclass and modify to suit), falling back to `Formtastic::Inputs::StringInput`.
+      #
+      # This also means that the application can define it's own custom inputs in the top level
+      # namespace (eg `DatepickerInput`).
+      #
+      # @param [Symbol] as A symbol representing the type of input to render
+      # @raise [Formtastic::UnknownInputError] An appropriate input class could not be found
+      # @return [Class] An input class constant
+      #
+      # @example Normal use
+      #   input_class(:string) #=> Formtastic::Inputs::StringInput
+      #   input_class(:date) #=> Formtastic::Inputs::DateInput
+      #
+      # @example When a top-level class is found
+      #   input_class(:string) #=> StringInput
+      #   input_class(:awesome) #=> AwesomeInput
+      def input_class(as)
+        @input_classes_cache ||= {}
+        @input_classes_cache[as] ||= begin
+          begin
+            begin
+              custom_input_class_name(as).constantize
+            rescue NameError
+              standard_input_class_name(as).constantize
+            end
+          rescue NameError
+            raise Formtastic::UnknownInputError
+          end
+        end
+      end
+      
+      # :as => :string # => StringInput
+      def custom_input_class_name(as)
+        "#{as.to_s.camelize}Input"
+      end
+
+      # :as => :string # => Formtastic::Inputs::StringInput
+      def standard_input_class_name(as)
+        "Formtastic::Inputs::#{as.to_s.camelize}Input"
+      end
+
+    end
+  end
+end
+      
\ No newline at end of file
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 5e381d41b..5a46b62d3 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -1,13 +1,10 @@
 module Formtastic
   module Helpers
 
-    # InputsHelper encapsulates the responsibilties of the {#inputs} and {#input} helpers at the core of the
-    # Formtastic DSL.
-    #
     # {#inputs} is used to wrap a series of form items in a `<fieldset>` and `<ol>`, with each item
     # in the list containing the markup representing a single {#input}.
     #
-    # {#inputs} is usually called with a block containing a series of {#input} calls:
+    # {#inputs} is usually called with a block containing a series of {#input} methods:
     #
     #     <%= semantic_form_for @post do |f| %>
     #       <%= f.inputs do %>
@@ -22,19 +19,17 @@ module Helpers
     #       <fieldset>
     #         <ol>
     #           <li class="string required" id="post_title_input">
-    #             <label for="post_title">Title*</label>
-    #             <input type="text" name="post[title]" id="post_title" value="" required="required">
+    #             ...
     #           </li>
     #           <li class="text required" id="post_body_input">
-    #             <label for="post_title">Title*</label>
-    #             <textarea name="post[body]" id="post_body" required="required"></textarea>
+    #             ...
     #           </li>
     #         </ol>
     #       </fieldset>
     #     </form>
     #
     # It's important to note that the `semantic_form_for` and {#inputs} blocks wrap the
-    # standard Rails `form_for` helper and form builder, so you have full access to every standard
+    # standard Rails `form_for` helper and FormBuilder, so you have full access to every standard
     # Rails form helper, with any HTML markup and ERB syntax, allowing you to "break free" from
     # Formtastic when it doesn't suit:
     #
@@ -47,234 +42,14 @@ module Helpers
     #       <% end %>
     #     <% end %>
     #
-    # There are many other syntax variations and arguments to customize your form. See the
-    # full documentation of {#inputs} and {#input} for details.
+    # @see Formtastic::Helpers::InputHelper#input
     module InputsHelper
       include Formtastic::Helpers::FieldsetWrapper
-      include Formtastic::Helpers::FileColumnDetection
-      include Formtastic::Reflection
       include Formtastic::LocalizedString
 
       # Which columns to skip when automatically rendering a form without any fields specified.
       SKIPPED_COLUMNS = [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
 
-      # Returns a chunk of HTML markup for a given `method` on the form object, wrapped in
-      # an `<li>` wrapper tag with appropriate `class` and `id` attribute hooks for CSS and JS.
-      # In many cases, the contents of the wrapper will be as simple as a `<label>` and an `<input>`:
-      #
-      #     <%= f.input :title, :as => :string, :required => true %>
-      #
-      #     <li class="string required" id="post_title_input">
-      #       <label for="post_title">Title<abbr title="Required">*</abbr></label>
-      #       <input type="text" name="post[title]" value="" id="post_title" required="required">
-      #     </li>
-      #
-      # In other cases (like a series of checkboxes for a `has_many` relationship), the wrapper may
-      # include more complex markup, like a nested `<fieldset>` with a `<legend>` and an `<ol>` of
-      # checkbox/label pairs for each choice:
-      #
-      #     <%= f.input :categories, :as => :check_boxes, :collection => Category.active.ordered %>
-      #
-      #     <li class="check_boxes" id="post_categories_input">
-      #       <fieldset>
-      #         <legend>Categories</legend>
-      #         <ol>
-      #           <li>
-      #             <label><input type="checkbox" name="post[categories][1]" value="1"> Ruby</label>
-      #           </li>
-      #           <li>
-      #             <label><input type="checkbox" name="post[categories][2]" value="2"> Rails</label>
-      #           </li>
-      #           <li>
-      #             <label><input type="checkbox" name="post[categories][2]" value="2"> Awesome</label>
-      #           </li>
-      #         </ol>
-      #       </fieldset>
-      #     </li>
-      #
-      # Sensible defaults for all options are guessed by looking at the method name, database column
-      # information, association information, validation information, etc. For example, a `:string`
-      # database column will map to a `:string` input, but if the method name contains 'email', will
-      # map to an `:email` input instead. `belongs_to` associations will have a `:select` input, etc.
-      #
-      # Formtastic supports many different styles of inputs, and you can/should override the default
-      # with the `:as` option. Internally, the symbol is used to map to a protected method
-      # responsible for the details. For example, `:as => :string` will map to `string_input`,
-      # defined in a module of the same name. Detailed documentation for each input style and it's
-      # supported options is available on the `*_input` method in each module (links provided below).
-      #
-      # Available input styles:
-      #
-      # * `:boolean`      (see {Inputs::BooleanInput})
-      # * `:check_boxes`  (see {Inputs::CheckBoxesInput})
-      # * `:country`      (see {Inputs::CountryInput})
-      # * `:datetime`     (see {Inputs::DatetimeInput})
-      # * `:date`         (see {Inputs::DateInput})
-      # * `:email`        (see {Inputs::EmailInput})
-      # * `:file`         (see {Inputs::FileInput})
-      # * `:hidden`       (see {Inputs::HiddenInput})
-      # * `:number`       (see {Inputs::NumberInput})
-      # * `:password`     (see {Inputs::PasswordInput})
-      # * `:phone`        (see {Inputs::PhoneInput})
-      # * `:radio`        (see {Inputs::RadioInput})
-      # * `:search`       (see {Inputs::SearchInput})
-      # * `:select`       (see {Inputs::SelectInput})
-      # * `:string`       (see {Inputs::StringInput})
-      # * `:text`         (see {Inputs::TextInput})
-      # * `:time_zone`    (see {Inputs::TimeZoneInput})
-      # * `:time`         (see {Inputs::TimeInput})
-      # * `:url`          (see {Inputs::UrlInput})
-      #
-      # Calling `:as => :string` (for example) will call `#to_html` on a new instance of 
-      # `Formtastic::Inputs::StringInput`. Before this, Formtastic will try to instantiate a top-level
-      # namespace StringInput, meaning you can subclass and modify `Formtastic::Inputs::StringInput` 
-      # in `app/inputs/`. This also means you can create your own new input types in `app/inputs/`.
-      #
-      # @todo document the "guessing" of input style
-      #
-      # @param [Symbol] method
-      #   The database column or method name on the form object that this input represents
-      #
-      # @option options :as [Symbol]
-      #   Override the style of input should be rendered
-      #
-      # @option options :label [String, Symbol, false]
-      #   Override the label text
-      #
-      # @option options :hint [String, Symbol, false]
-      #   Override hint text
-      #
-      # @option options :required [Boolean]
-      #   Override to mark the input as required (or not) — adds a required/optional class to the wrapper, and a HTML5 required attribute to the `<input>`
-      #
-      # @option options :input_html [Hash]
-      #   Override or add to the HTML attributes to be passed down to the `<input>` tag
-      #
-      # @option options :wrapper_html [Hash]
-      #   Override or add to the HTML attributes to be passed down to the wrapping `<li>` tag
-      #
-      # @option options :collection [Array<ActiveModel, String, Symbol>, Hash{String => String, Boolean}, OrderedHash{String => String, Boolean}]
-      #   Override collection of objects in the association (`:select`, `:radio` & `:check_boxes` inputs only)
-      #
-      # @option options :label_method [Symbol, Proc]
-      #   Override the method called on each object in the `:collection` for use as the `<label>` content (`:check_boxes` & `:radio` inputs) or `<option>` content (`:select` inputs)
-      #
-      # @option options :value_method [Symbol, Proc]
-      #   Override the method called on each object in the `:collection` for use as the `value` attribute in the `<input>` (`:check_boxes` & `:radio` inputs) or `<option>` (`:select` inputs)
-      #
-      # @option options :hint_class [String]
-      #   Override the `class` attribute applied to the `<p>` tag used when a `:hint` is rendered for an input
-      #
-      # @option options :error_class [String]
-      #   Override the `class` attribute applied to the `<p>` or `<ol>` tag used when inline errors are rendered for an input
-      #
-      # @option options :multiple [Boolean]
-      #   Specify if the `:select` input should allow multiple selections or not (defaults to `belongs_to` associations, and `true` for `has_many` and `has_and_belongs_to_many` associations)
-      #
-      # @option options :group_by [Symbol]
-      #   TODO will probably be deprecated
-      #
-      # @option options :find_options [Symbol]
-      #   TODO will probably be deprecated
-      #
-      # @option options :group_label_method [Symbol]
-      #   TODO will probably be deprecated
-      #
-      # @option options :include_blank [Boolean]
-      #   Specify if a `:select` input should include a blank option or not (defaults to `include_blank_for_select_by_default` configuration)
-      #
-      # @option options :prompt [String]
-      #   Specify the text in the first ('blank') `:select` input `<option>` to prompt a user to make a selection (implicitly sets `:include_blank` to `true`)
-      #
-      # @todo Can we kill `:hint_class` & `:error_class`? What's the use case for input-by-input? Shift to config or burn!
-      # @todo Can we kill `:group_by` & `:group_label_method`? Should be done with :collection => grouped_options_for_select(...)
-      # @todo Can we kill `:find_options`? Should be done with MyModel.some_scope.where(...).order(...).whatever_scope
-      # @todo Can we kill `:label`, `:hint` & `:prompt`? All strings could be shifted to i18n!
-      #
-      # @example Accept all default options
-      #   <%= f.input :title %>
-      #
-      # @example Change the input type
-      #   <%= f.input :title, :as => :string %>
-      #
-      # @example Changing the label with a String
-      #   <%= f.input :title, :label => "Post title" %>
-      #
-      # @example Disabling the label with false, even if an i18n translation exists
-      #   <%= f.input :title, :label => false  %>
-      #
-      # @example Changing the hint with a String
-      #   <%= f.input :title, :hint => "Every post needs a title!" %>
-      #
-      # @example Disabling the hint with false, even if an i18n translation exists
-      #   <%= f.input :title, :hint => false  %>
-      #
-      # @example Marking a field as required or not (even if validations do not enforce it)
-      #   <%= f.input :title, :required => true  %>
-      #   <%= f.input :title, :required => false  %>
-      #
-      # @example Changing or adding to HTML attributes in the main `<input>` or `<select>` tag
-      #   <%= f.input :title, :input_html => { :onchange => "somethingAwesome();", :class => 'awesome' } %>
-      #
-      # @example Changing or adding to HTML attributes in the wrapper `<li>` tag
-      #   <%= f.input :title, :wrapper_html => { :class => "important-input" } %>
-      #
-      # @example Changing the association choices with `:collection`
-      #   <%= f.input :author,     :collection => User.active %>
-      #   <%= f.input :categories, :collection => Category.where(...).order(...) %>
-      #   <%= f.input :status,     :collection => ["Draft", "Published"] %>
-      #   <%= f.input :status,     :collection => [:draft, :published] %>
-      #   <%= f.input :status,     :collection => {"Draft" => 0, "Published" => 1} %>
-      #   <%= f.input :status,     :collection => OrderedHash.new("Draft" => 0, "Published" => 1) %>
-      #   <%= f.input :status,     :collection => [["Draft", 0], ["Published", 1]] %>
-      #   <%= f.input :status,     :collection => grouped_options_for_select(...) %>
-      #   <%= f.input :status,     :collection => options_for_select(...) %>
-      #
-      # @example Specifying if a `:select` should allow multiple selections:
-      #   <%= f.input :cateogies, :as => :select, :multiple => true %>
-      #   <%= f.input :cateogies, :as => :select, :multiple => false %>
-      #
-      # @example Specifying if a `:select` should have a 'blank' first option to prompt selection:
-      #   <%= f.input :author, :as => :select, :include_blank => true %>
-      #   <%= f.input :author, :as => :select, :include_blank => false %>
-      #
-      # @example Specifying the text for a `:select` input's 'blank' first option to prompt selection:
-      #   <%= f.input :author, :as => :select, :prompt => "Select an Author" %>
-      #
-      # @example Modifying an input to suit your needs in `app/inputs`:
-      #   class StringInput < Formtastic::Inputs::StringInput
-      #     def to_html
-      #       puts "this is my custom version of StringInput"      
-      #       super
-      #     end
-      #   end
-      #
-      # @example Creating your own input to suit your needs in `app/inputs`:
-      #   class DatePickerInput
-      #     include Formtastic::Inputs::Base
-      #     def to_html
-      #       # ...
-      #     end
-      #   end
-      #
-      # @example Providing HTML5 placeholder text through i18n:
-      #   en:
-      #    formtastic:
-      #      placeholders:
-      #        user:
-      #          email: "you@yours.com"
-      #          first_name: "Joe"
-      #          last_name: "Smith"
-      #
-      # @todo Many many more examples. Some of the detail probably needs to be pushed out to the relevant methods too.
-      # @todo More i18n examples.
-      def input(method, options = {})
-        options = options.dup # Allow options to be shared without being tainted by Formtastic
-        options[:as] ||= default_input_type(method, options)
-
-        klass = input_class(options[:as])
-        klass.new(self, template, @object, @object_name, method, options).to_html
-      end
 
       # {#inputs} creates an input fieldset and ol tag wrapping for use around a set of inputs.  It can be
       # called either with a block (in which you can do the usual Rails form stuff, HTML, ERB, etc),
@@ -559,49 +334,6 @@ def inline_errors_for(method, options = {}) #:nodoc:
 
       protected
       
-      # Takes the `:as` option and attempts to return the corresponding input class. In the case of
-      # `:as => :string` it will first attempt to find a top level `StringInput` class (to allow the
-      # application to subclass and modify to suit), falling back to `Formtastic::Inputs::StringInput`.
-      #
-      # This also means that the application can define it's own custom inputs in the top level
-      # namespace (eg `DatepickerInput`).
-      #
-      # @param [Symbol] as A symbol representing the type of input to render
-      # @raise [Formtastic::UnknownInputError] An appropriate input class could not be found
-      # @return [Class] An input class constant
-      #
-      # @example Normal use
-      #   input_class(:string) #=> Formtastic::Inputs::StringInput
-      #   input_class(:date) #=> Formtastic::Inputs::DateInput
-      #
-      # @example When a top-level class is found
-      #   input_class(:string) #=> StringInput
-      #   input_class(:awesome) #=> AwesomeInput
-      def input_class(as)
-        @input_classes_cache ||= {}
-        @input_classes_cache[as] ||= begin
-          begin
-            begin
-              custom_input_class_name(as).constantize
-            rescue NameError
-              standard_input_class_name(as).constantize
-            end
-          rescue NameError
-            raise Formtastic::UnknownInputError
-          end
-        end
-      end
-      
-      # :as => :string # => StringInput
-      def custom_input_class_name(as)
-        "#{as.to_s.camelize}Input"
-      end
-
-      # :as => :string # => Formtastic::Inputs::StringInput
-      def standard_input_class_name(as)
-        "Formtastic::Inputs::#{as.to_s.camelize}Input"
-      end
-
       # Collects association columns (relation columns) for the current form object class. Skips
       # polymorphic associations because we can't guess which class to use for an automatically
       # generated input.
@@ -653,56 +385,6 @@ def inputs_for_nested_attributes(*args, &block) #:nodoc:
         semantic_fields_for(*fields_for_args, &fields_for_block)
       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 :number), 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 = 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/
-            return :email     if method.to_s =~ /email/
-            return :url       if method.to_s =~ /^url$|^website$|_url$/
-            return :phone     if method.to_s =~ /(phone|fax)/
-            return :search    if method.to_s =~ /^search$/
-          when :integer
-            return :select    if reflection_for(method)
-            return :number
-          when :float, :decimal
-            return :number
-          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 reflection_for(method)
-
-            return :file    if is_file?(method, options)
-          end
-
-          return :select    if options.key?(:collection)
-          return :password  if method.to_s =~ /password/
-          return :string
-        end
-      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
-
       def field_set_title_from_args(*args) #:nodoc:
         options = args.extract_options!
         options[:name] ||= options.delete(:title)

From 279b23a3af9632bf2e6f322ef2fc8699c6f7f6e1 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 11 Apr 2011 21:07:01 +1000
Subject: [PATCH 697/992] hide these from Yard

---
 lib/formtastic/helpers.rb | 1 +
 lib/formtastic/inputs.rb  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/formtastic/helpers.rb b/lib/formtastic/helpers.rb
index 85d76797b..f04bb26fc 100644
--- a/lib/formtastic/helpers.rb
+++ b/lib/formtastic/helpers.rb
@@ -1,4 +1,5 @@
 module Formtastic
+  # @private
   module Helpers
     autoload :ButtonsHelper, 'formtastic/helpers/buttons_helper'
     autoload :ErrorsHelper, 'formtastic/helpers/errors_helper'
diff --git a/lib/formtastic/inputs.rb b/lib/formtastic/inputs.rb
index a23db2471..9030013de 100644
--- a/lib/formtastic/inputs.rb
+++ b/lib/formtastic/inputs.rb
@@ -1,4 +1,5 @@
 module Formtastic
+  # @private
   module Inputs
     extend ActiveSupport::Autoload
 

From b3bcad9e77d008a72b180af6bb1b237bf7a32971 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 11 Apr 2011 21:15:36 +1000
Subject: [PATCH 698/992] hide the Exception classes from Yard

---
 lib/formtastic.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 57de5d332..e0f10180b 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -14,9 +14,11 @@ module Formtastic
   autoload :Reflection
   autoload :Util
   
+  # @private
   class UnknownInputError < NameError
   end
   
+  # @private
   class PolymorphicInputWithoutCollectionError < ArgumentError
   end
   

From fb88364e7d37d7a7d6e3334bbb565f4c5663e8f3 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 11 Apr 2011 21:15:51 +1000
Subject: [PATCH 699/992] unhide Inputs from Yard

---
 lib/formtastic/inputs.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/formtastic/inputs.rb b/lib/formtastic/inputs.rb
index 9030013de..a23db2471 100644
--- a/lib/formtastic/inputs.rb
+++ b/lib/formtastic/inputs.rb
@@ -1,5 +1,4 @@
 module Formtastic
-  # @private
   module Inputs
     extend ActiveSupport::Autoload
 

From 79a11ab219cf3138e8a3409d6a364f153a29fea7 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 11 Apr 2011 21:23:31 +1000
Subject: [PATCH 700/992] moved Reflection under Helpers namespace as it's only
 ErrorsHelper and InputHelper that use this now

---
 lib/formtastic.rb                       |  1 -
 lib/formtastic/helpers.rb               |  1 +
 lib/formtastic/helpers/errors_helper.rb |  2 +-
 lib/formtastic/helpers/input_helper.rb  |  2 +-
 lib/formtastic/helpers/reflection.rb    | 12 ++++++++++++
 lib/formtastic/reflection.rb            | 10 ----------
 6 files changed, 15 insertions(+), 13 deletions(-)
 create mode 100644 lib/formtastic/helpers/reflection.rb
 delete mode 100644 lib/formtastic/reflection.rb

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index e0f10180b..074b7688f 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -11,7 +11,6 @@ module Formtastic
   autoload :I18n
   autoload :Inputs
   autoload :LocalizedString
-  autoload :Reflection
   autoload :Util
   
   # @private
diff --git a/lib/formtastic/helpers.rb b/lib/formtastic/helpers.rb
index f04bb26fc..d6940b41f 100644
--- a/lib/formtastic/helpers.rb
+++ b/lib/formtastic/helpers.rb
@@ -10,5 +10,6 @@ module Helpers
     autoload :InputsHelper, 'formtastic/helpers/inputs_helper'
     autoload :LabelHelper, 'formtastic/helpers/label_helper'
     autoload :SemanticFormHelper, 'formtastic/helpers/semantic_form_helper'
+    autoload :Reflection, 'formtastic/helpers/reflection'
   end
 end
diff --git a/lib/formtastic/helpers/errors_helper.rb b/lib/formtastic/helpers/errors_helper.rb
index 48c216b29..757e2124c 100644
--- a/lib/formtastic/helpers/errors_helper.rb
+++ b/lib/formtastic/helpers/errors_helper.rb
@@ -2,7 +2,7 @@ module Formtastic
   module Helpers
     module ErrorsHelper
       include Formtastic::Helpers::FileColumnDetection
-      include Formtastic::Reflection
+      include Formtastic::Helpers::Reflection
       include Formtastic::LocalizedString
 
       INLINE_ERROR_TYPES = [:sentence, :list, :first]
diff --git a/lib/formtastic/helpers/input_helper.rb b/lib/formtastic/helpers/input_helper.rb
index 34fa56e3e..e88f26da7 100644
--- a/lib/formtastic/helpers/input_helper.rb
+++ b/lib/formtastic/helpers/input_helper.rb
@@ -35,7 +35,7 @@ module Helpers
     # @see Formtastic::Helpers::InputsHelper#inputs
     # @see Formtastic::Helpers::FormHelper#semantic_form_for
     module InputHelper
-      include Formtastic::Reflection
+      include Formtastic::Helpers::Reflection
       include Formtastic::Helpers::FileColumnDetection
       
       # Returns a chunk of HTML markup for a given `method` on the form object, wrapped in
diff --git a/lib/formtastic/helpers/reflection.rb b/lib/formtastic/helpers/reflection.rb
new file mode 100644
index 000000000..dd8606ea8
--- /dev/null
+++ b/lib/formtastic/helpers/reflection.rb
@@ -0,0 +1,12 @@
+module Formtastic
+  module Helpers
+    # @private
+    module Reflection
+      # 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
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/reflection.rb b/lib/formtastic/reflection.rb
deleted file mode 100644
index b0558996d..000000000
--- a/lib/formtastic/reflection.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module Formtastic
-  # @private
-  module Reflection
-    # 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
-  end
-end
\ No newline at end of file

From de41dc9a8d920ee7979863bb7f60199ba8dd163f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 13 Apr 2011 20:46:15 +1000
Subject: [PATCH 701/992] deprecated errors_on/inline_errors_for helper

---
 lib/formtastic/helpers/inputs_helper.rb |  5 ++++-
 spec/errors_spec.rb                     | 20 ++++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 5a46b62d3..5ff3bb39f 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -322,7 +322,10 @@ def inputs(*args, &block)
       #       <%= f.errors_on(:body) %>
       #     </li>
       #   <% end %>
-      def inline_errors_for(method, options = {}) #:nodoc:
+      #
+      # @deprecated See the README for the currently supported approach to custom inputs.
+      def inline_errors_for(method, options = {})
+        ActiveSupport::Deprecation.warn('inline_errors_for and errors_on are deprecated and will be removed on or after version 2.1', caller)
         if render_inline_errors?
           errors = error_keys(method, options).map{|x| @object.errors[x] }.flatten.compact.uniq
           send(:"error_#{inline_errors}", [*errors], options) if errors.any?
diff --git a/spec/errors_spec.rb b/spec/errors_spec.rb
index 62759dafe..c0ccf9eff 100644
--- a/spec/errors_spec.rb
+++ b/spec/errors_spec.rb
@@ -116,10 +116,12 @@
     end
 
     it 'should return nil when inline_errors config is :sentence, :list or :none' do
-      [:sentence, :list, :none].each do |config|
-        with_config :inline_errors, config do
-          semantic_form_for(@new_post) do |builder|
-            builder.errors_on(:title).should be_nil
+      with_deprecation_silenced do
+        [:sentence, :list, :none].each do |config|
+          with_config :inline_errors, config do
+            semantic_form_for(@new_post) do |builder|
+              builder.errors_on(:title).should be_nil
+            end
           end
         end
       end
@@ -132,10 +134,12 @@
     end
 
     it 'should return nil when inline_errors config is :sentence, :list or :none' do
-      [:sentence, :list, :none].each do |config|
-        Formtastic::FormBuilder.inline_errors = config
-        semantic_form_for(@new_post) do |builder|
-          builder.errors_on(:title).should be_nil
+      with_deprecation_silenced do
+        [:sentence, :list, :none].each do |config|
+          Formtastic::FormBuilder.inline_errors = config
+          semantic_form_for(@new_post) do |builder|
+            builder.errors_on(:title).should be_nil
+          end
         end
       end
     end

From 40ed72e39785fc6fb9aa9738553267a0f36566f2 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 13 Apr 2011 20:59:20 +1000
Subject: [PATCH 702/992] shift errors_on/inline_errors_for into ErrorsHelper

---
 lib/formtastic/helpers/errors_helper.rb | 32 +++++++++++++++++++++++++
 lib/formtastic/helpers/inputs_helper.rb | 31 ------------------------
 2 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/lib/formtastic/helpers/errors_helper.rb b/lib/formtastic/helpers/errors_helper.rb
index 757e2124c..4dd763313 100644
--- a/lib/formtastic/helpers/errors_helper.rb
+++ b/lib/formtastic/helpers/errors_helper.rb
@@ -54,6 +54,38 @@ def semantic_errors(*args)
           Formtastic::Util.html_safe(full_errors.map { |error| template.content_tag(:li, Formtastic::Util.html_safe(error)) }.join)
         end
       end
+      
+      # Generates error messages for the given method, used for displaying errors right near the
+      # field for data entry. Uses the `:inline_errors` config to determin the right presentation,
+      # which may be an ordered list, a paragraph sentence containing all errors, or a paragraph
+      # containing just the first error. If configred to `:none`, no error is shown.
+      #
+      # See the `:inline_errors` config documentation for more details.
+      #
+      # This method is mostly used internally, but can be used in your forms when creating your own
+      # custom inputs, so it's been made public and aliased to `errors_on`.
+      #
+      # @example
+      #   <%= semantic_form_for @post do |f| %>
+      #     <li class='my-custom-text-input'>
+      #       <%= f.label(:body) %>
+      #       <%= f.text_field(:body) %>
+      #       <%= f.errors_on(:body) %>
+      #     </li>
+      #   <% end %>
+      #
+      # @deprecated See the README for the currently supported approach to custom inputs.
+      def inline_errors_for(method, options = {})
+        ActiveSupport::Deprecation.warn('inline_errors_for and errors_on are deprecated and will be removed on or after version 2.1', caller)
+        if render_inline_errors?
+          errors = error_keys(method, options).map{|x| @object.errors[x] }.flatten.compact.uniq
+          send(:"error_#{inline_errors}", [*errors], options) if errors.any?
+        else
+          nil
+        end
+      end
+      alias :errors_on :inline_errors_for
+      
 
       protected
 
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 5ff3bb39f..d6ef0d63b 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -304,37 +304,6 @@ def inputs(*args, &block)
         out
       end
 
-      # Generates error messages for the given method, used for displaying errors right near the
-      # field for data entry. Uses the `:inline_errors` config to determin the right presentation,
-      # which may be an ordered list, a paragraph sentence containing all errors, or a paragraph
-      # containing just the first error. If configred to `:none`, no error is shown.
-      #
-      # See the `:inline_errors` config documentation for more details.
-      #
-      # This method is mostly used internally, but can be used in your forms when creating your own
-      # custom inputs, so it's been made public and aliased to `errors_on`.
-      #
-      # @example
-      #   <%= semantic_form_for @post do |f| %>
-      #     <li class='my-custom-text-input'>
-      #       <%= f.label(:body) %>
-      #       <%= f.text_field(:body) %>
-      #       <%= f.errors_on(:body) %>
-      #     </li>
-      #   <% end %>
-      #
-      # @deprecated See the README for the currently supported approach to custom inputs.
-      def inline_errors_for(method, options = {})
-        ActiveSupport::Deprecation.warn('inline_errors_for and errors_on are deprecated and will be removed on or after version 2.1', caller)
-        if render_inline_errors?
-          errors = error_keys(method, options).map{|x| @object.errors[x] }.flatten.compact.uniq
-          send(:"error_#{inline_errors}", [*errors], options) if errors.any?
-        else
-          nil
-        end
-      end
-      alias :errors_on :inline_errors_for
-
       protected
       
       # Collects association columns (relation columns) for the current form object class. Skips

From 40883d6b818c1d9253ac9d01a8ed529a9e8d0438 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 14 Apr 2011 07:13:11 +1000
Subject: [PATCH 703/992] small refactoring of inputs()

---
 lib/formtastic/helpers/inputs_helper.rb | 31 ++++++++++++++-----------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index d6ef0d63b..9fcab37ca 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -280,21 +280,10 @@ def inputs(*args, &block)
           elsif block_given?
             field_set_and_list_wrapping(*(args << html_options), &block)
           else
-            if @object && args.empty?
-              args  = association_columns(:belongs_to)
-              args += content_columns
-              args -= SKIPPED_COLUMNS
-              args.compact!
-            end
             legend = args.shift if args.first.is_a?(::String)
-            contents = args.collect do |method| 
-              if @object && (@object.class.reflect_on_association(method.to_sym) && @object.class.reflect_on_association(method.to_sym).options[:polymorphic] == true)
-                raise PolymorphicInputWithoutCollectionError.new("Please provide a collection for :#{method} input (you'll need to use block form syntax). Inputs for polymorphic associations can only be used when an explicit :collection is provided.")
-              end
-              input(method.to_sym)
-            end
+            args = default_columns_for_object if @object && args.empty?
+            contents = fieldset_contents_from_column_list(args)
             args.unshift(legend) if legend.present?
-          
             field_set_and_list_wrapping(*((args << html_options) << contents))
           end
         end
@@ -306,6 +295,22 @@ def inputs(*args, &block)
 
       protected
       
+      def default_columns_for_object
+        cols  = association_columns(:belongs_to)
+        cols += content_columns
+        cols -= SKIPPED_COLUMNS
+        cols.compact
+      end
+      
+      def fieldset_contents_from_column_list(columns)
+        columns.collect do |method| 
+          if @object && (@object.class.reflect_on_association(method.to_sym) && @object.class.reflect_on_association(method.to_sym).options[:polymorphic] == true)
+            raise PolymorphicInputWithoutCollectionError.new("Please provide a collection for :#{method} input (you'll need to use block form syntax). Inputs for polymorphic associations can only be used when an explicit :collection is provided.")
+          end
+          input(method.to_sym)
+        end
+      end
+      
       # Collects association columns (relation columns) for the current form object class. Skips
       # polymorphic associations because we can't guess which class to use for an automatically
       # generated input.

From 939b00724fc1d7f552833ba2e556d500174a3aa8 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 14 Apr 2011 16:23:20 +1000
Subject: [PATCH 704/992] shuffled a lot of specs around into folders

---
 spec/{ => builder}/custom_builder_spec.rb     |  0
 spec/{ => builder}/error_proc_spec.rb         |  0
 spec/{ => builder}/errors_spec.rb             |  0
 .../{ => builder}/semantic_fields_for_spec.rb |  0
 spec/defaults_spec.rb                         | 20 -------------------
 .../buttons_helper_spec.rb}                   |  0
 .../commit_button_helper_spec.rb}             |  0
 spec/{ => helpers}/form_helper_spec.rb        |  0
 .../input_helper_spec.rb}                     |  0
 .../inputs_helper_spec.rb}                    |  0
 .../semantic_errors_helper_spec.rb}           |  0
 spec/{new => inputs}/custom_input_spec.rb     |  0
 spec/{ => inputs}/include_blank_spec.rb       |  0
 spec/{ => inputs}/label_spec.rb               |  0
 14 files changed, 20 deletions(-)
 rename spec/{ => builder}/custom_builder_spec.rb (100%)
 rename spec/{ => builder}/error_proc_spec.rb (100%)
 rename spec/{ => builder}/errors_spec.rb (100%)
 rename spec/{ => builder}/semantic_fields_for_spec.rb (100%)
 delete mode 100644 spec/defaults_spec.rb
 rename spec/{buttons_spec.rb => helpers/buttons_helper_spec.rb} (100%)
 rename spec/{commit_button_spec.rb => helpers/commit_button_helper_spec.rb} (100%)
 rename spec/{ => helpers}/form_helper_spec.rb (100%)
 rename spec/{input_spec.rb => helpers/input_helper_spec.rb} (100%)
 rename spec/{inputs_spec.rb => helpers/inputs_helper_spec.rb} (100%)
 rename spec/{semantic_errors_spec.rb => helpers/semantic_errors_helper_spec.rb} (100%)
 rename spec/{new => inputs}/custom_input_spec.rb (100%)
 rename spec/{ => inputs}/include_blank_spec.rb (100%)
 rename spec/{ => inputs}/label_spec.rb (100%)

diff --git a/spec/custom_builder_spec.rb b/spec/builder/custom_builder_spec.rb
similarity index 100%
rename from spec/custom_builder_spec.rb
rename to spec/builder/custom_builder_spec.rb
diff --git a/spec/error_proc_spec.rb b/spec/builder/error_proc_spec.rb
similarity index 100%
rename from spec/error_proc_spec.rb
rename to spec/builder/error_proc_spec.rb
diff --git a/spec/errors_spec.rb b/spec/builder/errors_spec.rb
similarity index 100%
rename from spec/errors_spec.rb
rename to spec/builder/errors_spec.rb
diff --git a/spec/semantic_fields_for_spec.rb b/spec/builder/semantic_fields_for_spec.rb
similarity index 100%
rename from spec/semantic_fields_for_spec.rb
rename to spec/builder/semantic_fields_for_spec.rb
diff --git a/spec/defaults_spec.rb b/spec/defaults_spec.rb
deleted file mode 100644
index 2dedbbd0e..000000000
--- a/spec/defaults_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-
-describe 'Formtastic::FormBuilder-defaults' do
-
-  # Note: This spec might make better sense somewhere else. Just temporary.
-
-  describe "required string" do
-
-    it "should render proc with I18n correctly" do
-      ::I18n.backend.store_translations :en, :formtastic => {:required => 'Haha!'}
-
-      required_string = Formtastic::FormBuilder.required_string
-      required_string = required_string.is_a?(::Proc) ? required_string.call : required_string.to_s
-      required_string.should == %{<abbr title="Haha!">*</abbr>}
-    end
-
-  end
-
-end
diff --git a/spec/buttons_spec.rb b/spec/helpers/buttons_helper_spec.rb
similarity index 100%
rename from spec/buttons_spec.rb
rename to spec/helpers/buttons_helper_spec.rb
diff --git a/spec/commit_button_spec.rb b/spec/helpers/commit_button_helper_spec.rb
similarity index 100%
rename from spec/commit_button_spec.rb
rename to spec/helpers/commit_button_helper_spec.rb
diff --git a/spec/form_helper_spec.rb b/spec/helpers/form_helper_spec.rb
similarity index 100%
rename from spec/form_helper_spec.rb
rename to spec/helpers/form_helper_spec.rb
diff --git a/spec/input_spec.rb b/spec/helpers/input_helper_spec.rb
similarity index 100%
rename from spec/input_spec.rb
rename to spec/helpers/input_helper_spec.rb
diff --git a/spec/inputs_spec.rb b/spec/helpers/inputs_helper_spec.rb
similarity index 100%
rename from spec/inputs_spec.rb
rename to spec/helpers/inputs_helper_spec.rb
diff --git a/spec/semantic_errors_spec.rb b/spec/helpers/semantic_errors_helper_spec.rb
similarity index 100%
rename from spec/semantic_errors_spec.rb
rename to spec/helpers/semantic_errors_helper_spec.rb
diff --git a/spec/new/custom_input_spec.rb b/spec/inputs/custom_input_spec.rb
similarity index 100%
rename from spec/new/custom_input_spec.rb
rename to spec/inputs/custom_input_spec.rb
diff --git a/spec/include_blank_spec.rb b/spec/inputs/include_blank_spec.rb
similarity index 100%
rename from spec/include_blank_spec.rb
rename to spec/inputs/include_blank_spec.rb
diff --git a/spec/label_spec.rb b/spec/inputs/label_spec.rb
similarity index 100%
rename from spec/label_spec.rb
rename to spec/inputs/label_spec.rb

From 40b3cd3036b3c406f0ef22f6b81bb45e26f397f8 Mon Sep 17 00:00:00 2001
From: Bruce Williams <bruce@codefluency.com>
Date: Sat, 16 Apr 2011 00:33:46 -0700
Subject: [PATCH 705/992] Support Method objects for :label_method and
 :value_method.

Can provide any object that responds to :call (attempts to quack the
`duck` variable instead of checking if it's a Proc).
---
 lib/formtastic/inputs/base/collections.rb |  4 +--
 spec/support/custom_macros.rb             | 33 +++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic/inputs/base/collections.rb b/lib/formtastic/inputs/base/collections.rb
index 4a34e5e5c..490eea067 100644
--- a/lib/formtastic/inputs/base/collections.rb
+++ b/lib/formtastic/inputs/base/collections.rb
@@ -81,7 +81,7 @@ def collection_for_boolean
         end
       
         def send_or_call(duck, object)
-          if duck.is_a?(Proc)
+          if duck.respond_to?(:call)
             duck.call(object)
           else
             object.send(duck)
@@ -91,4 +91,4 @@ def send_or_call(duck, object)
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/support/custom_macros.rb b/spec/support/custom_macros.rb
index 2aa7042cb..ec223b6ac 100644
--- a/spec/support/custom_macros.rb
+++ b/spec/support/custom_macros.rb
@@ -408,6 +408,22 @@ def it_should_use_the_collection_when_provided(as, countable)
             end
           end
 
+          describe 'as a method object' do
+            before do
+              def reverse_login(a)
+                a.login.reverse
+              end
+              concat(semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:author, :as => as, :label_method => method(:reverse_login)))
+              end)
+            end
+
+            it 'should have options with the proc applied to each' do
+              ::Author.all.each do |author|
+                output_buffer.should have_tag("form li.#{as}", /#{author.login.reverse}/)
+              end
+            end
+          end
         end
 
         describe 'when the :label_method option is not provided' do
@@ -462,6 +478,23 @@ def it_should_use_the_collection_when_provided(as, countable)
               end
             end
           end
+
+          describe 'as a method object' do
+            before do
+              def reverse_login(a)
+                a.login.reverse
+              end
+              concat(semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:author, :as => as, :value_method => method(:reverse_login)))
+              end)
+            end
+
+            it 'should have options with the proc applied to each value' do
+              ::Author.all.each do |author|
+                output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login.reverse}']")
+              end
+            end
+          end
         end
 
       end

From 720d64cabe0eb9fd0d477a07950254c92887695a Mon Sep 17 00:00:00 2001
From: DeLynn Berry <delynn@gmail.com>
Date: Sun, 17 Apr 2011 23:58:39 -0600
Subject: [PATCH 706/992] Make sure the method attribute is returned when an
 association doesn't exist.

---
 lib/formtastic/inputs/base/associations.rb |   8 +-
 spec/inputs/select_input_spec.rb           | 194 +++++++++++----------
 2 files changed, 108 insertions(+), 94 deletions(-)

diff --git a/lib/formtastic/inputs/base/associations.rb b/lib/formtastic/inputs/base/associations.rb
index c9c29ec0f..1b95c3acd 100644
--- a/lib/formtastic/inputs/base/associations.rb
+++ b/lib/formtastic/inputs/base/associations.rb
@@ -7,21 +7,23 @@ module Associations
         def association
           @association ||= reflection.macro if reflection
         end
-        
+
         def reflection
           @reflection ||= object.class.reflect_on_association(method) if object.class.respond_to?(:reflect_on_association)
         end
-        
+
         def belongs_to?
           association == :belongs_to
         end
-        
+
         def association_primary_key
           if association
             return reflection.options[:foreign_key] unless reflection.options[:foreign_key].blank?
             return reflection.foreign_key if reflection.respond_to?(:foreign_key)
             return :"#{method}_id" if belongs_to?
             return "#{method.to_s.singularize}_id".pluralize.to_sym
+          else
+            return method.to_s
           end
         end
 
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 5f9fdce87..50c610f06 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -9,7 +9,7 @@
     @output_buffer = ''
     mock_everything
   end
-  
+
   describe 'explicit values' do
     describe 'using an array of values' do
       before do
@@ -20,7 +20,7 @@
           concat(builder.input(:title, :as => :select, :collection => @array_with_keys_and_values))
         end)
       end
-  
+
       it 'should have a option for each key and/or value' do
         @array_with_values.each do |v|
           output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
@@ -30,22 +30,22 @@
         end
       end
     end
-    
+
     describe "using a related model without reflection's options (Mongoid Document)" do
-      before do 
+      before do
         @new_post.stub!(:mongoid_reviewer)
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:mongoid_reviewer, :as => :select))
         end)
       end
-      
+
       it 'should draw select options' do
         output_buffer.should have_tag('form li select')
         output_buffer.should have_tag('form li select#post_reviewer_id')
         output_buffer.should_not have_tag('form li select#post_mongoid_reviewer_id')
       end
     end
-  
+
     describe 'using a range' do
       before do
         @range_with_values = 1..5
@@ -53,14 +53,14 @@
           concat(builder.input(:title, :as => :select, :collection => @range_with_values))
         end)
       end
-  
+
       it 'should have an option for each value' do
         @range_with_values.each do |v|
           output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
         end
       end
     end
-  
+
     describe 'using a string' do
       before do
         @string ="<option value='0'>0</option><option value='1'>1</option>"
@@ -68,7 +68,7 @@
           concat(builder.input(:title, :as => :select, :collection => @string))
         end)
       end
-  
+
       it 'should render select options using provided HTML string' do
         2.times do |v|
           output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
@@ -76,50 +76,50 @@
       end
     end
   end
-  
+
   describe 'for boolean columns' do
     describe 'default formtastic locale' do
       before do
         # Note: Works, but something like Formtastic.root.join(...) would probably be "safer".
         ::I18n.load_path = [File.join(File.dirname(__FILE__), *%w[.. .. lib locale en.yml])]
         ::I18n.backend.send(:init_translations)
-  
+
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:published, :as => :select))
         end)
       end
-  
+
       after do
         ::I18n.backend.store_translations :en, {}
       end
-  
+
       it 'should render a select with at least options: true/false' do
         output_buffer.should have_tag("form li select option[@value='true']", /^Yes$/)
         output_buffer.should have_tag("form li select option[@value='false']", /^No$/)
       end
     end
-  
+
     describe 'custom locale' do
       before do
         @boolean_select_labels = {:yes => 'Yep', :no => 'Nope'}
         ::I18n.backend.store_translations :en, :formtastic => @boolean_select_labels
-  
+
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:published, :as => :select))
         end)
       end
-  
+
       after do
         ::I18n.backend.store_translations :en, {}
       end
-  
+
       it 'should render a select with at least options: true/false' do
         output_buffer.should have_tag("form li select option[@value='true']", /#{@boolean_select_labels[:yes]}/)
         output_buffer.should have_tag("form li select option[@value='false']", /#{@boolean_select_labels[:no]}/)
       end
     end
   end
-  
+
   describe 'for a belongs_to association' do
     before do
       concat(semantic_form_for(@new_post) do |builder|
@@ -127,7 +127,7 @@
         concat(builder.input(:reviewer, :as => :select))
       end)
     end
-  
+
     it_should_have_input_wrapper_with_class("select")
     it_should_have_input_wrapper_with_id("post_author_input")
     it_should_have_label_with_text(/Author/)
@@ -135,68 +135,68 @@
     it_should_apply_error_logic_for_input_type(:select)
     it_should_call_find_on_association_class_when_no_collection_is_provided(:select)
     it_should_use_the_collection_when_provided(:select, 'option')
-    
+
     it 'should have a select inside the wrapper' do
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#post_author_id')
       output_buffer.should have_tag('form li select#post_reviewer_id')
     end
-    
+
     it 'should have a valid name' do
       output_buffer.should have_tag("form li select[@name='post[author_id]']")
       output_buffer.should_not have_tag("form li select[@name='post[author_id][]']")
       output_buffer.should_not have_tag("form li select[@name='post[reviewer_id][]']")
     end
-    
+
     it 'should not create a multi-select' do
       output_buffer.should_not have_tag('form li select[@multiple]')
     end
-    
+
     it 'should create a select without size' do
       output_buffer.should_not have_tag('form li select[@size]')
     end
-    
+
     it 'should have a blank option' do
       output_buffer.should have_tag("form li select option[@value='']")
     end
-    
+
     it 'should have a select option for each Author' do
       output_buffer.should have_tag("form li select[@name='post[author_id]'] option", :count => ::Author.all.size + 1)
       ::Author.all.each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
       end
     end
-    
+
     it 'should have one option with a "selected" attribute (bob)' do
       output_buffer.should have_tag("form li select[@name='post[author_id]'] option[@selected]", :count => 1)
     end
-    
+
     it 'should not singularize the association name' do
       @new_post.stub!(:author_status).and_return(@bob)
       @new_post.stub!(:author_status_id).and_return(@bob.id)
       @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => :integer, :limit => 255))
-    
+
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author_status, :as => :select))
       end)
-    
+
       output_buffer.should have_tag('form li select#post_author_status_id')
     end
   end
-  
+
   describe "for a belongs_to association with :group_by => :author" do
     it "should call author.posts" do
       ::Author.stub!(:reflect_on_all_associations).and_return { |macro| macro == :has_many ? [mock('reflection', :klass => Post, :name => :posts)] : []}
-      
+
       [@freds_post].each { |post| post.stub!(:to_label).and_return("Post - #{post.id}") }
       @fred.should_receive(:posts)
-  
+
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:main_post, :as => :select, :group_by => :author ) )
       end)
     end
   end
-  
+
   describe "for a belongs_to association with :conditions" do
     before do
       ::Post.stub!(:reflect_on_association).with(:author).and_return do
@@ -205,24 +205,24 @@
         mock
       end
     end
-  
+
     it "should call author.find with association conditions" do
       ::Author.should_receive(:where).with(:active => true)
-  
+
       semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select))
       end
     end
-  
+
     it "should call author.find with association conditions and find_options conditions" do
       ::Author.should_receive(:where).with({:active => true, :publisher => true})
-    
+
       semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select, :find_options => {:conditions => {:publisher => true}}))
       end
     end
   end
-  
+
   describe 'for a belongs_to association with :group_by => :continent' do
     before do
       @authors = [@bob, @fred, @fred, @fred]
@@ -230,17 +230,17 @@
       @continent_names = %w(Europe Africa)
       @continents = (0..1).map { |i| c = ::Continent.new; c.stub!(:id).and_return(100 - i);c }
       @authors[0..1].each_with_index { |author, i| author.stub!(:continent).and_return(@continents[i]) }
-      
+
       ::Continent.stub!(:reflect_on_all_associations).and_return { |macro| macro == :has_many ? [mock('reflection', :klass => Author, :name => :authors)] : [] }
       ::Continent.stub!(:reflect_on_association).and_return {|column_name| mock('reflection', :klass => Author) if column_name == :authors}
       ::Author.stub!(:reflect_on_association).and_return { |column_name| mock('reflection', :options => {}, :klass => Continent, :macro => :belongs_to) if column_name == :continent }
-  
-  
+
+
       @continents.each_with_index do |continent, i|
         continent.stub!(:to_label).and_return(@continent_names[i])
         continent.stub!(:authors).and_return([@authors[i]])
       end
-  
+
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select, :group_by => :continent ) )
         concat(builder.input(:author, :as => :select, :group_by => :continent, :group_label_method => :id ) )
@@ -248,57 +248,57 @@
         concat(builder.input(:author, :as => :select, :group_by => :continent, :label_method => :login, :group_label_method => :id ) )
       end)
     end
-  
+
     it_should_have_input_wrapper_with_class("select")
     it_should_have_input_wrapper_with_id("post_author_input")
     it_should_have_label_with_text(/Author/)
     it_should_have_label_for('post_author_id')
-  
+
     # TODO, need to find a way to repeat some of the specs and logic from the belongs_to specs without grouping
-  
+
     0.upto(1) do |i|
       it 'should have all option groups and the right values' do
         output_buffer.should have_tag("form li select optgroup[@label='#{@continent_names[i]}']", @authors[i].to_label)
       end
-  
+
       it 'should have custom group labels' do
         output_buffer.should have_tag("form li select optgroup[@label='#{@continents[i].id}']", @authors[i].to_label)
       end
-  
+
       it 'should have custom author labels' do
         output_buffer.should have_tag("form li select optgroup[@label='#{@continent_names[i]}']", @authors[i].login)
       end
-  
+
       it 'should have custom author and group labels' do
         output_buffer.should have_tag("form li select optgroup[@label='#{@continents[i].id}']", @authors[i].login)
       end
     end
-  
+
     it 'should have no duplicate groups' do
       output_buffer.should have_tag('form li select optgroup', :count => 8)
     end
-  
+
     it 'should sort the groups on the label method' do
       output_buffer.should have_tag("form li select optgroup[@label='Africa']")
       output_buffer.should have_tag("form li select optgroup[@label='99']")
     end
-  
+
     it 'should call find with :include for more optimized queries' do
       Author.should_receive(:where).with(:include => :continent)
-  
+
       semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select, :group_by => :continent ) )
       end
     end
   end
-  
+
   describe 'for a has_many association' do
     before do
       concat(semantic_form_for(@fred) do |builder|
         concat(builder.input(:posts, :as => :select))
       end)
     end
-  
+
     it_should_have_input_wrapper_with_class("select")
     it_should_have_input_wrapper_with_id("author_posts_input")
     it_should_have_label_with_text(/Post/)
@@ -306,55 +306,55 @@
     it_should_apply_error_logic_for_input_type(:select)
     it_should_call_find_on_association_class_when_no_collection_is_provided(:select)
     it_should_use_the_collection_when_provided(:select, 'option')
-  
+
     it 'should have a select inside the wrapper' do
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#author_post_ids')
     end
-  
+
     it 'should have a multi-select select' do
       output_buffer.should have_tag('form li select[@multiple="multiple"]')
     end
-  
+
     it 'should have a select option for each Post' do
       output_buffer.should have_tag('form li select option', :count => ::Post.all.size)
       ::Post.all.each do |post|
         output_buffer.should have_tag("form li select option[@value='#{post.id}']", /#{post.to_label}/)
       end
     end
-  
+
     it 'should not have a blank option by default' do
       output_buffer.should_not have_tag("form li select option[@value='']")
     end
-  
+
     it 'should respect the :include_blank option for single selects' do
       concat(semantic_form_for(@fred) do |builder|
         concat(builder.input(:posts, :as => :select, :multiple => false, :include_blank => true))
       end)
-  
+
       output_buffer.should have_tag("form li select option[@value='']")
     end
-  
+
     it 'should respect the :include_blank option for multiple selects' do
       concat(semantic_form_for(@fred) do |builder|
         concat(builder.input(:posts, :as => :select, :multiple => true, :include_blank => true))
       end)
-  
+
       output_buffer.should have_tag("form li select option[@value='']")
     end
-  
+
     it 'should have one option with a "selected" attribute' do
       output_buffer.should have_tag('form li select option[@selected]', :count => 1)
     end
   end
-  
+
   describe 'for a has_and_belongs_to_many association' do
     before do
       concat(semantic_form_for(@freds_post) do |builder|
         concat(builder.input(:authors, :as => :select))
       end)
     end
-  
+
     it_should_have_input_wrapper_with_class("select")
     it_should_have_input_wrapper_with_id("post_authors_input")
     it_should_have_label_with_text(/Author/)
@@ -362,48 +362,48 @@
     it_should_apply_error_logic_for_input_type(:select)
     it_should_call_find_on_association_class_when_no_collection_is_provided(:select)
     it_should_use_the_collection_when_provided(:select, 'option')
-  
+
     it 'should have a select inside the wrapper' do
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#post_author_ids')
     end
-  
+
     it 'should have a multi-select select' do
       output_buffer.should have_tag('form li select[@multiple="multiple"]')
     end
-  
+
     it 'should have a select option for each Author' do
       output_buffer.should have_tag('form li select option', :count => ::Author.all.size)
       ::Author.all.each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
       end
     end
-  
+
     it 'should not have a blank option by default' do
       output_buffer.should_not have_tag("form li select option[@value='']")
     end
-  
+
     it 'should respect the :include_blank option for single selects' do
       concat(semantic_form_for(@freds_post) do |builder|
         concat(builder.input(:authors, :as => :select, :multiple => false, :include_blank => true))
       end)
-  
+
       output_buffer.should have_tag("form li select option[@value='']")
     end
-  
+
     it 'should respect the :include_blank option for multiple selects' do
       concat(semantic_form_for(@freds_post) do |builder|
         concat(builder.input(:authors, :as => :select, :multiple => true, :include_blank => true))
       end)
-  
+
       output_buffer.should have_tag("form li select option[@value='']")
     end
-  
+
     it 'should have one option with a "selected" attribute' do
       output_buffer.should have_tag('form li select option[@selected]', :count => 1)
     end
   end
-  
+
   describe 'when :prompt => "choose something" is set' do
     before do
       @new_post.stub!(:author_id).and_return(nil)
@@ -411,40 +411,52 @@
         concat(builder.input(:author, :as => :select, :prompt => "choose author"))
       end)
     end
-  
+
     it 'should have a select with prompt' do
       output_buffer.should have_tag("form li select option[@value='']", /choose author/)
     end
-  
+
     it 'should not have a blank select option' do
       output_buffer.should_not have_tag("form li select option[@value='']", "")
     end
   end
-  
+
   describe 'when no object is given' do
     before(:each) do
       concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:author, :as => :select, :collection => ::Author.all))
       end)
     end
-  
+
     it 'should generate label' do
       output_buffer.should have_tag('form li label', /Author/)
       output_buffer.should have_tag("form li label[@for='project_author']")
     end
-  
+
     it 'should generate select inputs' do
       output_buffer.should have_tag('form li select#project_author')
       output_buffer.should have_tag('form li select option', :count => ::Author.all.size + 1)
     end
-  
+
     it 'should generate an option to each item' do
       ::Author.all.each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
       end
     end
   end
-  
+
+  describe 'when no association exists' do
+    before(:each) do
+      concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        concat(builder.input(:author_name, :as => :select, :collection => ::Author.all))
+      end)
+    end
+
+    it 'should still generate a valid name attribute' do
+      output_buffer.should have_tag("form li select[@name='project[author_name]']")
+    end
+  end
+
   describe 'when a grouped collection collection is given' do
     before(:each) do
       concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
@@ -454,7 +466,7 @@
         concat(builder.input(:author, :as => :select, :collection => grouped_options_for_select(@grouped_opts, "hands")))
       end)
     end
-  
+
     it 'should generate an option to each item' do
       @grouped_opts.each do |opt_pair|
         output_buffer.should have_tag("form li select optgroup[@label='#{opt_pair[0]}']")
@@ -465,14 +477,14 @@
       output_buffer.should have_tag("form li select optgroup option[@selected]","hands")
     end
   end
-  
+
   describe "enum" do
     before do
       @output_buffer = ''
       @some_meta_descriptions = ["One", "Two", "Three"]
       @new_post.stub!(:meta_description).any_number_of_times
     end
-  
+
     describe ":as is not set" do
       before do
         concat(semantic_form_for(@new_post) do |builder|
@@ -482,12 +494,12 @@
           concat(builder.input(:meta_description, :collection => @some_meta_descriptions))
         end)
       end
-  
+
       it "should render a select field" do
         output_buffer.should have_tag("form li select", :count => 2)
       end
     end
-  
+
     describe ":as is set" do
       before do
         # Should not be a case, but just checking :as got highest priority in setting input type.
@@ -498,13 +510,13 @@
           concat(builder.input(:meta_description, :as => :string, :collection => @some_meta_descriptions))
         end)
       end
-  
+
       it "should render a text field" do
         output_buffer.should have_tag("form li input[@type='text']", :count => 2)
       end
     end
   end
-  
+
   describe 'when a namespace is provided' do
     before do
       concat(semantic_form_for(@freds_post, :namespace => 'context2') do |builder|
@@ -515,7 +527,7 @@
     it_should_have_select_with_id("context2_post_author_ids")
     it_should_have_label_for("context2_post_author_ids")
   end
-  
+
   context "when required" do
     it "should add the required attribute to the select's html options" do
       concat(semantic_form_for(@new_post) do |builder|
@@ -524,5 +536,5 @@
       output_buffer.should have_tag("select[@required]")
     end
   end
-  
+
 end

From 1bfeb1e3b0a29d44e6f884f284017f36307b01bb Mon Sep 17 00:00:00 2001
From: Konstantin Shabanov <etehtsea@gmail.com>
Date: Tue, 26 Apr 2011 21:51:27 +0700
Subject: [PATCH 707/992] bump rails dep to ~> 3.0

---
 formtastic.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index f2558b223..48f7c4035 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}
 
-  s.add_dependency(%q<rails>, ["~> 3.0.0"])
+  s.add_dependency(%q<rails>, ["~> 3.0"])
 
   s.add_development_dependency(%q<rspec-rails>, ["~> 2.5"])
   s.add_development_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])

From 1f5e51f46bdf04ab7fdf7b428f1790398826a561 Mon Sep 17 00:00:00 2001
From: Thomas Walpole <twalpole@gmail.com>
Date: Mon, 2 May 2011 17:31:22 -0700
Subject: [PATCH 708/992] verify value is taken from object

---
 lib/formtastic/inputs/hidden_input.rb | 2 +-
 spec/inputs/hidden_input_spec.rb      | 4 ++++
 spec/spec_helper.rb                   | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic/inputs/hidden_input.rb b/lib/formtastic/inputs/hidden_input.rb
index 134039e0d..347cb1b1a 100644
--- a/lib/formtastic/inputs/hidden_input.rb
+++ b/lib/formtastic/inputs/hidden_input.rb
@@ -36,7 +36,7 @@ class HiddenInput
       #
       # @todo this is inconsistent with all other inputs, deprecate and remove
       def input_html_options
-        {:value => options[:value]}.merge(super).merge(:required => nil)
+        options.slice(:value).merge(super).merge(:required => nil)
       end
       
       def to_html
diff --git a/spec/inputs/hidden_input_spec.rb b/spec/inputs/hidden_input_spec.rb
index 4e959e0cb..3dc41c6d4 100644
--- a/spec/inputs/hidden_input_spec.rb
+++ b/spec/inputs/hidden_input_spec.rb
@@ -28,6 +28,10 @@
     output_buffer.should have_tag("form li input#post_secret[@name=\"post[secret]\"]")
   end
 
+  it "should get value from the object" do
+    output_buffer.should have_tag("form li input#post_secret[@type=\"hidden\"][@value=\"1\"]")
+  end
+  
   it "should pass any explicitly specified value - using :value" do
     output_buffer.should have_tag("form li input#post_author_id[@type=\"hidden\"][@value=\"99\"]")
   end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 060da7aa0..7f1938b64 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -178,7 +178,7 @@ def new_author_path; "/authors/new"; end
     @new_post.stub!(:to_key).and_return(nil)
     @new_post.stub!(:to_model).and_return(@new_post)
     @new_post.stub!(:persisted?).and_return(nil)
-
+    
     @freds_post = mock('post')
     @freds_post.stub!(:to_ary)
     @freds_post.stub!(:class).and_return(::Post)
@@ -245,7 +245,7 @@ def new_author_path; "/authors/new"; end
     @new_post.stub!(:published)
     @new_post.stub!(:publish_at)
     @new_post.stub!(:created_at)
-    @new_post.stub!(:secret)
+    @new_post.stub!(:secret).and_return(1)
     @new_post.stub!(:url)
     @new_post.stub!(:email)
     @new_post.stub!(:search)

From 4187ffb5d05cb01381c258bb0e99d1c5a538342e Mon Sep 17 00:00:00 2001
From: Thomas Walpole <twalpole@gmail.com>
Date: Mon, 2 May 2011 22:56:54 -0700
Subject: [PATCH 709/992] Fix date inputs not using label specified

---
 lib/formtastic/inputs/base/timeish.rb |  2 +-
 spec/inputs/label_spec.rb             | 20 +++++++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/lib/formtastic/inputs/base/timeish.rb b/lib/formtastic/inputs/base/timeish.rb
index a6bac3572..1c1fe84e9 100644
--- a/lib/formtastic/inputs/base/timeish.rb
+++ b/lib/formtastic/inputs/base/timeish.rb
@@ -105,7 +105,7 @@ def fragments_wrapping_html_options
         def fragments_label
           if render_label?
             template.content_tag(:legend, 
-              builder.label(method, :for => "#{input_html_options[:id]}_1i"), 
+              builder.label(method, label_text, :for => "#{input_html_options[:id]}_1i"), 
               :class => "label"
             )
           else
diff --git a/spec/inputs/label_spec.rb b/spec/inputs/label_spec.rb
index 8d9e7521a..faa5bef3e 100644
--- a/spec/inputs/label_spec.rb
+++ b/spec/inputs/label_spec.rb
@@ -14,7 +14,14 @@
     concat(semantic_form_for(@new_post) do |builder|
       builder.input(:title)
     end)
-    output_buffer.should have_tag('label', :with => /Login/)
+    output_buffer.should have_tag('label', /Title/)
+  end
+
+  it 'should humanize the given attribute for date fields' do
+    concat(semantic_form_for(@new_post) do |builder|
+      builder.input(:publish_at)
+    end)
+    output_buffer.should have_tag('label', /Publish at/)
   end
 
   describe 'when required is given' do
@@ -31,7 +38,7 @@
       concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :value_method => :to_s, :label_method => proc {|f| ('Label_%s' % [f])}))
       end)
-      output_buffer.should have_tag('form li fieldset ol li label', :with => /Label_[abc]/, :count => 3)
+      output_buffer.should have_tag('form li fieldset ol li label', /Label_[abc]/, :count => 3)
     end
 
     it 'should use a supplied value_method for simple collections' do
@@ -49,7 +56,14 @@
       concat(semantic_form_for(@new_post) do |builder|
         builder.input(:title, :label => 'My label')
       end)
-      output_buffer.should have_tag('label', :with => /My label/)
+      output_buffer.should have_tag('label', /My label/)
+    end
+    
+    it 'should allow the text to be given as label option for date fields' do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:publish_at, :label => 'My other label')
+      end)
+      output_buffer.should have_tag('label', /My other label/)
     end
 
     it 'should return nil if label is false' do

From 21bc9d6ea028f7bb3188ecb73d6a7b6c38fc4869 Mon Sep 17 00:00:00 2001
From: Edgars Beigarts <edgars.beigarts@makit.lv>
Date: Tue, 3 May 2011 11:35:34 +0300
Subject: [PATCH 710/992] Field should be always optional when :required is
 explicitly set to false.

---
 lib/formtastic/inputs/base/validations.rb |  4 ++--
 spec/helpers/input_helper_spec.rb         | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic/inputs/base/validations.rb b/lib/formtastic/inputs/base/validations.rb
index a9344e770..27e9f3c21 100644
--- a/lib/formtastic/inputs/base/validations.rb
+++ b/lib/formtastic/inputs/base/validations.rb
@@ -84,6 +84,8 @@ def validations?
         end
         
         def required?
+          return false if options[:required] == false
+          return true if options[:required] == true
           return false if not_required_through_negated_validation?
           if validations?
             validations.select { |validator| 
@@ -91,8 +93,6 @@ def required?
               validator.options[:allow_blank] != true
             }.any?
           else
-            return false if options[:required] == false
-            return true if options[:required] == true
             return !!builder.all_fields_required_by_default
           end
         end
diff --git a/spec/helpers/input_helper_spec.rb b/spec/helpers/input_helper_spec.rb
index 8bfd148fc..2ad620b5a 100644
--- a/spec/helpers/input_helper_spec.rb
+++ b/spec/helpers/input_helper_spec.rb
@@ -71,6 +71,17 @@
           output_buffer.should have_tag('form li.optional')
         end
 
+        it 'should set and "optional" class also when there is presence validator' do
+          @new_post.class.should_receive(:validators_on).with(:title).any_number_of_times.and_return([
+            active_model_presence_validator([:title])
+          ])
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:title, :required => false))
+          end)
+          output_buffer.should_not have_tag('form li.required')
+          output_buffer.should have_tag('form li.optional')
+        end
+
         it 'should append the "optional" string to the label' do
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => false))

From 6fb3b5cbcb446e0188a774f2d8ee42f78fbf1b32 Mon Sep 17 00:00:00 2001
From: Edgars Beigarts <edgars.beigarts@makit.lv>
Date: Tue, 3 May 2011 13:01:30 +0300
Subject: [PATCH 711/992] Refactored associations. There is not
 Reflection#options for mongoid.

---
 lib/formtastic/helpers/errors_helper.rb    | 14 +-------------
 lib/formtastic/helpers/reflection.rb       | 21 +++++++++++++++++++++
 lib/formtastic/inputs/base/associations.rb | 14 ++++----------
 lib/formtastic/inputs/base/collections.rb  |  4 ++--
 lib/formtastic/inputs/base/naming.rb       | 18 +++---------------
 spec/spec_helper.rb                        |  2 +-
 6 files changed, 32 insertions(+), 41 deletions(-)

diff --git a/lib/formtastic/helpers/errors_helper.rb b/lib/formtastic/helpers/errors_helper.rb
index 4dd763313..b4a0324d3 100644
--- a/lib/formtastic/helpers/errors_helper.rb
+++ b/lib/formtastic/helpers/errors_helper.rb
@@ -94,7 +94,7 @@ def error_keys(method, options)
         @methods_for_error[method] ||= begin
           methods_for_error = [method.to_sym]
           methods_for_error << file_metadata_suffixes.map{|suffix| "#{method}_#{suffix}".to_sym} if is_file?(method, options)
-          methods_for_error << [association_primary_key(method)] if association_macro_for_method(method) == :belongs_to
+          methods_for_error << [association_primary_key_for_method(method)] if association_macro_for_method(method) == :belongs_to
           methods_for_error.flatten.compact.uniq
         end
       end
@@ -107,18 +107,6 @@ def has_errors?(method, options)
       def render_inline_errors?
         @object && @object.respond_to?(:errors) && Formtastic::FormBuilder::INLINE_ERROR_TYPES.include?(inline_errors)
       end
-
-      def association_macro_for_method(method) #:nodoc:
-        reflection = reflection_for(method)
-        reflection.macro if reflection
-      end
-
-      def association_primary_key(method)
-        reflection = reflection_for(method)
-        reflection.options[:foreign_key] if reflection && !reflection.options[:foreign_key].blank?
-        :"#{method}_id"
-      end
-
     end
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/helpers/reflection.rb b/lib/formtastic/helpers/reflection.rb
index dd8606ea8..6a3931f32 100644
--- a/lib/formtastic/helpers/reflection.rb
+++ b/lib/formtastic/helpers/reflection.rb
@@ -7,6 +7,27 @@ module Reflection
       def reflection_for(method) #:nodoc:
         @object.class.reflect_on_association(method) if @object.class.respond_to?(:reflect_on_association)
       end
+
+      def association_macro_for_method(method) #:nodoc:
+        reflection = reflection_for(method)
+        reflection.macro if reflection
+      end
+
+      def association_primary_key_for_method(method) #:nodoc:
+        reflection = reflection_for(method)
+        if reflection
+          case association_macro_for_method(method)
+          when :has_and_belongs_to_many, :has_many, :references_and_referenced_in_many, :references_many
+            :"#{method.to_s.singularize}_ids"
+          else
+            return reflection.foreign_key.to_sym if reflection.respond_to?(:foreign_key)
+            return reflection.options[:foreign_key].to_sym unless reflection.options[:foreign_key].blank?
+            :"#{method}_id"
+          end
+        else
+          method.to_sym
+        end
+      end
     end
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/base/associations.rb b/lib/formtastic/inputs/base/associations.rb
index 1b95c3acd..514642ab9 100644
--- a/lib/formtastic/inputs/base/associations.rb
+++ b/lib/formtastic/inputs/base/associations.rb
@@ -2,14 +2,15 @@ module Formtastic
   module Inputs
     module Base
       module Associations
+        include Formtastic::Helpers::Reflection
 
         # :belongs_to, etc
         def association
-          @association ||= reflection.macro if reflection
+          @association ||= association_macro_for_method(method)
         end
 
         def reflection
-          @reflection ||= object.class.reflect_on_association(method) if object.class.respond_to?(:reflect_on_association)
+          @reflection ||= reflection_for(method)
         end
 
         def belongs_to?
@@ -17,14 +18,7 @@ def belongs_to?
         end
 
         def association_primary_key
-          if association
-            return reflection.options[:foreign_key] unless reflection.options[:foreign_key].blank?
-            return reflection.foreign_key if reflection.respond_to?(:foreign_key)
-            return :"#{method}_id" if belongs_to?
-            return "#{method.to_s.singularize}_id".pluralize.to_sym
-          else
-            return method.to_s
-          end
+          association_primary_key_for_method(method)
         end
 
       end
diff --git a/lib/formtastic/inputs/base/collections.rb b/lib/formtastic/inputs/base/collections.rb
index 4a34e5e5c..4a402699c 100644
--- a/lib/formtastic/inputs/base/collections.rb
+++ b/lib/formtastic/inputs/base/collections.rb
@@ -54,11 +54,11 @@ def collection_from_options
       
         def collection_from_association
           if reflection
-            raise PolymorphicInputWithoutCollectionError.new("A collection must be supplied for #{method} input. Collections cannot be guessed for polymorphic associations.") if reflection.options[:polymorphic] == true
+            raise PolymorphicInputWithoutCollectionError.new("A collection must be supplied for #{method} input. Collections cannot be guessed for polymorphic associations.") if reflection.options && reflection.options[:polymorphic] == true
 
             find_options_from_options = options[:find_options] || {}
             conditions_from_options = find_options_from_options[:conditions] || {}
-            conditions_from_reflection = reflection.options[:conditions] || {}
+            conditions_from_reflection = reflection.options && reflection.options[:conditions] || {}
             
             if conditions_from_options.any?
               reflection.klass.where(
diff --git a/lib/formtastic/inputs/base/naming.rb b/lib/formtastic/inputs/base/naming.rb
index 5d602d7a9..df1a6d55e 100644
--- a/lib/formtastic/inputs/base/naming.rb
+++ b/lib/formtastic/inputs/base/naming.rb
@@ -31,23 +31,11 @@ def humanized_method_name
             method.to_s.send(builder.label_str_method)
           end
         end
-        
-        # TODO this seems to overlap or be confused with association_primary_key
+
         def input_name
-          if reflection
-            if [:has_and_belongs_to_many, :has_many].include?(reflection.macro)
-              "#{method.to_s.singularize}_ids"
-            elsif reflection.respond_to? :foreign_key
-              reflection.foreign_key
-            else
-              reflection.options[:foreign_key] || "#{method}_id"
-            end
-          else
-            method
-          end.to_sym
+          association_primary_key
         end
-        
-      
+
       end
     end
   end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 7f1938b64..3fd82a95d 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -218,7 +218,7 @@ def new_author_path; "/authors/new"; end
       when :main_post
         mock('reflection', :options => {}, :klass => ::Post, :macro => :belongs_to)
       when :mongoid_reviewer
-        mock('reflection', :options => {}, :klass => ::Author, :macro => :referenced_in, :foreign_key => "reviewer_id") # custom id
+        mock('reflection', :options => nil, :klass => ::Author, :macro => :referenced_in, :foreign_key => "reviewer_id") # custom id
       end
 
     end

From e0f3aad48c73dc0d2d35c7e14e33f0517f1918b7 Mon Sep 17 00:00:00 2001
From: Thomas Walpole <twalpole@gmail.com>
Date: Tue, 3 May 2011 19:10:24 -0700
Subject: [PATCH 712/992] Multiple selects need to have [] appended to their
 name attributes to be able to submit data properly

---
 lib/formtastic/inputs/select_input.rb | 4 ++--
 spec/inputs/select_input_spec.rb      | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index 80aaa2b1e..6e9cd0b59 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -183,7 +183,7 @@ def input_html_options
       def extra_input_html_options
         {
           :multiple => multiple_by_association?,
-          :name => "#{object_name}[#{association_primary_key}]"
+          :name => "#{object_name}[#{association_primary_key}]#{'[]' if multiple?}"
         }
       end
       
@@ -202,7 +202,7 @@ def multiple?
       def single?
         !multiple?
       end
-        
+
     end
   end
 end
\ No newline at end of file
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 50c610f06..45c6d3af4 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -315,7 +315,11 @@
     it 'should have a multi-select select' do
       output_buffer.should have_tag('form li select[@multiple="multiple"]')
     end
-
+    
+    it 'should append [] to the name attribute for multiple select' do
+      output_buffer.should have_tag('form li select[@multiple="multiple"][@name="author[post_ids][]"]')
+    end
+    
     it 'should have a select option for each Post' do
       output_buffer.should have_tag('form li select option', :count => ::Post.all.size)
       ::Post.all.each do |post|

From 52a9df3cb7be4ebfb49ba5d2aea02dc88acff6b2 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 19 Apr 2011 07:29:35 +1000
Subject: [PATCH 713/992] f.semantic_fields_for is now just a wrapper around
 f.fields_for

Rails 3 will maintain the `:builder` option down through to the nested `fields_for` helper, so we no longer have to do that ourselves.
---
 lib/formtastic/form_builder.rb           | 16 +++++++++-------
 lib/formtastic/helpers/inputs_helper.rb  | 21 ++++++++++++++++-----
 spec/builder/custom_builder_spec.rb      |  8 ++++----
 spec/builder/semantic_fields_for_spec.rb | 12 ++++++------
 spec/i18n_spec.rb                        |  4 ++--
 5 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 9223648f6..c77f76c02 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -40,10 +40,13 @@ def self.configure(name, value = nil)
     include Formtastic::Helpers::ButtonsHelper
     include Formtastic::Helpers::ErrorsHelper
     
-    # A thin wrapper around `ActionView::Helpers::FormBuilder#fields_for` helper to set 
-    # `:builder => Formtastic::FormBuilder` for nesting forms inside the builder. Can be used in 
-    # the same way, but you'll also have access to the helpers in `Formtastic::FormBuilder` 
-    # (such as {#input}, etc) inside the block.
+    # This is a wrapper around Rails' `ActionView::Helpers::FormBuilder#fields_for`, originally 
+    # provided to ensure that the `:builder` from `semantic_form_for` was passed down into
+    # the nested `fields_for`. Rails 3 no longer requires us to do this, so this method is
+    # provided purely for backwards compatibility and DSL consistency.
+    #
+    # When constructing a `fields_for` form fragment *outside* of `semantic_form_for`, please use
+    # `Formtastic::Helpers::FormHelper#semantic_fields_for`.
     #
     # @see http://api.rubyonrails.org/classes/ActionView/Helpers/FormBuilder.html#method-i-fields_for ActionView::Helpers::FormBuilder#fields_for
     # @see http://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-fields_for ActionView::Helpers::FormHelper#fields_for
@@ -63,10 +66,9 @@ def self.configure(name, value = nil)
     #       </ol>
     #     </fieldset>
     #   </form>
+    #
+    # @todo is there a way to test the params structure of the Rails helper we wrap to ensure forward compatibility?
     def semantic_fields_for(record_or_name_or_array, *args, &block)
-      opts = args.extract_options!
-      opts[:builder] ||= self.class
-      args.push(opts)
       fields_for(record_or_name_or_array, *args, &block)
     end
     
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 9fcab37ca..87f7c88b6 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -111,7 +111,8 @@ module InputsHelper
       #     end
       #
       # Formtastic provides a helper called `semantic_fields_for`, which wraps around Rails' built-in
-      # `fields_for` helper, allowing you to combine Rails-style nested fields with Formtastic inputs:
+      # `fields_for` helper for backwards compatibility with previous versions of Formtastic, and for
+      # a consistent method naming API. The following examples are functionally equivalent:
       #
       #     <% semantic_form_for @user do |form| %>
       #       <%= f.inputs :name, :email %>
@@ -120,13 +121,23 @@ module InputsHelper
       #         <% profile.inputs do %>
       #           <%= profile.input :biography %>
       #           <%= profile.input :twitter_name %>
-      #           <%= profile.input :shoe_size %>
       #         <% end %>
       #       <% end %>
       #     <% end %>
       #
-      # {#inputs} also provides a DSL similar to `semantic_fields_for` to reduce the lines of code a
-      # little:
+      #     <% semantic_form_for @user do |form| %>
+      #       <%= f.inputs :name, :email %>
+      #
+      #       <% f.fields_for :profile do |profile| %>
+      #         <% profile.inputs do %>
+      #           <%= profile.input :biography %>
+      #           <%= profile.input :twitter_name %>
+      #         <% end %>
+      #       <% end %>
+      #     <% end %>
+      #
+      # {#inputs} also provides a DSL similar to `fields_for` / `semantic_fields_for` to reduce the 
+      # lines of code a little:
       #
       #     <% semantic_form_for @user do |f| %>
       #       <%= f.inputs :name, :email %>
@@ -359,7 +370,7 @@ def inputs_for_nested_attributes(*args, &block) #:nodoc:
         end
 
         fields_for_args = [options.delete(:for), options.delete(:for_options) || {}].flatten
-        semantic_fields_for(*fields_for_args, &fields_for_block)
+        fields_for(*fields_for_args, &fields_for_block)
       end
 
       def field_set_title_from_args(*args) #:nodoc:
diff --git a/spec/builder/custom_builder_spec.rb b/spec/builder/custom_builder_spec.rb
index ba6639124..bcf2343df 100644
--- a/spec/builder/custom_builder_spec.rb
+++ b/spec/builder/custom_builder_spec.rb
@@ -72,11 +72,11 @@ def to_html
 
     end
 
-    describe "semantic_fields_for" do
+    describe "fields_for" do
 
       it "should yield an instance of the parent form builder" do
         semantic_form_for(@new_post) do |builder|
-          builder.semantic_fields_for(:author) do |nested_builder|
+          builder.fields_for(:author) do |nested_builder|
             nested_builder.class.should == MyCustomFormBuilder
           end
         end
@@ -88,11 +88,11 @@ def to_html
 
   describe "when using a builder passed to form options" do
 
-    describe "semantic_fields_for" do
+    describe "fields_for" do
 
       it "should yield an instance of the parent form builder" do
         semantic_form_for(@new_post, :builder => MyCustomFormBuilder) do |builder|
-          builder.semantic_fields_for(:author) do |nested_builder|
+          builder.fields_for(:author) do |nested_builder|
             nested_builder.class.should == MyCustomFormBuilder
           end
         end
diff --git a/spec/builder/semantic_fields_for_spec.rb b/spec/builder/semantic_fields_for_spec.rb
index 87d3d8272..caa326234 100644
--- a/spec/builder/semantic_fields_for_spec.rb
+++ b/spec/builder/semantic_fields_for_spec.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'Formtastic::FormBuilder#semantic_fields_for' do
+describe 'Formtastic::FormBuilder#fields_for' do
 
   include FormtasticSpecHelper
 
@@ -13,7 +13,7 @@
 
   it 'yields an instance of FormHelper.builder' do
     semantic_form_for(@new_post) do |builder|
-      builder.semantic_fields_for(:author) do |nested_builder|
+      builder.fields_for(:author) do |nested_builder|
         nested_builder.class.should == Formtastic::Helpers::FormHelper.builder
       end
     end
@@ -21,7 +21,7 @@
 
   it 'nests the object name' do
     semantic_form_for(@new_post) do |builder|
-      builder.semantic_fields_for(@bob) do |nested_builder|
+      builder.fields_for(@bob) do |nested_builder|
         nested_builder.object_name.should == 'post[author]'
       end
     end
@@ -30,7 +30,7 @@
   it 'should sanitize html id for li tag' do
     @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
     concat(semantic_form_for(@new_post) do |builder|
-      concat(builder.semantic_fields_for(@bob, :index => 1) do |nested_builder|
+      concat(builder.fields_for(@bob, :index => 1) do |nested_builder|
         concat(nested_builder.inputs(:login))
       end)
     end)
@@ -43,7 +43,7 @@
   it 'should use namespace provided in nested fields' do
     @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
     concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
-      concat(builder.semantic_fields_for(@bob, :index => 1) do |nested_builder|
+      concat(builder.fields_for(@bob, :index => 1) do |nested_builder|
         concat(nested_builder.inputs(:login))
       end)
     end)
@@ -60,7 +60,7 @@
       @fred.stub!(:posts_attributes=)
 
       concat(semantic_form_for(@fred) do |builder|
-        concat(builder.semantic_fields_for(:posts) do |nested_builder|
+        concat(builder.fields_for(:posts) do |nested_builder|
           concat(nested_builder.input(:id, :as => :hidden))
           concat(nested_builder.input(:title))
         end)
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index 0941b6fae..612853657 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -133,7 +133,7 @@
     it 'should be able to translate nested objects with nested translations' do
       with_config :i18n_lookups_by_default, true do
         concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
-          builder.semantic_fields_for(:task) do |f|
+          builder.fields_for(:task) do |f|
             concat(f.input(:name))
           end
         end)
@@ -144,7 +144,7 @@
     it 'should be able to translate nested objects with top level translations' do
       with_config :i18n_lookups_by_default, true do
         concat(semantic_form_for(:order, :url => 'http://test.host') do |builder|
-          builder.semantic_fields_for(:line_item) do |f|
+          builder.fields_for(:line_item) do |f|
             concat(f.input(:name))
           end
         end)

From 38fae41066267182d7faf12eb0a809806bb624f0 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 20 Apr 2011 22:31:29 +1000
Subject: [PATCH 714/992] removed semantic_remote_form_for and aliases, because
 the methods they wrap are not in Rails 3

---
 CHANGELOG                             |  1 +
 lib/formtastic/helpers/form_helper.rb | 23 -----------------------
 spec/helpers/form_helper_spec.rb      | 16 ----------------
 3 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3e382773a..89c34aa70 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,6 +20,7 @@
 * Changed quick forms to skip polymorphic associations (they didn't work)
 * Changed short hand forms to raise an error when trying to render an input for a polymorphic association (it didn't work, need a collection)
 * Changed input() to raise an error when a :collection is not provided for a polymorphic association (we can't guess which class to use)
+* Removed semantic_remote_form_for etc, the remote_form_for helpers don't exist in Rails 3
 
 1.2.4.beta (unreleased)
 
diff --git a/lib/formtastic/helpers/form_helper.rb b/lib/formtastic/helpers/form_helper.rb
index 80b04b0f3..7e67a03e4 100644
--- a/lib/formtastic/helpers/form_helper.rb
+++ b/lib/formtastic/helpers/form_helper.rb
@@ -151,29 +151,6 @@ def semantic_fields_for(record_or_name_or_array, *args, &proc)
         form_helper_wrapper(:fields_for, record_or_name_or_array, *args, &proc)
       end
 
-      # Wrapper around Rails' own `remote_form_for` helper to set the `:builder` option to
-      # `Formtastic::FormBuilder` and to set some class names on the `<form>` tag such as
-      # `formtastic` and the downcased and underscored model name.
-      #
-      # @see #semantic_form_for
-      # @todo why isn't YARD rendering this method?
-      def semantic_remote_form_for(record_or_name_or_array, *args, &proc)
-        form_helper_wrapper(:remote_form_for, record_or_name_or_array, *args, &proc)
-      end
-
-      def semantic_remote_form_for_wrapper(record_or_name_or_array, *args, &proc)
-        options = args.extract_options!
-        if respond_to? :remote_form_for
-          semantic_remote_form_for_real(record_or_name_or_array, *(args << options), &proc)
-        else
-          options[:remote] = true
-          semantic_form_for(record_or_name_or_array, *(args << options), &proc)
-        end
-      end
-      alias :semantic_remote_form_for_real :semantic_remote_form_for
-      alias :semantic_remote_form_for :semantic_remote_form_for_wrapper
-      alias :semantic_form_remote_for :semantic_remote_form_for
-
       protected
 
       # @todo pretty sure some of this (like HTML classes and record naming are exlusive to `form_for`)
diff --git a/spec/helpers/form_helper_spec.rb b/spec/helpers/form_helper_spec.rb
index a592f2f31..793c170a7 100644
--- a/spec/helpers/form_helper_spec.rb
+++ b/spec/helpers/form_helper_spec.rb
@@ -131,21 +131,5 @@ class MyAwesomeCustomBuilder < Formtastic::FormBuilder
     end
   end
 
-  describe '#semantic_form_remote_for' do
-    it 'yields an instance of Formtastic::FormBuilder' do
-      semantic_form_remote_for(@new_post, :url => '/hello') do |builder|
-        builder.class.should == Formtastic::FormBuilder
-      end
-    end
-  end
-
-  describe '#semantic_form_for_remote' do
-    it 'yields an instance of Formtastic::FormBuilder' do
-      semantic_remote_form_for(@new_post, :url => '/hello') do |builder|
-        builder.class.should == Formtastic::FormBuilder
-      end
-    end
-  end
-
 end
 

From 116d6455588c80e035b7337891964d4174d02917 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 4 May 2011 22:02:36 +1000
Subject: [PATCH 715/992] documentation for the recent changes to
 :label_method, which now accepts a Method object for use with helper_methods

---
 lib/formtastic/helpers/input_helper.rb     |  4 ++--
 lib/formtastic/inputs/check_boxes_input.rb | 10 +++++++++-
 lib/formtastic/inputs/radio_input.rb       |  8 ++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic/helpers/input_helper.rb b/lib/formtastic/helpers/input_helper.rb
index e88f26da7..f33617513 100644
--- a/lib/formtastic/helpers/input_helper.rb
+++ b/lib/formtastic/helpers/input_helper.rb
@@ -136,10 +136,10 @@ module InputHelper
       # @option options :collection [Array<ActiveModel, String, Symbol>, Hash{String => String, Boolean}, OrderedHash{String => String, Boolean}]
       #   Override collection of objects in the association (`:select`, `:radio` & `:check_boxes` inputs only)
       #
-      # @option options :label_method [Symbol, Proc]
+      # @option options :label_method [Symbol, Proc, Method]
       #   Override the method called on each object in the `:collection` for use as the `<label>` content (`:check_boxes` & `:radio` inputs) or `<option>` content (`:select` inputs)
       #
-      # @option options :value_method [Symbol, Proc]
+      # @option options :value_method [Symbol, Proc, Method]
       #   Override the method called on each object in the `:collection` for use as the `value` attribute in the `<input>` (`:check_boxes` & `:radio` inputs) or `<option>` (`:select` inputs)
       #
       # @option options :hint_class [String]
diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index b6d86a41b..27f8ef075 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -55,13 +55,21 @@ module Inputs
     # @example `:label_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the label text (it'll try the methods like `to_s` in `collection_label_methods` config by default)
     #   <%= f.input :categories, :as => :check_boxes, :label_method => :name %>
     #   <%= f.input :categories, :as => :check_boxes, :label_method => :name_with_post_count
-    #   <%= f.input :categories, :as => :check_boxes, :label_method => Proc.new { |c| "#{c.name} (#{pluralize("post", c.posts.count)})" }
+    #   <%= f.input :categories, :as => :check_boxes, :label_method => { |c| "#{c.name} (#{pluralize("post", c.posts.count)})" }
+    #
+    # @example `:label_method` can be used with a helper method (both examples have the same result)
+    #   <%= f.input :categories, :as => :check_boxes, :label_method => method(:fancy_label)
+    #   <%= f.input :categories, :as => :check_boxes, :label_method => Proc.new { |category| fancy_label(category) }
     #
     # @example `:value_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the value for each checkbox (it'll try the methods like `id` in `collection_value_methods` config by default)
     #   <%= f.input :categories, :as => :check_boxes, :value_method => :code %>
     #   <%= f.input :categories, :as => :check_boxes, :value_method => :isbn
     #   <%= f.input :categories, :as => :check_boxes, :value_method => Proc.new { |c| c.name.downcase.underscore }
     #
+    # @example `:value_method` can be used with a helper method (both examples have the same result)
+    #   <%= f.input :categories, :as => :check_boxes, :value_method => method(:some_helper)
+    #   <%= f.input :categories, :as => :check_boxes, :value_method => Proc.new { |category| some_helper(category) }
+    #
     # @example `:value_as_class` can be used to add a class to the `<li>` wrapped around each choice using the checkbox value for custom styling of each choice
     #   <%= f.input :categories, :as => :check_boxes, :value_as_class => true %>
     #
diff --git a/lib/formtastic/inputs/radio_input.rb b/lib/formtastic/inputs/radio_input.rb
index d8449ed77..df1fcdb2a 100644
--- a/lib/formtastic/inputs/radio_input.rb
+++ b/lib/formtastic/inputs/radio_input.rb
@@ -90,10 +90,18 @@ module Inputs
     #   <%= f.input :author, :as => :radio, :label_method => :name_with_post_count
     #   <%= f.input :author, :as => :radio, :label_method => Proc.new { |a| "#{c.name} (#{pluralize("post", a.posts.count)})" }
     #
+    # @example `:label_method` can be used with a helper method (both examples have the same result)
+    #   <%= f.input :author, :as => :radio, :label_method => method(:fancy_label)
+    #   <%= f.input :author, :as => :radio, :label_method => Proc.new { |author| fancy_label(author) }
+    #
     # @example The `:value_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the value for each checkbox (it'll try the methods like `id` in `collection_value_methods` config by default)
     #   <%= f.input :author, :as => :radio, :value_method => :login %>
     #   <%= f.input :author, :as => :radio, :value_method => Proc.new { |c| c.full_name.downcase.underscore }
     #
+    # @example `:value_method` can be used with a helper method (both examples have the same result)
+    #   <%= f.input :author, :as => :radio, :value_method => method(:some_helper)
+    #   <%= f.input :author, :as => :radio, :value_method => Proc.new { |author| some_helper(author) }
+    #
     # @example Set HTML attributes on each `<input type="radio">` tag with `:input_html`
     #   <%= f.input :author, :as => :radio, :input_html => { :size => 20, :multiple => true, :class => "special" } %>
     #

From 454dd44c00c512509ce6b9b09ad19e72e620af34 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 5 May 2011 07:55:09 +1000
Subject: [PATCH 716/992] Renamed (with backwards compatibility) and
 deprecation notices) :label_method => :member_label, :value_method =>
 :member_value and :grouped_label_method => :grouped_label. Fixes #533.

---
 README.textile                                |   2 +-
 lib/formtastic/helpers/input_helper.rb        |  15 +-
 lib/formtastic/inputs/base.rb                 |  11 ++
 lib/formtastic/inputs/base/collections.rb     |   6 +-
 .../inputs/base/grouped_collections.rb        |   2 +-
 lib/formtastic/inputs/base/options.rb         |   2 +-
 lib/formtastic/inputs/check_boxes_input.rb    |  28 ++--
 lib/formtastic/inputs/radio_input.rb          |  28 ++--
 lib/formtastic/inputs/select_input.rb         |  18 +--
 spec/inputs/check_boxes_input_spec.rb         |   4 +-
 spec/inputs/label_spec.rb                     |   4 +-
 spec/inputs/select_input_spec.rb              |   6 +-
 spec/support/custom_macros.rb                 | 152 ++++++++++++++++--
 13 files changed, 216 insertions(+), 62 deletions(-)

diff --git a/README.textile b/README.textile
index 888e8d36b..bff02b426 100644
--- a/README.textile
+++ b/README.textile
@@ -171,7 +171,7 @@ If you want to customize the label text, or render some hint text below the fiel
     <% form.inputs :name => "Advanced Options", :id => "advanced" do %>
       <%= form.input :slug, :label => "URL Title", :hint => "Created automatically if left blank", :required => false %>
       <%= form.input :section, :as => :radio %>
-      <%= form.input :user, :label => "Author", :label_method => :full_name %>
+      <%= form.input :user, :label => "Author", :member_label => :full_name %>
       <%= form.input :categories, :required => false %>
       <%= form.input :created_at, :as => :string, :label => "Publication Date", :required => false %>
     <% end %>
diff --git a/lib/formtastic/helpers/input_helper.rb b/lib/formtastic/helpers/input_helper.rb
index f33617513..2d03309d7 100644
--- a/lib/formtastic/helpers/input_helper.rb
+++ b/lib/formtastic/helpers/input_helper.rb
@@ -136,12 +136,18 @@ module InputHelper
       # @option options :collection [Array<ActiveModel, String, Symbol>, Hash{String => String, Boolean}, OrderedHash{String => String, Boolean}]
       #   Override collection of objects in the association (`:select`, `:radio` & `:check_boxes` inputs only)
       #
-      # @option options :label_method [Symbol, Proc, Method]
+      # @option options :member_label [Symbol, Proc, Method]
       #   Override the method called on each object in the `:collection` for use as the `<label>` content (`:check_boxes` & `:radio` inputs) or `<option>` content (`:select` inputs)
       #
-      # @option options :value_method [Symbol, Proc, Method]
+      # @option options :label_method [Symbol, Proc, Method]
+      #   Deprecated, renamed to :member_label
+      #
+      # @option options :member_value [Symbol, Proc, Method]
       #   Override the method called on each object in the `:collection` for use as the `value` attribute in the `<input>` (`:check_boxes` & `:radio` inputs) or `<option>` (`:select` inputs)
       #
+      # @option options :value_method [Symbol, Proc, Method]
+      #   Deprecated, renamed to :member_value
+      #
       # @option options :hint_class [String]
       #   Override the `class` attribute applied to the `<p>` tag used when a `:hint` is rendered for an input
       #
@@ -158,6 +164,9 @@ module InputHelper
       #   TODO will probably be deprecated
       #
       # @option options :group_label_method [Symbol]
+      #   Deprecated, use `:group_label`
+      #
+      # @option options :group_label [Symbol]
       #   TODO will probably be deprecated
       #
       # @option options :include_blank [Boolean]
@@ -167,7 +176,7 @@ module InputHelper
       #   Specify the text in the first ('blank') `:select` input `<option>` to prompt a user to make a selection (implicitly sets `:include_blank` to `true`)
       #
       # @todo Can we kill `:hint_class` & `:error_class`? What's the use case for input-by-input? Shift to config or burn!
-      # @todo Can we kill `:group_by` & `:group_label_method`? Should be done with :collection => grouped_options_for_select(...)
+      # @todo Can we kill `:group_by` & `:group_label`/`:group_label_method`? Should be done with :collection => grouped_options_for_select(...)
       # @todo Can we kill `:find_options`? Should be done with MyModel.some_scope.where(...).order(...).whatever_scope
       # @todo Can we kill `:label`, `:hint` & `:prompt`? All strings could be shifted to i18n!
       #
diff --git a/lib/formtastic/inputs/base.rb b/lib/formtastic/inputs/base.rb
index 6d4c15938..b848aac23 100644
--- a/lib/formtastic/inputs/base.rb
+++ b/lib/formtastic/inputs/base.rb
@@ -11,6 +11,17 @@ def initialize(builder, template, object, object_name, method, options)
         @object_name = object_name
         @method = method
         @options = options.dup
+        
+        warn_and_correct_option!(:label_method, :member_label)
+        warn_and_correct_option!(:value_method, :member_value)
+        warn_and_correct_option!(:group_label_method, :group_label)
+      end
+      
+      def warn_and_correct_option!(old_option_name, new_option_name)
+        if options.key?(old_option_name)
+          ::ActiveSupport::Deprecation.warn("The :#{old_option_name} option is deprecated in favour of :#{new_option_name} and will be removed from Formtastic after 2.0")
+          options[new_option_name] = options.delete(old_option_name)
+        end
       end
       
       extend ActiveSupport::Autoload
diff --git a/lib/formtastic/inputs/base/collections.rb b/lib/formtastic/inputs/base/collections.rb
index 837351193..b2a94035b 100644
--- a/lib/formtastic/inputs/base/collections.rb
+++ b/lib/formtastic/inputs/base/collections.rb
@@ -24,8 +24,8 @@ def label_and_value_method(_collection, grouped=false)
           end
       
           # Order of preference: user supplied method, class defaults, auto-detect
-          label = (grouped ? options[:grouped_label_method] : options[:label_method]) || label || builder.collection_label_methods.find { |m| sample.respond_to?(m) }
-          value = (grouped ? options[:grouped_value_method] : options[:value_method]) || value || builder.collection_value_methods.find { |m| sample.respond_to?(m) }
+          label = (grouped ? options[:grouped_label_method] : options[:member_label]) || label || builder.collection_label_methods.find { |m| sample.respond_to?(m) }
+          value = (grouped ? options[:grouped_value_method] : options[:member_value]) || value || builder.collection_value_methods.find { |m| sample.respond_to?(m) }
       
           [label, value]
         end
@@ -41,7 +41,7 @@ def collection
           # Return if we have an Array of strings, fixnums or arrays
           return raw_collection if (raw_collection.instance_of?(Array) || raw_collection.instance_of?(Range)) &&
                                [Array, Fixnum, String, Symbol].include?(raw_collection.first.class) &&
-                               !(options.include?(:label_method) || options.include?(:value_method))
+                               !(options.include?(:member_label) || options.include?(:member_value))
                        
           raw_collection.map { |o| [send_or_call(label_method, o), send_or_call(value_method, o)] }
         end
diff --git a/lib/formtastic/inputs/base/grouped_collections.rb b/lib/formtastic/inputs/base/grouped_collections.rb
index aaf1249f2..47ba01a72 100644
--- a/lib/formtastic/inputs/base/grouped_collections.rb
+++ b/lib/formtastic/inputs/base/grouped_collections.rb
@@ -16,7 +16,7 @@ def group_label_method
         end
       
         def group_label_method_from_options
-          options[:group_label_method]
+          options[:group_label]
         end
       
         def group_label_method_from_grouped_collection
diff --git a/lib/formtastic/inputs/base/options.rb b/lib/formtastic/inputs/base/options.rb
index abbbbe070..d242d3c8a 100644
--- a/lib/formtastic/inputs/base/options.rb
+++ b/lib/formtastic/inputs/base/options.rb
@@ -8,7 +8,7 @@ def input_options
         end
         
         def formtastic_options
-          [:priority_countries, :priority_zones, :value_method, :label_method, :collection, :required, :label, :as, :hint, :input_html, :label_html, :value_as_class, :find_options, :class]
+          [:priority_countries, :priority_zones, :value_method, :label_method, :member_label, :member_value, :collection, :required, :label, :as, :hint, :input_html, :label_html, :value_as_class, :find_options, :class]
         end
       
       end
diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index 27f8ef075..ef33832c5 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -52,23 +52,23 @@ module Inputs
     # @example `:disabled` can be used to disable any checkboxes with a value found in the given Array
     #   <%= f.input :categories, :as => :check_boxes, :collection => ["a", "b"], :disabled => ["a"] %>
     #
-    # @example `:label_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the label text (it'll try the methods like `to_s` in `collection_label_methods` config by default)
-    #   <%= f.input :categories, :as => :check_boxes, :label_method => :name %>
-    #   <%= f.input :categories, :as => :check_boxes, :label_method => :name_with_post_count
-    #   <%= f.input :categories, :as => :check_boxes, :label_method => { |c| "#{c.name} (#{pluralize("post", c.posts.count)})" }
+    # @example `:member_label` can be used to call a different method (or a Proc) on each object in the collection for rendering the label text (it'll try the methods like `to_s` in `collection_label_methods` config by default)
+    #   <%= f.input :categories, :as => :check_boxes, :member_label => :name %>
+    #   <%= f.input :categories, :as => :check_boxes, :member_label => :name_with_post_count
+    #   <%= f.input :categories, :as => :check_boxes, :member_label => { |c| "#{c.name} (#{pluralize("post", c.posts.count)})" }
     #
-    # @example `:label_method` can be used with a helper method (both examples have the same result)
-    #   <%= f.input :categories, :as => :check_boxes, :label_method => method(:fancy_label)
-    #   <%= f.input :categories, :as => :check_boxes, :label_method => Proc.new { |category| fancy_label(category) }
+    # @example `:member_label` can be used with a helper method (both examples have the same result)
+    #   <%= f.input :categories, :as => :check_boxes, :member_label => method(:fancy_label)
+    #   <%= f.input :categories, :as => :check_boxes, :member_label => Proc.new { |category| fancy_label(category) }
     #
-    # @example `:value_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the value for each checkbox (it'll try the methods like `id` in `collection_value_methods` config by default)
-    #   <%= f.input :categories, :as => :check_boxes, :value_method => :code %>
-    #   <%= f.input :categories, :as => :check_boxes, :value_method => :isbn
-    #   <%= f.input :categories, :as => :check_boxes, :value_method => Proc.new { |c| c.name.downcase.underscore }
+    # @example `:member_value` can be used to call a different method (or a Proc) on each object in the collection for rendering the value for each checkbox (it'll try the methods like `id` in `collection_value_methods` config by default)
+    #   <%= f.input :categories, :as => :check_boxes, :member_value => :code %>
+    #   <%= f.input :categories, :as => :check_boxes, :member_value => :isbn
+    #   <%= f.input :categories, :as => :check_boxes, :member_value => Proc.new { |c| c.name.downcase.underscore }
     #
-    # @example `:value_method` can be used with a helper method (both examples have the same result)
-    #   <%= f.input :categories, :as => :check_boxes, :value_method => method(:some_helper)
-    #   <%= f.input :categories, :as => :check_boxes, :value_method => Proc.new { |category| some_helper(category) }
+    # @example `:member_value` can be used with a helper method (both examples have the same result)
+    #   <%= f.input :categories, :as => :check_boxes, :member_value => method(:some_helper)
+    #   <%= f.input :categories, :as => :check_boxes, :member_value => Proc.new { |category| some_helper(category) }
     #
     # @example `:value_as_class` can be used to add a class to the `<li>` wrapped around each choice using the checkbox value for custom styling of each choice
     #   <%= f.input :categories, :as => :check_boxes, :value_as_class => true %>
diff --git a/lib/formtastic/inputs/radio_input.rb b/lib/formtastic/inputs/radio_input.rb
index df1fcdb2a..bb7e00d91 100644
--- a/lib/formtastic/inputs/radio_input.rb
+++ b/lib/formtastic/inputs/radio_input.rb
@@ -32,7 +32,7 @@ module Inputs
     # You can override or customise this collection through the `:collection` option (see examples).
     #
     # The way on which Formtastic renders the `value` attribute and label for each choice is
-    # customisable through the `:label_method` and `:value_method` options (see examples below).
+    # customisable through the `:member_label` and `:member_value` options (see examples below).
     # When not provided, we fall back to a list of methods to try on each object such as
     # `:to_label`, `:name` and `:to_s`, which are defined in the configurations
     # `collection_label_methods` and `collection_value_methods`.
@@ -85,22 +85,22 @@ module Inputs
     #   <%= f.input :author, :as => :radio, :collection => [["Justin", 1], ["Kate", 3]] %>
     #   <%= f.input :author, :as => :radio, :collection => 1..5 %>
     #
-    # @example The `:label_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the label text (it'll try the methods like `to_s` in `collection_label_methods` config by default)
-    #   <%= f.input :author, :as => :radio, :label_method => :name %>
-    #   <%= f.input :author, :as => :radio, :label_method => :name_with_post_count
-    #   <%= f.input :author, :as => :radio, :label_method => Proc.new { |a| "#{c.name} (#{pluralize("post", a.posts.count)})" }
+    # @example The `:member_label` can be used to call a different method (or a Proc) on each object in the collection for rendering the label text (it'll try the methods like `to_s` in `collection_label_methods` config by default)
+    #   <%= f.input :author, :as => :radio, :member_label => :name %>
+    #   <%= f.input :author, :as => :radio, :member_label => :name_with_post_count
+    #   <%= f.input :author, :as => :radio, :member_label => Proc.new { |a| "#{c.name} (#{pluralize("post", a.posts.count)})" }
     #
-    # @example `:label_method` can be used with a helper method (both examples have the same result)
-    #   <%= f.input :author, :as => :radio, :label_method => method(:fancy_label)
-    #   <%= f.input :author, :as => :radio, :label_method => Proc.new { |author| fancy_label(author) }
+    # @example `:member_label` can be used with a helper method (both examples have the same result)
+    #   <%= f.input :author, :as => :radio, :member_label => method(:fancy_label)
+    #   <%= f.input :author, :as => :radio, :member_label => Proc.new { |author| fancy_label(author) }
     #
-    # @example The `:value_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the value for each checkbox (it'll try the methods like `id` in `collection_value_methods` config by default)
-    #   <%= f.input :author, :as => :radio, :value_method => :login %>
-    #   <%= f.input :author, :as => :radio, :value_method => Proc.new { |c| c.full_name.downcase.underscore }
+    # @example The `:member_value` can be used to call a different method (or a Proc) on each object in the collection for rendering the value for each checkbox (it'll try the methods like `id` in `collection_value_methods` config by default)
+    #   <%= f.input :author, :as => :radio, :member_value => :login %>
+    #   <%= f.input :author, :as => :radio, :member_value => Proc.new { |c| c.full_name.downcase.underscore }
     #
-    # @example `:value_method` can be used with a helper method (both examples have the same result)
-    #   <%= f.input :author, :as => :radio, :value_method => method(:some_helper)
-    #   <%= f.input :author, :as => :radio, :value_method => Proc.new { |author| some_helper(author) }
+    # @example `:member_value` can be used with a helper method (both examples have the same result)
+    #   <%= f.input :author, :as => :radio, :member_value => method(:some_helper)
+    #   <%= f.input :author, :as => :radio, :member_value => Proc.new { |author| some_helper(author) }
     #
     # @example Set HTML attributes on each `<input type="radio">` tag with `:input_html`
     #   <%= f.input :author, :as => :radio, :input_html => { :size => 20, :multiple => true, :class => "special" } %>
diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index 6e9cd0b59..ba5b96474 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -33,7 +33,7 @@ module Inputs
     # the `:collection` option (see examples).
     #
     # The way on which Formtastic renders the `value` attribute and content of each `<option>` tag
-    # is customisable through the `:label_method` and `:value_method` options. When not provided,
+    # is customisable through the `:member_label` and `:member_value` options. When not provided,
     # we fall back to a list of methods to try on each object such as `:to_label`, `:name` and
     # `:to_s`, which are defined in the configurations `collection_label_methods` and
     # `collection_value_methods` (see examples below).
@@ -106,14 +106,14 @@ module Inputs
     #   <%= f.input :author, :as => :select, :collection => grouped_options_for_select(...) %>
     #   <%= f.input :author, :as => :select, :collection => time_zone_options_for_select(...) %>
     #
-    # @example The `:label_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the label text (it'll try the methods like `to_s` in `collection_label_methods` config by default)
-    #   <%= f.input :author, :as => :select, :label_method => :name %>
-    #   <%= f.input :author, :as => :select, :label_method => :name_with_post_count
-    #   <%= f.input :author, :as => :select, :label_method => Proc.new { |a| "#{c.name} (#{pluralize("post", a.posts.count)})" }
+    # @example The `:member_label` can be used to call a different method (or a Proc) on each object in the collection for rendering the label text (it'll try the methods like `to_s` in `collection_label_methods` config by default)
+    #   <%= f.input :author, :as => :select, :member_label => :name %>
+    #   <%= f.input :author, :as => :select, :member_label => :name_with_post_count
+    #   <%= f.input :author, :as => :select, :member_label => Proc.new { |a| "#{c.name} (#{pluralize("post", a.posts.count)})" }
     #
-    # @example The `:value_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the value for each checkbox (it'll try the methods like `id` in `collection_value_methods` config by default)
-    #   <%= f.input :author, :as => :select, :value_method => :login %>
-    #   <%= f.input :author, :as => :select, :value_method => Proc.new { |c| c.full_name.downcase.underscore }
+    # @example The `:member_value` can be used to call a different method (or a Proc) on each object in the collection for rendering the value for each checkbox (it'll try the methods like `id` in `collection_value_methods` config by default)
+    #   <%= f.input :author, :as => :select, :member_value => :login %>
+    #   <%= f.input :author, :as => :select, :member_value => Proc.new { |c| c.full_name.downcase.underscore }
     #
     # @example Set HTML attributes on the `<select>` tag with `:input_html`
     #   <%= f.input :authors, :as => :select, :input_html => { :size => 20, :multiple => true, :class => "special" } %>
@@ -126,7 +126,7 @@ module Inputs
     #   <%= f.input :author, :as => :select, :input_html => { :include_blank => true } %>
     #   <%= f.input :author, :as => :select, :input_html => { :prompt => "Please select an Author..." } %>
     #
-    # @example Group options an `<optgroup>` with the `:group_by` and `:group_label_method` options (`belongs_to` associations only)
+    # @example Group options an `<optgroup>` with the `:group_by` and `:group_label` options (`belongs_to` associations only)
     #   <%= f.input :author, :as => :select, :group_by => :continent %>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 5e4b1a42f..3e74f8029 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -332,7 +332,7 @@
   end
 
   describe 'for an association when a :collection is provided' do
-    describe 'it should use the specified :value_method option' do
+    describe 'it should use the specified :member_value option' do
       before do
         @output_buffer = ''
         mock_everything
@@ -345,7 +345,7 @@
         item.should_receive(:custom_value).exactly(3).times
         @new_post.author.should_receive(:custom_value).exactly(3).times
         concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:author, :as => :check_boxes, :value_method => :custom_value, :collection => [item, item, item]))
+          concat(builder.input(:author, :as => :check_boxes, :member_value => :custom_value, :collection => [item, item, item]))
         end)
         output_buffer.should have_tag('input[@type=checkbox][@value="custom_value"]', :count => 3)
       end
diff --git a/spec/inputs/label_spec.rb b/spec/inputs/label_spec.rb
index faa5bef3e..714ea08d8 100644
--- a/spec/inputs/label_spec.rb
+++ b/spec/inputs/label_spec.rb
@@ -36,14 +36,14 @@
   describe 'when a collection is given' do
     it 'should use a supplied label_method for simple collections' do
       concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
-        concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :value_method => :to_s, :label_method => proc {|f| ('Label_%s' % [f])}))
+        concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :member_value => :to_s, :member_label => proc {|f| ('Label_%s' % [f])}))
       end)
       output_buffer.should have_tag('form li fieldset ol li label', /Label_[abc]/, :count => 3)
     end
 
     it 'should use a supplied value_method for simple collections' do
       concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
-        concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :value_method => proc {|f| ('Value_%s' % [f.to_s])}))
+        concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :member_value => proc {|f| ('Value_%s' % [f.to_s])}))
       end)
       output_buffer.should have_tag('form li fieldset ol li label input[value="Value_a"]')
       output_buffer.should have_tag('form li fieldset ol li label input[value="Value_b"]')
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 45c6d3af4..90d5aaead 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -243,9 +243,9 @@
 
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select, :group_by => :continent ) )
-        concat(builder.input(:author, :as => :select, :group_by => :continent, :group_label_method => :id ) )
-        concat(builder.input(:author, :as => :select, :group_by => :continent, :label_method => :login ) )
-        concat(builder.input(:author, :as => :select, :group_by => :continent, :label_method => :login, :group_label_method => :id ) )
+        concat(builder.input(:author, :as => :select, :group_by => :continent, :group_label => :id ) )
+        concat(builder.input(:author, :as => :select, :group_by => :continent, :member_label => :login ) )
+        concat(builder.input(:author, :as => :select, :group_by => :continent, :member_label => :login, :group_label => :id ) )
       end)
     end
 
diff --git a/spec/support/custom_macros.rb b/spec/support/custom_macros.rb
index ec223b6ac..5f914352b 100644
--- a/spec/support/custom_macros.rb
+++ b/spec/support/custom_macros.rb
@@ -378,12 +378,12 @@ def it_should_use_the_collection_when_provided(as, countable)
 
         end
 
-        describe 'when the :label_method option is provided' do
+        describe 'when the :member_label option is provided' do
 
           describe 'as a symbol' do
             before do
               concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:author, :as => as, :label_method => :login))
+                concat(builder.input(:author, :as => as, :member_label => :login))
               end)
             end
 
@@ -397,7 +397,7 @@ def it_should_use_the_collection_when_provided(as, countable)
           describe 'as a proc' do
             before do
               concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:author, :as => as, :label_method => Proc.new {|a| a.login.reverse }))
+                concat(builder.input(:author, :as => as, :member_label => Proc.new {|a| a.login.reverse }))
               end)
             end
 
@@ -414,7 +414,7 @@ def reverse_login(a)
                 a.login.reverse
               end
               concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:author, :as => as, :label_method => method(:reverse_login)))
+                concat(builder.input(:author, :as => as, :member_label => method(:reverse_login)))
               end)
             end
 
@@ -426,7 +426,7 @@ def reverse_login(a)
           end
         end
 
-        describe 'when the :label_method option is not provided' do
+        describe 'when the :member_label option is not provided' do
           Formtastic::FormBuilder.collection_label_methods.each do |label_method|
 
             describe "when the collection objects respond to #{label_method}" do
@@ -449,12 +449,12 @@ def reverse_login(a)
           end
         end
 
-        describe 'when the :value_method option is provided' do
+        describe 'when the :member_value option is provided' do
 
           describe 'as a symbol' do
             before do
               concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:author, :as => as, :value_method => :login))
+                concat(builder.input(:author, :as => as, :member_value => :login))
               end)
             end
 
@@ -468,7 +468,7 @@ def reverse_login(a)
           describe 'as a proc' do
             before do
               concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:author, :as => as, :value_method => Proc.new {|a| a.login.reverse }))
+                concat(builder.input(:author, :as => as, :member_value => Proc.new {|a| a.login.reverse }))
               end)
             end
 
@@ -485,7 +485,7 @@ def reverse_login(a)
                 a.login.reverse
               end
               concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:author, :as => as, :value_method => method(:reverse_login)))
+                concat(builder.input(:author, :as => as, :member_value => method(:reverse_login)))
               end)
             end
 
@@ -497,6 +497,140 @@ def reverse_login(a)
           end
         end
 
+        describe 'when the deprecated :label_method option is provided' do
+          
+          describe 'as a symbol' do
+            before do
+              with_deprecation_silenced do
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:author, :as => as, :label_method => :login))
+                end)
+              end
+            end
+
+            it 'should have options with text content from the specified method' do
+              ::Author.all.each do |author|
+                output_buffer.should have_tag("form li.#{as}", /#{author.login}/)
+              end
+            end
+          end
+
+          describe 'as a proc' do
+            
+            before do
+              with_deprecation_silenced do
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:author, :as => as, :label_method => Proc.new {|a| a.login.reverse }))
+                end)
+              end
+            end
+
+            it 'should have options with the proc applied to each' do
+              ::Author.all.each do |author|
+                output_buffer.should have_tag("form li.#{as}", /#{author.login.reverse}/)
+              end
+            end
+          end
+
+          describe 'as a method object' do
+            before do
+              def reverse_login(a)
+                a.login.reverse
+              end
+              with_deprecation_silenced do 
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:author, :as => as, :label_method => method(:reverse_login)))
+                end)
+              end
+            end
+
+            it 'should have options with the proc applied to each' do
+              ::Author.all.each do |author|
+                output_buffer.should have_tag("form li.#{as}", /#{author.login.reverse}/)
+              end
+            end
+          end
+        end
+
+        describe 'when the deprecated :label_method option is not provided' do
+          Formtastic::FormBuilder.collection_label_methods.each do |label_method|
+
+            describe "when the collection objects respond to #{label_method}" do
+              before do
+                @fred.stub!(:respond_to?).and_return { |m| m.to_s == label_method || m.to_s == 'id' }
+                ::Author.all.each { |a| a.stub!(label_method).and_return('The Label Text') }
+
+                with_deprecation_silenced do 
+                  concat(semantic_form_for(@new_post) do |builder|
+                    concat(builder.input(:author, :as => as))
+                  end)
+                end
+              end
+
+              it "should render the options with #{label_method} as the label" do
+                ::Author.all.each do |author|
+                  output_buffer.should have_tag("form li.#{as}", /The Label Text/)
+                end
+              end
+            end
+
+          end
+        end
+
+        describe 'when the deprecated :value_method option is provided' do
+
+          describe 'as a symbol' do
+            before do
+              with_deprecation_silenced do 
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:author, :as => as, :value_method => :login))
+                end)
+              end
+            end
+
+            it 'should have options with values from specified method' do
+              ::Author.all.each do |author|
+                output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login}']")
+              end
+            end
+          end
+
+          describe 'as a proc' do
+            before do
+              with_deprecation_silenced do 
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:author, :as => as, :value_method => Proc.new {|a| a.login.reverse }))
+                end)
+              end
+            end
+
+            it 'should have options with the proc applied to each value' do
+              ::Author.all.each do |author|
+                output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login.reverse}']")
+              end
+            end
+          end
+
+          describe 'as a method object' do
+            before do
+              def reverse_login(a)
+                a.login.reverse
+              end
+              with_deprecation_silenced do 
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:author, :as => as, :value_method => method(:reverse_login)))
+                end)
+              end
+            end
+
+            it 'should have options with the proc applied to each value' do
+              ::Author.all.each do |author|
+                output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login.reverse}']")
+              end
+            end
+          end
+        end
+
       end
     end
 

From 62cadeec3585ea3e4e4680b298b34af14605ffb7 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 5 May 2011 08:04:15 +1000
Subject: [PATCH 717/992] CHANGELOG

---
 CHANGELOG | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 89c34aa70..0be7be98a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -21,6 +21,13 @@
 * Changed short hand forms to raise an error when trying to render an input for a polymorphic association (it didn't work, need a collection)
 * Changed input() to raise an error when a :collection is not provided for a polymorphic association (we can't guess which class to use)
 * Removed semantic_remote_form_for etc, the remote_form_for helpers don't exist in Rails 3
+* Changed :label_method option to :member_label (with backwards compat and deprecation warnings)
+* Changed :value_method option to :member_value (with backwards compat and deprecation warnings)
+* Changed :grouped_label_method option to :grouped_label (with backwards compat and deprecation warnings)
+* Added support for a Method objects to :member_label/:member_value (aka :label_method/:value_method)
+* Improved support for Mongoid 
+* Changed Rails dependency from ~> 3.0.0 to ~> 3.0 to allow experimentation with Rails 3.1 betas
+
 
 1.2.4.beta (unreleased)
 

From 11f725d13aa7db9f09d467cc48090ab96becf916 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 5 May 2011 08:32:30 +1000
Subject: [PATCH 718/992] documented :disable_with, fixes #466

---
 README.textile                           |  2 +-
 lib/formtastic/helpers/buttons_helper.rb | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.textile b/README.textile
index bff02b426..8ca25633c 100644
--- a/README.textile
+++ b/README.textile
@@ -248,7 +248,7 @@ The same can be done for buttons with the @:button_html@ option:
   <% semantic_form_for @post do |form| %>
     ...
     <% form.buttons do %>
-      <%= form.commit_button :button_html => { :class => "primary" } %>
+      <%= form.commit_button :button_html => { :class => "primary", :disable_with => 'Wait...' } %>
     <% end %>
   <% end %>
 </pre>
diff --git a/lib/formtastic/helpers/buttons_helper.rb b/lib/formtastic/helpers/buttons_helper.rb
index abae1ac54..b9e11cd23 100644
--- a/lib/formtastic/helpers/buttons_helper.rb
+++ b/lib/formtastic/helpers/buttons_helper.rb
@@ -127,7 +127,7 @@ module ButtonsHelper
       #     <% semantic_form_for @post do |f| %>
       #       ...
       #       <%= f.buttons do %>
-      #         <%= f.commit_button :label => "Go", :input_html => { ... }, :wrapper_html => { ... }
+      #         <%= f.commit_button :label => "Go", :button_html => { :class => "pretty" :disable_with => "Wait..." }, :wrapper_html => { ... }
       #       <% end %>
       #     <% end %>
       #
@@ -214,14 +214,14 @@ def buttons(*args, &block)
       #   <%= f.commit_button "Go" %>
       #
       # @example Pass HTML attributes down to the `<input>`
-      #   <%= f.commit_button :button_html => { :class => 'pretty', :accesskey => 'g' } %>
-      #   <%= f.commit_button :label => "Go", :button_html => { :class => 'pretty', :accesskey => 'g' } %>
-      #   <%= f.commit_button "Go", :button_html => { :class => 'pretty', :accesskey => 'g' } %>
+      #   <%= f.commit_button :button_html => { :class => 'pretty', :accesskey => 'g', :disable_with => "Wait..." } %>
+      #   <%= f.commit_button :label => "Go", :button_html => { :class => 'pretty', :accesskey => 'g', :disable_with => "Wait..." } %>
+      #   <%= f.commit_button "Go", :button_html => { :class => 'pretty', :accesskey => 'g', :disable_with => "Wait..." } %>
       #
       # @example Pass HTML attributes down to the `<li>` wrapper
-      #   <%= f.commit_button :button_html => { :class => 'special', :id => 'whatever' } %>
-      #   <%= f.commit_button :label => "Go", :button_html => { :class => 'special', :id => 'whatever' } %>
-      #   <%= f.commit_button "Go", :button_html => { :class => 'special', :id => 'whatever' } %>
+      #   <%= f.commit_button :wrapper_html => { :class => 'special', :id => 'whatever' } %>
+      #   <%= f.commit_button :label => "Go", :wrapper_html => { :class => 'special', :id => 'whatever' } %>
+      #   <%= f.commit_button "Go", :wrapper_html => { :class => 'special', :id => 'whatever' } %>
       #
       # @option *args :label [String, Symbol]
       #   Override the label text with a String or a symbold for an i18n translation key

From 801b3478de72f837c10239e2ee285c43ab31fde7 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 5 May 2011 17:28:15 +1000
Subject: [PATCH 719/992] Many possible fixes for the %i interpolation in
 fieldset legends (references #515).

---
 lib/formtastic/helpers/fieldset_wrapper.rb | 21 +++++++++++++++++----
 spec/helpers/inputs_helper_spec.rb         |  5 ++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/lib/formtastic/helpers/fieldset_wrapper.rb b/lib/formtastic/helpers/fieldset_wrapper.rb
index 4c7805e0b..1d5cf35b1 100644
--- a/lib/formtastic/helpers/fieldset_wrapper.rb
+++ b/lib/formtastic/helpers/fieldset_wrapper.rb
@@ -25,7 +25,7 @@ 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.dup.delete(:name).to_s
+        legend  = (html_options[:name] || '').to_s
         legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
         legend  = template.content_tag(:legend, template.content_tag(:span, Formtastic::Util.html_safe(legend))) unless legend.blank?
 
@@ -41,7 +41,7 @@ def field_set_and_list_wrapping(*args, &block) #:nodoc:
         contents = contents.join if contents.respond_to?(:join)
         fieldset = template.content_tag(:fieldset,
           Formtastic::Util.html_safe(legend) << template.content_tag(:ol, Formtastic::Util.html_safe(contents)),
-          html_options.except(:builder, :parent)
+          html_options.except(:builder, :parent, :name)
         )
 
         fieldset
@@ -50,11 +50,24 @@ def field_set_and_list_wrapping(*args, &block) #:nodoc:
       # Gets the nested_child_index value from the parent builder. It returns a hash with each
       # association that the parent builds.
       def parent_child_index(parent) #:nodoc:
+        # Could be {"post[authors_attributes]"=>0} or { :authors => 0 }
         duck = parent[:builder].instance_variable_get('@nested_child_index')
-
+        
+        # Could be symbol for the association, or a model (or an array of either, I think? TODO)
         child = parent[:for]
+        # Pull a sybol or model out of Array (TODO: check if there's an Array)
         child = child.first if child.respond_to?(:first)
-        duck[child].to_i + 1
+        # If it's an object, get a symbol from the class name
+        child = child.class.name.underscore.to_sym unless child.is_a?(Symbol)
+        
+        key = "#{parent[:builder].object_name}[#{child}_attributes]"
+
+        # TODO: One of the tests produces a scenario where duck is "0" and the test looks for a "1" 
+        # in the legend, so if we have a number, return it with a +1 until we can verify this scenario.
+        return duck + 1 if duck.is_a?(Fixnum)
+        
+        # First try to extract key from duck Hash, then try child
+        i = (duck[key] || duck[child]).to_i + 1
       end
 
     end
diff --git a/spec/helpers/inputs_helper_spec.rb b/spec/helpers/inputs_helper_spec.rb
index 61d5acf19..e69002647 100644
--- a/spec/helpers/inputs_helper_spec.rb
+++ b/spec/helpers/inputs_helper_spec.rb
@@ -113,11 +113,14 @@
               concat(author.input(:login))
             end
           end)
-
+          
           output_buffer.should have_tag("form fieldset.inputs", :count => 2)
           output_buffer.should have_tag("form fieldset.inputs legend", :count => 2)
+          output_buffer.should have_tag("form fieldset.inputs legend", "1", :count => 1)
+          output_buffer.should have_tag("form fieldset.inputs legend", "2")
           output_buffer.should have_tag("form input[@name='post[authors_attributes][0][login]']")
           output_buffer.should have_tag("form input[@name='post[authors_attributes][1][login]']")
+          output_buffer.should_not have_tag('form fieldset[@name]')
         end
       end
 

From 4a683e21652ca89556ad17760e660a5de302339e Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 6 May 2011 15:15:46 +0900
Subject: [PATCH 720/992] Bundle test suite in gem (issue#535).

---
 formtastic.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 48f7c4035..be73a3e3b 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.summary = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.email = %q{justin@indent.com.au}
   s.extra_rdoc_files = ["README.textile"]
-  s.files = Dir.glob("lib/**/*") + %w(MIT-LICENSE README.textile)
+  s.files = Dir.glob("{lib,spec}/**/*") + %w(MIT-LICENSE README.textile)
   s.homepage = %q{http://github.com/justinfrench/formtastic/tree/master}
   s.post_install_message = %q{
   ========================================================================

From b230629045409784c52ab46518c4334b35b05284 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 7 May 2011 14:49:31 +1000
Subject: [PATCH 721/992] Work-around for Firefox 4 giving focus to the <li>
 wrapper (fixes #524).

http://www.quirksmode.org/css/clearing.html states that auto and hidden work, quick test in major browsers confirms
---
 lib/generators/templates/formtastic.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index d10237b83..d5272551b 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -30,7 +30,7 @@ form.formtastic ul.errors li { padding:0; border:none; display:list-item; }
 
 /* FIELDSETS & LISTS
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset { overflow:auto; } /* clearing contained floats */
+form.formtastic fieldset { overflow:hidden; } /* clearing contained floats */
 form.formtastic fieldset.inputs { }
 form.formtastic fieldset.buttons { padding-left:25%; }
 form.formtastic fieldset ol { }
@@ -39,7 +39,7 @@ form.formtastic fieldset.buttons li { float:left; padding-right:0.5em; }
 /* INPUT LIs
 --------------------------------------------------------------------------------------------------*/
 form.formtastic fieldset > ol > li { padding:0.5em 0; margin-top:-0.5em; margin-bottom:1em; } /* padding and negative margin juggling is for Firefox */
-form.formtastic fieldset > ol > li { overflow:auto; } /* clearing contained floats */
+form.formtastic fieldset > ol > li { overflow:hidden; } /* clearing contained floats */
 
 form.formtastic fieldset > ol > li.required { }
 form.formtastic fieldset > ol > li.optional { }

From 1ae9b5633af253c3d73a083a34d31d0da48c695a Mon Sep 17 00:00:00 2001
From: Matt Huggins <matt.huggins@gmail.com>
Date: Mon, 9 May 2011 01:07:40 -0500
Subject: [PATCH 722/992] Allow has_many and has_many_through relationships to
 be validated if included in a form

---
 lib/formtastic/inputs/base/associations.rb | 4 ++++
 lib/formtastic/inputs/base/errors.rb       | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/base/associations.rb b/lib/formtastic/inputs/base/associations.rb
index 514642ab9..61154289a 100644
--- a/lib/formtastic/inputs/base/associations.rb
+++ b/lib/formtastic/inputs/base/associations.rb
@@ -17,6 +17,10 @@ def belongs_to?
           association == :belongs_to
         end
 
+        def has_many?
+          association == :has_many
+        end
+
         def association_primary_key
           association_primary_key_for_method(method)
         end
diff --git a/lib/formtastic/inputs/base/errors.rb b/lib/formtastic/inputs/base/errors.rb
index 65a5e4eb7..9844651d9 100644
--- a/lib/formtastic/inputs/base/errors.rb
+++ b/lib/formtastic/inputs/base/errors.rb
@@ -47,7 +47,7 @@ def errors
         def error_keys
           keys = [method.to_sym]
           keys << builder.file_metadata_suffixes.map{|suffix| "#{method}_#{suffix}".to_sym} if file?
-          keys << association_primary_key if belongs_to?
+          keys << association_primary_key if belongs_to? || has_many?
           keys.flatten.compact.uniq
         end
         

From c88541ed5b6ae28e846eeda7093c2ffeef84309f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 9 Apr 2011 13:01:19 +1000
Subject: [PATCH 723/992] IntegerInput and RangeInput improvements (fixes #530)

* validation_max should raise with a (greater|less)_than validation on a float or decimal column
* refactor NumberInput to look like RangeInput under the hood
* Number input accepts min/max/step options from options hash OR from input HTML hash, just like Range
* updated documentation for NumberInput
* added documentation for RangeInput based off NumberInput
---
 lib/formtastic/inputs/base/validations.rb |  35 +-
 lib/formtastic/inputs/number_input.rb     |  68 +++-
 lib/formtastic/inputs/range_input.rb      | 112 +++++-
 spec/inputs/number_input_spec.rb          | 383 +++++++++++++++---
 spec/inputs/range_input_spec.rb           | 459 +++++++++++++++++++---
 5 files changed, 919 insertions(+), 138 deletions(-)

diff --git a/lib/formtastic/inputs/base/validations.rb b/lib/formtastic/inputs/base/validations.rb
index c2c2b4577..8b7bd5cf4 100644
--- a/lib/formtastic/inputs/base/validations.rb
+++ b/lib/formtastic/inputs/base/validations.rb
@@ -3,6 +3,24 @@ module Inputs
     module Base
       module Validations
         
+        class IndeterminableMinimumAttributeError < ArgumentError
+          def message
+            [
+              "A minimum value can not be determined when the validation uses :greater_than on a :decimal or :float column type.",
+              "Please alter the validation to use :greater_than_or_equal_to, or provide a value for this attribute explicitly with the :min option on input()."
+            ].join("\n")
+          end
+        end
+
+        class IndeterminableMaximumAttributeError < ArgumentError
+          def message
+            [
+              "A maximum value can not be determined when the validation uses :less_than on a :decimal or :float column type.",
+              "Please alter the validation to use :less_than_or_equal_to, or provide a value for this attribute explicitly with the :max option on input()."
+            ].join("\n")
+          end
+        end
+        
         def validations
           @validations ||= if object && object.class.respond_to?(:validators_on) 
             object.class.validators_on(attributized_method_name).select do |validator|
@@ -47,11 +65,13 @@ def validation_min
           validation = validations? && validations.find do |validation|
             validation.kind == :numericality
           end
-          if validation
+          
+          if validation 
+            # We can't determine an appropriate value for :greater_than with a float/decimal column
+            raise IndeterminableMinimumAttributeError if validation.options[:greater_than] && column? && [:float, :decimal].include?(column.type)
+            
             return validation.options[:greater_than_or_equal_to] if validation.options[:greater_than_or_equal_to]
-            return (validation.options[:greater_than] + 1) if validation.options[:greater_than]
-          else
-            nil
+            return (validation.options[:greater_than] + 1)       if validation.options[:greater_than]
           end
         end
 
@@ -61,10 +81,11 @@ def validation_max
             validation.kind == :numericality
           end
           if validation
+            # We can't determine an appropriate value for :greater_than with a float/decimal column
+            raise IndeterminableMaximumAttributeError if validation.options[:less_than] && column? && [:float, :decimal].include?(column.type)
+            
             return validation.options[:less_than_or_equal_to] if validation.options[:less_than_or_equal_to]
-            return (validation.options[:less_than] - 1) if validation.options[:less_than]
-          else
-            nil
+            return (validation.options[:less_than] - 1)       if validation.options[:less_than]
           end
         end
         
diff --git a/lib/formtastic/inputs/number_input.rb b/lib/formtastic/inputs/number_input.rb
index 6032614a4..b382a3156 100644
--- a/lib/formtastic/inputs/number_input.rb
+++ b/lib/formtastic/inputs/number_input.rb
@@ -6,6 +6,20 @@ module Inputs
     # and `:decimal`, as well as `:integer` columns that aren't used for `belongs_to` associations,
     # but can be applied to any text-like input with `:as => :number`.
     #
+    # Sensible default values for the `min`, `max` and `step` attributes are found by reflecting on 
+    # the model's validations (when provided). An `IndeterminableMinimumAttributeError` exception 
+    # will be raised when the following conditions are all true:
+    #
+    # * you haven't specified a `:min` or `:max` for the input
+    # * the model's database column type is a `:float` or `:decimal`
+    # * the validation uses `:less_than` or `:greater_than`
+    #
+    # The solution is to either:
+    # 
+    # * manually specify the `:min` or `:max` for the input
+    # * change the database column type to an `:integer` (if appropriate)
+    # * change the validations to use `:less_than_or_equal_to` or `:greater_than_or_equal_to`
+    #
     # @example Full form context and output
     #
     #   <%= semantic_form_for(@user) do |f| %>
@@ -29,8 +43,8 @@ module Inputs
     #
     #   class Person < ActiveRecord::Base
     #     validates_numericality_of :age, 
-    #       :less_than => 100, 
-    #       :greater_than => 17, 
+    #       :less_than_or_equal_to => 100, 
+    #       :greater_than_or_equal_to => 18, 
     #       :only_integer => true
     #   end
     #
@@ -38,16 +52,21 @@ module Inputs
     #
     #   <li class="numeric">
     #     <label for="persom_age">Age</label>
-    #     <input type="number" id="person_age" name="person[age]" min="18" max="99" step="1">
+    #     <input type="number" id="person_age" name="person[age]" min="18" max="100" step="1">
     #   </li>
     #
-    # @example Pass attributes down to the `<input>` tag
+    # @example Pass attributes down to the `<input>` tag with :input_html
     #  <%= f.input :shoe_size, :as => :number, :input_html => { :min => 3, :max => 15, :step => 1, :class => "special" } %>
     #
+    # @example Min/max/step also work as options
+    #  <%= f.input :shoe_size, :as => :number, :min => 3, :max => 15, :step => 1, :input_html => { :class => "special" } %>
+    #
+    # @example Use :in with a Range as a shortcut for :min/:max
+    #  <%= f.input :shoe_size, :as => :number, :in => 3..15, :step => 1 %>
+    #  <%= f.input :shoe_size, :as => :number, :input_html => { :in => 3..15, :step => 1 } %>
+    #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     # @see http://api.rubyonrails.org/classes/ActiveModel/Validations/HelperMethods.html#method-i-validates_numericality_of Rails' Numericality validation documentation
-    #
-    # @todo Rename/Alias to NumberInput
     class NumberInput 
       include Base
       include Base::Stringish
@@ -60,11 +79,38 @@ def to_html
       end
       
       def input_html_options
-        {
-          :min => validation_min || 0, # always need a min value
-          :max => validation_max,
-          :step => validation_step || 1 
-        }.merge(super)
+        defaults = super
+        
+        if in_option
+          defaults[:min] = in_option.to_a.min
+          defaults[:max] = in_option.to_a.max
+        else
+          defaults[:min]  ||= min_option
+          defaults[:max]  ||= max_option
+        end
+        defaults[:step] ||= step_option
+        defaults
+      end
+      
+      def step_option
+        return options[:step] if options.key?(:step)
+        return validation_step if validation_step
+        return 1 if validation_integer_only?
+        1
+      end
+      
+      def min_option
+        return options[:min] if options.key?(:min)
+        validation_min
+      end
+      
+      def max_option
+        return options[:max] if options.key?(:max)
+        validation_max
+      end
+      
+      def in_option
+        options[:in]
       end
       
     end
diff --git a/lib/formtastic/inputs/range_input.rb b/lib/formtastic/inputs/range_input.rb
index c70254a31..575dcab4c 100644
--- a/lib/formtastic/inputs/range_input.rb
+++ b/lib/formtastic/inputs/range_input.rb
@@ -1,5 +1,71 @@
 module Formtastic
   module Inputs
+    
+    # Outputs a simple `<label>` with a HTML5 `<input type="range">` wrapped in the standard
+    # `<li>` wrapper. This is an alternative input choice to a number input.
+    #
+    # Sensible default for the `min`, `max` and `step` attributes are found by reflecting on 
+    # the model's validations. When validations are not provided, the `min` and `step` default to
+    # `1` and the `max` default to `100`. An `IndeterminableMinimumAttributeError` exception 
+    # will be raised when the following conditions are all true:
+    #
+    # * you haven't specified a `:min` or `:max` for the input
+    # * the model's database column type is a `:float` or `:decimal`
+    # * the validation uses `:less_than` or `:greater_than`
+    #
+    # The solution is to either:
+    # 
+    # * manually specify the `:min` or `:max` for the input
+    # * change the database column type to an `:integer` (if appropriate)
+    # * change the validations to use `:less_than_or_equal_to` or `:greater_than_or_equal_to`
+    #
+    # @example Full form context and output
+    #
+    #   <%= semantic_form_for(@user) do |f| %>
+    #     <%= f.inputs do %>
+    #       <%= f.input :shoe_size, :as => :range %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   <form...>
+    #     <fieldset>
+    #       <ol>
+    #         <li class="numeric">
+    #           <label for="user_shoe_size">Shoe size</label>
+    #           <input type="range" id="user_shoe_size" name="user[shoe_size]" min="1" max="100" step="1">
+    #         </li>
+    #       </ol>
+    #     </fieldset>
+    #   </form>
+    #
+    # @example Default HTML5 min/max/step attributes are detected from the numericality validations
+    #
+    #   class Person < ActiveRecord::Base
+    #     validates_numericality_of :age, 
+    #       :less_than_or_equal_to => 100, 
+    #       :greater_than_or_equal_to => 18, 
+    #       :only_integer => true
+    #   end
+    #
+    #   <%= f.input :age, :as => :number %>
+    #
+    #   <li class="numeric">
+    #     <label for="persom_age">Age</label>
+    #     <input type="range" id="person_age" name="person[age]" min="18" max="100" step="1">
+    #   </li>
+    #
+    # @example Pass attributes down to the `<input>` tag with :input_html
+    #  <%= f.input :shoe_size, :as => :range, :input_html => { :min => 3, :max => 15, :step => 1, :class => "special" } %>
+    #
+    # @example Min/max/step also work as options
+    #  <%= f.input :shoe_size, :as => :range, :min => 3, :max => 15, :step => 1, :input_html => { :class => "special" } %>
+    #
+    # @example Use :in with a Range as a shortcut for :min/:max
+    #  <%= f.input :shoe_size, :as => :range, :in => 3..15, :step => 1 %>
+    #  <%= f.input :shoe_size, :as => :range, :input_html => { :in => 3..15, :step => 1 } %>
+    #
+    # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
+    # @see http://api.rubyonrails.org/classes/ActiveModel/Validations/HelperMethods.html#method-i-validates_numericality_of Rails' Numericality validation documentation
     class RangeInput
       include Base
       include Base::Stringish
@@ -11,29 +77,41 @@ def to_html
         end
       end
       
-      # options[:input_html][:max] trumps :input_html[:max] trumps validations trumps default
       def input_html_options
-        input_html_options_from_validations.merge(input_html_options_from_options).merge(super)
+        defaults = super
+        
+        if in_option
+          defaults[:min] = in_option.to_a.min
+          defaults[:max] = in_option.to_a.max
+        else
+          defaults[:min]  ||= min_option
+          defaults[:max]  ||= max_option
+        end
+        defaults[:step] ||= step_option
+        defaults
+      end
+      
+      def step_option
+        return options[:step] if options.key?(:step)
+        return validation_step if validation_step
+        return 1 if validation_integer_only?
+        1
       end
       
-      def input_html_options_from_options
-        hash = {}
-        hash[:in] = options[:in] if options.key?(:in)
-        hash[:min] = options[:min] if options.key?(:min)
-        hash[:max] = options[:max] if options.key?(:max)
-        hash[:step] = options[:step] if options.key?(:step)
-        hash
+      def min_option
+        return options[:min] if options.key?(:min)
+        validation_min || 1
       end
       
-      def input_html_options_from_validations
-        {
-          :step => validation_step || 1,
-          :min => validation_min || 1,
-          :max => validation_max || 100
-        }
+      def max_option
+        return options[:max] if options.key?(:max)
+        validation_max || 100
+      end
+      
+      def in_option
+        options[:in]
       end
       
     end
   end
-end
-
+end
\ No newline at end of file
diff --git a/spec/inputs/number_input_spec.rb b/spec/inputs/number_input_spec.rb
index cac391148..d4b591b2a 100644
--- a/spec/inputs/number_input_spec.rb
+++ b/spec/inputs/number_input_spec.rb
@@ -8,32 +8,44 @@
   before do
     @output_buffer = ''
     mock_everything
-
-    concat(semantic_form_for(@new_post) do |builder|
-      concat(builder.input(:title, :as => :number))
-    end)
+    
+    @new_post.class.stub!(:validators_on).with(:title).and_return([
+      active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :greater_than=>2})
+    ])
   end
+  
+  describe "all cases" do
+    
+    before do
+      concat(
+      semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:title, :as => :number))
+      end
+      )
+    end
 
-  it_should_have_input_wrapper_with_class(:number)
-  it_should_have_input_wrapper_with_id("post_title_input")
-  it_should_have_label_with_text(/Title/)
-  it_should_have_label_for("post_title")
-  it_should_have_input_with_id("post_title")
-  it_should_have_input_with_type(:number)
-  it_should_have_input_with_name("post[title]")
-  it_should_use_default_text_field_size_when_not_nil(:string)
-  it_should_not_use_default_text_field_size_when_nil(:string)
-  it_should_apply_custom_input_attributes_when_input_html_provided(:string)
-  it_should_apply_custom_for_to_label_when_input_html_id_provided(:string)
-  it_should_apply_error_logic_for_input_type(:number)
+    it_should_have_input_wrapper_with_class(:number)
+    it_should_have_input_wrapper_with_id("post_title_input")
+    it_should_have_label_with_text(/Title/)
+    it_should_have_label_for("post_title")
+    it_should_have_input_with_id("post_title")
+    it_should_have_input_with_type(:number)
+    it_should_have_input_with_name("post[title]")
+    it_should_use_default_text_field_size_when_not_nil(:string)
+    it_should_not_use_default_text_field_size_when_nil(:string)
+    it_should_apply_custom_input_attributes_when_input_html_provided(:string)
+    it_should_apply_custom_for_to_label_when_input_html_id_provided(:string)
+    it_should_apply_error_logic_for_input_type(:number)
+    
+  end
 
   describe "when no object is provided" do
     before do
       concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
-        concat(builder.input(:title, :as => :number))
+        concat(builder.input(:title, :as => :number, :input_html => { :min => 1, :max => 2 }))
       end)
     end
-
+    
     it_should_have_label_with_text(/Title/)
     it_should_have_label_for("project_title")
     it_should_have_input_with_id("project_title")
@@ -47,7 +59,7 @@
         concat(builder.input(:title, :as => :number))
       end)
     end
-
+  
     it_should_have_input_wrapper_with_id("context2_post_title_input")
     it_should_have_label_and_input_with_id("context2_post_title")
   end
@@ -68,19 +80,75 @@
       ])
     end
     
-    it "should add a max attribute to the input one greater than the validation" do
+    it "should allow :input_html to override :min" do
       concat(semantic_form_for(@new_post) do |builder|
-        builder.input(:title, :as => :number)
+        builder.input(:title, :as => :number, :input_html => { :min => 5 })
       end)
-      output_buffer.should have_tag('input[@min="3"]')
+      output_buffer.should have_tag('input[@min="5"]')
     end
     
-    it "should allow :input_html to override :min" do
+    it "should allow :input_html to override :min through :in" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :number, :input_html => { :in => 5..102 })
+      end)
+      output_buffer.should have_tag('input[@min="5"]')
+    end
+    
+    it "should allow options to override :min" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :number, :min => 5)
+      end)
+      output_buffer.should have_tag('input[@min="5"]')
+    end
+    
+    it "should allow options to override :min through :in" do
       concat(semantic_form_for(@new_post) do |builder|
-        builder.input(:title, :as => :number, :input_html => { :min => 102 })
+        builder.input(:title, :as => :number, :in => 5..102)
       end)
-      output_buffer.should have_tag('input[@min="102"]')
+      output_buffer.should have_tag('input[@min="5"]')
     end
+    
+    describe "and the column is an integer" do
+      before do
+        @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :integer))
+      end
+      
+      it "should add a min attribute to the input one greater than the validation" do
+        concat(semantic_form_for(@new_post) do |builder|
+          builder.input(:title, :as => :number)
+        end)
+        output_buffer.should have_tag('input[@min="3"]')
+      end
+    end
+    
+    describe "and the column is a float" do
+      before do
+        @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :float))
+      end
+      
+      it "should raise an error" do
+        lambda {
+          concat(semantic_form_for(@new_post) do |builder|
+            builder.input(:title, :as => :number)
+          end)
+        }.should raise_error(Formtastic::Inputs::Base::Validations::IndeterminableMinimumAttributeError)
+      end
+    end
+    
+    describe "and the column is a big decimal" do
+      before do
+        @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :decimal))
+      end
+      
+      it "should raise an error" do
+        lambda {
+          concat(semantic_form_for(@new_post) do |builder|
+            builder.input(:title, :as => :number)
+          end)
+        }.should raise_error(Formtastic::Inputs::Base::Validations::IndeterminableMinimumAttributeError)
+      end
+    end
+    
   end
   
   describe "when validations require a minimum value (:greater_than_or_equal_to)" do
@@ -90,36 +158,142 @@
       ])
     end
     
-    it "should add a max attribute to the input equal to the validation" do
+    it "should allow :input_html to override :min" do
       concat(semantic_form_for(@new_post) do |builder|
-        builder.input(:title, :as => :number)
+        builder.input(:title, :as => :number, :input_html => { :min => 5 })
       end)
-      output_buffer.should have_tag('input[@min="2"]')
+      output_buffer.should have_tag('input[@min="5"]')
     end
-  end
-  
-  describe "when validations require a maximum value (:less_than)" do
-    before do
-      @new_post.class.stub!(:validators_on).with(:title).and_return([
-        active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :less_than=>20})
-      ])
+    
+    it "should allow options to override :min" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :number, :min => 5)
+      end)
+      output_buffer.should have_tag('input[@min="5"]')
+    end
+
+    it "should allow :input_html to override :min with :in" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :number, :input_html => { :in => 5..102 })
+      end)
+      output_buffer.should have_tag('input[@min="5"]')
     end
     
-    it "should add a min attribute to the input one less than the validation" do
+    it "should allow options to override :min  with :in" do
       concat(semantic_form_for(@new_post) do |builder|
-        builder.input(:title, :as => :number)
+        builder.input(:title, :as => :number, :in => 5..102)
       end)
-      output_buffer.should have_tag('input[@max="19"]')
+      output_buffer.should have_tag('input[@min="5"]')
     end
     
-    it "should allow :input_html to override :min" do
+
+    [:integer, :decimal, :float].each do |column_type|
+      describe "and the column is a #{column_type}" do
+        before do
+          @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => column_type))
+        end
+
+        it "should add a max attribute to the input equal to the validation" do
+          concat(semantic_form_for(@new_post) do |builder|
+            builder.input(:title, :as => :number)
+          end)
+          output_buffer.should have_tag('input[@min="2"]')
+        end
+      end
+    end
+
+    describe "and there is no column" do
+      before do
+        @new_post.stub!(:column_for_attribute).with(:title).and_return(nil)
+      end
+    
+      it "should add a max attribute to the input equal to the validation" do
+        concat(semantic_form_for(@new_post) do |builder|
+          builder.input(:title, :as => :number)
+        end)
+        output_buffer.should have_tag('input[@min="2"]')
+      end
+    end
+  end
+
+  describe "when validations require a maximum value (:less_than)" do
+   before do
+     @new_post.class.stub!(:validators_on).with(:title).and_return([
+       active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :less_than=>20})
+     ])
+   end
+   
+   it "should allow :input_html to override :max" do
+     concat(semantic_form_for(@new_post) do |builder|
+       builder.input(:title, :as => :number, :input_html => { :max => 102 })
+     end)
+     output_buffer.should have_tag('input[@max="102"]')
+   end
+   
+   it "should allow option to override :max" do
+     concat(semantic_form_for(@new_post) do |builder|
+       builder.input(:title, :as => :number, :max => 102)
+     end)
+     output_buffer.should have_tag('input[@max="102"]')
+   end
+   
+   it "should allow :input_html to override :max with :in" do
       concat(semantic_form_for(@new_post) do |builder|
-        builder.input(:title, :as => :number, :input_html => { :max => 48 })
+        builder.input(:title, :as => :number, :input_html => { :in => 1..102 })
       end)
-      output_buffer.should have_tag('input[@max="48"]')
+      output_buffer.should have_tag('input[@max="102"]')
     end
-  end  
 
+    it "should allow option to override :max with :in" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :number, :in => 1..102)
+      end)
+      output_buffer.should have_tag('input[@max="102"]')
+    end
+   
+   describe "and the column is an integer" do
+     before do
+       @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :integer))
+     end
+     
+     it "should add a max attribute to the input one greater than the validation" do
+       concat(semantic_form_for(@new_post) do |builder|
+         builder.input(:title, :as => :number)
+       end)
+       output_buffer.should have_tag('input[@max="19"]')
+     end
+   end
+   
+   describe "and the column is a float" do
+     before do
+       @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :float))
+     end
+     
+     it "should raise an error" do
+       lambda {
+         concat(semantic_form_for(@new_post) do |builder|
+           builder.input(:title, :as => :number)
+         end)
+       }.should raise_error(Formtastic::Inputs::Base::Validations::IndeterminableMaximumAttributeError)
+     end
+   end
+   
+   describe "and the column is a big decimal" do
+     before do
+       @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :decimal))
+     end
+     
+     it "should raise an error" do
+       lambda {
+         concat(semantic_form_for(@new_post) do |builder|
+           builder.input(:title, :as => :number)
+         end)
+       }.should raise_error(Formtastic::Inputs::Base::Validations::IndeterminableMaximumAttributeError)
+     end
+   end
+   
+  end
+  
   describe "when validations require a maximum value (:less_than_or_equal_to)" do
     before do
       @new_post.class.stub!(:validators_on).with(:title).and_return([
@@ -127,11 +301,60 @@
       ])
     end
     
-    it "should add a min attribute to the input one less than the validation" do
+    it "should allow :input_html to override :max" do
       concat(semantic_form_for(@new_post) do |builder|
-        builder.input(:title, :as => :number)
+        builder.input(:title, :as => :number, :input_html => { :max => 102 })
+      end)
+      output_buffer.should have_tag('input[@max="102"]')
+    end
+    
+    it "should allow options to override :max" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :number, :max => 102)
       end)
-      output_buffer.should have_tag('input[@max="20"]')
+      output_buffer.should have_tag('input[@max="102"]')
+    end
+    
+    it "should allow :input_html to override :max with :in" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :number, :input_html => { :in => 1..102 })
+      end)
+      output_buffer.should have_tag('input[@max="102"]')
+    end
+    
+    it "should allow options to override :max with :in" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :number, :in => 1..102)
+      end)
+      output_buffer.should have_tag('input[@max="102"]')
+    end
+
+    [:integer, :decimal, :float].each do |column_type|
+      describe "and the column is a #{column_type}" do
+        before do
+          @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => column_type))
+        end
+
+        it "should add a max attribute to the input equal to the validation" do
+          concat(semantic_form_for(@new_post) do |builder|
+            builder.input(:title, :as => :number)
+          end)
+          output_buffer.should have_tag('input[@max="20"]')
+        end
+      end
+    end
+
+    describe "and there is no column" do
+      before do
+        @new_post.stub!(:column_for_attribute).with(:title).and_return(nil)
+      end
+    
+      it "should add a max attribute to the input equal to the validation" do
+        concat(semantic_form_for(@new_post) do |builder|
+          builder.input(:title, :as => :number)
+        end)
+        output_buffer.should have_tag('input[@max="20"]')
+      end
     end
   end
   
@@ -186,6 +409,76 @@
       end)
       output_buffer.should have_tag('input[@step="3"]')
     end
+    
+    it "should let options override :step" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :number, :step => 3)
+      end)
+      output_buffer.should have_tag('input[@step="3"]')
+    end
+    
+  end
+  
+  describe "when validations require a :step (non standard)" do
+    
+    before do
+      @new_post.class.stub!(:validators_on).with(:title).and_return([
+        active_model_numericality_validator([:title], {:allow_nil=>false, :only_integer=>true, :step=>2})
+      ])
+    end
+    
+    it "should add a step=1 attribute to the input to signify that only whole numbers are allowed" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :number)
+      end)
+      output_buffer.should have_tag('input[@step="2"]')
+    end
+    
+    it "should let input_html override :step" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :number, :input_html => { :step => 3 })
+      end)
+      output_buffer.should have_tag('input[@step="3"]')
+    end
+    
+    it "should let options override :step" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :number, :step => 3)
+      end)
+      output_buffer.should have_tag('input[@step="3"]')
+    end
+    
+  end
+  
+  describe "when validations do not specify :step (non standard) or :only_integer" do
+    
+    before do
+      @new_post.class.stub!(:validators_on).with(:title).and_return([
+        active_model_numericality_validator([:title], {:allow_nil=>false})
+      ])
+    end
+    
+    it "should default step to 1" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :number)
+      end)
+      output_buffer.should have_tag('input[@step="1"]')
+    end
+    
+    it "should let input_html set :step" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :number, :input_html => { :step => 3 })
+      end)
+      output_buffer.should have_tag('input[@step="3"]')
+    end
+    
+    it "should let options set :step" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :number, :step => 3)
+      end)
+      output_buffer.should have_tag('input[@step="3"]')
+    end
+    
   end
   
 end
diff --git a/spec/inputs/range_input_spec.rb b/spec/inputs/range_input_spec.rb
index ca4577c6b..7756b02de 100644
--- a/spec/inputs/range_input_spec.rb
+++ b/spec/inputs/range_input_spec.rb
@@ -40,93 +40,436 @@
     it_should_have_label_and_input_with_id("context2_author_age")
 
   end
-  
-  describe "core processing" do
-  
-    before { mock_everything }
-  
-    it "uses min and max from greater_than_or_equal_to and less_than_or_equal_to validation options" do
-      @james.class.stub!(:validators_on).with(:age).and_return([
-        active_model_numericality_validator([:age], {:only_integer=>false, :allow_nil=>false, :greater_than_or_equal_to=>1930, :less_than_or_equal_to=>(Time.now.year-5)})
+
+  describe "when validations require a minimum value (:greater_than)" do
+    before do
+      @new_post.class.stub!(:validators_on).with(:title).and_return([
+        active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :greater_than=>2})
       ])
-      
-      concat(semantic_form_for(@james) do |builder|
-        concat(builder.input(:age, :as => :range))
+    end
+    
+    it "should allow :input_html to override :min" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range, :input_html => { :min => 5 })
       end)
+      output_buffer.should have_tag('input[@min="5"]')
+    end
+    
+    it "should allow :input_html to override :min through :in" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range, :input_html => { :in => 5..102 })
+      end)
+      output_buffer.should have_tag('input[@min="5"]')
+    end
+    
+    it "should allow options to override :min" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range, :min => 5)
+      end)
+      output_buffer.should have_tag('input[@min="5"]')
+    end
+    
+    it "should allow options to override :min through :in" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range, :in => 5..102)
+      end)
+      output_buffer.should have_tag('input[@min="5"]')
+    end
+    
+    describe "and the column is an integer" do
+      before do
+        @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :integer))
+      end
       
-      output_buffer.should have_tag("form li input[step=\"1\"][min=\"1930\"][max=\"#{Time.now.year - 5}\"]")
+      it "should add a min attribute to the input one greater than the validation" do
+        concat(semantic_form_for(@new_post) do |builder|
+          builder.input(:title, :as => :range)
+        end)
+        output_buffer.should have_tag('input[@min="3"]')
+      end
     end
     
-    it "adjusts greater_than and less_than validation options by 1" do        
-      @james.class.stub!(:validators_on).with(:age).and_return([
-        active_model_numericality_validator([:age], {:only_integer=>false, :allow_nil=>false, :greater_than=>0, :less_than=>6})
-      ])
+    describe "and the column is a float" do
+      before do
+        @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :float))
+      end
       
-      concat(semantic_form_for(@james) do |builder|
-        concat(builder.input(:age, :as => :range))
-      end)
+      it "should raise an error" do
+        lambda {
+          concat(semantic_form_for(@new_post) do |builder|
+            builder.input(:title, :as => :range)
+          end)
+        }.should raise_error(Formtastic::Inputs::Base::Validations::IndeterminableMinimumAttributeError)
+      end
+    end
+    
+    describe "and the column is a big decimal" do
+      before do
+        @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :decimal))
+      end
       
-      output_buffer.should have_tag("form li input[step=\"1\"][min=\"1\"][max=\"5\"]")
+      it "should raise an error" do
+        lambda {
+          concat(semantic_form_for(@new_post) do |builder|
+            builder.input(:title, :as => :range)
+          end)
+        }.should raise_error(Formtastic::Inputs::Base::Validations::IndeterminableMinimumAttributeError)
+      end
     end
     
-    it "defaults the step to 1" do        
-      concat(semantic_form_for(@james) do |builder|
-        concat(builder.input(:age, :as => :range))
+  end
+  
+  describe "when validations require a minimum value (:greater_than_or_equal_to)" do
+    before do
+      @new_post.class.stub!(:validators_on).with(:title).and_return([
+        active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :greater_than_or_equal_to=>2})
+      ])
+    end
+    
+    it "should allow :input_html to override :min" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range, :input_html => { :min => 5 })
       end)
-      output_buffer.should have_tag("form li input[step=\"1\"]")
+      output_buffer.should have_tag('input[@min="5"]')
     end
     
-    it "defaults the min to 1" do        
-      concat(semantic_form_for(@james) do |builder|
-        concat(builder.input(:age, :as => :range))
+    it "should allow options to override :min" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range, :min => 5)
       end)
-      output_buffer.should have_tag("form li input[min=\"1\"]")
+      output_buffer.should have_tag('input[@min="5"]')
+    end
+
+    it "should allow :input_html to override :min with :in" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range, :input_html => { :in => 5..102 })
+      end)
+      output_buffer.should have_tag('input[@min="5"]')
     end
     
-    it "defaults the max to 100" do        
-      concat(semantic_form_for(@james) do |builder|
-        concat(builder.input(:age, :as => :range))
+    it "should allow options to override :min  with :in" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range, :in => 5..102)
       end)
-      output_buffer.should have_tag("form li input[max=\"100\"]")
+      output_buffer.should have_tag('input[@min="5"]')
     end
     
-    it "will look for the non-standard :step validation option" do        
-      @james.class.stub!(:validators_on).with(:age).and_return([
-        active_model_numericality_validator([:age], {:only_integer=>false, :allow_nil=>false, :greater_than=>0, :less_than=>6, :step => 0.5})
+
+    [:integer, :decimal, :float].each do |column_type|
+      describe "and the column is a #{column_type}" do
+        before do
+          @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => column_type))
+        end
+
+        it "should add a max attribute to the input equal to the validation" do
+          concat(semantic_form_for(@new_post) do |builder|
+            builder.input(:title, :as => :range)
+          end)
+          output_buffer.should have_tag('input[@min="2"]')
+        end
+      end
+    end
+
+    describe "and there is no column" do
+      before do
+        @new_post.stub!(:column_for_attribute).with(:title).and_return(nil)
+      end
+    
+      it "should add a max attribute to the input equal to the validation" do
+        concat(semantic_form_for(@new_post) do |builder|
+          builder.input(:title, :as => :range)
+        end)
+        output_buffer.should have_tag('input[@min="2"]')
+      end
+    end
+  end
+
+  describe "when validations do not require a minimum value" do
+    
+    it "should default to 1" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range)
+      end)
+      output_buffer.should have_tag('input[@min="1"]')
+    end
+    
+  end
+
+  describe "when validations require a maximum value (:less_than)" do
+   before do
+     @new_post.class.stub!(:validators_on).with(:title).and_return([
+       active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :less_than=>20})
+     ])
+   end
+   
+   it "should allow :input_html to override :max" do
+     concat(semantic_form_for(@new_post) do |builder|
+       builder.input(:title, :as => :range, :input_html => { :max => 102 })
+     end)
+     output_buffer.should have_tag('input[@max="102"]')
+   end
+   
+   it "should allow option to override :max" do
+     concat(semantic_form_for(@new_post) do |builder|
+       builder.input(:title, :as => :range, :max => 102)
+     end)
+     output_buffer.should have_tag('input[@max="102"]')
+   end
+   
+   it "should allow :input_html to override :max with :in" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range, :input_html => { :in => 1..102 })
+      end)
+      output_buffer.should have_tag('input[@max="102"]')
+    end
+
+    it "should allow option to override :max with :in" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range, :in => 1..102)
+      end)
+      output_buffer.should have_tag('input[@max="102"]')
+    end
+   
+   describe "and the column is an integer" do
+     before do
+       @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :integer))
+     end
+     
+     it "should add a max attribute to the input one greater than the validation" do
+       concat(semantic_form_for(@new_post) do |builder|
+         builder.input(:title, :as => :range)
+       end)
+       output_buffer.should have_tag('input[@max="19"]')
+     end
+   end
+   
+   describe "and the column is a float" do
+     before do
+       @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :float))
+     end
+     
+     it "should raise an error" do
+       lambda {
+         concat(semantic_form_for(@new_post) do |builder|
+           builder.input(:title, :as => :range)
+         end)
+       }.should raise_error(Formtastic::Inputs::Base::Validations::IndeterminableMaximumAttributeError)
+     end
+   end
+   
+   describe "and the column is a big decimal" do
+     before do
+       @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :decimal))
+     end
+     
+     it "should raise an error" do
+       lambda {
+         concat(semantic_form_for(@new_post) do |builder|
+           builder.input(:title, :as => :range)
+         end)
+       }.should raise_error(Formtastic::Inputs::Base::Validations::IndeterminableMaximumAttributeError)
+     end
+   end
+   
+  end
+  
+  describe "when validations require a maximum value (:less_than_or_equal_to)" do
+    before do
+      @new_post.class.stub!(:validators_on).with(:title).and_return([
+        active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :less_than_or_equal_to=>20})
       ])
-      
-      concat(semantic_form_for(@james) do |builder|
-        concat(builder.input(:age, :as => :range))
+    end
+    
+    it "should allow :input_html to override :max" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range, :input_html => { :max => 102 })
       end)
-      
-      output_buffer.should have_tag("form li input[step=\"0.5\"][min=\"1\"][max=\"5\"]")
+      output_buffer.should have_tag('input[@max="102"]')
+    end
+    
+    it "should allow options to override :max" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range, :max => 102)
+      end)
+      output_buffer.should have_tag('input[@max="102"]')
+    end
+    
+    it "should allow :input_html to override :max with :in" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range, :input_html => { :in => 1..102 })
+      end)
+      output_buffer.should have_tag('input[@max="102"]')
     end
     
-    it "allows options hash to override validations" do
-      @james.class.stub!(:validators_on).with(:age).and_return([
-        active_model_numericality_validator([:age], {:only_integer=>false, :allow_nil=>false, :greater_than=>5, :less_than=>50, :step => 0.5})
+    it "should allow options to override :max with :in" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range, :in => 1..102)
+      end)
+      output_buffer.should have_tag('input[@max="102"]')
+    end
+
+    [:integer, :decimal, :float].each do |column_type|
+      describe "and the column is a #{column_type}" do
+        before do
+          @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => column_type))
+        end
+
+        it "should add a max attribute to the input equal to the validation" do
+          concat(semantic_form_for(@new_post) do |builder|
+            builder.input(:title, :as => :range)
+          end)
+          output_buffer.should have_tag('input[@max="20"]')
+        end
+      end
+    end
+
+    describe "and there is no column" do
+      before do
+        @new_post.stub!(:column_for_attribute).with(:title).and_return(nil)
+      end
+    
+      it "should add a max attribute to the input equal to the validation" do
+        concat(semantic_form_for(@new_post) do |builder|
+          builder.input(:title, :as => :range)
+        end)
+        output_buffer.should have_tag('input[@max="20"]')
+      end
+    end
+  end
+  
+  describe "when validations do not require a maximum value" do
+    
+    it "should default to 1" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range)
+      end)
+      output_buffer.should have_tag('input[@max="100"]')
+    end
+    
+  end
+  
+  describe "when validations require conflicting minimum values (:greater_than, :greater_than_or_equal_to)" do
+    before do
+      @new_post.class.stub!(:validators_on).with(:title).and_return([
+        active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :greater_than => 20, :greater_than_or_equal_to=>2})
       ])
-      
-      concat(semantic_form_for(@james) do |builder|
-        concat(builder.input(:age, :as => :range, :in => 52..108, :step => 2))
+    end
+    
+    it "should add a max attribute to the input equal to the :greater_than_or_equal_to validation" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range)
       end)
-      
-      output_buffer.should have_tag("form li input[step=\"2\"][min=\"52\"][max=\"108\"]")
+      output_buffer.should have_tag('input[@min="2"]')
+    end
+  end
+  
+  describe "when validations require conflicting maximum values (:less_than, :less_than_or_equal_to)" do
+    before do
+      @new_post.class.stub!(:validators_on).with(:title).and_return([
+        active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :less_than => 20, :less_than_or_equal_to=>2})
+      ])
     end
     
-    it "should allow input_html hash to override validations and options" do
-      @james.class.stub!(:validators_on).with(:age).and_return([
-        active_model_numericality_validator([:age], {:only_integer=>false, :allow_nil=>false, :greater_than=>5, :less_than=>50, :step => 0.5})
+    it "should add a max attribute to the input equal to the :greater_than_or_equal_to validation" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range)
+      end)
+      output_buffer.should have_tag('input[@max="2"]')
+    end
+  end
+  
+  describe "when validations require only an integer (:only_integer)" do
+    
+    before do
+      @new_post.class.stub!(:validators_on).with(:title).and_return([
+        active_model_numericality_validator([:title], {:allow_nil=>false, :only_integer=>true})
       ])
-      
-      concat(semantic_form_for(@james) do |builder|
-        concat(builder.input(:age, :as => :range, :in => 52..108, :step => 2, :input_html => { :in => 53..109, :step => 3 }))
+    end
+    
+    it "should add a step=1 attribute to the input to signify that only whole numbers are allowed" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range)
       end)
-      
-      output_buffer.should have_tag("form li input[step=\"3\"][min=\"53\"][max=\"109\"]")
+      output_buffer.should have_tag('input[@step="1"]')
     end
     
-  end 
-
+    it "should let input_html override :step" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range, :input_html => { :step => 3 })
+      end)
+      output_buffer.should have_tag('input[@step="3"]')
+    end
+    
+    it "should let options override :step" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range, :step => 3)
+      end)
+      output_buffer.should have_tag('input[@step="3"]')
+    end
+    
+  end
+  
+  describe "when validations require a :step (non standard)" do
+    
+    before do
+      @new_post.class.stub!(:validators_on).with(:title).and_return([
+        active_model_numericality_validator([:title], {:allow_nil=>false, :only_integer=>true, :step=>2})
+      ])
+    end
+    
+    it "should add a step=1 attribute to the input to signify that only whole numbers are allowed" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range)
+      end)
+      output_buffer.should have_tag('input[@step="2"]')
+    end
+    
+    it "should let input_html override :step" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range, :input_html => { :step => 3 })
+      end)
+      output_buffer.should have_tag('input[@step="3"]')
+    end
+    
+    it "should let options override :step" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range, :step => 3)
+      end)
+      output_buffer.should have_tag('input[@step="3"]')
+    end
+    
+  end
+  
+  describe "when validations do not specify :step (non standard) or :only_integer" do
+    
+    before do
+      @new_post.class.stub!(:validators_on).with(:title).and_return([
+        active_model_numericality_validator([:title], {:allow_nil=>false})
+      ])
+    end
+    
+    it "should default step to 1" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range)
+      end)
+      output_buffer.should have_tag('input[@step="1"]')
+    end
+    
+    it "should let input_html set :step" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range, :input_html => { :step => 3 })
+      end)
+      output_buffer.should have_tag('input[@step="3"]')
+    end
+    
+    it "should let options set :step" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :range, :step => 3)
+      end)
+      output_buffer.should have_tag('input[@step="3"]')
+    end
+    
+  end
+  
 end
 

From dc008ee1a436774c8c13303bad124b20c6d1522e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 10 Apr 2011 21:19:03 +1000
Subject: [PATCH 724/992] Automatically wrap nested inputs() in an <li> tag to
 preserve HTML validity. Fixes #487

---
 CHANGELOG                               |  2 +
 lib/formtastic/helpers/inputs_helper.rb | 43 +++++++++-----
 spec/inputs_spec.rb                     | 75 +++++++++++++++++++++++++
 3 files changed, 105 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3ea42dd18..7114fe7bf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,8 @@
 * Added support for HTML5 required attribute on input, select and textarea tags
 * Added support for HTML5 min/max/step attributes on NumericInput
 * Added support for HTML5 placeholder attributes on Stringish inputs (string, email, phone, url, search, number, password)
+* Changed nested inputs() blocks to be automatically wrapped in an `<li>` tag to preserve HTML validity
+
 
 1.2.4.beta (unreleased)
 
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 8bba8abf4..422d726cf 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -376,6 +376,10 @@ def input(method, options = {})
       # All options except `:name`, `:title` and `:for` will be passed down to the fieldset as HTML
       # attributes (id, class, style, etc).
       #
+      # When nesting `inputs()` inside another `inputs()` block, the nested content will 
+      # automatically be wrapped in an `<li>` tag to preserve the HTML validity (a `<fieldset>`
+      # cannot be a direct descendant of an `<ol>`.
+      #
       #
       # @option *args :for [Symbol, ActiveModel, Array]
       #   The contents of this option is passed down to Rails' fields_for() helper, so it accepts the same values.
@@ -487,28 +491,37 @@ def input(method, options = {})
       #     <% end %>
       #   <% end %>
       def inputs(*args, &block)
+        wrap_it = @already_in_an_inputs_block ? true : false
+        @already_in_an_inputs_block = true
+        
         title = field_set_title_from_args(*args)
         html_options = args.extract_options!
         html_options[:class] ||= "inputs"
         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(*(args << html_options), &block)
-        else
-          if @object && args.empty?
-            args  = association_columns(:belongs_to)
-            args += content_columns
-            args -= SKIPPED_COLUMNS
-            args.compact!
+        out = begin
+          if html_options[:for] # Nested form
+            inputs_for_nested_attributes(*(args << html_options), &block)
+          elsif block_given?
+            field_set_and_list_wrapping(*(args << html_options), &block)
+          else
+            if @object && args.empty?
+              args  = association_columns(:belongs_to)
+              args += content_columns
+              args -= SKIPPED_COLUMNS
+              args.compact!
+            end
+            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
-          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
+        
+        out = template.content_tag(:li, out) if wrap_it
+        @already_in_an_inputs_block = false
+        out
       end
 
       # A thin wrapper around Rails' `fields_for` helper to set `:builder => Formtastic::FormBuilder`
diff --git a/spec/inputs_spec.rb b/spec/inputs_spec.rb
index c3c94e8d1..37130e1ef 100644
--- a/spec/inputs_spec.rb
+++ b/spec/inputs_spec.rb
@@ -436,4 +436,79 @@
     end
 
   end
+
+  describe 'nesting' do
+    
+    context "when not nested" do
+      it "should not wrap the inputs in an li block" do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.inputs do
+          end)
+        end)
+        output_buffer.should_not have_tag('form > li')
+      end
+    end
+    
+    context "when nested (with block)" do
+      it "should wrap the nested inputs in an li block to maintain HTML validity" do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.inputs do
+            concat(builder.inputs do
+            end)
+          end)
+        end)
+        output_buffer.should have_tag('form > fieldset.inputs > ol > li > fieldset.inputs > ol')
+      end
+    end
+    
+    context "when nested (with block and :for)" do
+      it "should wrap the nested inputs in an li block to maintain HTML validity" do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.inputs do
+            concat(builder.inputs(:for => :author) do |author_builder|
+            end)
+          end)
+        end)
+        output_buffer.should have_tag('form > fieldset.inputs > ol > li > fieldset.inputs > ol')
+      end
+    end
+    
+    context "when nested (without block)" do
+      it "should wrap the nested inputs in an li block to maintain HTML validity" do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.inputs do
+            concat(builder.inputs(:title))
+          end)
+        end)
+        output_buffer.should have_tag('form > fieldset.inputs > ol > li > fieldset.inputs > ol')
+      end
+    end
+
+    context "when nested (without block, with :for)" do
+      it "should wrap the nested inputs in an li block to maintain HTML validity" do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.inputs do
+            concat(builder.inputs(:name, :for => :author))
+          end)
+        end)
+        output_buffer.should have_tag('form > fieldset.inputs > ol > li > fieldset.inputs > ol')
+      end
+    end
+
+    context "when double nested" do
+      it "should wrap the nested inputs in an li block to maintain HTML validity" do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.inputs do
+            concat(builder.inputs do
+              concat(builder.inputs do
+              end)
+            end)
+          end)
+        end)
+        output_buffer.should have_tag('form > fieldset.inputs > ol > li > fieldset.inputs > ol > li > fieldset.inputs > ol')
+      end
+    end
+    
+  end
+
 end

From 06cdac03f07b12cf0c36871d7cdcbb264790025f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 10 Apr 2011 21:28:09 +1000
Subject: [PATCH 725/992] changelog tweak

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7114fe7bf..f841f64f5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-[refactor branch]
+[master]
 
 * Removed the "inline_order" configuration (redefine input_wrapping instead)
 * Removed the "special" implementation of label() from FormBuilder, so builder.label will call Rails' label helper, not ours

From 76aa6f1b8f17d44cbb46cb7b548f5688d47e033f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 11 Apr 2011 08:31:05 +1000
Subject: [PATCH 726/992] Better handling of Polymorphic inputs without a
 :collection (fixes #511)

We cannot guess which class to use for the :collection when rendering an input for a polymorphic association, so:

* skip polymorphic associations altogether when rendering inputs with quick form syntax (<%= f.inputs %>)
* raise an error when quick form syntax (<%= f.inputs :title, :body %>) tries to render an input for a polymorphic association
* raise an error when a :collection is not provided in block form syntax (<%= f.inputs do %><%= f.input :foo %><% end %>) on a polymorphic association
---
 lib/formtastic.rb                         |  3 ++
 lib/formtastic/helpers/inputs_helper.rb   | 15 +++++--
 lib/formtastic/inputs/base/collections.rb |  2 +
 spec/input_spec.rb                        | 25 +++++++++++
 spec/inputs_spec.rb                       | 51 +++++++++++++++++++++--
 5 files changed, 90 insertions(+), 6 deletions(-)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index dc55390bf..57de5d332 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -17,4 +17,7 @@ module Formtastic
   class UnknownInputError < NameError
   end
   
+  class PolymorphicInputWithoutCollectionError < ArgumentError
+  end
+  
 end
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 422d726cf..a859b6c73 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -512,7 +512,12 @@ def inputs(*args, &block)
               args.compact!
             end
             legend = args.shift if args.first.is_a?(::String)
-            contents = args.collect { |method| input(method.to_sym) }
+            contents = args.collect do |method| 
+              if @object && (@object.class.reflect_on_association(method.to_sym) && @object.class.reflect_on_association(method.to_sym).options[:polymorphic] == true)
+                raise PolymorphicInputWithoutCollectionError.new("Please provide a collection for :#{method} input (you'll need to use block form syntax). Inputs for polymorphic associations can only be used when an explicit :collection is provided.")
+              end
+              input(method.to_sym)
+            end
             args.unshift(legend) if legend.present?
           
             field_set_and_list_wrapping(*((args << html_options) << contents))
@@ -622,12 +627,16 @@ def standard_input_class_name(as)
         "Formtastic::Inputs::#{as.to_s.camelize}Input"
       end
 
-      # Collects association columns (relation columns) for the current form object class.
+      # Collects association columns (relation columns) for the current form object class. Skips
+      # polymorphic associations because we can't guess which class to use for an automatically
+      # generated input.
       def association_columns(*by_associations) #:nodoc:
         if @object.present? && @object.class.respond_to?(:reflections)
           @object.class.reflections.collect do |name, association_reflection|
             if by_associations.present?
-              name if by_associations.include?(association_reflection.macro)
+              if by_associations.include?(association_reflection.macro) && association_reflection.options[:polymorphic] != true
+                name 
+              end
             else
               name
             end
diff --git a/lib/formtastic/inputs/base/collections.rb b/lib/formtastic/inputs/base/collections.rb
index bf3ce051a..4a34e5e5c 100644
--- a/lib/formtastic/inputs/base/collections.rb
+++ b/lib/formtastic/inputs/base/collections.rb
@@ -54,6 +54,8 @@ def collection_from_options
       
         def collection_from_association
           if reflection
+            raise PolymorphicInputWithoutCollectionError.new("A collection must be supplied for #{method} input. Collections cannot be guessed for polymorphic associations.") if reflection.options[:polymorphic] == true
+
             find_options_from_options = options[:find_options] || {}
             conditions_from_options = find_options_from_options[:conditions] || {}
             conditions_from_reflection = reflection.options[:conditions] || {}
diff --git a/spec/input_spec.rb b/spec/input_spec.rb
index b2b849214..8bfd148fc 100644
--- a/spec/input_spec.rb
+++ b/spec/input_spec.rb
@@ -725,6 +725,31 @@ def should_be_required(options)
       end
 
     end
+
+    describe ':collection option' do
+      
+      it "should be required on polymorphic associations" do
+        @new_post.stub!(:commentable)
+        @new_post.class.stub!(:reflections).and_return({ 
+          :commentable => mock('macro_reflection', :options => { :polymorphic => true }, :macro => :belongs_to)
+        })
+        @new_post.stub!(:column_for_attribute).with(:commentable).and_return(
+          mock('column', :type => :integer)
+        )
+        @new_post.class.stub!(:reflect_on_association).with(:commentable).and_return(
+          mock('reflection', :macro => :belongs_to, :options => { :polymorphic => true })
+        )
+        expect { 
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.inputs do 
+              concat(builder.input :commentable)
+            end)
+          end)
+        }.to raise_error(Formtastic::PolymorphicInputWithoutCollectionError)
+      end
+      
+    end
+
   end
   
   describe 'options re-use' do
diff --git a/spec/inputs_spec.rb b/spec/inputs_spec.rb
index 37130e1ef..61d5acf19 100644
--- a/spec/inputs_spec.rb
+++ b/spec/inputs_spec.rb
@@ -10,7 +10,7 @@
     mock_everything
   end
 
-  describe 'with a block' do
+  describe 'with a block (block forms syntax)' do
 
     describe 'when no options are provided' do
       before do
@@ -317,7 +317,7 @@
       @new_post.stub!(:column_for_attribute).with(:author).and_return(nil)
     end
 
-    describe 'with no args' do
+    describe 'with no args (quick forms syntax)' do
       before do
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.inputs)
@@ -361,9 +361,30 @@
       it 'should not render timestamps inputs by default' do
         output_buffer.should_not have_tag('form > fieldset.inputs > ol > li.datetime')
       end
+    
+      context "with a polymorphic association" do
+        
+        before do 
+          @new_post.stub!(:commentable)
+          @new_post.class.stub!(:reflections).and_return({ 
+            :commentable => mock('macro_reflection', :options => { :polymorphic => true }, :macro => :belongs_to)
+          })
+          @new_post.stub!(:column_for_attribute).with(:commentable).and_return(
+            mock('column', :type => :integer)
+          )
+        end
+        
+        it 'should not render an input for the polymorphic association (the collection class cannot be guessed)' do
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.inputs)
+          end)
+          output_buffer.should_not have_tag('li#post_commentable_input')
+        end
+        
+      end
     end
 
-    describe 'with column names as args' do
+    describe 'with column names as args (short hand forms syntax)' do
       describe 'and an object is given' do
         it 'should render a form with a fieldset containing two list items' do
           concat(semantic_form_for(@new_post) do |builder|
@@ -385,6 +406,30 @@
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.string', :count => 2)
         end
       end
+      
+      context "with a polymorphic association" do
+        
+        it 'should raise an error for polymorphic associations (the collection class cannot be guessed)' do
+          @new_post.stub!(:commentable)
+          @new_post.class.stub!(:reflections).and_return({ 
+            :commentable => mock('macro_reflection', :options => { :polymorphic => true }, :macro => :belongs_to)
+          })
+          @new_post.stub!(:column_for_attribute).with(:commentable).and_return(
+            mock('column', :type => :integer)
+          )
+          @new_post.class.stub!(:reflect_on_association).with(:commentable).and_return(
+            mock('reflection', :macro => :belongs_to, :options => { :polymorphic => true })
+          )
+          
+          expect { 
+            concat(semantic_form_for(@new_post) do |builder|
+              concat(builder.inputs :commentable)
+            end)
+          }.to raise_error(Formtastic::PolymorphicInputWithoutCollectionError)
+        end
+        
+      end
+      
     end
 
     describe 'when a :for option is provided' do

From 3e92f12980593ba71c2b78eb81a7edc9520c43d4 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 11 Apr 2011 09:58:59 +1000
Subject: [PATCH 727/992] changelog catch-up

---
 CHANGELOG | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index f841f64f5..3e382773a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,7 +17,9 @@
 * Added support for HTML5 min/max/step attributes on NumericInput
 * Added support for HTML5 placeholder attributes on Stringish inputs (string, email, phone, url, search, number, password)
 * Changed nested inputs() blocks to be automatically wrapped in an `<li>` tag to preserve HTML validity
-
+* Changed quick forms to skip polymorphic associations (they didn't work)
+* Changed short hand forms to raise an error when trying to render an input for a polymorphic association (it didn't work, need a collection)
+* Changed input() to raise an error when a :collection is not provided for a polymorphic association (we can't guess which class to use)
 
 1.2.4.beta (unreleased)
 

From 4067730aeff9ff392498aa43d8f432c91819cf6e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 11 Apr 2011 16:23:56 +1000
Subject: [PATCH 728/992] improve documentation of semantic_fields_for in
 FormBuilder

---
 lib/formtastic/helpers/inputs_helper.rb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index a859b6c73..a629327c9 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -529,9 +529,14 @@ def inputs(*args, &block)
         out
       end
 
-      # A thin wrapper around Rails' `fields_for` helper to set `:builder => Formtastic::FormBuilder`
-      # for nesting forms. Can be used in the same way as `fields_for` (see the Rails documentation),
-      # but you'll also have access to Formtastic's helpers ({#input}, etc) inside the block.
+      # A thin wrapper around `ActionView::Helpers::FormBuilder#fields_for` helper to set 
+      # `:builder => Formtastic::FormBuilder` for nesting forms inside the builder. Can be used in 
+      # the same way, but you'll also have access to the helpers in `Formtastic::FormBuilder` 
+      # (such as {#input}, etc) inside the block.
+      #
+      # @see http://api.rubyonrails.org/classes/ActionView/Helpers/FormBuilder.html#method-i-fields_for ActionView::Helpers::FormBuilder#fields_for
+      # @see http://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-fields_for ActionView::Helpers::FormHelper#fields_for
+      # @see Formtastic::Helpers::FormHelper#semantic_fields_for
       #
       # @example
       #   <% semantic_form_for @post do |post| %>

From d260c870f691d338ff5e7295d69860146d41cefb Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 11 Apr 2011 16:24:54 +1000
Subject: [PATCH 729/992] move semantic_fields_for inside FormBuilder

---
 lib/formtastic/form_builder.rb          | 32 ++++++++++++++++++++++++-
 lib/formtastic/helpers/inputs_helper.rb | 30 -----------------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 77efbf9e7..cb5cf88a6 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -38,7 +38,37 @@ def self.configure(name, value = nil)
     include Formtastic::Helpers::InputsHelper
     include Formtastic::Helpers::ButtonsHelper
     include Formtastic::Helpers::ErrorsHelper
-
+    
+    # A thin wrapper around `ActionView::Helpers::FormBuilder#fields_for` helper to set 
+    # `:builder => Formtastic::FormBuilder` for nesting forms inside the builder. Can be used in 
+    # the same way, but you'll also have access to the helpers in `Formtastic::FormBuilder` 
+    # (such as {#input}, etc) inside the block.
+    #
+    # @see http://api.rubyonrails.org/classes/ActionView/Helpers/FormBuilder.html#method-i-fields_for ActionView::Helpers::FormBuilder#fields_for
+    # @see http://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-fields_for ActionView::Helpers::FormHelper#fields_for
+    # @see Formtastic::Helpers::FormHelper#semantic_fields_for
+    #
+    # @example
+    #   <% semantic_form_for @post do |post| %>
+    #     <% post.semantic_fields_for :author do |author| %>
+    #       <% author.inputs :name %>
+    #     <% end %>
+    #   <% end %>
+    #
+    #   <form ...>
+    #     <fieldset class="inputs">
+    #       <ol>
+    #         <li class="string"><input type='text' name='post[author][name]' id='post_author_name' /></li>
+    #       </ol>
+    #     </fieldset>
+    #   </form>
+    def semantic_fields_for(record_or_name_or_array, *args, &block)
+      opts = args.extract_options!
+      opts[:builder] ||= self.class
+      args.push(opts)
+      fields_for(record_or_name_or_array, *args, &block)
+    end
+    
   end
 
 end
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index a629327c9..5e381d41b 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -529,36 +529,6 @@ def inputs(*args, &block)
         out
       end
 
-      # A thin wrapper around `ActionView::Helpers::FormBuilder#fields_for` helper to set 
-      # `:builder => Formtastic::FormBuilder` for nesting forms inside the builder. Can be used in 
-      # the same way, but you'll also have access to the helpers in `Formtastic::FormBuilder` 
-      # (such as {#input}, etc) inside the block.
-      #
-      # @see http://api.rubyonrails.org/classes/ActionView/Helpers/FormBuilder.html#method-i-fields_for ActionView::Helpers::FormBuilder#fields_for
-      # @see http://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-fields_for ActionView::Helpers::FormHelper#fields_for
-      # @see Formtastic::Helpers::FormHelper#semantic_fields_for
-      #
-      # @example
-      #   <% semantic_form_for @post do |post| %>
-      #     <% post.semantic_fields_for :author do |author| %>
-      #       <% author.inputs :name %>
-      #     <% end %>
-      #   <% end %>
-      #
-      #   <form ...>
-      #     <fieldset class="inputs">
-      #       <ol>
-      #         <li class="string"><input type='text' name='post[author][name]' id='post_author_name' /></li>
-      #       </ol>
-      #     </fieldset>
-      #   </form>
-      def semantic_fields_for(record_or_name_or_array, *args, &block)
-        opts = args.extract_options!
-        opts[:builder] ||= self.class
-        args.push(opts)
-        fields_for(record_or_name_or_array, *args, &block)
-      end
-
       # Generates error messages for the given method, used for displaying errors right near the
       # field for data entry. Uses the `:inline_errors` config to determin the right presentation,
       # which may be an ordered list, a paragraph sentence containing all errors, or a paragraph

From 1ebd2e84746926f0a710d2090dfcbdaca7b5a60c Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 11 Apr 2011 21:05:13 +1000
Subject: [PATCH 730/992] split input() related methods out of InputsHelper
 into InputHelper

---
 lib/formtastic/form_builder.rb          |   1 +
 lib/formtastic/helpers.rb               |   1 +
 lib/formtastic/helpers/input_helper.rb  | 357 ++++++++++++++++++++++++
 lib/formtastic/helpers/inputs_helper.rb | 328 +---------------------
 4 files changed, 364 insertions(+), 323 deletions(-)
 create mode 100644 lib/formtastic/helpers/input_helper.rb

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index cb5cf88a6..72bdad730 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -35,6 +35,7 @@ def self.configure(name, value = nil)
 
     include Formtastic::HtmlAttributes
 
+    include Formtastic::Helpers::InputHelper
     include Formtastic::Helpers::InputsHelper
     include Formtastic::Helpers::ButtonsHelper
     include Formtastic::Helpers::ErrorsHelper
diff --git a/lib/formtastic/helpers.rb b/lib/formtastic/helpers.rb
index 844793afb..5b16c29df 100644
--- a/lib/formtastic/helpers.rb
+++ b/lib/formtastic/helpers.rb
@@ -5,6 +5,7 @@ module Helpers
     autoload :FieldsetWrapper, 'formtastic/helpers/fieldset_wrapper'
     autoload :FileColumnDetection, 'formtastic/helpers/file_column_detection'
     autoload :FormHelper, 'formtastic/helpers/form_helper'
+    autoload :InputHelper, 'formtastic/helpers/input_helper'
     autoload :InputsHelper, 'formtastic/helpers/inputs_helper'
     autoload :LabelHelper, 'formtastic/helpers/label_helper'
     autoload :SemanticFormHelper, 'formtastic/helpers/semantic_form_helper'
diff --git a/lib/formtastic/helpers/input_helper.rb b/lib/formtastic/helpers/input_helper.rb
new file mode 100644
index 000000000..34fa56e3e
--- /dev/null
+++ b/lib/formtastic/helpers/input_helper.rb
@@ -0,0 +1,357 @@
+module Formtastic
+  module Helpers
+    
+    # {#input} is used to render all content (labels, form widgets, error messages, hints, etc) for 
+    # a single form input (or field), usually representing a single method or attribute on the 
+    # form's object or model.
+    #
+    # The content is wrapped in an `<li>` tag, so it's usually called inside an {Formtastic::Helpers::InputsHelper#inputs inputs} block 
+    # (which renders an `<ol>` inside a `<fieldset>`), which should be inside a {Formtastic::Helpers::FormHelper#semantic_form_for `semantic_form_for`} 
+    # block:
+    #
+    #     <%= semantic_form_for @post do |f| %>
+    #       <%= f.inputs do %>
+    #         <%= f.input :title %>
+    #         <%= f.input :body %>
+    #       <% end %>
+    #     <% end %>
+    #
+    # The HTML output will be something like:
+    #
+    #     <form class="formtastic" method="post" action="...">
+    #       <fieldset>
+    #         <ol>
+    #           <li class="string required" id="post_title_input">
+    #             ...
+    #           </li>
+    #           <li class="text required" id="post_body_input">
+    #             ...
+    #           </li>
+    #         </ol>
+    #       </fieldset>
+    #     </form>
+    #
+    # @see #input
+    # @see Formtastic::Helpers::InputsHelper#inputs
+    # @see Formtastic::Helpers::FormHelper#semantic_form_for
+    module InputHelper
+      include Formtastic::Reflection
+      include Formtastic::Helpers::FileColumnDetection
+      
+      # Returns a chunk of HTML markup for a given `method` on the form object, wrapped in
+      # an `<li>` wrapper tag with appropriate `class` and `id` attribute hooks for CSS and JS.
+      # In many cases, the contents of the wrapper will be as simple as a `<label>` and an `<input>`:
+      #
+      #     <%= f.input :title, :as => :string, :required => true %>
+      #
+      #     <li class="string required" id="post_title_input">
+      #       <label for="post_title">Title<abbr title="Required">*</abbr></label>
+      #       <input type="text" name="post[title]" value="" id="post_title" required="required">
+      #     </li>
+      #
+      # In other cases (like a series of checkboxes for a `has_many` relationship), the wrapper may
+      # include more complex markup, like a nested `<fieldset>` with a `<legend>` and an `<ol>` of
+      # checkbox/label pairs for each choice:
+      #
+      #     <%= f.input :categories, :as => :check_boxes, :collection => Category.active.ordered %>
+      #
+      #     <li class="check_boxes" id="post_categories_input">
+      #       <fieldset>
+      #         <legend>Categories</legend>
+      #         <ol>
+      #           <li>
+      #             <label><input type="checkbox" name="post[categories][1]" value="1"> Ruby</label>
+      #           </li>
+      #           <li>
+      #             <label><input type="checkbox" name="post[categories][2]" value="2"> Rails</label>
+      #           </li>
+      #           <li>
+      #             <label><input type="checkbox" name="post[categories][2]" value="2"> Awesome</label>
+      #           </li>
+      #         </ol>
+      #       </fieldset>
+      #     </li>
+      #
+      # Sensible defaults for all options are guessed by looking at the method name, database column
+      # information, association information, validation information, etc. For example, a `:string`
+      # database column will map to a `:string` input, but if the method name contains 'email', will
+      # map to an `:email` input instead. `belongs_to` associations will have a `:select` input, etc.
+      #
+      # Formtastic supports many different styles of inputs, and you can/should override the default
+      # with the `:as` option. Internally, the symbol is used to map to a protected method
+      # responsible for the details. For example, `:as => :string` will map to `string_input`,
+      # defined in a module of the same name. Detailed documentation for each input style and it's
+      # supported options is available on the `*_input` method in each module (links provided below).
+      #
+      # Available input styles:
+      #
+      # * `:boolean`      (see {Inputs::BooleanInput})
+      # * `:check_boxes`  (see {Inputs::CheckBoxesInput})
+      # * `:country`      (see {Inputs::CountryInput})
+      # * `:datetime`     (see {Inputs::DatetimeInput})
+      # * `:date`         (see {Inputs::DateInput})
+      # * `:email`        (see {Inputs::EmailInput})
+      # * `:file`         (see {Inputs::FileInput})
+      # * `:hidden`       (see {Inputs::HiddenInput})
+      # * `:number`       (see {Inputs::NumberInput})
+      # * `:password`     (see {Inputs::PasswordInput})
+      # * `:phone`        (see {Inputs::PhoneInput})
+      # * `:radio`        (see {Inputs::RadioInput})
+      # * `:search`       (see {Inputs::SearchInput})
+      # * `:select`       (see {Inputs::SelectInput})
+      # * `:string`       (see {Inputs::StringInput})
+      # * `:text`         (see {Inputs::TextInput})
+      # * `:time_zone`    (see {Inputs::TimeZoneInput})
+      # * `:time`         (see {Inputs::TimeInput})
+      # * `:url`          (see {Inputs::UrlInput})
+      #
+      # Calling `:as => :string` (for example) will call `#to_html` on a new instance of 
+      # `Formtastic::Inputs::StringInput`. Before this, Formtastic will try to instantiate a top-level
+      # namespace StringInput, meaning you can subclass and modify `Formtastic::Inputs::StringInput` 
+      # in `app/inputs/`. This also means you can create your own new input types in `app/inputs/`.
+      #
+      # @todo document the "guessing" of input style
+      #
+      # @param [Symbol] method
+      #   The database column or method name on the form object that this input represents
+      #
+      # @option options :as [Symbol]
+      #   Override the style of input should be rendered
+      #
+      # @option options :label [String, Symbol, false]
+      #   Override the label text
+      #
+      # @option options :hint [String, Symbol, false]
+      #   Override hint text
+      #
+      # @option options :required [Boolean]
+      #   Override to mark the input as required (or not) — adds a required/optional class to the wrapper, and a HTML5 required attribute to the `<input>`
+      #
+      # @option options :input_html [Hash]
+      #   Override or add to the HTML attributes to be passed down to the `<input>` tag
+      #
+      # @option options :wrapper_html [Hash]
+      #   Override or add to the HTML attributes to be passed down to the wrapping `<li>` tag
+      #
+      # @option options :collection [Array<ActiveModel, String, Symbol>, Hash{String => String, Boolean}, OrderedHash{String => String, Boolean}]
+      #   Override collection of objects in the association (`:select`, `:radio` & `:check_boxes` inputs only)
+      #
+      # @option options :label_method [Symbol, Proc]
+      #   Override the method called on each object in the `:collection` for use as the `<label>` content (`:check_boxes` & `:radio` inputs) or `<option>` content (`:select` inputs)
+      #
+      # @option options :value_method [Symbol, Proc]
+      #   Override the method called on each object in the `:collection` for use as the `value` attribute in the `<input>` (`:check_boxes` & `:radio` inputs) or `<option>` (`:select` inputs)
+      #
+      # @option options :hint_class [String]
+      #   Override the `class` attribute applied to the `<p>` tag used when a `:hint` is rendered for an input
+      #
+      # @option options :error_class [String]
+      #   Override the `class` attribute applied to the `<p>` or `<ol>` tag used when inline errors are rendered for an input
+      #
+      # @option options :multiple [Boolean]
+      #   Specify if the `:select` input should allow multiple selections or not (defaults to `belongs_to` associations, and `true` for `has_many` and `has_and_belongs_to_many` associations)
+      #
+      # @option options :group_by [Symbol]
+      #   TODO will probably be deprecated
+      #
+      # @option options :find_options [Symbol]
+      #   TODO will probably be deprecated
+      #
+      # @option options :group_label_method [Symbol]
+      #   TODO will probably be deprecated
+      #
+      # @option options :include_blank [Boolean]
+      #   Specify if a `:select` input should include a blank option or not (defaults to `include_blank_for_select_by_default` configuration)
+      #
+      # @option options :prompt [String]
+      #   Specify the text in the first ('blank') `:select` input `<option>` to prompt a user to make a selection (implicitly sets `:include_blank` to `true`)
+      #
+      # @todo Can we kill `:hint_class` & `:error_class`? What's the use case for input-by-input? Shift to config or burn!
+      # @todo Can we kill `:group_by` & `:group_label_method`? Should be done with :collection => grouped_options_for_select(...)
+      # @todo Can we kill `:find_options`? Should be done with MyModel.some_scope.where(...).order(...).whatever_scope
+      # @todo Can we kill `:label`, `:hint` & `:prompt`? All strings could be shifted to i18n!
+      #
+      # @example Accept all default options
+      #   <%= f.input :title %>
+      #
+      # @example Change the input type
+      #   <%= f.input :title, :as => :string %>
+      #
+      # @example Changing the label with a String
+      #   <%= f.input :title, :label => "Post title" %>
+      #
+      # @example Disabling the label with false, even if an i18n translation exists
+      #   <%= f.input :title, :label => false  %>
+      #
+      # @example Changing the hint with a String
+      #   <%= f.input :title, :hint => "Every post needs a title!" %>
+      #
+      # @example Disabling the hint with false, even if an i18n translation exists
+      #   <%= f.input :title, :hint => false  %>
+      #
+      # @example Marking a field as required or not (even if validations do not enforce it)
+      #   <%= f.input :title, :required => true  %>
+      #   <%= f.input :title, :required => false  %>
+      #
+      # @example Changing or adding to HTML attributes in the main `<input>` or `<select>` tag
+      #   <%= f.input :title, :input_html => { :onchange => "somethingAwesome();", :class => 'awesome' } %>
+      #
+      # @example Changing or adding to HTML attributes in the wrapper `<li>` tag
+      #   <%= f.input :title, :wrapper_html => { :class => "important-input" } %>
+      #
+      # @example Changing the association choices with `:collection`
+      #   <%= f.input :author,     :collection => User.active %>
+      #   <%= f.input :categories, :collection => Category.where(...).order(...) %>
+      #   <%= f.input :status,     :collection => ["Draft", "Published"] %>
+      #   <%= f.input :status,     :collection => [:draft, :published] %>
+      #   <%= f.input :status,     :collection => {"Draft" => 0, "Published" => 1} %>
+      #   <%= f.input :status,     :collection => OrderedHash.new("Draft" => 0, "Published" => 1) %>
+      #   <%= f.input :status,     :collection => [["Draft", 0], ["Published", 1]] %>
+      #   <%= f.input :status,     :collection => grouped_options_for_select(...) %>
+      #   <%= f.input :status,     :collection => options_for_select(...) %>
+      #
+      # @example Specifying if a `:select` should allow multiple selections:
+      #   <%= f.input :cateogies, :as => :select, :multiple => true %>
+      #   <%= f.input :cateogies, :as => :select, :multiple => false %>
+      #
+      # @example Specifying if a `:select` should have a 'blank' first option to prompt selection:
+      #   <%= f.input :author, :as => :select, :include_blank => true %>
+      #   <%= f.input :author, :as => :select, :include_blank => false %>
+      #
+      # @example Specifying the text for a `:select` input's 'blank' first option to prompt selection:
+      #   <%= f.input :author, :as => :select, :prompt => "Select an Author" %>
+      #
+      # @example Modifying an input to suit your needs in `app/inputs`:
+      #   class StringInput < Formtastic::Inputs::StringInput
+      #     def to_html
+      #       puts "this is my custom version of StringInput"      
+      #       super
+      #     end
+      #   end
+      #
+      # @example Creating your own input to suit your needs in `app/inputs`:
+      #   class DatePickerInput
+      #     include Formtastic::Inputs::Base
+      #     def to_html
+      #       # ...
+      #     end
+      #   end
+      #
+      # @example Providing HTML5 placeholder text through i18n:
+      #   en:
+      #    formtastic:
+      #      placeholders:
+      #        user:
+      #          email: "you@yours.com"
+      #          first_name: "Joe"
+      #          last_name: "Smith"
+      #
+      # @todo Many many more examples. Some of the detail probably needs to be pushed out to the relevant methods too.
+      # @todo More i18n examples.
+      def input(method, options = {})
+        options = options.dup # Allow options to be shared without being tainted by Formtastic
+        options[:as] ||= default_input_type(method, options)
+      
+        klass = input_class(options[:as])
+        klass.new(self, template, @object, @object_name, method, options).to_html
+      end
+      
+      protected
+      
+      # 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 :number), 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 = 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/
+            return :email     if method.to_s =~ /email/
+            return :url       if method.to_s =~ /^url$|^website$|_url$/
+            return :phone     if method.to_s =~ /(phone|fax)/
+            return :search    if method.to_s =~ /^search$/
+          when :integer
+            return :select    if reflection_for(method)
+            return :number
+          when :float, :decimal
+            return :number
+          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 reflection_for(method)
+
+            return :file    if is_file?(method, options)
+          end
+
+          return :select    if options.key?(:collection)
+          return :password  if method.to_s =~ /password/
+          return :string
+        end
+      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
+
+      # Takes the `:as` option and attempts to return the corresponding input class. In the case of
+      # `:as => :string` it will first attempt to find a top level `StringInput` class (to allow the
+      # application to subclass and modify to suit), falling back to `Formtastic::Inputs::StringInput`.
+      #
+      # This also means that the application can define it's own custom inputs in the top level
+      # namespace (eg `DatepickerInput`).
+      #
+      # @param [Symbol] as A symbol representing the type of input to render
+      # @raise [Formtastic::UnknownInputError] An appropriate input class could not be found
+      # @return [Class] An input class constant
+      #
+      # @example Normal use
+      #   input_class(:string) #=> Formtastic::Inputs::StringInput
+      #   input_class(:date) #=> Formtastic::Inputs::DateInput
+      #
+      # @example When a top-level class is found
+      #   input_class(:string) #=> StringInput
+      #   input_class(:awesome) #=> AwesomeInput
+      def input_class(as)
+        @input_classes_cache ||= {}
+        @input_classes_cache[as] ||= begin
+          begin
+            begin
+              custom_input_class_name(as).constantize
+            rescue NameError
+              standard_input_class_name(as).constantize
+            end
+          rescue NameError
+            raise Formtastic::UnknownInputError
+          end
+        end
+      end
+      
+      # :as => :string # => StringInput
+      def custom_input_class_name(as)
+        "#{as.to_s.camelize}Input"
+      end
+
+      # :as => :string # => Formtastic::Inputs::StringInput
+      def standard_input_class_name(as)
+        "Formtastic::Inputs::#{as.to_s.camelize}Input"
+      end
+
+    end
+  end
+end
+      
\ No newline at end of file
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 5e381d41b..5a46b62d3 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -1,13 +1,10 @@
 module Formtastic
   module Helpers
 
-    # InputsHelper encapsulates the responsibilties of the {#inputs} and {#input} helpers at the core of the
-    # Formtastic DSL.
-    #
     # {#inputs} is used to wrap a series of form items in a `<fieldset>` and `<ol>`, with each item
     # in the list containing the markup representing a single {#input}.
     #
-    # {#inputs} is usually called with a block containing a series of {#input} calls:
+    # {#inputs} is usually called with a block containing a series of {#input} methods:
     #
     #     <%= semantic_form_for @post do |f| %>
     #       <%= f.inputs do %>
@@ -22,19 +19,17 @@ module Helpers
     #       <fieldset>
     #         <ol>
     #           <li class="string required" id="post_title_input">
-    #             <label for="post_title">Title*</label>
-    #             <input type="text" name="post[title]" id="post_title" value="" required="required">
+    #             ...
     #           </li>
     #           <li class="text required" id="post_body_input">
-    #             <label for="post_title">Title*</label>
-    #             <textarea name="post[body]" id="post_body" required="required"></textarea>
+    #             ...
     #           </li>
     #         </ol>
     #       </fieldset>
     #     </form>
     #
     # It's important to note that the `semantic_form_for` and {#inputs} blocks wrap the
-    # standard Rails `form_for` helper and form builder, so you have full access to every standard
+    # standard Rails `form_for` helper and FormBuilder, so you have full access to every standard
     # Rails form helper, with any HTML markup and ERB syntax, allowing you to "break free" from
     # Formtastic when it doesn't suit:
     #
@@ -47,234 +42,14 @@ module Helpers
     #       <% end %>
     #     <% end %>
     #
-    # There are many other syntax variations and arguments to customize your form. See the
-    # full documentation of {#inputs} and {#input} for details.
+    # @see Formtastic::Helpers::InputHelper#input
     module InputsHelper
       include Formtastic::Helpers::FieldsetWrapper
-      include Formtastic::Helpers::FileColumnDetection
-      include Formtastic::Reflection
       include Formtastic::LocalizedString
 
       # Which columns to skip when automatically rendering a form without any fields specified.
       SKIPPED_COLUMNS = [:created_at, :updated_at, :created_on, :updated_on, :lock_version, :version]
 
-      # Returns a chunk of HTML markup for a given `method` on the form object, wrapped in
-      # an `<li>` wrapper tag with appropriate `class` and `id` attribute hooks for CSS and JS.
-      # In many cases, the contents of the wrapper will be as simple as a `<label>` and an `<input>`:
-      #
-      #     <%= f.input :title, :as => :string, :required => true %>
-      #
-      #     <li class="string required" id="post_title_input">
-      #       <label for="post_title">Title<abbr title="Required">*</abbr></label>
-      #       <input type="text" name="post[title]" value="" id="post_title" required="required">
-      #     </li>
-      #
-      # In other cases (like a series of checkboxes for a `has_many` relationship), the wrapper may
-      # include more complex markup, like a nested `<fieldset>` with a `<legend>` and an `<ol>` of
-      # checkbox/label pairs for each choice:
-      #
-      #     <%= f.input :categories, :as => :check_boxes, :collection => Category.active.ordered %>
-      #
-      #     <li class="check_boxes" id="post_categories_input">
-      #       <fieldset>
-      #         <legend>Categories</legend>
-      #         <ol>
-      #           <li>
-      #             <label><input type="checkbox" name="post[categories][1]" value="1"> Ruby</label>
-      #           </li>
-      #           <li>
-      #             <label><input type="checkbox" name="post[categories][2]" value="2"> Rails</label>
-      #           </li>
-      #           <li>
-      #             <label><input type="checkbox" name="post[categories][2]" value="2"> Awesome</label>
-      #           </li>
-      #         </ol>
-      #       </fieldset>
-      #     </li>
-      #
-      # Sensible defaults for all options are guessed by looking at the method name, database column
-      # information, association information, validation information, etc. For example, a `:string`
-      # database column will map to a `:string` input, but if the method name contains 'email', will
-      # map to an `:email` input instead. `belongs_to` associations will have a `:select` input, etc.
-      #
-      # Formtastic supports many different styles of inputs, and you can/should override the default
-      # with the `:as` option. Internally, the symbol is used to map to a protected method
-      # responsible for the details. For example, `:as => :string` will map to `string_input`,
-      # defined in a module of the same name. Detailed documentation for each input style and it's
-      # supported options is available on the `*_input` method in each module (links provided below).
-      #
-      # Available input styles:
-      #
-      # * `:boolean`      (see {Inputs::BooleanInput})
-      # * `:check_boxes`  (see {Inputs::CheckBoxesInput})
-      # * `:country`      (see {Inputs::CountryInput})
-      # * `:datetime`     (see {Inputs::DatetimeInput})
-      # * `:date`         (see {Inputs::DateInput})
-      # * `:email`        (see {Inputs::EmailInput})
-      # * `:file`         (see {Inputs::FileInput})
-      # * `:hidden`       (see {Inputs::HiddenInput})
-      # * `:number`       (see {Inputs::NumberInput})
-      # * `:password`     (see {Inputs::PasswordInput})
-      # * `:phone`        (see {Inputs::PhoneInput})
-      # * `:radio`        (see {Inputs::RadioInput})
-      # * `:search`       (see {Inputs::SearchInput})
-      # * `:select`       (see {Inputs::SelectInput})
-      # * `:string`       (see {Inputs::StringInput})
-      # * `:text`         (see {Inputs::TextInput})
-      # * `:time_zone`    (see {Inputs::TimeZoneInput})
-      # * `:time`         (see {Inputs::TimeInput})
-      # * `:url`          (see {Inputs::UrlInput})
-      #
-      # Calling `:as => :string` (for example) will call `#to_html` on a new instance of 
-      # `Formtastic::Inputs::StringInput`. Before this, Formtastic will try to instantiate a top-level
-      # namespace StringInput, meaning you can subclass and modify `Formtastic::Inputs::StringInput` 
-      # in `app/inputs/`. This also means you can create your own new input types in `app/inputs/`.
-      #
-      # @todo document the "guessing" of input style
-      #
-      # @param [Symbol] method
-      #   The database column or method name on the form object that this input represents
-      #
-      # @option options :as [Symbol]
-      #   Override the style of input should be rendered
-      #
-      # @option options :label [String, Symbol, false]
-      #   Override the label text
-      #
-      # @option options :hint [String, Symbol, false]
-      #   Override hint text
-      #
-      # @option options :required [Boolean]
-      #   Override to mark the input as required (or not) — adds a required/optional class to the wrapper, and a HTML5 required attribute to the `<input>`
-      #
-      # @option options :input_html [Hash]
-      #   Override or add to the HTML attributes to be passed down to the `<input>` tag
-      #
-      # @option options :wrapper_html [Hash]
-      #   Override or add to the HTML attributes to be passed down to the wrapping `<li>` tag
-      #
-      # @option options :collection [Array<ActiveModel, String, Symbol>, Hash{String => String, Boolean}, OrderedHash{String => String, Boolean}]
-      #   Override collection of objects in the association (`:select`, `:radio` & `:check_boxes` inputs only)
-      #
-      # @option options :label_method [Symbol, Proc]
-      #   Override the method called on each object in the `:collection` for use as the `<label>` content (`:check_boxes` & `:radio` inputs) or `<option>` content (`:select` inputs)
-      #
-      # @option options :value_method [Symbol, Proc]
-      #   Override the method called on each object in the `:collection` for use as the `value` attribute in the `<input>` (`:check_boxes` & `:radio` inputs) or `<option>` (`:select` inputs)
-      #
-      # @option options :hint_class [String]
-      #   Override the `class` attribute applied to the `<p>` tag used when a `:hint` is rendered for an input
-      #
-      # @option options :error_class [String]
-      #   Override the `class` attribute applied to the `<p>` or `<ol>` tag used when inline errors are rendered for an input
-      #
-      # @option options :multiple [Boolean]
-      #   Specify if the `:select` input should allow multiple selections or not (defaults to `belongs_to` associations, and `true` for `has_many` and `has_and_belongs_to_many` associations)
-      #
-      # @option options :group_by [Symbol]
-      #   TODO will probably be deprecated
-      #
-      # @option options :find_options [Symbol]
-      #   TODO will probably be deprecated
-      #
-      # @option options :group_label_method [Symbol]
-      #   TODO will probably be deprecated
-      #
-      # @option options :include_blank [Boolean]
-      #   Specify if a `:select` input should include a blank option or not (defaults to `include_blank_for_select_by_default` configuration)
-      #
-      # @option options :prompt [String]
-      #   Specify the text in the first ('blank') `:select` input `<option>` to prompt a user to make a selection (implicitly sets `:include_blank` to `true`)
-      #
-      # @todo Can we kill `:hint_class` & `:error_class`? What's the use case for input-by-input? Shift to config or burn!
-      # @todo Can we kill `:group_by` & `:group_label_method`? Should be done with :collection => grouped_options_for_select(...)
-      # @todo Can we kill `:find_options`? Should be done with MyModel.some_scope.where(...).order(...).whatever_scope
-      # @todo Can we kill `:label`, `:hint` & `:prompt`? All strings could be shifted to i18n!
-      #
-      # @example Accept all default options
-      #   <%= f.input :title %>
-      #
-      # @example Change the input type
-      #   <%= f.input :title, :as => :string %>
-      #
-      # @example Changing the label with a String
-      #   <%= f.input :title, :label => "Post title" %>
-      #
-      # @example Disabling the label with false, even if an i18n translation exists
-      #   <%= f.input :title, :label => false  %>
-      #
-      # @example Changing the hint with a String
-      #   <%= f.input :title, :hint => "Every post needs a title!" %>
-      #
-      # @example Disabling the hint with false, even if an i18n translation exists
-      #   <%= f.input :title, :hint => false  %>
-      #
-      # @example Marking a field as required or not (even if validations do not enforce it)
-      #   <%= f.input :title, :required => true  %>
-      #   <%= f.input :title, :required => false  %>
-      #
-      # @example Changing or adding to HTML attributes in the main `<input>` or `<select>` tag
-      #   <%= f.input :title, :input_html => { :onchange => "somethingAwesome();", :class => 'awesome' } %>
-      #
-      # @example Changing or adding to HTML attributes in the wrapper `<li>` tag
-      #   <%= f.input :title, :wrapper_html => { :class => "important-input" } %>
-      #
-      # @example Changing the association choices with `:collection`
-      #   <%= f.input :author,     :collection => User.active %>
-      #   <%= f.input :categories, :collection => Category.where(...).order(...) %>
-      #   <%= f.input :status,     :collection => ["Draft", "Published"] %>
-      #   <%= f.input :status,     :collection => [:draft, :published] %>
-      #   <%= f.input :status,     :collection => {"Draft" => 0, "Published" => 1} %>
-      #   <%= f.input :status,     :collection => OrderedHash.new("Draft" => 0, "Published" => 1) %>
-      #   <%= f.input :status,     :collection => [["Draft", 0], ["Published", 1]] %>
-      #   <%= f.input :status,     :collection => grouped_options_for_select(...) %>
-      #   <%= f.input :status,     :collection => options_for_select(...) %>
-      #
-      # @example Specifying if a `:select` should allow multiple selections:
-      #   <%= f.input :cateogies, :as => :select, :multiple => true %>
-      #   <%= f.input :cateogies, :as => :select, :multiple => false %>
-      #
-      # @example Specifying if a `:select` should have a 'blank' first option to prompt selection:
-      #   <%= f.input :author, :as => :select, :include_blank => true %>
-      #   <%= f.input :author, :as => :select, :include_blank => false %>
-      #
-      # @example Specifying the text for a `:select` input's 'blank' first option to prompt selection:
-      #   <%= f.input :author, :as => :select, :prompt => "Select an Author" %>
-      #
-      # @example Modifying an input to suit your needs in `app/inputs`:
-      #   class StringInput < Formtastic::Inputs::StringInput
-      #     def to_html
-      #       puts "this is my custom version of StringInput"      
-      #       super
-      #     end
-      #   end
-      #
-      # @example Creating your own input to suit your needs in `app/inputs`:
-      #   class DatePickerInput
-      #     include Formtastic::Inputs::Base
-      #     def to_html
-      #       # ...
-      #     end
-      #   end
-      #
-      # @example Providing HTML5 placeholder text through i18n:
-      #   en:
-      #    formtastic:
-      #      placeholders:
-      #        user:
-      #          email: "you@yours.com"
-      #          first_name: "Joe"
-      #          last_name: "Smith"
-      #
-      # @todo Many many more examples. Some of the detail probably needs to be pushed out to the relevant methods too.
-      # @todo More i18n examples.
-      def input(method, options = {})
-        options = options.dup # Allow options to be shared without being tainted by Formtastic
-        options[:as] ||= default_input_type(method, options)
-
-        klass = input_class(options[:as])
-        klass.new(self, template, @object, @object_name, method, options).to_html
-      end
 
       # {#inputs} creates an input fieldset and ol tag wrapping for use around a set of inputs.  It can be
       # called either with a block (in which you can do the usual Rails form stuff, HTML, ERB, etc),
@@ -559,49 +334,6 @@ def inline_errors_for(method, options = {}) #:nodoc:
 
       protected
       
-      # Takes the `:as` option and attempts to return the corresponding input class. In the case of
-      # `:as => :string` it will first attempt to find a top level `StringInput` class (to allow the
-      # application to subclass and modify to suit), falling back to `Formtastic::Inputs::StringInput`.
-      #
-      # This also means that the application can define it's own custom inputs in the top level
-      # namespace (eg `DatepickerInput`).
-      #
-      # @param [Symbol] as A symbol representing the type of input to render
-      # @raise [Formtastic::UnknownInputError] An appropriate input class could not be found
-      # @return [Class] An input class constant
-      #
-      # @example Normal use
-      #   input_class(:string) #=> Formtastic::Inputs::StringInput
-      #   input_class(:date) #=> Formtastic::Inputs::DateInput
-      #
-      # @example When a top-level class is found
-      #   input_class(:string) #=> StringInput
-      #   input_class(:awesome) #=> AwesomeInput
-      def input_class(as)
-        @input_classes_cache ||= {}
-        @input_classes_cache[as] ||= begin
-          begin
-            begin
-              custom_input_class_name(as).constantize
-            rescue NameError
-              standard_input_class_name(as).constantize
-            end
-          rescue NameError
-            raise Formtastic::UnknownInputError
-          end
-        end
-      end
-      
-      # :as => :string # => StringInput
-      def custom_input_class_name(as)
-        "#{as.to_s.camelize}Input"
-      end
-
-      # :as => :string # => Formtastic::Inputs::StringInput
-      def standard_input_class_name(as)
-        "Formtastic::Inputs::#{as.to_s.camelize}Input"
-      end
-
       # Collects association columns (relation columns) for the current form object class. Skips
       # polymorphic associations because we can't guess which class to use for an automatically
       # generated input.
@@ -653,56 +385,6 @@ def inputs_for_nested_attributes(*args, &block) #:nodoc:
         semantic_fields_for(*fields_for_args, &fields_for_block)
       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 :number), 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 = 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/
-            return :email     if method.to_s =~ /email/
-            return :url       if method.to_s =~ /^url$|^website$|_url$/
-            return :phone     if method.to_s =~ /(phone|fax)/
-            return :search    if method.to_s =~ /^search$/
-          when :integer
-            return :select    if reflection_for(method)
-            return :number
-          when :float, :decimal
-            return :number
-          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 reflection_for(method)
-
-            return :file    if is_file?(method, options)
-          end
-
-          return :select    if options.key?(:collection)
-          return :password  if method.to_s =~ /password/
-          return :string
-        end
-      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
-
       def field_set_title_from_args(*args) #:nodoc:
         options = args.extract_options!
         options[:name] ||= options.delete(:title)

From 69352975b986e056c66512adab354e0681d6a106 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 11 Apr 2011 21:07:01 +1000
Subject: [PATCH 731/992] hide these from Yard

---
 lib/formtastic/helpers.rb | 1 +
 lib/formtastic/inputs.rb  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/formtastic/helpers.rb b/lib/formtastic/helpers.rb
index 5b16c29df..d43a1ab3e 100644
--- a/lib/formtastic/helpers.rb
+++ b/lib/formtastic/helpers.rb
@@ -1,4 +1,5 @@
 module Formtastic
+  # @private
   module Helpers
     autoload :ButtonsHelper, 'formtastic/helpers/buttons_helper'
     autoload :ErrorsHelper, 'formtastic/helpers/errors_helper'
diff --git a/lib/formtastic/inputs.rb b/lib/formtastic/inputs.rb
index daa8e3cff..f00d3a98b 100644
--- a/lib/formtastic/inputs.rb
+++ b/lib/formtastic/inputs.rb
@@ -1,4 +1,5 @@
 module Formtastic
+  # @private
   module Inputs
     extend ActiveSupport::Autoload
 

From d335b9e567e7f549f1e8927baf89887371cf060c Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 11 Apr 2011 21:15:36 +1000
Subject: [PATCH 732/992] hide the Exception classes from Yard

---
 lib/formtastic.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 57de5d332..e0f10180b 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -14,9 +14,11 @@ module Formtastic
   autoload :Reflection
   autoload :Util
   
+  # @private
   class UnknownInputError < NameError
   end
   
+  # @private
   class PolymorphicInputWithoutCollectionError < ArgumentError
   end
   

From 15cfca2299cdf0508d532d47da96b1ac5ef750fa Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 11 Apr 2011 21:15:51 +1000
Subject: [PATCH 733/992] unhide Inputs from Yard

---
 lib/formtastic/inputs.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/formtastic/inputs.rb b/lib/formtastic/inputs.rb
index f00d3a98b..daa8e3cff 100644
--- a/lib/formtastic/inputs.rb
+++ b/lib/formtastic/inputs.rb
@@ -1,5 +1,4 @@
 module Formtastic
-  # @private
   module Inputs
     extend ActiveSupport::Autoload
 

From 30e7b49b4bb70e60cbc8bb81583cb49befb4acda Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 11 Apr 2011 21:23:31 +1000
Subject: [PATCH 734/992] moved Reflection under Helpers namespace as it's only
 ErrorsHelper and InputHelper that use this now

---
 lib/formtastic.rb                       |  1 -
 lib/formtastic/helpers.rb               |  1 +
 lib/formtastic/helpers/errors_helper.rb |  2 +-
 lib/formtastic/helpers/input_helper.rb  |  2 +-
 lib/formtastic/helpers/reflection.rb    | 12 ++++++++++++
 lib/formtastic/reflection.rb            | 10 ----------
 6 files changed, 15 insertions(+), 13 deletions(-)
 create mode 100644 lib/formtastic/helpers/reflection.rb
 delete mode 100644 lib/formtastic/reflection.rb

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index e0f10180b..074b7688f 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -11,7 +11,6 @@ module Formtastic
   autoload :I18n
   autoload :Inputs
   autoload :LocalizedString
-  autoload :Reflection
   autoload :Util
   
   # @private
diff --git a/lib/formtastic/helpers.rb b/lib/formtastic/helpers.rb
index d43a1ab3e..e790f266e 100644
--- a/lib/formtastic/helpers.rb
+++ b/lib/formtastic/helpers.rb
@@ -10,6 +10,7 @@ module Helpers
     autoload :InputsHelper, 'formtastic/helpers/inputs_helper'
     autoload :LabelHelper, 'formtastic/helpers/label_helper'
     autoload :SemanticFormHelper, 'formtastic/helpers/semantic_form_helper'
+    autoload :Reflection, 'formtastic/helpers/reflection'
   end
 end
 
diff --git a/lib/formtastic/helpers/errors_helper.rb b/lib/formtastic/helpers/errors_helper.rb
index 48c216b29..757e2124c 100644
--- a/lib/formtastic/helpers/errors_helper.rb
+++ b/lib/formtastic/helpers/errors_helper.rb
@@ -2,7 +2,7 @@ module Formtastic
   module Helpers
     module ErrorsHelper
       include Formtastic::Helpers::FileColumnDetection
-      include Formtastic::Reflection
+      include Formtastic::Helpers::Reflection
       include Formtastic::LocalizedString
 
       INLINE_ERROR_TYPES = [:sentence, :list, :first]
diff --git a/lib/formtastic/helpers/input_helper.rb b/lib/formtastic/helpers/input_helper.rb
index 34fa56e3e..e88f26da7 100644
--- a/lib/formtastic/helpers/input_helper.rb
+++ b/lib/formtastic/helpers/input_helper.rb
@@ -35,7 +35,7 @@ module Helpers
     # @see Formtastic::Helpers::InputsHelper#inputs
     # @see Formtastic::Helpers::FormHelper#semantic_form_for
     module InputHelper
-      include Formtastic::Reflection
+      include Formtastic::Helpers::Reflection
       include Formtastic::Helpers::FileColumnDetection
       
       # Returns a chunk of HTML markup for a given `method` on the form object, wrapped in
diff --git a/lib/formtastic/helpers/reflection.rb b/lib/formtastic/helpers/reflection.rb
new file mode 100644
index 000000000..dd8606ea8
--- /dev/null
+++ b/lib/formtastic/helpers/reflection.rb
@@ -0,0 +1,12 @@
+module Formtastic
+  module Helpers
+    # @private
+    module Reflection
+      # 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
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/formtastic/reflection.rb b/lib/formtastic/reflection.rb
deleted file mode 100644
index b0558996d..000000000
--- a/lib/formtastic/reflection.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module Formtastic
-  # @private
-  module Reflection
-    # 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
-  end
-end
\ No newline at end of file

From 17e3d2c37d811d1a70911c19f34bfa45baa9a612 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 13 Apr 2011 20:46:15 +1000
Subject: [PATCH 735/992] deprecated errors_on/inline_errors_for helper

---
 lib/formtastic/helpers/inputs_helper.rb |  5 ++++-
 spec/errors_spec.rb                     | 20 ++++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 5a46b62d3..5ff3bb39f 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -322,7 +322,10 @@ def inputs(*args, &block)
       #       <%= f.errors_on(:body) %>
       #     </li>
       #   <% end %>
-      def inline_errors_for(method, options = {}) #:nodoc:
+      #
+      # @deprecated See the README for the currently supported approach to custom inputs.
+      def inline_errors_for(method, options = {})
+        ActiveSupport::Deprecation.warn('inline_errors_for and errors_on are deprecated and will be removed on or after version 2.1', caller)
         if render_inline_errors?
           errors = error_keys(method, options).map{|x| @object.errors[x] }.flatten.compact.uniq
           send(:"error_#{inline_errors}", [*errors], options) if errors.any?
diff --git a/spec/errors_spec.rb b/spec/errors_spec.rb
index 62759dafe..c0ccf9eff 100644
--- a/spec/errors_spec.rb
+++ b/spec/errors_spec.rb
@@ -116,10 +116,12 @@
     end
 
     it 'should return nil when inline_errors config is :sentence, :list or :none' do
-      [:sentence, :list, :none].each do |config|
-        with_config :inline_errors, config do
-          semantic_form_for(@new_post) do |builder|
-            builder.errors_on(:title).should be_nil
+      with_deprecation_silenced do
+        [:sentence, :list, :none].each do |config|
+          with_config :inline_errors, config do
+            semantic_form_for(@new_post) do |builder|
+              builder.errors_on(:title).should be_nil
+            end
           end
         end
       end
@@ -132,10 +134,12 @@
     end
 
     it 'should return nil when inline_errors config is :sentence, :list or :none' do
-      [:sentence, :list, :none].each do |config|
-        Formtastic::FormBuilder.inline_errors = config
-        semantic_form_for(@new_post) do |builder|
-          builder.errors_on(:title).should be_nil
+      with_deprecation_silenced do
+        [:sentence, :list, :none].each do |config|
+          Formtastic::FormBuilder.inline_errors = config
+          semantic_form_for(@new_post) do |builder|
+            builder.errors_on(:title).should be_nil
+          end
         end
       end
     end

From 204064034b9db2004c88e0349107896372f61f33 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 13 Apr 2011 20:59:20 +1000
Subject: [PATCH 736/992] shift errors_on/inline_errors_for into ErrorsHelper

---
 lib/formtastic/helpers/errors_helper.rb | 32 +++++++++++++++++++++++++
 lib/formtastic/helpers/inputs_helper.rb | 31 ------------------------
 2 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/lib/formtastic/helpers/errors_helper.rb b/lib/formtastic/helpers/errors_helper.rb
index 757e2124c..4dd763313 100644
--- a/lib/formtastic/helpers/errors_helper.rb
+++ b/lib/formtastic/helpers/errors_helper.rb
@@ -54,6 +54,38 @@ def semantic_errors(*args)
           Formtastic::Util.html_safe(full_errors.map { |error| template.content_tag(:li, Formtastic::Util.html_safe(error)) }.join)
         end
       end
+      
+      # Generates error messages for the given method, used for displaying errors right near the
+      # field for data entry. Uses the `:inline_errors` config to determin the right presentation,
+      # which may be an ordered list, a paragraph sentence containing all errors, or a paragraph
+      # containing just the first error. If configred to `:none`, no error is shown.
+      #
+      # See the `:inline_errors` config documentation for more details.
+      #
+      # This method is mostly used internally, but can be used in your forms when creating your own
+      # custom inputs, so it's been made public and aliased to `errors_on`.
+      #
+      # @example
+      #   <%= semantic_form_for @post do |f| %>
+      #     <li class='my-custom-text-input'>
+      #       <%= f.label(:body) %>
+      #       <%= f.text_field(:body) %>
+      #       <%= f.errors_on(:body) %>
+      #     </li>
+      #   <% end %>
+      #
+      # @deprecated See the README for the currently supported approach to custom inputs.
+      def inline_errors_for(method, options = {})
+        ActiveSupport::Deprecation.warn('inline_errors_for and errors_on are deprecated and will be removed on or after version 2.1', caller)
+        if render_inline_errors?
+          errors = error_keys(method, options).map{|x| @object.errors[x] }.flatten.compact.uniq
+          send(:"error_#{inline_errors}", [*errors], options) if errors.any?
+        else
+          nil
+        end
+      end
+      alias :errors_on :inline_errors_for
+      
 
       protected
 
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 5ff3bb39f..d6ef0d63b 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -304,37 +304,6 @@ def inputs(*args, &block)
         out
       end
 
-      # Generates error messages for the given method, used for displaying errors right near the
-      # field for data entry. Uses the `:inline_errors` config to determin the right presentation,
-      # which may be an ordered list, a paragraph sentence containing all errors, or a paragraph
-      # containing just the first error. If configred to `:none`, no error is shown.
-      #
-      # See the `:inline_errors` config documentation for more details.
-      #
-      # This method is mostly used internally, but can be used in your forms when creating your own
-      # custom inputs, so it's been made public and aliased to `errors_on`.
-      #
-      # @example
-      #   <%= semantic_form_for @post do |f| %>
-      #     <li class='my-custom-text-input'>
-      #       <%= f.label(:body) %>
-      #       <%= f.text_field(:body) %>
-      #       <%= f.errors_on(:body) %>
-      #     </li>
-      #   <% end %>
-      #
-      # @deprecated See the README for the currently supported approach to custom inputs.
-      def inline_errors_for(method, options = {})
-        ActiveSupport::Deprecation.warn('inline_errors_for and errors_on are deprecated and will be removed on or after version 2.1', caller)
-        if render_inline_errors?
-          errors = error_keys(method, options).map{|x| @object.errors[x] }.flatten.compact.uniq
-          send(:"error_#{inline_errors}", [*errors], options) if errors.any?
-        else
-          nil
-        end
-      end
-      alias :errors_on :inline_errors_for
-
       protected
       
       # Collects association columns (relation columns) for the current form object class. Skips

From 45f979074639c6ef04012cdfb81c97d7ab9db674 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 14 Apr 2011 07:13:11 +1000
Subject: [PATCH 737/992] small refactoring of inputs()

---
 lib/formtastic/helpers/inputs_helper.rb | 31 ++++++++++++++-----------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index d6ef0d63b..9fcab37ca 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -280,21 +280,10 @@ def inputs(*args, &block)
           elsif block_given?
             field_set_and_list_wrapping(*(args << html_options), &block)
           else
-            if @object && args.empty?
-              args  = association_columns(:belongs_to)
-              args += content_columns
-              args -= SKIPPED_COLUMNS
-              args.compact!
-            end
             legend = args.shift if args.first.is_a?(::String)
-            contents = args.collect do |method| 
-              if @object && (@object.class.reflect_on_association(method.to_sym) && @object.class.reflect_on_association(method.to_sym).options[:polymorphic] == true)
-                raise PolymorphicInputWithoutCollectionError.new("Please provide a collection for :#{method} input (you'll need to use block form syntax). Inputs for polymorphic associations can only be used when an explicit :collection is provided.")
-              end
-              input(method.to_sym)
-            end
+            args = default_columns_for_object if @object && args.empty?
+            contents = fieldset_contents_from_column_list(args)
             args.unshift(legend) if legend.present?
-          
             field_set_and_list_wrapping(*((args << html_options) << contents))
           end
         end
@@ -306,6 +295,22 @@ def inputs(*args, &block)
 
       protected
       
+      def default_columns_for_object
+        cols  = association_columns(:belongs_to)
+        cols += content_columns
+        cols -= SKIPPED_COLUMNS
+        cols.compact
+      end
+      
+      def fieldset_contents_from_column_list(columns)
+        columns.collect do |method| 
+          if @object && (@object.class.reflect_on_association(method.to_sym) && @object.class.reflect_on_association(method.to_sym).options[:polymorphic] == true)
+            raise PolymorphicInputWithoutCollectionError.new("Please provide a collection for :#{method} input (you'll need to use block form syntax). Inputs for polymorphic associations can only be used when an explicit :collection is provided.")
+          end
+          input(method.to_sym)
+        end
+      end
+      
       # Collects association columns (relation columns) for the current form object class. Skips
       # polymorphic associations because we can't guess which class to use for an automatically
       # generated input.

From 4cfd00806d9f87ad1b60178e6f21303c75b126dc Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 14 Apr 2011 16:23:20 +1000
Subject: [PATCH 738/992] shuffled a lot of specs around into folders

---
 spec/{ => builder}/custom_builder_spec.rb     |  0
 spec/{ => builder}/error_proc_spec.rb         |  0
 spec/{ => builder}/errors_spec.rb             |  0
 .../{ => builder}/semantic_fields_for_spec.rb |  0
 spec/defaults_spec.rb                         | 20 -------------------
 .../buttons_helper_spec.rb}                   |  0
 .../commit_button_helper_spec.rb}             |  0
 spec/{ => helpers}/form_helper_spec.rb        |  0
 .../input_helper_spec.rb}                     |  0
 .../inputs_helper_spec.rb}                    |  0
 .../semantic_errors_helper_spec.rb}           |  0
 spec/{new => inputs}/custom_input_spec.rb     |  0
 spec/{ => inputs}/include_blank_spec.rb       |  0
 spec/{ => inputs}/label_spec.rb               |  0
 14 files changed, 20 deletions(-)
 rename spec/{ => builder}/custom_builder_spec.rb (100%)
 rename spec/{ => builder}/error_proc_spec.rb (100%)
 rename spec/{ => builder}/errors_spec.rb (100%)
 rename spec/{ => builder}/semantic_fields_for_spec.rb (100%)
 delete mode 100644 spec/defaults_spec.rb
 rename spec/{buttons_spec.rb => helpers/buttons_helper_spec.rb} (100%)
 rename spec/{commit_button_spec.rb => helpers/commit_button_helper_spec.rb} (100%)
 rename spec/{ => helpers}/form_helper_spec.rb (100%)
 rename spec/{input_spec.rb => helpers/input_helper_spec.rb} (100%)
 rename spec/{inputs_spec.rb => helpers/inputs_helper_spec.rb} (100%)
 rename spec/{semantic_errors_spec.rb => helpers/semantic_errors_helper_spec.rb} (100%)
 rename spec/{new => inputs}/custom_input_spec.rb (100%)
 rename spec/{ => inputs}/include_blank_spec.rb (100%)
 rename spec/{ => inputs}/label_spec.rb (100%)

diff --git a/spec/custom_builder_spec.rb b/spec/builder/custom_builder_spec.rb
similarity index 100%
rename from spec/custom_builder_spec.rb
rename to spec/builder/custom_builder_spec.rb
diff --git a/spec/error_proc_spec.rb b/spec/builder/error_proc_spec.rb
similarity index 100%
rename from spec/error_proc_spec.rb
rename to spec/builder/error_proc_spec.rb
diff --git a/spec/errors_spec.rb b/spec/builder/errors_spec.rb
similarity index 100%
rename from spec/errors_spec.rb
rename to spec/builder/errors_spec.rb
diff --git a/spec/semantic_fields_for_spec.rb b/spec/builder/semantic_fields_for_spec.rb
similarity index 100%
rename from spec/semantic_fields_for_spec.rb
rename to spec/builder/semantic_fields_for_spec.rb
diff --git a/spec/defaults_spec.rb b/spec/defaults_spec.rb
deleted file mode 100644
index 2dedbbd0e..000000000
--- a/spec/defaults_spec.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-
-describe 'Formtastic::FormBuilder-defaults' do
-
-  # Note: This spec might make better sense somewhere else. Just temporary.
-
-  describe "required string" do
-
-    it "should render proc with I18n correctly" do
-      ::I18n.backend.store_translations :en, :formtastic => {:required => 'Haha!'}
-
-      required_string = Formtastic::FormBuilder.required_string
-      required_string = required_string.is_a?(::Proc) ? required_string.call : required_string.to_s
-      required_string.should == %{<abbr title="Haha!">*</abbr>}
-    end
-
-  end
-
-end
diff --git a/spec/buttons_spec.rb b/spec/helpers/buttons_helper_spec.rb
similarity index 100%
rename from spec/buttons_spec.rb
rename to spec/helpers/buttons_helper_spec.rb
diff --git a/spec/commit_button_spec.rb b/spec/helpers/commit_button_helper_spec.rb
similarity index 100%
rename from spec/commit_button_spec.rb
rename to spec/helpers/commit_button_helper_spec.rb
diff --git a/spec/form_helper_spec.rb b/spec/helpers/form_helper_spec.rb
similarity index 100%
rename from spec/form_helper_spec.rb
rename to spec/helpers/form_helper_spec.rb
diff --git a/spec/input_spec.rb b/spec/helpers/input_helper_spec.rb
similarity index 100%
rename from spec/input_spec.rb
rename to spec/helpers/input_helper_spec.rb
diff --git a/spec/inputs_spec.rb b/spec/helpers/inputs_helper_spec.rb
similarity index 100%
rename from spec/inputs_spec.rb
rename to spec/helpers/inputs_helper_spec.rb
diff --git a/spec/semantic_errors_spec.rb b/spec/helpers/semantic_errors_helper_spec.rb
similarity index 100%
rename from spec/semantic_errors_spec.rb
rename to spec/helpers/semantic_errors_helper_spec.rb
diff --git a/spec/new/custom_input_spec.rb b/spec/inputs/custom_input_spec.rb
similarity index 100%
rename from spec/new/custom_input_spec.rb
rename to spec/inputs/custom_input_spec.rb
diff --git a/spec/include_blank_spec.rb b/spec/inputs/include_blank_spec.rb
similarity index 100%
rename from spec/include_blank_spec.rb
rename to spec/inputs/include_blank_spec.rb
diff --git a/spec/label_spec.rb b/spec/inputs/label_spec.rb
similarity index 100%
rename from spec/label_spec.rb
rename to spec/inputs/label_spec.rb

From 3fb514776224da02d5d392961023d48dfc13addf Mon Sep 17 00:00:00 2001
From: DeLynn Berry <delynn@gmail.com>
Date: Sun, 17 Apr 2011 23:58:39 -0600
Subject: [PATCH 739/992] Make sure the method attribute is returned when an
 association doesn't exist.

---
 lib/formtastic/inputs/base/associations.rb |   8 +-
 spec/inputs/select_input_spec.rb           | 194 +++++++++++----------
 2 files changed, 108 insertions(+), 94 deletions(-)

diff --git a/lib/formtastic/inputs/base/associations.rb b/lib/formtastic/inputs/base/associations.rb
index c9c29ec0f..1b95c3acd 100644
--- a/lib/formtastic/inputs/base/associations.rb
+++ b/lib/formtastic/inputs/base/associations.rb
@@ -7,21 +7,23 @@ module Associations
         def association
           @association ||= reflection.macro if reflection
         end
-        
+
         def reflection
           @reflection ||= object.class.reflect_on_association(method) if object.class.respond_to?(:reflect_on_association)
         end
-        
+
         def belongs_to?
           association == :belongs_to
         end
-        
+
         def association_primary_key
           if association
             return reflection.options[:foreign_key] unless reflection.options[:foreign_key].blank?
             return reflection.foreign_key if reflection.respond_to?(:foreign_key)
             return :"#{method}_id" if belongs_to?
             return "#{method.to_s.singularize}_id".pluralize.to_sym
+          else
+            return method.to_s
           end
         end
 
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 5f9fdce87..50c610f06 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -9,7 +9,7 @@
     @output_buffer = ''
     mock_everything
   end
-  
+
   describe 'explicit values' do
     describe 'using an array of values' do
       before do
@@ -20,7 +20,7 @@
           concat(builder.input(:title, :as => :select, :collection => @array_with_keys_and_values))
         end)
       end
-  
+
       it 'should have a option for each key and/or value' do
         @array_with_values.each do |v|
           output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
@@ -30,22 +30,22 @@
         end
       end
     end
-    
+
     describe "using a related model without reflection's options (Mongoid Document)" do
-      before do 
+      before do
         @new_post.stub!(:mongoid_reviewer)
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:mongoid_reviewer, :as => :select))
         end)
       end
-      
+
       it 'should draw select options' do
         output_buffer.should have_tag('form li select')
         output_buffer.should have_tag('form li select#post_reviewer_id')
         output_buffer.should_not have_tag('form li select#post_mongoid_reviewer_id')
       end
     end
-  
+
     describe 'using a range' do
       before do
         @range_with_values = 1..5
@@ -53,14 +53,14 @@
           concat(builder.input(:title, :as => :select, :collection => @range_with_values))
         end)
       end
-  
+
       it 'should have an option for each value' do
         @range_with_values.each do |v|
           output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
         end
       end
     end
-  
+
     describe 'using a string' do
       before do
         @string ="<option value='0'>0</option><option value='1'>1</option>"
@@ -68,7 +68,7 @@
           concat(builder.input(:title, :as => :select, :collection => @string))
         end)
       end
-  
+
       it 'should render select options using provided HTML string' do
         2.times do |v|
           output_buffer.should have_tag("form li select option[@value='#{v}']", /^#{v}$/)
@@ -76,50 +76,50 @@
       end
     end
   end
-  
+
   describe 'for boolean columns' do
     describe 'default formtastic locale' do
       before do
         # Note: Works, but something like Formtastic.root.join(...) would probably be "safer".
         ::I18n.load_path = [File.join(File.dirname(__FILE__), *%w[.. .. lib locale en.yml])]
         ::I18n.backend.send(:init_translations)
-  
+
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:published, :as => :select))
         end)
       end
-  
+
       after do
         ::I18n.backend.store_translations :en, {}
       end
-  
+
       it 'should render a select with at least options: true/false' do
         output_buffer.should have_tag("form li select option[@value='true']", /^Yes$/)
         output_buffer.should have_tag("form li select option[@value='false']", /^No$/)
       end
     end
-  
+
     describe 'custom locale' do
       before do
         @boolean_select_labels = {:yes => 'Yep', :no => 'Nope'}
         ::I18n.backend.store_translations :en, :formtastic => @boolean_select_labels
-  
+
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:published, :as => :select))
         end)
       end
-  
+
       after do
         ::I18n.backend.store_translations :en, {}
       end
-  
+
       it 'should render a select with at least options: true/false' do
         output_buffer.should have_tag("form li select option[@value='true']", /#{@boolean_select_labels[:yes]}/)
         output_buffer.should have_tag("form li select option[@value='false']", /#{@boolean_select_labels[:no]}/)
       end
     end
   end
-  
+
   describe 'for a belongs_to association' do
     before do
       concat(semantic_form_for(@new_post) do |builder|
@@ -127,7 +127,7 @@
         concat(builder.input(:reviewer, :as => :select))
       end)
     end
-  
+
     it_should_have_input_wrapper_with_class("select")
     it_should_have_input_wrapper_with_id("post_author_input")
     it_should_have_label_with_text(/Author/)
@@ -135,68 +135,68 @@
     it_should_apply_error_logic_for_input_type(:select)
     it_should_call_find_on_association_class_when_no_collection_is_provided(:select)
     it_should_use_the_collection_when_provided(:select, 'option')
-    
+
     it 'should have a select inside the wrapper' do
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#post_author_id')
       output_buffer.should have_tag('form li select#post_reviewer_id')
     end
-    
+
     it 'should have a valid name' do
       output_buffer.should have_tag("form li select[@name='post[author_id]']")
       output_buffer.should_not have_tag("form li select[@name='post[author_id][]']")
       output_buffer.should_not have_tag("form li select[@name='post[reviewer_id][]']")
     end
-    
+
     it 'should not create a multi-select' do
       output_buffer.should_not have_tag('form li select[@multiple]')
     end
-    
+
     it 'should create a select without size' do
       output_buffer.should_not have_tag('form li select[@size]')
     end
-    
+
     it 'should have a blank option' do
       output_buffer.should have_tag("form li select option[@value='']")
     end
-    
+
     it 'should have a select option for each Author' do
       output_buffer.should have_tag("form li select[@name='post[author_id]'] option", :count => ::Author.all.size + 1)
       ::Author.all.each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
       end
     end
-    
+
     it 'should have one option with a "selected" attribute (bob)' do
       output_buffer.should have_tag("form li select[@name='post[author_id]'] option[@selected]", :count => 1)
     end
-    
+
     it 'should not singularize the association name' do
       @new_post.stub!(:author_status).and_return(@bob)
       @new_post.stub!(:author_status_id).and_return(@bob.id)
       @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => :integer, :limit => 255))
-    
+
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author_status, :as => :select))
       end)
-    
+
       output_buffer.should have_tag('form li select#post_author_status_id')
     end
   end
-  
+
   describe "for a belongs_to association with :group_by => :author" do
     it "should call author.posts" do
       ::Author.stub!(:reflect_on_all_associations).and_return { |macro| macro == :has_many ? [mock('reflection', :klass => Post, :name => :posts)] : []}
-      
+
       [@freds_post].each { |post| post.stub!(:to_label).and_return("Post - #{post.id}") }
       @fred.should_receive(:posts)
-  
+
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:main_post, :as => :select, :group_by => :author ) )
       end)
     end
   end
-  
+
   describe "for a belongs_to association with :conditions" do
     before do
       ::Post.stub!(:reflect_on_association).with(:author).and_return do
@@ -205,24 +205,24 @@
         mock
       end
     end
-  
+
     it "should call author.find with association conditions" do
       ::Author.should_receive(:where).with(:active => true)
-  
+
       semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select))
       end
     end
-  
+
     it "should call author.find with association conditions and find_options conditions" do
       ::Author.should_receive(:where).with({:active => true, :publisher => true})
-    
+
       semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select, :find_options => {:conditions => {:publisher => true}}))
       end
     end
   end
-  
+
   describe 'for a belongs_to association with :group_by => :continent' do
     before do
       @authors = [@bob, @fred, @fred, @fred]
@@ -230,17 +230,17 @@
       @continent_names = %w(Europe Africa)
       @continents = (0..1).map { |i| c = ::Continent.new; c.stub!(:id).and_return(100 - i);c }
       @authors[0..1].each_with_index { |author, i| author.stub!(:continent).and_return(@continents[i]) }
-      
+
       ::Continent.stub!(:reflect_on_all_associations).and_return { |macro| macro == :has_many ? [mock('reflection', :klass => Author, :name => :authors)] : [] }
       ::Continent.stub!(:reflect_on_association).and_return {|column_name| mock('reflection', :klass => Author) if column_name == :authors}
       ::Author.stub!(:reflect_on_association).and_return { |column_name| mock('reflection', :options => {}, :klass => Continent, :macro => :belongs_to) if column_name == :continent }
-  
-  
+
+
       @continents.each_with_index do |continent, i|
         continent.stub!(:to_label).and_return(@continent_names[i])
         continent.stub!(:authors).and_return([@authors[i]])
       end
-  
+
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select, :group_by => :continent ) )
         concat(builder.input(:author, :as => :select, :group_by => :continent, :group_label_method => :id ) )
@@ -248,57 +248,57 @@
         concat(builder.input(:author, :as => :select, :group_by => :continent, :label_method => :login, :group_label_method => :id ) )
       end)
     end
-  
+
     it_should_have_input_wrapper_with_class("select")
     it_should_have_input_wrapper_with_id("post_author_input")
     it_should_have_label_with_text(/Author/)
     it_should_have_label_for('post_author_id')
-  
+
     # TODO, need to find a way to repeat some of the specs and logic from the belongs_to specs without grouping
-  
+
     0.upto(1) do |i|
       it 'should have all option groups and the right values' do
         output_buffer.should have_tag("form li select optgroup[@label='#{@continent_names[i]}']", @authors[i].to_label)
       end
-  
+
       it 'should have custom group labels' do
         output_buffer.should have_tag("form li select optgroup[@label='#{@continents[i].id}']", @authors[i].to_label)
       end
-  
+
       it 'should have custom author labels' do
         output_buffer.should have_tag("form li select optgroup[@label='#{@continent_names[i]}']", @authors[i].login)
       end
-  
+
       it 'should have custom author and group labels' do
         output_buffer.should have_tag("form li select optgroup[@label='#{@continents[i].id}']", @authors[i].login)
       end
     end
-  
+
     it 'should have no duplicate groups' do
       output_buffer.should have_tag('form li select optgroup', :count => 8)
     end
-  
+
     it 'should sort the groups on the label method' do
       output_buffer.should have_tag("form li select optgroup[@label='Africa']")
       output_buffer.should have_tag("form li select optgroup[@label='99']")
     end
-  
+
     it 'should call find with :include for more optimized queries' do
       Author.should_receive(:where).with(:include => :continent)
-  
+
       semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select, :group_by => :continent ) )
       end
     end
   end
-  
+
   describe 'for a has_many association' do
     before do
       concat(semantic_form_for(@fred) do |builder|
         concat(builder.input(:posts, :as => :select))
       end)
     end
-  
+
     it_should_have_input_wrapper_with_class("select")
     it_should_have_input_wrapper_with_id("author_posts_input")
     it_should_have_label_with_text(/Post/)
@@ -306,55 +306,55 @@
     it_should_apply_error_logic_for_input_type(:select)
     it_should_call_find_on_association_class_when_no_collection_is_provided(:select)
     it_should_use_the_collection_when_provided(:select, 'option')
-  
+
     it 'should have a select inside the wrapper' do
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#author_post_ids')
     end
-  
+
     it 'should have a multi-select select' do
       output_buffer.should have_tag('form li select[@multiple="multiple"]')
     end
-  
+
     it 'should have a select option for each Post' do
       output_buffer.should have_tag('form li select option', :count => ::Post.all.size)
       ::Post.all.each do |post|
         output_buffer.should have_tag("form li select option[@value='#{post.id}']", /#{post.to_label}/)
       end
     end
-  
+
     it 'should not have a blank option by default' do
       output_buffer.should_not have_tag("form li select option[@value='']")
     end
-  
+
     it 'should respect the :include_blank option for single selects' do
       concat(semantic_form_for(@fred) do |builder|
         concat(builder.input(:posts, :as => :select, :multiple => false, :include_blank => true))
       end)
-  
+
       output_buffer.should have_tag("form li select option[@value='']")
     end
-  
+
     it 'should respect the :include_blank option for multiple selects' do
       concat(semantic_form_for(@fred) do |builder|
         concat(builder.input(:posts, :as => :select, :multiple => true, :include_blank => true))
       end)
-  
+
       output_buffer.should have_tag("form li select option[@value='']")
     end
-  
+
     it 'should have one option with a "selected" attribute' do
       output_buffer.should have_tag('form li select option[@selected]', :count => 1)
     end
   end
-  
+
   describe 'for a has_and_belongs_to_many association' do
     before do
       concat(semantic_form_for(@freds_post) do |builder|
         concat(builder.input(:authors, :as => :select))
       end)
     end
-  
+
     it_should_have_input_wrapper_with_class("select")
     it_should_have_input_wrapper_with_id("post_authors_input")
     it_should_have_label_with_text(/Author/)
@@ -362,48 +362,48 @@
     it_should_apply_error_logic_for_input_type(:select)
     it_should_call_find_on_association_class_when_no_collection_is_provided(:select)
     it_should_use_the_collection_when_provided(:select, 'option')
-  
+
     it 'should have a select inside the wrapper' do
       output_buffer.should have_tag('form li select')
       output_buffer.should have_tag('form li select#post_author_ids')
     end
-  
+
     it 'should have a multi-select select' do
       output_buffer.should have_tag('form li select[@multiple="multiple"]')
     end
-  
+
     it 'should have a select option for each Author' do
       output_buffer.should have_tag('form li select option', :count => ::Author.all.size)
       ::Author.all.each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
       end
     end
-  
+
     it 'should not have a blank option by default' do
       output_buffer.should_not have_tag("form li select option[@value='']")
     end
-  
+
     it 'should respect the :include_blank option for single selects' do
       concat(semantic_form_for(@freds_post) do |builder|
         concat(builder.input(:authors, :as => :select, :multiple => false, :include_blank => true))
       end)
-  
+
       output_buffer.should have_tag("form li select option[@value='']")
     end
-  
+
     it 'should respect the :include_blank option for multiple selects' do
       concat(semantic_form_for(@freds_post) do |builder|
         concat(builder.input(:authors, :as => :select, :multiple => true, :include_blank => true))
       end)
-  
+
       output_buffer.should have_tag("form li select option[@value='']")
     end
-  
+
     it 'should have one option with a "selected" attribute' do
       output_buffer.should have_tag('form li select option[@selected]', :count => 1)
     end
   end
-  
+
   describe 'when :prompt => "choose something" is set' do
     before do
       @new_post.stub!(:author_id).and_return(nil)
@@ -411,40 +411,52 @@
         concat(builder.input(:author, :as => :select, :prompt => "choose author"))
       end)
     end
-  
+
     it 'should have a select with prompt' do
       output_buffer.should have_tag("form li select option[@value='']", /choose author/)
     end
-  
+
     it 'should not have a blank select option' do
       output_buffer.should_not have_tag("form li select option[@value='']", "")
     end
   end
-  
+
   describe 'when no object is given' do
     before(:each) do
       concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:author, :as => :select, :collection => ::Author.all))
       end)
     end
-  
+
     it 'should generate label' do
       output_buffer.should have_tag('form li label', /Author/)
       output_buffer.should have_tag("form li label[@for='project_author']")
     end
-  
+
     it 'should generate select inputs' do
       output_buffer.should have_tag('form li select#project_author')
       output_buffer.should have_tag('form li select option', :count => ::Author.all.size + 1)
     end
-  
+
     it 'should generate an option to each item' do
       ::Author.all.each do |author|
         output_buffer.should have_tag("form li select option[@value='#{author.id}']", /#{author.to_label}/)
       end
     end
   end
-  
+
+  describe 'when no association exists' do
+    before(:each) do
+      concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        concat(builder.input(:author_name, :as => :select, :collection => ::Author.all))
+      end)
+    end
+
+    it 'should still generate a valid name attribute' do
+      output_buffer.should have_tag("form li select[@name='project[author_name]']")
+    end
+  end
+
   describe 'when a grouped collection collection is given' do
     before(:each) do
       concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
@@ -454,7 +466,7 @@
         concat(builder.input(:author, :as => :select, :collection => grouped_options_for_select(@grouped_opts, "hands")))
       end)
     end
-  
+
     it 'should generate an option to each item' do
       @grouped_opts.each do |opt_pair|
         output_buffer.should have_tag("form li select optgroup[@label='#{opt_pair[0]}']")
@@ -465,14 +477,14 @@
       output_buffer.should have_tag("form li select optgroup option[@selected]","hands")
     end
   end
-  
+
   describe "enum" do
     before do
       @output_buffer = ''
       @some_meta_descriptions = ["One", "Two", "Three"]
       @new_post.stub!(:meta_description).any_number_of_times
     end
-  
+
     describe ":as is not set" do
       before do
         concat(semantic_form_for(@new_post) do |builder|
@@ -482,12 +494,12 @@
           concat(builder.input(:meta_description, :collection => @some_meta_descriptions))
         end)
       end
-  
+
       it "should render a select field" do
         output_buffer.should have_tag("form li select", :count => 2)
       end
     end
-  
+
     describe ":as is set" do
       before do
         # Should not be a case, but just checking :as got highest priority in setting input type.
@@ -498,13 +510,13 @@
           concat(builder.input(:meta_description, :as => :string, :collection => @some_meta_descriptions))
         end)
       end
-  
+
       it "should render a text field" do
         output_buffer.should have_tag("form li input[@type='text']", :count => 2)
       end
     end
   end
-  
+
   describe 'when a namespace is provided' do
     before do
       concat(semantic_form_for(@freds_post, :namespace => 'context2') do |builder|
@@ -515,7 +527,7 @@
     it_should_have_select_with_id("context2_post_author_ids")
     it_should_have_label_for("context2_post_author_ids")
   end
-  
+
   context "when required" do
     it "should add the required attribute to the select's html options" do
       concat(semantic_form_for(@new_post) do |builder|
@@ -524,5 +536,5 @@
       output_buffer.should have_tag("select[@required]")
     end
   end
-  
+
 end

From 6edfbfb01786c389c1678d6fcfbb6e075f9e18ce Mon Sep 17 00:00:00 2001
From: Thomas Walpole <twalpole@gmail.com>
Date: Mon, 2 May 2011 17:31:22 -0700
Subject: [PATCH 740/992] verify value is taken from object

---
 lib/formtastic/inputs/hidden_input.rb | 2 +-
 spec/inputs/hidden_input_spec.rb      | 4 ++++
 spec/spec_helper.rb                   | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic/inputs/hidden_input.rb b/lib/formtastic/inputs/hidden_input.rb
index 134039e0d..347cb1b1a 100644
--- a/lib/formtastic/inputs/hidden_input.rb
+++ b/lib/formtastic/inputs/hidden_input.rb
@@ -36,7 +36,7 @@ class HiddenInput
       #
       # @todo this is inconsistent with all other inputs, deprecate and remove
       def input_html_options
-        {:value => options[:value]}.merge(super).merge(:required => nil)
+        options.slice(:value).merge(super).merge(:required => nil)
       end
       
       def to_html
diff --git a/spec/inputs/hidden_input_spec.rb b/spec/inputs/hidden_input_spec.rb
index 4e959e0cb..3dc41c6d4 100644
--- a/spec/inputs/hidden_input_spec.rb
+++ b/spec/inputs/hidden_input_spec.rb
@@ -28,6 +28,10 @@
     output_buffer.should have_tag("form li input#post_secret[@name=\"post[secret]\"]")
   end
 
+  it "should get value from the object" do
+    output_buffer.should have_tag("form li input#post_secret[@type=\"hidden\"][@value=\"1\"]")
+  end
+  
   it "should pass any explicitly specified value - using :value" do
     output_buffer.should have_tag("form li input#post_author_id[@type=\"hidden\"][@value=\"99\"]")
   end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 0568a66bf..f9c31904b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -181,7 +181,7 @@ def new_author_path; "/authors/new"; end
     @new_post.stub!(:to_key).and_return(nil)
     @new_post.stub!(:to_model).and_return(@new_post)
     @new_post.stub!(:persisted?).and_return(nil)
-
+    
     @freds_post = mock('post')
     @freds_post.stub!(:to_ary)
     @freds_post.stub!(:class).and_return(::Post)
@@ -248,7 +248,7 @@ def new_author_path; "/authors/new"; end
     @new_post.stub!(:published)
     @new_post.stub!(:publish_at)
     @new_post.stub!(:created_at)
-    @new_post.stub!(:secret)
+    @new_post.stub!(:secret).and_return(1)
     @new_post.stub!(:url)
     @new_post.stub!(:email)
     @new_post.stub!(:search)

From 9fd19b0a5ad8197a2c92249e570be5b353ef539c Mon Sep 17 00:00:00 2001
From: Konstantin Shabanov <etehtsea@gmail.com>
Date: Tue, 26 Apr 2011 21:51:27 +0700
Subject: [PATCH 741/992] bump rails dep to ~> 3.0

---
 formtastic.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index f2558b223..48f7c4035 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}
 
-  s.add_dependency(%q<rails>, ["~> 3.0.0"])
+  s.add_dependency(%q<rails>, ["~> 3.0"])
 
   s.add_development_dependency(%q<rspec-rails>, ["~> 2.5"])
   s.add_development_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])

From 6971a1527359cc151624c5a84f1b37dd907c819f Mon Sep 17 00:00:00 2001
From: Thomas Walpole <twalpole@gmail.com>
Date: Tue, 3 May 2011 19:10:24 -0700
Subject: [PATCH 742/992] Multiple selects need to have [] appended to their
 name attributes to be able to submit data properly

---
 lib/formtastic/inputs/select_input.rb | 4 ++--
 spec/inputs/select_input_spec.rb      | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index 80aaa2b1e..6e9cd0b59 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -183,7 +183,7 @@ def input_html_options
       def extra_input_html_options
         {
           :multiple => multiple_by_association?,
-          :name => "#{object_name}[#{association_primary_key}]"
+          :name => "#{object_name}[#{association_primary_key}]#{'[]' if multiple?}"
         }
       end
       
@@ -202,7 +202,7 @@ def multiple?
       def single?
         !multiple?
       end
-        
+
     end
   end
 end
\ No newline at end of file
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 50c610f06..45c6d3af4 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -315,7 +315,11 @@
     it 'should have a multi-select select' do
       output_buffer.should have_tag('form li select[@multiple="multiple"]')
     end
-
+    
+    it 'should append [] to the name attribute for multiple select' do
+      output_buffer.should have_tag('form li select[@multiple="multiple"][@name="author[post_ids][]"]')
+    end
+    
     it 'should have a select option for each Post' do
       output_buffer.should have_tag('form li select option', :count => ::Post.all.size)
       ::Post.all.each do |post|

From 80b05914492d188d84c739babdc0b3f92f4b4425 Mon Sep 17 00:00:00 2001
From: Edgars Beigarts <edgars.beigarts@makit.lv>
Date: Tue, 3 May 2011 13:01:30 +0300
Subject: [PATCH 743/992] Refactored associations. There is not
 Reflection#options for mongoid.

---
 lib/formtastic/helpers/errors_helper.rb    | 14 +-------------
 lib/formtastic/helpers/reflection.rb       | 21 +++++++++++++++++++++
 lib/formtastic/inputs/base/associations.rb | 14 ++++----------
 lib/formtastic/inputs/base/collections.rb  |  4 ++--
 lib/formtastic/inputs/base/naming.rb       | 18 +++---------------
 spec/spec_helper.rb                        |  2 +-
 6 files changed, 32 insertions(+), 41 deletions(-)

diff --git a/lib/formtastic/helpers/errors_helper.rb b/lib/formtastic/helpers/errors_helper.rb
index 4dd763313..b4a0324d3 100644
--- a/lib/formtastic/helpers/errors_helper.rb
+++ b/lib/formtastic/helpers/errors_helper.rb
@@ -94,7 +94,7 @@ def error_keys(method, options)
         @methods_for_error[method] ||= begin
           methods_for_error = [method.to_sym]
           methods_for_error << file_metadata_suffixes.map{|suffix| "#{method}_#{suffix}".to_sym} if is_file?(method, options)
-          methods_for_error << [association_primary_key(method)] if association_macro_for_method(method) == :belongs_to
+          methods_for_error << [association_primary_key_for_method(method)] if association_macro_for_method(method) == :belongs_to
           methods_for_error.flatten.compact.uniq
         end
       end
@@ -107,18 +107,6 @@ def has_errors?(method, options)
       def render_inline_errors?
         @object && @object.respond_to?(:errors) && Formtastic::FormBuilder::INLINE_ERROR_TYPES.include?(inline_errors)
       end
-
-      def association_macro_for_method(method) #:nodoc:
-        reflection = reflection_for(method)
-        reflection.macro if reflection
-      end
-
-      def association_primary_key(method)
-        reflection = reflection_for(method)
-        reflection.options[:foreign_key] if reflection && !reflection.options[:foreign_key].blank?
-        :"#{method}_id"
-      end
-
     end
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/helpers/reflection.rb b/lib/formtastic/helpers/reflection.rb
index dd8606ea8..6a3931f32 100644
--- a/lib/formtastic/helpers/reflection.rb
+++ b/lib/formtastic/helpers/reflection.rb
@@ -7,6 +7,27 @@ module Reflection
       def reflection_for(method) #:nodoc:
         @object.class.reflect_on_association(method) if @object.class.respond_to?(:reflect_on_association)
       end
+
+      def association_macro_for_method(method) #:nodoc:
+        reflection = reflection_for(method)
+        reflection.macro if reflection
+      end
+
+      def association_primary_key_for_method(method) #:nodoc:
+        reflection = reflection_for(method)
+        if reflection
+          case association_macro_for_method(method)
+          when :has_and_belongs_to_many, :has_many, :references_and_referenced_in_many, :references_many
+            :"#{method.to_s.singularize}_ids"
+          else
+            return reflection.foreign_key.to_sym if reflection.respond_to?(:foreign_key)
+            return reflection.options[:foreign_key].to_sym unless reflection.options[:foreign_key].blank?
+            :"#{method}_id"
+          end
+        else
+          method.to_sym
+        end
+      end
     end
   end
 end
\ No newline at end of file
diff --git a/lib/formtastic/inputs/base/associations.rb b/lib/formtastic/inputs/base/associations.rb
index 1b95c3acd..514642ab9 100644
--- a/lib/formtastic/inputs/base/associations.rb
+++ b/lib/formtastic/inputs/base/associations.rb
@@ -2,14 +2,15 @@ module Formtastic
   module Inputs
     module Base
       module Associations
+        include Formtastic::Helpers::Reflection
 
         # :belongs_to, etc
         def association
-          @association ||= reflection.macro if reflection
+          @association ||= association_macro_for_method(method)
         end
 
         def reflection
-          @reflection ||= object.class.reflect_on_association(method) if object.class.respond_to?(:reflect_on_association)
+          @reflection ||= reflection_for(method)
         end
 
         def belongs_to?
@@ -17,14 +18,7 @@ def belongs_to?
         end
 
         def association_primary_key
-          if association
-            return reflection.options[:foreign_key] unless reflection.options[:foreign_key].blank?
-            return reflection.foreign_key if reflection.respond_to?(:foreign_key)
-            return :"#{method}_id" if belongs_to?
-            return "#{method.to_s.singularize}_id".pluralize.to_sym
-          else
-            return method.to_s
-          end
+          association_primary_key_for_method(method)
         end
 
       end
diff --git a/lib/formtastic/inputs/base/collections.rb b/lib/formtastic/inputs/base/collections.rb
index 4a34e5e5c..4a402699c 100644
--- a/lib/formtastic/inputs/base/collections.rb
+++ b/lib/formtastic/inputs/base/collections.rb
@@ -54,11 +54,11 @@ def collection_from_options
       
         def collection_from_association
           if reflection
-            raise PolymorphicInputWithoutCollectionError.new("A collection must be supplied for #{method} input. Collections cannot be guessed for polymorphic associations.") if reflection.options[:polymorphic] == true
+            raise PolymorphicInputWithoutCollectionError.new("A collection must be supplied for #{method} input. Collections cannot be guessed for polymorphic associations.") if reflection.options && reflection.options[:polymorphic] == true
 
             find_options_from_options = options[:find_options] || {}
             conditions_from_options = find_options_from_options[:conditions] || {}
-            conditions_from_reflection = reflection.options[:conditions] || {}
+            conditions_from_reflection = reflection.options && reflection.options[:conditions] || {}
             
             if conditions_from_options.any?
               reflection.klass.where(
diff --git a/lib/formtastic/inputs/base/naming.rb b/lib/formtastic/inputs/base/naming.rb
index 5d602d7a9..df1a6d55e 100644
--- a/lib/formtastic/inputs/base/naming.rb
+++ b/lib/formtastic/inputs/base/naming.rb
@@ -31,23 +31,11 @@ def humanized_method_name
             method.to_s.send(builder.label_str_method)
           end
         end
-        
-        # TODO this seems to overlap or be confused with association_primary_key
+
         def input_name
-          if reflection
-            if [:has_and_belongs_to_many, :has_many].include?(reflection.macro)
-              "#{method.to_s.singularize}_ids"
-            elsif reflection.respond_to? :foreign_key
-              reflection.foreign_key
-            else
-              reflection.options[:foreign_key] || "#{method}_id"
-            end
-          else
-            method
-          end.to_sym
+          association_primary_key
         end
-        
-      
+
       end
     end
   end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f9c31904b..0aa13d80b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -221,7 +221,7 @@ def new_author_path; "/authors/new"; end
       when :main_post
         mock('reflection', :options => {}, :klass => ::Post, :macro => :belongs_to)
       when :mongoid_reviewer
-        mock('reflection', :options => {}, :klass => ::Author, :macro => :referenced_in, :foreign_key => "reviewer_id") # custom id
+        mock('reflection', :options => nil, :klass => ::Author, :macro => :referenced_in, :foreign_key => "reviewer_id") # custom id
       end
 
     end

From fee148bbeafb6b275acf99d85c175478aad4974b Mon Sep 17 00:00:00 2001
From: Edgars Beigarts <edgars.beigarts@makit.lv>
Date: Tue, 3 May 2011 11:35:34 +0300
Subject: [PATCH 744/992] Field should be always optional when :required is
 explicitly set to false.

---
 lib/formtastic/inputs/base/validations.rb |  4 ++--
 spec/helpers/input_helper_spec.rb         | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic/inputs/base/validations.rb b/lib/formtastic/inputs/base/validations.rb
index 8b7bd5cf4..a2d1c7bc1 100644
--- a/lib/formtastic/inputs/base/validations.rb
+++ b/lib/formtastic/inputs/base/validations.rb
@@ -116,6 +116,8 @@ def validations?
         end
         
         def required?
+          return false if options[:required] == false
+          return true if options[:required] == true
           return false if not_required_through_negated_validation?
           if validations?
             validations.select { |validator| 
@@ -123,8 +125,6 @@ def required?
               validator.options[:allow_blank] != true
             }.any?
           else
-            return false if options[:required] == false
-            return true if options[:required] == true
             return !!builder.all_fields_required_by_default
           end
         end
diff --git a/spec/helpers/input_helper_spec.rb b/spec/helpers/input_helper_spec.rb
index 8bfd148fc..2ad620b5a 100644
--- a/spec/helpers/input_helper_spec.rb
+++ b/spec/helpers/input_helper_spec.rb
@@ -71,6 +71,17 @@
           output_buffer.should have_tag('form li.optional')
         end
 
+        it 'should set and "optional" class also when there is presence validator' do
+          @new_post.class.should_receive(:validators_on).with(:title).any_number_of_times.and_return([
+            active_model_presence_validator([:title])
+          ])
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:title, :required => false))
+          end)
+          output_buffer.should_not have_tag('form li.required')
+          output_buffer.should have_tag('form li.optional')
+        end
+
         it 'should append the "optional" string to the label' do
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => false))

From 71661fefc4de38149af4ee4b792bb90fa656ead9 Mon Sep 17 00:00:00 2001
From: Thomas Walpole <twalpole@gmail.com>
Date: Mon, 2 May 2011 22:56:54 -0700
Subject: [PATCH 745/992] Fix date inputs not using label specified

---
 lib/formtastic/inputs/base/timeish.rb |  2 +-
 spec/inputs/label_spec.rb             | 20 +++++++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/lib/formtastic/inputs/base/timeish.rb b/lib/formtastic/inputs/base/timeish.rb
index a6bac3572..1c1fe84e9 100644
--- a/lib/formtastic/inputs/base/timeish.rb
+++ b/lib/formtastic/inputs/base/timeish.rb
@@ -105,7 +105,7 @@ def fragments_wrapping_html_options
         def fragments_label
           if render_label?
             template.content_tag(:legend, 
-              builder.label(method, :for => "#{input_html_options[:id]}_1i"), 
+              builder.label(method, label_text, :for => "#{input_html_options[:id]}_1i"), 
               :class => "label"
             )
           else
diff --git a/spec/inputs/label_spec.rb b/spec/inputs/label_spec.rb
index 8d9e7521a..faa5bef3e 100644
--- a/spec/inputs/label_spec.rb
+++ b/spec/inputs/label_spec.rb
@@ -14,7 +14,14 @@
     concat(semantic_form_for(@new_post) do |builder|
       builder.input(:title)
     end)
-    output_buffer.should have_tag('label', :with => /Login/)
+    output_buffer.should have_tag('label', /Title/)
+  end
+
+  it 'should humanize the given attribute for date fields' do
+    concat(semantic_form_for(@new_post) do |builder|
+      builder.input(:publish_at)
+    end)
+    output_buffer.should have_tag('label', /Publish at/)
   end
 
   describe 'when required is given' do
@@ -31,7 +38,7 @@
       concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :value_method => :to_s, :label_method => proc {|f| ('Label_%s' % [f])}))
       end)
-      output_buffer.should have_tag('form li fieldset ol li label', :with => /Label_[abc]/, :count => 3)
+      output_buffer.should have_tag('form li fieldset ol li label', /Label_[abc]/, :count => 3)
     end
 
     it 'should use a supplied value_method for simple collections' do
@@ -49,7 +56,14 @@
       concat(semantic_form_for(@new_post) do |builder|
         builder.input(:title, :label => 'My label')
       end)
-      output_buffer.should have_tag('label', :with => /My label/)
+      output_buffer.should have_tag('label', /My label/)
+    end
+    
+    it 'should allow the text to be given as label option for date fields' do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:publish_at, :label => 'My other label')
+      end)
+      output_buffer.should have_tag('label', /My other label/)
     end
 
     it 'should return nil if label is false' do

From 15a93a0562016223e194d2b66f01af52402ae337 Mon Sep 17 00:00:00 2001
From: Bruce Williams <bruce@codefluency.com>
Date: Sat, 16 Apr 2011 00:33:46 -0700
Subject: [PATCH 746/992] Support Method objects for :label_method and
 :value_method.

Can provide any object that responds to :call (attempts to quack the
`duck` variable instead of checking if it's a Proc).
---
 lib/formtastic/inputs/base/collections.rb |  4 +--
 spec/support/custom_macros.rb             | 33 +++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic/inputs/base/collections.rb b/lib/formtastic/inputs/base/collections.rb
index 4a402699c..837351193 100644
--- a/lib/formtastic/inputs/base/collections.rb
+++ b/lib/formtastic/inputs/base/collections.rb
@@ -81,7 +81,7 @@ def collection_for_boolean
         end
       
         def send_or_call(duck, object)
-          if duck.is_a?(Proc)
+          if duck.respond_to?(:call)
             duck.call(object)
           else
             object.send(duck)
@@ -91,4 +91,4 @@ def send_or_call(duck, object)
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/support/custom_macros.rb b/spec/support/custom_macros.rb
index 2aa7042cb..ec223b6ac 100644
--- a/spec/support/custom_macros.rb
+++ b/spec/support/custom_macros.rb
@@ -408,6 +408,22 @@ def it_should_use_the_collection_when_provided(as, countable)
             end
           end
 
+          describe 'as a method object' do
+            before do
+              def reverse_login(a)
+                a.login.reverse
+              end
+              concat(semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:author, :as => as, :label_method => method(:reverse_login)))
+              end)
+            end
+
+            it 'should have options with the proc applied to each' do
+              ::Author.all.each do |author|
+                output_buffer.should have_tag("form li.#{as}", /#{author.login.reverse}/)
+              end
+            end
+          end
         end
 
         describe 'when the :label_method option is not provided' do
@@ -462,6 +478,23 @@ def it_should_use_the_collection_when_provided(as, countable)
               end
             end
           end
+
+          describe 'as a method object' do
+            before do
+              def reverse_login(a)
+                a.login.reverse
+              end
+              concat(semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:author, :as => as, :value_method => method(:reverse_login)))
+              end)
+            end
+
+            it 'should have options with the proc applied to each value' do
+              ::Author.all.each do |author|
+                output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login.reverse}']")
+              end
+            end
+          end
         end
 
       end

From 210b9d663e716fad40a4d3cecfc6b8e6229b6c52 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 19 Apr 2011 07:29:35 +1000
Subject: [PATCH 747/992] f.semantic_fields_for is now just a wrapper around
 f.fields_for

Rails 3 will maintain the `:builder` option down through to the nested `fields_for` helper, so we no longer have to do that ourselves.
---
 lib/formtastic/form_builder.rb           | 16 +++++++++-------
 lib/formtastic/helpers/inputs_helper.rb  | 21 ++++++++++++++++-----
 spec/builder/custom_builder_spec.rb      |  8 ++++----
 spec/builder/semantic_fields_for_spec.rb | 12 ++++++------
 spec/i18n_spec.rb                        |  4 ++--
 5 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 72bdad730..1d04a8a5b 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -40,10 +40,13 @@ def self.configure(name, value = nil)
     include Formtastic::Helpers::ButtonsHelper
     include Formtastic::Helpers::ErrorsHelper
     
-    # A thin wrapper around `ActionView::Helpers::FormBuilder#fields_for` helper to set 
-    # `:builder => Formtastic::FormBuilder` for nesting forms inside the builder. Can be used in 
-    # the same way, but you'll also have access to the helpers in `Formtastic::FormBuilder` 
-    # (such as {#input}, etc) inside the block.
+    # This is a wrapper around Rails' `ActionView::Helpers::FormBuilder#fields_for`, originally 
+    # provided to ensure that the `:builder` from `semantic_form_for` was passed down into
+    # the nested `fields_for`. Rails 3 no longer requires us to do this, so this method is
+    # provided purely for backwards compatibility and DSL consistency.
+    #
+    # When constructing a `fields_for` form fragment *outside* of `semantic_form_for`, please use
+    # `Formtastic::Helpers::FormHelper#semantic_fields_for`.
     #
     # @see http://api.rubyonrails.org/classes/ActionView/Helpers/FormBuilder.html#method-i-fields_for ActionView::Helpers::FormBuilder#fields_for
     # @see http://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-fields_for ActionView::Helpers::FormHelper#fields_for
@@ -63,10 +66,9 @@ def self.configure(name, value = nil)
     #       </ol>
     #     </fieldset>
     #   </form>
+    #
+    # @todo is there a way to test the params structure of the Rails helper we wrap to ensure forward compatibility?
     def semantic_fields_for(record_or_name_or_array, *args, &block)
-      opts = args.extract_options!
-      opts[:builder] ||= self.class
-      args.push(opts)
       fields_for(record_or_name_or_array, *args, &block)
     end
     
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 9fcab37ca..87f7c88b6 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -111,7 +111,8 @@ module InputsHelper
       #     end
       #
       # Formtastic provides a helper called `semantic_fields_for`, which wraps around Rails' built-in
-      # `fields_for` helper, allowing you to combine Rails-style nested fields with Formtastic inputs:
+      # `fields_for` helper for backwards compatibility with previous versions of Formtastic, and for
+      # a consistent method naming API. The following examples are functionally equivalent:
       #
       #     <% semantic_form_for @user do |form| %>
       #       <%= f.inputs :name, :email %>
@@ -120,13 +121,23 @@ module InputsHelper
       #         <% profile.inputs do %>
       #           <%= profile.input :biography %>
       #           <%= profile.input :twitter_name %>
-      #           <%= profile.input :shoe_size %>
       #         <% end %>
       #       <% end %>
       #     <% end %>
       #
-      # {#inputs} also provides a DSL similar to `semantic_fields_for` to reduce the lines of code a
-      # little:
+      #     <% semantic_form_for @user do |form| %>
+      #       <%= f.inputs :name, :email %>
+      #
+      #       <% f.fields_for :profile do |profile| %>
+      #         <% profile.inputs do %>
+      #           <%= profile.input :biography %>
+      #           <%= profile.input :twitter_name %>
+      #         <% end %>
+      #       <% end %>
+      #     <% end %>
+      #
+      # {#inputs} also provides a DSL similar to `fields_for` / `semantic_fields_for` to reduce the 
+      # lines of code a little:
       #
       #     <% semantic_form_for @user do |f| %>
       #       <%= f.inputs :name, :email %>
@@ -359,7 +370,7 @@ def inputs_for_nested_attributes(*args, &block) #:nodoc:
         end
 
         fields_for_args = [options.delete(:for), options.delete(:for_options) || {}].flatten
-        semantic_fields_for(*fields_for_args, &fields_for_block)
+        fields_for(*fields_for_args, &fields_for_block)
       end
 
       def field_set_title_from_args(*args) #:nodoc:
diff --git a/spec/builder/custom_builder_spec.rb b/spec/builder/custom_builder_spec.rb
index ba6639124..bcf2343df 100644
--- a/spec/builder/custom_builder_spec.rb
+++ b/spec/builder/custom_builder_spec.rb
@@ -72,11 +72,11 @@ def to_html
 
     end
 
-    describe "semantic_fields_for" do
+    describe "fields_for" do
 
       it "should yield an instance of the parent form builder" do
         semantic_form_for(@new_post) do |builder|
-          builder.semantic_fields_for(:author) do |nested_builder|
+          builder.fields_for(:author) do |nested_builder|
             nested_builder.class.should == MyCustomFormBuilder
           end
         end
@@ -88,11 +88,11 @@ def to_html
 
   describe "when using a builder passed to form options" do
 
-    describe "semantic_fields_for" do
+    describe "fields_for" do
 
       it "should yield an instance of the parent form builder" do
         semantic_form_for(@new_post, :builder => MyCustomFormBuilder) do |builder|
-          builder.semantic_fields_for(:author) do |nested_builder|
+          builder.fields_for(:author) do |nested_builder|
             nested_builder.class.should == MyCustomFormBuilder
           end
         end
diff --git a/spec/builder/semantic_fields_for_spec.rb b/spec/builder/semantic_fields_for_spec.rb
index 87d3d8272..caa326234 100644
--- a/spec/builder/semantic_fields_for_spec.rb
+++ b/spec/builder/semantic_fields_for_spec.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'Formtastic::FormBuilder#semantic_fields_for' do
+describe 'Formtastic::FormBuilder#fields_for' do
 
   include FormtasticSpecHelper
 
@@ -13,7 +13,7 @@
 
   it 'yields an instance of FormHelper.builder' do
     semantic_form_for(@new_post) do |builder|
-      builder.semantic_fields_for(:author) do |nested_builder|
+      builder.fields_for(:author) do |nested_builder|
         nested_builder.class.should == Formtastic::Helpers::FormHelper.builder
       end
     end
@@ -21,7 +21,7 @@
 
   it 'nests the object name' do
     semantic_form_for(@new_post) do |builder|
-      builder.semantic_fields_for(@bob) do |nested_builder|
+      builder.fields_for(@bob) do |nested_builder|
         nested_builder.object_name.should == 'post[author]'
       end
     end
@@ -30,7 +30,7 @@
   it 'should sanitize html id for li tag' do
     @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
     concat(semantic_form_for(@new_post) do |builder|
-      concat(builder.semantic_fields_for(@bob, :index => 1) do |nested_builder|
+      concat(builder.fields_for(@bob, :index => 1) do |nested_builder|
         concat(nested_builder.inputs(:login))
       end)
     end)
@@ -43,7 +43,7 @@
   it 'should use namespace provided in nested fields' do
     @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
     concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
-      concat(builder.semantic_fields_for(@bob, :index => 1) do |nested_builder|
+      concat(builder.fields_for(@bob, :index => 1) do |nested_builder|
         concat(nested_builder.inputs(:login))
       end)
     end)
@@ -60,7 +60,7 @@
       @fred.stub!(:posts_attributes=)
 
       concat(semantic_form_for(@fred) do |builder|
-        concat(builder.semantic_fields_for(:posts) do |nested_builder|
+        concat(builder.fields_for(:posts) do |nested_builder|
           concat(nested_builder.input(:id, :as => :hidden))
           concat(nested_builder.input(:title))
         end)
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index 0941b6fae..612853657 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -133,7 +133,7 @@
     it 'should be able to translate nested objects with nested translations' do
       with_config :i18n_lookups_by_default, true do
         concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
-          builder.semantic_fields_for(:task) do |f|
+          builder.fields_for(:task) do |f|
             concat(f.input(:name))
           end
         end)
@@ -144,7 +144,7 @@
     it 'should be able to translate nested objects with top level translations' do
       with_config :i18n_lookups_by_default, true do
         concat(semantic_form_for(:order, :url => 'http://test.host') do |builder|
-          builder.semantic_fields_for(:line_item) do |f|
+          builder.fields_for(:line_item) do |f|
             concat(f.input(:name))
           end
         end)

From a15e49e365299fc04e9b27b82d935cbbf0840d2e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 20 Apr 2011 22:31:29 +1000
Subject: [PATCH 748/992] removed semantic_remote_form_for and aliases, because
 the methods they wrap are not in Rails 3

---
 CHANGELOG                             |  1 +
 lib/formtastic/helpers/form_helper.rb | 23 -----------------------
 spec/helpers/form_helper_spec.rb      | 16 ----------------
 3 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3e382773a..89c34aa70 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,6 +20,7 @@
 * Changed quick forms to skip polymorphic associations (they didn't work)
 * Changed short hand forms to raise an error when trying to render an input for a polymorphic association (it didn't work, need a collection)
 * Changed input() to raise an error when a :collection is not provided for a polymorphic association (we can't guess which class to use)
+* Removed semantic_remote_form_for etc, the remote_form_for helpers don't exist in Rails 3
 
 1.2.4.beta (unreleased)
 
diff --git a/lib/formtastic/helpers/form_helper.rb b/lib/formtastic/helpers/form_helper.rb
index 80b04b0f3..7e67a03e4 100644
--- a/lib/formtastic/helpers/form_helper.rb
+++ b/lib/formtastic/helpers/form_helper.rb
@@ -151,29 +151,6 @@ def semantic_fields_for(record_or_name_or_array, *args, &proc)
         form_helper_wrapper(:fields_for, record_or_name_or_array, *args, &proc)
       end
 
-      # Wrapper around Rails' own `remote_form_for` helper to set the `:builder` option to
-      # `Formtastic::FormBuilder` and to set some class names on the `<form>` tag such as
-      # `formtastic` and the downcased and underscored model name.
-      #
-      # @see #semantic_form_for
-      # @todo why isn't YARD rendering this method?
-      def semantic_remote_form_for(record_or_name_or_array, *args, &proc)
-        form_helper_wrapper(:remote_form_for, record_or_name_or_array, *args, &proc)
-      end
-
-      def semantic_remote_form_for_wrapper(record_or_name_or_array, *args, &proc)
-        options = args.extract_options!
-        if respond_to? :remote_form_for
-          semantic_remote_form_for_real(record_or_name_or_array, *(args << options), &proc)
-        else
-          options[:remote] = true
-          semantic_form_for(record_or_name_or_array, *(args << options), &proc)
-        end
-      end
-      alias :semantic_remote_form_for_real :semantic_remote_form_for
-      alias :semantic_remote_form_for :semantic_remote_form_for_wrapper
-      alias :semantic_form_remote_for :semantic_remote_form_for
-
       protected
 
       # @todo pretty sure some of this (like HTML classes and record naming are exlusive to `form_for`)
diff --git a/spec/helpers/form_helper_spec.rb b/spec/helpers/form_helper_spec.rb
index a592f2f31..793c170a7 100644
--- a/spec/helpers/form_helper_spec.rb
+++ b/spec/helpers/form_helper_spec.rb
@@ -131,21 +131,5 @@ class MyAwesomeCustomBuilder < Formtastic::FormBuilder
     end
   end
 
-  describe '#semantic_form_remote_for' do
-    it 'yields an instance of Formtastic::FormBuilder' do
-      semantic_form_remote_for(@new_post, :url => '/hello') do |builder|
-        builder.class.should == Formtastic::FormBuilder
-      end
-    end
-  end
-
-  describe '#semantic_form_for_remote' do
-    it 'yields an instance of Formtastic::FormBuilder' do
-      semantic_remote_form_for(@new_post, :url => '/hello') do |builder|
-        builder.class.should == Formtastic::FormBuilder
-      end
-    end
-  end
-
 end
 

From dbf01b59b42878cfa6d40206751f5ce71386f869 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 4 May 2011 22:02:36 +1000
Subject: [PATCH 749/992] documentation for the recent changes to
 :label_method, which now accepts a Method object for use with helper_methods

---
 lib/formtastic/helpers/input_helper.rb     |  4 ++--
 lib/formtastic/inputs/check_boxes_input.rb | 10 +++++++++-
 lib/formtastic/inputs/radio_input.rb       |  8 ++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic/helpers/input_helper.rb b/lib/formtastic/helpers/input_helper.rb
index e88f26da7..f33617513 100644
--- a/lib/formtastic/helpers/input_helper.rb
+++ b/lib/formtastic/helpers/input_helper.rb
@@ -136,10 +136,10 @@ module InputHelper
       # @option options :collection [Array<ActiveModel, String, Symbol>, Hash{String => String, Boolean}, OrderedHash{String => String, Boolean}]
       #   Override collection of objects in the association (`:select`, `:radio` & `:check_boxes` inputs only)
       #
-      # @option options :label_method [Symbol, Proc]
+      # @option options :label_method [Symbol, Proc, Method]
       #   Override the method called on each object in the `:collection` for use as the `<label>` content (`:check_boxes` & `:radio` inputs) or `<option>` content (`:select` inputs)
       #
-      # @option options :value_method [Symbol, Proc]
+      # @option options :value_method [Symbol, Proc, Method]
       #   Override the method called on each object in the `:collection` for use as the `value` attribute in the `<input>` (`:check_boxes` & `:radio` inputs) or `<option>` (`:select` inputs)
       #
       # @option options :hint_class [String]
diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index b6d86a41b..27f8ef075 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -55,13 +55,21 @@ module Inputs
     # @example `:label_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the label text (it'll try the methods like `to_s` in `collection_label_methods` config by default)
     #   <%= f.input :categories, :as => :check_boxes, :label_method => :name %>
     #   <%= f.input :categories, :as => :check_boxes, :label_method => :name_with_post_count
-    #   <%= f.input :categories, :as => :check_boxes, :label_method => Proc.new { |c| "#{c.name} (#{pluralize("post", c.posts.count)})" }
+    #   <%= f.input :categories, :as => :check_boxes, :label_method => { |c| "#{c.name} (#{pluralize("post", c.posts.count)})" }
+    #
+    # @example `:label_method` can be used with a helper method (both examples have the same result)
+    #   <%= f.input :categories, :as => :check_boxes, :label_method => method(:fancy_label)
+    #   <%= f.input :categories, :as => :check_boxes, :label_method => Proc.new { |category| fancy_label(category) }
     #
     # @example `:value_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the value for each checkbox (it'll try the methods like `id` in `collection_value_methods` config by default)
     #   <%= f.input :categories, :as => :check_boxes, :value_method => :code %>
     #   <%= f.input :categories, :as => :check_boxes, :value_method => :isbn
     #   <%= f.input :categories, :as => :check_boxes, :value_method => Proc.new { |c| c.name.downcase.underscore }
     #
+    # @example `:value_method` can be used with a helper method (both examples have the same result)
+    #   <%= f.input :categories, :as => :check_boxes, :value_method => method(:some_helper)
+    #   <%= f.input :categories, :as => :check_boxes, :value_method => Proc.new { |category| some_helper(category) }
+    #
     # @example `:value_as_class` can be used to add a class to the `<li>` wrapped around each choice using the checkbox value for custom styling of each choice
     #   <%= f.input :categories, :as => :check_boxes, :value_as_class => true %>
     #
diff --git a/lib/formtastic/inputs/radio_input.rb b/lib/formtastic/inputs/radio_input.rb
index d8449ed77..df1fcdb2a 100644
--- a/lib/formtastic/inputs/radio_input.rb
+++ b/lib/formtastic/inputs/radio_input.rb
@@ -90,10 +90,18 @@ module Inputs
     #   <%= f.input :author, :as => :radio, :label_method => :name_with_post_count
     #   <%= f.input :author, :as => :radio, :label_method => Proc.new { |a| "#{c.name} (#{pluralize("post", a.posts.count)})" }
     #
+    # @example `:label_method` can be used with a helper method (both examples have the same result)
+    #   <%= f.input :author, :as => :radio, :label_method => method(:fancy_label)
+    #   <%= f.input :author, :as => :radio, :label_method => Proc.new { |author| fancy_label(author) }
+    #
     # @example The `:value_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the value for each checkbox (it'll try the methods like `id` in `collection_value_methods` config by default)
     #   <%= f.input :author, :as => :radio, :value_method => :login %>
     #   <%= f.input :author, :as => :radio, :value_method => Proc.new { |c| c.full_name.downcase.underscore }
     #
+    # @example `:value_method` can be used with a helper method (both examples have the same result)
+    #   <%= f.input :author, :as => :radio, :value_method => method(:some_helper)
+    #   <%= f.input :author, :as => :radio, :value_method => Proc.new { |author| some_helper(author) }
+    #
     # @example Set HTML attributes on each `<input type="radio">` tag with `:input_html`
     #   <%= f.input :author, :as => :radio, :input_html => { :size => 20, :multiple => true, :class => "special" } %>
     #

From 8d4d9edce25692312f6c31ab4a928cb5d832c6d5 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 5 May 2011 07:55:09 +1000
Subject: [PATCH 750/992] Renamed (with backwards compatibility) and
 deprecation notices) :label_method => :member_label, :value_method =>
 :member_value and :grouped_label_method => :grouped_label. Fixes #533.

---
 README.textile                                |   2 +-
 lib/formtastic/helpers/input_helper.rb        |  15 +-
 lib/formtastic/inputs/base.rb                 |  11 ++
 lib/formtastic/inputs/base/collections.rb     |   6 +-
 .../inputs/base/grouped_collections.rb        |   2 +-
 lib/formtastic/inputs/base/options.rb         |   2 +-
 lib/formtastic/inputs/check_boxes_input.rb    |  28 ++--
 lib/formtastic/inputs/radio_input.rb          |  28 ++--
 lib/formtastic/inputs/select_input.rb         |  18 +--
 spec/inputs/check_boxes_input_spec.rb         |   4 +-
 spec/inputs/label_spec.rb                     |   4 +-
 spec/inputs/select_input_spec.rb              |   6 +-
 spec/support/custom_macros.rb                 | 152 ++++++++++++++++--
 13 files changed, 216 insertions(+), 62 deletions(-)

diff --git a/README.textile b/README.textile
index 1b2e85e57..fe83db835 100644
--- a/README.textile
+++ b/README.textile
@@ -171,7 +171,7 @@ If you want to customize the label text, or render some hint text below the fiel
     <% form.inputs :name => "Advanced Options", :id => "advanced" do %>
       <%= form.input :slug, :label => "URL Title", :hint => "Created automatically if left blank", :required => false %>
       <%= form.input :section, :as => :radio %>
-      <%= form.input :user, :label => "Author", :label_method => :full_name %>
+      <%= form.input :user, :label => "Author", :member_label => :full_name %>
       <%= form.input :categories, :required => false %>
       <%= form.input :created_at, :as => :string, :label => "Publication Date", :required => false %>
     <% end %>
diff --git a/lib/formtastic/helpers/input_helper.rb b/lib/formtastic/helpers/input_helper.rb
index f33617513..2d03309d7 100644
--- a/lib/formtastic/helpers/input_helper.rb
+++ b/lib/formtastic/helpers/input_helper.rb
@@ -136,12 +136,18 @@ module InputHelper
       # @option options :collection [Array<ActiveModel, String, Symbol>, Hash{String => String, Boolean}, OrderedHash{String => String, Boolean}]
       #   Override collection of objects in the association (`:select`, `:radio` & `:check_boxes` inputs only)
       #
-      # @option options :label_method [Symbol, Proc, Method]
+      # @option options :member_label [Symbol, Proc, Method]
       #   Override the method called on each object in the `:collection` for use as the `<label>` content (`:check_boxes` & `:radio` inputs) or `<option>` content (`:select` inputs)
       #
-      # @option options :value_method [Symbol, Proc, Method]
+      # @option options :label_method [Symbol, Proc, Method]
+      #   Deprecated, renamed to :member_label
+      #
+      # @option options :member_value [Symbol, Proc, Method]
       #   Override the method called on each object in the `:collection` for use as the `value` attribute in the `<input>` (`:check_boxes` & `:radio` inputs) or `<option>` (`:select` inputs)
       #
+      # @option options :value_method [Symbol, Proc, Method]
+      #   Deprecated, renamed to :member_value
+      #
       # @option options :hint_class [String]
       #   Override the `class` attribute applied to the `<p>` tag used when a `:hint` is rendered for an input
       #
@@ -158,6 +164,9 @@ module InputHelper
       #   TODO will probably be deprecated
       #
       # @option options :group_label_method [Symbol]
+      #   Deprecated, use `:group_label`
+      #
+      # @option options :group_label [Symbol]
       #   TODO will probably be deprecated
       #
       # @option options :include_blank [Boolean]
@@ -167,7 +176,7 @@ module InputHelper
       #   Specify the text in the first ('blank') `:select` input `<option>` to prompt a user to make a selection (implicitly sets `:include_blank` to `true`)
       #
       # @todo Can we kill `:hint_class` & `:error_class`? What's the use case for input-by-input? Shift to config or burn!
-      # @todo Can we kill `:group_by` & `:group_label_method`? Should be done with :collection => grouped_options_for_select(...)
+      # @todo Can we kill `:group_by` & `:group_label`/`:group_label_method`? Should be done with :collection => grouped_options_for_select(...)
       # @todo Can we kill `:find_options`? Should be done with MyModel.some_scope.where(...).order(...).whatever_scope
       # @todo Can we kill `:label`, `:hint` & `:prompt`? All strings could be shifted to i18n!
       #
diff --git a/lib/formtastic/inputs/base.rb b/lib/formtastic/inputs/base.rb
index 6d4c15938..b848aac23 100644
--- a/lib/formtastic/inputs/base.rb
+++ b/lib/formtastic/inputs/base.rb
@@ -11,6 +11,17 @@ def initialize(builder, template, object, object_name, method, options)
         @object_name = object_name
         @method = method
         @options = options.dup
+        
+        warn_and_correct_option!(:label_method, :member_label)
+        warn_and_correct_option!(:value_method, :member_value)
+        warn_and_correct_option!(:group_label_method, :group_label)
+      end
+      
+      def warn_and_correct_option!(old_option_name, new_option_name)
+        if options.key?(old_option_name)
+          ::ActiveSupport::Deprecation.warn("The :#{old_option_name} option is deprecated in favour of :#{new_option_name} and will be removed from Formtastic after 2.0")
+          options[new_option_name] = options.delete(old_option_name)
+        end
       end
       
       extend ActiveSupport::Autoload
diff --git a/lib/formtastic/inputs/base/collections.rb b/lib/formtastic/inputs/base/collections.rb
index 837351193..b2a94035b 100644
--- a/lib/formtastic/inputs/base/collections.rb
+++ b/lib/formtastic/inputs/base/collections.rb
@@ -24,8 +24,8 @@ def label_and_value_method(_collection, grouped=false)
           end
       
           # Order of preference: user supplied method, class defaults, auto-detect
-          label = (grouped ? options[:grouped_label_method] : options[:label_method]) || label || builder.collection_label_methods.find { |m| sample.respond_to?(m) }
-          value = (grouped ? options[:grouped_value_method] : options[:value_method]) || value || builder.collection_value_methods.find { |m| sample.respond_to?(m) }
+          label = (grouped ? options[:grouped_label_method] : options[:member_label]) || label || builder.collection_label_methods.find { |m| sample.respond_to?(m) }
+          value = (grouped ? options[:grouped_value_method] : options[:member_value]) || value || builder.collection_value_methods.find { |m| sample.respond_to?(m) }
       
           [label, value]
         end
@@ -41,7 +41,7 @@ def collection
           # Return if we have an Array of strings, fixnums or arrays
           return raw_collection if (raw_collection.instance_of?(Array) || raw_collection.instance_of?(Range)) &&
                                [Array, Fixnum, String, Symbol].include?(raw_collection.first.class) &&
-                               !(options.include?(:label_method) || options.include?(:value_method))
+                               !(options.include?(:member_label) || options.include?(:member_value))
                        
           raw_collection.map { |o| [send_or_call(label_method, o), send_or_call(value_method, o)] }
         end
diff --git a/lib/formtastic/inputs/base/grouped_collections.rb b/lib/formtastic/inputs/base/grouped_collections.rb
index aaf1249f2..47ba01a72 100644
--- a/lib/formtastic/inputs/base/grouped_collections.rb
+++ b/lib/formtastic/inputs/base/grouped_collections.rb
@@ -16,7 +16,7 @@ def group_label_method
         end
       
         def group_label_method_from_options
-          options[:group_label_method]
+          options[:group_label]
         end
       
         def group_label_method_from_grouped_collection
diff --git a/lib/formtastic/inputs/base/options.rb b/lib/formtastic/inputs/base/options.rb
index abbbbe070..d242d3c8a 100644
--- a/lib/formtastic/inputs/base/options.rb
+++ b/lib/formtastic/inputs/base/options.rb
@@ -8,7 +8,7 @@ def input_options
         end
         
         def formtastic_options
-          [:priority_countries, :priority_zones, :value_method, :label_method, :collection, :required, :label, :as, :hint, :input_html, :label_html, :value_as_class, :find_options, :class]
+          [:priority_countries, :priority_zones, :value_method, :label_method, :member_label, :member_value, :collection, :required, :label, :as, :hint, :input_html, :label_html, :value_as_class, :find_options, :class]
         end
       
       end
diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index 27f8ef075..ef33832c5 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -52,23 +52,23 @@ module Inputs
     # @example `:disabled` can be used to disable any checkboxes with a value found in the given Array
     #   <%= f.input :categories, :as => :check_boxes, :collection => ["a", "b"], :disabled => ["a"] %>
     #
-    # @example `:label_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the label text (it'll try the methods like `to_s` in `collection_label_methods` config by default)
-    #   <%= f.input :categories, :as => :check_boxes, :label_method => :name %>
-    #   <%= f.input :categories, :as => :check_boxes, :label_method => :name_with_post_count
-    #   <%= f.input :categories, :as => :check_boxes, :label_method => { |c| "#{c.name} (#{pluralize("post", c.posts.count)})" }
+    # @example `:member_label` can be used to call a different method (or a Proc) on each object in the collection for rendering the label text (it'll try the methods like `to_s` in `collection_label_methods` config by default)
+    #   <%= f.input :categories, :as => :check_boxes, :member_label => :name %>
+    #   <%= f.input :categories, :as => :check_boxes, :member_label => :name_with_post_count
+    #   <%= f.input :categories, :as => :check_boxes, :member_label => { |c| "#{c.name} (#{pluralize("post", c.posts.count)})" }
     #
-    # @example `:label_method` can be used with a helper method (both examples have the same result)
-    #   <%= f.input :categories, :as => :check_boxes, :label_method => method(:fancy_label)
-    #   <%= f.input :categories, :as => :check_boxes, :label_method => Proc.new { |category| fancy_label(category) }
+    # @example `:member_label` can be used with a helper method (both examples have the same result)
+    #   <%= f.input :categories, :as => :check_boxes, :member_label => method(:fancy_label)
+    #   <%= f.input :categories, :as => :check_boxes, :member_label => Proc.new { |category| fancy_label(category) }
     #
-    # @example `:value_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the value for each checkbox (it'll try the methods like `id` in `collection_value_methods` config by default)
-    #   <%= f.input :categories, :as => :check_boxes, :value_method => :code %>
-    #   <%= f.input :categories, :as => :check_boxes, :value_method => :isbn
-    #   <%= f.input :categories, :as => :check_boxes, :value_method => Proc.new { |c| c.name.downcase.underscore }
+    # @example `:member_value` can be used to call a different method (or a Proc) on each object in the collection for rendering the value for each checkbox (it'll try the methods like `id` in `collection_value_methods` config by default)
+    #   <%= f.input :categories, :as => :check_boxes, :member_value => :code %>
+    #   <%= f.input :categories, :as => :check_boxes, :member_value => :isbn
+    #   <%= f.input :categories, :as => :check_boxes, :member_value => Proc.new { |c| c.name.downcase.underscore }
     #
-    # @example `:value_method` can be used with a helper method (both examples have the same result)
-    #   <%= f.input :categories, :as => :check_boxes, :value_method => method(:some_helper)
-    #   <%= f.input :categories, :as => :check_boxes, :value_method => Proc.new { |category| some_helper(category) }
+    # @example `:member_value` can be used with a helper method (both examples have the same result)
+    #   <%= f.input :categories, :as => :check_boxes, :member_value => method(:some_helper)
+    #   <%= f.input :categories, :as => :check_boxes, :member_value => Proc.new { |category| some_helper(category) }
     #
     # @example `:value_as_class` can be used to add a class to the `<li>` wrapped around each choice using the checkbox value for custom styling of each choice
     #   <%= f.input :categories, :as => :check_boxes, :value_as_class => true %>
diff --git a/lib/formtastic/inputs/radio_input.rb b/lib/formtastic/inputs/radio_input.rb
index df1fcdb2a..bb7e00d91 100644
--- a/lib/formtastic/inputs/radio_input.rb
+++ b/lib/formtastic/inputs/radio_input.rb
@@ -32,7 +32,7 @@ module Inputs
     # You can override or customise this collection through the `:collection` option (see examples).
     #
     # The way on which Formtastic renders the `value` attribute and label for each choice is
-    # customisable through the `:label_method` and `:value_method` options (see examples below).
+    # customisable through the `:member_label` and `:member_value` options (see examples below).
     # When not provided, we fall back to a list of methods to try on each object such as
     # `:to_label`, `:name` and `:to_s`, which are defined in the configurations
     # `collection_label_methods` and `collection_value_methods`.
@@ -85,22 +85,22 @@ module Inputs
     #   <%= f.input :author, :as => :radio, :collection => [["Justin", 1], ["Kate", 3]] %>
     #   <%= f.input :author, :as => :radio, :collection => 1..5 %>
     #
-    # @example The `:label_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the label text (it'll try the methods like `to_s` in `collection_label_methods` config by default)
-    #   <%= f.input :author, :as => :radio, :label_method => :name %>
-    #   <%= f.input :author, :as => :radio, :label_method => :name_with_post_count
-    #   <%= f.input :author, :as => :radio, :label_method => Proc.new { |a| "#{c.name} (#{pluralize("post", a.posts.count)})" }
+    # @example The `:member_label` can be used to call a different method (or a Proc) on each object in the collection for rendering the label text (it'll try the methods like `to_s` in `collection_label_methods` config by default)
+    #   <%= f.input :author, :as => :radio, :member_label => :name %>
+    #   <%= f.input :author, :as => :radio, :member_label => :name_with_post_count
+    #   <%= f.input :author, :as => :radio, :member_label => Proc.new { |a| "#{c.name} (#{pluralize("post", a.posts.count)})" }
     #
-    # @example `:label_method` can be used with a helper method (both examples have the same result)
-    #   <%= f.input :author, :as => :radio, :label_method => method(:fancy_label)
-    #   <%= f.input :author, :as => :radio, :label_method => Proc.new { |author| fancy_label(author) }
+    # @example `:member_label` can be used with a helper method (both examples have the same result)
+    #   <%= f.input :author, :as => :radio, :member_label => method(:fancy_label)
+    #   <%= f.input :author, :as => :radio, :member_label => Proc.new { |author| fancy_label(author) }
     #
-    # @example The `:value_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the value for each checkbox (it'll try the methods like `id` in `collection_value_methods` config by default)
-    #   <%= f.input :author, :as => :radio, :value_method => :login %>
-    #   <%= f.input :author, :as => :radio, :value_method => Proc.new { |c| c.full_name.downcase.underscore }
+    # @example The `:member_value` can be used to call a different method (or a Proc) on each object in the collection for rendering the value for each checkbox (it'll try the methods like `id` in `collection_value_methods` config by default)
+    #   <%= f.input :author, :as => :radio, :member_value => :login %>
+    #   <%= f.input :author, :as => :radio, :member_value => Proc.new { |c| c.full_name.downcase.underscore }
     #
-    # @example `:value_method` can be used with a helper method (both examples have the same result)
-    #   <%= f.input :author, :as => :radio, :value_method => method(:some_helper)
-    #   <%= f.input :author, :as => :radio, :value_method => Proc.new { |author| some_helper(author) }
+    # @example `:member_value` can be used with a helper method (both examples have the same result)
+    #   <%= f.input :author, :as => :radio, :member_value => method(:some_helper)
+    #   <%= f.input :author, :as => :radio, :member_value => Proc.new { |author| some_helper(author) }
     #
     # @example Set HTML attributes on each `<input type="radio">` tag with `:input_html`
     #   <%= f.input :author, :as => :radio, :input_html => { :size => 20, :multiple => true, :class => "special" } %>
diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index 6e9cd0b59..ba5b96474 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -33,7 +33,7 @@ module Inputs
     # the `:collection` option (see examples).
     #
     # The way on which Formtastic renders the `value` attribute and content of each `<option>` tag
-    # is customisable through the `:label_method` and `:value_method` options. When not provided,
+    # is customisable through the `:member_label` and `:member_value` options. When not provided,
     # we fall back to a list of methods to try on each object such as `:to_label`, `:name` and
     # `:to_s`, which are defined in the configurations `collection_label_methods` and
     # `collection_value_methods` (see examples below).
@@ -106,14 +106,14 @@ module Inputs
     #   <%= f.input :author, :as => :select, :collection => grouped_options_for_select(...) %>
     #   <%= f.input :author, :as => :select, :collection => time_zone_options_for_select(...) %>
     #
-    # @example The `:label_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the label text (it'll try the methods like `to_s` in `collection_label_methods` config by default)
-    #   <%= f.input :author, :as => :select, :label_method => :name %>
-    #   <%= f.input :author, :as => :select, :label_method => :name_with_post_count
-    #   <%= f.input :author, :as => :select, :label_method => Proc.new { |a| "#{c.name} (#{pluralize("post", a.posts.count)})" }
+    # @example The `:member_label` can be used to call a different method (or a Proc) on each object in the collection for rendering the label text (it'll try the methods like `to_s` in `collection_label_methods` config by default)
+    #   <%= f.input :author, :as => :select, :member_label => :name %>
+    #   <%= f.input :author, :as => :select, :member_label => :name_with_post_count
+    #   <%= f.input :author, :as => :select, :member_label => Proc.new { |a| "#{c.name} (#{pluralize("post", a.posts.count)})" }
     #
-    # @example The `:value_method` can be used to call a different method (or a Proc) on each object in the collection for rendering the value for each checkbox (it'll try the methods like `id` in `collection_value_methods` config by default)
-    #   <%= f.input :author, :as => :select, :value_method => :login %>
-    #   <%= f.input :author, :as => :select, :value_method => Proc.new { |c| c.full_name.downcase.underscore }
+    # @example The `:member_value` can be used to call a different method (or a Proc) on each object in the collection for rendering the value for each checkbox (it'll try the methods like `id` in `collection_value_methods` config by default)
+    #   <%= f.input :author, :as => :select, :member_value => :login %>
+    #   <%= f.input :author, :as => :select, :member_value => Proc.new { |c| c.full_name.downcase.underscore }
     #
     # @example Set HTML attributes on the `<select>` tag with `:input_html`
     #   <%= f.input :authors, :as => :select, :input_html => { :size => 20, :multiple => true, :class => "special" } %>
@@ -126,7 +126,7 @@ module Inputs
     #   <%= f.input :author, :as => :select, :input_html => { :include_blank => true } %>
     #   <%= f.input :author, :as => :select, :input_html => { :prompt => "Please select an Author..." } %>
     #
-    # @example Group options an `<optgroup>` with the `:group_by` and `:group_label_method` options (`belongs_to` associations only)
+    # @example Group options an `<optgroup>` with the `:group_by` and `:group_label` options (`belongs_to` associations only)
     #   <%= f.input :author, :as => :select, :group_by => :continent %>
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 5e4b1a42f..3e74f8029 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -332,7 +332,7 @@
   end
 
   describe 'for an association when a :collection is provided' do
-    describe 'it should use the specified :value_method option' do
+    describe 'it should use the specified :member_value option' do
       before do
         @output_buffer = ''
         mock_everything
@@ -345,7 +345,7 @@
         item.should_receive(:custom_value).exactly(3).times
         @new_post.author.should_receive(:custom_value).exactly(3).times
         concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:author, :as => :check_boxes, :value_method => :custom_value, :collection => [item, item, item]))
+          concat(builder.input(:author, :as => :check_boxes, :member_value => :custom_value, :collection => [item, item, item]))
         end)
         output_buffer.should have_tag('input[@type=checkbox][@value="custom_value"]', :count => 3)
       end
diff --git a/spec/inputs/label_spec.rb b/spec/inputs/label_spec.rb
index faa5bef3e..714ea08d8 100644
--- a/spec/inputs/label_spec.rb
+++ b/spec/inputs/label_spec.rb
@@ -36,14 +36,14 @@
   describe 'when a collection is given' do
     it 'should use a supplied label_method for simple collections' do
       concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
-        concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :value_method => :to_s, :label_method => proc {|f| ('Label_%s' % [f])}))
+        concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :member_value => :to_s, :member_label => proc {|f| ('Label_%s' % [f])}))
       end)
       output_buffer.should have_tag('form li fieldset ol li label', /Label_[abc]/, :count => 3)
     end
 
     it 'should use a supplied value_method for simple collections' do
       concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
-        concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :value_method => proc {|f| ('Value_%s' % [f.to_s])}))
+        concat(builder.input(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :member_value => proc {|f| ('Value_%s' % [f.to_s])}))
       end)
       output_buffer.should have_tag('form li fieldset ol li label input[value="Value_a"]')
       output_buffer.should have_tag('form li fieldset ol li label input[value="Value_b"]')
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 45c6d3af4..90d5aaead 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -243,9 +243,9 @@
 
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select, :group_by => :continent ) )
-        concat(builder.input(:author, :as => :select, :group_by => :continent, :group_label_method => :id ) )
-        concat(builder.input(:author, :as => :select, :group_by => :continent, :label_method => :login ) )
-        concat(builder.input(:author, :as => :select, :group_by => :continent, :label_method => :login, :group_label_method => :id ) )
+        concat(builder.input(:author, :as => :select, :group_by => :continent, :group_label => :id ) )
+        concat(builder.input(:author, :as => :select, :group_by => :continent, :member_label => :login ) )
+        concat(builder.input(:author, :as => :select, :group_by => :continent, :member_label => :login, :group_label => :id ) )
       end)
     end
 
diff --git a/spec/support/custom_macros.rb b/spec/support/custom_macros.rb
index ec223b6ac..5f914352b 100644
--- a/spec/support/custom_macros.rb
+++ b/spec/support/custom_macros.rb
@@ -378,12 +378,12 @@ def it_should_use_the_collection_when_provided(as, countable)
 
         end
 
-        describe 'when the :label_method option is provided' do
+        describe 'when the :member_label option is provided' do
 
           describe 'as a symbol' do
             before do
               concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:author, :as => as, :label_method => :login))
+                concat(builder.input(:author, :as => as, :member_label => :login))
               end)
             end
 
@@ -397,7 +397,7 @@ def it_should_use_the_collection_when_provided(as, countable)
           describe 'as a proc' do
             before do
               concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:author, :as => as, :label_method => Proc.new {|a| a.login.reverse }))
+                concat(builder.input(:author, :as => as, :member_label => Proc.new {|a| a.login.reverse }))
               end)
             end
 
@@ -414,7 +414,7 @@ def reverse_login(a)
                 a.login.reverse
               end
               concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:author, :as => as, :label_method => method(:reverse_login)))
+                concat(builder.input(:author, :as => as, :member_label => method(:reverse_login)))
               end)
             end
 
@@ -426,7 +426,7 @@ def reverse_login(a)
           end
         end
 
-        describe 'when the :label_method option is not provided' do
+        describe 'when the :member_label option is not provided' do
           Formtastic::FormBuilder.collection_label_methods.each do |label_method|
 
             describe "when the collection objects respond to #{label_method}" do
@@ -449,12 +449,12 @@ def reverse_login(a)
           end
         end
 
-        describe 'when the :value_method option is provided' do
+        describe 'when the :member_value option is provided' do
 
           describe 'as a symbol' do
             before do
               concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:author, :as => as, :value_method => :login))
+                concat(builder.input(:author, :as => as, :member_value => :login))
               end)
             end
 
@@ -468,7 +468,7 @@ def reverse_login(a)
           describe 'as a proc' do
             before do
               concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:author, :as => as, :value_method => Proc.new {|a| a.login.reverse }))
+                concat(builder.input(:author, :as => as, :member_value => Proc.new {|a| a.login.reverse }))
               end)
             end
 
@@ -485,7 +485,7 @@ def reverse_login(a)
                 a.login.reverse
               end
               concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:author, :as => as, :value_method => method(:reverse_login)))
+                concat(builder.input(:author, :as => as, :member_value => method(:reverse_login)))
               end)
             end
 
@@ -497,6 +497,140 @@ def reverse_login(a)
           end
         end
 
+        describe 'when the deprecated :label_method option is provided' do
+          
+          describe 'as a symbol' do
+            before do
+              with_deprecation_silenced do
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:author, :as => as, :label_method => :login))
+                end)
+              end
+            end
+
+            it 'should have options with text content from the specified method' do
+              ::Author.all.each do |author|
+                output_buffer.should have_tag("form li.#{as}", /#{author.login}/)
+              end
+            end
+          end
+
+          describe 'as a proc' do
+            
+            before do
+              with_deprecation_silenced do
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:author, :as => as, :label_method => Proc.new {|a| a.login.reverse }))
+                end)
+              end
+            end
+
+            it 'should have options with the proc applied to each' do
+              ::Author.all.each do |author|
+                output_buffer.should have_tag("form li.#{as}", /#{author.login.reverse}/)
+              end
+            end
+          end
+
+          describe 'as a method object' do
+            before do
+              def reverse_login(a)
+                a.login.reverse
+              end
+              with_deprecation_silenced do 
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:author, :as => as, :label_method => method(:reverse_login)))
+                end)
+              end
+            end
+
+            it 'should have options with the proc applied to each' do
+              ::Author.all.each do |author|
+                output_buffer.should have_tag("form li.#{as}", /#{author.login.reverse}/)
+              end
+            end
+          end
+        end
+
+        describe 'when the deprecated :label_method option is not provided' do
+          Formtastic::FormBuilder.collection_label_methods.each do |label_method|
+
+            describe "when the collection objects respond to #{label_method}" do
+              before do
+                @fred.stub!(:respond_to?).and_return { |m| m.to_s == label_method || m.to_s == 'id' }
+                ::Author.all.each { |a| a.stub!(label_method).and_return('The Label Text') }
+
+                with_deprecation_silenced do 
+                  concat(semantic_form_for(@new_post) do |builder|
+                    concat(builder.input(:author, :as => as))
+                  end)
+                end
+              end
+
+              it "should render the options with #{label_method} as the label" do
+                ::Author.all.each do |author|
+                  output_buffer.should have_tag("form li.#{as}", /The Label Text/)
+                end
+              end
+            end
+
+          end
+        end
+
+        describe 'when the deprecated :value_method option is provided' do
+
+          describe 'as a symbol' do
+            before do
+              with_deprecation_silenced do 
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:author, :as => as, :value_method => :login))
+                end)
+              end
+            end
+
+            it 'should have options with values from specified method' do
+              ::Author.all.each do |author|
+                output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login}']")
+              end
+            end
+          end
+
+          describe 'as a proc' do
+            before do
+              with_deprecation_silenced do 
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:author, :as => as, :value_method => Proc.new {|a| a.login.reverse }))
+                end)
+              end
+            end
+
+            it 'should have options with the proc applied to each value' do
+              ::Author.all.each do |author|
+                output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login.reverse}']")
+              end
+            end
+          end
+
+          describe 'as a method object' do
+            before do
+              def reverse_login(a)
+                a.login.reverse
+              end
+              with_deprecation_silenced do 
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:author, :as => as, :value_method => method(:reverse_login)))
+                end)
+              end
+            end
+
+            it 'should have options with the proc applied to each value' do
+              ::Author.all.each do |author|
+                output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login.reverse}']")
+              end
+            end
+          end
+        end
+
       end
     end
 

From d34186d2fdf7a9b96fbf2cfbf2cd6efc4d07356b Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 5 May 2011 08:04:15 +1000
Subject: [PATCH 751/992] CHANGELOG

---
 CHANGELOG | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 89c34aa70..0be7be98a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -21,6 +21,13 @@
 * Changed short hand forms to raise an error when trying to render an input for a polymorphic association (it didn't work, need a collection)
 * Changed input() to raise an error when a :collection is not provided for a polymorphic association (we can't guess which class to use)
 * Removed semantic_remote_form_for etc, the remote_form_for helpers don't exist in Rails 3
+* Changed :label_method option to :member_label (with backwards compat and deprecation warnings)
+* Changed :value_method option to :member_value (with backwards compat and deprecation warnings)
+* Changed :grouped_label_method option to :grouped_label (with backwards compat and deprecation warnings)
+* Added support for a Method objects to :member_label/:member_value (aka :label_method/:value_method)
+* Improved support for Mongoid 
+* Changed Rails dependency from ~> 3.0.0 to ~> 3.0 to allow experimentation with Rails 3.1 betas
+
 
 1.2.4.beta (unreleased)
 

From 7e465098a4218c91ec03d59f438d40a3e7aabbbd Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 5 May 2011 08:32:30 +1000
Subject: [PATCH 752/992] documented :disable_with, fixes #466

---
 README.textile                           |  2 +-
 lib/formtastic/helpers/buttons_helper.rb | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.textile b/README.textile
index fe83db835..73c55ecdb 100644
--- a/README.textile
+++ b/README.textile
@@ -248,7 +248,7 @@ The same can be done for buttons with the @:button_html@ option:
   <% semantic_form_for @post do |form| %>
     ...
     <% form.buttons do %>
-      <%= form.commit_button :button_html => { :class => "primary" } %>
+      <%= form.commit_button :button_html => { :class => "primary", :disable_with => 'Wait...' } %>
     <% end %>
   <% end %>
 </pre>
diff --git a/lib/formtastic/helpers/buttons_helper.rb b/lib/formtastic/helpers/buttons_helper.rb
index abae1ac54..b9e11cd23 100644
--- a/lib/formtastic/helpers/buttons_helper.rb
+++ b/lib/formtastic/helpers/buttons_helper.rb
@@ -127,7 +127,7 @@ module ButtonsHelper
       #     <% semantic_form_for @post do |f| %>
       #       ...
       #       <%= f.buttons do %>
-      #         <%= f.commit_button :label => "Go", :input_html => { ... }, :wrapper_html => { ... }
+      #         <%= f.commit_button :label => "Go", :button_html => { :class => "pretty" :disable_with => "Wait..." }, :wrapper_html => { ... }
       #       <% end %>
       #     <% end %>
       #
@@ -214,14 +214,14 @@ def buttons(*args, &block)
       #   <%= f.commit_button "Go" %>
       #
       # @example Pass HTML attributes down to the `<input>`
-      #   <%= f.commit_button :button_html => { :class => 'pretty', :accesskey => 'g' } %>
-      #   <%= f.commit_button :label => "Go", :button_html => { :class => 'pretty', :accesskey => 'g' } %>
-      #   <%= f.commit_button "Go", :button_html => { :class => 'pretty', :accesskey => 'g' } %>
+      #   <%= f.commit_button :button_html => { :class => 'pretty', :accesskey => 'g', :disable_with => "Wait..." } %>
+      #   <%= f.commit_button :label => "Go", :button_html => { :class => 'pretty', :accesskey => 'g', :disable_with => "Wait..." } %>
+      #   <%= f.commit_button "Go", :button_html => { :class => 'pretty', :accesskey => 'g', :disable_with => "Wait..." } %>
       #
       # @example Pass HTML attributes down to the `<li>` wrapper
-      #   <%= f.commit_button :button_html => { :class => 'special', :id => 'whatever' } %>
-      #   <%= f.commit_button :label => "Go", :button_html => { :class => 'special', :id => 'whatever' } %>
-      #   <%= f.commit_button "Go", :button_html => { :class => 'special', :id => 'whatever' } %>
+      #   <%= f.commit_button :wrapper_html => { :class => 'special', :id => 'whatever' } %>
+      #   <%= f.commit_button :label => "Go", :wrapper_html => { :class => 'special', :id => 'whatever' } %>
+      #   <%= f.commit_button "Go", :wrapper_html => { :class => 'special', :id => 'whatever' } %>
       #
       # @option *args :label [String, Symbol]
       #   Override the label text with a String or a symbold for an i18n translation key

From 3459fd0aa8d923416a8eef00db4f2266f3beaf5d Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 5 May 2011 17:28:15 +1000
Subject: [PATCH 753/992] Many possible fixes for the %i interpolation in
 fieldset legends (references #515).

---
 lib/formtastic/helpers/fieldset_wrapper.rb | 21 +++++++++++++++++----
 spec/helpers/inputs_helper_spec.rb         |  5 ++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/lib/formtastic/helpers/fieldset_wrapper.rb b/lib/formtastic/helpers/fieldset_wrapper.rb
index 4c7805e0b..1d5cf35b1 100644
--- a/lib/formtastic/helpers/fieldset_wrapper.rb
+++ b/lib/formtastic/helpers/fieldset_wrapper.rb
@@ -25,7 +25,7 @@ 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.dup.delete(:name).to_s
+        legend  = (html_options[:name] || '').to_s
         legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
         legend  = template.content_tag(:legend, template.content_tag(:span, Formtastic::Util.html_safe(legend))) unless legend.blank?
 
@@ -41,7 +41,7 @@ def field_set_and_list_wrapping(*args, &block) #:nodoc:
         contents = contents.join if contents.respond_to?(:join)
         fieldset = template.content_tag(:fieldset,
           Formtastic::Util.html_safe(legend) << template.content_tag(:ol, Formtastic::Util.html_safe(contents)),
-          html_options.except(:builder, :parent)
+          html_options.except(:builder, :parent, :name)
         )
 
         fieldset
@@ -50,11 +50,24 @@ def field_set_and_list_wrapping(*args, &block) #:nodoc:
       # Gets the nested_child_index value from the parent builder. It returns a hash with each
       # association that the parent builds.
       def parent_child_index(parent) #:nodoc:
+        # Could be {"post[authors_attributes]"=>0} or { :authors => 0 }
         duck = parent[:builder].instance_variable_get('@nested_child_index')
-
+        
+        # Could be symbol for the association, or a model (or an array of either, I think? TODO)
         child = parent[:for]
+        # Pull a sybol or model out of Array (TODO: check if there's an Array)
         child = child.first if child.respond_to?(:first)
-        duck[child].to_i + 1
+        # If it's an object, get a symbol from the class name
+        child = child.class.name.underscore.to_sym unless child.is_a?(Symbol)
+        
+        key = "#{parent[:builder].object_name}[#{child}_attributes]"
+
+        # TODO: One of the tests produces a scenario where duck is "0" and the test looks for a "1" 
+        # in the legend, so if we have a number, return it with a +1 until we can verify this scenario.
+        return duck + 1 if duck.is_a?(Fixnum)
+        
+        # First try to extract key from duck Hash, then try child
+        i = (duck[key] || duck[child]).to_i + 1
       end
 
     end
diff --git a/spec/helpers/inputs_helper_spec.rb b/spec/helpers/inputs_helper_spec.rb
index 61d5acf19..e69002647 100644
--- a/spec/helpers/inputs_helper_spec.rb
+++ b/spec/helpers/inputs_helper_spec.rb
@@ -113,11 +113,14 @@
               concat(author.input(:login))
             end
           end)
-
+          
           output_buffer.should have_tag("form fieldset.inputs", :count => 2)
           output_buffer.should have_tag("form fieldset.inputs legend", :count => 2)
+          output_buffer.should have_tag("form fieldset.inputs legend", "1", :count => 1)
+          output_buffer.should have_tag("form fieldset.inputs legend", "2")
           output_buffer.should have_tag("form input[@name='post[authors_attributes][0][login]']")
           output_buffer.should have_tag("form input[@name='post[authors_attributes][1][login]']")
+          output_buffer.should_not have_tag('form fieldset[@name]')
         end
       end
 

From 2e7f2e0d2e018d7426e6f59faaccc3774a459015 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 6 May 2011 15:15:46 +0900
Subject: [PATCH 754/992] Bundle test suite in gem (issue#535).

---
 formtastic.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 48f7c4035..be73a3e3b 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.summary = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.email = %q{justin@indent.com.au}
   s.extra_rdoc_files = ["README.textile"]
-  s.files = Dir.glob("lib/**/*") + %w(MIT-LICENSE README.textile)
+  s.files = Dir.glob("{lib,spec}/**/*") + %w(MIT-LICENSE README.textile)
   s.homepage = %q{http://github.com/justinfrench/formtastic/tree/master}
   s.post_install_message = %q{
   ========================================================================

From f7ca5f564d7c1fc089c4b398fd179778b7d5a11a Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 7 May 2011 14:49:31 +1000
Subject: [PATCH 755/992] Work-around for Firefox 4 giving focus to the <li>
 wrapper (fixes #524).

http://www.quirksmode.org/css/clearing.html states that auto and hidden work, quick test in major browsers confirms
---
 lib/generators/templates/formtastic.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index d10237b83..d5272551b 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -30,7 +30,7 @@ form.formtastic ul.errors li { padding:0; border:none; display:list-item; }
 
 /* FIELDSETS & LISTS
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset { overflow:auto; } /* clearing contained floats */
+form.formtastic fieldset { overflow:hidden; } /* clearing contained floats */
 form.formtastic fieldset.inputs { }
 form.formtastic fieldset.buttons { padding-left:25%; }
 form.formtastic fieldset ol { }
@@ -39,7 +39,7 @@ form.formtastic fieldset.buttons li { float:left; padding-right:0.5em; }
 /* INPUT LIs
 --------------------------------------------------------------------------------------------------*/
 form.formtastic fieldset > ol > li { padding:0.5em 0; margin-top:-0.5em; margin-bottom:1em; } /* padding and negative margin juggling is for Firefox */
-form.formtastic fieldset > ol > li { overflow:auto; } /* clearing contained floats */
+form.formtastic fieldset > ol > li { overflow:hidden; } /* clearing contained floats */
 
 form.formtastic fieldset > ol > li.required { }
 form.formtastic fieldset > ol > li.optional { }

From 6084ca86ecf72afef7f4bb022fd51f7bf043e796 Mon Sep 17 00:00:00 2001
From: Kjel Delaey <kde@vasco.com>
Date: Wed, 11 May 2011 15:01:07 +0200
Subject: [PATCH 756/992] Add autofocus support with JavaScript fallback
 (jQuery) for non-HTML5 browsers (fixes #421)

---
 lib/formtastic/inputs/base/html.rb        |  5 ++--
 lib/formtastic/inputs/base/validations.rb |  6 ++++-
 lib/formtastic/inputs/base/wrapping.rb    |  1 +
 lib/formtastic/inputs/hidden_input.rb     |  2 +-
 lib/generators/templates/formtastic.js    | 28 +++++++++++++++++++++++
 sample/basic_inputs.html                  |  7 ++++++
 6 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 lib/generators/templates/formtastic.js

diff --git a/lib/formtastic/inputs/base/html.rb b/lib/formtastic/inputs/base/html.rb
index 4008f3e5f..a29d57b18 100644
--- a/lib/formtastic/inputs/base/html.rb
+++ b/lib/formtastic/inputs/base/html.rb
@@ -21,7 +21,8 @@ def to_html
         def input_html_options
           { 
             :id => dom_id,
-            :required => required?
+            :required => required?,
+            :autofocus => autofocus?
           }.merge(options[:input_html] || {})
         end
         
@@ -44,7 +45,7 @@ def dom_index
             ""
           end
         end
-        
+
       end
     end
   end
diff --git a/lib/formtastic/inputs/base/validations.rb b/lib/formtastic/inputs/base/validations.rb
index a2d1c7bc1..8d5ecd04c 100644
--- a/lib/formtastic/inputs/base/validations.rb
+++ b/lib/formtastic/inputs/base/validations.rb
@@ -140,7 +140,11 @@ def not_required_through_negated_validation!
         def optional?
           !required?
         end
-        
+
+        def autofocus?
+          !!options[:autofocus]
+        end
+
         def column_limit
           column.limit if column? && column.respond_to?(:limit)
         end
diff --git a/lib/formtastic/inputs/base/wrapping.rb b/lib/formtastic/inputs/base/wrapping.rb
index fea35d36b..8bb2be2e9 100644
--- a/lib/formtastic/inputs/base/wrapping.rb
+++ b/lib/formtastic/inputs/base/wrapping.rb
@@ -21,6 +21,7 @@ def wrapper_html_options
           opts[:class] << "error" if errors?
           opts[:class] << "optional" if optional?
           opts[:class] << "required" if required?
+          opts[:class] << "autofocus" if autofocus?
           opts[:class] = opts[:class].join(' ')
           
           opts[:id] ||= wrapper_dom_id
diff --git a/lib/formtastic/inputs/hidden_input.rb b/lib/formtastic/inputs/hidden_input.rb
index 347cb1b1a..41856c240 100644
--- a/lib/formtastic/inputs/hidden_input.rb
+++ b/lib/formtastic/inputs/hidden_input.rb
@@ -36,7 +36,7 @@ class HiddenInput
       #
       # @todo this is inconsistent with all other inputs, deprecate and remove
       def input_html_options
-        options.slice(:value).merge(super).merge(:required => nil)
+        options.slice(:value).merge(super).merge(:required => nil).merge(:autofocus => nil)
       end
       
       def to_html
diff --git a/lib/generators/templates/formtastic.js b/lib/generators/templates/formtastic.js
new file mode 100644
index 000000000..39cf7dcb1
--- /dev/null
+++ b/lib/generators/templates/formtastic.js
@@ -0,0 +1,28 @@
+(function($) {
+    $.formtastic = function(options) {
+        this.settings = $.extend({}, $.formtastic.defaults, options);
+    };
+
+    $.extend($.formtastic, {
+        defaults: {},
+
+        prototype: {
+            autofocusSupported: function() {
+                var input = document.createElement("input");
+                return "autofocus" in input;
+            },
+
+            autofocus: function() {
+                if (this.autofocusSupported() == false) {
+                    $(':input.autofocus:not(:hidden)').last().focus();
+                }
+            }
+        }
+    });
+})(jQuery);
+
+var formtastic = new $.formtastic();
+
+$(document).ready(function() {
+    formtastic.autofocus();
+});
diff --git a/sample/basic_inputs.html b/sample/basic_inputs.html
index 787578dcf..e25d1c7a8 100644
--- a/sample/basic_inputs.html
+++ b/sample/basic_inputs.html
@@ -5,6 +5,8 @@
     <meta charset="utf-8">
     <title>Formtastic</title>
     <link href="../lib/generators/templates/formtastic.css" rel="stylesheet" type="text/css" />
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.0/jquery.min.js" type="text/javascript"></script>
+    <script src="../lib/generators/templates/formtastic.js" type="text/javascript"></script>
     <style>
       body {
         font-family: helvetica, arial;
@@ -98,6 +100,11 @@ <h1>Formtastic</h1>
           </fieldset>
         </li>
 
+        <li class="string optional" id="gem_autofocus_input">
+          <label for="gem_autofocus">Autofocus</label>
+          <input id="gem_autofocus" name="gem[autofocus]" type="text" value="The focus is set to this field" autofocus="autofocus" class="autofocus">
+        </li>
+
         <li class="radio optional">
           <fieldset>
             <legend class="label"><label>Rate</label></legend>

From 32492d85f4d1ba44516b09d0fd8b18a2a8262fc9 Mon Sep 17 00:00:00 2001
From: Kjel Delaey <kde@vasco.com>
Date: Wed, 11 May 2011 16:55:36 +0200
Subject: [PATCH 757/992] Fixes previous commit: the wrapper's css class was
 not updated correctly + do not set an autocomplete class on the field
 (references #421)

---
 lib/formtastic/inputs/base/validations.rb | 4 +++-
 lib/generators/templates/formtastic.js    | 2 +-
 sample/basic_inputs.html                  | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/formtastic/inputs/base/validations.rb b/lib/formtastic/inputs/base/validations.rb
index 8d5ecd04c..482134017 100644
--- a/lib/formtastic/inputs/base/validations.rb
+++ b/lib/formtastic/inputs/base/validations.rb
@@ -142,7 +142,9 @@ def optional?
         end
 
         def autofocus?
-          !!options[:autofocus]
+          opt_autofocus = options[:input_html] && options[:input_html][:autofocus]
+
+          !!opt_autofocus
         end
 
         def column_limit
diff --git a/lib/generators/templates/formtastic.js b/lib/generators/templates/formtastic.js
index 39cf7dcb1..394c4830f 100644
--- a/lib/generators/templates/formtastic.js
+++ b/lib/generators/templates/formtastic.js
@@ -14,7 +14,7 @@
 
             autofocus: function() {
                 if (this.autofocusSupported() == false) {
-                    $(':input.autofocus:not(:hidden)').last().focus();
+                    $(':input[autofocus]:not(:hidden)').last().focus();
                 }
             }
         }
diff --git a/sample/basic_inputs.html b/sample/basic_inputs.html
index e25d1c7a8..604fc6edf 100644
--- a/sample/basic_inputs.html
+++ b/sample/basic_inputs.html
@@ -100,9 +100,9 @@ <h1>Formtastic</h1>
           </fieldset>
         </li>
 
-        <li class="string optional" id="gem_autofocus_input">
+        <li class="string optional autofocus" id="gem_autofocus_input">
           <label for="gem_autofocus">Autofocus</label>
-          <input id="gem_autofocus" name="gem[autofocus]" type="text" value="The focus is set to this field" autofocus="autofocus" class="autofocus">
+          <input id="gem_autofocus" name="gem[autofocus]" type="text" value="The focus is set to this field" autofocus="autofocus">
         </li>
 
         <li class="radio optional">

From bf443c3d14fc1ccedf808ede49e3d027c5470e8c Mon Sep 17 00:00:00 2001
From: Kjel Delaey <kde@vasco.com>
Date: Wed, 11 May 2011 16:56:54 +0200
Subject: [PATCH 758/992] Update the installer script: copy formtastic.js to
 public/javascripts (references #421)

---
 lib/generators/formtastic/install/install_generator.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/generators/formtastic/install/install_generator.rb b/lib/generators/formtastic/install/install_generator.rb
index fe6ddf4d6..3dc3d71f9 100644
--- a/lib/generators/formtastic/install/install_generator.rb
+++ b/lib/generators/formtastic/install/install_generator.rb
@@ -9,7 +9,7 @@ module Formtastic
   #
   # @todo Revisit in Rails 3.1 where public assets are treated differently
   class InstallGenerator < Rails::Generators::Base
-    desc "Copies formtastic.css and formtastic_changes.css to public/stylesheets/ and a config initializer to config/initializers/formtastic_config.rb"
+    desc "Copies formtastic.css and formtastic_changes.css to public/stylesheets/, formtastic.js to public/javascripts/, and a config initializer to config/initializers/formtastic_config.rb"
 
     source_root File.expand_path('../../../templates', __FILE__)
 
@@ -18,6 +18,7 @@ def copy_files
 
       template        'formtastic.css',         'public/stylesheets/formtastic.css'
       template        'formtastic_changes.css', 'public/stylesheets/formtastic_changes.css'
+      template        'formtastic.js',          'public/javascripts/formtastic.js'
     end
   end
 end

From 6be5d9319d6f96a644584ef37735f833476027d7 Mon Sep 17 00:00:00 2001
From: Kjel Delaey <kjel_delaey@hotmail.com>
Date: Wed, 11 May 2011 19:41:03 +0200
Subject: [PATCH 759/992] Add some basic specs to test the autofocus attribute
 (non-JS) (references #421)

---
 spec/inputs/hidden_input_spec.rb | 11 ++++++++++-
 spec/inputs/text_input_spec.rb   | 15 ++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/spec/inputs/hidden_input_spec.rb b/spec/inputs/hidden_input_spec.rb
index 3dc41c6d4..5f76ec90a 100644
--- a/spec/inputs/hidden_input_spec.rb
+++ b/spec/inputs/hidden_input_spec.rb
@@ -105,6 +105,15 @@
       output_buffer.should_not have_tag("input[@required]")
     end
   end
-  
+
+  context "when :autofocus is provided in :input_html" do
+    it "should not add the autofocus attribute to the input's html options" do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:title, :as => :hidden, :input_html => {:autofocus => true}))
+      end)
+      output_buffer.should_not have_tag("input[@autofocus]")
+    end
+  end
+
 end
 
diff --git a/spec/inputs/text_input_spec.rb b/spec/inputs/text_input_spec.rb
index d81c80ed7..e61ad8285 100644
--- a/spec/inputs/text_input_spec.rb
+++ b/spec/inputs/text_input_spec.rb
@@ -88,7 +88,20 @@
       output_buffer.should have_tag("textarea[@required]")
     end
   end
-  
+
+  context "when :autofocus is provided in :input_html" do
+    before(:each) do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:title, :input_html => {:autofocus => true}))
+      end)
+    end
+
+    it_should_have_input_wrapper_with_class("autofocus")
+
+    it "should add the autofocus attribute to the input's html options" do
+      output_buffer.should have_tag("input[@autofocus]")
+    end
+  end
 
   context "when :rows is missing in :input_html" do
     before do

From f1e83a3cf8a59c9483c2c4f691670cf8e5b7d3ce Mon Sep 17 00:00:00 2001
From: Ryan Garver <ragarver@gmail.com>
Date: Wed, 11 May 2011 15:43:29 -0700
Subject: [PATCH 760/992] Allow a radio field to have specific options set on
 each button through the collection similar to options_for_select

---
 lib/formtastic/inputs/base/choices.rb | 8 ++++++--
 lib/formtastic/inputs/radio_input.rb  | 4 ++--
 spec/inputs/radio_input_spec.rb       | 9 +++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/lib/formtastic/inputs/base/choices.rb b/lib/formtastic/inputs/base/choices.rb
index c6319c921..6700d5e4f 100644
--- a/lib/formtastic/inputs/base/choices.rb
+++ b/lib/formtastic/inputs/base/choices.rb
@@ -45,7 +45,11 @@ def choice_label(choice)
         end
 
         def choice_value(choice)
-          choice.is_a?(Array) ? choice.last : choice
+          choice.is_a?(Array) ? choice[1] : choice
+        end
+
+        def choice_options(choice)
+          ((choice.is_a?(Array) && choice.size > 2) ? choice.last : {}).merge(:id => choice_input_dom_id(choice))
         end
 
         def choice_html_safe_value(choice)
@@ -85,4 +89,4 @@ def label_html_options
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/formtastic/inputs/radio_input.rb b/lib/formtastic/inputs/radio_input.rb
index bb7e00d91..c106f695c 100644
--- a/lib/formtastic/inputs/radio_input.rb
+++ b/lib/formtastic/inputs/radio_input.rb
@@ -137,7 +137,7 @@ def to_html
 
       def choice_html(choice)        
         template.content_tag(:label,
-          builder.radio_button(input_name, choice_value(choice), input_html_options.merge(:id => choice_input_dom_id(choice))) << 
+          builder.radio_button(input_name, choice_value(choice), input_html_options.merge(choice_options(choice))) << 
           choice_label(choice),
           label_html_options.merge(:for => choice_input_dom_id(choice))
         )
@@ -151,4 +151,4 @@ def label_html_options
 
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index f31ed4c0c..cc6274cc7 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -83,6 +83,15 @@
         output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
       end
 
+      it "should mark the input as disabled if options attached for disabling" do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:author, :as => :radio, :collection => [["Test", 'test'], ["Try", "try", {:disabled => true}]]))
+        end)
+
+        output_buffer.should_not have_tag("form li fieldset ol li label input[@value='test'][@disabled='disabled']")
+        output_buffer.should have_tag("form li fieldset ol li label input[@value='try'][@disabled='disabled']")
+      end
+
       it "should not contain invalid HTML attributes" do
 
         concat(semantic_form_for(@new_post) do |builder|

From c89f3fb487c6a599d7a0aac31bb002e403491c0f Mon Sep 17 00:00:00 2001
From: Pirogov Evgenij <iamexile@gmail.com>
Date: Thu, 12 May 2011 03:37:51 -0700
Subject: [PATCH 761/992] Fix examples with no namespace given

---
 README.textile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.textile b/README.textile
index 73c55ecdb..65a9add8b 100644
--- a/README.textile
+++ b/README.textile
@@ -527,8 +527,8 @@ h3. Specifying HAML instead of ERB with @--haml@
 
 <pre>
   $ rails generate formtastic:form Post --haml
-      exists  app/views/admin/posts
-      create  app/views/admin/posts/_form.html.haml
+      exists  app/views/posts
+      create  app/views/posts/_form.html.haml
 </pre>
 
 h3. Specifying controller namespace with @--controller@
@@ -543,8 +543,8 @@ h3. Specifying which attributes need an input
 
 <pre>
   $ rails generate formtastic:form Post title:string body:text publication_state:select
-      exists  app/views/admin/posts
-      create  app/views/admin/posts/_form.html.erb
+      exists  app/views/posts
+      create  app/views/posts/_form.html.erb
 </pre>
 
 

From b895841fc2e4a59755f04a2141d6516145a63180 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 13 May 2011 07:12:25 +1000
Subject: [PATCH 762/992] add submit translation to en.yml fallback, fixes #551

---
 lib/locale/en.yml                         |  1 +
 spec/helpers/commit_button_helper_spec.rb | 22 +++++++++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/lib/locale/en.yml b/lib/locale/en.yml
index 147db7692..c571dd318 100644
--- a/lib/locale/en.yml
+++ b/lib/locale/en.yml
@@ -4,4 +4,5 @@ en:
     :no: 'No'
     :create: 'Create %{model}'
     :update: 'Update %{model}'
+    :submit: 'Submit %{model}'
     :required: 'required'
diff --git a/spec/helpers/commit_button_helper_spec.rb b/spec/helpers/commit_button_helper_spec.rb
index 181ae8aaf..09246a615 100644
--- a/spec/helpers/commit_button_helper_spec.rb
+++ b/spec/helpers/commit_button_helper_spec.rb
@@ -29,8 +29,27 @@
     end
 
   end
+  
+  describe 'when not persisted' do
 
+    before do
+      @new_post.stub(:respond_to?).with(:to_model).and_return("X")
+      @new_post.stub(:respond_to?).with(:persisted?).and_return(false)
+      @new_post.stub(:respond_to?).with(:new_record?).and_return(false)
+    end
 
+    it 'should have a submit button label' do
+      with_config :i18n_lookups_by_default, false do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.commit_button)
+        end)
+      end
+      
+      output_buffer.should have_tag('.commit input[@value="Submit Post"]')
+    end
+  end
+  
+  
   describe 'when used on any record' do
 
     before do
@@ -443,8 +462,5 @@ def self.human_name
     end
 
   end
-
-  
-  
   
 end

From 340a80ad7cf69b8ff327cf6789db3a7e672ec837 Mon Sep 17 00:00:00 2001
From: Jan Schwenzien <jan@schwenzien.org>
Date: Sun, 15 May 2011 14:57:09 +0200
Subject: [PATCH 763/992] removed call to :humanize (only possible value of
 label_str_method at this point)

---
 lib/formtastic/inputs/base/naming.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/base/naming.rb b/lib/formtastic/inputs/base/naming.rb
index df1a6d55e..c62898ec2 100644
--- a/lib/formtastic/inputs/base/naming.rb
+++ b/lib/formtastic/inputs/base/naming.rb
@@ -26,7 +26,7 @@ def humanized_method_name
             # rely purely on :human_attribute_name.
             method.to_s.send(builder.label_str_method)
           elsif object && object.class.respond_to?(:human_attribute_name)
-            object.class.human_attribute_name(method.to_s).send(builder.label_str_method)
+            object.class.human_attribute_name(method.to_s)
           else
             method.to_s.send(builder.label_str_method)
           end

From b9fb3c666f335d3d441b879c2bdae64da7cc0e91 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 16 May 2011 17:11:54 +1000
Subject: [PATCH 764/992] pulled JS stuff out of 2b8e18c (ref #555)

---
 .../formtastic/install/install_generator.rb   |  3 +-
 lib/generators/templates/formtastic.js        | 28 -------------------
 sample/basic_inputs.html                      |  1 -
 3 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 lib/generators/templates/formtastic.js

diff --git a/lib/generators/formtastic/install/install_generator.rb b/lib/generators/formtastic/install/install_generator.rb
index 3dc3d71f9..fe6ddf4d6 100644
--- a/lib/generators/formtastic/install/install_generator.rb
+++ b/lib/generators/formtastic/install/install_generator.rb
@@ -9,7 +9,7 @@ module Formtastic
   #
   # @todo Revisit in Rails 3.1 where public assets are treated differently
   class InstallGenerator < Rails::Generators::Base
-    desc "Copies formtastic.css and formtastic_changes.css to public/stylesheets/, formtastic.js to public/javascripts/, and a config initializer to config/initializers/formtastic_config.rb"
+    desc "Copies formtastic.css and formtastic_changes.css to public/stylesheets/ and a config initializer to config/initializers/formtastic_config.rb"
 
     source_root File.expand_path('../../../templates', __FILE__)
 
@@ -18,7 +18,6 @@ def copy_files
 
       template        'formtastic.css',         'public/stylesheets/formtastic.css'
       template        'formtastic_changes.css', 'public/stylesheets/formtastic_changes.css'
-      template        'formtastic.js',          'public/javascripts/formtastic.js'
     end
   end
 end
diff --git a/lib/generators/templates/formtastic.js b/lib/generators/templates/formtastic.js
deleted file mode 100644
index 394c4830f..000000000
--- a/lib/generators/templates/formtastic.js
+++ /dev/null
@@ -1,28 +0,0 @@
-(function($) {
-    $.formtastic = function(options) {
-        this.settings = $.extend({}, $.formtastic.defaults, options);
-    };
-
-    $.extend($.formtastic, {
-        defaults: {},
-
-        prototype: {
-            autofocusSupported: function() {
-                var input = document.createElement("input");
-                return "autofocus" in input;
-            },
-
-            autofocus: function() {
-                if (this.autofocusSupported() == false) {
-                    $(':input[autofocus]:not(:hidden)').last().focus();
-                }
-            }
-        }
-    });
-})(jQuery);
-
-var formtastic = new $.formtastic();
-
-$(document).ready(function() {
-    formtastic.autofocus();
-});
diff --git a/sample/basic_inputs.html b/sample/basic_inputs.html
index 604fc6edf..5d1f2430e 100644
--- a/sample/basic_inputs.html
+++ b/sample/basic_inputs.html
@@ -6,7 +6,6 @@
     <title>Formtastic</title>
     <link href="../lib/generators/templates/formtastic.css" rel="stylesheet" type="text/css" />
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.0/jquery.min.js" type="text/javascript"></script>
-    <script src="../lib/generators/templates/formtastic.js" type="text/javascript"></script>
     <style>
       body {
         font-family: helvetica, arial;

From 45170c552268ceb573374cf0377f3dbdca47f776 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 16 May 2011 17:19:01 +1000
Subject: [PATCH 765/992] refactored choice_options stuff from #556, still need
 some documentation

---
 lib/formtastic/inputs/base/choices.rb | 12 ++++++++++--
 lib/formtastic/inputs/radio_input.rb  |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic/inputs/base/choices.rb b/lib/formtastic/inputs/base/choices.rb
index 6700d5e4f..2c4cb442d 100644
--- a/lib/formtastic/inputs/base/choices.rb
+++ b/lib/formtastic/inputs/base/choices.rb
@@ -48,8 +48,16 @@ def choice_value(choice)
           choice.is_a?(Array) ? choice[1] : choice
         end
 
-        def choice_options(choice)
-          ((choice.is_a?(Array) && choice.size > 2) ? choice.last : {}).merge(:id => choice_input_dom_id(choice))
+        def choice_html_options(choice)
+          custom_choice_html_options(choice).merge(default_choice_html_options(choice))
+        end
+
+        def default_choice_html_options(choice)
+          { :id => choice_input_dom_id(choice) }
+        end
+
+        def custom_choice_html_options(choice)
+          (choice.is_a?(Array) && choice.size > 2) ? choice.last : {}
         end
 
         def choice_html_safe_value(choice)
diff --git a/lib/formtastic/inputs/radio_input.rb b/lib/formtastic/inputs/radio_input.rb
index c106f695c..801c14f07 100644
--- a/lib/formtastic/inputs/radio_input.rb
+++ b/lib/formtastic/inputs/radio_input.rb
@@ -137,7 +137,7 @@ def to_html
 
       def choice_html(choice)        
         template.content_tag(:label,
-          builder.radio_button(input_name, choice_value(choice), input_html_options.merge(choice_options(choice))) << 
+          builder.radio_button(input_name, choice_value(choice), input_html_options.merge(choice_html_options(choice))) << 
           choice_label(choice),
           label_html_options.merge(:for => choice_input_dom_id(choice))
         )

From b1c3a5b2aedf8208574076740128758c81ab2232 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 16 May 2011 17:23:54 +1000
Subject: [PATCH 766/992] documentation and @todos related to #556

---
 lib/formtastic/inputs/check_boxes_input.rb | 2 ++
 lib/formtastic/inputs/radio_input.rb       | 3 +++
 lib/formtastic/inputs/select_input.rb      | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index ef33832c5..505ca15a9 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -75,6 +75,8 @@ module Inputs
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     # @see Formtastic::Inputs::BooleanInput BooleanInput for a single checkbox for boolean (checked = true) inputs
+    #
+    # @todo Do/can we support the per-item HTML options like RadioInput?
     class CheckBoxesInput
       include Base
       include Base::Collections
diff --git a/lib/formtastic/inputs/radio_input.rb b/lib/formtastic/inputs/radio_input.rb
index 801c14f07..e94794a11 100644
--- a/lib/formtastic/inputs/radio_input.rb
+++ b/lib/formtastic/inputs/radio_input.rb
@@ -111,6 +111,9 @@ module Inputs
     # @example `:value_as_class` can be used to add a class to the `<li>` wrapped around each choice using the radio value for custom styling of each choice
     #   <%= f.input :author, :as => :radio, :value_as_class => true %>
     #
+    # @example Set HTML options on a specific radio input option with a 3rd element in the array for a collection member
+    #   <%= f.input :author, :as => :radio, :collection => [["Test", 'test'], ["Try", "try", {:disabled => true}]]
+    #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     # @see Formtastic::Inputs::RadioInput as an alternative for `belongs_to` associations
     #
diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index ba5b96474..a2a0a2213 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -132,6 +132,8 @@ module Inputs
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     # @see Formtastic::Inputs::CheckBoxesInput CheckBoxesInput as an alternative for `has_many` and `has_and_belongs_to_many` associations
     # @see Formtastic::Inputs::RadioInput RadioInput as an alternative for `belongs_to` associations
+    #
+    # @todo Do/can we support the per-item HTML options like RadioInput?
     class SelectInput
       include Base
       include Base::Collections

From c767ae92aef54fefef2b702b369f0531f5770089 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 16 May 2011 19:34:44 +1000
Subject: [PATCH 767/992] Make CSS selectors less specific, resolves missing
 nested styles issue #554

Changing `ol > li` to `ol li` allows the same styles to work on nested forms, because both `ol li` and `ol li ol li` will match. This original increase in specificity (9efd185795f71a911a182d868ae1274283968b43) did not mention any use cases or specific problems it was seeking to address, so we'll have to address those when the come up.
---
 lib/generators/templates/formtastic.css | 114 ++++++++++++------------
 1 file changed, 57 insertions(+), 57 deletions(-)

diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index d5272551b..61c359b34 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -38,66 +38,66 @@ form.formtastic fieldset.buttons li { float:left; padding-right:0.5em; }
 
 /* INPUT LIs
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol > li { padding:0.5em 0; margin-top:-0.5em; margin-bottom:1em; } /* padding and negative margin juggling is for Firefox */
-form.formtastic fieldset > ol > li { overflow:hidden; } /* clearing contained floats */
+form.formtastic fieldset > ol li { padding:0.5em 0; margin-top:-0.5em; margin-bottom:1em; } /* padding and negative margin juggling is for Firefox */
+form.formtastic fieldset > ol li { overflow:hidden; } /* clearing contained floats */
 
-form.formtastic fieldset > ol > li.required { }
-form.formtastic fieldset > ol > li.optional { }
-form.formtastic fieldset > ol > li.error { }
+form.formtastic fieldset > ol li.required { }
+form.formtastic fieldset > ol li.optional { }
+form.formtastic fieldset > ol li.error { }
 
 
 /* LABELS
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol > li label { display:block; width:25%; float:left; padding-top:.2em; }
-form.formtastic fieldset > ol > li > li label { line-height:100%; padding-top:0; }
-form.formtastic fieldset > ol > li > li label input { line-height:100%; vertical-align:middle; margin-top:-0.1em;}
+form.formtastic fieldset > ol li label { display:block; width:25%; float:left; padding-top:.2em; }
+form.formtastic fieldset > ol li li label { line-height:100%; padding-top:0; }
+form.formtastic fieldset > ol li li label input { line-height:100%; vertical-align:middle; margin-top:-0.1em;}
 
 
 /* NESTED FIELDSETS AND LEGENDS (radio, check boxes and date/time inputs use nested fieldsets)
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol > li fieldset { position:relative; }
-form.formtastic fieldset > ol > li fieldset legend { position:absolute; width:95%; left: 0px; }
-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; }
+form.formtastic fieldset > ol li fieldset { position:relative; }
+form.formtastic fieldset > ol li fieldset legend { position:absolute; width:95%; left: 0px; }
+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; }
 
 
 /* INLINE HINTS
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol > li p.inline-hints { color:#666; margin:0.5em 0 0 25%; }
+form.formtastic fieldset > ol li p.inline-hints { color:#666; margin:0.5em 0 0 25%; }
 
 
 /* INLINE ERRORS
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol > li p.inline-errors { color:#cc0000; margin:0.5em 0 0 25%; }
-form.formtastic fieldset > ol > li ul.errors { color:#cc0000; margin:0.5em 0 0 25%; list-style:square; }
-form.formtastic fieldset > ol > li ul.errors li { padding:0; border:none; display:list-item; }
+form.formtastic fieldset > ol li p.inline-errors { color:#cc0000; margin:0.5em 0 0 25%; }
+form.formtastic fieldset > ol li ul.errors { color:#cc0000; margin:0.5em 0 0 25%; list-style:square; }
+form.formtastic fieldset > ol li ul.errors li { padding:0; border:none; display:list-item; }
 
 
 /* STRING, NUMERIC, PASSWORD, EMAIL, URL, PHONE & SEARCH OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol > li.string input,
-form.formtastic fieldset > ol > li.password input,
-form.formtastic fieldset > ol > li.numeric input,
-form.formtastic fieldset > ol > li.email input,
-form.formtastic fieldset > ol > li.url input,
-form.formtastic fieldset > ol > li.phone input,
-form.formtastic fieldset > ol > li.search input { width:72%; }
+form.formtastic fieldset > ol li.string input,
+form.formtastic fieldset > ol li.password input,
+form.formtastic fieldset > ol li.numeric input,
+form.formtastic fieldset > ol li.email input,
+form.formtastic fieldset > ol li.url input,
+form.formtastic fieldset > ol li.phone input,
+form.formtastic fieldset > ol li.search input { width:72%; }
 
-form.formtastic fieldset > ol > li.string input[size],
-form.formtastic fieldset > ol > li.password input[size],
-form.formtastic fieldset > ol > li.numeric input[size],
-form.formtastic fieldset > ol > li.email input[size],
-form.formtastic fieldset > ol > li.url input[size],
-form.formtastic fieldset > ol > li.phone input[size],
-form.formtastic fieldset > ol > li.search input[size] { width:auto; max-width:72%; }
+form.formtastic fieldset > ol li.string input[size],
+form.formtastic fieldset > ol li.password input[size],
+form.formtastic fieldset > ol li.numeric input[size],
+form.formtastic fieldset > ol li.email input[size],
+form.formtastic fieldset > ol li.url input[size],
+form.formtastic fieldset > ol li.phone input[size],
+form.formtastic fieldset > ol li.search input[size] { width:auto; max-width:72%; }
 
 
 /* TEXTAREA OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol > li.text textarea { width:72%; }
-form.formtastic fieldset > ol > li.text textarea[cols] { width:auto; max-width:72%; }
+form.formtastic fieldset > ol li.text textarea { width:72%; }
+form.formtastic fieldset > ol li.text textarea[cols] { width:auto; max-width:72%; }
 
 
 /* HIDDEN OVERRIDES
@@ -106,40 +106,40 @@ form.formtastic fieldset ol li.hidden { display:none; }
 
 /* BOOLEAN OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol > li.boolean label { padding-left:25%; width:auto; }
-form.formtastic fieldset > ol > li.boolean label input { margin:0 0.5em 0 0.2em; }
+form.formtastic fieldset > ol li.boolean label { padding-left:25%; width:auto; }
+form.formtastic fieldset > ol li.boolean label input { margin:0 0.5em 0 0.2em; }
 
 
 /* RADIO OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol > li.radio { }
-form.formtastic fieldset > ol > li.radio fieldset { overflow:visible; }
-form.formtastic fieldset > ol > li.radio fieldset ol { margin-bottom:-0.5em; }
-form.formtastic fieldset > ol > li.radio fieldset ol li { margin:0.1em 0 0.5em 0; overflow:visible; }
-form.formtastic fieldset > ol > li.radio fieldset ol li label { float:none; width:100%; }
-form.formtastic fieldset > ol > li.radio fieldset ol li label input { margin-right:0.2em; }
+form.formtastic fieldset > ol li.radio { }
+form.formtastic fieldset > ol li.radio fieldset { overflow:visible; }
+form.formtastic fieldset > ol li.radio fieldset ol { margin-bottom:-0.5em; }
+form.formtastic fieldset > ol li.radio fieldset ol li { margin:0.1em 0 0.5em 0; overflow:visible; }
+form.formtastic fieldset > ol li.radio fieldset ol li label { float:none; width:100%; }
+form.formtastic fieldset > ol li.radio fieldset ol li label input { margin-right:0.2em; }
 
 
 /* CHECK BOXES (COLLECTION) OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol > li.check_boxes { }
-form.formtastic fieldset > ol > li.check_boxes fieldset { overflow:visible; }
-form.formtastic fieldset > ol > li.check_boxes fieldset ol { margin-bottom:-0.5em; }
-form.formtastic fieldset > ol > li.check_boxes fieldset ol li { margin:0.1em 0 0.5em 0; overflow:visible; }
-form.formtastic fieldset > ol > li.check_boxes fieldset ol li label { float:none; width:100%; }
-form.formtastic fieldset > ol > li.check_boxes fieldset ol li label input { margin-right:0.2em; }
+form.formtastic fieldset > ol li.check_boxes { }
+form.formtastic fieldset > ol li.check_boxes fieldset { overflow:visible; }
+form.formtastic fieldset > ol li.check_boxes fieldset ol { margin-bottom:-0.5em; }
+form.formtastic fieldset > ol li.check_boxes fieldset ol li { margin:0.1em 0 0.5em 0; overflow:visible; }
+form.formtastic fieldset > ol li.check_boxes fieldset ol li label { float:none; width:100%; }
+form.formtastic fieldset > ol li.check_boxes fieldset ol li label input { margin-right:0.2em; }
 
 
 /* DATE & TIME OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol > li.date fieldset ol li,
-form.formtastic fieldset > ol > li.time fieldset ol li,
-form.formtastic fieldset > ol > li.datetime fieldset ol li { float:left; width:auto; margin:0 .3em 0 0; }
+form.formtastic fieldset > ol li.date fieldset ol li,
+form.formtastic fieldset > ol li.time fieldset ol li,
+form.formtastic fieldset > ol li.datetime fieldset ol li { float:left; width:auto; margin:0 .3em 0 0; }
 
-form.formtastic fieldset > ol > li.date fieldset ol li label,
-form.formtastic fieldset > ol > li.time fieldset ol li label,
-form.formtastic fieldset > ol > li.datetime fieldset ol li label { display:none; }
+form.formtastic fieldset > ol li.date fieldset ol li label,
+form.formtastic fieldset > ol li.time fieldset ol li label,
+form.formtastic fieldset > ol li.datetime fieldset ol li label { display:none; }
 
-form.formtastic fieldset > ol > li.date fieldset ol li label input,
-form.formtastic fieldset > ol > li.time fieldset ol li label input,
-form.formtastic fieldset > ol > li.datetime fieldset ol li label input { display:inline; margin:0; padding:0;  }
+form.formtastic fieldset > ol li.date fieldset ol li label input,
+form.formtastic fieldset > ol li.time fieldset ol li label input,
+form.formtastic fieldset > ol li.datetime fieldset ol li label input { display:inline; margin:0; padding:0;  }

From 9109f7d0e7a223176feef63e9df6d1c55f4f87b8 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 16 May 2011 19:56:31 +1000
Subject: [PATCH 768/992] Added a new "stringish" class to wrapper around all
 inputs that use Stringish. Fixes #560

Since they're all so similar in appearance, this allows styling of them all together without writing ~9 selectors.
---
 lib/formtastic/inputs/base/stringish.rb | 5 +++++
 lib/formtastic/inputs/range_input.rb    | 2 ++
 spec/inputs/country_input_spec.rb       | 6 +++---
 spec/inputs/email_input_spec.rb         | 1 +
 spec/inputs/number_input_spec.rb        | 1 +
 spec/inputs/password_input_spec.rb      | 1 +
 spec/inputs/phone_input_spec.rb         | 1 +
 spec/inputs/range_input_spec.rb         | 1 +
 spec/inputs/search_input_spec.rb        | 1 +
 spec/inputs/string_input_spec.rb        | 1 +
 spec/inputs/url_input_spec.rb           | 1 +
 11 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic/inputs/base/stringish.rb b/lib/formtastic/inputs/base/stringish.rb
index 22615a00a..e8118b039 100644
--- a/lib/formtastic/inputs/base/stringish.rb
+++ b/lib/formtastic/inputs/base/stringish.rb
@@ -24,6 +24,11 @@ def placeholder_text
           localized_string(method, options[:placeholder], :placeholder)
         end
         
+        def wrapper_html_options
+          new_class = [super[:class], "stringish"].compact.join(" ")
+          super.merge(:class => new_class)
+        end
+        
       end
     end
   end
diff --git a/lib/formtastic/inputs/range_input.rb b/lib/formtastic/inputs/range_input.rb
index 575dcab4c..986b8e238 100644
--- a/lib/formtastic/inputs/range_input.rb
+++ b/lib/formtastic/inputs/range_input.rb
@@ -66,6 +66,8 @@ module Inputs
     #
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     # @see http://api.rubyonrails.org/classes/ActiveModel/Validations/HelperMethods.html#method-i-validates_numericality_of Rails' Numericality validation documentation
+    #
+    # @todo Is it still correct for this to be Stringish?
     class RangeInput
       include Base
       include Base::Stringish
diff --git a/spec/inputs/country_input_spec.rb b/spec/inputs/country_input_spec.rb
index 7d009cd65..c1d1e4cd6 100644
--- a/spec/inputs/country_input_spec.rb
+++ b/spec/inputs/country_input_spec.rb
@@ -55,7 +55,7 @@
       priority_countries = ["Foo", "Bah"]
       semantic_form_for(@new_post) do |builder|
         builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
-        builder.should_receive(:country_select).with(:country, priority_countries, {}, {:id => "post_country", :required => true}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        builder.should_receive(:country_select).with(:country, priority_countries, {}, {:id => "post_country", :required => true, :autofocus => false}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
 
         concat(builder.input(:country, :as => :country, :priority_countries => priority_countries))
       end
@@ -68,7 +68,7 @@
 
       semantic_form_for(@new_post) do |builder|
         builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
-        builder.should_receive(:country_select).with(:country, priority_countries, {}, {:id => "post_country", :required => true}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        builder.should_receive(:country_select).with(:country, priority_countries, {}, {:id => "post_country", :required => true, :autofocus => false}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
 
         concat(builder.input(:country, :as => :country))
       end
@@ -84,7 +84,7 @@
 
       concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
-        builder.should_receive(:country_select).with(:country, [], {}, {:id => "context2_post_country", :required => true}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        builder.should_receive(:country_select).with(:country, [], {}, {:id => "context2_post_country", :required => true, :autofocus => false}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         concat(builder.input(:country, :priority_countries => []))
       end)
     end
diff --git a/spec/inputs/email_input_spec.rb b/spec/inputs/email_input_spec.rb
index 328a4e597..863ba2209 100644
--- a/spec/inputs/email_input_spec.rb
+++ b/spec/inputs/email_input_spec.rb
@@ -18,6 +18,7 @@
     end
 
     it_should_have_input_wrapper_with_class(:email)
+    it_should_have_input_wrapper_with_class(:stringish)
     it_should_have_input_wrapper_with_id("post_email_input")
     it_should_have_label_with_text(/Email/)
     it_should_have_label_for("post_email")
diff --git a/spec/inputs/number_input_spec.rb b/spec/inputs/number_input_spec.rb
index d4b591b2a..7590d19f9 100644
--- a/spec/inputs/number_input_spec.rb
+++ b/spec/inputs/number_input_spec.rb
@@ -25,6 +25,7 @@
     end
 
     it_should_have_input_wrapper_with_class(:number)
+    it_should_have_input_wrapper_with_class(:stringish)
     it_should_have_input_wrapper_with_id("post_title_input")
     it_should_have_label_with_text(/Title/)
     it_should_have_label_for("post_title")
diff --git a/spec/inputs/password_input_spec.rb b/spec/inputs/password_input_spec.rb
index 09816764e..444b50e50 100644
--- a/spec/inputs/password_input_spec.rb
+++ b/spec/inputs/password_input_spec.rb
@@ -15,6 +15,7 @@
   end
 
   it_should_have_input_wrapper_with_class(:password)
+  it_should_have_input_wrapper_with_class(:stringish)
   it_should_have_input_wrapper_with_id("post_title_input")
   it_should_have_label_with_text(/Title/)
   it_should_have_label_for("post_title")
diff --git a/spec/inputs/phone_input_spec.rb b/spec/inputs/phone_input_spec.rb
index 198224e8c..7b54f389a 100644
--- a/spec/inputs/phone_input_spec.rb
+++ b/spec/inputs/phone_input_spec.rb
@@ -18,6 +18,7 @@
     end
 
     it_should_have_input_wrapper_with_class(:phone)
+    it_should_have_input_wrapper_with_class(:stringish)
     it_should_have_input_wrapper_with_id("post_phone_input")
     it_should_have_label_with_text(/Phone/)
     it_should_have_label_for("post_phone")
diff --git a/spec/inputs/range_input_spec.rb b/spec/inputs/range_input_spec.rb
index 7756b02de..e629a349a 100644
--- a/spec/inputs/range_input_spec.rb
+++ b/spec/inputs/range_input_spec.rb
@@ -19,6 +19,7 @@
     end
 
     it_should_have_input_wrapper_with_class(:range)
+    it_should_have_input_wrapper_with_class(:stringish) # might be removed
     it_should_have_input_wrapper_with_id("author_age_input")
     it_should_have_label_with_text(/Age/)
     it_should_have_label_for("author_age")
diff --git a/spec/inputs/search_input_spec.rb b/spec/inputs/search_input_spec.rb
index 8a5fc7fd8..aa35e78ac 100644
--- a/spec/inputs/search_input_spec.rb
+++ b/spec/inputs/search_input_spec.rb
@@ -18,6 +18,7 @@
     end
 
     it_should_have_input_wrapper_with_class(:search)
+    it_should_have_input_wrapper_with_class(:stringish)
     it_should_have_input_wrapper_with_id("post_search_input")
     it_should_have_label_with_text(/Search/)
     it_should_have_label_for("post_search")
diff --git a/spec/inputs/string_input_spec.rb b/spec/inputs/string_input_spec.rb
index 6e06cb327..a2614f8ea 100644
--- a/spec/inputs/string_input_spec.rb
+++ b/spec/inputs/string_input_spec.rb
@@ -18,6 +18,7 @@
     end
     
     it_should_have_input_wrapper_with_class(:string)
+    it_should_have_input_wrapper_with_class(:stringish)
     it_should_have_input_wrapper_with_id("post_title_input")
     it_should_have_label_with_text(/Title/)
     it_should_have_label_for("post_title")
diff --git a/spec/inputs/url_input_spec.rb b/spec/inputs/url_input_spec.rb
index 338859f26..10a0ee594 100644
--- a/spec/inputs/url_input_spec.rb
+++ b/spec/inputs/url_input_spec.rb
@@ -18,6 +18,7 @@
     end
 
     it_should_have_input_wrapper_with_class(:url)
+    it_should_have_input_wrapper_with_class(:stringish)
     it_should_have_input_wrapper_with_id("post_url_input")
     it_should_have_label_with_text(/Url/)
     it_should_have_label_for("post_url")

From 3535c5fa6b50b760909f1da1b85d60e00c37ef9e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 16 May 2011 20:16:42 +1000
Subject: [PATCH 769/992] add an .input class to all inputs to allow easy
 styling of all of them

---
 lib/formtastic/inputs/base/wrapping.rb | 1 +
 spec/inputs/boolean_input_spec.rb      | 1 +
 spec/inputs/check_boxes_input_spec.rb  | 1 +
 spec/inputs/country_input_spec.rb      | 1 +
 spec/inputs/date_input_spec.rb         | 1 +
 spec/inputs/datetime_input_spec.rb     | 1 +
 spec/inputs/email_input_spec.rb        | 1 +
 spec/inputs/file_input_spec.rb         | 1 +
 spec/inputs/hidden_input_spec.rb       | 1 +
 spec/inputs/number_input_spec.rb       | 1 +
 spec/inputs/numeric_input_spec.rb      | 1 +
 spec/inputs/password_input_spec.rb     | 1 +
 spec/inputs/phone_input_spec.rb        | 1 +
 spec/inputs/radio_input_spec.rb        | 1 +
 spec/inputs/range_input_spec.rb        | 1 +
 spec/inputs/search_input_spec.rb       | 1 +
 spec/inputs/select_input_spec.rb       | 1 +
 spec/inputs/string_input_spec.rb       | 1 +
 spec/inputs/text_input_spec.rb         | 1 +
 spec/inputs/time_input_spec.rb         | 1 +
 spec/inputs/time_zone_input_spec.rb    | 1 +
 spec/inputs/url_input_spec.rb          | 1 +
 22 files changed, 22 insertions(+)

diff --git a/lib/formtastic/inputs/base/wrapping.rb b/lib/formtastic/inputs/base/wrapping.rb
index 8bb2be2e9..fcfff13db 100644
--- a/lib/formtastic/inputs/base/wrapping.rb
+++ b/lib/formtastic/inputs/base/wrapping.rb
@@ -18,6 +18,7 @@ def wrapper_html_options
           opts[:class] ||= []
           opts[:class] = [opts[:class].to_s] unless opts[:class].is_a?(Array)
           opts[:class] << as
+          opts[:class] << "input"
           opts[:class] << "error" if errors?
           opts[:class] << "optional" if optional?
           opts[:class] << "required" if required?
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index f54cc32e6..be5cb08d7 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -15,6 +15,7 @@
   end
 
   it_should_have_input_wrapper_with_class("boolean")
+  it_should_have_input_wrapper_with_class(:input)
   it_should_have_input_wrapper_with_id("post_allow_comments_input")
   it_should_apply_error_logic_for_input_type(:boolean)
 
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 3e74f8029..8e52d1f05 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -16,6 +16,7 @@
     end
 
     it_should_have_input_wrapper_with_class("check_boxes")
+    it_should_have_input_wrapper_with_class(:input)
     it_should_have_input_wrapper_with_id("author_posts_input")
     it_should_have_a_nested_fieldset
     it_should_apply_error_logic_for_input_type(:check_boxes)
diff --git a/spec/inputs/country_input_spec.rb b/spec/inputs/country_input_spec.rb
index c1d1e4cd6..2416fc9f4 100644
--- a/spec/inputs/country_input_spec.rb
+++ b/spec/inputs/country_input_spec.rb
@@ -32,6 +32,7 @@
     end
 
     it_should_have_input_wrapper_with_class("country")
+    it_should_have_input_wrapper_with_class(:input)
     it_should_have_input_wrapper_with_id("post_country_input")
 
     # TODO -- needs stubbing inside the builder block, tricky!
diff --git a/spec/inputs/date_input_spec.rb b/spec/inputs/date_input_spec.rb
index 0790b0bae..ed84af940 100644
--- a/spec/inputs/date_input_spec.rb
+++ b/spec/inputs/date_input_spec.rb
@@ -20,6 +20,7 @@
     end
 
     it_should_have_input_wrapper_with_class("date")
+    it_should_have_input_wrapper_with_class(:input)
     it_should_have_input_wrapper_with_id("post_publish_at_input")
     it_should_have_a_nested_fieldset
     it_should_apply_error_logic_for_input_type(:date)
diff --git a/spec/inputs/datetime_input_spec.rb b/spec/inputs/datetime_input_spec.rb
index 58556c362..5175ec449 100644
--- a/spec/inputs/datetime_input_spec.rb
+++ b/spec/inputs/datetime_input_spec.rb
@@ -21,6 +21,7 @@
     end
 
     it_should_have_input_wrapper_with_class("datetime")
+    it_should_have_input_wrapper_with_class(:input)
     it_should_have_input_wrapper_with_id("post_publish_at_input")
     it_should_have_a_nested_fieldset
     it_should_apply_error_logic_for_input_type(:datetime)
diff --git a/spec/inputs/email_input_spec.rb b/spec/inputs/email_input_spec.rb
index 863ba2209..b4066c6d8 100644
--- a/spec/inputs/email_input_spec.rb
+++ b/spec/inputs/email_input_spec.rb
@@ -18,6 +18,7 @@
     end
 
     it_should_have_input_wrapper_with_class(:email)
+    it_should_have_input_wrapper_with_class(:input)
     it_should_have_input_wrapper_with_class(:stringish)
     it_should_have_input_wrapper_with_id("post_email_input")
     it_should_have_label_with_text(/Email/)
diff --git a/spec/inputs/file_input_spec.rb b/spec/inputs/file_input_spec.rb
index b7da00b73..6360e7a0e 100644
--- a/spec/inputs/file_input_spec.rb
+++ b/spec/inputs/file_input_spec.rb
@@ -15,6 +15,7 @@
   end
 
   it_should_have_input_wrapper_with_class("file")
+  it_should_have_input_wrapper_with_class(:input)
   it_should_have_input_wrapper_with_id("post_body_input")
   it_should_have_label_with_text(/Body/)
   it_should_have_label_for("post_body")
diff --git a/spec/inputs/hidden_input_spec.rb b/spec/inputs/hidden_input_spec.rb
index 5f76ec90a..2fee3503b 100644
--- a/spec/inputs/hidden_input_spec.rb
+++ b/spec/inputs/hidden_input_spec.rb
@@ -19,6 +19,7 @@
   end
 
   it_should_have_input_wrapper_with_class("hidden")
+  it_should_have_input_wrapper_with_class(:input)
   it_should_have_input_wrapper_with_id("post_secret_input")
   it_should_not_have_a_label
 
diff --git a/spec/inputs/number_input_spec.rb b/spec/inputs/number_input_spec.rb
index 7590d19f9..4f99ffda3 100644
--- a/spec/inputs/number_input_spec.rb
+++ b/spec/inputs/number_input_spec.rb
@@ -25,6 +25,7 @@
     end
 
     it_should_have_input_wrapper_with_class(:number)
+    it_should_have_input_wrapper_with_class(:input)
     it_should_have_input_wrapper_with_class(:stringish)
     it_should_have_input_wrapper_with_id("post_title_input")
     it_should_have_label_with_text(/Title/)
diff --git a/spec/inputs/numeric_input_spec.rb b/spec/inputs/numeric_input_spec.rb
index 2ff0e90fb..c6e9f1b95 100644
--- a/spec/inputs/numeric_input_spec.rb
+++ b/spec/inputs/numeric_input_spec.rb
@@ -25,6 +25,7 @@
       end)
     end
     output_buffer.should have_tag('li.numeric')
+    output_buffer.should have_tag('li.input')
   end
   
   it "should warn that :numeric is deprecated in favor of :number" do
diff --git a/spec/inputs/password_input_spec.rb b/spec/inputs/password_input_spec.rb
index 444b50e50..81f2a4e44 100644
--- a/spec/inputs/password_input_spec.rb
+++ b/spec/inputs/password_input_spec.rb
@@ -15,6 +15,7 @@
   end
 
   it_should_have_input_wrapper_with_class(:password)
+  it_should_have_input_wrapper_with_class(:input)
   it_should_have_input_wrapper_with_class(:stringish)
   it_should_have_input_wrapper_with_id("post_title_input")
   it_should_have_label_with_text(/Title/)
diff --git a/spec/inputs/phone_input_spec.rb b/spec/inputs/phone_input_spec.rb
index 7b54f389a..d70e87d68 100644
--- a/spec/inputs/phone_input_spec.rb
+++ b/spec/inputs/phone_input_spec.rb
@@ -18,6 +18,7 @@
     end
 
     it_should_have_input_wrapper_with_class(:phone)
+    it_should_have_input_wrapper_with_class(:input)
     it_should_have_input_wrapper_with_class(:stringish)
     it_should_have_input_wrapper_with_id("post_phone_input")
     it_should_have_label_with_text(/Phone/)
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index cc6274cc7..6022f6b9e 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -18,6 +18,7 @@
     end
 
     it_should_have_input_wrapper_with_class("radio")
+    it_should_have_input_wrapper_with_class(:input)
     it_should_have_input_wrapper_with_id("post_author_input")
     it_should_have_a_nested_fieldset
     it_should_apply_error_logic_for_input_type(:radio)
diff --git a/spec/inputs/range_input_spec.rb b/spec/inputs/range_input_spec.rb
index e629a349a..a2e546a16 100644
--- a/spec/inputs/range_input_spec.rb
+++ b/spec/inputs/range_input_spec.rb
@@ -19,6 +19,7 @@
     end
 
     it_should_have_input_wrapper_with_class(:range)
+    it_should_have_input_wrapper_with_class(:input)
     it_should_have_input_wrapper_with_class(:stringish) # might be removed
     it_should_have_input_wrapper_with_id("author_age_input")
     it_should_have_label_with_text(/Age/)
diff --git a/spec/inputs/search_input_spec.rb b/spec/inputs/search_input_spec.rb
index aa35e78ac..0c4387f33 100644
--- a/spec/inputs/search_input_spec.rb
+++ b/spec/inputs/search_input_spec.rb
@@ -18,6 +18,7 @@
     end
 
     it_should_have_input_wrapper_with_class(:search)
+    it_should_have_input_wrapper_with_class(:input)
     it_should_have_input_wrapper_with_class(:stringish)
     it_should_have_input_wrapper_with_id("post_search_input")
     it_should_have_label_with_text(/Search/)
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 90d5aaead..9f3195798 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -129,6 +129,7 @@
     end
 
     it_should_have_input_wrapper_with_class("select")
+    it_should_have_input_wrapper_with_class(:input)
     it_should_have_input_wrapper_with_id("post_author_input")
     it_should_have_label_with_text(/Author/)
     it_should_have_label_for('post_author_id')
diff --git a/spec/inputs/string_input_spec.rb b/spec/inputs/string_input_spec.rb
index a2614f8ea..dbcca9726 100644
--- a/spec/inputs/string_input_spec.rb
+++ b/spec/inputs/string_input_spec.rb
@@ -18,6 +18,7 @@
     end
     
     it_should_have_input_wrapper_with_class(:string)
+    it_should_have_input_wrapper_with_class(:input)
     it_should_have_input_wrapper_with_class(:stringish)
     it_should_have_input_wrapper_with_id("post_title_input")
     it_should_have_label_with_text(/Title/)
diff --git a/spec/inputs/text_input_spec.rb b/spec/inputs/text_input_spec.rb
index e61ad8285..13122708c 100644
--- a/spec/inputs/text_input_spec.rb
+++ b/spec/inputs/text_input_spec.rb
@@ -15,6 +15,7 @@
   end
 
   it_should_have_input_wrapper_with_class("text")
+  it_should_have_input_wrapper_with_class(:input)
   it_should_have_input_wrapper_with_id("post_body_input")
   it_should_have_label_with_text(/Body/)
   it_should_have_label_for("post_body")
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index 82fef8a59..94b86a4a6 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -44,6 +44,7 @@
       end
 
       it_should_have_input_wrapper_with_class("time")
+      it_should_have_input_wrapper_with_class(:input)
       it_should_have_input_wrapper_with_id("post_publish_at_input")
       it_should_have_a_nested_fieldset
       it_should_apply_error_logic_for_input_type(:time)
diff --git a/spec/inputs/time_zone_input_spec.rb b/spec/inputs/time_zone_input_spec.rb
index fd1ca76c6..4e75e64f9 100644
--- a/spec/inputs/time_zone_input_spec.rb
+++ b/spec/inputs/time_zone_input_spec.rb
@@ -15,6 +15,7 @@
   end
 
   it_should_have_input_wrapper_with_class("time_zone")
+  it_should_have_input_wrapper_with_class(:input)
   it_should_have_input_wrapper_with_id("post_time_zone_input")
   it_should_apply_error_logic_for_input_type(:time_zone)
 
diff --git a/spec/inputs/url_input_spec.rb b/spec/inputs/url_input_spec.rb
index 10a0ee594..04a4402ca 100644
--- a/spec/inputs/url_input_spec.rb
+++ b/spec/inputs/url_input_spec.rb
@@ -18,6 +18,7 @@
     end
 
     it_should_have_input_wrapper_with_class(:url)
+    it_should_have_input_wrapper_with_class(:input)
     it_should_have_input_wrapper_with_class(:stringish)
     it_should_have_input_wrapper_with_id("post_url_input")
     it_should_have_label_with_text(/Url/)

From b6e8eb222aa5b379b58130315ffa1e5e57b4c484 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 16 May 2011 20:19:50 +1000
Subject: [PATCH 770/992] CSS can be simplified to use .stringish class

---
 lib/generators/templates/formtastic.css | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index 61c359b34..f72b1f0ba 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -75,23 +75,10 @@ form.formtastic fieldset > ol li ul.errors { color:#cc0000; margin:0.5em 0 0 25%
 form.formtastic fieldset > ol li ul.errors li { padding:0; border:none; display:list-item; }
 
 
-/* STRING, NUMERIC, PASSWORD, EMAIL, URL, PHONE & SEARCH OVERRIDES
+/* STRING, NUMERIC, PASSWORD, EMAIL, URL, PHONE, SEARCH (ETC) OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol li.string input,
-form.formtastic fieldset > ol li.password input,
-form.formtastic fieldset > ol li.numeric input,
-form.formtastic fieldset > ol li.email input,
-form.formtastic fieldset > ol li.url input,
-form.formtastic fieldset > ol li.phone input,
-form.formtastic fieldset > ol li.search input { width:72%; }
-
-form.formtastic fieldset > ol li.string input[size],
-form.formtastic fieldset > ol li.password input[size],
-form.formtastic fieldset > ol li.numeric input[size],
-form.formtastic fieldset > ol li.email input[size],
-form.formtastic fieldset > ol li.url input[size],
-form.formtastic fieldset > ol li.phone input[size],
-form.formtastic fieldset > ol li.search input[size] { width:auto; max-width:72%; }
+form.formtastic fieldset > ol li.stringish input { width:72%; }
+form.formtastic fieldset > ol li.stringish input[size] { width:auto; max-width:72%; }
 
 
 /* TEXTAREA OVERRIDES
@@ -104,6 +91,7 @@ form.formtastic fieldset > ol li.text textarea[cols] { width:auto; max-width:72%
 --------------------------------------------------------------------------------------------------*/
 form.formtastic fieldset ol li.hidden { display:none; }
 
+
 /* BOOLEAN OVERRIDES
 --------------------------------------------------------------------------------------------------*/
 form.formtastic fieldset > ol li.boolean label { padding-left:25%; width:auto; }

From d463c062249c7d685a79d45640f5a505c6322a65 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 16 May 2011 20:30:38 +1000
Subject: [PATCH 771/992] CSS can be simplified to use new .input class (and
 some other simplifications)

---
 lib/generators/templates/formtastic.css | 92 ++++++++++++-------------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index f72b1f0ba..01a6725ce 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -38,96 +38,96 @@ form.formtastic fieldset.buttons li { float:left; padding-right:0.5em; }
 
 /* INPUT LIs
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol li { padding:0.5em 0; margin-top:-0.5em; margin-bottom:1em; } /* padding and negative margin juggling is for Firefox */
-form.formtastic fieldset > ol li { overflow:hidden; } /* clearing contained floats */
+form.formtastic .input { padding:0.5em 0; margin-top:-0.5em; margin-bottom:1em; } /* padding and negative margin juggling is for Firefox */
+form.formtastic .input { overflow:hidden; } /* clearing contained floats */
 
-form.formtastic fieldset > ol li.required { }
-form.formtastic fieldset > ol li.optional { }
-form.formtastic fieldset > ol li.error { }
+form.formtastic .required { }
+form.formtastic .optional { }
+form.formtastic .error { }
 
 
 /* LABELS
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol li label { display:block; width:25%; float:left; padding-top:.2em; }
-form.formtastic fieldset > ol li li label { line-height:100%; padding-top:0; }
-form.formtastic fieldset > ol li li label input { line-height:100%; vertical-align:middle; margin-top:-0.1em;}
+form.formtastic .input label { display:block; width:25%; float:left; padding-top:.2em; }
+form.formtastic .input li label { line-height:100%; padding-top:0; }
+form.formtastic .input li label input { line-height:100%; vertical-align:middle; margin-top:-0.1em;}
 
 
 /* NESTED FIELDSETS AND LEGENDS (radio, check boxes and date/time inputs use nested fieldsets)
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol li fieldset { position:relative; }
-form.formtastic fieldset > ol li fieldset legend { position:absolute; width:95%; left: 0px; }
-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; }
+form.formtastic .input fieldset { position:relative; }
+form.formtastic .input fieldset legend { position:absolute; width:95%; left: 0px; }
+form.formtastic .input fieldset legend span { position:absolute; }
+form.formtastic .input fieldset legend.label label { position:absolute; }
+form.formtastic .input fieldset ol { float:left; width:74%; margin:0; padding:0 0 0 25%; }
+form.formtastic .input fieldset ol li { padding:0; border:0; }
 
 
 /* INLINE HINTS
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol li p.inline-hints { color:#666; margin:0.5em 0 0 25%; }
+form.formtastic .input p.inline-hints { color:#666; margin:0.5em 0 0 25%; }
 
 
 /* INLINE ERRORS
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol li p.inline-errors { color:#cc0000; margin:0.5em 0 0 25%; }
-form.formtastic fieldset > ol li ul.errors { color:#cc0000; margin:0.5em 0 0 25%; list-style:square; }
-form.formtastic fieldset > ol li ul.errors li { padding:0; border:none; display:list-item; }
+form.formtastic .input p.inline-errors { color:#cc0000; margin:0.5em 0 0 25%; }
+form.formtastic .input ul.errors { color:#cc0000; margin:0.5em 0 0 25%; list-style:square; }
+form.formtastic .input ul.errors li { padding:0; border:none; display:list-item; }
 
 
 /* STRING, NUMERIC, PASSWORD, EMAIL, URL, PHONE, SEARCH (ETC) OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol li.stringish input { width:72%; }
-form.formtastic fieldset > ol li.stringish input[size] { width:auto; max-width:72%; }
+form.formtastic .stringish input { width:72%; }
+form.formtastic .stringish input[size] { width:auto; max-width:72%; }
 
 
 /* TEXTAREA OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol li.text textarea { width:72%; }
-form.formtastic fieldset > ol li.text textarea[cols] { width:auto; max-width:72%; }
+form.formtastic .text textarea { width:72%; }
+form.formtastic .text textarea[cols] { width:auto; max-width:72%; }
 
 
 /* HIDDEN OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset ol li.hidden { display:none; }
+form.formtastic .hidden { display:none; }
 
 
 /* BOOLEAN OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol li.boolean label { padding-left:25%; width:auto; }
-form.formtastic fieldset > ol li.boolean label input { margin:0 0.5em 0 0.2em; }
+form.formtastic .boolean label { padding-left:25%; width:auto; }
+form.formtastic .boolean label input { margin:0 0.5em 0 0.2em; }
 
 
 /* RADIO OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol li.radio { }
-form.formtastic fieldset > ol li.radio fieldset { overflow:visible; }
-form.formtastic fieldset > ol li.radio fieldset ol { margin-bottom:-0.5em; }
-form.formtastic fieldset > ol li.radio fieldset ol li { margin:0.1em 0 0.5em 0; overflow:visible; }
-form.formtastic fieldset > ol li.radio fieldset ol li label { float:none; width:100%; }
-form.formtastic fieldset > ol li.radio fieldset ol li label input { margin-right:0.2em; }
+form.formtastic .radio { }
+form.formtastic .radio fieldset { overflow:visible; }
+form.formtastic .radio fieldset ol { margin-bottom:-0.5em; }
+form.formtastic .radio fieldset ol li { margin:0.1em 0 0.5em 0; overflow:visible; }
+form.formtastic .radio fieldset ol li label { float:none; width:100%; }
+form.formtastic .radio fieldset ol li label input { margin-right:0.2em; }
 
 
 /* CHECK BOXES (COLLECTION) OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol li.check_boxes { }
-form.formtastic fieldset > ol li.check_boxes fieldset { overflow:visible; }
-form.formtastic fieldset > ol li.check_boxes fieldset ol { margin-bottom:-0.5em; }
-form.formtastic fieldset > ol li.check_boxes fieldset ol li { margin:0.1em 0 0.5em 0; overflow:visible; }
-form.formtastic fieldset > ol li.check_boxes fieldset ol li label { float:none; width:100%; }
-form.formtastic fieldset > ol li.check_boxes fieldset ol li label input { margin-right:0.2em; }
+form.formtastic .check_boxes { }
+form.formtastic .check_boxes fieldset { overflow:visible; }
+form.formtastic .check_boxes fieldset ol { margin-bottom:-0.5em; }
+form.formtastic .check_boxes fieldset ol li { margin:0.1em 0 0.5em 0; overflow:visible; }
+form.formtastic .check_boxes fieldset ol li label { float:none; width:100%; }
+form.formtastic .check_boxes fieldset ol li label input { margin-right:0.2em; }
 
 
 /* DATE & TIME OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset > ol li.date fieldset ol li,
-form.formtastic fieldset > ol li.time fieldset ol li,
-form.formtastic fieldset > ol li.datetime fieldset ol li { float:left; width:auto; margin:0 .3em 0 0; }
+form.formtastic .date fieldset ol li,
+form.formtastic .time fieldset ol li,
+form.formtastic .datetime fieldset ol li { float:left; width:auto; margin:0 .3em 0 0; }
 
-form.formtastic fieldset > ol li.date fieldset ol li label,
-form.formtastic fieldset > ol li.time fieldset ol li label,
-form.formtastic fieldset > ol li.datetime fieldset ol li label { display:none; }
+form.formtastic .date fieldset ol li label,
+form.formtastic .time fieldset ol li label,
+form.formtastic .datetime fieldset ol li label { display:none; }
 
-form.formtastic fieldset > ol li.date fieldset ol li label input,
-form.formtastic fieldset > ol li.time fieldset ol li label input,
-form.formtastic fieldset > ol li.datetime fieldset ol li label input { display:inline; margin:0; padding:0;  }
+form.formtastic .date fieldset ol li label input,
+form.formtastic .time fieldset ol li label input,
+form.formtastic .datetime fieldset ol li label input { display:inline; margin:0; padding:0;  }

From 2a9a856a06b468aa6b4f28691b4c5d9b3d9c4339 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 16 May 2011 20:31:50 +1000
Subject: [PATCH 772/992] simplify CSS: form.formtastic => .formtastic

---
 lib/generators/templates/formtastic.css | 124 ++++++++++++------------
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index 01a6725ce..34aed4532 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -10,124 +10,124 @@ This stylesheet forms part of the Formtastic Rails Plugin
 --------------------------------------------------------------------------------------------------*/
 
 
-/* NORMALIZE AND RESET - obviously inspired by Yahoo's reset.css, but scoped to just form.formtastic
+/* NORMALIZE AND RESET - obviously inspired by Yahoo's reset.css, but scoped to just .formtastic
 --------------------------------------------------------------------------------------------------*/
-form.formtastic, form.formtastic ul, form.formtastic ol, form.formtastic li, form.formtastic fieldset, form.formtastic legend, form.formtastic input, form.formtastic textarea, form.formtastic select, form.formtastic p { margin:0; padding:0; }
-form.formtastic fieldset { border:0; }
-form.formtastic em, form.formtastic strong { font-style:normal; font-weight:normal; }
-form.formtastic ol, form.formtastic ul { list-style:none; }
-form.formtastic abbr, form.formtastic acronym { border:0; font-variant:normal; }
-form.formtastic input, form.formtastic textarea, form.formtastic select { font-family:inherit; font-size:inherit; font-weight:inherit; }
-form.formtastic input, form.formtastic textarea, form.formtastic select { font-size:100%; }
-form.formtastic legend { white-space:normal; color:#000; }
+.formtastic, .formtastic ul, .formtastic ol, .formtastic li, .formtastic fieldset, .formtastic legend, .formtastic input, .formtastic textarea, .formtastic select, .formtastic p { margin:0; padding:0; }
+.formtastic fieldset { border:0; }
+.formtastic em, .formtastic strong { font-style:normal; font-weight:normal; }
+.formtastic ol, .formtastic ul { list-style:none; }
+.formtastic abbr, .formtastic acronym { border:0; font-variant:normal; }
+.formtastic input, .formtastic textarea, .formtastic select { font-family:inherit; font-size:inherit; font-weight:inherit; }
+.formtastic input, .formtastic textarea, .formtastic select { font-size:100%; }
+.formtastic legend { white-space:normal; color:#000; }
 
 
 /* SEMANTIC ERRORS
 --------------------------------------------------------------------------------------------------*/
-form.formtastic ul.errors { color:#cc0000; margin:0.5em 0 1.5em 25%; list-style:square; }
-form.formtastic ul.errors li { padding:0; border:none; display:list-item; }
+.formtastic ul.errors { color:#cc0000; margin:0.5em 0 1.5em 25%; list-style:square; }
+.formtastic ul.errors li { padding:0; border:none; display:list-item; }
 
 
 /* FIELDSETS & LISTS
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset { overflow:hidden; } /* clearing contained floats */
-form.formtastic fieldset.inputs { }
-form.formtastic fieldset.buttons { padding-left:25%; }
-form.formtastic fieldset ol { }
-form.formtastic fieldset.buttons li { float:left; padding-right:0.5em; }
+.formtastic fieldset { overflow:hidden; } /* clearing contained floats */
+.formtastic fieldset.inputs { }
+.formtastic fieldset.buttons { padding-left:25%; }
+.formtastic fieldset ol { }
+.formtastic fieldset.buttons li { float:left; padding-right:0.5em; }
 
 /* INPUT LIs
 --------------------------------------------------------------------------------------------------*/
-form.formtastic .input { padding:0.5em 0; margin-top:-0.5em; margin-bottom:1em; } /* padding and negative margin juggling is for Firefox */
-form.formtastic .input { overflow:hidden; } /* clearing contained floats */
+.formtastic .input { padding:0.5em 0; margin-top:-0.5em; margin-bottom:1em; } /* padding and negative margin juggling is for Firefox */
+.formtastic .input { overflow:hidden; } /* clearing contained floats */
 
-form.formtastic .required { }
-form.formtastic .optional { }
-form.formtastic .error { }
+.formtastic .required { }
+.formtastic .optional { }
+.formtastic .error { }
 
 
 /* LABELS
 --------------------------------------------------------------------------------------------------*/
-form.formtastic .input label { display:block; width:25%; float:left; padding-top:.2em; }
-form.formtastic .input li label { line-height:100%; padding-top:0; }
-form.formtastic .input li label input { line-height:100%; vertical-align:middle; margin-top:-0.1em;}
+.formtastic .input label { display:block; width:25%; float:left; padding-top:.2em; }
+.formtastic .input li label { line-height:100%; padding-top:0; }
+.formtastic .input li label input { line-height:100%; vertical-align:middle; margin-top:-0.1em;}
 
 
 /* NESTED FIELDSETS AND LEGENDS (radio, check boxes and date/time inputs use nested fieldsets)
 --------------------------------------------------------------------------------------------------*/
-form.formtastic .input fieldset { position:relative; }
-form.formtastic .input fieldset legend { position:absolute; width:95%; left: 0px; }
-form.formtastic .input fieldset legend span { position:absolute; }
-form.formtastic .input fieldset legend.label label { position:absolute; }
-form.formtastic .input fieldset ol { float:left; width:74%; margin:0; padding:0 0 0 25%; }
-form.formtastic .input fieldset ol li { padding:0; border:0; }
+.formtastic .input fieldset { position:relative; }
+.formtastic .input fieldset legend { position:absolute; width:95%; left: 0px; }
+.formtastic .input fieldset legend span { position:absolute; }
+.formtastic .input fieldset legend.label label { position:absolute; }
+.formtastic .input fieldset ol { float:left; width:74%; margin:0; padding:0 0 0 25%; }
+.formtastic .input fieldset ol li { padding:0; border:0; }
 
 
 /* INLINE HINTS
 --------------------------------------------------------------------------------------------------*/
-form.formtastic .input p.inline-hints { color:#666; margin:0.5em 0 0 25%; }
+.formtastic .input p.inline-hints { color:#666; margin:0.5em 0 0 25%; }
 
 
 /* INLINE ERRORS
 --------------------------------------------------------------------------------------------------*/
-form.formtastic .input p.inline-errors { color:#cc0000; margin:0.5em 0 0 25%; }
-form.formtastic .input ul.errors { color:#cc0000; margin:0.5em 0 0 25%; list-style:square; }
-form.formtastic .input ul.errors li { padding:0; border:none; display:list-item; }
+.formtastic .input p.inline-errors { color:#cc0000; margin:0.5em 0 0 25%; }
+.formtastic .input ul.errors { color:#cc0000; margin:0.5em 0 0 25%; list-style:square; }
+.formtastic .input ul.errors li { padding:0; border:none; display:list-item; }
 
 
 /* STRING, NUMERIC, PASSWORD, EMAIL, URL, PHONE, SEARCH (ETC) OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic .stringish input { width:72%; }
-form.formtastic .stringish input[size] { width:auto; max-width:72%; }
+.formtastic .stringish input { width:72%; }
+.formtastic .stringish input[size] { width:auto; max-width:72%; }
 
 
 /* TEXTAREA OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic .text textarea { width:72%; }
-form.formtastic .text textarea[cols] { width:auto; max-width:72%; }
+.formtastic .text textarea { width:72%; }
+.formtastic .text textarea[cols] { width:auto; max-width:72%; }
 
 
 /* HIDDEN OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic .hidden { display:none; }
+.formtastic .hidden { display:none; }
 
 
 /* BOOLEAN OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic .boolean label { padding-left:25%; width:auto; }
-form.formtastic .boolean label input { margin:0 0.5em 0 0.2em; }
+.formtastic .boolean label { padding-left:25%; width:auto; }
+.formtastic .boolean label input { margin:0 0.5em 0 0.2em; }
 
 
 /* RADIO OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic .radio { }
-form.formtastic .radio fieldset { overflow:visible; }
-form.formtastic .radio fieldset ol { margin-bottom:-0.5em; }
-form.formtastic .radio fieldset ol li { margin:0.1em 0 0.5em 0; overflow:visible; }
-form.formtastic .radio fieldset ol li label { float:none; width:100%; }
-form.formtastic .radio fieldset ol li label input { margin-right:0.2em; }
+.formtastic .radio { }
+.formtastic .radio fieldset { overflow:visible; }
+.formtastic .radio fieldset ol { margin-bottom:-0.5em; }
+.formtastic .radio fieldset ol li { margin:0.1em 0 0.5em 0; overflow:visible; }
+.formtastic .radio fieldset ol li label { float:none; width:100%; }
+.formtastic .radio fieldset ol li label input { margin-right:0.2em; }
 
 
 /* CHECK BOXES (COLLECTION) OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic .check_boxes { }
-form.formtastic .check_boxes fieldset { overflow:visible; }
-form.formtastic .check_boxes fieldset ol { margin-bottom:-0.5em; }
-form.formtastic .check_boxes fieldset ol li { margin:0.1em 0 0.5em 0; overflow:visible; }
-form.formtastic .check_boxes fieldset ol li label { float:none; width:100%; }
-form.formtastic .check_boxes fieldset ol li label input { margin-right:0.2em; }
+.formtastic .check_boxes { }
+.formtastic .check_boxes fieldset { overflow:visible; }
+.formtastic .check_boxes fieldset ol { margin-bottom:-0.5em; }
+.formtastic .check_boxes fieldset ol li { margin:0.1em 0 0.5em 0; overflow:visible; }
+.formtastic .check_boxes fieldset ol li label { float:none; width:100%; }
+.formtastic .check_boxes fieldset ol li label input { margin-right:0.2em; }
 
 
 /* DATE & TIME OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic .date fieldset ol li,
-form.formtastic .time fieldset ol li,
-form.formtastic .datetime fieldset ol li { float:left; width:auto; margin:0 .3em 0 0; }
+.formtastic .date fieldset ol li,
+.formtastic .time fieldset ol li,
+.formtastic .datetime fieldset ol li { float:left; width:auto; margin:0 .3em 0 0; }
 
-form.formtastic .date fieldset ol li label,
-form.formtastic .time fieldset ol li label,
-form.formtastic .datetime fieldset ol li label { display:none; }
+.formtastic .date fieldset ol li label,
+.formtastic .time fieldset ol li label,
+.formtastic .datetime fieldset ol li label { display:none; }
 
-form.formtastic .date fieldset ol li label input,
-form.formtastic .time fieldset ol li label input,
-form.formtastic .datetime fieldset ol li label input { display:inline; margin:0; padding:0;  }
+.formtastic .date fieldset ol li label input,
+.formtastic .time fieldset ol li label input,
+.formtastic .datetime fieldset ol li label input { display:inline; margin:0; padding:0;  }

From 102efd6d14da2a098a9e6ac52b03fbbddafa3ea4 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 16 May 2011 20:52:54 +1000
Subject: [PATCH 773/992] simplify CSS for outer fieldsets

---
 lib/generators/templates/formtastic.css | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index 34aed4532..d4b34a868 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -28,13 +28,17 @@ This stylesheet forms part of the Formtastic Rails Plugin
 .formtastic ul.errors li { padding:0; border:none; display:list-item; }
 
 
-/* FIELDSETS & LISTS
+/* OUTER FIELDSETS
 --------------------------------------------------------------------------------------------------*/
-.formtastic fieldset { overflow:hidden; } /* clearing contained floats */
-.formtastic fieldset.inputs { }
-.formtastic fieldset.buttons { padding-left:25%; }
-.formtastic fieldset ol { }
-.formtastic fieldset.buttons li { float:left; padding-right:0.5em; }
+.formtastic .inputs,
+.formtastic .buttons { overflow:hidden; } /* clearing contained floats */
+.formtastic .buttons { padding-left:25%; }
+
+
+/* BUTTONS
+--------------------------------------------------------------------------------------------------*/
+.formtastic .buttons li { float:left; padding-right:0.5em; }
+
 
 /* INPUT LIs
 --------------------------------------------------------------------------------------------------*/

From 0d8cd3e8de0bc9dfee8a85648f3ae47652e82d34 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 16 May 2011 21:04:53 +1000
Subject: [PATCH 774/992] add .input wrapper to the nested fields wrapping so
 that the new simplified styles pick it up

---
 lib/formtastic/helpers/inputs_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 87f7c88b6..7c9282f23 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -299,7 +299,7 @@ def inputs(*args, &block)
           end
         end
         
-        out = template.content_tag(:li, out) if wrap_it
+        out = template.content_tag(:li, out, :class => "input") if wrap_it
         @already_in_an_inputs_block = false
         out
       end

From 592a2b3415278eb8326b1356e4a34ffeefd754c4 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 16 May 2011 21:11:49 +1000
Subject: [PATCH 775/992] add a .button class to commit button wrapper, alter
 to css to match

---
 lib/formtastic/helpers/buttons_helper.rb  | 2 +-
 lib/generators/templates/formtastic.css   | 2 +-
 spec/helpers/commit_button_helper_spec.rb | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic/helpers/buttons_helper.rb b/lib/formtastic/helpers/buttons_helper.rb
index b9e11cd23..a10255348 100644
--- a/lib/formtastic/helpers/buttons_helper.rb
+++ b/lib/formtastic/helpers/buttons_helper.rb
@@ -264,7 +264,7 @@ def commit_button(*args)
         button_html = options.delete(:button_html) || {}
         button_html.merge!(:class => [button_html[:class], key].compact.join(' '))
 
-        wrapper_html_class = ['commit'] # TODO: Add class reflecting on form action.
+        wrapper_html_class = ['commit', 'button'] # TODO: Add class reflecting on form action.
         wrapper_html = options.delete(:wrapper_html) || {}
         wrapper_html[:class] = (wrapper_html_class << wrapper_html[:class]).flatten.compact.join(' ')
 
diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index d4b34a868..31e5fa6b7 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -37,7 +37,7 @@ This stylesheet forms part of the Formtastic Rails Plugin
 
 /* BUTTONS
 --------------------------------------------------------------------------------------------------*/
-.formtastic .buttons li { float:left; padding-right:0.5em; }
+.formtastic .buttons .button { float:left; padding-right:0.5em; }
 
 
 /* INPUT LIs
diff --git a/spec/helpers/commit_button_helper_spec.rb b/spec/helpers/commit_button_helper_spec.rb
index 09246a615..717dc8c13 100644
--- a/spec/helpers/commit_button_helper_spec.rb
+++ b/spec/helpers/commit_button_helper_spec.rb
@@ -62,6 +62,10 @@
     it 'should render a commit li' do
       output_buffer.should have_tag('li.commit')
     end
+    
+    it 'should render a button li' do
+      output_buffer.should have_tag('li.button')
+    end
 
     it 'should render an input with a type attribute of "submit"' do
       output_buffer.should have_tag('li.commit input[@type="submit"]')

From b2e5ceb2f281d20402d8e000d89714bfc55cf467 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 17 May 2011 06:20:24 +1000
Subject: [PATCH 776/992] add new classes to the sample

---
 sample/basic_inputs.html | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/sample/basic_inputs.html b/sample/basic_inputs.html
index 5d1f2430e..89ca8ed1b 100644
--- a/sample/basic_inputs.html
+++ b/sample/basic_inputs.html
@@ -20,60 +20,60 @@ <h1>Formtastic</h1>
   <form action="basic_inputs.html" class="formtastic gem" id="new_gem" method="get">
     <fieldset class="inputs">
       <ol>
-        <li class="string optional" id="gem_summary_input">
+        <li class="input string stringish optional" id="gem_summary_input">
           <label for="gem_summary">Summary</label>
           <input id="gem_summary" name="gem[summary]" type="text" value="A Rails form builder plugin/gem with semantically rich and accessible markup" maxlength="255">
         </li>
 
-        <li class="text optional" id="gem_description_input">
+        <li class="input text optional" id="gem_description_input">
           <label for="gem_description">Description</label>
           <textarea id="gem_description" rows="5">A Rails form builder plugin/gem with semantically rich and accessible markup</textarea>
         </li>
 
-        <li class="url optional" id="gem_url_input">
+        <li class="input url stringish optional" id="gem_url_input">
           <label for="gem_url">URL</label>
           <input id="gem_url" name="gem[url]" type="url">
           <p class="inline-hints">Example: https://github.com/justinfrench/formtastic</p>
         </li>
 
-        <li class="password required" id="gem_password_input">
+        <li class="input password stringish required" id="gem_password_input">
           <label for="gem_password">Password<abbr title="required">*</abbr></label>
           <input id="gem_password" name="gem[password]" type="password">
           <p class="inline-errors">can't be blank</p>
         </li>
 
-        <li class="password required" id="gem_password_input">
+        <li class="input password stringish required" id="gem_password_input">
           <label for="gem_password_confirmation">Password confirmation<abbr title="required">*</abbr></label>
           <input id="gem_password_confirmation" name="gem[password_confirmation]" type="password">
           <p class="inline-errors">can't be blank</p>
         </li>
 
-        <li class="numeric optional" id="gem_downloads_input">
+        <li class="input numeric stringish optional" id="gem_downloads_input">
           <label for="gem_downloads">Downloads</label>
           <input id="gem_downloads" name="gem[downloads]" type="numeric" value="209,354">
         </li>
 
-        <li class="file optional" id="gem_file_input">
+        <li class="input file optional" id="gem_file_input">
           <label for="gem_file">File</label>
           <input id="gem_file" name="gem[file]" type="file" value="value">
         </li>
 
-        <li class="email optional" id="gem_email_input">
+        <li class="input email stringish optional" id="gem_email_input">
           <label for="gem_email">Email</label>
           <input id="gem_email" name="gem[email]" type="email">
         </li>
 
-        <li class="phone optional" id="gem_phone_input">
+        <li class="input phone stringish optional" id="gem_phone_input">
           <label for="gem_phone">Phone</label>
           <input id="gem_phone" name="gem[phone]" type="phone">
         </li>
 
-        <li class="search optional" id="gem_search_input">
+        <li class="input search stringish optional" id="gem_search_input">
           <label for="gem_search">Search</label>
           <input id="gem_search" name="gem[search]" type="search">
         </li>
 
-        <li class="date optional">
+        <li class="input date optional">
           <fieldset>
             <legend class="label"><label>First release</label></legend>
             <ol>
@@ -99,12 +99,12 @@ <h1>Formtastic</h1>
           </fieldset>
         </li>
 
-        <li class="string optional autofocus" id="gem_autofocus_input">
+        <li class="input string stringish optional autofocus" id="gem_autofocus_input">
           <label for="gem_autofocus">Autofocus</label>
           <input id="gem_autofocus" name="gem[autofocus]" type="text" value="The focus is set to this field" autofocus="autofocus">
         </li>
 
-        <li class="radio optional">
+        <li class="input radio optional">
           <fieldset>
             <legend class="label"><label>Rate</label></legend>
             <ol>
@@ -127,7 +127,7 @@ <h1>Formtastic</h1>
           </fieldset>
         </li>
 
-        <li class="check_boxes optional">
+        <li class="input check_boxes optional">
           <fieldset>
             <legend class="label"><label>Browsers</label></legend>
             <ol>
@@ -154,7 +154,7 @@ <h1>Formtastic</h1>
 
     <fieldset class="buttons">
       <ol>
-        <li class="commit">
+        <li class="button commit">
           <input class="create" id="gem_submit" type="submit">
         </li>
       </ol>

From c1e5ce266987ffbabcaa2991a806fdc2f3492661 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 17 May 2011 06:23:11 +1000
Subject: [PATCH 777/992] added missing select to sample

---
 sample/basic_inputs.html | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sample/basic_inputs.html b/sample/basic_inputs.html
index 89ca8ed1b..ca582a1d6 100644
--- a/sample/basic_inputs.html
+++ b/sample/basic_inputs.html
@@ -104,6 +104,14 @@ <h1>Formtastic</h1>
           <input id="gem_autofocus" name="gem[autofocus]" type="text" value="The focus is set to this field" autofocus="autofocus">
         </li>
 
+        <li class="input select optional" id="gem_autofocus_input">
+          <label for="gem_awesomeness">Select</label>
+          <select id="gem_awesomeness" name="gem[awesomeness]" type="text">
+            <option value="5">First choice</option>
+            <option value="4">Second choice</option>
+          </select>
+        </li>
+
         <li class="input radio optional">
           <fieldset>
             <legend class="label"><label>Rate</label></legend>

From d198d276f026ca9421edd2310a98388dc3b6f666 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 17 May 2011 06:30:11 +1000
Subject: [PATCH 778/992] added missing boolean example to sample (and fixed
 select)

---
 sample/basic_inputs.html | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/sample/basic_inputs.html b/sample/basic_inputs.html
index ca582a1d6..d0a45d657 100644
--- a/sample/basic_inputs.html
+++ b/sample/basic_inputs.html
@@ -104,9 +104,16 @@ <h1>Formtastic</h1>
           <input id="gem_autofocus" name="gem[autofocus]" type="text" value="The focus is set to this field" autofocus="autofocus">
         </li>
 
-        <li class="input select optional" id="gem_autofocus_input">
+        <li class="input boolean optional" id="gem_terms_and_conditions_input">
+          <label for="gem_terms_and_conditions">
+            <input id="gem_terms_and_conditions" name="gem[terms_and_conditions]" type="checkbox" value="1" checked="checked">
+            I agree to your draconian terms of service
+          </label>
+        </li>
+        
+        <li class="input select optional" id="gem_awesomeness_input">
           <label for="gem_awesomeness">Select</label>
-          <select id="gem_awesomeness" name="gem[awesomeness]" type="text">
+          <select id="gem_awesomeness" name="gem[awesomeness]">
             <option value="5">First choice</option>
             <option value="4">Second choice</option>
           </select>

From 2abc2f4aca1bd97cb55014536977782d51ae7c79 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 17 May 2011 06:34:58 +1000
Subject: [PATCH 779/992] add more comments to CSS

---
 lib/generators/templates/formtastic.css | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index 31e5fa6b7..3c2920804 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -53,8 +53,16 @@ This stylesheet forms part of the Formtastic Rails Plugin
 /* LABELS
 --------------------------------------------------------------------------------------------------*/
 .formtastic .input label { display:block; width:25%; float:left; padding-top:.2em; }
+
+
+/* CHECKBOXES AND RADIO LABELS
+--------------------------------------------------------------------------------------------------*/
 .formtastic .input li label { line-height:100%; padding-top:0; }
-.formtastic .input li label input { line-height:100%; vertical-align:middle; margin-top:-0.1em;}
+
+
+/* CHECKBOXES AND RADIO INPUTS
+--------------------------------------------------------------------------------------------------*/
+.formtastic .input li label input { line-height:100%; vertical-align:middle; margin-top:-0.1em; }
 
 
 /* NESTED FIELDSETS AND LEGENDS (radio, check boxes and date/time inputs use nested fieldsets)

From 86f46cb8a791448de0b5c018f35a6eaef9504c6d Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 17 May 2011 06:39:33 +1000
Subject: [PATCH 780/992] improve alignment of radio and check_boxes
 labels/inputs

---
 lib/generators/templates/formtastic.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index 3c2920804..0d3f40683 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -57,12 +57,12 @@ This stylesheet forms part of the Formtastic Rails Plugin
 
 /* CHECKBOXES AND RADIO LABELS
 --------------------------------------------------------------------------------------------------*/
-.formtastic .input li label { line-height:100%; padding-top:0; }
+.formtastic .input li label { line-height:100%; padding-top:0; margin-bottom:0.6em; }
 
 
 /* CHECKBOXES AND RADIO INPUTS
 --------------------------------------------------------------------------------------------------*/
-.formtastic .input li label input { line-height:100%; vertical-align:middle; margin-top:-0.1em; }
+.formtastic .input li label input { line-height:100%; }
 
 
 /* NESTED FIELDSETS AND LEGENDS (radio, check boxes and date/time inputs use nested fieldsets)

From dc8e5e5e7ebf19614fa462eff5ac8e38014e386e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 17 May 2011 06:40:51 +1000
Subject: [PATCH 781/992] be more specic and communicate better what we're
 targetting with this selector

---
 lib/generators/templates/formtastic.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index 0d3f40683..782593580 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -57,7 +57,8 @@ This stylesheet forms part of the Formtastic Rails Plugin
 
 /* CHECKBOXES AND RADIO LABELS
 --------------------------------------------------------------------------------------------------*/
-.formtastic .input li label { line-height:100%; padding-top:0; margin-bottom:0.6em; }
+.formtastic .boolean li label,
+.formtastuc .check_boxes li label { line-height:100%; padding-top:0; margin-bottom:0.6em; }
 
 
 /* CHECKBOXES AND RADIO INPUTS

From 057eabeb64cda4e1d7e82b7a6bc15d426c19ae56 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 17 May 2011 07:23:15 +1000
Subject: [PATCH 782/992] Change the reset a little, font-family:inherit; does
 bad things to selects in Opera and Firefox.

---
 lib/generators/templates/formtastic.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index 782593580..2cf8336f1 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -17,7 +17,8 @@ This stylesheet forms part of the Formtastic Rails Plugin
 .formtastic em, .formtastic strong { font-style:normal; font-weight:normal; }
 .formtastic ol, .formtastic ul { list-style:none; }
 .formtastic abbr, .formtastic acronym { border:0; font-variant:normal; }
-.formtastic input, .formtastic textarea, .formtastic select { font-family:inherit; font-size:inherit; font-weight:inherit; }
+.formtastic input, .formtastic textarea { font-family:inherit; font-size:inherit; font-weight:inherit; }
+.formtastic select { font-size:inherit; font-weight:inherit; }
 .formtastic input, .formtastic textarea, .formtastic select { font-size:100%; }
 .formtastic legend { white-space:normal; color:#000; }
 
@@ -57,7 +58,7 @@ This stylesheet forms part of the Formtastic Rails Plugin
 
 /* CHECKBOXES AND RADIO LABELS
 --------------------------------------------------------------------------------------------------*/
-.formtastic .boolean li label,
+.formtastic .radio li label,
 .formtastuc .check_boxes li label { line-height:100%; padding-top:0; margin-bottom:0.6em; }
 
 

From 105386df18e356582974adf5da04c90c40bac92d Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 17 May 2011 16:59:10 +1000
Subject: [PATCH 783/992] Heaps of new HTML classes (and using them in the
 CSS).

.choices for the fieldset inside a .radio or .check_boxes input
.choices-group for the ol inside the .choices
.choice for each li in .choices-group
.fragments for the fieldset inside date/time inputs
.fragments-group for the ol inside .fragments
.fragment for the li inside .fragments-group

Still some duplication to remove and we don't need all this specificity.
---
 lib/formtastic/inputs/base/choices.rb   |  9 ++--
 lib/formtastic/inputs/base/timeish.rb   | 25 ++++++-----
 lib/generators/templates/formtastic.css | 56 ++++++++++++-------------
 sample/basic_inputs.html                | 38 ++++++++---------
 spec/inputs/check_boxes_input_spec.rb   |  6 ++-
 spec/inputs/date_input_spec.rb          |  6 ++-
 spec/inputs/datetime_input_spec.rb      |  6 ++-
 spec/inputs/radio_input_spec.rb         |  4 +-
 spec/inputs/time_input_spec.rb          |  6 ++-
 spec/support/custom_macros.rb           | 12 ++++++
 10 files changed, 98 insertions(+), 70 deletions(-)

diff --git a/lib/formtastic/inputs/base/choices.rb b/lib/formtastic/inputs/base/choices.rb
index 2c4cb442d..335b0e7fc 100644
--- a/lib/formtastic/inputs/base/choices.rb
+++ b/lib/formtastic/inputs/base/choices.rb
@@ -11,7 +11,7 @@ def choices_wrapping(&block)
         end
 
         def choices_wrapping_html_options
-          {}
+          { :class => "choices" }
         end
 
         def choices_group_wrapping(&block)
@@ -22,7 +22,7 @@ def choices_group_wrapping(&block)
         end
 
         def choices_group_wrapping_html_options
-          {}
+          { :class => "choices-group" }
         end
 
         def choice_wrapping(html_options, &block)
@@ -33,7 +33,10 @@ def choice_wrapping(html_options, &block)
         end
 
         def choice_wrapping_html_options(choice)
-          { :class => value_as_class? ? "#{sanitized_method_name.singularize}_#{choice_html_safe_value(choice)}" : '' }
+          classes = ['choice']
+          classes << "#{sanitized_method_name.singularize}_#{choice_html_safe_value(choice)}" if value_as_class?
+          
+          { :class => classes.join(" ") }
         end
 
         def choice_html(choice)        
diff --git a/lib/formtastic/inputs/base/timeish.rb b/lib/formtastic/inputs/base/timeish.rb
index 1c1fe84e9..081b613e3 100644
--- a/lib/formtastic/inputs/base/timeish.rb
+++ b/lib/formtastic/inputs/base/timeish.rb
@@ -7,15 +7,14 @@ def to_html
           input_wrapping do
             fragments_wrapping do
               fragments_label <<
-              template.content_tag(:fieldset,
-                template.content_tag(:ol,
-                  fragments.map do |fragment|
-                    fragment_wrapping do
-                      fragment_label_html(fragment) <<
-                      fragment_input_html(fragment)
-                    end
-                  end.join.html_safe # TODO is this safe?
-                )
+              template.content_tag(:ol,
+                fragments.map do |fragment|
+                  fragment_wrapping do
+                    fragment_label_html(fragment) <<
+                    fragment_input_html(fragment)
+                  end
+                end.join.html_safe, # TODO is this safe?
+                { :class => 'fragments-group' } # TODO refactor to fragments_group_wrapping
               )
             end
           end
@@ -38,7 +37,11 @@ def default_date_fragments
         end
         
         def fragment_wrapping(&block)
-          template.content_tag(:li, template.capture(&block))
+          template.content_tag(:li, template.capture(&block), fragment_wrapping_html_options)
+        end
+        
+        def fragment_wrapping_html_options
+          { :class => 'fragment' }
         end
         
         def fragment_label(fragment)
@@ -99,7 +102,7 @@ def fragments_wrapping(&block)
         end
         
         def fragments_wrapping_html_options
-          {}
+          { :class => "fragments" }
         end
         
         def fragments_label
diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index 2cf8336f1..026740b42 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -58,23 +58,23 @@ This stylesheet forms part of the Formtastic Rails Plugin
 
 /* CHECKBOXES AND RADIO LABELS
 --------------------------------------------------------------------------------------------------*/
-.formtastic .radio li label,
-.formtastuc .check_boxes li label { line-height:100%; padding-top:0; margin-bottom:0.6em; }
+.formtastic .radio .choice label,
+.formtastuc .check_boxes .choice label { line-height:100%; padding-top:0; margin-bottom:0.6em; }
 
 
 /* CHECKBOXES AND RADIO INPUTS
 --------------------------------------------------------------------------------------------------*/
-.formtastic .input li label input { line-height:100%; }
+.formtastic .input .choice label input { line-height:100%; }
 
 
 /* NESTED FIELDSETS AND LEGENDS (radio, check boxes and date/time inputs use nested fieldsets)
 --------------------------------------------------------------------------------------------------*/
-.formtastic .input fieldset { position:relative; }
-.formtastic .input fieldset legend { position:absolute; width:95%; left: 0px; }
-.formtastic .input fieldset legend span { position:absolute; }
-.formtastic .input fieldset legend.label label { position:absolute; }
-.formtastic .input fieldset ol { float:left; width:74%; margin:0; padding:0 0 0 25%; }
-.formtastic .input fieldset ol li { padding:0; border:0; }
+.formtastic .input .choices { position:relative; }
+.formtastic .input .choices legend { position:absolute; width:95%; left: 0px; }
+.formtastic .input .choices legend span { position:absolute; }
+.formtastic .input .choices legend.label label { position:absolute; }
+.formtastic .input .choices .choices-group { float:left; width:74%; margin:0; padding:0 0 0 25%; }
+.formtastic .input .choices .choices-group .choice { padding:0; border:0; }
 
 
 /* INLINE HINTS
@@ -115,33 +115,33 @@ This stylesheet forms part of the Formtastic Rails Plugin
 /* RADIO OVERRIDES
 --------------------------------------------------------------------------------------------------*/
 .formtastic .radio { }
-.formtastic .radio fieldset { overflow:visible; }
-.formtastic .radio fieldset ol { margin-bottom:-0.5em; }
-.formtastic .radio fieldset ol li { margin:0.1em 0 0.5em 0; overflow:visible; }
-.formtastic .radio fieldset ol li label { float:none; width:100%; }
-.formtastic .radio fieldset ol li label input { margin-right:0.2em; }
+.formtastic .radio .choices { overflow:visible; }
+.formtastic .radio .choices .choices-group { margin-bottom:-0.5em; }
+.formtastic .radio .choices .choices-group .choice { margin:0.1em 0 0.5em 0; overflow:visible; }
+.formtastic .radio .choices .choices-group .choice label { float:none; width:100%; }
+.formtastic .radio .choices .choices-group .choice label input { margin-right:0.2em; }
 
 
 /* CHECK BOXES (COLLECTION) OVERRIDES
 --------------------------------------------------------------------------------------------------*/
 .formtastic .check_boxes { }
-.formtastic .check_boxes fieldset { overflow:visible; }
-.formtastic .check_boxes fieldset ol { margin-bottom:-0.5em; }
-.formtastic .check_boxes fieldset ol li { margin:0.1em 0 0.5em 0; overflow:visible; }
-.formtastic .check_boxes fieldset ol li label { float:none; width:100%; }
-.formtastic .check_boxes fieldset ol li label input { margin-right:0.2em; }
+.formtastic .check_boxes .choices { overflow:visible; }
+.formtastic .check_boxes .choices .choices-group { margin-bottom:-0.5em; }
+.formtastic .check_boxes .choices .choices-group .choice { margin:0.1em 0 0.5em 0; overflow:visible; }
+.formtastic .check_boxes .choices .choices-group .choice label { float:none; width:100%; }
+.formtastic .check_boxes .choices .choices-group .choice label input { margin-right:0.2em; }
 
 
 /* DATE & TIME OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-.formtastic .date fieldset ol li,
-.formtastic .time fieldset ol li,
-.formtastic .datetime fieldset ol li { float:left; width:auto; margin:0 .3em 0 0; }
 
-.formtastic .date fieldset ol li label,
-.formtastic .time fieldset ol li label,
-.formtastic .datetime fieldset ol li label { display:none; }
+.formtastic .fragments { position:relative; }
+.formtastic .fragments legend { position:absolute; width:95%; left: 0px; }
+.formtastic .fragments legend span { position:absolute; }
+.formtastic .fragments legend.label label { position:absolute; }
+.formtastic .fragments .fragments-group { float:left; width:74%; margin:0; padding:0 0 0 25%; }
+.formtastic .fragments .fragments-group .fragment { padding:0; border:0; }
+.formtastic .fragments .fragments-group .fragment { float:left; width:auto; margin:0 .3em 0 0; }
+.formtastic .fragments .fragments-group .fragment label { display:none; }
+.formtastic .fragments .fragments-group .fragment label input { display:inline; margin:0; padding:0;  }
 
-.formtastic .date fieldset ol li label input,
-.formtastic .time fieldset ol li label input,
-.formtastic .datetime fieldset ol li label input { display:inline; margin:0; padding:0;  }
diff --git a/sample/basic_inputs.html b/sample/basic_inputs.html
index d0a45d657..01828754f 100644
--- a/sample/basic_inputs.html
+++ b/sample/basic_inputs.html
@@ -74,22 +74,22 @@ <h1>Formtastic</h1>
         </li>
 
         <li class="input date optional">
-          <fieldset>
+          <fieldset class="fragments">
             <legend class="label"><label>First release</label></legend>
-            <ol>
-              <li>
+            <ol class="fragments-group">
+              <li class="fragment">
                 <label>Year</label>
                 <select id="gem_first_release_1i" name="gem[first_release][1i]">
                   <option>2009</option>
                 </select>
               </li>
-              <li>
+              <li class="fragment">
                 <label>Month</label>
                 <select id="gem_first_release_2i" name="gem[first_release][2i]">
                   <option>October</option>
                 </select>
               </li>
-              <li>
+              <li class="fragment">
                 <label>Day</label>
                 <select id="gem_first_release_3i" name="gem[first_release][3i]">
                   <option>15</option>
@@ -120,22 +120,22 @@ <h1>Formtastic</h1>
         </li>
 
         <li class="input radio optional">
-          <fieldset>
+          <fieldset class="choices">
             <legend class="label"><label>Rate</label></legend>
-            <ol>
-              <li>
+            <ol class="choices-group">
+              <li class="choice">
                 <label><input id="gem_rate_five" name="gem[rate]" type="radio" checked="checked"> Five</label></label>
               </li>
-              <li>
+              <li class="choice">
                 <label><input id="gem_rate_four" name="gem[rate]" type="radio"> Four</label></label>
               </li>
-              <li>
+              <li class="choice">
                 <label><input id="gem_rate_three" name="gem[rate]" type="radio"> Three</label></label>
               </li>
-              <li>
+              <li class="choice">
                 <label><input id="gem_rate_two" name="gem[rate]" type="radio"> Two</label></label>
               </li>
-              <li>
+              <li class="choice">
                 <label><input id="gem_rate_one" name="gem[rate]" type="radio"> One</label></label>
               </li>
             </ol>
@@ -143,22 +143,22 @@ <h1>Formtastic</h1>
         </li>
 
         <li class="input check_boxes optional">
-          <fieldset>
+          <fieldset class="choices">
             <legend class="label"><label>Browsers</label></legend>
-            <ol>
-              <li>
+            <ol class="choices-group">
+              <li class="choice">
                 <label><input id="gem_browser_google_chrome" name="gem[browser][]" type="checkbox"> Google Chrome</label></label>
               </li>
-              <li>
+              <li class="choice">
                 <label><input id="gem_browser_apple_safari" name="gem[browser][]" type="checkbox"> Apple Safari</label></label>
               </li>
-              <li>
+              <li class="choice">
                 <label><input id="gem_browser_mozilla_firefox" name="gem[browser][]" type="checkbox"> Mozilla Firefox</label></label>
               </li>
-              <li>
+              <li class="choice">
                 <label><input id="gem_browser_opera" name="gem[browser][]" type="checkbox"> Opera</label></label>
               </li>
-              <li>
+              <li class="choice">
                 <label><input id="gem_browser_internet_explorer" name="gem[browser][]" type="checkbox"> Internet Explorer</label></label>
               </li>
             </ol>
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 8e52d1f05..d87efdef6 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -19,6 +19,8 @@
     it_should_have_input_wrapper_with_class(:input)
     it_should_have_input_wrapper_with_id("author_posts_input")
     it_should_have_a_nested_fieldset
+    it_should_have_a_nested_fieldset_with_class('choices')
+    it_should_have_a_nested_ordered_list_with_class('choices-group')
     it_should_apply_error_logic_for_input_type(:check_boxes)
     it_should_call_find_on_association_class_when_no_collection_is_provided(:check_boxes)
     it_should_use_the_collection_when_provided(:check_boxes, 'input[@type="checkbox"]')
@@ -32,9 +34,9 @@
       output_buffer.should_not have_tag('form li fieldset legend label[@for^="author_post_ids_"]')
     end
 
-    it 'should generate an ordered list with a list item for each choice' do
+    it 'should generate an ordered list with an li.choice for each choice' do
       output_buffer.should have_tag('form li fieldset ol')
-      output_buffer.should have_tag('form li fieldset ol li input[@type=checkbox]', :count => ::Post.all.size)
+      output_buffer.should have_tag('form li fieldset ol li.choice input[@type=checkbox]', :count => ::Post.all.size)
     end
 
     it 'should have one option with a "checked" attribute' do
diff --git a/spec/inputs/date_input_spec.rb b/spec/inputs/date_input_spec.rb
index ed84af940..ca46d5718 100644
--- a/spec/inputs/date_input_spec.rb
+++ b/spec/inputs/date_input_spec.rb
@@ -23,6 +23,8 @@
     it_should_have_input_wrapper_with_class(:input)
     it_should_have_input_wrapper_with_id("post_publish_at_input")
     it_should_have_a_nested_fieldset
+    it_should_have_a_nested_fieldset_with_class('fragments')
+    it_should_have_a_nested_ordered_list_with_class('fragments-group')
     it_should_apply_error_logic_for_input_type(:date)
 
     it 'should have a legend and label with the label text inside the fieldset' do
@@ -37,8 +39,8 @@
     end
 
     it 'should have an ordered list of three items inside the fieldset' do
-      output_buffer.should have_tag('form li.date fieldset ol')
-      output_buffer.should have_tag('form li.date fieldset ol li', :count => 3)
+      output_buffer.should have_tag('form li.date fieldset ol.fragments-group')
+      output_buffer.should have_tag('form li.date fieldset ol li.fragment', :count => 3)
     end
 
     it 'should have three labels for year, month and day' do
diff --git a/spec/inputs/datetime_input_spec.rb b/spec/inputs/datetime_input_spec.rb
index 5175ec449..88ab02262 100644
--- a/spec/inputs/datetime_input_spec.rb
+++ b/spec/inputs/datetime_input_spec.rb
@@ -24,6 +24,8 @@
     it_should_have_input_wrapper_with_class(:input)
     it_should_have_input_wrapper_with_id("post_publish_at_input")
     it_should_have_a_nested_fieldset
+    it_should_have_a_nested_fieldset_with_class('fragments')
+    it_should_have_a_nested_ordered_list_with_class('fragments-group')
     it_should_apply_error_logic_for_input_type(:datetime)
     
     it 'should have a legend and label with the label text inside the fieldset' do
@@ -38,8 +40,8 @@
     end
     
     it 'should have an ordered list of five items inside the fieldset' do
-      output_buffer.should have_tag('form li.datetime fieldset ol')
-      output_buffer.should have_tag('form li.datetime fieldset ol li', :count => 5)
+      output_buffer.should have_tag('form li.datetime fieldset ol.fragments-group')
+      output_buffer.should have_tag('form li.datetime fieldset ol li.fragment', :count => 5)
     end
 
     it 'should have five labels for year, month and day' do
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 6022f6b9e..14076e814 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -21,6 +21,8 @@
     it_should_have_input_wrapper_with_class(:input)
     it_should_have_input_wrapper_with_id("post_author_input")
     it_should_have_a_nested_fieldset
+    it_should_have_a_nested_fieldset_with_class('choices')
+    it_should_have_a_nested_ordered_list_with_class('choices-group')
     it_should_apply_error_logic_for_input_type(:radio)
     it_should_use_the_collection_when_provided(:radio, 'input')
 
@@ -35,7 +37,7 @@
 
     it 'should generate an ordered list with a list item for each choice' do
       output_buffer.should have_tag('form li fieldset ol')
-      output_buffer.should have_tag('form li fieldset ol li', :count => ::Author.all.size)
+      output_buffer.should have_tag('form li fieldset ol li.choice', :count => ::Author.all.size)
     end
 
     it 'should have one option with a "checked" attribute' do
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index 94b86a4a6..166e06652 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -47,6 +47,8 @@
       it_should_have_input_wrapper_with_class(:input)
       it_should_have_input_wrapper_with_id("post_publish_at_input")
       it_should_have_a_nested_fieldset
+      it_should_have_a_nested_fieldset_with_class('fragments')
+      it_should_have_a_nested_ordered_list_with_class('fragments-group')
       it_should_apply_error_logic_for_input_type(:time)
 
       it 'should have a legend and label with the label text inside the fieldset' do
@@ -58,8 +60,8 @@
       end
 
       it 'should have an ordered list of two items inside the fieldset' do
-        output_buffer.should have_tag('form li.time fieldset ol')
-        output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
+        output_buffer.should have_tag('form li.time fieldset ol.fragments-group')
+        output_buffer.should have_tag('form li.time fieldset ol li.fragment', :count => 2)
       end
 
       it 'should have five labels for hour and minute' do
diff --git a/spec/support/custom_macros.rb b/spec/support/custom_macros.rb
index 5f914352b..a38451d35 100644
--- a/spec/support/custom_macros.rb
+++ b/spec/support/custom_macros.rb
@@ -31,6 +31,18 @@ def it_should_have_a_nested_fieldset
         output_buffer.should have_tag("form li fieldset")
       end
     end
+    
+    def it_should_have_a_nested_fieldset_with_class(klass)
+      it "should have a nested_fieldset with class #{klass}" do
+        output_buffer.should have_tag("form li fieldset.#{klass}")
+      end
+    end
+    
+    def it_should_have_a_nested_ordered_list_with_class(klass)
+      it "should have a nested fieldset with class #{klass}" do
+        output_buffer.should have_tag("form li ol.#{klass}")
+      end
+    end
 
     def it_should_have_label_with_text(string_or_regex)
       it "should have a label with text '#{string_or_regex}'" do

From bc5603babb7d36ec78dda8028cfe69bd913509c6 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 17 May 2011 14:47:31 +1000
Subject: [PATCH 784/992] convert <% ... do %> to <%= ... do %> in README

---
 README.textile | 84 +++++++++++++++++++++++++-------------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/README.textile b/README.textile
index 65a9add8b..c026912ac 100644
--- a/README.textile
+++ b/README.textile
@@ -18,9 +18,9 @@ h2. The Story
 One day, I finally had enough, so I opened up my text editor, and wrote a DSL for how I'd like to author forms:
 
 <pre>
-  <% semantic_form_for @article do |form| %>
+  <%= semantic_form_for @article do |form| %>
 
-    <% form.inputs :name => "Basic" do %>
+    <%= form.inputs :name => "Basic" do %>
       <%= form.input :title %>
       <%= form.input :body %>
       <%= form.input :section %>
@@ -29,19 +29,19 @@ One day, I finally had enough, so I opened up my text editor, and wrote a DSL fo
       <%= form.input :allow_comments, :label => "Allow commenting on this article" %>
     <% end %>
 
-    <% form.inputs :name => "Advanced" do %>
+    <%= form.inputs :name => "Advanced" do %>
       <%= form.input :keywords, :required => false, :hint => "Example: ruby, rails, forms" %>
       <%= form.input :extract, :required => false %>
       <%= form.input :description, :required => false %>
       <%= form.input :url_title, :required => false %>
     <% end %>
 
-    <% form.inputs :name => "Author", :for => :author do |author_form| %>
+    <%= form.inputs :name => "Author", :for => :author do |author_form| %>
       <%= author_form.input :first_name %>
       <%= author_form.input :last_name %>
     <% end %>
 
-    <% form.buttons do %>
+    <%= form.buttons do %>
       <%= form.commit_button %>
     <% end %>
 
@@ -126,7 +126,7 @@ Forms are really boring to code... you want to get onto the good stuff as fast a
 This renders a set of inputs (one for _most_ columns in the database table, and one for each ActiveRecord @belongs_to@-association), followed by a submit button:
 
 <pre>
-  <% semantic_form_for @user do |form| %>
+  <%= semantic_form_for @user do |form| %>
     <%= form.inputs %>
     <%= form.buttons %>
   <% end %>
@@ -137,7 +137,7 @@ This is a great way to get something up fast, but like scaffolding, it's not rec
 You probably want to specify the order of the fields, skip some of the fields or even add in fields that Formtastic couldn't detect, you can pass in a list of field names to @inputs@ and list of button names to @buttons@:
 
 <pre>
-  <% semantic_form_for @user do |form| %>
+  <%= semantic_form_for @user do |form| %>
     <%= form.inputs :title, :body, :section, :categories, :created_at %>
     <%= form.buttons :commit %>
   <% end %>
@@ -146,15 +146,15 @@ You probably want to specify the order of the fields, skip some of the fields or
 You probably want control over the input type Formtastic uses for each field, you can expand the @inputs@ and @buttons@ blocks. This specifies the @:section@ input should be a set of radio buttons (rather than the default select box), and that the @:created_at@ field should be a string (rather than the default datetime selects):
 
 <pre>
-  <% semantic_form_for @post do |form| %>
-    <% form.inputs do %>
+  <%= semantic_form_for @post do |form| %>
+    <%= form.inputs do %>
       <%= form.input :title %>
       <%= form.input :body %>
       <%= form.input :section, :as => :radio %>
       <%= form.input :categories %>
       <%= form.input :created_at, :as => :string %>
     <% end %>
-    <% form.buttons do %>
+    <%= form.buttons do %>
       <%= form.commit_button %>
     <% end %>
   <% end %>
@@ -163,19 +163,19 @@ You probably want control over the input type Formtastic uses for each field, yo
 If you want to customize the label text, or render some hint text below the field, specify which fields are required/optional, or break the form into two fieldsets, the DSL is pretty comprehensive:
 
 <pre>
-  <% semantic_form_for @post do |form| %>
-    <% form.inputs "Basic", :id => "basic" do %>
+  <%= semantic_form_for @post do |form| %>
+    <%= form.inputs "Basic", :id => "basic" do %>
       <%= form.input :title %>
       <%= form.input :body %>
     <% end %>
-    <% form.inputs :name => "Advanced Options", :id => "advanced" do %>
+    <%= form.inputs :name => "Advanced Options", :id => "advanced" do %>
       <%= form.input :slug, :label => "URL Title", :hint => "Created automatically if left blank", :required => false %>
       <%= form.input :section, :as => :radio %>
       <%= form.input :user, :label => "Author", :member_label => :full_name %>
       <%= form.input :categories, :required => false %>
       <%= form.input :created_at, :as => :string, :label => "Publication Date", :required => false %>
     <% end %>
-    <% form.buttons do %>
+    <%= form.buttons do %>
       <%= form.commit_button %>
     <% end %>
   <% end %>
@@ -184,15 +184,15 @@ If you want to customize the label text, or render some hint text below the fiel
 You can create forms for nested resources:
 
 <pre>
-	<% semantic_form_for [@author, @post] do |form| %>
+	<%= semantic_form_for [@author, @post] do |form| %>
 </pre>
 
 Nested forms are also supported (don't forget your models need to be setup correctly with @accepts_nested_attributes_for@). You can do it in the Rails way:
 
 <pre>
-  <% semantic_form_for @post do |form| %>
+  <%= semantic_form_for @post do |form| %>
     <%= form.inputs :title, :body, :created_at %>
-    <% form.semantic_fields_for :author do |author| %>
+    <%= form.semantic_fields_for :author do |author| %>
       <%= author.inputs :first_name, :last_name, :name => "Author" %>
     <% end %>
     <%= form.buttons %>
@@ -202,7 +202,7 @@ Nested forms are also supported (don't forget your models need to be setup corre
 Or the Formtastic way with the @:for@ option:
 
 <pre>
-  <% semantic_form_for @post do |form| %>
+  <%= semantic_form_for @post do |form| %>
     <%= form.inputs :title, :body, :created_at %>
     <%= form.inputs :first_name, :last_name, :for => :author, :name => "Author" %>
     <%= form.buttons %>
@@ -212,7 +212,7 @@ Or the Formtastic way with the @:for@ option:
 When working in has many association, you can even supply @"%i"@ in your fieldset name that it will be properly interpolated with the child index. For example:
 
 <pre>
-  <% semantic_form_for @post do |form| %>
+  <%= semantic_form_for @post do |form| %>
     <%= form.inputs %>
     <%= form.inputs :name => 'Category #%i', :for => :categories %>
     <%= form.buttons %>
@@ -223,18 +223,18 @@ If you have more than one form on the same page, it may lead to HTML invalidatio
 a namespace for your form to ensure uniqueness of id attributes on form elements. The namespace attribute will be prefixed with underscore on the generate html id. For example:
 
 <pre>
-  <% semantic_form_for(@post, :namespace => 'cat_form') do |form| %>
-  <%= form.input :title %>        # id="cat_form_post_title"
-  <%= form.input :body %>         # id="cat_form_post_body"
-  <%= form.input :created_at %>   # id="cat_form_post_created_at"
-  <%= form.buttons %>
+  <%= semantic_form_for(@post, :namespace => 'cat_form') do |form| %>
+    <%= form.input :title %>        # id="cat_form_post_title"
+    <%= form.input :body %>         # id="cat_form_post_body"
+    <%= form.input :created_at %>   # id="cat_form_post_created_at"
+    <%= form.buttons %>
   <% end %>
 </pre>
 
 Customize HTML attributes for any input using the @:input_html@ option. Typically this is used to disable the input, change the size of a text field, change the rows in a textarea, or even to add a special class to an input to attach special behavior like "autogrow":http://plugins.jquery.com/project/autogrow textareas:
 
 <pre>
-  <% semantic_form_for @post do |form| %>
+  <%= semantic_form_for @post do |form| %>
     <%= form.input :title,      :input_html => {  :cols => 10 } %>
     <%= form.input :body,       :input_html => { :class => 'autogrow', :rows => 10, :cols => 20, :maxlength => 10  } %>
     <%= form.input :created_at, :input_html => { :disabled => true } %>
@@ -245,9 +245,9 @@ Customize HTML attributes for any input using the @:input_html@ option. Typicall
 The same can be done for buttons with the @:button_html@ option:
 
 <pre>
-  <% semantic_form_for @post do |form| %>
+  <%= semantic_form_for @post do |form| %>
     ...
-    <% form.buttons do %>
+    <%= form.buttons do %>
       <%= form.commit_button :button_html => { :class => "primary", :disable_with => 'Wait...' } %>
     <% end %>
   <% end %>
@@ -256,7 +256,7 @@ The same can be done for buttons with the @:button_html@ option:
 Customize the HTML attributes for the @<li>@ wrapper around every input with the @:wrapper_html@ option hash. There's one special key in the hash (@:class@), which will actually _append_ your string of classes to the existing classes provided by Formtastic (like @"required string error"@).
 
 <pre>
-  <% semantic_form_for @post do |form| %>
+  <%= semantic_form_for @post do |form| %>
     <%= form.input :title, :wrapper_html => { :class => "important" } %>
     <%= form.input :body %>
     <%= form.input :description, :wrapper_html => { :style => "display:none;" } %>
@@ -267,7 +267,7 @@ Customize the HTML attributes for the @<li>@ wrapper around every input with the
 Customize the default class used for hints on each attribute or globally in the @config/formtastic.rb@ file. Similarly you can customize the error classes on an attribute level or globally.
 
 <pre>
-  <% semantic_form_for @post do |form| %>
+  <%= semantic_form_for @post do |form| %>
     <%= form.input :title, :hint_class => 'custom-html-class', :error_class => 'custom-error-class' %>
   <% end %>
 </pre>
@@ -338,7 +338,7 @@ Formtastic got some neat I18n-features. ActiveRecord object names and attributes
 Basic localization (labels only, with ActiveRecord):
 
 <pre>
-  <% semantic_form_for @post do |form| %>
+  <%= semantic_form_for @post do |form| %>
     <%= form.input :title %>        # => :label => I18n.t('activerecord.attributes.user.title')    or 'Title'
     <%= form.input :body %>         # => :label => I18n.t('activerecord.attributes.user.body')     or 'Body'
     <%= form.input :section %>      # => :label => I18n.t('activerecord.attributes.user.section')  or 'Section'
@@ -391,13 +391,13 @@ Formtastic supports localized *labels*, *hints*, *legends*, *actions* using the
 *3. ...and now you'll get:*
 
 <pre>
-  <% semantic_form_for Post.new do |form| %>
-    <% form.inputs do %>
+  <%= semantic_form_for Post.new do |form| %>
+    <%= form.inputs do %>
       <%= form.input :title %>      # => :label => "Choose a title...", :hint => "Choose a good title for you post."
       <%= form.input :body %>       # => :label => "Write something...", :hint => "Write something inspiring here."
       <%= form.input :section %>    # => :label => I18n.t('activerecord.attributes.user.section')  or 'Section'
     <% end %>
-    <% form.buttons do %>
+    <%= form.buttons do %>
       <%= form.commit_button %>     # => "Create my %{model}"
     <% end %>
   <% end %>
@@ -408,8 +408,8 @@ Formtastic supports localized *labels*, *hints*, *legends*, *actions* using the
 _Note: Slightly different because Formtastic can't guess how you group fields in a form. Legend text can be set with first (as in the sample below) specified value, or :name/:title options - depending on what flavor is preferred._
 
 <pre>
-  <% semantic_form_for @post do |form| %>
-    <% form.inputs :post_details do %>   # => :title => "Post details"
+  <%= semantic_form_for @post do |form| %>
+    <%= form.inputs :post_details do %>   # => :title => "Post details"
       # ...
     <% end %>
     # ...
@@ -419,13 +419,13 @@ _Note: Slightly different because Formtastic can't guess how you group fields in
 *5. Override I18n settings:*
 
 <pre>
-  <% semantic_form_for @post do |form| %>
-    <% form.inputs do %>
+  <%= semantic_form_for @post do |form| %>
+    <%= form.inputs do %>
       <%= form.input :title %>      # => :label => "Choose a title...", :hint => "Choose a good title for you post."
       <%= form.input :body, :hint => false %>                 # => :label => "Write something..."
       <%= form.input :section, :label => 'Some section' %>    # => :label => 'Some section'
     <% end %>
-    <% form.buttons do %>
+    <%= form.buttons do %>
       <%= form.commit_button :dummie %>     # => "Launch!"
     <% end %>
   <% end %>
@@ -440,13 +440,13 @@ If I18n-lookups is disabled, i.e.:
 ...then you can enable I18n within the forms instead:
 
 <pre>
-  <% semantic_form_for @post do |form| %>
-    <% form.inputs do %>
+  <%= semantic_form_for @post do |form| %>
+    <%= form.inputs do %>
       <%= form.input :title, :label => true %>      # => :label => "Choose a title..."
       <%= form.input :body, :label => true %>       # => :label => "Write something..."
       <%= form.input :section, :label => true %>    # => :label => I18n.t('activerecord.attributes.user.section')  or 'Section'
     <% end %>
-    <% form.buttons do %>
+    <%= form.buttons do %>
       <%= form.commit_button true %>                # => "Update %{model}" (if we are in edit that is...)
     <% end %>
   <% end %>
@@ -492,7 +492,7 @@ h2. Semantic errors
 You can show errors on base (by default) and any other attribute just passing it name to semantic_errors method:
 
 <pre>
-  <% semantic_form_for @post do |form| %>
+  <%= semantic_form_for @post do |form| %>
     <%= form.semantic_errors :state %>
   <% end %>
 </pre>

From 55ad42fa64952f34222024c6ec59e353875d48ef Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 17 May 2011 14:53:26 +1000
Subject: [PATCH 785/992] typo in README

---
 README.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.textile b/README.textile
index c026912ac..d8e7cd5c1 100644
--- a/README.textile
+++ b/README.textile
@@ -505,7 +505,7 @@ Run @rails generate formtastic:install@ to copy a commented out config file into
 
 h2. Form Generator
 
-There's a Formtastic form code generator to make your transition to Formtastic easier. All you have to do is to *specify an existing model name*, and optionally specify view template framework (ERB/HAML), and you are good to go. *Note:* This won't overwrite any of your exsting files without confrmation.
+There's a Formtastic form code generator to make your transition to Formtastic easier. All you have to do is to *specify an existing model name*, and optionally specify view template framework (ERB/HAML), and you are good to go. *Note:* This won't overwrite any of your exsting files without confirmation.
 
 h3. Basic usage
 

From 94aa7c48e3c190ddc1b23dc1ff11f30e9d1fe9bb Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 17 May 2011 20:47:33 +1000
Subject: [PATCH 786/992] reduce specificity and merge radio/check_boxes rules
 into rules for inputs that contain choices

---
 lib/generators/templates/formtastic.css | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index 026740b42..7b759f739 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -112,29 +112,27 @@ This stylesheet forms part of the Formtastic Rails Plugin
 .formtastic .boolean label input { margin:0 0.5em 0 0.2em; }
 
 
+/* CHOICE GROUPS
+--------------------------------------------------------------------------------------------------*/
+.formtastic .choices { overflow:visible; }
+.formtastic .choices-group { margin-bottom:-0.5em; }
+.formtastic .choice { margin:0.1em 0 0.5em 0; overflow:visible; }
+.formtastic .choice label { float:none; width:100%; }
+.formtastic .choice label input { margin-right:0.2em; }
+
+
 /* RADIO OVERRIDES
 --------------------------------------------------------------------------------------------------*/
 .formtastic .radio { }
-.formtastic .radio .choices { overflow:visible; }
-.formtastic .radio .choices .choices-group { margin-bottom:-0.5em; }
-.formtastic .radio .choices .choices-group .choice { margin:0.1em 0 0.5em 0; overflow:visible; }
-.formtastic .radio .choices .choices-group .choice label { float:none; width:100%; }
-.formtastic .radio .choices .choices-group .choice label input { margin-right:0.2em; }
 
 
 /* CHECK BOXES (COLLECTION) OVERRIDES
 --------------------------------------------------------------------------------------------------*/
 .formtastic .check_boxes { }
-.formtastic .check_boxes .choices { overflow:visible; }
-.formtastic .check_boxes .choices .choices-group { margin-bottom:-0.5em; }
-.formtastic .check_boxes .choices .choices-group .choice { margin:0.1em 0 0.5em 0; overflow:visible; }
-.formtastic .check_boxes .choices .choices-group .choice label { float:none; width:100%; }
-.formtastic .check_boxes .choices .choices-group .choice label input { margin-right:0.2em; }
 
 
 /* DATE & TIME OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-
 .formtastic .fragments { position:relative; }
 .formtastic .fragments legend { position:absolute; width:95%; left: 0px; }
 .formtastic .fragments legend span { position:absolute; }

From 77d5b2b74b9b2a2fee362cb75ae831324ef14692 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 17 May 2011 20:55:21 +1000
Subject: [PATCH 787/992] reduce specificity of fragments rules, merged some
 stuff

---
 lib/generators/templates/formtastic.css | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index 7b759f739..7ea0a5938 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -131,15 +131,14 @@ This stylesheet forms part of the Formtastic Rails Plugin
 .formtastic .check_boxes { }
 
 
-/* DATE & TIME OVERRIDES
+/* FRAGMENTED INPUTS (DATE/TIME/DATETIME)
 --------------------------------------------------------------------------------------------------*/
 .formtastic .fragments { position:relative; }
 .formtastic .fragments legend { position:absolute; width:95%; left: 0px; }
 .formtastic .fragments legend span { position:absolute; }
 .formtastic .fragments legend.label label { position:absolute; }
-.formtastic .fragments .fragments-group { float:left; width:74%; margin:0; padding:0 0 0 25%; }
-.formtastic .fragments .fragments-group .fragment { padding:0; border:0; }
-.formtastic .fragments .fragments-group .fragment { float:left; width:auto; margin:0 .3em 0 0; }
-.formtastic .fragments .fragments-group .fragment label { display:none; }
-.formtastic .fragments .fragments-group .fragment label input { display:inline; margin:0; padding:0;  }
+.formtastic .fragments-group { float:left; width:74%; margin:0; padding:0 0 0 25%; }
+.formtastic .fragment { float:left; width:auto; margin:0 .3em 0 0; padding:0; border:0; }
+.formtastic .fragment label { display:none; }
+.formtastic .fragment label input { display:inline; margin:0; padding:0;  }
 

From ef01bf1b368bd5306e7eef9d458fb9744edb2356 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 17 May 2011 21:01:49 +1000
Subject: [PATCH 788/992] reducing more specificity

---
 lib/generators/templates/formtastic.css | 28 ++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index 7ea0a5938..ed0219dae 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -25,8 +25,8 @@ This stylesheet forms part of the Formtastic Rails Plugin
 
 /* SEMANTIC ERRORS
 --------------------------------------------------------------------------------------------------*/
-.formtastic ul.errors { color:#cc0000; margin:0.5em 0 1.5em 25%; list-style:square; }
-.formtastic ul.errors li { padding:0; border:none; display:list-item; }
+.formtastic .errors { color:#cc0000; margin:0.5em 0 1.5em 25%; list-style:square; }
+.formtastic .errors li { padding:0; border:none; display:list-item; }
 
 
 /* OUTER FIELDSETS
@@ -38,7 +38,7 @@ This stylesheet forms part of the Formtastic Rails Plugin
 
 /* BUTTONS
 --------------------------------------------------------------------------------------------------*/
-.formtastic .buttons .button { float:left; padding-right:0.5em; }
+.formtastic .button { float:left; padding-right:0.5em; }
 
 
 /* INPUT LIs
@@ -64,29 +64,29 @@ This stylesheet forms part of the Formtastic Rails Plugin
 
 /* CHECKBOXES AND RADIO INPUTS
 --------------------------------------------------------------------------------------------------*/
-.formtastic .input .choice label input { line-height:100%; }
+.formtastic .choice label input { line-height:100%; }
 
 
 /* NESTED FIELDSETS AND LEGENDS (radio, check boxes and date/time inputs use nested fieldsets)
 --------------------------------------------------------------------------------------------------*/
-.formtastic .input .choices { position:relative; }
-.formtastic .input .choices legend { position:absolute; width:95%; left: 0px; }
-.formtastic .input .choices legend span { position:absolute; }
-.formtastic .input .choices legend.label label { position:absolute; }
-.formtastic .input .choices .choices-group { float:left; width:74%; margin:0; padding:0 0 0 25%; }
-.formtastic .input .choices .choices-group .choice { padding:0; border:0; }
+.formtastic .choices { position:relative; }
+.formtastic .choices legend { position:absolute; width:95%; left: 0px; }
+.formtastic .choices legend span { position:absolute; }
+.formtastic .choices legend.label label { position:absolute; }
+.formtastic .choices-group { float:left; width:74%; margin:0; padding:0 0 0 25%; }
+.formtastic .choice { padding:0; border:0; }
 
 
 /* INLINE HINTS
 --------------------------------------------------------------------------------------------------*/
-.formtastic .input p.inline-hints { color:#666; margin:0.5em 0 0 25%; }
+.formtastic .input .inline-hints { color:#666; margin:0.5em 0 0 25%; }
 
 
 /* INLINE ERRORS
 --------------------------------------------------------------------------------------------------*/
-.formtastic .input p.inline-errors { color:#cc0000; margin:0.5em 0 0 25%; }
-.formtastic .input ul.errors { color:#cc0000; margin:0.5em 0 0 25%; list-style:square; }
-.formtastic .input ul.errors li { padding:0; border:none; display:list-item; }
+.formtastic .inline-errors { color:#cc0000; margin:0.5em 0 0 25%; }
+.formtastic .errors { color:#cc0000; margin:0.5em 0 0 25%; list-style:square; }
+.formtastic .errors li { padding:0; border:none; display:list-item; }
 
 
 /* STRING, NUMERIC, PASSWORD, EMAIL, URL, PHONE, SEARCH (ETC) OVERRIDES

From 7311c3dbd6163e1a1fde2da1c7c7d0e50ef9b848 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 17 May 2011 21:06:06 +1000
Subject: [PATCH 789/992] re-arranged CSS so the choice stuff is all together
 and combined

---
 lib/generators/templates/formtastic.css | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index ed0219dae..5acc42842 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -56,17 +56,6 @@ This stylesheet forms part of the Formtastic Rails Plugin
 .formtastic .input label { display:block; width:25%; float:left; padding-top:.2em; }
 
 
-/* CHECKBOXES AND RADIO LABELS
---------------------------------------------------------------------------------------------------*/
-.formtastic .radio .choice label,
-.formtastuc .check_boxes .choice label { line-height:100%; padding-top:0; margin-bottom:0.6em; }
-
-
-/* CHECKBOXES AND RADIO INPUTS
---------------------------------------------------------------------------------------------------*/
-.formtastic .choice label input { line-height:100%; }
-
-
 /* NESTED FIELDSETS AND LEGENDS (radio, check boxes and date/time inputs use nested fieldsets)
 --------------------------------------------------------------------------------------------------*/
 .formtastic .choices { position:relative; }
@@ -117,8 +106,8 @@ This stylesheet forms part of the Formtastic Rails Plugin
 .formtastic .choices { overflow:visible; }
 .formtastic .choices-group { margin-bottom:-0.5em; }
 .formtastic .choice { margin:0.1em 0 0.5em 0; overflow:visible; }
-.formtastic .choice label { float:none; width:100%; }
-.formtastic .choice label input { margin-right:0.2em; }
+.formtastic .choice label { float:none; width:100%; line-height:100%; padding-top:0; margin-bottom:0.6em; }
+.formtastic .choice label input { margin-right:0.2em; line-height:100%; }
 
 
 /* RADIO OVERRIDES

From bd7f61b38ea47accec642cc4d6ce24cb1c8833d8 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 17 May 2011 21:15:12 +1000
Subject: [PATCH 790/992] more css clean-ups

---
 lib/generators/templates/formtastic.css | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index 5acc42842..a0cb960d8 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -5,7 +5,7 @@ this one in your layouts (eg formtastic_changes.css) and override the styles to
 This will allow you to update formtastic.css with new releases without clobbering your own changes.
 
 This stylesheet forms part of the Formtastic Rails Plugin
-(c) 2008 Justin French
+(c) 2008-2011 Justin French
 
 --------------------------------------------------------------------------------------------------*/
 
@@ -29,23 +29,17 @@ This stylesheet forms part of the Formtastic Rails Plugin
 .formtastic .errors li { padding:0; border:none; display:list-item; }
 
 
-/* OUTER FIELDSETS
---------------------------------------------------------------------------------------------------*/
-.formtastic .inputs,
-.formtastic .buttons { overflow:hidden; } /* clearing contained floats */
-.formtastic .buttons { padding-left:25%; }
-
-
 /* BUTTONS
 --------------------------------------------------------------------------------------------------*/
+.formtastic .buttons { overflow:hidden; padding-left:25%; }
 .formtastic .button { float:left; padding-right:0.5em; }
 
 
-/* INPUT LIs
+/* INPUTS
 --------------------------------------------------------------------------------------------------*/
+.formtastic .inputs { overflow:hidden; }
 .formtastic .input { padding:0.5em 0; margin-top:-0.5em; margin-bottom:1em; } /* padding and negative margin juggling is for Firefox */
 .formtastic .input { overflow:hidden; } /* clearing contained floats */
-
 .formtastic .required { }
 .formtastic .optional { }
 .formtastic .error { }

From cd1d12558efc4b2aea6c0b0fa3e0b26f1785b675 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 18 May 2011 06:43:36 +1000
Subject: [PATCH 791/992] shift CSS to multi-line so we can annotate it

---
 lib/generators/templates/formtastic.css | 297 +++++++++++++++++++-----
 1 file changed, 244 insertions(+), 53 deletions(-)

diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index a0cb960d8..4f7535bfa 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -9,119 +9,310 @@ This stylesheet forms part of the Formtastic Rails Plugin
 
 --------------------------------------------------------------------------------------------------*/
 
-
 /* NORMALIZE AND RESET - obviously inspired by Yahoo's reset.css, but scoped to just .formtastic
 --------------------------------------------------------------------------------------------------*/
-.formtastic, .formtastic ul, .formtastic ol, .formtastic li, .formtastic fieldset, .formtastic legend, .formtastic input, .formtastic textarea, .formtastic select, .formtastic p { margin:0; padding:0; }
-.formtastic fieldset { border:0; }
-.formtastic em, .formtastic strong { font-style:normal; font-weight:normal; }
-.formtastic ol, .formtastic ul { list-style:none; }
-.formtastic abbr, .formtastic acronym { border:0; font-variant:normal; }
-.formtastic input, .formtastic textarea { font-family:inherit; font-size:inherit; font-weight:inherit; }
-.formtastic select { font-size:inherit; font-weight:inherit; }
-.formtastic input, .formtastic textarea, .formtastic select { font-size:100%; }
-.formtastic legend { white-space:normal; color:#000; }
+.formtastic,
+
+.formtastic ul,
+.formtastic ol,
+.formtastic li,
+.formtastic fieldset,
+.formtastic legend,
+.formtastic input,
+.formtastic textarea,
+.formtastic select,
+.formtastic p {
+  margin:0;
+  padding:0;
+}
+.formtastic fieldset {
+  border:0;
+}
+.formtastic em,
+.formtastic strong {
+  font-style:normal; font-weight:normal;
+}
+.formtastic ol,
+.formtastic ul {
+  list-style:none;
+}
+.formtastic abbr,
+.formtastic acronym {
+  border:0;
+  font-variant:normal;
+}
+.formtastic input,
+.formtastic textarea {
+  font-family:inherit;
+  font-size:inherit;
+  font-weight:inherit;
+}
+.formtastic select {
+  font-size:inherit;
+  font-weight:inherit;
+}
+.formtastic input,
+.formtastic textarea,
+.formtastic select {
+  font-size:100%;
+}
+.formtastic legend {
+  white-space:normal;
+  color:#000;
+}
 
 
 /* SEMANTIC ERRORS
 --------------------------------------------------------------------------------------------------*/
-.formtastic .errors { color:#cc0000; margin:0.5em 0 1.5em 25%; list-style:square; }
-.formtastic .errors li { padding:0; border:none; display:list-item; }
+.formtastic .errors {
+  color:#cc0000;
+  margin:0.5em 0 1.5em 25%;
+  list-style:square;
+}
+
+.formtastic .errors li {
+  padding:0;
+  border:none;
+  display:list-item;
+}
 
 
 /* BUTTONS
 --------------------------------------------------------------------------------------------------*/
-.formtastic .buttons { overflow:hidden; padding-left:25%; }
-.formtastic .button { float:left; padding-right:0.5em; }
+.formtastic .buttons {
+  overflow:hidden;
+  padding-left:25%;
+}
+
+.formtastic .button {
+  float:left;
+  padding-right:0.5em;
+}
 
 
 /* INPUTS
 --------------------------------------------------------------------------------------------------*/
-.formtastic .inputs { overflow:hidden; }
-.formtastic .input { padding:0.5em 0; margin-top:-0.5em; margin-bottom:1em; } /* padding and negative margin juggling is for Firefox */
-.formtastic .input { overflow:hidden; } /* clearing contained floats */
-.formtastic .required { }
-.formtastic .optional { }
-.formtastic .error { }
+.formtastic .inputs {
+  overflow:hidden;
+}
+
+.formtastic .input {
+  padding:0.5em 0; /* padding and negative margin juggling is for Firefox */
+  margin-top:-0.5em;
+  margin-bottom:1em;
+}
+
+.formtastic .input {
+  overflow:hidden; /* clearing contained floats */
+}
+
+.formtastic .required {
+}
+
+.formtastic .optional {
+}
+
+.formtastic .error {
+}
 
 
 /* LABELS
 --------------------------------------------------------------------------------------------------*/
-.formtastic .input label { display:block; width:25%; float:left; padding-top:.2em; }
+.formtastic .input label {
+  display:block;
+  width:25%;
+  float:left;
+  padding-top:.2em;
+}
 
 
 /* NESTED FIELDSETS AND LEGENDS (radio, check boxes and date/time inputs use nested fieldsets)
 --------------------------------------------------------------------------------------------------*/
-.formtastic .choices { position:relative; }
-.formtastic .choices legend { position:absolute; width:95%; left: 0px; }
-.formtastic .choices legend span { position:absolute; }
-.formtastic .choices legend.label label { position:absolute; }
-.formtastic .choices-group { float:left; width:74%; margin:0; padding:0 0 0 25%; }
-.formtastic .choice { padding:0; border:0; }
+.formtastic .choices {
+  position:relative;
+}
+
+.formtastic .choices legend {
+  position:absolute;
+  width:95%;
+  left:0px;
+}
+
+.formtastic .choices legend span {
+  position:absolute;
+}
+
+.formtastic .choices legend.label label {
+  position:absolute;
+}
+
+.formtastic .choices-group {
+  float:left;
+  width:74%;
+  margin:0;
+  padding:0 0 0 25%;
+}
+
+.formtastic .choice {
+  padding:0;
+  border:0;
+}
 
 
 /* INLINE HINTS
 --------------------------------------------------------------------------------------------------*/
-.formtastic .input .inline-hints { color:#666; margin:0.5em 0 0 25%; }
+.formtastic .input .inline-hints {
+  color:#666;
+  margin:0.5em 0 0 25%;
+}
 
 
 /* INLINE ERRORS
 --------------------------------------------------------------------------------------------------*/
-.formtastic .inline-errors { color:#cc0000; margin:0.5em 0 0 25%; }
-.formtastic .errors { color:#cc0000; margin:0.5em 0 0 25%; list-style:square; }
-.formtastic .errors li { padding:0; border:none; display:list-item; }
+.formtastic .inline-errors {
+  color:#cc0000;
+  margin:0.5em 0 0 25%;
+}
+
+.formtastic .errors {
+  color:#cc0000;
+  margin:0.5em 0 0 25%;
+  list-style:square;
+}
+
+.formtastic .errors li {
+  padding:0;
+  border:none;
+  display:list-item;
+}
 
 
 /* STRING, NUMERIC, PASSWORD, EMAIL, URL, PHONE, SEARCH (ETC) OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-.formtastic .stringish input { width:72%; }
-.formtastic .stringish input[size] { width:auto; max-width:72%; }
+.formtastic .stringish input {
+  width:72%;
+}
+
+.formtastic .stringish input[size] {
+  width:auto;
+  max-width:72%;
+}
 
 
 /* TEXTAREA OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-.formtastic .text textarea { width:72%; }
-.formtastic .text textarea[cols] { width:auto; max-width:72%; }
+.formtastic .text textarea {
+  width:72%;
+}
+
+.formtastic .text textarea[cols] {
+  width:auto;
+  max-width:72%;
+}
 
 
 /* HIDDEN OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-.formtastic .hidden { display:none; }
+.formtastic .hidden {
+  display:none;
+}
 
 
 /* BOOLEAN OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-.formtastic .boolean label { padding-left:25%; width:auto; }
-.formtastic .boolean label input { margin:0 0.5em 0 0.2em; }
+.formtastic .boolean label {
+  padding-left:25%;
+  width:auto;
+}
+
+.formtastic .boolean label input {
+  margin:0 0.5em 0 0.2em;
+}
 
 
 /* CHOICE GROUPS
 --------------------------------------------------------------------------------------------------*/
-.formtastic .choices { overflow:visible; }
-.formtastic .choices-group { margin-bottom:-0.5em; }
-.formtastic .choice { margin:0.1em 0 0.5em 0; overflow:visible; }
-.formtastic .choice label { float:none; width:100%; line-height:100%; padding-top:0; margin-bottom:0.6em; }
-.formtastic .choice label input { margin-right:0.2em; line-height:100%; }
+.formtastic .choices {
+  overflow:visible;
+}
+
+.formtastic .choices-group {
+  margin-bottom:-0.5em;
+}
+
+.formtastic .choice {
+  margin:0.1em 0 0.5em 0;
+  overflow:visible;
+}
+
+.formtastic .choice label {
+  float:none;
+  width:100%;
+  line-height:100%;
+  padding-top:0;
+  margin-bottom:0.6em;
+}
+
+.formtastic .choice label input {
+  margin-right:0.2em;
+  line-height:100%;
+}
 
 
 /* RADIO OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-.formtastic .radio { }
+.formtastic .radio {
+}
 
 
 /* CHECK BOXES (COLLECTION) OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-.formtastic .check_boxes { }
+.formtastic .check_boxes {
+}
 
 
 /* FRAGMENTED INPUTS (DATE/TIME/DATETIME)
 --------------------------------------------------------------------------------------------------*/
-.formtastic .fragments { position:relative; }
-.formtastic .fragments legend { position:absolute; width:95%; left: 0px; }
-.formtastic .fragments legend span { position:absolute; }
-.formtastic .fragments legend.label label { position:absolute; }
-.formtastic .fragments-group { float:left; width:74%; margin:0; padding:0 0 0 25%; }
-.formtastic .fragment { float:left; width:auto; margin:0 .3em 0 0; padding:0; border:0; }
-.formtastic .fragment label { display:none; }
-.formtastic .fragment label input { display:inline; margin:0; padding:0;  }
+.formtastic .fragments {
+  position:relative;
+}
+
+.formtastic .fragments legend {
+  position:absolute;
+  width:95%;
+  left:0px;
+}
+
+.formtastic .fragments legend span {
+  position:absolute;
+}
+
+.formtastic .fragments legend.label label {
+  position:absolute;
+}
+
+.formtastic .fragments-group {
+  float:left;
+  width:74%;
+  margin:0;
+  padding:0 0 0 25%;
+}
+
+.formtastic .fragment {
+  float:left;
+  width:auto;
+  margin:0 .3em 0 0;
+  padding:0;
+  border:0;
+}
+
+.formtastic .fragment label {
+  display:none;
+}
+
+.formtastic .fragment label input {
+  display:inline;
+  margin:0;
+  padding:0;
+}
 

From adef7630630cf869cefbc80b8d01cf01a9c01af2 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 18 May 2011 06:45:27 +1000
Subject: [PATCH 792/992] remove empty styles

---
 lib/generators/templates/formtastic.css | 30 +++++++------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index 4f7535bfa..812a94ef6 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -12,7 +12,6 @@ This stylesheet forms part of the Formtastic Rails Plugin
 /* NORMALIZE AND RESET - obviously inspired by Yahoo's reset.css, but scoped to just .formtastic
 --------------------------------------------------------------------------------------------------*/
 .formtastic,
-
 .formtastic ul,
 .formtastic ol,
 .formtastic li,
@@ -25,37 +24,45 @@ This stylesheet forms part of the Formtastic Rails Plugin
   margin:0;
   padding:0;
 }
+
 .formtastic fieldset {
   border:0;
 }
+
 .formtastic em,
 .formtastic strong {
   font-style:normal; font-weight:normal;
 }
+
 .formtastic ol,
 .formtastic ul {
   list-style:none;
 }
+
 .formtastic abbr,
 .formtastic acronym {
   border:0;
   font-variant:normal;
 }
+
 .formtastic input,
 .formtastic textarea {
   font-family:inherit;
   font-size:inherit;
   font-weight:inherit;
 }
+
 .formtastic select {
   font-size:inherit;
   font-weight:inherit;
 }
+
 .formtastic input,
 .formtastic textarea,
 .formtastic select {
   font-size:100%;
 }
+
 .formtastic legend {
   white-space:normal;
   color:#000;
@@ -106,15 +113,6 @@ This stylesheet forms part of the Formtastic Rails Plugin
   overflow:hidden; /* clearing contained floats */
 }
 
-.formtastic .required {
-}
-
-.formtastic .optional {
-}
-
-.formtastic .error {
-}
-
 
 /* LABELS
 --------------------------------------------------------------------------------------------------*/
@@ -259,18 +257,6 @@ This stylesheet forms part of the Formtastic Rails Plugin
 }
 
 
-/* RADIO OVERRIDES
---------------------------------------------------------------------------------------------------*/
-.formtastic .radio {
-}
-
-
-/* CHECK BOXES (COLLECTION) OVERRIDES
---------------------------------------------------------------------------------------------------*/
-.formtastic .check_boxes {
-}
-
-
 /* FRAGMENTED INPUTS (DATE/TIME/DATETIME)
 --------------------------------------------------------------------------------------------------*/
 .formtastic .fragments {

From e26dc0229a1314081a80040274807be0b63cba5e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 18 May 2011 06:47:23 +1000
Subject: [PATCH 793/992] add zoom:1 and comments to all overflow:hidden
 clearfixes

---
 lib/generators/templates/formtastic.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index 812a94ef6..739be7cf4 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -87,7 +87,7 @@ This stylesheet forms part of the Formtastic Rails Plugin
 /* BUTTONS
 --------------------------------------------------------------------------------------------------*/
 .formtastic .buttons {
-  overflow:hidden;
+  overflow:hidden; zoom:1; /* clear containing floats */
   padding-left:25%;
 }
 
@@ -100,7 +100,7 @@ This stylesheet forms part of the Formtastic Rails Plugin
 /* INPUTS
 --------------------------------------------------------------------------------------------------*/
 .formtastic .inputs {
-  overflow:hidden;
+  overflow:hidden; zoom:1; /* clear containing floats */
 }
 
 .formtastic .input {
@@ -110,7 +110,7 @@ This stylesheet forms part of the Formtastic Rails Plugin
 }
 
 .formtastic .input {
-  overflow:hidden; /* clearing contained floats */
+  overflow:hidden; zoom:1; /* clear containing floats */
 }
 
 

From 57160c4a87f998b274de741d2ad3043b73330299 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 18 May 2011 06:52:53 +1000
Subject: [PATCH 794/992] added some longer text to force wrapping

---
 sample/basic_inputs.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sample/basic_inputs.html b/sample/basic_inputs.html
index 01828754f..20b21a944 100644
--- a/sample/basic_inputs.html
+++ b/sample/basic_inputs.html
@@ -107,7 +107,7 @@ <h1>Formtastic</h1>
         <li class="input boolean optional" id="gem_terms_and_conditions_input">
           <label for="gem_terms_and_conditions">
             <input id="gem_terms_and_conditions" name="gem[terms_and_conditions]" type="checkbox" value="1" checked="checked">
-            I agree to your draconian terms of service
+            I agree to your draconian terms of service even though I didn't read them
           </label>
         </li>
         
@@ -159,7 +159,7 @@ <h1>Formtastic</h1>
                 <label><input id="gem_browser_opera" name="gem[browser][]" type="checkbox"> Opera</label></label>
               </li>
               <li class="choice">
-                <label><input id="gem_browser_internet_explorer" name="gem[browser][]" type="checkbox"> Internet Explorer</label></label>
+                <label><input id="gem_browser_internet_explorer" name="gem[browser][]" type="checkbox"> Internet Explorer (Although you really can't call it a browser can you? This is some long text to force wrapping.)</label></label>
               </li>
             </ol>
           </fieldset>

From dac354f615dd5e7e9bc0842b98973662e0fb9aec Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 18 May 2011 06:53:04 +1000
Subject: [PATCH 795/992] can't see any reason for overflow:visible here

---
 lib/generators/templates/formtastic.css | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index 739be7cf4..38898620e 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -230,17 +230,12 @@ This stylesheet forms part of the Formtastic Rails Plugin
 
 /* CHOICE GROUPS
 --------------------------------------------------------------------------------------------------*/
-.formtastic .choices {
-  overflow:visible;
-}
-
 .formtastic .choices-group {
   margin-bottom:-0.5em;
 }
 
 .formtastic .choice {
   margin:0.1em 0 0.5em 0;
-  overflow:visible;
 }
 
 .formtastic .choice label {

From 37f69187d45f0bea0631a70349d9cf1adf320dba Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 18 May 2011 07:01:14 +1000
Subject: [PATCH 796/992] merge the styles for inputs inside labels (radio,
 boolean, check_boxes), make space consistent

---
 lib/generators/templates/formtastic.css | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index 38898620e..fc9da7b13 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -223,10 +223,6 @@ This stylesheet forms part of the Formtastic Rails Plugin
   width:auto;
 }
 
-.formtastic .boolean label input {
-  margin:0 0.5em 0 0.2em;
-}
-
 
 /* CHOICE GROUPS
 --------------------------------------------------------------------------------------------------*/
@@ -246,8 +242,12 @@ This stylesheet forms part of the Formtastic Rails Plugin
   margin-bottom:0.6em;
 }
 
-.formtastic .choice label input {
-  margin-right:0.2em;
+
+/* ADJUSTMENTS FOR INPUTS INSIDE LABELS (boolean input, radio input, check_boxes input)
+--------------------------------------------------------------------------------------------------*/
+.formtastic .choice label input,
+.formtastic .boolean label input {
+  margin:0 0.3em 0 0.2em;
   line-height:100%;
 }
 

From 751fe5870065cd28bfc0d4f197f20a19b9286015 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 18 May 2011 07:02:45 +1000
Subject: [PATCH 797/992] missed an expansion

---
 lib/generators/templates/formtastic.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index fc9da7b13..8498c3194 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -31,7 +31,8 @@ This stylesheet forms part of the Formtastic Rails Plugin
 
 .formtastic em,
 .formtastic strong {
-  font-style:normal; font-weight:normal;
+  font-style:normal;
+  font-weight:normal;
 }
 
 .formtastic ol,

From 47b6c625ff4447b24ca367a70b4021b32d9642a9 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 18 May 2011 07:49:58 +1000
Subject: [PATCH 798/992] be a bit less hard-core with resetting form elements,
 your browser should feel like your browser

---
 lib/generators/templates/formtastic.css | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/generators/templates/formtastic.css b/lib/generators/templates/formtastic.css
index 8498c3194..09e774f67 100644
--- a/lib/generators/templates/formtastic.css
+++ b/lib/generators/templates/formtastic.css
@@ -48,12 +48,7 @@ This stylesheet forms part of the Formtastic Rails Plugin
 
 .formtastic input,
 .formtastic textarea {
-  font-family:inherit;
-  font-size:inherit;
-  font-weight:inherit;
-}
-
-.formtastic select {
+  font-family:sans-serif;
   font-size:inherit;
   font-weight:inherit;
 }

From 226e6c041f48b2f8f2687e16ea54f5e97cfedaec Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 18 May 2011 16:59:36 +1000
Subject: [PATCH 799/992] changelog catch-up

---
 CHANGELOG | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0be7be98a..e9d1a7aa9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,7 @@
 * Added support for HTML5 required attribute on input, select and textarea tags
 * Added support for HTML5 min/max/step attributes on NumericInput
 * Added support for HTML5 placeholder attributes on Stringish inputs (string, email, phone, url, search, number, password)
+* Added support for HTML5 autofocus attributes
 * Changed nested inputs() blocks to be automatically wrapped in an `<li>` tag to preserve HTML validity
 * Changed quick forms to skip polymorphic associations (they didn't work)
 * Changed short hand forms to raise an error when trying to render an input for a polymorphic association (it didn't work, need a collection)
@@ -27,7 +28,13 @@
 * Added support for a Method objects to :member_label/:member_value (aka :label_method/:value_method)
 * Improved support for Mongoid 
 * Changed Rails dependency from ~> 3.0.0 to ~> 3.0 to allow experimentation with Rails 3.1 betas
-
+* Removed some overly eager CSS resets on form elements that made Opera and FF inputs look pretty ugly
+* Removed specificity and duplication in CSS
+* Added many new classes to DOM elements to enable more efficient and descriptive CSS
+* Improved visual/spacing consistency in checkboxes
+* Added non-standard zoom:1; to clearfixes to support IE better
+* Changed CSS coding style to multi-line so we can annotate the styles better
+* Fixed that overly specific CSS rules weren't applied to nested form elements properly
 
 1.2.4.beta (unreleased)
 

From a00ab554823947b7fad848f103e680146025b3d6 Mon Sep 17 00:00:00 2001
From: Jason King <jk@silentcow.com>
Date: Wed, 18 May 2011 16:32:36 -0700
Subject: [PATCH 800/992] Fixed link to the config file.

---
 README.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.textile b/README.textile
index d8e7cd5c1..a0f73343a 100644
--- a/README.textile
+++ b/README.textile
@@ -500,7 +500,7 @@ You can show errors on base (by default) and any other attribute just passing it
 
 h2. Configuration
 
-Run @rails generate formtastic:install@ to copy a commented out config file into @config/initializers/formtastic.rb@. You can "view the configuration file on GitHub":http://github.com/justinfrench/formtastic/blob/master/generators/formtastic/templates/formtastic.rb
+Run @rails generate formtastic:install@ to copy a commented out config file into @config/initializers/formtastic.rb@. You can "view the configuration file on GitHub":http://github.com/justinfrench/formtastic/blob/master/lib/generators/templates/formtastic.rb
 
 
 h2. Form Generator

From 873f50a1e57a577024002ddffbeb4d25ee4bcd96 Mon Sep 17 00:00:00 2001
From: Robin Stocker <robin@nibor.org>
Date: Sun, 22 May 2011 18:19:17 +0200
Subject: [PATCH 801/992] Don't strip '-' in choice_html_safe_value

When using a radio with a collection of e.g. [1, 0, -1], the ids of the
generated input tags are the same for 1 and -1. By not stripping '-', we
get unique ids in this case.
---
 lib/formtastic/inputs/base/choices.rb | 2 +-
 spec/support/custom_macros.rb         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic/inputs/base/choices.rb b/lib/formtastic/inputs/base/choices.rb
index 335b0e7fc..6f85f63ef 100644
--- a/lib/formtastic/inputs/base/choices.rb
+++ b/lib/formtastic/inputs/base/choices.rb
@@ -64,7 +64,7 @@ def custom_choice_html_options(choice)
         end
 
         def choice_html_safe_value(choice)
-          choice_value(choice).to_s.gsub(/\s/, '_').gsub(/\W/, '').downcase
+          choice_value(choice).to_s.gsub(/\s/, '_').gsub(/[^\w-]/, '').downcase
         end
 
         def choice_input_dom_id(choice)
diff --git a/spec/support/custom_macros.rb b/spec/support/custom_macros.rb
index a38451d35..b80f0e5af 100644
--- a/spec/support/custom_macros.rb
+++ b/spec/support/custom_macros.rb
@@ -296,7 +296,7 @@ def it_should_use_the_collection_when_provided(as, countable)
               output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_general']")
               output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_design']")
               output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_development']")
-              output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_quasiserious_inventions']")
+              output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_quasi-serious_inventions']")
             end
           end
         end

From 83e0877de6518cb2cd636bbb53717f9abb226e0d Mon Sep 17 00:00:00 2001
From: Matt Huggins <matt.huggins@gmail.com>
Date: Mon, 23 May 2011 21:38:06 -0500
Subject: [PATCH 802/992] Create rspec to demonstrate has_many error messages
 aren't properly being displayed without this patch

---
 lib/formtastic/helpers/errors_helper.rb | 2 +-
 spec/builder/errors_spec.rb             | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/helpers/errors_helper.rb b/lib/formtastic/helpers/errors_helper.rb
index b4a0324d3..41185e77e 100644
--- a/lib/formtastic/helpers/errors_helper.rb
+++ b/lib/formtastic/helpers/errors_helper.rb
@@ -94,7 +94,7 @@ def error_keys(method, options)
         @methods_for_error[method] ||= begin
           methods_for_error = [method.to_sym]
           methods_for_error << file_metadata_suffixes.map{|suffix| "#{method}_#{suffix}".to_sym} if is_file?(method, options)
-          methods_for_error << [association_primary_key_for_method(method)] if association_macro_for_method(method) == :belongs_to
+          methods_for_error << [association_primary_key_for_method(method)] if [:belongs_to, :has_many].include? association_macro_for_method(method)
           methods_for_error.flatten.compact.uniq
         end
       end
diff --git a/spec/builder/errors_spec.rb b/spec/builder/errors_spec.rb
index c0ccf9eff..5b2711a61 100644
--- a/spec/builder/errors_spec.rb
+++ b/spec/builder/errors_spec.rb
@@ -181,5 +181,13 @@
 
   end
 
+  describe "when there are errors on a has_many association" do
+    it "should include the association ids error messages" do
+      semantic_form_for(@new_post) do |builder|
+        builder.send(:error_keys, :sub_posts, {}).should include(:sub_post_ids)
+      end
+    end
+  end
+
 end
 

From f7d9cfdb8fd37871a7d098091b156693a5dc1f05 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 18 Apr 2011 20:28:00 +1000
Subject: [PATCH 803/992] A bunch of Rails 3.1 compatability stuff for #564

* Rails 3.1 nested inputs won't work unless the nested attributes collection returns a non-empty collection

* stub Author#persisted? to get another test passing

* stub controller, default_url_options, _routes, _routes.url_helpers, _routes.url_helpers.has_for_..._path, etc

* f.fields_for(:some_association) in Rails 3.1 checks for the some_association= method on the parent model, so we need to stub it

Disabled some failing i18n specs for now.
---
 spec/builder/custom_builder_spec.rb | 15 +++++++----
 spec/helpers/form_helper_spec.rb    |  4 +--
 spec/i18n_spec.rb                   | 18 ++++++-------
 spec/spec_helper.rb                 | 41 +++++++++++++++++++++++++++--
 4 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/spec/builder/custom_builder_spec.rb b/spec/builder/custom_builder_spec.rb
index bcf2343df..28b98233e 100644
--- a/spec/builder/custom_builder_spec.rb
+++ b/spec/builder/custom_builder_spec.rb
@@ -59,7 +59,7 @@ def to_html
 
       it "should yield an instance of the custom builder" do
         semantic_form_for(@new_post) do |builder|
-          builder.class.should == MyCustomFormBuilder
+          builder.class.should.kind_of?(MyCustomFormBuilder)
         end
       end
       
@@ -75,9 +75,13 @@ def to_html
     describe "fields_for" do
 
       it "should yield an instance of the parent form builder" do
-        semantic_form_for(@new_post) do |builder|
-          builder.fields_for(:author) do |nested_builder|
-            nested_builder.class.should == MyCustomFormBuilder
+        @new_post.stub!(:comment).and_return([@fred])
+        @new_post.stub!(:comment_attributes=)
+        semantic_form_for(@new_post, :builder => MyCustomFormBuilder) do |builder|
+          builder.class.should.kind_of?(MyCustomFormBuilder)
+          
+          builder.fields_for(:comment) do |nested_builder|
+            nested_builder.class.should.kind_of?(MyCustomFormBuilder)
           end
         end
       end
@@ -91,9 +95,10 @@ def to_html
     describe "fields_for" do
 
       it "should yield an instance of the parent form builder" do
+        @new_post.stub!(:author_attributes=)
         semantic_form_for(@new_post, :builder => MyCustomFormBuilder) do |builder|
           builder.fields_for(:author) do |nested_builder|
-            nested_builder.class.should == MyCustomFormBuilder
+            nested_builder.class.should.kind_of?(MyCustomFormBuilder)
           end
         end
       end
diff --git a/spec/helpers/form_helper_spec.rb b/spec/helpers/form_helper_spec.rb
index 793c170a7..f0a69530d 100644
--- a/spec/helpers/form_helper_spec.rb
+++ b/spec/helpers/form_helper_spec.rb
@@ -125,8 +125,8 @@ class MyAwesomeCustomBuilder < Formtastic::FormBuilder
 
   describe '#semantic_fields_for' do
     it 'yields an instance of Formtastic::FormBuilder' do
-      semantic_fields_for(@new_post, :url => '/hello') do |builder|
-        builder.class.should == Formtastic::FormBuilder
+      semantic_fields_for(@new_post) do |builder|
+        builder.class.should.kind_of?(Formtastic::FormBuilder)
       end
     end
   end
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index 612853657..46f10ac00 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -88,8 +88,8 @@
       ::I18n.backend.store_translations :en, {:formtastic => {
           :labels => {
               :title    => "Hello world!",
-              :post     => {:title => "Hello post!"},
-              :project  => {:title => "Hello project!", :task => {:name => "Hello task name!"}},
+              :post     => {:title => "Hello post!", :author => {:name => "Hello author name!"}},
+              :project  => {:title => "Hello project!"},
               :line_item => {:name => "Hello line item name!"}
             }
         }, :helpers => {
@@ -130,18 +130,18 @@
       end
     end
 
-    it 'should be able to translate nested objects with nested translations' do
+    xit 'should be able to translate nested objects with nested translations' do
       with_config :i18n_lookups_by_default, true do
-        concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
-          builder.fields_for(:task) do |f|
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.fields_for(:author) do |f|
             concat(f.input(:name))
-          end
+          end)
         end)
-        output_buffer.should have_tag("form label", /Hello task name!/)
+        output_buffer.should have_tag("form label", /Hello author name!/)
       end
     end
 
-    it 'should be able to translate nested objects with top level translations' do
+    xit 'should be able to translate nested objects with top level translations' do
       with_config :i18n_lookups_by_default, true do
         concat(semantic_form_for(:order, :url => 'http://test.host') do |builder|
           builder.fields_for(:line_item) do |f|
@@ -152,7 +152,7 @@
       end
     end
 
-    it 'should be able to translate helper label as Rails does' do
+    xit 'should be able to translate helper label as Rails does' do
       with_config :i18n_lookups_by_default, true do
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:author))
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 0aa13d80b..c7192a9de 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -7,7 +7,7 @@
 require 'action_pack'
 require 'action_view'
 require 'action_controller'
-#require 'action_mailer'
+require 'action_dispatch'
 
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic/util'))
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic'))
@@ -16,6 +16,9 @@
 # in ./support/ and its subdirectories in alphabetic order.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each {|f| require f}
 
+module FakeHelpersModule
+end
+
 module FormtasticSpecHelper
   include ActionPack
   include ActionView::Context if defined?(ActionView::Context)
@@ -97,6 +100,9 @@ class ::Author
 
     def to_label
     end
+    
+    def persisted?
+    end
   end
   class ::Continent
     extend ActiveModel::Naming if defined?(ActiveModel::Naming)
@@ -106,6 +112,27 @@ class ::PostModel
     extend ActiveModel::Naming if defined?(ActiveModel::Naming)
     include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
   end
+  
+  def _routes
+    url_helpers = mock('url_helpers')
+    url_helpers.stub!(:hash_for_posts_path).and_return({})
+    url_helpers.stub!(:hash_for_post_path).and_return({})
+    url_helpers.stub!(:hash_for_post_models_path).and_return({})
+    url_helpers.stub!(:hash_for_authors_path).and_return({})
+    
+    mock('_routes', 
+      :url_helpers => url_helpers,
+      :url_for => "/mock/path"
+    )
+  end
+    
+  def controller
+    mock('controller', :controller_path= => '', :params => {})
+  end
+  
+  def default_url_options
+    {}
+  end
 
   def mock_everything
 
@@ -131,6 +158,7 @@ def new_author_path; "/authors/new"; end
     @fred.stub!(:errors).and_return(mock('errors', :[] => nil))
     @fred.stub!(:to_key).and_return(nil)
     @fred.stub!(:persisted?).and_return(nil)
+    @fred.stub!(:name).and_return('Fred')
 
     @bob = ::Author.new
     @bob.stub!(:to_label).and_return('Bob Rock')
@@ -144,6 +172,7 @@ def new_author_path; "/authors/new"; end
     @bob.stub!(:errors).and_return(mock('errors', :[] => nil))
     @bob.stub!(:to_key).and_return(nil)
     @bob.stub!(:persisted?).and_return(nil)
+    @bob.stub!(:name).and_return('Bob')
 
     @james = ::Author.new
     @james.stub!(:to_label).and_return('James Shock')
@@ -156,6 +185,7 @@ def new_author_path; "/authors/new"; end
     @james.stub!(:errors).and_return(mock('errors', :[] => nil))
     @james.stub!(:to_key).and_return(nil)
     @james.stub!(:persisted?).and_return(nil)
+    @james.stub!(:name).and_return('James')
 
 
     ::Author.stub!(:find).and_return([@fred, @bob])
@@ -175,6 +205,9 @@ def new_author_path; "/authors/new"; end
     @new_post.stub!(:new_record?).and_return(true)
     @new_post.stub!(:errors).and_return(mock('errors', :[] => nil))
     @new_post.stub!(:author).and_return(nil)
+    @new_post.stub!(:author_attributes=).and_return(nil)
+    @new_post.stub!(:authors).and_return([@fred])
+    @new_post.stub!(:authors_attributes=)
     @new_post.stub!(:reviewer).and_return(nil)
     @new_post.stub!(:main_post).and_return(nil)
     @new_post.stub!(:sub_posts).and_return([]) #TODO should be a mock with methods for adding sub posts
@@ -298,7 +331,11 @@ def self.included(base)
       def protect_against_forgery?
         false
       end
-
+      
+      def _helpers
+        FakeHelpersModule
+      end
+      
     end
   end
 

From b82fd53bbd3adcacf3fa849bcef1ec4a2ecf8f71 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 20 May 2011 06:59:40 +1000
Subject: [PATCH 804/992] Fixes for i18n under Rails 3.1, all tests pass under
 Rails 3.1.0.rc1 and 3.0.7.

* Model_name in Rails 3 can be `author` or `post[author]`. In Rails 3.1 always `author`. Rails 3.1 introduces `builder.parent_builder`, so we use `builder.parent_builder.object` name for the parent (`post`) bit if available, and `f.semantic_fields_for` will pass `:parent_builder` to `f.form_for` as an option to provide similar functionality in Rails 3.0.

* The nested translation tests in for the above code really didn't cover the common use cases, so I re-wrote a lot of them, added extras, etc.

* Rails 3.1 also doesn't seem to instantiate the nested builder as a Formtastic::FormBuilder if the parent form is using `:post` instead of `@post`, so converted the specs to work with real objects.

* The tests for falling back to Rails-style translations didn't make sense to me so I re-wrote them and adding coverage for nesting.

Fixes #564
---
 lib/formtastic/form_builder.rb     |  6 ++++
 lib/formtastic/localized_string.rb | 11 ++++++-
 spec/i18n_spec.rb                  | 46 ++++++++++++++++++++++--------
 3 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 1d04a8a5b..583b62d6c 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -69,6 +69,12 @@ def self.configure(name, value = nil)
     #
     # @todo is there a way to test the params structure of the Rails helper we wrap to ensure forward compatibility?
     def semantic_fields_for(record_or_name_or_array, *args, &block)
+      # Add a :parent_builder to the args so that nested translations can be possible in Rails 3
+      options = args.shift || {}
+      options[:parent_builder] ||= self
+      args.unshift(options)
+      
+      # Wrap the Rails helper
       fields_for(record_or_name_or_array, *args, &block)
     end
     
diff --git a/lib/formtastic/localized_string.rb b/lib/formtastic/localized_string.rb
index 631c04fc0..6bab5bc7f 100644
--- a/lib/formtastic/localized_string.rb
+++ b/lib/formtastic/localized_string.rb
@@ -35,6 +35,7 @@ def localized_string(key, value, type, options = {}) #:nodoc:
 
         if use_i18n
           model_name, nested_model_name  = normalize_model_name(self.model_name.underscore)
+          
           action_name = template.params[:action].to_s rescue ''
           attribute_name = key.to_s
 
@@ -73,9 +74,17 @@ def model_name
     end
 
     def normalize_model_name(name)
-      if name =~ /(.+)\[(.+)\]/
+      if !name =~ /\[/ && self.respond_to?(:builder) && builder.respond_to?(:parent_builder) && builder.parent_builder.object_name
+        # Rails 3.1 nested builder case
+        [builder.parent_builder.object_name.to_s, name]
+      elsif name =~ /(.+)\[(.+)\]/
+        # Rails 3 (and 3.1?) nested builder case with :post rather than @post
         [$1, $2]
+      elsif self.respond_to?(:builder) && builder.respond_to?(:options) && builder.options.key?(:parent_builder)
+        # Rails 3.0 nested builder work-around case, where :parent_builder is provided by f.semantic_form_for
+        [builder.options[:parent_builder].object_name.to_s, name]
       else
+        # Non-nested case
         [name]
       end
     end
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index 46f10ac00..31f7d47e9 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -87,14 +87,14 @@
 
       ::I18n.backend.store_translations :en, {:formtastic => {
           :labels => {
-              :title    => "Hello world!",
+              :author   => { :name => "Top author name transation" },
               :post     => {:title => "Hello post!", :author => {:name => "Hello author name!"}},
               :project  => {:title => "Hello project!"},
-              :line_item => {:name => "Hello line item name!"}
             }
         }, :helpers => {
           :label => {
-            :post => {:author => "Written by"}
+            :post => {:body => "Elaborate..." },
+            :author => { :login => "Hello login" }
           }
         }}
 
@@ -130,10 +130,10 @@
       end
     end
 
-    xit 'should be able to translate nested objects with nested translations' do
+    it 'should be able to translate nested objects with nested translations' do
       with_config :i18n_lookups_by_default, true do
         concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.fields_for(:author) do |f|
+          concat(builder.semantic_fields_for(@new_post.author) do |f|
             concat(f.input(:name))
           end)
         end)
@@ -141,23 +141,45 @@
       end
     end
 
-    xit 'should be able to translate nested objects with top level translations' do
+    it 'should be able to translate nested objects with top level translations' do
       with_config :i18n_lookups_by_default, true do
-        concat(semantic_form_for(:order, :url => 'http://test.host') do |builder|
-          builder.fields_for(:line_item) do |f|
+        concat(semantic_form_for(@new_post) do |builder|
+          builder.semantic_fields_for(@new_post.author) do |f|
             concat(f.input(:name))
           end
         end)
-        output_buffer.should have_tag("form label", /Hello line item name!/)
+        output_buffer.should have_tag("form label", /Hello author name!/)
+      end
+    end
+    
+    it 'should be able to translate nested forms with top level translations' do
+      with_config :i18n_lookups_by_default, true do
+        concat(semantic_form_for(:post) do |builder|
+          builder.semantic_fields_for(:author) do |f|
+            concat(f.input(:name))
+          end
+        end)
+        output_buffer.should have_tag("form label", /Hello author name!/)
       end
     end
 
-    xit 'should be able to translate helper label as Rails does' do
+    it 'should be able to translate helper label as Rails does' do
       with_config :i18n_lookups_by_default, true do
         concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:author))
+          concat(builder.input(:body))
+        end)
+        output_buffer.should have_tag("form label", /Elaborate/)
+      end
+    end
+    
+    it 'should be able to translate nested helper label as Rails does' do
+      with_config :i18n_lookups_by_default, true do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.inputs :for => @new_post.author do |f|
+            concat(f.input(:login))
+          end)
         end)
-        output_buffer.should have_tag("form label", /Written by/)
+        output_buffer.should have_tag("form label", /Hello login/)
       end
     end
 

From 19fc3e23607e3de116f7d9e2cadea117895f40a4 Mon Sep 17 00:00:00 2001
From: Thomas Walpole <twalpole@gmail.com>
Date: Thu, 26 May 2011 10:53:14 -0700
Subject: [PATCH 805/992] fix for broken semantic_fields_for

---
 lib/formtastic/form_builder.rb           | 5 ++---
 spec/builder/semantic_fields_for_spec.rb | 8 ++++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 583b62d6c..70eb2baa8 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -70,12 +70,11 @@ def self.configure(name, value = nil)
     # @todo is there a way to test the params structure of the Rails helper we wrap to ensure forward compatibility?
     def semantic_fields_for(record_or_name_or_array, *args, &block)
       # Add a :parent_builder to the args so that nested translations can be possible in Rails 3
-      options = args.shift || {}
+      options = args.extract_options!
       options[:parent_builder] ||= self
-      args.unshift(options)
       
       # Wrap the Rails helper
-      fields_for(record_or_name_or_array, *args, &block)
+      fields_for(record_or_name_or_array, *(args << options), &block)
     end
     
   end
diff --git a/spec/builder/semantic_fields_for_spec.rb b/spec/builder/semantic_fields_for_spec.rb
index caa326234..085698172 100644
--- a/spec/builder/semantic_fields_for_spec.rb
+++ b/spec/builder/semantic_fields_for_spec.rb
@@ -26,6 +26,14 @@
       end
     end
   end
+  
+  it 'supports passing collection as second parameter' do
+    semantic_form_for(@new_post) do |builder|
+      builder.semantic_fields_for(:author, [@fred,@bob]) do |nested_builder|
+        nested_builder.object_name.should =~ /post\[author_attributes\]\[\d+\]/
+      end
+    end
+  end
 
   it 'should sanitize html id for li tag' do
     @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))

From 45a3ddac97017d5d25f7cc6616a2635d9b283708 Mon Sep 17 00:00:00 2001
From: Joe Winter <jwinter@gmail.com>
Date: Fri, 27 May 2011 15:40:06 -0700
Subject: [PATCH 806/992] Fix syntax error in Ruby 1.9.2

---
 spec/i18n_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index 31f7d47e9..bfb3a7c61 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -175,7 +175,7 @@
     it 'should be able to translate nested helper label as Rails does' do
       with_config :i18n_lookups_by_default, true do
         concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.inputs :for => @new_post.author do |f|
+          concat(builder.inputs(:for => @new_post.author) do |f|
             concat(f.input(:login))
           end)
         end)

From ff296bd6c37bb2c48d77ba1c0e3f79a76eb7d709 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Mon, 30 May 2011 10:19:27 +0530
Subject: [PATCH 807/992] Boolean fields should not use global requied default.
 Fixes #580

---
 lib/formtastic/inputs/base/validations.rb | 51 ++++++++++++-----------
 lib/formtastic/inputs/boolean_input.rb    | 28 +++++++------
 spec/inputs/boolean_input_spec.rb         | 39 ++++++++++-------
 3 files changed, 66 insertions(+), 52 deletions(-)

diff --git a/lib/formtastic/inputs/base/validations.rb b/lib/formtastic/inputs/base/validations.rb
index 482134017..399f02fae 100644
--- a/lib/formtastic/inputs/base/validations.rb
+++ b/lib/formtastic/inputs/base/validations.rb
@@ -2,7 +2,7 @@ module Formtastic
   module Inputs
     module Base
       module Validations
-        
+
         class IndeterminableMinimumAttributeError < ArgumentError
           def message
             [
@@ -20,9 +20,9 @@ def message
             ].join("\n")
           end
         end
-        
+
         def validations
-          @validations ||= if object && object.class.respond_to?(:validators_on) 
+          @validations ||= if object && object.class.respond_to?(:validators_on)
             object.class.validators_on(attributized_method_name).select do |validator|
               validator_relevant?(validator)
             end
@@ -30,11 +30,11 @@ def validations
             []
           end
         end
-        
+
         def validator_relevant?(validator)
           return true unless validator.options.key?(:if) || validator.options.key?(:unless)
           conditional = validator.options.key?(:if) ? validator.options[:if] : validator.options[:unless]
-          
+
           result = if conditional.respond_to?(:call)
             conditional.call(object)
           elsif conditional.is_a?(::Symbol) && object.respond_to?(conditional)
@@ -42,13 +42,13 @@ def validator_relevant?(validator)
           else
             conditional
           end
-          
+
           result = validator.options.key?(:unless) ? !result : !!result
           not_required_through_negated_validation! if !result && [:presence, :inclusion, :length].include?(validator.kind)
 
           result
         end
-        
+
         def validation_limit
           validation = validations? && validations.find do |validation|
             validation.kind == :length
@@ -59,17 +59,17 @@ def validation_limit
             nil
           end
         end
-        
+
         # Prefer :greater_than_or_equal_to over :greater_than, for no particular reason.
         def validation_min
           validation = validations? && validations.find do |validation|
             validation.kind == :numericality
           end
-          
-          if validation 
+
+          if validation
             # We can't determine an appropriate value for :greater_than with a float/decimal column
             raise IndeterminableMinimumAttributeError if validation.options[:greater_than] && column? && [:float, :decimal].include?(column.type)
-            
+
             return validation.options[:greater_than_or_equal_to] if validation.options[:greater_than_or_equal_to]
             return (validation.options[:greater_than] + 1)       if validation.options[:greater_than]
           end
@@ -83,12 +83,12 @@ def validation_max
           if validation
             # We can't determine an appropriate value for :greater_than with a float/decimal column
             raise IndeterminableMaximumAttributeError if validation.options[:less_than] && column? && [:float, :decimal].include?(column.type)
-            
+
             return validation.options[:less_than_or_equal_to] if validation.options[:less_than_or_equal_to]
             return (validation.options[:less_than] - 1)       if validation.options[:less_than]
           end
         end
-        
+
         def validation_step
           validation = validations? && validations.find do |validation|
             validation.kind == :numericality
@@ -110,33 +110,37 @@ def validation_integer_only?
             false
           end
         end
-        
+
         def validations?
           !validations.empty?
         end
-        
+
         def required?
           return false if options[:required] == false
           return true if options[:required] == true
           return false if not_required_through_negated_validation?
           if validations?
-            validations.select { |validator| 
+            validations.select { |validator|
               [:presence, :inclusion, :length].include?(validator.kind) &&
               validator.options[:allow_blank] != true
             }.any?
           else
-            return !!builder.all_fields_required_by_default
+            return responds_to_global_required? && !!builder.all_fields_required_by_default
           end
         end
-        
+
         def not_required_through_negated_validation?
           @not_required_through_negated_validation
         end
-        
+
         def not_required_through_negated_validation!
           @not_required_through_negated_validation = true
         end
-        
+
+        def responds_to_global_required?
+          true
+        end
+
         def optional?
           !required?
         end
@@ -150,14 +154,13 @@ def autofocus?
         def column_limit
           column.limit if column? && column.respond_to?(:limit)
         end
-        
+
         def limit
           validation_limit || column_limit
         end
-        
+
       end
     end
   end
 end
-        
-        
\ No newline at end of file
+
diff --git a/lib/formtastic/inputs/boolean_input.rb b/lib/formtastic/inputs/boolean_input.rb
index b45bcb2cc..5ae4c2613 100644
--- a/lib/formtastic/inputs/boolean_input.rb
+++ b/lib/formtastic/inputs/boolean_input.rb
@@ -31,53 +31,57 @@ module Inputs
     # @see Formtastic::Helpers::InputsHelper#input InputsHelper#input for full documetation of all possible options.
     class BooleanInput
       include Base
-      
+
       def to_html
         input_wrapping do
-          hidden_field_html << 
+          hidden_field_html <<
           label_with_nested_checkbox
         end
       end
-      
+
       def hidden_field_html
         template.hidden_field_tag(input_html_options[:name], unchecked_value, :id => nil, :disabled => input_html_options[:disabled] )
       end
-            
+
       def label_with_nested_checkbox
         builder.label(
           method,
-          label_text_with_embedded_checkbox, 
+          label_text_with_embedded_checkbox,
           label_html_options
         )
       end
-      
+
       def label_html_options
         input_html_options.merge(
           :id => nil,
           :for => input_html_options[:id]
         )
       end
-      
+
       def label_text_with_embedded_checkbox
         label_text << " " << check_box_html
       end
-      
+
       def check_box_html
         template.check_box_tag("#{object_name}[#{method}]", checked_value, checked?, input_html_options)
       end
-      
+
       def unchecked_value
         options[:unchecked_value] || '0'
       end
-      
+
       def checked_value
         options[:checked_value] || '1'
       end
-      
+
+      def responds_to_global_required?
+        false
+      end
+
       def input_html_options
         {:name => "#{object_name}[#{method}]"}.merge(super)
       end
-      
+
       def checked?
         object && ActionView::Helpers::InstanceTag.check_box_checked?(object.send(method), checked_value)
       end
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index be5cb08d7..615fce12a 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -27,7 +27,7 @@
     output_buffer.should have_tag('form li input[@type="hidden"]', :count => 1)
     output_buffer.should_not have_tag('form li label input[@type="hidden"]', :count => 1) # invalid HTML5
   end
-  
+
   it 'should generate a checkbox input' do
     output_buffer.should have_tag('form li label input')
     output_buffer.should have_tag('form li label input#post_allow_comments')
@@ -35,13 +35,13 @@
     output_buffer.should have_tag('form li label input[@name="post[allow_comments]"]')
     output_buffer.should have_tag('form li label input[@type="checkbox"][@value="1"]')
   end
-  
+
   it 'should generate a checked input if object.method returns true' do
     output_buffer.should have_tag('form li label input[@checked="checked"]')
     output_buffer.should have_tag('form li input[@name="post[allow_comments]"]', :count => 2)
     output_buffer.should have_tag('form li input#post_allow_comments', :count => 1)
   end
-  
+
   it 'should generate a checked input if :input_html is passed :checked => checked' do
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:answer_comments, :as => :boolean, :input_html => {:checked => 'checked'}))
@@ -53,20 +53,20 @@
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:answer_comments, :as => :boolean, :input_html => { :name => "foo" }))
     end)
-    
+
     output_buffer.should have_tag('form li input[@type="checkbox"][@name="foo"]', :count => 1)
     output_buffer.should have_tag('form li input[@type="hidden"][@name="foo"]', :count => 1)
   end
-  
+
   it 'should name the hidden input with the :name html_option' do
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:answer_comments, :as => :boolean, :input_html => { :name => "foo" }))
     end)
-    
+
     output_buffer.should have_tag('form li input[@type="checkbox"][@name="foo"]', :count => 1)
     output_buffer.should have_tag('form li input[@type="hidden"][@name="foo"]', :count => 1)
   end
-  
+
   it "should generate a disabled input and hidden input if :input_html is passed :disabled => 'disabled' " do
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :input_html => {:disabled => 'disabled'}))
@@ -74,7 +74,7 @@
     output_buffer.should have_tag('form li label input[@disabled="disabled"]', :count => 1)
     output_buffer.should have_tag('form li input[@type="hidden"][@disabled="disabled"]', :count => 1)
   end
-  
+
   it 'should generate an input[id] with matching label[for] when id passed in :input_html' do
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :input_html => {:id => 'custom_id'}))
@@ -91,24 +91,24 @@
     output_buffer.should have_tag('form li input[@type="hidden"][@value="unchecked"]')
     output_buffer.should_not have_tag('form li label input[@type="hidden"]') # invalid HTML5
   end
-  
+
   it 'should generate a checked input if object.method returns checked value' do
     @new_post.stub!(:allow_comments).and_return('yes')
-  
+
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'yes', :unchecked_value => 'no'))
     end)
-  
+
     output_buffer.should have_tag('form li label input[@type="checkbox"][@value="yes"][@checked="checked"]')
   end
-  
+
   it 'should not generate a checked input if object.method returns unchecked value' do
     @new_post.stub!(:allow_comments).and_return('no')
-  
+
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'yes', :unchecked_value => 'no'))
     end)
-  
+
     output_buffer.should have_tag('form li label input[@type="checkbox"][@value="yes"]:not([@checked])')
   end
 
@@ -145,7 +145,7 @@
     output_buffer.should have_tag('form li label input[@type="checkbox"]')
     output_buffer.should have_tag('form li label input[@name="project[allow_comments]"]')
   end
-  
+
   context "when required" do
     it "should add the required attribute to the input's html options" do
       concat(semantic_form_for(@new_post) do |builder|
@@ -153,8 +153,15 @@
       end)
       output_buffer.should have_tag("input[@required]")
     end
+
+    it "should not add the required attribute to the boolean fields input's html options" do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:title, :as => :boolean))
+      end)
+      output_buffer.should_not have_tag("input[@required]")
+    end
   end
-  
+
   describe "when namespace is provided" do
 
     before do

From eff38a1b67afb3e75af5e488b05de411d51354e5 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 27 May 2011 16:48:44 +1000
Subject: [PATCH 808/992] too hard to maintain the maintainers

---
 README.textile | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/README.textile b/README.textile
index a0f73343a..0df6aa99b 100644
--- a/README.textile
+++ b/README.textile
@@ -614,23 +614,18 @@ For significant changes, you may wish to discuss your idea on the Formtastic Goo
 See below for installation of a development environment.
 
 
-h2. Maintainers & Contributors
-
-Formtastic is maintained by "Justin French":http://github.com/justinfrench, "Morton Jonuschat":http://github.com/yabawock and "Gabriel Sobrinho":http://github.com/sobrinho. "Denis Major":http://github.com/denismajor1 is doing some amazing documentation work in the wiki, and we very much appreciate the past efforts of "José Valim":http://github.com/josevalim and "Jonas Grimfelt":http://github.com/grimen and over 40 other contributors.
-
-@git shortlog -n -s --no-merges@
-
-
 h2. Google Group, Twitter, etc
 
 Please join the "Formtastic Google Group":http://groups.google.com.au/group/formtastic, especially if you'd like to talk about a new feature, or report a bug.
 
 You can also "follow @formtastic on Twitter":http://twitter.com/formtastic for announcements, tutorials and awesome Formtastic links.
 
-
 h2. Project Info
 
-Formtastic is hosted on Github: "http://github.com/justinfrench/formtastic":http://github.com/justinfrench/formtastic, where your contributions, forkings, comments and feedback are greatly welcomed.
+Formtastic was created by "Justin French":http://www.justinfrench.com with contributions from over 100 awesome developers.
+
+Run @git shortlog -n -s@ to see the awesome.
 
+The project is hosted on Github: "http://github.com/justinfrench/formtastic":http://github.com/justinfrench/formtastic, where your contributions, forkings, comments, issues and feedback are greatly welcomed.
 
 Copyright (c) 2007-2010 Justin French, released under the MIT license.

From a3713e84e122187e10de28d11ed1bb1679e9f5f4 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 30 May 2011 21:41:49 +1000
Subject: [PATCH 809/992] use real objects in :for and fields_for examples,
 fixes #561

---
 README.textile                             | 8 ++++----
 lib/formtastic/helpers/fieldset_wrapper.rb | 4 ++--
 lib/formtastic/helpers/inputs_helper.rb    | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.textile b/README.textile
index 0df6aa99b..6e89e6963 100644
--- a/README.textile
+++ b/README.textile
@@ -36,7 +36,7 @@ One day, I finally had enough, so I opened up my text editor, and wrote a DSL fo
       <%= form.input :url_title, :required => false %>
     <% end %>
 
-    <%= form.inputs :name => "Author", :for => :author do |author_form| %>
+    <%= form.inputs :name => "Author", :for => @article.author do |author_form| %>
       <%= author_form.input :first_name %>
       <%= author_form.input :last_name %>
     <% end %>
@@ -192,7 +192,7 @@ Nested forms are also supported (don't forget your models need to be setup corre
 <pre>
   <%= semantic_form_for @post do |form| %>
     <%= form.inputs :title, :body, :created_at %>
-    <%= form.semantic_fields_for :author do |author| %>
+    <%= form.semantic_fields_for @post.author do |author| %>
       <%= author.inputs :first_name, :last_name, :name => "Author" %>
     <% end %>
     <%= form.buttons %>
@@ -204,7 +204,7 @@ Or the Formtastic way with the @:for@ option:
 <pre>
   <%= semantic_form_for @post do |form| %>
     <%= form.inputs :title, :body, :created_at %>
-    <%= form.inputs :first_name, :last_name, :for => :author, :name => "Author" %>
+    <%= form.inputs :first_name, :last_name, :for => @post.author, :name => "Author" %>
     <%= form.buttons %>
   <% end %>
 </pre>
@@ -214,7 +214,7 @@ When working in has many association, you can even supply @"%i"@ in your fieldse
 <pre>
   <%= semantic_form_for @post do |form| %>
     <%= form.inputs %>
-    <%= form.inputs :name => 'Category #%i', :for => :categories %>
+    <%= form.inputs :name => 'Category #%i', :for => @post.categories %>
     <%= form.buttons %>
   <% end %>
 </pre>
diff --git a/lib/formtastic/helpers/fieldset_wrapper.rb b/lib/formtastic/helpers/fieldset_wrapper.rb
index 1d5cf35b1..87e497f11 100644
--- a/lib/formtastic/helpers/fieldset_wrapper.rb
+++ b/lib/formtastic/helpers/fieldset_wrapper.rb
@@ -8,11 +8,11 @@ module FieldsetWrapper
       # Generates a fieldset and wraps the content in an ordered list. When working
       # with nested attributes, it allows %i as interpolation option in :name. So you can do:
       #
-      #   f.inputs :name => 'Task #%i', :for => :tasks
+      #   f.inputs :name => 'Task #%i', :for => @project.tasks
       #
       # or the shorter equivalent:
       #
-      #   f.inputs 'Task #%i', :for => :tasks
+      #   f.inputs 'Task #%i', :for => @project.tasks
       #
       # And it will generate a fieldset for each task with legend 'Task #1', 'Task #2',
       # 'Task #3' and so on.
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 7c9282f23..30c95eb1c 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -142,7 +142,7 @@ module InputsHelper
       #     <% semantic_form_for @user do |f| %>
       #       <%= f.inputs :name, :email %>
       #
-      #       <% f.inputs :for => :profile do %>
+      #       <% f.inputs :for => @user.profile do %>
       #         <%= profile.input :biography %>
       #         <%= profile.input :twitter_name %>
       #         <%= profile.input :shoe_size %>
@@ -151,9 +151,9 @@ module InputsHelper
       #
       # The `:for` option also works with short hand syntax:
       #
-      #     <% semantic_form_for @post do |form| %>
+      #     <% semantic_form_for @user do |form| %>
       #       <%= f.inputs :name, :email %>
-      #       <%= f.inputs :biography, :twitter_name, :shoe_size, :for => :profile %>
+      #       <%= f.inputs :biography, :twitter_name, :shoe_size, :for => @user.profile %>
       #     <% end %>
       #
       # {#inputs} will always create a new `<fieldset>` wrapping, so only use it when it makes sense
@@ -233,7 +233,7 @@ module InputsHelper
       #       <%= f.input :name ... %>
       #       <%= f.input :email ... %>
       #     <% end %>
-      #     <%= f.inputs :for => :profile do |profile| %>
+      #     <%= f.inputs :for => @user.profile do |profile| %>
       #       <%= profile.input :user ... %>
       #       <%= profile.input :categories ... %>
       #     <% end %>

From 4f4b069f48daf86529d04846ef9e76e7b5cff455 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 31 May 2011 08:29:54 +1000
Subject: [PATCH 810/992] Rails 3.1 Asset Pipeline compatibility (Fixes #563)

* removed formtastic_changes.css
* moved formtastic.css into app/assets/stylesheets/formtastic.css
* changed install generator to only copy formtastic.css in Rails < 3.1
* changed install generator to source the stylesheet template from new location
* added formtastic/engine.rb, which seems to be needed to trigger asset pipeline
* updated documentation

Also modified install instructions in README to include bundling from master.

For Rails 3.1, instead of copying the styles across with a generator, simply add them to your application.css with sprockets:

`*= require formtastic`
---
 README.textile                                | 34 ++++++++++++++-----
 .../assets/stylesheets}/formtastic.css        |  0
 lib/formtastic.rb                             |  3 +-
 lib/formtastic/engine.rb                      |  7 ++++
 .../formtastic/install/install_generator.rb   | 29 ++++++++++------
 lib/generators/templates/formtastic.rb        |  2 +-
 .../templates/formtastic_changes.css          | 14 --------
 7 files changed, 53 insertions(+), 36 deletions(-)
 rename {lib/generators/templates => app/assets/stylesheets}/formtastic.css (100%)
 create mode 100644 lib/formtastic/engine.rb
 delete mode 100644 lib/generators/templates/formtastic_changes.css

diff --git a/README.textile b/README.textile
index 6e89e6963..959533878 100644
--- a/README.textile
+++ b/README.textile
@@ -91,15 +91,19 @@ RDoc documentation _should_ be automatically generated after each commit and mad
 
 h2. Installation
 
-Formtastic edge (2.0) will be compatible with Rails 3 only, and the gem is "hosted":http://rubygems.org/gems/formtastic on RubyGems.org.
-
 Simply add Formtastic to your Gemfile and bundle it up:
 
 <pre>
   gem 'formtastic', '~> 1.2.3'
 </pre>
 
-Optionally, run the generator to copy some stylesheets and a configuration initializer into your application:
+If you want to try out our work towards Formtastic 2.0 (Rails >= 3 only), bundle in Formtastic directly from Github with the @:git@ option instead:
+
+<pre>
+  gem 'formtastic', :git => 'http://github.com/justinfrench/formtastic', :branch => 'master'
+</pre>
+
+Optionally, run the generator to copy a stylesheet (Rails 3.0.x only) and a configuration initializer into your application:
 
 <pre>
   $ rails generate formtastic:install 
@@ -108,14 +112,26 @@ Optionally, run the generator to copy some stylesheets and a configuration initi
 
 h2. Stylesheets
 
-A proof-of-concept stylesheet is provided which you can include in your layout. Customization is best achieved by overriding these styles in an additional stylesheet so that the Formtastic styles can be updated without clobbering your changes. If you want to use these stylesheets, add both to your layout with this helper:
+A proof-of-concept stylesheet is provided which you can include in your layout. Customization is best achieved by overriding these styles in an additional stylesheet.
+
+h3. Stylesheet usage in Rails < 3.1:
 
 <pre>
-  <head>
-    ...
-    <%= stylesheet_link_tag 'formtastic', 'formtastic_changes' %>
-    ...
-  </head>
+  $ rails generate formtastic:install 
+</pre>
+
+<pre>
+  # app/views/layouts/application.html.erb
+  <%= stylesheet_link_tag 'formtastic', 'my_formtastic_changes' %>
+</pre>
+
+h3. Stylesheet usage in Rails >= 3.1:
+
+Rails 3.1 introduces an asset pipeline that allows plugins like Formtastic to serve their own Stylesheets, Javascripts, etc without having to run generators that copy them accross to the host application.
+
+<pre>
+  # app/assets/stylesheets/application.css
+  *= require formtastic
 </pre>
 
 
diff --git a/lib/generators/templates/formtastic.css b/app/assets/stylesheets/formtastic.css
similarity index 100%
rename from lib/generators/templates/formtastic.css
rename to app/assets/stylesheets/formtastic.css
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 074b7688f..e5dfc596e 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -1,5 +1,6 @@
 # encoding: utf-8
-require 'formtastic/railtie.rb' if defined?(Rails)
+require 'formtastic/railtie' if defined?(::Rails)
+require 'formtastic/engine' if defined?(::Rails)
 
 module Formtastic
   extend ActiveSupport::Autoload
diff --git a/lib/formtastic/engine.rb b/lib/formtastic/engine.rb
new file mode 100644
index 000000000..05dae9a0a
--- /dev/null
+++ b/lib/formtastic/engine.rb
@@ -0,0 +1,7 @@
+# Configure Rails 3.1 to have assert_select_jquery() in tests
+module Formtastic
+  # Required for formtastic.css to be discoverable in the asset pipeline
+  # @private
+  class Engine < ::Rails::Engine
+  end
+end
\ No newline at end of file
diff --git a/lib/generators/formtastic/install/install_generator.rb b/lib/generators/formtastic/install/install_generator.rb
index fe6ddf4d6..bfb7c0f64 100644
--- a/lib/generators/formtastic/install/install_generator.rb
+++ b/lib/generators/formtastic/install/install_generator.rb
@@ -1,23 +1,30 @@
 # encoding: utf-8
 
 module Formtastic
-  # Copies formtastic.css and formtastic_changes.css to public/stylesheets/ and a config initializer
-  # to config/initializers/formtastic_config.rb.
+  # Copies formtastic.css to public/stylesheets/ (Rails 3.0.x only) and a config initializer
+  # to config/initializers/formtastic.rb (all Rails versions).
   #
   # @example
   #   $ rails generate formtastic:install
   #
-  # @todo Revisit in Rails 3.1 where public assets are treated differently
+  # @todo Test with Rails 3.0
   class InstallGenerator < Rails::Generators::Base
-    desc "Copies formtastic.css and formtastic_changes.css to public/stylesheets/ and a config initializer to config/initializers/formtastic_config.rb"
-
+    
     source_root File.expand_path('../../../templates', __FILE__)
-
-    def copy_files
-      template        'formtastic.rb', 'config/initializers/formtastic.rb'
-
-      template        'formtastic.css',         'public/stylesheets/formtastic.css'
-      template        'formtastic_changes.css', 'public/stylesheets/formtastic_changes.css'
+    
+    if ::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR >= 1
+      # Rails 3.1.x has the asset pipeline, no need to copy CSS files any more
+      desc "Copies a config initializer to config/initializers/formtastic.rb"
+      def copy_files
+        template 'formtastic.rb', 'config/initializers/formtastic.rb'
+      end
+    else
+      # Rails 3.0 doesn't have an asset pipeline, so we copy in CSS too
+      desc "Copies formtastic.css to public/stylesheets/ and a config initializer to config/initializers/formtastic.rb"
+      def copy_files
+        template 'formtastic.rb', 'config/initializers/formtastic.rb'
+        template '../../../app/assets/stylesheets/formtastic.css', 'public/stylesheets/formtastic.css'
+      end
     end
   end
 end
diff --git a/lib/generators/templates/formtastic.rb b/lib/generators/templates/formtastic.rb
index 64df025cd..65687b286 100644
--- a/lib/generators/templates/formtastic.rb
+++ b/lib/generators/templates/formtastic.rb
@@ -42,7 +42,7 @@
 # Formtastic::FormBuilder.inline_errors = :sentence
 # Formtastic uses the following classes as default for hints, inline_errors and error list
 
-# If you override the class here, please ensure to override it in your formtastic_changes.css stylesheet as well
+# If you override the class here, please ensure to override it in your stylesheets as well
 # Formtastic::FormBuilder.default_hint_class = "inline-hints"
 # Formtastic::FormBuilder.default_inline_error_class = "inline-errors"
 # Formtastic::FormBuilder.default_error_list_class = "errors"
diff --git a/lib/generators/templates/formtastic_changes.css b/lib/generators/templates/formtastic_changes.css
deleted file mode 100644
index 8a044fab6..000000000
--- a/lib/generators/templates/formtastic_changes.css
+++ /dev/null
@@ -1,14 +0,0 @@
-/* -------------------------------------------------------------------------------------------------
-
-Load this stylesheet after formtastic.css in your layouts to override the CSS to suit your needs.
-This will allow you to update formtastic.css with new releases without clobbering your own changes.
-
-For example, to make the inline hint paragraphs a little darker in color than the standard #666:
-
-form.formtastic fieldset > ol > li p.inline-hints { color:#333; }
-
-HINT:
-The following style may be *conditionally* included for improved support on older versions of IE(<8)
-form.formtastic fieldset ol li fieldset legend { margin-left: -6px;}
-
---------------------------------------------------------------------------------------------------*/

From 90e674f064bf07379f86c6bd5fe04af9d2ba363a Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 31 May 2011 17:19:09 +1000
Subject: [PATCH 811/992] ignore :base in semantic_errors, since base errors
 are always rendered, avoids duplicates (fixes #576)

---
 lib/formtastic/helpers/errors_helper.rb     |  1 +
 spec/helpers/semantic_errors_helper_spec.rb | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/lib/formtastic/helpers/errors_helper.rb b/lib/formtastic/helpers/errors_helper.rb
index 41185e77e..d65c9b6c0 100644
--- a/lib/formtastic/helpers/errors_helper.rb
+++ b/lib/formtastic/helpers/errors_helper.rb
@@ -40,6 +40,7 @@ module ErrorsHelper
       #   <% end %>
       def semantic_errors(*args)
         html_options = args.extract_options!
+        args = args - [:base]
         full_errors = args.inject([]) do |array, method|
           attribute = localized_string(method, method.to_sym, :label) || humanized_attribute_name(method)
           errors = Array(@object.errors[method.to_sym]).to_sentence
diff --git a/spec/helpers/semantic_errors_helper_spec.rb b/spec/helpers/semantic_errors_helper_spec.rb
index f15ea8be4..a14d50fa6 100644
--- a/spec/helpers/semantic_errors_helper_spec.rb
+++ b/spec/helpers/semantic_errors_helper_spec.rb
@@ -95,4 +95,18 @@
       end
     end
   end
+  
+  describe 'when :base is passed in as an argument' do
+    before do
+      @errors.stub!(:[]).with(:base).and_return(@base_error)
+    end
+
+    it 'should ignore :base and only render base errors once' do
+      semantic_form_for(@new_post) do |builder|
+        builder.semantic_errors(:base).should have_tag('ul li', :count => 1)
+        builder.semantic_errors(:base).should_not have_tag('ul li', "Base #{@base_error}")
+      end
+    end
+  end
+  
 end

From 33aeedd945f719c43b6bc3430f5ed28d834af3a6 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 1 Jun 2011 07:11:18 +1000
Subject: [PATCH 812/992] remove incorrect comment about
 all_fields_required_by_default from config template (ref #581)

---
 lib/generators/templates/formtastic.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/generators/templates/formtastic.rb b/lib/generators/templates/formtastic.rb
index 65687b286..4fce02cc0 100644
--- a/lib/generators/templates/formtastic.rb
+++ b/lib/generators/templates/formtastic.rb
@@ -18,7 +18,6 @@
 # Formtastic::FormBuilder.default_text_area_width = 50
 
 # Should all fields be considered "required" by default?
-# Rails 2 only, ignored by Rails 3 because it will never fall back to this default.
 # Defaults to true.
 # Formtastic::FormBuilder.all_fields_required_by_default = true
 
@@ -67,7 +66,7 @@
 # Specifies if labels/hints for input fields automatically be looked up using I18n.
 # Default value: true. Overridden for specific fields by setting value to true,
 # i.e. :label => true, or :hint => true (or opposite depending on initialized value)
-# Formtastic::FormBuilder.i18n_lookups_by_default = false
+# Formtastic::FormBuilder_lookups_by_default = false
 
 # You can add custom inputs or override parts of Formtastic by subclassing Formtastic::FormBuilder and
 # specifying that class here.  Defaults to Formtastic::FormBuilder.

From 382b28319b7204a71646372cd71a54cce3352870 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 1 Jun 2011 07:51:57 +1000
Subject: [PATCH 813/992] tweaking install instructions, not that anyone really
 sees them any more with bundler

---
 formtastic.gemspec | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index be73a3e3b..28d6c9167 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -17,8 +17,8 @@ Gem::Specification.new do |s|
   ========================================================================
   Thanks for installing Formtastic!
   ------------------------------------------------------------------------
-  You can now (optionally) run the generator to copy some stylesheets and
-  a config initializer into your application:
+  You can now (optionally) run the generator to copy a config initializer 
+  (and some stylesheets, in Rails 3.0.x) into your application:
     rails generate formtastic:install
 
   To generate some semantic form markup for your existing models, just run:
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
 
   Find out more and get involved:
     http://github.com/justinfrench/formtastic
+    http://rdoc.info/github/justinfrench/formtastic/master/frames
     http://groups.google.com.au/group/formtastic
     http://twitter.com/formtastic
   ========================================================================

From 43153bcf550d587ad0f7de89f119611f52c7834b Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Wed, 1 Jun 2011 10:55:21 +0530
Subject: [PATCH 814/992] Fixes #584 . Retry if value received from i18n is not
 a string

---
 lib/formtastic/localized_string.rb | 14 +++++++-------
 spec/i18n_spec.rb                  |  9 +++++++++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/lib/formtastic/localized_string.rb b/lib/formtastic/localized_string.rb
index 6bab5bc7f..9b89910f2 100644
--- a/lib/formtastic/localized_string.rb
+++ b/lib/formtastic/localized_string.rb
@@ -35,7 +35,7 @@ def localized_string(key, value, type, options = {}) #:nodoc:
 
         if use_i18n
           model_name, nested_model_name  = normalize_model_name(self.model_name.underscore)
-          
+
           action_name = template.params[:action].to_s rescue ''
           attribute_name = key.to_s
 
@@ -57,14 +57,14 @@ def localized_string(key, value, type, options = {}) #:nodoc:
           default_key = defaults.shift
           i18n_value = Formtastic::I18n.t(default_key,
             options.merge(:default => defaults, :scope => type.to_s.pluralize.to_sym))
+          i18n_value = i18n_value.is_a?(::String) ? i18n_value : nil
           if i18n_value.blank? && type == :label
             # This is effectively what Rails label helper does for i18n lookup
             options[:scope] = [:helpers, type]
             options[:default] = defaults
             i18n_value = ::I18n.t(default_key, options)
           end
-          i18n_value = escape_html_entities(i18n_value) if i18n_value.is_a?(::String)
-          i18n_value.blank? ? nil : i18n_value
+          (i18n_value.is_a?(::String) && i18n_value.present?) ? escape_html_entities(i18n_value) : nil
         end
       end
     end
@@ -88,18 +88,18 @@ def normalize_model_name(name)
         [name]
       end
     end
-    
+
     def escape_html_entities(string) #:nodoc:
-      if (respond_to?(:builder) && builder.escape_html_entities_in_hints_and_labels) || 
+      if (respond_to?(:builder) && builder.escape_html_entities_in_hints_and_labels) ||
          (self.respond_to?(:escape_html_entities_in_hints_and_labels) && escape_html_entities_in_hints_and_labels)
         string = template.escape_once(string) unless string.respond_to?(:html_safe?) && string.html_safe? == true # Acceppt html_safe flag as indicator to skip escaping
       end
       string
     end
-    
+
     def i18n_lookups_by_default
       respond_to?(:builder) ? builder.i18n_lookups_by_default : i18n_lookups_by_default
     end
-    
+
   end
 end
\ No newline at end of file
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index bfb3a7c61..1179c2b5b 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -130,6 +130,15 @@
       end
     end
 
+    it "should be able to translate when method name is same as model" do
+      with_config :i18n_lookups_by_default, true do
+        concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          concat(builder.input(:author))
+        end)
+        output_buffer.should have_tag("form label", /Author/)
+      end
+    end
+
     it 'should be able to translate nested objects with nested translations' do
       with_config :i18n_lookups_by_default, true do
         concat(semantic_form_for(@new_post) do |builder|

From 2787d87138957e3c7cf82ba162b9ededb143955d Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 1 Jun 2011 16:58:17 +1000
Subject: [PATCH 815/992] Deferring garbage collection cuts the time to run the
 test suite down (#547).

Just over a third of the time it used to take.

    # before
    Finished in 178.55 seconds
    1148 examples, 0 failures

    #after
    Finished in 66.23 seconds
    1148 examples, 0 failures
---
 spec/spec_helper.rb                         | 10 ++++++++++
 spec/support/deferred_garbage_collection.rb | 21 +++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 spec/support/deferred_garbage_collection.rb

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c7192a9de..b1a0f7258 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -349,3 +349,13 @@ def with_config(config_method_name, value, &block)
 end
 
 ::ActiveSupport::Deprecation.silenced = false
+
+
+Rspec.configure do |config|
+  config.before(:all) do
+    DeferredGarbageCollection.start
+  end
+  config.after(:all) do
+    DeferredGarbageCollection.reconsider
+  end
+end
\ No newline at end of file
diff --git a/spec/support/deferred_garbage_collection.rb b/spec/support/deferred_garbage_collection.rb
new file mode 100644
index 000000000..173754daa
--- /dev/null
+++ b/spec/support/deferred_garbage_collection.rb
@@ -0,0 +1,21 @@
+# Taken from http://makandra.com/notes/950-speed-up-rspec-by-deferring-garbage-collection
+class DeferredGarbageCollection
+
+  DEFERRED_GC_THRESHOLD = (ENV['DEFER_GC'] || 10.0).to_f
+
+  @@last_gc_run = Time.now
+
+  def self.start
+    GC.disable if DEFERRED_GC_THRESHOLD > 0
+  end
+
+  def self.reconsider
+    if DEFERRED_GC_THRESHOLD > 0 && Time.now - @@last_gc_run >= DEFERRED_GC_THRESHOLD
+      GC.enable
+      GC.start
+      GC.disable
+      @@last_gc_run = Time.now
+    end
+  end
+
+end
\ No newline at end of file

From d57c05486ede6c3220f909636d03557709ee7b5f Mon Sep 17 00:00:00 2001
From: Robin Stocker <robin@nibor.org>
Date: Thu, 2 Jun 2011 18:39:52 +0200
Subject: [PATCH 816/992] README: Fix mention of inexistent StringTextInput

---
 README.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.textile b/README.textile
index 959533878..83b901316 100644
--- a/README.textile
+++ b/README.textile
@@ -582,7 +582,7 @@ To create your own new types of inputs based on existing inputs, the process is
 
 <pre>
   # f.input(:body, :as => :flexible_text)
-  class FlexibleTextInput < Formtastic::Inputs::StringTextInput
+  class FlexibleTextInput < Formtastic::Inputs::StringInput
     def input_html_options
       super.merge(:class => "flexible-text-area")
     end

From 34d6e16b34e87fd437f75b9525ce27510def1f04 Mon Sep 17 00:00:00 2001
From: Robin Stocker <robin@nibor.org>
Date: Thu, 2 Jun 2011 18:43:58 +0200
Subject: [PATCH 817/992] README: Fix custom input example about DatePicker

---
 README.textile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.textile b/README.textile
index 83b901316..61c9c0e86 100644
--- a/README.textile
+++ b/README.textile
@@ -593,9 +593,10 @@ To create your own new types of inputs from scratch:
 
 <pre>
   # f.input(:created_at, :as => :date_picker)
-  class DatePicker
-    def input_html_options
-      super.merge(:class => "date-picker")
+  class DatePickerInput
+    include Formtastic::Inputs::Base
+    def to_html
+      # ...
     end
   end
 </pre>

From 7f01af4b8d06df5dcc450b1bd6a4d57eb100a95f Mon Sep 17 00:00:00 2001
From: Kouhei Sutou <kou@clear-code.com>
Date: Fri, 3 Jun 2011 21:37:00 +0900
Subject: [PATCH 818/992] switch to gemspec generated by bundler. #535 #548

---
 Rakefile                  |  3 +++
 formtastic.gemspec        | 32 +++++++++++++++++++-------------
 lib/formtastic/version.rb |  3 +++
 3 files changed, 25 insertions(+), 13 deletions(-)
 create mode 100644 lib/formtastic/version.rb

diff --git a/Rakefile b/Rakefile
index 65c15bfa8..81bc17b16 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,6 +4,9 @@ require 'rake'
 require 'rake/rdoctask'
 require 'rspec/core/rake_task'
 require 'tasks/verify_rcov'
+require 'bundler'
+
+Bundler::GemHelper.install_tasks
 
 desc 'Default: run unit specs.'
 task :default => :spec_and_verify_coverage
diff --git a/formtastic.gemspec b/formtastic.gemspec
index 28d6c9167..d9fc44d63 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -1,18 +1,23 @@
 # encoding: utf-8
+$:.push File.expand_path("../lib", __FILE__)
+require "formtastic/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{formtastic}
-  s.version = "2.0.0.pre"
-  s.date = %q{2011-01-07}
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Justin French"]
+  s.name        = %q{formtastic}
+  s.version     = Formtastic::VERSION
+  s.date        = %q{2011-01-07}
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = [%q{Justin French}]
+  s.email       = [%q{justin@indent.com.au}]
+  s.homepage    = %q{http://github.com/justinfrench/formtastic/tree/master}
+  s.summary     = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.description = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
-  s.summary = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
-  s.email = %q{justin@indent.com.au}
-  s.extra_rdoc_files = ["README.textile"]
-  s.files = Dir.glob("{lib,spec}/**/*") + %w(MIT-LICENSE README.textile)
-  s.homepage = %q{http://github.com/justinfrench/formtastic/tree/master}
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
   s.post_install_message = %q{
   ========================================================================
   Thanks for installing Formtastic!
@@ -32,7 +37,9 @@ Gem::Specification.new do |s|
   ========================================================================
   }
   s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
+  s.extra_rdoc_files = ["README.textile"]
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.rubygems_version = %q{1.3.6}
 
   s.add_dependency(%q<rails>, ["~> 3.0"])
@@ -44,5 +51,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<yard>, ["~> 0.6"])
   s.add_development_dependency(%q<rcov>, ["~> 0.9.9"])
   s.add_development_dependency(%q<colored>)
-
 end
diff --git a/lib/formtastic/version.rb b/lib/formtastic/version.rb
new file mode 100644
index 000000000..f1baaabc6
--- /dev/null
+++ b/lib/formtastic/version.rb
@@ -0,0 +1,3 @@
+module Formtastic
+  VERSION = "2.0.0.pre"
+end

From 6d9cae1219a764ffe733f18fb4000ec030cde0f9 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sun, 5 Jun 2011 12:24:29 -0300
Subject: [PATCH 819/992] Removed formtastic:form generator and changed
 formtastic:install generator to override scaffold generator (closes #461)

---
 CHANGELOG                                     |  2 +
 formtastic.gemspec                            |  3 -
 .../formtastic/form/form_generator.rb         | 95 -------------------
 .../formtastic/install/install_generator.rb   | 17 ++--
 lib/generators/templates/_form.html.erb       | 12 ++-
 lib/generators/templates/_form.html.haml      |  9 +-
 6 files changed, 27 insertions(+), 111 deletions(-)
 delete mode 100644 lib/generators/formtastic/form/form_generator.rb

diff --git a/CHANGELOG b/CHANGELOG
index e9d1a7aa9..bd59a7749 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -35,6 +35,8 @@
 * Added non-standard zoom:1; to clearfixes to support IE better
 * Changed CSS coding style to multi-line so we can annotate the styles better
 * Fixed that overly specific CSS rules weren't applied to nested form elements properly
+* Removed formtastic:form generator and changed formtastic:install generator
+to override scaffold generator
 
 1.2.4.beta (unreleased)
 
diff --git a/formtastic.gemspec b/formtastic.gemspec
index d9fc44d63..93512470a 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -26,9 +26,6 @@ Gem::Specification.new do |s|
   (and some stylesheets, in Rails 3.0.x) into your application:
     rails generate formtastic:install
 
-  To generate some semantic form markup for your existing models, just run:
-    rails generate formtastic:form MODEL_NAME
-
   Find out more and get involved:
     http://github.com/justinfrench/formtastic
     http://rdoc.info/github/justinfrench/formtastic/master/frames
diff --git a/lib/generators/formtastic/form/form_generator.rb b/lib/generators/formtastic/form/form_generator.rb
deleted file mode 100644
index 3962858d9..000000000
--- a/lib/generators/formtastic/form/form_generator.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-# encoding: utf-8
-module Formtastic
-  # Generates a Formtastic form partial based on an existing model. It will not overwrite existing
-  # files without confirmation.
-  #
-  # @example
-  #   $ rails generate formtastic:form Post
-  # @example Copy the partial code to the pasteboard rather than generating a partial
-  #   $ rails generate formtastic:form Post --copy
-  # @example Return HAML output instead of ERB
-  #   $ rails generate formtastic:form Post --haml
-  # @example Generate a form for specific model attributes
-  #   $ rails generate formtastic:form Post title:string body:text
-  # @example Generate a form for a specific controller
-  #   $ rails generate formtastic:form Post --controller admin/posts
-  class FormGenerator < Rails::Generators::NamedBase
-    desc "Generates a Formtastic form partial based on an existing model."
-
-    argument :name, :type => :string, :required => true, :banner => 'MyExistingModel'
-    argument :attributes, :type => :array, :default => [], :banner => 'attribute attribute'
-
-    class_option :haml, :type => :boolean, :default => false, :group => :formtastic,
-                 :desc => "Generate HAML instead of ERB"
-
-    class_option :partial, :type => :boolean, :default => true, :group => :formtastic,
-                 :desc => 'Generate a form partial in the model views path (eg `posts/_form.html.erb`)'
-
-    class_option :copy, :type => :boolean, :default => false, :group => :formtastic,
-                 :desc => 'Copy the generated code the clipboard instead of generating a partial file."'
-
-    class_option :controller, :type => :string, :default => false, :group => :formtastic,
-                 :desc => 'Generate for custom controller/view path - in case model and controller namespace is different, i.e. "admin/posts"'
-
-    source_root File.expand_path('../../../templates', __FILE__)
-
-    def create_or_show
-      @attributes = reflected_attributes if @attributes.empty?
-      
-      if options[:copy]
-        template = File.read("#{self.class.source_root}/_form.html.#{template_type}")
-        erb = ERB.new(template, nil, '-')
-        generated_code = erb.result(binding).strip rescue nil
-        puts "The following code has been to the clipboard, just paste it in your views:" if save_to_clipboard(generated_code)
-        puts generated_code || "Error: Nothing generated. Does the model exist?"
-      else
-        empty_directory "app/views/#{controller_path}"
-        template "_form.html.#{template_type}", "app/views/#{controller_path}/_form.html.#{template_type}"
-      end
-    end
-
-    protected
-
-    def template_type
-      @template_type ||= options[:haml] ? :haml : :erb
-    end
-
-    def controller_path
-      @controller_path ||= if options[:controller]
-        options[:controller].underscore
-      else
-        name.underscore.pluralize
-      end
-    end
-
-    def reflected_attributes
-      columns = model.content_columns.map{|column| column.name}
-      columns += model.reflect_on_all_associations.map{|association| association.name.to_s}
-      columns -= %w(created_at updated_at)
-    end
-
-    def model
-      @model ||= name.camelize.constantize
-    end
-
-    def save_to_clipboard(data)
-      return unless data
-
-      begin
-        case RUBY_PLATFORM
-        when /win32/
-          require 'win32/clipboard'
-          ::Win32::Clipboard.data = data
-        when /darwin/ # mac
-          `echo "#{data}" | pbcopy`
-        else # linux/unix
-          `echo "#{data}" | xsel --clipboard` || `echo "#{data}" | xclip`
-        end
-      rescue LoadError
-        false
-      else
-        true
-      end
-    end
-  end
-end
diff --git a/lib/generators/formtastic/install/install_generator.rb b/lib/generators/formtastic/install/install_generator.rb
index bfb7c0f64..c8b06a01f 100644
--- a/lib/generators/formtastic/install/install_generator.rb
+++ b/lib/generators/formtastic/install/install_generator.rb
@@ -9,22 +9,27 @@ module Formtastic
   #
   # @todo Test with Rails 3.0
   class InstallGenerator < Rails::Generators::Base
-    
     source_root File.expand_path('../../../templates', __FILE__)
-    
+    class_option :template_engine
+
     if ::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR >= 1
-      # Rails 3.1.x has the asset pipeline, no need to copy CSS files any more
+      # Rails 3.1 has the asset pipeline, no need to copy CSS files any more
       desc "Copies a config initializer to config/initializers/formtastic.rb"
       def copy_files
-        template 'formtastic.rb', 'config/initializers/formtastic.rb'
+        copy_file 'formtastic.rb', 'config/initializers/formtastic.rb'
       end
     else
       # Rails 3.0 doesn't have an asset pipeline, so we copy in CSS too
       desc "Copies formtastic.css to public/stylesheets/ and a config initializer to config/initializers/formtastic.rb"
       def copy_files
-        template 'formtastic.rb', 'config/initializers/formtastic.rb'
-        template '../../../app/assets/stylesheets/formtastic.css', 'public/stylesheets/formtastic.css'
+        copy_file 'formtastic.rb', 'config/initializers/formtastic.rb'
+        copy_file '../../../app/assets/stylesheets/formtastic.css', 'public/stylesheets/formtastic.css'
       end
     end
+
+    def copy_scaffold_template
+      engine = options[:template_engine]
+      copy_file "_form.html.#{engine}", "lib/templates/#{engine}/scaffold/_form.html.#{engine}"
+    end
   end
 end
diff --git a/lib/generators/templates/_form.html.erb b/lib/generators/templates/_form.html.erb
index a03c83555..bb8fc9b19 100644
--- a/lib/generators/templates/_form.html.erb
+++ b/lib/generators/templates/_form.html.erb
@@ -1,7 +1,11 @@
-<%%= semantic_form_for @<%= name.underscore %> do |f| %>
+<%%= semantic_form_for @<%= singular_name %> do |f| %>
   <%%= f.inputs do %>
-  <% @attributes.each do |attribute| -%>
-    <%%= f.input :<%= attribute %> %>
-  <% end -%>
+  <%- attributes.each do |attribute| -%>
+    <%%= f.input :<%= attribute.name %> %>
+  <%- end -%>
+  <%% end %>
+
+  <%%= f.buttons do %>
+    <%%= f.commit_button %>
   <%% end %>
 <%% end %>
diff --git a/lib/generators/templates/_form.html.haml b/lib/generators/templates/_form.html.haml
index ff173c5cd..5afb5a099 100644
--- a/lib/generators/templates/_form.html.haml
+++ b/lib/generators/templates/_form.html.haml
@@ -1,5 +1,8 @@
-= semantic_form_for @<%= name.underscore %> do |f|
+= semantic_form_for @<%= singular_name %> do |f|
   = f.inputs do
-  <% @attributes.each do |attribute| -%>
-    = f.input :<%= attribute %>
+  <% attributes.each do |attribute| -%>
+    = f.input :<%= attribute.name %>
   <% end -%>
+
+  = f.buttons do
+    = f.commit_button

From a1d214926f23f351d92e49b40397f0f16ce87173 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 2 Jun 2011 17:02:12 +1000
Subject: [PATCH 820/992] merge two .input styles into one

---
 app/assets/stylesheets/formtastic.css | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/formtastic.css b/app/assets/stylesheets/formtastic.css
index 09e774f67..8ed8ad4f3 100644
--- a/app/assets/stylesheets/formtastic.css
+++ b/app/assets/stylesheets/formtastic.css
@@ -100,15 +100,12 @@ This stylesheet forms part of the Formtastic Rails Plugin
 }
 
 .formtastic .input {
+  overflow:hidden; zoom:1; /* clear containing floats */
   padding:0.5em 0; /* padding and negative margin juggling is for Firefox */
   margin-top:-0.5em;
   margin-bottom:1em;
 }
 
-.formtastic .input {
-  overflow:hidden; zoom:1; /* clear containing floats */
-}
-
 
 /* LABELS
 --------------------------------------------------------------------------------------------------*/

From 6540d3a833c3d41e6106d01d9be171dd93cfbb8d Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 2 Jun 2011 17:04:37 +1000
Subject: [PATCH 821/992] fix samples/basic_inputs.html reference to stylesheet
 which moved to app/assets

---
 sample/basic_inputs.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sample/basic_inputs.html b/sample/basic_inputs.html
index 20b21a944..823e181aa 100644
--- a/sample/basic_inputs.html
+++ b/sample/basic_inputs.html
@@ -4,7 +4,7 @@
     <meta content="noindex,nofollow" name="robots">
     <meta charset="utf-8">
     <title>Formtastic</title>
-    <link href="../lib/generators/templates/formtastic.css" rel="stylesheet" type="text/css" />
+    <link href="../app/assets/stylesheets/formtastic.css" rel="stylesheet" type="text/css" />
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.0/jquery.min.js" type="text/javascript"></script>
     <style>
       body {

From a1fdf124d570d4c549f9703166ed8ac9d8728476 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 2 Jun 2011 17:05:00 +1000
Subject: [PATCH 822/992] we don't need jQuery at the moment in the samples

---
 sample/basic_inputs.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sample/basic_inputs.html b/sample/basic_inputs.html
index 823e181aa..7bbabb555 100644
--- a/sample/basic_inputs.html
+++ b/sample/basic_inputs.html
@@ -5,7 +5,6 @@
     <meta charset="utf-8">
     <title>Formtastic</title>
     <link href="../app/assets/stylesheets/formtastic.css" rel="stylesheet" type="text/css" />
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.0/jquery.min.js" type="text/javascript"></script>
     <style>
       body {
         font-family: helvetica, arial;

From 250888025824427bc90343139434efe656209fb5 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 2 Jun 2011 17:15:08 +1000
Subject: [PATCH 823/992] Refactor labels CSS, add classes.

Add .label class to all labels intended to be displayed on the left of an input, refactor CSS.

* legends are already marked as .label
* add .label to all labels intended to be displayed on the left of an input as well
* .label lets us address any tag with that class, and style them together
* lets us merge duplicated styles going forward
* exposed a bug where boolean label_html_options wasn't calling super to get the default stuff in Labelling module (fixed)
---
 app/assets/stylesheets/formtastic.css   | 18 +++++-------------
 lib/formtastic/inputs/base/labelling.rb |  2 ++
 lib/formtastic/inputs/boolean_input.rb  |  9 +++++++--
 sample/basic_inputs.html                | 24 ++++++++++++------------
 spec/inputs/boolean_input_spec.rb       |  5 ++++-
 spec/support/custom_macros.rb           |  6 ++++++
 6 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/app/assets/stylesheets/formtastic.css b/app/assets/stylesheets/formtastic.css
index 8ed8ad4f3..abfc97008 100644
--- a/app/assets/stylesheets/formtastic.css
+++ b/app/assets/stylesheets/formtastic.css
@@ -109,7 +109,7 @@ This stylesheet forms part of the Formtastic Rails Plugin
 
 /* LABELS
 --------------------------------------------------------------------------------------------------*/
-.formtastic .input label {
+.formtastic .input .label {
   display:block;
   width:25%;
   float:left;
@@ -123,17 +123,13 @@ This stylesheet forms part of the Formtastic Rails Plugin
   position:relative;
 }
 
-.formtastic .choices legend {
+.formtastic .choices .label {
   position:absolute;
   width:95%;
   left:0px;
 }
 
-.formtastic .choices legend span {
-  position:absolute;
-}
-
-.formtastic .choices legend.label label {
+.formtastic .choices .label label {
   position:absolute;
 }
 
@@ -251,17 +247,13 @@ This stylesheet forms part of the Formtastic Rails Plugin
   position:relative;
 }
 
-.formtastic .fragments legend {
+.formtastic .fragments .label {
   position:absolute;
   width:95%;
   left:0px;
 }
 
-.formtastic .fragments legend span {
-  position:absolute;
-}
-
-.formtastic .fragments legend.label label {
+.formtastic .fragments .label label {
   position:absolute;
 }
 
diff --git a/lib/formtastic/inputs/base/labelling.rb b/lib/formtastic/inputs/base/labelling.rb
index adc7ce999..ceb571137 100644
--- a/lib/formtastic/inputs/base/labelling.rb
+++ b/lib/formtastic/inputs/base/labelling.rb
@@ -13,6 +13,8 @@ def label_html_options
           # opts = options_for_label(options) # TODO
           opts = {}
           opts[:for] ||= input_html_options[:id]
+          opts[:class] = [opts[:class]]
+          opts[:class] << 'label'
           
           opts
         end
diff --git a/lib/formtastic/inputs/boolean_input.rb b/lib/formtastic/inputs/boolean_input.rb
index 5ae4c2613..012aa757f 100644
--- a/lib/formtastic/inputs/boolean_input.rb
+++ b/lib/formtastic/inputs/boolean_input.rb
@@ -52,9 +52,14 @@ def label_with_nested_checkbox
       end
 
       def label_html_options
+        prev = super
+        prev[:class] = prev[:class] - ['label']
+        
         input_html_options.merge(
-          :id => nil,
-          :for => input_html_options[:id]
+          prev.merge(
+            :id => nil,
+            :for => input_html_options[:id]
+          )
         )
       end
 
diff --git a/sample/basic_inputs.html b/sample/basic_inputs.html
index 7bbabb555..751a6e17e 100644
--- a/sample/basic_inputs.html
+++ b/sample/basic_inputs.html
@@ -20,55 +20,55 @@ <h1>Formtastic</h1>
     <fieldset class="inputs">
       <ol>
         <li class="input string stringish optional" id="gem_summary_input">
-          <label for="gem_summary">Summary</label>
+          <label class="label" for="gem_summary">Summary</label>
           <input id="gem_summary" name="gem[summary]" type="text" value="A Rails form builder plugin/gem with semantically rich and accessible markup" maxlength="255">
         </li>
 
         <li class="input text optional" id="gem_description_input">
-          <label for="gem_description">Description</label>
+          <label class="label" for="gem_description">Description</label>
           <textarea id="gem_description" rows="5">A Rails form builder plugin/gem with semantically rich and accessible markup</textarea>
         </li>
 
         <li class="input url stringish optional" id="gem_url_input">
-          <label for="gem_url">URL</label>
+          <label class="label" for="gem_url">URL</label>
           <input id="gem_url" name="gem[url]" type="url">
           <p class="inline-hints">Example: https://github.com/justinfrench/formtastic</p>
         </li>
 
         <li class="input password stringish required" id="gem_password_input">
-          <label for="gem_password">Password<abbr title="required">*</abbr></label>
+          <label class="label" for="gem_password">Password<abbr title="required">*</abbr></label>
           <input id="gem_password" name="gem[password]" type="password">
           <p class="inline-errors">can't be blank</p>
         </li>
 
         <li class="input password stringish required" id="gem_password_input">
-          <label for="gem_password_confirmation">Password confirmation<abbr title="required">*</abbr></label>
+          <label class="label" for="gem_password_confirmation">Password confirmation<abbr title="required">*</abbr></label>
           <input id="gem_password_confirmation" name="gem[password_confirmation]" type="password">
           <p class="inline-errors">can't be blank</p>
         </li>
 
         <li class="input numeric stringish optional" id="gem_downloads_input">
-          <label for="gem_downloads">Downloads</label>
+          <label class="label" for="gem_downloads">Downloads</label>
           <input id="gem_downloads" name="gem[downloads]" type="numeric" value="209,354">
         </li>
 
         <li class="input file optional" id="gem_file_input">
-          <label for="gem_file">File</label>
+          <label class="label" for="gem_file">File</label>
           <input id="gem_file" name="gem[file]" type="file" value="value">
         </li>
 
         <li class="input email stringish optional" id="gem_email_input">
-          <label for="gem_email">Email</label>
+          <label class="label" for="gem_email">Email</label>
           <input id="gem_email" name="gem[email]" type="email">
         </li>
 
         <li class="input phone stringish optional" id="gem_phone_input">
-          <label for="gem_phone">Phone</label>
+          <label class="label" for="gem_phone">Phone</label>
           <input id="gem_phone" name="gem[phone]" type="phone">
         </li>
 
         <li class="input search stringish optional" id="gem_search_input">
-          <label for="gem_search">Search</label>
+          <label class="label" for="gem_search">Search</label>
           <input id="gem_search" name="gem[search]" type="search">
         </li>
 
@@ -99,7 +99,7 @@ <h1>Formtastic</h1>
         </li>
 
         <li class="input string stringish optional autofocus" id="gem_autofocus_input">
-          <label for="gem_autofocus">Autofocus</label>
+          <label class="label" for="gem_autofocus">Autofocus</label>
           <input id="gem_autofocus" name="gem[autofocus]" type="text" value="The focus is set to this field" autofocus="autofocus">
         </li>
 
@@ -111,7 +111,7 @@ <h1>Formtastic</h1>
         </li>
         
         <li class="input select optional" id="gem_awesomeness_input">
-          <label for="gem_awesomeness">Select</label>
+          <label class="label" for="gem_awesomeness">Select</label>
           <select id="gem_awesomeness" name="gem[awesomeness]">
             <option value="5">First choice</option>
             <option value="4">Second choice</option>
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index 615fce12a..3ca2c2e81 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -20,6 +20,9 @@
   it_should_apply_error_logic_for_input_type(:boolean)
 
   it 'should generate a label containing the input' do
+    output_buffer.should_not have_tag('label.label')
+    
+    
     output_buffer.should have_tag('form li label', :count => 1)
     output_buffer.should have_tag('form li label[@for="post_allow_comments"]')
     output_buffer.should have_tag('form li label', /Allow comments/)
@@ -174,7 +177,7 @@
     end
 
     it_should_have_input_wrapper_with_id("context2_post_allow_comments_input")
-    it_should_have_label_for("context2_post_allow_comments")
+    it_should_have_an_inline_label_for("context2_post_allow_comments")
 
   end
 
diff --git a/spec/support/custom_macros.rb b/spec/support/custom_macros.rb
index b80f0e5af..5aef0a979 100644
--- a/spec/support/custom_macros.rb
+++ b/spec/support/custom_macros.rb
@@ -51,6 +51,12 @@ def it_should_have_label_with_text(string_or_regex)
     end
 
     def it_should_have_label_for(element_id)
+      it "should have a label for ##{element_id}" do
+        output_buffer.should have_tag("form li label.label[@for='#{element_id}']")
+      end
+    end
+    
+    def it_should_have_an_inline_label_for(element_id)
       it "should have a label for ##{element_id}" do
         output_buffer.should have_tag("form li label[@for='#{element_id}']")
       end

From 70f9a89443cd9699134275c232913a07864b3be2 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 2 Jun 2011 17:33:11 +1000
Subject: [PATCH 824/992] merge duplicated .label styles together

---
 app/assets/stylesheets/formtastic.css | 29 +++++++++------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/app/assets/stylesheets/formtastic.css b/app/assets/stylesheets/formtastic.css
index abfc97008..b9aa24cc3 100644
--- a/app/assets/stylesheets/formtastic.css
+++ b/app/assets/stylesheets/formtastic.css
@@ -107,7 +107,7 @@ This stylesheet forms part of the Formtastic Rails Plugin
 }
 
 
-/* LABELS
+/* LEFT ALIGNED LABELS
 --------------------------------------------------------------------------------------------------*/
 .formtastic .input .label {
   display:block;
@@ -116,23 +116,24 @@ This stylesheet forms part of the Formtastic Rails Plugin
   padding-top:.2em;
 }
 
-
-/* NESTED FIELDSETS AND LEGENDS (radio, check boxes and date/time inputs use nested fieldsets)
---------------------------------------------------------------------------------------------------*/
-.formtastic .choices {
-  position:relative;
-}
-
+.formtastic .fragments .label,
 .formtastic .choices .label {
   position:absolute;
   width:95%;
   left:0px;
 }
 
+.formtastic .fragments .label label,
 .formtastic .choices .label label {
   position:absolute;
 }
 
+/* NESTED FIELDSETS AND LEGENDS (radio, check boxes and date/time inputs use nested fieldsets)
+--------------------------------------------------------------------------------------------------*/
+.formtastic .choices {
+  position:relative;
+}
+
 .formtastic .choices-group {
   float:left;
   width:74%;
@@ -205,7 +206,7 @@ This stylesheet forms part of the Formtastic Rails Plugin
 }
 
 
-/* BOOLEAN OVERRIDES
+/* BOOLEAN LABELS
 --------------------------------------------------------------------------------------------------*/
 .formtastic .boolean label {
   padding-left:25%;
@@ -247,16 +248,6 @@ This stylesheet forms part of the Formtastic Rails Plugin
   position:relative;
 }
 
-.formtastic .fragments .label {
-  position:absolute;
-  width:95%;
-  left:0px;
-}
-
-.formtastic .fragments .label label {
-  position:absolute;
-}
-
 .formtastic .fragments-group {
   float:left;
   width:74%;

From 9a2714e94fe78ca3c3e6598de0c69dc5551f1f34 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 2 Jun 2011 20:22:54 +1000
Subject: [PATCH 825/992] fix for .boolean labels in IE8

---
 app/assets/stylesheets/formtastic.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/formtastic.css b/app/assets/stylesheets/formtastic.css
index b9aa24cc3..1d8b67f37 100644
--- a/app/assets/stylesheets/formtastic.css
+++ b/app/assets/stylesheets/formtastic.css
@@ -210,7 +210,7 @@ This stylesheet forms part of the Formtastic Rails Plugin
 --------------------------------------------------------------------------------------------------*/
 .formtastic .boolean label {
   padding-left:25%;
-  width:auto;
+  display:block;
 }
 
 

From 4ef751207a0a4698e8cf63fd8f624406f227fea6 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 3 Jun 2011 06:39:46 +1000
Subject: [PATCH 826/992] quick rack app to serve samples, to make testing over
 windows VMs much much easier

---
 sample/basic_inputs.html |  2 +-
 sample/config.ru         | 69 ++++++++++++++++++++++++++++++++++++++++
 sample/index.html        | 14 ++++++++
 3 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 sample/config.ru
 create mode 100644 sample/index.html

diff --git a/sample/basic_inputs.html b/sample/basic_inputs.html
index 751a6e17e..5fb18d0d4 100644
--- a/sample/basic_inputs.html
+++ b/sample/basic_inputs.html
@@ -4,7 +4,7 @@
     <meta content="noindex,nofollow" name="robots">
     <meta charset="utf-8">
     <title>Formtastic</title>
-    <link href="../app/assets/stylesheets/formtastic.css" rel="stylesheet" type="text/css" />
+    <link href="/formtastic.css" rel="stylesheet" type="text/css" />
     <style>
       body {
         font-family: helvetica, arial;
diff --git a/sample/config.ru b/sample/config.ru
new file mode 100644
index 000000000..c25acd2e5
--- /dev/null
+++ b/sample/config.ru
@@ -0,0 +1,69 @@
+module Rack
+  module Formtastic
+    class Samples
+      def initialize(app)
+        @app = app        
+      end
+      
+      def call(env)
+        @status, @headers, @body = @app.call(env)
+        @env = env
+  
+        @body = '' if favicon?
+        @body = static_file if !favicon? && static_file?
+        @body = stylesheet if stylesheet?
+        @headers ||= {}
+        @headers['Content-Type'] = mime(extension)
+        [@status, @headers, @body]
+      end
+      
+      def static_file?
+        !stylesheet?
+      end
+      
+      def stylesheet?
+        @env["PATH_INFO"] =~ /\.(css)/
+      end
+      
+      def favicon?
+        @env["PATH_INFO"] =~ /favicon.ico$/
+      end
+      
+      def extension
+        @env["PATH_INFO"].split(".").last
+      end
+      
+      def mime(extension)
+        mimes[extension] || mimes['html']
+      end
+      
+      def mimes
+        {
+          'ico' => 'image/x-icon',
+          'html' => 'text/html',
+          'css' => 'text/css',
+          'js' => 'text/javascript'
+        }
+      end
+      
+      def static_file
+        ::File.open(file_path)
+      end
+      
+      def stylesheet
+        ::File.open(::File.join("../app/assets/stylesheets", file_path))
+      end
+      
+      def file_path
+        @env["PATH_INFO"].gsub(/^\//, '').gsub(/^$/, 'index.html')
+      end
+      
+    end
+  end
+end
+
+use Rack::ContentLength
+use Rack::Formtastic::Samples
+
+app = lambda { |env| [200, @headers, @body] }
+run app
diff --git a/sample/index.html b/sample/index.html
new file mode 100644
index 000000000..5e81b9993
--- /dev/null
+++ b/sample/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>untitled</title>
+</head>
+<body>
+  
+  <ul>
+    <li><a href="/basic_inputs.html">Basic Inputs</li>
+  </ul>
+
+</body>
+</html>

From a42f6c8366135727d39fec44bee56a0f542e88e4 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 3 Jun 2011 06:46:54 +1000
Subject: [PATCH 827/992] added (empty) ie6 and ie7 stylesheets

---
 app/assets/stylesheets/formtastic_ie6.css | 1 +
 app/assets/stylesheets/formtastic_ie7.css | 1 +
 sample/basic_inputs.html                  | 4 ++++
 3 files changed, 6 insertions(+)
 create mode 100644 app/assets/stylesheets/formtastic_ie6.css
 create mode 100644 app/assets/stylesheets/formtastic_ie7.css

diff --git a/app/assets/stylesheets/formtastic_ie6.css b/app/assets/stylesheets/formtastic_ie6.css
new file mode 100644
index 000000000..a07d55d26
--- /dev/null
+++ b/app/assets/stylesheets/formtastic_ie6.css
@@ -0,0 +1 @@
+/* additional stylesheets only for IE6, if you wish to support it */
\ No newline at end of file
diff --git a/app/assets/stylesheets/formtastic_ie7.css b/app/assets/stylesheets/formtastic_ie7.css
new file mode 100644
index 000000000..3cd49de9e
--- /dev/null
+++ b/app/assets/stylesheets/formtastic_ie7.css
@@ -0,0 +1 @@
+/* additional stylesheets only for IE7, if you wish to support it */
\ No newline at end of file
diff --git a/sample/basic_inputs.html b/sample/basic_inputs.html
index 5fb18d0d4..bb4e26516 100644
--- a/sample/basic_inputs.html
+++ b/sample/basic_inputs.html
@@ -4,7 +4,11 @@
     <meta content="noindex,nofollow" name="robots">
     <meta charset="utf-8">
     <title>Formtastic</title>
+
     <link href="/formtastic.css" rel="stylesheet" type="text/css" />
+    <!--[if IE 6]><link href="/formtastic_ie6.css" rel="stylesheet" type="text/css" /><![endif]-->
+    <!--[if IE 7]><link href="/formtastic_ie7.css" rel="stylesheet" type="text/css" /><![endif]-->
+
     <style>
       body {
         font-family: helvetica, arial;

From 3829a49f40f2eb574b2075adbd8d715057c510b6 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 3 Jun 2011 07:42:44 +1000
Subject: [PATCH 828/992] some styles for ie6 and ie7

---
 app/assets/stylesheets/formtastic_ie6.css | 28 ++++++++++++++++++++++-
 app/assets/stylesheets/formtastic_ie7.css | 18 ++++++++++++++-
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/formtastic_ie6.css b/app/assets/stylesheets/formtastic_ie6.css
index a07d55d26..46756de1c 100644
--- a/app/assets/stylesheets/formtastic_ie6.css
+++ b/app/assets/stylesheets/formtastic_ie6.css
@@ -1 +1,27 @@
-/* additional stylesheets only for IE6, if you wish to support it */
\ No newline at end of file
+/* additional stylesheets only for IE6, if you wish to support it */
+
+/* legend labels apper to have a left margin or padding I couldn't get rid of cleanly in main stylesheet */
+.formtastic .input fieldset legend.label {
+  margin-left:-7px;
+}
+
+/* checkbox and radio inputs appear to have a margin around them that I couldn't remove in main stylesheet */
+.formtastic .choice label input,
+.formtastic .boolean label input {
+  position:relative;
+  left:-1px;
+  size:15px;
+  margin-left:0;
+  margin-right:0;
+}
+
+/* inline hints and errors appear a few pixel too far over to the left */
+.formtastic .inline-hints,
+.formtastic .inline-errors {
+  padding-left:3px;
+}
+
+/* fragment (eg year, month, day) appear a few pixels too far to the left*/
+.formtastic .fragment {
+  padding-left:3px;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/formtastic_ie7.css b/app/assets/stylesheets/formtastic_ie7.css
index 3cd49de9e..9f3840f14 100644
--- a/app/assets/stylesheets/formtastic_ie7.css
+++ b/app/assets/stylesheets/formtastic_ie7.css
@@ -1 +1,17 @@
-/* additional stylesheets only for IE7, if you wish to support it */
\ No newline at end of file
+/* additional stylesheets only for IE7, if you wish to support it */
+
+/* legend labels apper to have a left margin or padding I couldn't get rid of cleanly in main stylesheet */
+.formtastic .input fieldset legend.label {
+  margin-left:-7px;
+}
+
+/* checkbox and radio inputs appear to have a margin around them that I couldn't remove in main stylesheet */
+.formtastic .choice label input,
+.formtastic .boolean label input {
+  position:relative;
+  left:-4px;
+  right:-4px;
+  size:15px;
+  margin-left:0;
+  margin-right:0;
+}
\ No newline at end of file

From 28754a29b3b8eb51ad11abc1e5db89ca603869de Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 3 Jun 2011 07:49:30 +1000
Subject: [PATCH 829/992] updated README for asset pipeline with ie6 & 7 css

---
 README.textile | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/README.textile b/README.textile
index 61c9c0e86..d307e676d 100644
--- a/README.textile
+++ b/README.textile
@@ -112,7 +112,7 @@ Optionally, run the generator to copy a stylesheet (Rails 3.0.x only) and a conf
 
 h2. Stylesheets
 
-A proof-of-concept stylesheet is provided which you can include in your layout. Customization is best achieved by overriding these styles in an additional stylesheet.
+A proof-of-concept set of stylesheets are provided which you can include in your layout. Customization is best achieved by overriding these styles in an additional stylesheet.
 
 h3. Stylesheet usage in Rails < 3.1:
 
@@ -123,17 +123,34 @@ h3. Stylesheet usage in Rails < 3.1:
 <pre>
   # app/views/layouts/application.html.erb
   <%= stylesheet_link_tag 'formtastic', 'my_formtastic_changes' %>
+  <!--[if IE 6]><%= stylesheet_link_tag 'formtastic_ie6' %><![endif]-->
+  <!--[if IE 7]><%= stylesheet_link_tag 'formtastic_ie7' %><![endif]-->
 </pre>
 
 h3. Stylesheet usage in Rails >= 3.1:
 
-Rails 3.1 introduces an asset pipeline that allows plugins like Formtastic to serve their own Stylesheets, Javascripts, etc without having to run generators that copy them accross to the host application.
+Rails 3.1 introduces an asset pipeline that allows plugins like Formtastic to serve their own Stylesheets, Javascripts, etc without having to run generators that copy them accross to the host application. Formtastic makes three stylesheets available as an Engine, you just need to require them in your global stylesheets.
 
 <pre>
   # app/assets/stylesheets/application.css
   *= require formtastic
+  *= require my_formtastic_changes
+  
+  # app/assets/stylesheets/ie6.css
+  *= require formtastic_ie6
+  
+  # app/assets/stylesheets/ie7.css
+  *= require formtastic_ie7
 </pre>
 
+<pre>
+  # app/views/layouts/application.html.erb
+  <%= stylesheet_link_tag 'application' %>
+  <!--[if IE 6]><%= stylesheet_link_tag 'ie6' %><![endif]-->
+  <!--[if IE 7]><%= stylesheet_link_tag 'ie7' %><![endif]-->
+</pre>
+
+
 
 h2. Usage
 

From 9be0cd82b9690409d138e1ee208cb5fc426cc073 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 3 Jun 2011 07:51:06 +1000
Subject: [PATCH 830/992] update install generator to include ie6 & 7 css

---
 lib/generators/formtastic/install/install_generator.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/generators/formtastic/install/install_generator.rb b/lib/generators/formtastic/install/install_generator.rb
index c8b06a01f..a9710e799 100644
--- a/lib/generators/formtastic/install/install_generator.rb
+++ b/lib/generators/formtastic/install/install_generator.rb
@@ -20,10 +20,12 @@ def copy_files
       end
     else
       # Rails 3.0 doesn't have an asset pipeline, so we copy in CSS too
-      desc "Copies formtastic.css to public/stylesheets/ and a config initializer to config/initializers/formtastic.rb"
+      desc "Copies some CSS files to public/stylesheets/ and a config initializer to config/initializers/formtastic.rb"
       def copy_files
-        copy_file 'formtastic.rb', 'config/initializers/formtastic.rb'
-        copy_file '../../../app/assets/stylesheets/formtastic.css', 'public/stylesheets/formtastic.css'
+        template 'formtastic.rb', 'config/initializers/formtastic.rb'
+        template '../../../app/assets/stylesheets/formtastic.css',     'public/stylesheets/formtastic.css'
+        template '../../../app/assets/stylesheets/formtastic_ie6.css', 'public/stylesheets/formtastic_ie6.css'
+        template '../../../app/assets/stylesheets/formtastic_ie7.css', 'public/stylesheets/formtastic_ie7.css'
       end
     end
 

From e98f1f8656812a377df55245aea9b3958eb04a69 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 3 Jun 2011 08:11:40 +1000
Subject: [PATCH 831/992] tweak margins around checkboxes and radios

---
 app/assets/stylesheets/formtastic.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/formtastic.css b/app/assets/stylesheets/formtastic.css
index 1d8b67f37..95b49bfc1 100644
--- a/app/assets/stylesheets/formtastic.css
+++ b/app/assets/stylesheets/formtastic.css
@@ -237,7 +237,7 @@ This stylesheet forms part of the Formtastic Rails Plugin
 --------------------------------------------------------------------------------------------------*/
 .formtastic .choice label input,
 .formtastic .boolean label input {
-  margin:0 0.3em 0 0.2em;
+  margin:0 0.3em 0 0.1em;
   line-height:100%;
 }
 

From c6cc4406cff1ffab6d3067e12a5c552a57ba0739 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 7 Jun 2011 06:42:33 +1000
Subject: [PATCH 832/992] change i18n specs to use association names, not
 associations

---
 spec/i18n_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index 1179c2b5b..a1b9056bd 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -142,7 +142,7 @@
     it 'should be able to translate nested objects with nested translations' do
       with_config :i18n_lookups_by_default, true do
         concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.semantic_fields_for(@new_post.author) do |f|
+          concat(builder.semantic_fields_for(:author) do |f|
             concat(f.input(:name))
           end)
         end)
@@ -153,7 +153,7 @@
     it 'should be able to translate nested objects with top level translations' do
       with_config :i18n_lookups_by_default, true do
         concat(semantic_form_for(@new_post) do |builder|
-          builder.semantic_fields_for(@new_post.author) do |f|
+          builder.semantic_fields_for(:author) do |f|
             concat(f.input(:name))
           end
         end)
@@ -184,7 +184,7 @@
     it 'should be able to translate nested helper label as Rails does' do
       with_config :i18n_lookups_by_default, true do
         concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.inputs(:for => @new_post.author) do |f|
+          concat(builder.inputs(:for => :author) do |f|
             concat(f.input(:login))
           end)
         end)

From 90c6e298a7a9fa1dd098571b167f3bda76e71ec3 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 7 Jun 2011 06:49:19 +1000
Subject: [PATCH 833/992] Revert "use real objects in :for and fields_for
 examples"

This reverts commit a3713e84e122187e10de28d11ed1bb1679e9f5f4 to fix #583
---
 README.textile                             | 8 ++++----
 lib/formtastic/helpers/fieldset_wrapper.rb | 4 ++--
 lib/formtastic/helpers/inputs_helper.rb    | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.textile b/README.textile
index d307e676d..310dc6c2c 100644
--- a/README.textile
+++ b/README.textile
@@ -36,7 +36,7 @@ One day, I finally had enough, so I opened up my text editor, and wrote a DSL fo
       <%= form.input :url_title, :required => false %>
     <% end %>
 
-    <%= form.inputs :name => "Author", :for => @article.author do |author_form| %>
+    <%= form.inputs :name => "Author", :for => :author do |author_form| %>
       <%= author_form.input :first_name %>
       <%= author_form.input :last_name %>
     <% end %>
@@ -225,7 +225,7 @@ Nested forms are also supported (don't forget your models need to be setup corre
 <pre>
   <%= semantic_form_for @post do |form| %>
     <%= form.inputs :title, :body, :created_at %>
-    <%= form.semantic_fields_for @post.author do |author| %>
+    <%= form.semantic_fields_for :author do |author| %>
       <%= author.inputs :first_name, :last_name, :name => "Author" %>
     <% end %>
     <%= form.buttons %>
@@ -237,7 +237,7 @@ Or the Formtastic way with the @:for@ option:
 <pre>
   <%= semantic_form_for @post do |form| %>
     <%= form.inputs :title, :body, :created_at %>
-    <%= form.inputs :first_name, :last_name, :for => @post.author, :name => "Author" %>
+    <%= form.inputs :first_name, :last_name, :for => :author, :name => "Author" %>
     <%= form.buttons %>
   <% end %>
 </pre>
@@ -247,7 +247,7 @@ When working in has many association, you can even supply @"%i"@ in your fieldse
 <pre>
   <%= semantic_form_for @post do |form| %>
     <%= form.inputs %>
-    <%= form.inputs :name => 'Category #%i', :for => @post.categories %>
+    <%= form.inputs :name => 'Category #%i', :for => :categories %>
     <%= form.buttons %>
   <% end %>
 </pre>
diff --git a/lib/formtastic/helpers/fieldset_wrapper.rb b/lib/formtastic/helpers/fieldset_wrapper.rb
index 87e497f11..1d5cf35b1 100644
--- a/lib/formtastic/helpers/fieldset_wrapper.rb
+++ b/lib/formtastic/helpers/fieldset_wrapper.rb
@@ -8,11 +8,11 @@ module FieldsetWrapper
       # Generates a fieldset and wraps the content in an ordered list. When working
       # with nested attributes, it allows %i as interpolation option in :name. So you can do:
       #
-      #   f.inputs :name => 'Task #%i', :for => @project.tasks
+      #   f.inputs :name => 'Task #%i', :for => :tasks
       #
       # or the shorter equivalent:
       #
-      #   f.inputs 'Task #%i', :for => @project.tasks
+      #   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.
diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 30c95eb1c..7c9282f23 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -142,7 +142,7 @@ module InputsHelper
       #     <% semantic_form_for @user do |f| %>
       #       <%= f.inputs :name, :email %>
       #
-      #       <% f.inputs :for => @user.profile do %>
+      #       <% f.inputs :for => :profile do %>
       #         <%= profile.input :biography %>
       #         <%= profile.input :twitter_name %>
       #         <%= profile.input :shoe_size %>
@@ -151,9 +151,9 @@ module InputsHelper
       #
       # The `:for` option also works with short hand syntax:
       #
-      #     <% semantic_form_for @user do |form| %>
+      #     <% semantic_form_for @post do |form| %>
       #       <%= f.inputs :name, :email %>
-      #       <%= f.inputs :biography, :twitter_name, :shoe_size, :for => @user.profile %>
+      #       <%= f.inputs :biography, :twitter_name, :shoe_size, :for => :profile %>
       #     <% end %>
       #
       # {#inputs} will always create a new `<fieldset>` wrapping, so only use it when it makes sense
@@ -233,7 +233,7 @@ module InputsHelper
       #       <%= f.input :name ... %>
       #       <%= f.input :email ... %>
       #     <% end %>
-      #     <%= f.inputs :for => @user.profile do |profile| %>
+      #     <%= f.inputs :for => :profile do |profile| %>
       #       <%= profile.input :user ... %>
       #       <%= profile.input :categories ... %>
       #     <% end %>

From ba93de2a5302824d99aae6ce4769aa92c6eb3a65 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 9 Jun 2011 12:44:03 +1000
Subject: [PATCH 834/992] CHANGELOG catch-up

---
 CHANGELOG | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index bd59a7749..fcd3ae57a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-[master]
+2.0.0.rc1
 
 * Removed the "inline_order" configuration (redefine input_wrapping instead)
 * Removed the "special" implementation of label() from FormBuilder, so builder.label will call Rails' label helper, not ours
@@ -37,6 +37,10 @@
 * Fixed that overly specific CSS rules weren't applied to nested form elements properly
 * Removed formtastic:form generator and changed formtastic:install generator
 to override scaffold generator
+* Refactored and consolidated CSS by adding extra class names into the mark-up, preferring to style by class instead of element wherever possible
+* Added IE6 and IE7 stylesheets for specific fixes if needed (uncomplicates formtastic.css)
+* Added support for Rails 3.1 asset pipeline as well as previous generated CSS for Rails < 3.1
+* Made many subtle visual improvements to CSS, especially in IE
 
 1.2.4.beta (unreleased)
 

From 7a0851c250987916ba3b5157abbde61ed0b0a9aa Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 9 Jun 2011 12:46:54 +1000
Subject: [PATCH 835/992] merge in changelog from 1.2-stable

---
 CHANGELOG | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index fcd3ae57a..f786ed4fb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -42,7 +42,25 @@ to override scaffold generator
 * Added support for Rails 3.1 asset pipeline as well as previous generated CSS for Rails < 3.1
 * Made many subtle visual improvements to CSS, especially in IE
 
-1.2.4.beta (unreleased)
+1.2.4
+
+* no changes
+
+1.2.4.beta2
+
+* Changed :boolean inputs to use Rails' check_box_checked? instead of our own logic
+* Changed developer instructions in README
+* Fixed :boolean inputs to disable the included hidden input when disabling the actual checkbox
+* Fixed that Formtastic was making changes to the options hash directly instead of on a duplicate, causing problems for those trying to reuse options on multiple inputs in the view 
+* Fixed that tiny scroll bars were appearing on legends in date/time/radio/cbheckboxes fielsets (GH-477)    
+* Fixed an issue when formtastic fails to determine if a checkbox is checked with custom checked and unchecked values (thanks to Eugene Bolshakov)
+* Fixed that the hidden input rendered with a boolean checkbox did nt use the custom :name from :input_html options hash
+* Fixed issue where Firefox 4 gives focus to the <li> wrapper (fixes #524).
+* Fixed that a shared input options hash could not be re-used in the view without being altered by each input
+* Improved compatibility with Mongoid Documents
+* Updated i18n dependency to ~> 0.4
+
+1.2.4.beta
 
 * Changed :boolean inputs to use Rails' check_box_checked? instead of our own logic
 * Changed developer instructions in README

From aae91c2b571f0cd8b171ad9b75905a31fdaf1ae6 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 9 Jun 2011 16:01:52 +1000
Subject: [PATCH 836/992] remove form generator docs from README

---
 README.textile | 46 ----------------------------------------------
 1 file changed, 46 deletions(-)

diff --git a/README.textile b/README.textile
index 310dc6c2c..e8d89a995 100644
--- a/README.textile
+++ b/README.textile
@@ -536,52 +536,6 @@ h2. Configuration
 Run @rails generate formtastic:install@ to copy a commented out config file into @config/initializers/formtastic.rb@. You can "view the configuration file on GitHub":http://github.com/justinfrench/formtastic/blob/master/lib/generators/templates/formtastic.rb
 
 
-h2. Form Generator
-
-There's a Formtastic form code generator to make your transition to Formtastic easier. All you have to do is to *specify an existing model name*, and optionally specify view template framework (ERB/HAML), and you are good to go. *Note:* This won't overwrite any of your exsting files without confirmation.
-
-h3. Basic usage
-
-<pre>
-  $ rails generate formtastic:form ModelName
-      exists  app/views/posts
-      create  app/views/posts/_form.html.erb
-</pre>
-
-The ERB code is saved to a partial file, but it will not overwrite existing files without a prompt.
-
-h3. Copying the ERB code to the clipboard instead with @--copy@
-
-<pre>
-  $ rails generate formtastic:form Post --copy
-</pre>
-
-h3. Specifying HAML instead of ERB with @--haml@
-
-<pre>
-  $ rails generate formtastic:form Post --haml
-      exists  app/views/posts
-      create  app/views/posts/_form.html.haml
-</pre>
-
-h3. Specifying controller namespace with @--controller@
-
-<pre>
-  $ rails generate formtastic:form Post --controller admin/posts
-      exists  app/views/admin/posts
-      create  app/views/admin/posts/_form.html.erb
-</pre>
-
-h3. Specifying which attributes need an input
-
-<pre>
-  $ rails generate formtastic:form Post title:string body:text publication_state:select
-      exists  app/views/posts
-      create  app/views/posts/_form.html.erb
-</pre>
-
-
-
 h2. Modified & Custom Inputs
 
 If you want to change the behaviour of an input, you can subclass it in your app. For example, to tweak @StringInput@, create a new file @app/inputs/string_input.rb@:

From ab530b72b28b35251bd1efeb77f4f3c58911d144 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 9 Jun 2011 12:51:04 +1000
Subject: [PATCH 837/992] bumped the version to 2.0.0.rc1

---
 RELEASE_PROCESS           | 3 ++-
 formtastic.gemspec        | 4 ++--
 lib/formtastic/version.rb | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/RELEASE_PROCESS b/RELEASE_PROCESS
index 1c9a6a2d3..19f8db09f 100644
--- a/RELEASE_PROCESS
+++ b/RELEASE_PROCESS
@@ -1,4 +1,5 @@
-# edit gemspec version number, date
+# edit version.rb
+# edit gemspec release date
 git ci formtastic.gemspec -m "new gemspec" # commit changes
 git tag X.X.X                              # tag the new version in the code base too
 gem build formtastic.gemspec               # build the gem
diff --git a/formtastic.gemspec b/formtastic.gemspec
index 93512470a..45e40b891 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -5,11 +5,11 @@ require "formtastic/version"
 Gem::Specification.new do |s|
   s.name        = %q{formtastic}
   s.version     = Formtastic::VERSION
-  s.date        = %q{2011-01-07}
+  s.date        = %q{2011-06-09}
   s.platform    = Gem::Platform::RUBY
   s.authors     = [%q{Justin French}]
   s.email       = [%q{justin@indent.com.au}]
-  s.homepage    = %q{http://github.com/justinfrench/formtastic/tree/master}
+  s.homepage    = %q{http://github.com/justinfrench/formtastic}
   s.summary     = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
   s.description = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
 
diff --git a/lib/formtastic/version.rb b/lib/formtastic/version.rb
index f1baaabc6..2f1894f0d 100644
--- a/lib/formtastic/version.rb
+++ b/lib/formtastic/version.rb
@@ -1,3 +1,3 @@
 module Formtastic
-  VERSION = "2.0.0.pre"
+  VERSION = "2.0.0.rc1"
 end

From ea34367d34005ba99e52709c1c2e63558f02f961 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 9 Jun 2011 21:29:25 +1000
Subject: [PATCH 838/992] updated install instructions in readme to reflect
 2.0.0.rc1

---
 README.textile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.textile b/README.textile
index e8d89a995..104be08c8 100644
--- a/README.textile
+++ b/README.textile
@@ -97,13 +97,13 @@ Simply add Formtastic to your Gemfile and bundle it up:
   gem 'formtastic', '~> 1.2.3'
 </pre>
 
-If you want to try out our work towards Formtastic 2.0 (Rails >= 3 only), bundle in Formtastic directly from Github with the @:git@ option instead:
+If you want to try out our work towards Formtastic 2.0 (Rails 3.x only):
 
 <pre>
-  gem 'formtastic', :git => 'http://github.com/justinfrench/formtastic', :branch => 'master'
+  gem 'formtastic', '2.0.0.rc1'
 </pre>
 
-Optionally, run the generator to copy a stylesheet (Rails 3.0.x only) and a configuration initializer into your application:
+Run the installation generator to copy a stylesheet (Rails 3.0.x only) and a configuration initializer into your application:
 
 <pre>
   $ rails generate formtastic:install 

From 995a51366a36a585426e6b7451b67f11144dccb2 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 11 Jun 2011 16:28:00 +1000
Subject: [PATCH 839/992] checkbox input should come before the label text in
 the BooleanInput <label>, fixes #591

---
 lib/formtastic/inputs/boolean_input.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/boolean_input.rb b/lib/formtastic/inputs/boolean_input.rb
index 012aa757f..980f9db8d 100644
--- a/lib/formtastic/inputs/boolean_input.rb
+++ b/lib/formtastic/inputs/boolean_input.rb
@@ -64,7 +64,7 @@ def label_html_options
       end
 
       def label_text_with_embedded_checkbox
-        label_text << " " << check_box_html
+        check_box_html << "" << label_text
       end
 
       def check_box_html

From aefbba4fe83cf5b127a07eef90c95d77ab427cd3 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 11 Jun 2011 16:29:33 +1000
Subject: [PATCH 840/992] changelog catch-up

---
 CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index f786ed4fb..b8799bfd6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+2.0.0.rc2
+
+* Fixed that the checkbox was mistakenly placed after the label text in BooleanInput, not before it as per 1.x
+
 2.0.0.rc1
 
 * Removed the "inline_order" configuration (redefine input_wrapping instead)

From 82fa0026de271155aa116a5132b13ca74c273777 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 11 Jun 2011 16:35:04 +1000
Subject: [PATCH 841/992] spec to expose bug and fixed #590

---
 lib/formtastic/inputs/select_input.rb | 2 +-
 spec/inputs/select_input_spec.rb      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index a2a0a2213..21bcb243b 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -175,7 +175,7 @@ def label_html_options
       end
       
       def input_options
-        {:include_blank => include_blank?}.merge(super)
+        super.merge({:include_blank => include_blank?, :prompt => nil})
       end
       
       def input_html_options
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 9f3195798..c5457775d 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -418,7 +418,7 @@
     end
 
     it 'should have a select with prompt' do
-      output_buffer.should have_tag("form li select option[@value='']", /choose author/)
+      output_buffer.should have_tag("form li select option[@value='']", /choose author/, :count => 1)
     end
 
     it 'should not have a blank select option' do

From e34f01b72c6c373c4b97aa626d629cb6d1e8ed7e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 11 Jun 2011 23:01:39 +1000
Subject: [PATCH 842/992] some documentation for Timeish inputs, fixes #589

---
 lib/formtastic/inputs/base/timeish.rb   | 84 +++++++++++++++++++++++++
 lib/formtastic/inputs/date_input.rb     |  2 +
 lib/formtastic/inputs/datetime_input.rb |  3 +
 lib/formtastic/inputs/time_input.rb     |  2 +
 4 files changed, 91 insertions(+)

diff --git a/lib/formtastic/inputs/base/timeish.rb b/lib/formtastic/inputs/base/timeish.rb
index 081b613e3..48df7717e 100644
--- a/lib/formtastic/inputs/base/timeish.rb
+++ b/lib/formtastic/inputs/base/timeish.rb
@@ -1,6 +1,90 @@
 module Formtastic
   module Inputs
     module Base
+      # Timeish inputs (`:date`, `:datetime`, `:time`) are similar to the Rails date and time 
+      # helpers (`date_select`, `datetime_select`, `time_select`), rendering a series of `<select>`
+      # tags for each fragment (year, month, day, hour, minute, seconds). The fragments are then 
+      # re-combined to a date by ActiveRecord through multi-parameter assignment.
+      #
+      # The mark-up produced by Rails is simple but far from ideal, with no way to label the 
+      # individual fragments for accessibility, no fieldset to group the related fields, and no
+      # legend describing the group. Formtastic addresses this within the standard `<li>` wrapper 
+      # with a `<fieldset>` with a `<legend>` as a label, followed by an ordered list (`<ol>`) of 
+      # list items (`<li>`), one for each fragment (year, month, ...). Each `<li>` fragment contains
+      # a `<label>` (eg "Year") for the fragment, and a `<select>` containing `<option>`s (eg a 
+      # range of years).
+      #
+      # In the supplied formtastic.css file, the resulting mark-up is styled to appear a lot like a
+      # standard Rails date time select by:
+      #
+      # * styling the legend to look like the other labels (to the left hand side of the selects)
+      # * floating the `<li>` fragments against each other as a single line
+      # * hiding the `<label>` of each fragment with `display:none`
+      #
+      # @example `:date` input with full form context and sample HTMl output
+      #
+      #   <%= semantic_form_for(@post) do |f| %>
+      #     <%= f.inputs do %>
+      #       ...
+      #       <%= f.input :publish_at, :as => :date %>
+      #     <% end %>
+      #   <% end %>
+      #
+      #   <form...>
+      #     <fieldset class="inputs">
+      #       <ol>
+      #         <li class="date">
+      #           <fieldset class="fragments">
+      #             <ol class="fragments-group">
+      #               <li class="fragment">
+      #                 <label for="post_publish_at_1i">Year</label>
+      #                 <select id="post_publish_at_1i" name="post[publish_at_1i]">...</select>
+      #               </li>
+      #               <li class="fragment">
+      #                 <label for="post_publish_at_2i">Month</label>
+      #                 <select id="post_publish_at_2i" name="post[publish_at_2i]">...</select>
+      #               </li>
+      #               <li class="fragment">
+      #                 <label for="post_publish_at_3i">Day</label>
+      #                 <select id="post_publish_at_3i" name="post[publish_at_3i]">...</select>
+      #               </li>
+      #             </ol>
+      #           </fieldset>
+      #         </li>
+      #       </ol>
+      #     </fieldset>
+      #   </form>
+      #       
+      #
+      # @example `:time` input
+      #   <%= f.input :publish_at, :as => :time %>
+      #
+      # @example `:datetime` input
+      #   <%= f.input :publish_at, :as => :datetime %>
+      #
+      # @example Change the labels for each fragment
+      #   <%= f.input :publish_at, :as => :date, :labels => { :year => "Y", :month => "M", :day => "D" }  %>
+      #
+      # @example Skip a fragment (defaults to 1, skips all following fragments)
+      #   <%= f.input :publish_at, :as => :datetime, :discard_minute => true  %>
+      #   <%= f.input :publish_at, :as => :datetime, :discard_hour => true  %>
+      #   <%= f.input :publish_at, :as => :datetime, :discard_day => true  %>
+      #   <%= f.input :publish_at, :as => :datetime, :discard_month => true  %>
+      #   <%= f.input :publish_at, :as => :datetime, :discard_year => true  %>
+      #
+      # @example Change the order
+      #   <%= f.input :publish_at, :as => :date, :order => [:month, :day, :year]  %>
+      #
+      # @example Include seconds with times (excluded by default)
+      #   <%= f.input :publish_at, :as => :time, :include_seconds => true %>
+      #
+      # @example Specify if there should be a blank option at the start of each select or not
+      #   <%= f.input :publish_at, :as => :time, :include_blank=> true %>
+      #   <%= f.input :publish_at, :as => :time, :include_blank=> false %>
+      #
+      # @todo Document i18n
+      # @todo Check what other Rails options are supported (`start_year`, `end_year`, `use_month_numbers`, `use_short_month`, `add_month_numbers`, `prompt`), write tests for them, and otherwise support them
+      # @todo Could we take the rendering from Rails' helpers and inject better HTML in and around it rather than re-inventing the whee?
       module Timeish
         
         def to_html
diff --git a/lib/formtastic/inputs/date_input.rb b/lib/formtastic/inputs/date_input.rb
index f59486725..f290c87e8 100644
--- a/lib/formtastic/inputs/date_input.rb
+++ b/lib/formtastic/inputs/date_input.rb
@@ -1,5 +1,7 @@
 module Formtastic
   module Inputs
+    # Outputs a series of select boxes for the fragments that make up a date (year, month, day).
+    #
     # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
     class DateInput 
       include Base
diff --git a/lib/formtastic/inputs/datetime_input.rb b/lib/formtastic/inputs/datetime_input.rb
index 3239b362a..37b3ac10e 100644
--- a/lib/formtastic/inputs/datetime_input.rb
+++ b/lib/formtastic/inputs/datetime_input.rb
@@ -1,5 +1,8 @@
 module Formtastic
   module Inputs
+
+    # Outputs a series of select boxes for the fragments that make up a date and time (year, month, day, hour, minute, second).
+    #
     # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
     class DatetimeInput 
       include Base
diff --git a/lib/formtastic/inputs/time_input.rb b/lib/formtastic/inputs/time_input.rb
index b06eccf41..8716f356d 100644
--- a/lib/formtastic/inputs/time_input.rb
+++ b/lib/formtastic/inputs/time_input.rb
@@ -1,5 +1,7 @@
 module Formtastic
   module Inputs
+    # Outputs a series of select boxes for the fragments that make up a time (hour, minute, second).
+    #
     # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
     class TimeInput 
       include Base

From cbb4c9c48732a06482b134ccc78de46acbf32246 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 13 Jun 2011 20:27:10 +1000
Subject: [PATCH 843/992] version bump to rc2

---
 lib/formtastic/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/version.rb b/lib/formtastic/version.rb
index 2f1894f0d..0f8071a6e 100644
--- a/lib/formtastic/version.rb
+++ b/lib/formtastic/version.rb
@@ -1,3 +1,3 @@
 module Formtastic
-  VERSION = "2.0.0.rc1"
+  VERSION = "2.0.0.rc2"
 end

From d55918d7cc38c93a7ebfae8569571ca647d6ad86 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 13 Jun 2011 20:27:38 +1000
Subject: [PATCH 844/992] let's see what happens if i omit the date

---
 formtastic.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 45e40b891..83dc93cd3 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -5,7 +5,7 @@ require "formtastic/version"
 Gem::Specification.new do |s|
   s.name        = %q{formtastic}
   s.version     = Formtastic::VERSION
-  s.date        = %q{2011-06-09}
+  s.date        = %q{2011-06-13}
   s.platform    = Gem::Platform::RUBY
   s.authors     = [%q{Justin French}]
   s.email       = [%q{justin@indent.com.au}]

From 2e8e282d8ff02ddf5bbf1ce8b4ec6ce373e4d9cb Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 14 Jun 2011 12:03:31 +1000
Subject: [PATCH 845/992] CHANGELOG

---
 CHANGELOG | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index b8799bfd6..27b501f55 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 2.0.0.rc2
 
-* Fixed that the checkbox was mistakenly placed after the label text in BooleanInput, not before it as per 1.x
+* Fixed install instructions in readme to reflect 2.0.0.rc1
+* Fixed that the checkbox was mistakenly placed after the label text in BooleanInput, not before it as per 1.x (#591)
+* Fixed that select inputs had two "blank" options at the top in some cases (#590)
+* Added documentation for Timeish inputs (date, datetime, time) (#589)
 
 2.0.0.rc1
 

From 14aef5f8d73330ce6f1037f03c6dae65a2f17fb9 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 18 Jun 2011 17:11:34 +1000
Subject: [PATCH 846/992] don't apply a .label class to <label> tags inside a
 .choice on radio and checkbox inputs because BAD THINGS HAPPEN, fixes #599

---
 lib/formtastic/inputs/check_boxes_input.rb |  2 +-
 lib/formtastic/inputs/radio_input.rb       |  2 +-
 spec/inputs/check_boxes_input_spec.rb      | 11 +++++++++--
 spec/inputs/radio_input_spec.rb            |  6 +++++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index 505ca15a9..7ab3d5825 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -104,7 +104,7 @@ def choice_html(choice)
             check_box_with_hidden_input(choice) : 
             check_box_without_hidden_input(choice) <<
           choice_label(choice),
-          label_html_options.merge(:for => choice_input_dom_id(choice))
+          label_html_options.merge(:for => choice_input_dom_id(choice), :class => nil)
         )
       end
       
diff --git a/lib/formtastic/inputs/radio_input.rb b/lib/formtastic/inputs/radio_input.rb
index e94794a11..083750b17 100644
--- a/lib/formtastic/inputs/radio_input.rb
+++ b/lib/formtastic/inputs/radio_input.rb
@@ -142,7 +142,7 @@ def choice_html(choice)
         template.content_tag(:label,
           builder.radio_button(input_name, choice_value(choice), input_html_options.merge(choice_html_options(choice))) << 
           choice_label(choice),
-          label_html_options.merge(:for => choice_input_dom_id(choice))
+          label_html_options.merge(:for => choice_input_dom_id(choice), :class => nil)
         )
       end
       
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index d87efdef6..f4d5bbd6f 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -56,7 +56,11 @@
     end
 
     describe "each choice" do
-
+      
+      it 'should not give the choice label the .label class' do
+        output_buffer.should_not have_tag('li.choice label.label')
+      end
+      
       it 'should contain a label for the radio input with a nested input and label text' do
         ::Post.all.each do |post|
           output_buffer.should have_tag('form li fieldset ol li label', /#{post.to_label}/)
@@ -365,8 +369,11 @@
         concat(builder.input(:posts, :as => :check_boxes))
       end)
     end
+    
+    it "should have a label for #context2_author_post_ids_19" do
+      output_buffer.should have_tag("form li label[@for='context2_author_post_ids_19']")
+    end
 
-    it_should_have_label_for('context2_author_post_ids_19')
     it_should_have_input_with_id('context2_author_post_ids_19')
     it_should_have_input_wrapper_with_id("context2_author_posts_input")
   end
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 14076e814..05fee5f3e 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -45,7 +45,11 @@
     end
 
     describe "each choice" do
-
+      
+      it 'should not give the choice label the .label class' do
+        output_buffer.should_not have_tag('li.choice label.label')
+      end
+      
       it 'should contain a label for the radio input with a nested input and label text' do
         ::Author.all.each do |author|
           output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)

From a452caf3faff9c51da949137dece92f0462a1c5e Mon Sep 17 00:00:00 2001
From: Ijonas Kisselbach <ijonas.kisselbach@gmail.com>
Date: Sat, 18 Jun 2011 11:22:37 +0100
Subject: [PATCH 847/992] fix mongo_mapper related issue: mongo_mapper doesn't
 respond to reflect_on_association(), but associations() instead

---
 lib/formtastic/helpers/inputs_helper.rb | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 7c9282f23..c45a28dc6 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -314,9 +314,17 @@ def default_columns_for_object
       end
       
       def fieldset_contents_from_column_list(columns)
-        columns.collect do |method| 
-          if @object && (@object.class.reflect_on_association(method.to_sym) && @object.class.reflect_on_association(method.to_sym).options[:polymorphic] == true)
-            raise PolymorphicInputWithoutCollectionError.new("Please provide a collection for :#{method} input (you'll need to use block form syntax). Inputs for polymorphic associations can only be used when an explicit :collection is provided.")
+        columns.collect do |method|
+          if @object
+            if @object.class.respond_to?(:reflect_on_association)
+              if (@object.class.reflect_on_association(method.to_sym) && @object.class.reflect_on_association(method.to_sym).options[:polymorphic] == true)
+                raise PolymorphicInputWithoutCollectionError.new("Please provide a collection for :#{method} input (you'll need to use block form syntax). Inputs for polymorphic associations can only be used when an explicit :collection is provided.")
+              end
+            elsif @object.class.respond_to?(:associations)
+              if (@object.class.associations(method.to_sym) && @object.class.associations(method.to_sym).options[:polymorphic] == true)
+                raise PolymorphicInputWithoutCollectionError.new("Please provide a collection for :#{method} input (you'll need to use block form syntax). Inputs for polymorphic associations can only be used when an explicit :collection is provided.")
+              end            
+            end            
           end
           input(method.to_sym)
         end

From b87d729b178b53fb9c5587937dcf149f66f0b2f9 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 19 Jun 2011 20:08:11 +1000
Subject: [PATCH 848/992] version bump 2.0.0.rc3

---
 lib/formtastic/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/version.rb b/lib/formtastic/version.rb
index 0f8071a6e..f578b82bf 100644
--- a/lib/formtastic/version.rb
+++ b/lib/formtastic/version.rb
@@ -1,3 +1,3 @@
 module Formtastic
-  VERSION = "2.0.0.rc2"
+  VERSION = "2.0.0.rc3"
 end

From c6a285a7155f2266fc81a837e63d86988b8b7af8 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 19 Jun 2011 20:17:19 +1000
Subject: [PATCH 849/992] drop date from gemspec

---
 formtastic.gemspec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 83dc93cd3..e82d1fcec 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -5,7 +5,6 @@ require "formtastic/version"
 Gem::Specification.new do |s|
   s.name        = %q{formtastic}
   s.version     = Formtastic::VERSION
-  s.date        = %q{2011-06-13}
   s.platform    = Gem::Platform::RUBY
   s.authors     = [%q{Justin French}]
   s.email       = [%q{justin@indent.com.au}]

From 17053dcbdc5d97dd0a9a96263a49e02dad4d3440 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 19 Jun 2011 20:21:20 +1000
Subject: [PATCH 850/992] CHANGELOG

---
 CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 27b501f55..5f763aeae 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+2.0.0.rc3
+
+* Fixed that .label class was incorrectly applied to <label> tags inside a .choice on radio and checkbox inputs (#599)
+
 2.0.0.rc2
 
 * Fixed install instructions in readme to reflect 2.0.0.rc1

From c6c6d2bcb91831e1e6cf6f7fb6abbeaf3ecbf3b4 Mon Sep 17 00:00:00 2001
From: Ijonas Kisselbach <ijonas.kisselbach@gmail.com>
Date: Mon, 20 Jun 2011 10:13:33 +0100
Subject: [PATCH 851/992] specs for support of polymorphic association checking
 on top of MongoMapper

---
 spec/helpers/inputs_helper_spec.rb | 158 ++++++++++++++++-------------
 spec/spec_helper.rb                |  40 +++++++-
 2 files changed, 124 insertions(+), 74 deletions(-)

diff --git a/spec/helpers/inputs_helper_spec.rb b/spec/helpers/inputs_helper_spec.rb
index e69002647..5a3542f4b 100644
--- a/spec/helpers/inputs_helper_spec.rb
+++ b/spec/helpers/inputs_helper_spec.rb
@@ -11,7 +11,7 @@
   end
 
   describe 'with a block (block forms syntax)' do
-
+  
     describe 'when no options are provided' do
       before do
         output_buffer.replace 'before_builder' # clear the output buffer and sets before_builder
@@ -21,28 +21,28 @@
           end
         end)
       end
-
+  
       it 'should output just the content wrapped in inputs, not the whole template' do
         output_buffer.should      =~ /before_builder/
         @inputs_output.should_not =~ /before_builder/
       end
-
+  
       it 'should render a fieldset inside the form, with a class of "inputs"' do
         output_buffer.should have_tag("form fieldset.inputs")
       end
-
+  
       it 'should render an ol inside the fieldset' do
         output_buffer.should have_tag("form fieldset.inputs ol")
       end
-
+  
       it 'should render the contents of the block inside the ol' do
         output_buffer.should have_tag("form fieldset.inputs ol", /hello/)
       end
-
+  
       it 'should not render a legend inside the fieldset' do
         output_buffer.should_not have_tag("form fieldset.inputs legend")
       end
-
+  
       it 'should render a fieldset even if no object is given' do
         concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
           @inputs_output = builder.inputs do
@@ -52,17 +52,17 @@
         output_buffer.should have_tag("form fieldset.inputs ol", /bye/)
       end
     end
-
+  
     describe 'when a :for option is provided' do
-
+  
       before do
         @new_post.stub!(:respond_to?).and_return(true, true)
         @new_post.stub!(:author).and_return(@bob)
       end
-
+  
       it 'should render nested inputs' do
         @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
-
+  
         concat(semantic_form_for(@new_post) do |builder|
           inputs = builder.inputs :for => [:author, @bob] do |bob_builder|
             concat(bob_builder.input(:login))
@@ -72,23 +72,23 @@
         output_buffer.should have_tag("form fieldset.inputs #post_author_attributes_login")
         output_buffer.should_not have_tag("form fieldset.inputs #author_login")
       end
-
+  
       it 'should concat rendered nested inputs to the template' do
         @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
-
+  
         concat(semantic_form_for(@new_post) do |builder|
           builder.inputs :for => [:author, @bob] do |bob_builder|
             concat(bob_builder.input(:login))
           end
         end)
-
+  
         output_buffer.should have_tag("form fieldset.inputs #post_author_attributes_login")
         output_buffer.should_not have_tag("form fieldset.inputs #author_login")
-
+  
       end
-
+  
       describe "as a symbol representing the association name" do
-
+  
         it 'should nest the inputs with an _attributes suffix on the association name' do
           concat(semantic_form_for(@new_post) do |post|
             inputs = post.inputs :for => :author do |author|
@@ -98,15 +98,15 @@
           end)
           output_buffer.should have_tag("form input[@name='post[author_attributes][login]']")
         end
-
+  
       end
-
+  
       describe "as a symbol representing a has_many association name" do
         before do
           @new_post.stub!(:authors).and_return([@bob, @fred])
           @new_post.stub!(:authors_attributes=)
         end
-
+  
         it 'should nest the inputs with a fieldset, legend and :name input for each item' do
           concat(semantic_form_for(@new_post) do |post|
             post.inputs :for => :authors, :name => '%i' do |author|
@@ -123,9 +123,9 @@
           output_buffer.should_not have_tag('form fieldset[@name]')
         end
       end
-
+  
       describe 'as an array containing the a symbole for the association name and the associated object' do
-
+  
         it 'should nest the inputs with an _attributes suffix on the association name' do
           concat(semantic_form_for(@new_post) do |post|
             inputs = post.inputs :for => [:author, @new_post.author] do |author|
@@ -135,11 +135,11 @@
           end)
           output_buffer.should have_tag("form input[@name='post[author_attributes][login]']")
         end
-
+  
       end
-
+  
       describe 'as an associated object' do
-
+  
         it 'should not nest the inputs with an _attributes suffix' do
           concat(semantic_form_for(@new_post) do |post|
             inputs = post.inputs :for => @new_post.author do |author|
@@ -149,9 +149,9 @@
           end)
           output_buffer.should have_tag("form input[@name='post[author][login]']")
         end
-
+  
       end
-
+  
       it 'should raise an error if :for and block with no argument is given' do
         semantic_form_for(@new_post) do |builder|
           proc {
@@ -162,20 +162,20 @@
                                               'but the block does not accept any argument.')
         end
       end
-
+  
       it 'should pass options down to semantic_fields_for' do
         @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
-
+  
         concat(semantic_form_for(@new_post) do |builder|
           inputs = builder.inputs :for => [:author, @bob], :for_options => { :index => 10 } do |bob_builder|
             concat(bob_builder.input(:login))
           end
           concat(inputs)
         end)
-
+  
         output_buffer.should have_tag('form fieldset ol li #post_author_attributes_10_login')
       end
-
+  
       it 'should not add builder as a fieldset attribute tag' do
         concat(semantic_form_for(@new_post) do |builder|
           inputs = builder.inputs :for => [:author, @bob], :for_options => { :index => 10 } do |bob_builder|
@@ -183,10 +183,10 @@
           end
           concat(inputs)
         end)
-
+  
         output_buffer.should_not have_tag('fieldset[@builder="Formtastic::Helpers::FormHelper"]')
       end
-
+  
       it 'should send parent_builder as an option to allow child index interpolation' do
         concat(semantic_form_for(@new_post) do |builder|
           builder.instance_variable_set('@nested_child_index', 0)
@@ -195,10 +195,10 @@
           end
           concat(inputs)
         end)
-
+  
         output_buffer.should have_tag('fieldset legend', 'Author #1')
       end
-
+  
       it 'should also provide child index interpolation when nested child index is a hash' do
         concat(semantic_form_for(@new_post) do |builder|
           builder.instance_variable_set('@nested_child_index', :author => 10)
@@ -207,11 +207,11 @@
           end
           concat(inputs)
         end)
-
+  
         output_buffer.should have_tag('fieldset legend', 'Author #11')
       end
     end
-
+  
     describe 'when a :name or :title option is provided' do
       describe 'and is a string' do
         before do
@@ -234,7 +234,7 @@
             concat(inputs)
           end)
         end
-
+  
         it 'should render a fieldset with a legend inside the form' do
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text_using_name}$/)
@@ -242,7 +242,7 @@
           output_buffer.should have_tag("form fieldset legend", /^#{@nested_forms_legend_text}$/)
         end
       end
-
+  
       describe 'and is a symbol' do
         before do
           @localized_legend_text = "Localized advanced options"
@@ -274,7 +274,7 @@
             concat(inputs)
           end)
         end
-
+  
         it 'should render a fieldset with a localized legend inside the form' do
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text_using_name}$/)
@@ -283,84 +283,84 @@
         end
       end
     end
-
+  
     describe 'when other options are provided' do
       before do
         @id_option = 'advanced'
         @class_option = 'wide'
-
+  
         concat(semantic_form_for(@new_post) do |builder|
           builder.inputs :id => @id_option, :class => @class_option do
           end
         end)
       end
-
+  
       it 'should pass the options into the fieldset tag as attributes' do
         output_buffer.should have_tag("form fieldset##{@id_option}")
         output_buffer.should have_tag("form fieldset.#{@class_option}")
       end
     end
-
+  
   end
-
+  
   describe 'without a block' do
-
+  
     before do
       ::Post.stub!(:reflections).and_return({:author => mock('reflection', :options => {}, :macro => :belongs_to),
                                            :comments => mock('reflection', :options => {}, :macro => :has_many) })
       ::Author.stub!(:find).and_return([@fred, @bob])
-
+  
       @new_post.stub!(:title)
       @new_post.stub!(:body)
       @new_post.stub!(:author_id)
-
+  
       @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :string, :limit => 255))
       @new_post.stub!(:column_for_attribute).with(:body).and_return(mock('column', :type => :text))
       @new_post.stub!(:column_for_attribute).with(:created_at).and_return(mock('column', :type => :datetime))
       @new_post.stub!(:column_for_attribute).with(:author).and_return(nil)
     end
-
+  
     describe 'with no args (quick forms syntax)' do
       before do
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.inputs)
         end)
       end
-
+  
       it 'should render a form' do
         output_buffer.should have_tag('form')
       end
-
+  
       it 'should render a fieldset inside the form' do
         output_buffer.should have_tag('form > fieldset.inputs')
       end
-
+  
       it 'should not render a legend in the fieldset' do
         output_buffer.should_not have_tag('form > fieldset.inputs > legend')
       end
-
+  
       it 'should render an ol in the fieldset' do
         output_buffer.should have_tag('form > fieldset.inputs > ol')
       end
-
+  
       it 'should render a list item in the ol for each column and reflection' do
         # Remove the :has_many macro and :created_at column
         count = ::Post.content_columns.size + ::Post.reflections.size - 2
         output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => count)
       end
-
+  
       it 'should render a string list item for title' do
         output_buffer.should have_tag('form > fieldset.inputs > ol > li.string')
       end
-
+  
       it 'should render a text list item for body' do
         output_buffer.should have_tag('form > fieldset.inputs > ol > li.text')
       end
-
+  
       it 'should render a select list item for author_id' do
         output_buffer.should have_tag('form > fieldset.inputs > ol > li.select', :count => 1)
       end
-
+  
       it 'should not render timestamps inputs by default' do
         output_buffer.should_not have_tag('form > fieldset.inputs > ol > li.datetime')
       end
@@ -386,26 +386,26 @@
         
       end
     end
-
+  
     describe 'with column names as args (short hand forms syntax)' do
       describe 'and an object is given' do
         it 'should render a form with a fieldset containing two list items' do
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.inputs(:title, :body))
           end)
-
+  
           output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => 2)
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.string')
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.text')
         end
       end
-
+  
       describe 'and no object is given' do
         it 'should render a form with a fieldset containing two list items' do
           concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
             concat(builder.inputs(:title, :body))
           end)
-
+  
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.string', :count => 2)
         end
       end
@@ -434,7 +434,7 @@
       end
       
     end
-
+  
     describe 'when a :for option is provided' do
       describe 'and an object is given' do
         it 'should render nested inputs' do
@@ -442,12 +442,12 @@
           concat(semantic_form_for(@new_post) do |builder|
             concat(builder.inputs(:login, :for => @bob))
           end)
-
+  
           output_buffer.should have_tag("form fieldset.inputs #post_author_login")
           output_buffer.should_not have_tag("form fieldset.inputs #author_login")
         end
       end
-
+  
       describe 'and no object is given' do
         it 'should render nested inputs' do
           concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
@@ -458,7 +458,7 @@
         end
       end
     end
-
+  
     describe 'with column names and an options hash as args' do
       before do
         concat(semantic_form_for(@new_post) do |builder|
@@ -468,23 +468,23 @@
           concat(builder.inputs(@legend_text_using_arg, :title, :body, :id => "my-id-2"))
         end)
       end
-
+  
       it 'should render a form with a fieldset containing two list items' do
         output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => 4)
       end
-
+  
       it 'should pass the options down to the fieldset' do
         output_buffer.should have_tag('form > fieldset#my-id.inputs')
       end
-
+  
       it 'should use the special :name option as a text for the legend tag' do
         output_buffer.should have_tag('form > fieldset#my-id.inputs > legend', /^#{@legend_text_using_option}$/)
         output_buffer.should have_tag('form > fieldset#my-id-2.inputs > legend', /^#{@legend_text_using_arg}$/)
       end
     end
-
+  
   end
-
+  
   describe 'nesting' do
     
     context "when not nested" do
@@ -531,7 +531,7 @@
         output_buffer.should have_tag('form > fieldset.inputs > ol > li > fieldset.inputs > ol')
       end
     end
-
+  
     context "when nested (without block, with :for)" do
       it "should wrap the nested inputs in an li block to maintain HTML validity" do
         concat(semantic_form_for(@new_post) do |builder|
@@ -542,7 +542,7 @@
         output_buffer.should have_tag('form > fieldset.inputs > ol > li > fieldset.inputs > ol')
       end
     end
-
+  
     context "when double nested" do
       it "should wrap the nested inputs in an li block to maintain HTML validity" do
         concat(semantic_form_for(@new_post) do |builder|
@@ -559,4 +559,16 @@
     
   end
 
+  describe 'when using MongoMapper associations ' do
+    def generate_form
+      semantic_form_for(@new_mm_post) do |builder|
+        builder.inputs :title, :sub_posts
+      end
+    end
+    it "should throw PolymorphicInputWithoutCollectionError on sub_posts" do
+      ::MongoPost.should_receive(:associations).exactly(3).times
+      expect { generate_form }.to raise_error(Formtastic::PolymorphicInputWithoutCollectionError)
+    end
+  end
+
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index b1a0f7258..2278e76f8 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -72,6 +72,17 @@ def active_model_numericality_validator(attributes, options = {})
     active_model_validator(:numericality, attributes, options)
   end
 
+  class ::MongoPost
+    include MongoMapper::Document if defined?(MongoMapper::Document)
+
+    def id
+    end
+
+    def persisted?
+    end
+  end
+
+
   class ::Post
     extend ActiveModel::Naming if defined?(ActiveModel::Naming)
     include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
@@ -256,7 +267,6 @@ def new_author_path; "/authors/new"; end
       when :mongoid_reviewer
         mock('reflection', :options => nil, :klass => ::Author, :macro => :referenced_in, :foreign_key => "reviewer_id") # custom id
       end
-
     end
     ::Post.stub!(:find).and_return([@freds_post])
     ::Post.stub!(:all).and_return([@freds_post])
@@ -266,6 +276,34 @@ def new_author_path; "/authors/new"; end
     ::Post.stub!(:persisted?).and_return(nil)
     ::Post.stub!(:to_ary)
 
+
+    ::MongoPost.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
+    ::MongoPost.stub!(:human_name).and_return('MongoPost')
+    ::MongoPost.stub!(:associations).and_return do |column_name|
+      case column_name
+      when :sub_posts
+        mock('reflection', :options => {:polymorphic => true}, :klass => ::MongoPost, :macro => :has_many)
+      end
+    end
+    ::MongoPost.stub!(:find).and_return([@freds_post])
+    ::MongoPost.stub!(:all).and_return([@freds_post])
+    ::MongoPost.stub!(:where).and_return([@freds_post])
+    ::MongoPost.stub!(:to_key).and_return(nil)
+    ::MongoPost.stub!(:persisted?).and_return(nil)
+    ::MongoPost.stub!(:to_ary)
+    ::MongoPost.stub!(:model_name).and_return( mock(:model_name_mock, :singular => "post", :plural => "posts") ) 
+
+    @new_mm_post = mock('mm_post')
+    @new_mm_post.stub!(:class).and_return(::MongoPost)
+    @new_mm_post.stub!(:id).and_return(nil)
+    @new_mm_post.stub!(:new_record?).and_return(true)
+    @new_mm_post.stub!(:errors).and_return(mock('errors', :[] => nil))
+    @new_mm_post.stub!(:title).and_return("Hello World")    
+    @new_mm_post.stub!(:sub_posts).and_return([]) #TODO should be a mock with methods for adding sub posts
+    @new_mm_post.stub!(:to_key).and_return(nil)
+    @new_mm_post.stub!(:to_model).and_return(@new_mm_post)
+    @new_mm_post.stub!(:persisted?).and_return(nil)
+
     @mock_file = mock('file')
     Formtastic::FormBuilder.file_methods.each do |method|
       @mock_file.stub!(method).and_return(true)

From e64a36a4973b770d7e6cdd1dafcbe59ea16b779a Mon Sep 17 00:00:00 2001
From: Ijonas Kisselbach <ijonas.kisselbach@gmail.com>
Date: Mon, 20 Jun 2011 10:56:02 +0100
Subject: [PATCH 852/992] added MongoMapper-specific reflection capability

---
 lib/formtastic/helpers/reflection.rb   |  6 ++++-
 spec/helpers/inputs_helper_spec.rb     |  2 +-
 spec/helpers/reflection_helper_spec.rb | 32 ++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 spec/helpers/reflection_helper_spec.rb

diff --git a/lib/formtastic/helpers/reflection.rb b/lib/formtastic/helpers/reflection.rb
index 6a3931f32..0532a72e3 100644
--- a/lib/formtastic/helpers/reflection.rb
+++ b/lib/formtastic/helpers/reflection.rb
@@ -5,7 +5,11 @@ module Reflection
       # 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)
+        if @object.class.respond_to?(:reflect_on_association)
+          @object.class.reflect_on_association(method) 
+        elsif @object.class.respond_to?(:associations) # MongoMapper uses the 'associations(method)' instead
+          @object.class.associations(method) 
+        end
       end
 
       def association_macro_for_method(method) #:nodoc:
diff --git a/spec/helpers/inputs_helper_spec.rb b/spec/helpers/inputs_helper_spec.rb
index 5a3542f4b..f445ec967 100644
--- a/spec/helpers/inputs_helper_spec.rb
+++ b/spec/helpers/inputs_helper_spec.rb
@@ -566,7 +566,7 @@ def generate_form
       end
     end
     it "should throw PolymorphicInputWithoutCollectionError on sub_posts" do
-      ::MongoPost.should_receive(:associations).exactly(3).times
+      ::MongoPost.should_receive(:associations).at_least(3).times
       expect { generate_form }.to raise_error(Formtastic::PolymorphicInputWithoutCollectionError)
     end
   end
diff --git a/spec/helpers/reflection_helper_spec.rb b/spec/helpers/reflection_helper_spec.rb
new file mode 100644
index 000000000..4cd1dd16c
--- /dev/null
+++ b/spec/helpers/reflection_helper_spec.rb
@@ -0,0 +1,32 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe 'Formtastic::Helpers::Reflection' do
+
+  include FormtasticSpecHelper
+
+  before do
+    @output_buffer = ''
+    mock_everything
+  end
+
+  class ReflectionTester
+    include Formtastic::Helpers::Reflection
+    def initialize(model_object)
+      @object = model_object
+    end
+  end
+
+  context 'with an ActiveRecord object' do
+    it "should return association details on an ActiveRecord association" do
+      @reflection_tester = ReflectionTester.new(@new_post)
+      @reflection_tester.reflection_for(:sub_posts).should_not be_nil
+    end
+    it "should return association details on a MongoMapper association" do
+      @reflection_tester = ReflectionTester.new(@new_mm_post)
+      @reflection_tester.reflection_for(:sub_posts).should_not be_nil
+    end
+  end
+  
+  
+end
\ No newline at end of file

From c9c23edda371dc9f86bd848bc88d04d93845cffe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20Wn=C4=99trzak?= <w.wnetrzak@gmail.com>
Date: Fri, 24 Jun 2011 10:09:09 +0200
Subject: [PATCH 853/992] fixed i18n_lookups config variable name in template

---
 lib/generators/templates/formtastic.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/generators/templates/formtastic.rb b/lib/generators/templates/formtastic.rb
index 4fce02cc0..572d04fc4 100644
--- a/lib/generators/templates/formtastic.rb
+++ b/lib/generators/templates/formtastic.rb
@@ -66,7 +66,7 @@
 # Specifies if labels/hints for input fields automatically be looked up using I18n.
 # Default value: true. Overridden for specific fields by setting value to true,
 # i.e. :label => true, or :hint => true (or opposite depending on initialized value)
-# Formtastic::FormBuilder_lookups_by_default = false
+# Formtastic::FormBuilder.i18n_lookups_by_default = false
 
 # You can add custom inputs or override parts of Formtastic by subclassing Formtastic::FormBuilder and
 # specifying that class here.  Defaults to Formtastic::FormBuilder.

From d1c3365e90182f7a48115b4bc184301c5ad352d9 Mon Sep 17 00:00:00 2001
From: Balazs Nagy <julsevern@gmail.com>
Date: Mon, 27 Jun 2011 15:03:17 +0200
Subject: [PATCH 854/992] Added failing test for validates_length_of
 :maximum-only setting

Signed-off-by: Balazs Nagy <julsevern@gmail.com>
---
 spec/helpers/input_helper_spec.rb | 40 ++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/spec/helpers/input_helper_spec.rb b/spec/helpers/input_helper_spec.rb
index 2ad620b5a..bdaba2b98 100644
--- a/spec/helpers/input_helper_spec.rb
+++ b/spec/helpers/input_helper_spec.rb
@@ -203,7 +203,45 @@
               output_buffer.should have_tag('form li.optional')
             end
           end
-        
+
+          describe 'and validates_length_of was called for the method' do
+            it 'should be required if minimum is set' do
+              @new_post.class.should_receive(:validators_on).with(:title).any_number_of_times {[
+                active_model_length_validator([:title], {:minimum => 1})
+              ]}
+
+              concat(semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title))
+              end)
+              output_buffer.should have_tag('form li.required')
+              output_buffer.should_not have_tag('form li.optional')
+            end
+
+            it 'should be required if :within is set' do
+              @new_post.class.should_receive(:validators_on).with(:title).any_number_of_times {[
+                active_model_length_validator([:title], {:within => 1..5})
+              ]}
+
+              concat(semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title))
+              end)
+              output_buffer.should have_tag('form li.required')
+              output_buffer.should_not have_tag('form li.optional')
+            end
+
+            it 'should not be required if only :maximum is set' do
+              @new_post.class.should_receive(:validators_on).with(:title).any_number_of_times {[
+                active_model_length_validator([:title], {:maximum => 4})
+              ]}
+
+              concat(semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title))
+              end)
+              output_buffer.should have_tag('form li.optional')
+              output_buffer.should_not have_tag('form li.required')
+            end
+          end
+
           # TODO make a matcher for this?
           def should_be_required(options)
             @new_post.class.stub!(:validators_on).with(:body).and_return([

From be7285ff15ecc061ee0cadd43f18b752245acfce Mon Sep 17 00:00:00 2001
From: Balazs Nagy <julsevern@gmail.com>
Date: Mon, 27 Jun 2011 15:11:09 +0200
Subject: [PATCH 855/992] html5 validators should reflect AR validations more
 strictly

* validates_presence_of has no options
* validates_inclusion_of can be optional only if :allow_blank => true
* validates_length_of can be optional if either :allow_blank => true,
  :minimum is > 0, or :within's least value is > 0

Signed-off-by: Balazs Nagy <julsevern@gmail.com>
---
 lib/formtastic/inputs/base/validations.rb | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic/inputs/base/validations.rb b/lib/formtastic/inputs/base/validations.rb
index 399f02fae..2d4082cf0 100644
--- a/lib/formtastic/inputs/base/validations.rb
+++ b/lib/formtastic/inputs/base/validations.rb
@@ -121,8 +121,18 @@ def required?
           return false if not_required_through_negated_validation?
           if validations?
             validations.select { |validator|
-              [:presence, :inclusion, :length].include?(validator.kind) &&
-              validator.options[:allow_blank] != true
+              case validator.kind
+              when :presence
+                true
+              when :inclusion
+                validator.options[:allow_blank] != true
+              when :length
+                validator.options[:allow_blank] != true &&
+                validator.options[:minimum].to_i > 0 ||
+                validator.options[:within].try(:first).to_i > 0
+              else
+                false
+              end
             }.any?
           else
             return responds_to_global_required? && !!builder.all_fields_required_by_default

From 7b22ff0d4fe191a6976728d1d3992ab02c855a88 Mon Sep 17 00:00:00 2001
From: Balazs Nagy <julsevern@gmail.com>
Date: Mon, 27 Jun 2011 15:42:32 +0200
Subject: [PATCH 856/992] Better specs for converting AR validators to required
 parameters

Signed-off-by: Balazs Nagy <julsevern@gmail.com>
---
 spec/helpers/input_helper_spec.rb | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/spec/helpers/input_helper_spec.rb b/spec/helpers/input_helper_spec.rb
index bdaba2b98..23fe3fc89 100644
--- a/spec/helpers/input_helper_spec.rb
+++ b/spec/helpers/input_helper_spec.rb
@@ -229,9 +229,33 @@
               output_buffer.should_not have_tag('form li.optional')
             end
 
-            it 'should not be required if only :maximum is set' do
+            it 'should not be required if :within allows zero length' do
               @new_post.class.should_receive(:validators_on).with(:title).any_number_of_times {[
-                active_model_length_validator([:title], {:maximum => 4})
+                active_model_length_validator([:title], {:within => 0..5})
+              ]}
+
+              concat(semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title))
+              end)
+              output_buffer.should have_tag('form li.optional')
+              output_buffer.should_not have_tag('form li.required')
+            end
+
+            it 'should not be required if only :minimum is zero' do
+              @new_post.class.should_receive(:validators_on).with(:title).any_number_of_times {[
+                active_model_length_validator([:title], {:minimum => 0})
+              ]}
+
+              concat(semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title))
+              end)
+              output_buffer.should have_tag('form li.optional')
+              output_buffer.should_not have_tag('form li.required')
+            end
+
+            it 'should not be required if only :minimum is not set' do
+              @new_post.class.should_receive(:validators_on).with(:title).any_number_of_times {[
+                active_model_length_validator([:title], {:maximum => 5})
               ]}
 
               concat(semantic_form_for(@new_post) do |builder|

From bbc40520a2861c4e8a410a13bab559e261a95967 Mon Sep 17 00:00:00 2001
From: Balazs Nagy <julsevern@gmail.com>
Date: Mon, 27 Jun 2011 16:07:18 +0200
Subject: [PATCH 857/992] input_helper_spec refactor, typo fix

Signed-off-by: Balazs Nagy <julsevern@gmail.com>
---
 spec/helpers/input_helper_spec.rb | 116 ++++++++++++------------------
 1 file changed, 44 insertions(+), 72 deletions(-)

diff --git a/spec/helpers/input_helper_spec.rb b/spec/helpers/input_helper_spec.rb
index 23fe3fc89..33ecc960f 100644
--- a/spec/helpers/input_helper_spec.rb
+++ b/spec/helpers/input_helper_spec.rb
@@ -138,43 +138,43 @@
             end
         
             it 'should be not be required if the optional :if condition is not satisifed' do
-              should_be_required(:required => false, :options => { :if => false })
+              presence_should_be_required(:required => false, :tag => :body, :options => { :if => false })
             end
         
             it 'should not be required if the optional :if proc evaluates to false' do
-              should_be_required(:required => false, :options => { :if => proc { |record| false } })
+              presence_should_be_required(:required => false, :tag => :body, :options => { :if => proc { |record| false } })
             end
         
             it 'should be required if the optional :if proc evaluates to true' do
-              should_be_required(:required => true, :options => { :if => proc { |record| true } })
+              presence_should_be_required(:required => true, :tag => :body, :options => { :if => proc { |record| true } })
             end
         
             it 'should not be required if the optional :unless proc evaluates to true' do
-              should_be_required(:required => false, :options => { :unless => proc { |record| true } })
+              presence_should_be_required(:required => false, :tag => :body, :options => { :unless => proc { |record| true } })
             end
         
             it 'should be required if the optional :unless proc evaluates to false' do
-              should_be_required(:required => true, :options => { :unless => proc { |record| false } })
+              presence_should_be_required(:required => true, :tag => :body, :options => { :unless => proc { |record| false } })
             end
         
             it 'should be required if the optional :if with a method string evaluates to true' do
               @new_post.should_receive(:required_condition).and_return(true)
-              should_be_required(:required => true, :options => { :if => :required_condition })
+              presence_should_be_required(:required => true, :tag => :body, :options => { :if => :required_condition })
             end
         
             it 'should be required if the optional :if with a method string evaluates to false' do
               @new_post.should_receive(:required_condition).and_return(false)
-              should_be_required(:required => false, :options => { :if => :required_condition })
+              presence_should_be_required(:required => false, :tag => :body, :options => { :if => :required_condition })
             end
         
-            it 'should not be required if the optional :unless with a method string evaluates to false' do
+            it 'should be required if the optional :unless with a method string evaluates to false' do
                @new_post.should_receive(:required_condition).and_return(false)
-              should_be_required(:required => true, :options => { :unless => :required_condition })
+              presence_should_be_required(:required => true, :tag => :body, :options => { :unless => :required_condition })
             end
         
-             it 'should be required if the optional :unless with a method string evaluates to true' do
+             it 'should not be required if the optional :unless with a method string evaluates to true' do
                @new_post.should_receive(:required_condition).and_return(true)
-               should_be_required(:required => false, :options => { :unless => :required_condition })
+               presence_should_be_required(:required => false, :tag => :body, :options => { :unless => :required_condition })
              end
           end
         
@@ -183,97 +183,59 @@
               @new_post.class.should_receive(:validators_on).with(:published).any_number_of_times.and_return([
                 active_model_inclusion_validator([:published], {:in => [false, true]})
               ])
-        
-              concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:published))
-              end)
-              output_buffer.should have_tag('form li.required')
-              output_buffer.should_not have_tag('form li.optional')
+              should_be_required(:tag => :published, :required => true)
             end
             
             it 'should not be required if allow_blank is true' do
               @new_post.class.should_receive(:validators_on).with(:published).any_number_of_times.and_return([
                 active_model_inclusion_validator([:published], {:in => [false, true], :allow_blank => true})
               ])
-        
-              concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:published))
-              end)
-              output_buffer.should_not have_tag('form li.required')
-              output_buffer.should have_tag('form li.optional')
+              should_be_required(:tag => :published, :required => false)
             end
           end
 
           describe 'and validates_length_of was called for the method' do
             it 'should be required if minimum is set' do
-              @new_post.class.should_receive(:validators_on).with(:title).any_number_of_times {[
-                active_model_length_validator([:title], {:minimum => 1})
-              ]}
-
-              concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:title))
-              end)
-              output_buffer.should have_tag('form li.required')
-              output_buffer.should_not have_tag('form li.optional')
+              length_should_be_required(:tag => :title, :required => true, :options => {:minimum => 1})
             end
 
             it 'should be required if :within is set' do
-              @new_post.class.should_receive(:validators_on).with(:title).any_number_of_times {[
-                active_model_length_validator([:title], {:within => 1..5})
-              ]}
-
-              concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:title))
-              end)
-              output_buffer.should have_tag('form li.required')
-              output_buffer.should_not have_tag('form li.optional')
+              length_should_be_required(:tag => :title, :required => true, :options => {:within => 1..5})
             end
 
             it 'should not be required if :within allows zero length' do
-              @new_post.class.should_receive(:validators_on).with(:title).any_number_of_times {[
-                active_model_length_validator([:title], {:within => 0..5})
-              ]}
-
-              concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:title))
-              end)
-              output_buffer.should have_tag('form li.optional')
-              output_buffer.should_not have_tag('form li.required')
+              length_should_be_required(:tag => :title, :required => false, :options => {:within => 0..5})
             end
 
             it 'should not be required if only :minimum is zero' do
-              @new_post.class.should_receive(:validators_on).with(:title).any_number_of_times {[
-                active_model_length_validator([:title], {:minimum => 0})
-              ]}
-
-              concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:title))
-              end)
-              output_buffer.should have_tag('form li.optional')
-              output_buffer.should_not have_tag('form li.required')
+              length_should_be_required(:tag => :title, :required => false, :options => {:minimum => 0})
             end
 
             it 'should not be required if only :minimum is not set' do
-              @new_post.class.should_receive(:validators_on).with(:title).any_number_of_times {[
-                active_model_length_validator([:title], {:maximum => 5})
-              ]}
+              length_should_be_required(:tag => :title, :required => false, :options => {:maximum => 5})
+            end
 
-              concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:title))
-              end)
-              output_buffer.should have_tag('form li.optional')
-              output_buffer.should_not have_tag('form li.required')
+            it 'should not be required if allow_blank is true' do
+              length_should_be_required(:tag => :published, :required => false, :options => {:allow_blank => true})
             end
           end
 
+          def add_presence_validator(options)
+            @new_post.class.stub!(:validators_on).with(options[:tag]).and_return([
+              active_model_presence_validator([options[:tag]], options[:options])
+            ])
+          end
+
+          def add_length_validator(options)
+            @new_post.class.should_receive(:validators_on).with(options[:tag]).any_number_of_times {[
+              active_model_length_validator([options[:tag]], options[:options])
+            ]}
+          end
+
           # TODO make a matcher for this?
           def should_be_required(options)
-            @new_post.class.stub!(:validators_on).with(:body).and_return([
-              active_model_presence_validator([:body], options[:options])
-            ])
-        
             concat(semantic_form_for(@new_post) do |builder|
-              concat(builder.input(:body))
+              concat(builder.input(options[:tag]))
             end)
         
             if options[:required]
@@ -284,6 +246,16 @@ def should_be_required(options)
               output_buffer.should_not have_tag('form li.required')
             end
           end
+
+          def presence_should_be_required(options)
+            add_presence_validator(options)
+            should_be_required(options)
+          end
+
+          def length_should_be_required(options)
+            add_length_validator(options)
+            should_be_required(options)
+          end
           
           # TODO JF reversed this during refactor, need to make sure
           describe 'and there are no requirement validations on the method' do

From 4325eaeea8373700618970a707d1b48b2584b737 Mon Sep 17 00:00:00 2001
From: Mikael Henriksson <mikael@zoolutions.se>
Date: Mon, 27 Jun 2011 20:29:28 +0200
Subject: [PATCH 858/992] fix #606

---
 lib/formtastic/inputs/base/validations.rb | 26 +++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/lib/formtastic/inputs/base/validations.rb b/lib/formtastic/inputs/base/validations.rb
index 399f02fae..380d56bfa 100644
--- a/lib/formtastic/inputs/base/validations.rb
+++ b/lib/formtastic/inputs/base/validations.rb
@@ -69,9 +69,16 @@ def validation_min
           if validation
             # We can't determine an appropriate value for :greater_than with a float/decimal column
             raise IndeterminableMinimumAttributeError if validation.options[:greater_than] && column? && [:float, :decimal].include?(column.type)
-
-            return validation.options[:greater_than_or_equal_to] if validation.options[:greater_than_or_equal_to]
-            return (validation.options[:greater_than] + 1)       if validation.options[:greater_than]
+ 
+            if validation.options[:greater_than_or_equal_to]
+              return (validation.options[:greater_than_or_equal_to].call) if validation.options[:greater_than_or_equal_to].kind_of?(Proc)
+              return (validation.options[:greater_than_or_equal_to])
+            end
+            
+            if validation.options[:greater_than]
+              return (validation.options[:greater_than].call + 1) if validation.options[:greater_than].kind_of?(Proc)
+              return (validation.options[:greater_than] + 1)
+            end
           end
         end
 
@@ -83,9 +90,16 @@ def validation_max
           if validation
             # We can't determine an appropriate value for :greater_than with a float/decimal column
             raise IndeterminableMaximumAttributeError if validation.options[:less_than] && column? && [:float, :decimal].include?(column.type)
-
-            return validation.options[:less_than_or_equal_to] if validation.options[:less_than_or_equal_to]
-            return (validation.options[:less_than] - 1)       if validation.options[:less_than]
+                 
+            if validation.options[:less_than_or_equal_to]
+              return (validation.options[:less_than_or_equal_to].call) if validation.options[:less_than_or_equal_to].kind_of?(Proc)
+              return (validation.options[:less_than_or_equal_to])
+            end
+            
+            if validation.options[:less_than]
+              return (validation.options[:less_than].call - 1) if validation.options[:less_than].kind_of?(Proc)
+              return (validation.options[:less_than] - 1)
+            end
           end
         end
 

From 0b21d5f64b4149e3b0e89a466cf0778b2093909f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 1 Jul 2011 21:12:41 +1000
Subject: [PATCH 859/992] added test to expose missing methods error_list
 error_sentence error_first from Builder, which are required for the
 (deprecated) errors_on/inline_errors_for, fixes #616

---
 lib/formtastic/helpers/errors_helper.rb | 22 ++++++++++++++++++++++
 spec/builder/errors_spec.rb             | 10 ++++++++++
 2 files changed, 32 insertions(+)

diff --git a/lib/formtastic/helpers/errors_helper.rb b/lib/formtastic/helpers/errors_helper.rb
index d65c9b6c0..31729656b 100644
--- a/lib/formtastic/helpers/errors_helper.rb
+++ b/lib/formtastic/helpers/errors_helper.rb
@@ -89,6 +89,28 @@ def inline_errors_for(method, options = {})
       
 
       protected
+      
+      # @deprecated This should be removed with inline_errors_for in 2.1
+      def error_sentence(errors, options = {})
+        error_class = options[:error_class] || default_inline_error_class
+        template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.untaint), :class => error_class)
+      end
+      
+      # @deprecated This should be removed with inline_errors_for in 2.1
+      def error_list(errors, options = {})
+        error_class = options[:error_class] || default_error_list_class
+        list_elements = []
+        errors.each do |error|
+          list_elements <<  template.content_tag(:li, Formtastic::Util.html_safe(error.untaint))
+        end
+        template.content_tag(:ul, Formtastic::Util.html_safe(list_elements.join("\n")), :class => error_class)
+      end
+      
+      # @deprecated This should be removed with inline_errors_for in 2.1
+      def error_first(errors, options = {})
+        error_class = options[:error_class] || default_inline_error_class
+        template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => error_class)
+      end
 
       def error_keys(method, options)
         @methods_for_error ||= {}
diff --git a/spec/builder/errors_spec.rb b/spec/builder/errors_spec.rb
index 5b2711a61..300492f53 100644
--- a/spec/builder/errors_spec.rb
+++ b/spec/builder/errors_spec.rb
@@ -107,6 +107,16 @@
       output_buffer.should_not have_tag('p.inine-errors')
       output_buffer.should_not have_tag('ul.errors')
     end
+    
+    it 'should allow calling deprecated errors_on and inline_errors_for helpers' do
+      Formtastic::FormBuilder.inline_errors = :sentence
+      with_deprecation_silenced do
+        concat(semantic_form_for(@new_post) do |builder|
+          builder.errors_on :title
+          builder.inline_errors_for :title
+        end)
+      end
+    end
 
   end
 

From daac3162d82ecf5e803568555527f378f6c48a26 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 4 Jul 2011 21:11:48 +1000
Subject: [PATCH 860/992] added new configuration  to opt out of HTML5
 attribute, fixes #604

some browsers are doing a really bad/ugly job of client-side requirements and validation, so let each app's authors decide if they want the new shiny or not.
---
 lib/formtastic/form_builder.rb            |  1 +
 lib/formtastic/inputs/base/html.rb        |  2 +-
 lib/formtastic/inputs/base/validations.rb |  4 ++++
 lib/generators/templates/formtastic.rb    |  4 ++++
 spec/inputs/string_input_spec.rb          | 27 ++++++++++++++++++-----
 5 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 70eb2baa8..54b395011 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -28,6 +28,7 @@ def self.configure(name, value = nil)
     configure :default_inline_error_class, 'inline-errors'
     configure :default_error_list_class, 'errors'
     configure :default_hint_class, 'inline-hints'
+    configure :use_required_attribute, true
 
     attr_reader :template
 
diff --git a/lib/formtastic/inputs/base/html.rb b/lib/formtastic/inputs/base/html.rb
index a29d57b18..0e39944fb 100644
--- a/lib/formtastic/inputs/base/html.rb
+++ b/lib/formtastic/inputs/base/html.rb
@@ -21,7 +21,7 @@ def to_html
         def input_html_options
           { 
             :id => dom_id,
-            :required => required?,
+            :required => required_attribute?,
             :autofocus => autofocus?
           }.merge(options[:input_html] || {})
         end
diff --git a/lib/formtastic/inputs/base/validations.rb b/lib/formtastic/inputs/base/validations.rb
index 399f02fae..8606a7315 100644
--- a/lib/formtastic/inputs/base/validations.rb
+++ b/lib/formtastic/inputs/base/validations.rb
@@ -128,6 +128,10 @@ def required?
             return responds_to_global_required? && !!builder.all_fields_required_by_default
           end
         end
+        
+        def required_attribute?
+          required? && builder.use_required_attribute
+        end
 
         def not_required_through_negated_validation?
           @not_required_through_negated_validation
diff --git a/lib/generators/templates/formtastic.rb b/lib/generators/templates/formtastic.rb
index 572d04fc4..c41f96639 100644
--- a/lib/generators/templates/formtastic.rb
+++ b/lib/generators/templates/formtastic.rb
@@ -71,3 +71,7 @@
 # You can add custom inputs or override parts of Formtastic by subclassing Formtastic::FormBuilder and
 # specifying that class here.  Defaults to Formtastic::FormBuilder.
 # Formtastic::Helpers::FormHelper.builder = MyCustomBuilder
+
+# You can opt out of Formtastic's use of the HTML5 `required` attribute on `<input>`, `<select>` 
+# and `<textarea>` tags by setting this to false (defaults to true).
+# Formtastic::FormBuilder.use_required_attribute = false
diff --git a/spec/inputs/string_input_spec.rb b/spec/inputs/string_input_spec.rb
index dbcca9726..5507fff12 100644
--- a/spec/inputs/string_input_spec.rb
+++ b/spec/inputs/string_input_spec.rb
@@ -151,12 +151,29 @@ def should_have_maxlength(maxlength, options)
   end
   
   describe "when required" do
-    it "should add the required attribute to the input's html options" do
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:title, :as => :string, :required => true))
-      end)
-      output_buffer.should have_tag("input[@required]")
+    
+    context "and configured to use HTML5 attribute" do
+      it "should add the required attribute to the input's html options" do
+        with_config :use_required_attribute, true do
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:title, :as => :string, :required => true))
+          end)
+          output_buffer.should have_tag("input[@required]")
+        end
+      end
     end
+
+    context "and configured to not use HTML5 attribute" do
+      it "should add the required attribute to the input's html options" do
+        with_config :use_required_attribute, false do
+          concat(semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:title, :as => :string, :required => true))
+          end)
+          output_buffer.should_not have_tag("input[@required]")
+        end
+      end
+    end
+    
   end
 
 end

From 281dc8998d7876d9eb857d8c50123f1920b35bcf Mon Sep 17 00:00:00 2001
From: Mikael Henriksson <mikael@zoolutions.se>
Date: Mon, 4 Jul 2011 17:37:03 +0200
Subject: [PATCH 861/992] Specs for #606

---
 spec/inputs/number_input_spec.rb | 296 +++++++++++++++++++++++++++++++
 1 file changed, 296 insertions(+)

diff --git a/spec/inputs/number_input_spec.rb b/spec/inputs/number_input_spec.rb
index 4f99ffda3..54cb6249a 100644
--- a/spec/inputs/number_input_spec.rb
+++ b/spec/inputs/number_input_spec.rb
@@ -153,6 +153,84 @@
     
   end
   
+  describe "when validations require a minimum value (:greater_than) that takes a proc" do
+    before do
+      @new_post.class.stub!(:validators_on).with(:title).and_return([
+        active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :greater_than=> Proc.new {|x| 2}})
+      ])
+    end
+    
+    it "should allow :input_html to override :min" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :number, :input_html => { :min => 5 })
+      end)
+      output_buffer.should have_tag('input[@min="5"]')
+    end
+    
+    it "should allow :input_html to override :min through :in" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :number, :input_html => { :in => 5..102 })
+      end)
+      output_buffer.should have_tag('input[@min="5"]')
+    end
+    
+    it "should allow options to override :min" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :number, :min => 5)
+      end)
+      output_buffer.should have_tag('input[@min="5"]')
+    end
+    
+    it "should allow options to override :min through :in" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :number, :in => 5..102)
+      end)
+      output_buffer.should have_tag('input[@min="5"]')
+    end
+    
+    describe "and the column is an integer" do
+      before do
+        @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :integer))
+      end
+      
+      it "should add a min attribute to the input one greater than the validation" do
+        concat(semantic_form_for(@new_post) do |builder|
+          builder.input(:title, :as => :number)
+        end)
+        output_buffer.should have_tag('input[@min="3"]')
+      end
+    end
+    
+    describe "and the column is a float" do
+      before do
+        @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :float))
+      end
+      
+      it "should raise an error" do
+        lambda {
+          concat(semantic_form_for(@new_post) do |builder|
+            builder.input(:title, :as => :number)
+          end)
+        }.should raise_error(Formtastic::Inputs::Base::Validations::IndeterminableMinimumAttributeError)
+      end
+    end
+    
+    describe "and the column is a big decimal" do
+      before do
+        @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :decimal))
+      end
+      
+      it "should raise an error" do
+        lambda {
+          concat(semantic_form_for(@new_post) do |builder|
+            builder.input(:title, :as => :number)
+          end)
+        }.should raise_error(Formtastic::Inputs::Base::Validations::IndeterminableMinimumAttributeError)
+      end
+    end
+    
+  end
+  
   describe "when validations require a minimum value (:greater_than_or_equal_to)" do
     before do
       @new_post.class.stub!(:validators_on).with(:title).and_return([
@@ -217,8 +295,74 @@
       end
     end
   end
+  
+  describe "when validations require a minimum value (:greater_than_or_equal_to) that takes a Proc" do
+     before do
+       @new_post.class.stub!(:validators_on).with(:title).and_return([
+         active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :greater_than_or_equal_to=> Proc.new { |x| 2}})
+       ])
+     end
+
+     it "should allow :input_html to override :min" do
+       concat(semantic_form_for(@new_post) do |builder|
+         builder.input(:title, :as => :number, :input_html => { :min => 5 })
+       end)
+       output_buffer.should have_tag('input[@min="5"]')
+     end
+
+     it "should allow options to override :min" do
+       concat(semantic_form_for(@new_post) do |builder|
+         builder.input(:title, :as => :number, :min => 5)
+       end)
+       output_buffer.should have_tag('input[@min="5"]')
+     end
+
+     it "should allow :input_html to override :min with :in" do
+       concat(semantic_form_for(@new_post) do |builder|
+         builder.input(:title, :as => :number, :input_html => { :in => 5..102 })
+       end)
+       output_buffer.should have_tag('input[@min="5"]')
+     end
+
+     it "should allow options to override :min  with :in" do
+       concat(semantic_form_for(@new_post) do |builder|
+         builder.input(:title, :as => :number, :in => 5..102)
+       end)
+       output_buffer.should have_tag('input[@min="5"]')
+     end
+
+
+     [:integer, :decimal, :float].each do |column_type|
+       describe "and the column is a #{column_type}" do
+         before do
+           @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => column_type))
+         end
+
+         it "should add a max attribute to the input equal to the validation" do
+           concat(semantic_form_for(@new_post) do |builder|
+             builder.input(:title, :as => :number)
+           end)
+           output_buffer.should have_tag('input[@min="2"]')
+         end
+       end
+     end
+
+     describe "and there is no column" do
+       before do
+         @new_post.stub!(:column_for_attribute).with(:title).and_return(nil)
+       end
+
+       it "should add a max attribute to the input equal to the validation" do
+         concat(semantic_form_for(@new_post) do |builder|
+           builder.input(:title, :as => :number)
+         end)
+         output_buffer.should have_tag('input[@min="2"]')
+       end
+     end
+   end
 
   describe "when validations require a maximum value (:less_than)" do
+    
    before do
      @new_post.class.stub!(:validators_on).with(:title).and_return([
        active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :less_than=>20})
@@ -293,9 +437,97 @@
        }.should raise_error(Formtastic::Inputs::Base::Validations::IndeterminableMaximumAttributeError)
      end
    end
+   describe "and the validator takes a proc" do
+     before do
+       @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :decimal))
+     end
+   end
+  end
+  
+  describe "when validations require a maximum value (:less_than) that takes a Proc" do
+    
+   before do
+     @new_post.class.stub!(:validators_on).with(:title).and_return([
+       active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :less_than=> Proc.new {|x| 20 }})
+     ])
+   end
+   
+   it "should allow :input_html to override :max" do
+     concat(semantic_form_for(@new_post) do |builder|
+       builder.input(:title, :as => :number, :input_html => { :max => 102 })
+     end)
+     output_buffer.should have_tag('input[@max="102"]')
+   end
+   
+   it "should allow option to override :max" do
+     concat(semantic_form_for(@new_post) do |builder|
+       builder.input(:title, :as => :number, :max => 102)
+     end)
+     output_buffer.should have_tag('input[@max="102"]')
+   end
    
+   it "should allow :input_html to override :max with :in" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :number, :input_html => { :in => 1..102 })
+      end)
+      output_buffer.should have_tag('input[@max="102"]')
+    end
+
+    it "should allow option to override :max with :in" do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :number, :in => 1..102)
+      end)
+      output_buffer.should have_tag('input[@max="102"]')
+    end
+   
+   describe "and the column is an integer" do
+     before do
+       @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :integer))
+     end
+     
+     it "should add a max attribute to the input one greater than the validation" do
+       concat(semantic_form_for(@new_post) do |builder|
+         builder.input(:title, :as => :number)
+       end)
+       output_buffer.should have_tag('input[@max="19"]')
+     end
+   end
+   
+   describe "and the column is a float" do
+     before do
+       @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :float))
+     end
+     
+     it "should raise an error" do
+       lambda {
+         concat(semantic_form_for(@new_post) do |builder|
+           builder.input(:title, :as => :number)
+         end)
+       }.should raise_error(Formtastic::Inputs::Base::Validations::IndeterminableMaximumAttributeError)
+     end
+   end
+   
+   describe "and the column is a big decimal" do
+     before do
+       @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :decimal))
+     end
+     
+     it "should raise an error" do
+       lambda {
+         concat(semantic_form_for(@new_post) do |builder|
+           builder.input(:title, :as => :number)
+         end)
+       }.should raise_error(Formtastic::Inputs::Base::Validations::IndeterminableMaximumAttributeError)
+     end
+   end
+   describe "and the validator takes a proc" do
+     before do
+       @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => :decimal))
+     end
+   end
   end
   
+  
   describe "when validations require a maximum value (:less_than_or_equal_to)" do
     before do
       @new_post.class.stub!(:validators_on).with(:title).and_return([
@@ -359,6 +591,70 @@
       end
     end
   end
+ 
+  describe "when validations require a maximum value (:less_than_or_equal_to) that takes a proc" do
+     before do
+       @new_post.class.stub!(:validators_on).with(:title).and_return([
+         active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :less_than_or_equal_to=> Proc.new { |x| 20 }})
+       ])
+     end
+
+     it "should allow :input_html to override :max" do
+       concat(semantic_form_for(@new_post) do |builder|
+         builder.input(:title, :as => :number, :input_html => { :max => 102 })
+       end)
+       output_buffer.should have_tag('input[@max="102"]')
+     end
+
+     it "should allow options to override :max" do
+       concat(semantic_form_for(@new_post) do |builder|
+         builder.input(:title, :as => :number, :max => 102)
+       end)
+       output_buffer.should have_tag('input[@max="102"]')
+     end
+
+     it "should allow :input_html to override :max with :in" do
+       concat(semantic_form_for(@new_post) do |builder|
+         builder.input(:title, :as => :number, :input_html => { :in => 1..102 })
+       end)
+       output_buffer.should have_tag('input[@max="102"]')
+     end
+
+     it "should allow options to override :max with :in" do
+       concat(semantic_form_for(@new_post) do |builder|
+         builder.input(:title, :as => :number, :in => 1..102)
+       end)
+       output_buffer.should have_tag('input[@max="102"]')
+     end
+
+     [:integer, :decimal, :float].each do |column_type|
+       describe "and the column is a #{column_type}" do
+         before do
+           @new_post.stub!(:column_for_attribute).with(:title).and_return(mock('column', :type => column_type))
+         end
+
+         it "should add a max attribute to the input equal to the validation" do
+           concat(semantic_form_for(@new_post) do |builder|
+             builder.input(:title, :as => :number)
+           end)
+           output_buffer.should have_tag('input[@max="20"]')
+         end
+       end
+     end
+
+     describe "and there is no column" do
+       before do
+         @new_post.stub!(:column_for_attribute).with(:title).and_return(nil)
+       end
+
+       it "should add a max attribute to the input equal to the validation" do
+         concat(semantic_form_for(@new_post) do |builder|
+           builder.input(:title, :as => :number)
+         end)
+         output_buffer.should have_tag('input[@max="20"]')
+       end
+     end
+   end
   
   describe "when validations require conflicting minimum values (:greater_than, :greater_than_or_equal_to)" do
     before do

From cd66ccc250c7152bcedde741f90ad35e2ec9d8b8 Mon Sep 17 00:00:00 2001
From: Mattias Pfeiffer <mattias@pfeiffer.dk>
Date: Tue, 5 Jul 2011 09:33:40 +0200
Subject: [PATCH 862/992] Failing spec for check_boxes input

---
 spec/inputs/check_boxes_input_spec.rb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index f4d5bbd6f..0d7d62fa0 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -358,6 +358,23 @@
       end
     end
   end
+  
+  describe 'when :collection is provided' do
+    before do
+      @output_buffer = ''
+      mock_everything
+      @fred.stub(:genres) { ['ficton', 'biography'] }
+      
+      concat(semantic_form_for(@fred) do |builder|
+        concat(builder.input(:genres, :as => :check_boxes, :collection => [['Fiction', 'fiction'], ['Non-fiction', 'non_fiction'], ['Biography', 'biography']]))
+      end)
+    end
+    
+    it 'should check the correct checkboxes' do
+      output_buffer.should have_tag("form li fieldset ol li label input[@value='fiction'][@checked='checked']")
+      output_buffer.should have_tag("form li fieldset ol li label input[@value='biography'][@checked='checked']")
+    end
+  end
 
   describe "when namespace is provided" do
 

From 44516caeb2eaf9a1c355bfae779f6bc69821049b Mon Sep 17 00:00:00 2001
From: iscra <ah@gamegenetics.de>
Date: Thu, 7 Jul 2011 18:19:13 +0200
Subject: [PATCH 863/992] attributes in model with #validators_on without
 defined validations should not be required

---
 lib/formtastic/inputs/base/validations.rb | 4 ++--
 spec/helpers/input_helper_spec.rb         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/formtastic/inputs/base/validations.rb b/lib/formtastic/inputs/base/validations.rb
index d05d4762a..11796c5cc 100644
--- a/lib/formtastic/inputs/base/validations.rb
+++ b/lib/formtastic/inputs/base/validations.rb
@@ -27,7 +27,7 @@ def validations
               validator_relevant?(validator)
             end
           else
-            []
+            nil
           end
         end
 
@@ -126,7 +126,7 @@ def validation_integer_only?
         end
 
         def validations?
-          !validations.empty?
+          validations != nil
         end
 
         def required?
diff --git a/spec/helpers/input_helper_spec.rb b/spec/helpers/input_helper_spec.rb
index 33ecc960f..2cb8ee277 100644
--- a/spec/helpers/input_helper_spec.rb
+++ b/spec/helpers/input_helper_spec.rb
@@ -263,12 +263,12 @@ def length_should_be_required(options)
               @new_post.class.should_receive(:validators_on).with(:title).and_return([])
             end
         
-            it 'should use the default value' do
+            it 'should not be required' do
               concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title))
               end)
-              output_buffer.should have_tag('form li.required')
-              output_buffer.should_not have_tag('form li.optional')
+              output_buffer.should_not have_tag('form li.required')
+              output_buffer.should have_tag('form li.optional')
             end
           end
         

From 210138e7f4a69214c47580603d3b2306f1ae451a Mon Sep 17 00:00:00 2001
From: Corin Langosch <corin.langosch@netskin.com>
Date: Fri, 8 Jul 2011 14:02:59 +0200
Subject: [PATCH 864/992] moved ie specific css to ie files

---
 app/assets/stylesheets/formtastic.css     | 6 +++---
 app/assets/stylesheets/formtastic_ie6.css | 8 +++++++-
 app/assets/stylesheets/formtastic_ie7.css | 8 +++++++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/formtastic.css b/app/assets/stylesheets/formtastic.css
index 95b49bfc1..e06160e09 100644
--- a/app/assets/stylesheets/formtastic.css
+++ b/app/assets/stylesheets/formtastic.css
@@ -83,7 +83,7 @@ This stylesheet forms part of the Formtastic Rails Plugin
 /* BUTTONS
 --------------------------------------------------------------------------------------------------*/
 .formtastic .buttons {
-  overflow:hidden; zoom:1; /* clear containing floats */
+  overflow:hidden; /* clear containing floats */
   padding-left:25%;
 }
 
@@ -96,11 +96,11 @@ This stylesheet forms part of the Formtastic Rails Plugin
 /* INPUTS
 --------------------------------------------------------------------------------------------------*/
 .formtastic .inputs {
-  overflow:hidden; zoom:1; /* clear containing floats */
+  overflow:hidden; /* clear containing floats */
 }
 
 .formtastic .input {
-  overflow:hidden; zoom:1; /* clear containing floats */
+  overflow:hidden; /* clear containing floats */
   padding:0.5em 0; /* padding and negative margin juggling is for Firefox */
   margin-top:-0.5em;
   margin-bottom:1em;
diff --git a/app/assets/stylesheets/formtastic_ie6.css b/app/assets/stylesheets/formtastic_ie6.css
index 46756de1c..b864ed415 100644
--- a/app/assets/stylesheets/formtastic_ie6.css
+++ b/app/assets/stylesheets/formtastic_ie6.css
@@ -24,4 +24,10 @@
 /* fragment (eg year, month, day) appear a few pixels too far to the left*/
 .formtastic .fragment {
   padding-left:3px;
-}
\ No newline at end of file
+}
+
+.formtastic .buttons,
+.formtastic .inputs,
+.formtastic .input {
+  zoom:1;
+}
diff --git a/app/assets/stylesheets/formtastic_ie7.css b/app/assets/stylesheets/formtastic_ie7.css
index 9f3840f14..694c942af 100644
--- a/app/assets/stylesheets/formtastic_ie7.css
+++ b/app/assets/stylesheets/formtastic_ie7.css
@@ -14,4 +14,10 @@
   size:15px;
   margin-left:0;
   margin-right:0;
-}
\ No newline at end of file
+}
+
+.formtastic .buttons,
+.formtastic .inputs,
+.formtastic .input {
+  zoom:1;
+}

From 504ec7a3aa7e88a207aca2bddaa6e287d84fce17 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 14 Jul 2011 12:55:18 +1000
Subject: [PATCH 865/992] FIX for mongo patches under 3.1

---
 spec/spec_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 2278e76f8..07c914dfe 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -291,7 +291,7 @@ def new_author_path; "/authors/new"; end
     ::MongoPost.stub!(:to_key).and_return(nil)
     ::MongoPost.stub!(:persisted?).and_return(nil)
     ::MongoPost.stub!(:to_ary)
-    ::MongoPost.stub!(:model_name).and_return( mock(:model_name_mock, :singular => "post", :plural => "posts") ) 
+    ::MongoPost.stub!(:model_name).and_return( mock(:model_name_mock, :singular => "post", :plural => "posts", :param_key => "post", :route_key => "posts") ) 
 
     @new_mm_post = mock('mm_post')
     @new_mm_post.stub!(:class).and_return(::MongoPost)

From 7afcf0fa09709c12e880c37d432949c7ed05bb95 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 14 Jul 2011 13:33:06 +1000
Subject: [PATCH 866/992] Patch for 44516ca under Rails 3.1 there was a
 "multiple values for a block parameter" warning because the object wasn't
 being passed into the call().

---
 lib/formtastic/inputs/base/validations.rb | 8 ++++----
 spec/inputs/number_input_spec.rb          | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/formtastic/inputs/base/validations.rb b/lib/formtastic/inputs/base/validations.rb
index 11796c5cc..023a09ee7 100644
--- a/lib/formtastic/inputs/base/validations.rb
+++ b/lib/formtastic/inputs/base/validations.rb
@@ -71,12 +71,12 @@ def validation_min
             raise IndeterminableMinimumAttributeError if validation.options[:greater_than] && column? && [:float, :decimal].include?(column.type)
  
             if validation.options[:greater_than_or_equal_to]
-              return (validation.options[:greater_than_or_equal_to].call) if validation.options[:greater_than_or_equal_to].kind_of?(Proc)
+              return (validation.options[:greater_than_or_equal_to].call(object)) if validation.options[:greater_than_or_equal_to].kind_of?(Proc)
               return (validation.options[:greater_than_or_equal_to])
             end
             
             if validation.options[:greater_than]
-              return (validation.options[:greater_than].call + 1) if validation.options[:greater_than].kind_of?(Proc)
+              return (validation.options[:greater_than].call(object) + 1) if validation.options[:greater_than].kind_of?(Proc)
               return (validation.options[:greater_than] + 1)
             end
           end
@@ -92,12 +92,12 @@ def validation_max
             raise IndeterminableMaximumAttributeError if validation.options[:less_than] && column? && [:float, :decimal].include?(column.type)
                  
             if validation.options[:less_than_or_equal_to]
-              return (validation.options[:less_than_or_equal_to].call) if validation.options[:less_than_or_equal_to].kind_of?(Proc)
+              return (validation.options[:less_than_or_equal_to].call(object)) if validation.options[:less_than_or_equal_to].kind_of?(Proc)
               return (validation.options[:less_than_or_equal_to])
             end
             
             if validation.options[:less_than]
-              return (validation.options[:less_than].call - 1) if validation.options[:less_than].kind_of?(Proc)
+              return ((validation.options[:less_than].call(object)) - 1) if validation.options[:less_than].kind_of?(Proc)
               return (validation.options[:less_than] - 1)
             end
           end
diff --git a/spec/inputs/number_input_spec.rb b/spec/inputs/number_input_spec.rb
index 54cb6249a..e9c8f6e75 100644
--- a/spec/inputs/number_input_spec.rb
+++ b/spec/inputs/number_input_spec.rb
@@ -156,7 +156,7 @@
   describe "when validations require a minimum value (:greater_than) that takes a proc" do
     before do
       @new_post.class.stub!(:validators_on).with(:title).and_return([
-        active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :greater_than=> Proc.new {|x| 2}})
+        active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :greater_than=> Proc.new {|post| 2}})
       ])
     end
     
@@ -299,7 +299,7 @@
   describe "when validations require a minimum value (:greater_than_or_equal_to) that takes a Proc" do
      before do
        @new_post.class.stub!(:validators_on).with(:title).and_return([
-         active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :greater_than_or_equal_to=> Proc.new { |x| 2}})
+         active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :greater_than_or_equal_to=> Proc.new { |post| 2}})
        ])
      end
 
@@ -448,7 +448,7 @@
     
    before do
      @new_post.class.stub!(:validators_on).with(:title).and_return([
-       active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :less_than=> Proc.new {|x| 20 }})
+       active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :less_than=> Proc.new {|post| 20 }})
      ])
    end
    
@@ -595,7 +595,7 @@
   describe "when validations require a maximum value (:less_than_or_equal_to) that takes a proc" do
      before do
        @new_post.class.stub!(:validators_on).with(:title).and_return([
-         active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :less_than_or_equal_to=> Proc.new { |x| 20 }})
+         active_model_numericality_validator([:title], {:only_integer=>false, :allow_nil=>false, :less_than_or_equal_to=> Proc.new { |post| 20 }})
        ])
      end
 

From a19f006cef184e94712b46f0ae6dbfd4841c7af6 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 19 Jul 2011 17:36:12 +1000
Subject: [PATCH 867/992] remove the abstraction wrapper method that
 semantic_fields_for and semantic_form_for rely on (they've diverged in Rails
 3.1) ref #568

---
 lib/formtastic/helpers/form_helper.rb | 31 +++++++++++++++++++--------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/lib/formtastic/helpers/form_helper.rb b/lib/formtastic/helpers/form_helper.rb
index 7e67a03e4..5e7abbe4c 100644
--- a/lib/formtastic/helpers/form_helper.rb
+++ b/lib/formtastic/helpers/form_helper.rb
@@ -140,7 +140,25 @@ module FormHelper
       #
       # @option *args [String] :namespace
       def semantic_form_for(record_or_name_or_array, *args, &proc)
-        form_helper_wrapper(:form_for, record_or_name_or_array, *args, &proc)
+        options = args.extract_options!
+        options[:builder] ||= @@builder
+        options[:html] ||= {}
+        @@builder.custom_namespace = options[:namespace].to_s
+
+        singularizer = defined?(ActiveModel::Naming.singular) ? ActiveModel::Naming.method(:singular) : ActionController::RecordIdentifier.method(:singular_class_name)
+
+        class_names = options[:html][:class] ? options[:html][:class].split(" ") : []
+        class_names << @@default_form_class
+        class_names << case record_or_name_or_array
+          when String, Symbol then record_or_name_or_array.to_s                                  # :post => "post"
+          when Array then options[:as] || singularizer.call(record_or_name_or_array.last.class)  # [@post, @comment] # => "comment"
+          else options[:as] || singularizer.call(record_or_name_or_array.class)                  # @post => "post"
+        end
+        options[:html][:class] = class_names.join(" ")
+
+        with_custom_field_error_proc do
+          self.form_for(record_or_name_or_array, *(args << options), &proc)
+        end
       end
 
       # Wrapper around Rails' own `fields_for` helper to set the `:builder` option to
@@ -148,13 +166,6 @@ def semantic_form_for(record_or_name_or_array, *args, &proc)
       #
       # @see #semantic_form_for
       def semantic_fields_for(record_or_name_or_array, *args, &proc)
-        form_helper_wrapper(:fields_for, record_or_name_or_array, *args, &proc)
-      end
-
-      protected
-
-      # @todo pretty sure some of this (like HTML classes and record naming are exlusive to `form_for`)
-      def form_helper_wrapper(rails_helper_method_name, record_or_name_or_array, *args, &proc)
         options = args.extract_options!
         options[:builder] ||= @@builder
         options[:html] ||= {}
@@ -172,9 +183,11 @@ def form_helper_wrapper(rails_helper_method_name, record_or_name_or_array, *args
         options[:html][:class] = class_names.join(" ")
 
         with_custom_field_error_proc do
-          self.send(rails_helper_method_name, record_or_name_or_array, *(args << options), &proc)
+          self.fields_for(record_or_name_or_array, *(args << options), &proc)
         end
       end
+      
+      protected
 
       # Override the default ActiveRecordHelper behaviour of wrapping the input.
       # This gets taken care of semantically by adding an error class to the LI tag

From 14010b8742a29250cdb87c86a92f801fe4f88545 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 19 Jul 2011 17:39:49 +1000
Subject: [PATCH 868/992] remove the stuff that sematnci_fields_for doesn't
 need

---
 lib/formtastic/helpers/form_helper.rb | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/lib/formtastic/helpers/form_helper.rb b/lib/formtastic/helpers/form_helper.rb
index 5e7abbe4c..77ec460a7 100644
--- a/lib/formtastic/helpers/form_helper.rb
+++ b/lib/formtastic/helpers/form_helper.rb
@@ -168,19 +168,7 @@ def semantic_form_for(record_or_name_or_array, *args, &proc)
       def semantic_fields_for(record_or_name_or_array, *args, &proc)
         options = args.extract_options!
         options[:builder] ||= @@builder
-        options[:html] ||= {}
-        @@builder.custom_namespace = options[:namespace].to_s
-
-        singularizer = defined?(ActiveModel::Naming.singular) ? ActiveModel::Naming.method(:singular) : ActionController::RecordIdentifier.method(:singular_class_name)
-
-        class_names = options[:html][:class] ? options[:html][:class].split(" ") : []
-        class_names << @@default_form_class
-        class_names << case record_or_name_or_array
-          when String, Symbol then record_or_name_or_array.to_s                                  # :post => "post"
-          when Array then options[:as] || singularizer.call(record_or_name_or_array.last.class)  # [@post, @comment] # => "comment"
-          else options[:as] || singularizer.call(record_or_name_or_array.class)                  # @post => "post"
-        end
-        options[:html][:class] = class_names.join(" ")
+        @@builder.custom_namespace = options[:namespace].to_s # TODO needed?
 
         with_custom_field_error_proc do
           self.fields_for(record_or_name_or_array, *(args << options), &proc)

From d674c4a2db51feef3d2b9f458f9db867fa2da495 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 19 Jul 2011 17:48:06 +1000
Subject: [PATCH 869/992] Altered semantic_fields_for to work with Rails 3
 *and* 3.1's method sigs (I hope) Many thanks to the simple_form guys for
 figuring this out before I did :) ref #568

---
 lib/formtastic/helpers/form_helper.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic/helpers/form_helper.rb b/lib/formtastic/helpers/form_helper.rb
index 77ec460a7..51cf3f8ad 100644
--- a/lib/formtastic/helpers/form_helper.rb
+++ b/lib/formtastic/helpers/form_helper.rb
@@ -165,13 +165,13 @@ def semantic_form_for(record_or_name_or_array, *args, &proc)
       # `Formtastic::FormBuilder`.
       #
       # @see #semantic_form_for
-      def semantic_fields_for(record_or_name_or_array, *args, &proc)
-        options = args.extract_options!
+      def semantic_fields_for(record_name, record_object = nil, options = {}, &block)
+        options, record_object = record_object, nil if record_object.is_a?(Hash)
         options[:builder] ||= @@builder
         @@builder.custom_namespace = options[:namespace].to_s # TODO needed?
 
         with_custom_field_error_proc do
-          self.fields_for(record_or_name_or_array, *(args << options), &proc)
+          self.fields_for(record_name, record_object, options, &block)
         end
       end
       

From 9ce1721a4d283b2a6d04600c4945f13559565170 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 19 Jul 2011 20:14:24 +1000
Subject: [PATCH 870/992] these should be testing semantic_fields_for, not
 fields_for ref #568

---
 spec/builder/semantic_fields_for_spec.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spec/builder/semantic_fields_for_spec.rb b/spec/builder/semantic_fields_for_spec.rb
index 085698172..84307a50e 100644
--- a/spec/builder/semantic_fields_for_spec.rb
+++ b/spec/builder/semantic_fields_for_spec.rb
@@ -13,7 +13,7 @@
 
   it 'yields an instance of FormHelper.builder' do
     semantic_form_for(@new_post) do |builder|
-      builder.fields_for(:author) do |nested_builder|
+      builder.semantic_fields_for(:author) do |nested_builder|
         nested_builder.class.should == Formtastic::Helpers::FormHelper.builder
       end
     end
@@ -21,7 +21,7 @@
 
   it 'nests the object name' do
     semantic_form_for(@new_post) do |builder|
-      builder.fields_for(@bob) do |nested_builder|
+      builder.semantic_fields_for(@bob) do |nested_builder|
         nested_builder.object_name.should == 'post[author]'
       end
     end
@@ -38,7 +38,7 @@
   it 'should sanitize html id for li tag' do
     @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
     concat(semantic_form_for(@new_post) do |builder|
-      concat(builder.fields_for(@bob, :index => 1) do |nested_builder|
+      concat(builder.semantic_fields_for(@bob, :index => 1) do |nested_builder|
         concat(nested_builder.inputs(:login))
       end)
     end)
@@ -51,7 +51,7 @@
   it 'should use namespace provided in nested fields' do
     @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
     concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
-      concat(builder.fields_for(@bob, :index => 1) do |nested_builder|
+      concat(builder.semantic_fields_for(@bob, :index => 1) do |nested_builder|
         concat(nested_builder.inputs(:login))
       end)
     end)
@@ -68,7 +68,7 @@
       @fred.stub!(:posts_attributes=)
 
       concat(semantic_form_for(@fred) do |builder|
-        concat(builder.fields_for(:posts) do |nested_builder|
+        concat(builder.semantic_fields_for(:posts) do |nested_builder|
           concat(nested_builder.input(:id, :as => :hidden))
           concat(nested_builder.input(:title))
         end)

From 06790f4965b33b3d5c21e18e950041560c2d33b8 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 19 Jul 2011 20:15:17 +1000
Subject: [PATCH 871/992] add a context around these tests

---
 spec/builder/semantic_fields_for_spec.rb | 76 ++++++++++++------------
 1 file changed, 39 insertions(+), 37 deletions(-)

diff --git a/spec/builder/semantic_fields_for_spec.rb b/spec/builder/semantic_fields_for_spec.rb
index 84307a50e..a30b5c3e9 100644
--- a/spec/builder/semantic_fields_for_spec.rb
+++ b/spec/builder/semantic_fields_for_spec.rb
@@ -11,51 +11,53 @@
     @new_post.stub!(:author).and_return(::Author.new)
   end
 
-  it 'yields an instance of FormHelper.builder' do
-    semantic_form_for(@new_post) do |builder|
-      builder.semantic_fields_for(:author) do |nested_builder|
-        nested_builder.class.should == Formtastic::Helpers::FormHelper.builder
+  context 'within a form_for block' do
+    it 'yields an instance of FormHelper.builder' do
+      semantic_form_for(@new_post) do |builder|
+        builder.semantic_fields_for(:author) do |nested_builder|
+          nested_builder.class.should == Formtastic::Helpers::FormHelper.builder
+        end
       end
     end
-  end
-
-  it 'nests the object name' do
-    semantic_form_for(@new_post) do |builder|
-      builder.semantic_fields_for(@bob) do |nested_builder|
-        nested_builder.object_name.should == 'post[author]'
+    
+    it 'nests the object name' do
+      semantic_form_for(@new_post) do |builder|
+        builder.semantic_fields_for(@bob) do |nested_builder|
+          nested_builder.object_name.should == 'post[author]'
+        end
       end
     end
-  end
-  
-  it 'supports passing collection as second parameter' do
-    semantic_form_for(@new_post) do |builder|
-      builder.semantic_fields_for(:author, [@fred,@bob]) do |nested_builder|
-        nested_builder.object_name.should =~ /post\[author_attributes\]\[\d+\]/
+    
+    it 'supports passing collection as second parameter' do
+      semantic_form_for(@new_post) do |builder|
+        builder.semantic_fields_for(:author, [@fred,@bob]) do |nested_builder|
+          nested_builder.object_name.should =~ /post\[author_attributes\]\[\d+\]/
+        end
       end
     end
-  end
-
-  it 'should sanitize html id for li tag' do
-    @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
-    concat(semantic_form_for(@new_post) do |builder|
-      concat(builder.semantic_fields_for(@bob, :index => 1) do |nested_builder|
-        concat(nested_builder.inputs(:login))
+    
+    it 'should sanitize html id for li tag' do
+      @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.semantic_fields_for(@bob, :index => 1) do |nested_builder|
+          concat(nested_builder.inputs(:login))
+        end)
       end)
-    end)
-    output_buffer.should have_tag('form fieldset.inputs #post_author_1_login_input')
-    # Not valid selector, so using good ol' regex
-    output_buffer.should_not =~ /id="post\[author\]_1_login_input"/
-    # <=> output_buffer.should_not have_tag('form fieldset.inputs #post[author]_1_login_input')
-  end
-
-  it 'should use namespace provided in nested fields' do
-    @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
-    concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
-      concat(builder.semantic_fields_for(@bob, :index => 1) do |nested_builder|
-        concat(nested_builder.inputs(:login))
+      output_buffer.should have_tag('form fieldset.inputs #post_author_1_login_input')
+      # Not valid selector, so using good ol' regex
+      output_buffer.should_not =~ /id="post\[author\]_1_login_input"/
+      # <=> output_buffer.should_not have_tag('form fieldset.inputs #post[author]_1_login_input')
+    end
+    
+    it 'should use namespace provided in nested fields' do
+      @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
+      concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+        concat(builder.semantic_fields_for(@bob, :index => 1) do |nested_builder|
+          concat(nested_builder.inputs(:login))
+        end)
       end)
-    end)
-    output_buffer.should have_tag('form fieldset.inputs #context2_post_author_1_login_input')
+      output_buffer.should have_tag('form fieldset.inputs #context2_post_author_1_login_input')
+    end
   end
   
   context "when I rendered my own hidden id input" do 

From 8a448812986f0461a87f471cfa489ac729ea0247 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 19 Jul 2011 20:22:02 +1000
Subject: [PATCH 872/992] added more coverage for semantic_fields_for ref #568

---
 spec/builder/semantic_fields_for_spec.rb | 26 ++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/spec/builder/semantic_fields_for_spec.rb b/spec/builder/semantic_fields_for_spec.rb
index a30b5c3e9..8c4ebde3c 100644
--- a/spec/builder/semantic_fields_for_spec.rb
+++ b/spec/builder/semantic_fields_for_spec.rb
@@ -11,6 +11,32 @@
     @new_post.stub!(:author).and_return(::Author.new)
   end
 
+  context 'outside a form_for block' do
+    it 'yields an instance of FormHelper.builder' do
+      semantic_fields_for(@new_post) do |nested_builder|
+        nested_builder.class.should == Formtastic::Helpers::FormHelper.builder
+      end
+      semantic_fields_for(@new_post.author) do |nested_builder|
+        nested_builder.class.should == Formtastic::Helpers::FormHelper.builder
+      end
+      semantic_fields_for(:author, @new_post.author) do |nested_builder|
+        nested_builder.class.should == Formtastic::Helpers::FormHelper.builder
+      end
+    end
+    
+    it 'should respond to input' do
+      semantic_fields_for(@new_post) do |nested_builder|
+        nested_builder.respond_to?(:input).should be_true
+      end
+      semantic_fields_for(@new_post.author) do |nested_builder|
+        nested_builder.respond_to?(:input).should be_true
+      end
+      semantic_fields_for(:author, @new_post.author) do |nested_builder|
+        nested_builder.respond_to?(:input).should be_true
+      end
+    end
+  end
+  
   context 'within a form_for block' do
     it 'yields an instance of FormHelper.builder' do
       semantic_form_for(@new_post) do |builder|

From aac8d75abb7facbf939b88e8d0f8ae9e216a0972 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 19 Jul 2011 20:58:49 +1000
Subject: [PATCH 873/992] require rake < 0.9 for now

---
 Gemfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Gemfile b/Gemfile
index a1b93f3ed..17b2ca7f9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,5 @@
 source :rubygems
 
+gem 'rake', '< 0.9'
+
 gemspec

From 131f3508e7e435671010fbc105f0ba4d894ea407 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 20 Jul 2011 07:41:48 +1000
Subject: [PATCH 874/992] Fix bug when simple_fields_for is used with a hask
 like model

Thanks to @rafaelfranca and @spohlenz fixing in simple_form and Rails!

See:
https://github.com/plataformatec/simple_form/commit/14b6263ee270af4ac972703f78cb5a2b4586033c
https://github.com/rails/rails/pull/1778

ref #568
---
 lib/formtastic/helpers/form_helper.rb    |  2 +-
 spec/builder/semantic_fields_for_spec.rb | 15 ++++++++++++++-
 spec/spec_helper.rb                      | 15 +++++++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic/helpers/form_helper.rb b/lib/formtastic/helpers/form_helper.rb
index 51cf3f8ad..ddb0c9237 100644
--- a/lib/formtastic/helpers/form_helper.rb
+++ b/lib/formtastic/helpers/form_helper.rb
@@ -166,7 +166,7 @@ def semantic_form_for(record_or_name_or_array, *args, &proc)
       #
       # @see #semantic_form_for
       def semantic_fields_for(record_name, record_object = nil, options = {}, &block)
-        options, record_object = record_object, nil if record_object.is_a?(Hash)
+        options, record_object = record_object, nil if record_object.is_a?(Hash) && record_object.extractable_options?
         options[:builder] ||= @@builder
         @@builder.custom_namespace = options[:namespace].to_s # TODO needed?
 
diff --git a/spec/builder/semantic_fields_for_spec.rb b/spec/builder/semantic_fields_for_spec.rb
index 8c4ebde3c..d78d657f0 100644
--- a/spec/builder/semantic_fields_for_spec.rb
+++ b/spec/builder/semantic_fields_for_spec.rb
@@ -22,6 +22,9 @@
       semantic_fields_for(:author, @new_post.author) do |nested_builder|
         nested_builder.class.should == Formtastic::Helpers::FormHelper.builder
       end
+      semantic_fields_for(:author, @hash_backed_author) do |nested_builder|
+        nested_builder.class.should == Formtastic::Helpers::FormHelper.builder
+      end
     end
     
     it 'should respond to input' do
@@ -34,6 +37,9 @@
       semantic_fields_for(:author, @new_post.author) do |nested_builder|
         nested_builder.respond_to?(:input).should be_true
       end
+      semantic_fields_for(:author, @hash_backed_author) do |nested_builder|
+        nested_builder.respond_to?(:input).should be_true
+      end
     end
   end
   
@@ -46,6 +52,14 @@
       end
     end
     
+    it 'yields an instance of FormHelper.builder with hash-like model' do
+      semantic_form_for(:user) do |builder|
+        builder.semantic_fields_for(:author, @hash_backed_author) do |nested_builder|
+          nested_builder.class.should == Formtastic::Helpers::FormHelper.builder
+        end
+      end
+    end
+    
     it 'nests the object name' do
       semantic_form_for(@new_post) do |builder|
         builder.semantic_fields_for(@bob) do |nested_builder|
@@ -113,4 +127,3 @@
   end
 
 end
-
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 07c914dfe..9a5af26aa 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -93,6 +93,7 @@ def id
     def persisted?
     end
   end
+  
   module ::Namespaced
     class Post
       extend ActiveModel::Naming if defined?(ActiveModel::Naming)
@@ -105,6 +106,7 @@ def persisted?
       end
     end
   end
+  
   class ::Author
     extend ActiveModel::Naming if defined?(ActiveModel::Naming)
     include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
@@ -115,10 +117,21 @@ def to_label
     def persisted?
     end
   end
+  
+  class ::HashBackedAuthor < Hash
+    extend ActiveModel::Naming if defined?(ActiveModel::Naming)
+    include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
+    def persisted?; false; end
+    def name
+      'hash backed author'
+    end
+  end
+  
   class ::Continent
     extend ActiveModel::Naming if defined?(ActiveModel::Naming)
     include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
   end
+  
   class ::PostModel
     extend ActiveModel::Naming if defined?(ActiveModel::Naming)
     include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
@@ -209,6 +222,8 @@ def new_author_path; "/authors/new"; end
     ::Author.stub!(:to_key).and_return(nil)
     ::Author.stub!(:persisted?).and_return(nil)
 
+    @hash_backed_author = HashBackedAuthor.new
+    
     # Sometimes we need a mock @post object and some Authors for belongs_to
     @new_post = mock('post')
     @new_post.stub!(:class).and_return(::Post)

From 4eb72a88f00be52662a2bd3bae3f166a533fd5c0 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 20 Jul 2011 17:04:46 +1000
Subject: [PATCH 875/992] don't add the required attribute to the choices in a
 :radio or :check_boxes input, fixes #628

---
 lib/formtastic/inputs/check_boxes_input.rb |  4 ++--
 lib/formtastic/inputs/radio_input.rb       |  2 +-
 spec/inputs/check_boxes_input_spec.rb      | 10 ++++------
 spec/inputs/radio_input_spec.rb            | 11 +++++------
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index 7ab3d5825..c3b319c2e 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -127,7 +127,7 @@ def check_box_with_hidden_input(choice)
         value = choice_value(choice)
         builder.check_box(
           association_primary_key || method, 
-          input_html_options.merge(:id => choice_input_dom_id(choice), :name => input_name, :disabled => disabled?(value)), 
+          input_html_options.merge(:id => choice_input_dom_id(choice), :name => input_name, :disabled => disabled?(value), :required => false), 
           value, 
           unchecked_value
         )
@@ -139,7 +139,7 @@ def check_box_without_hidden_input(choice)
           input_name, 
           value, 
           checked?(value), 
-          input_html_options.merge(:id => choice_input_dom_id(choice), :disabled => disabled?(value))
+          input_html_options.merge(:id => choice_input_dom_id(choice), :disabled => disabled?(value), :required => false)
         ) 
       end
       
diff --git a/lib/formtastic/inputs/radio_input.rb b/lib/formtastic/inputs/radio_input.rb
index 083750b17..adee75958 100644
--- a/lib/formtastic/inputs/radio_input.rb
+++ b/lib/formtastic/inputs/radio_input.rb
@@ -140,7 +140,7 @@ def to_html
 
       def choice_html(choice)        
         template.content_tag(:label,
-          builder.radio_button(input_name, choice_value(choice), input_html_options.merge(choice_html_options(choice))) << 
+          builder.radio_button(input_name, choice_value(choice), input_html_options.merge(choice_html_options(choice)).merge(:required => false)) << 
           choice_label(choice),
           label_html_options.merge(:for => choice_input_dom_id(choice), :class => nil)
         )
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index f4d5bbd6f..0e0668ae2 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -61,6 +61,10 @@
         output_buffer.should_not have_tag('li.choice label.label')
       end
       
+      it 'should not be marked as required' do
+        output_buffer.should_not have_tag('li.choice input[@required]')
+      end
+      
       it 'should contain a label for the radio input with a nested input and label text' do
         ::Post.all.each do |post|
           output_buffer.should have_tag('form li fieldset ol li label', /#{post.to_label}/)
@@ -74,12 +78,6 @@
         end
       end
       
-      it "should add the required attribute to the input's html options" do
-        ::Post.all.each do |post|
-          output_buffer.should have_tag("form li fieldset ol li.post_#{post.id} input[@required]")
-        end
-      end
-
       it 'should have a checkbox input but no hidden field for each post' do
         ::Post.all.each do |post|
           output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 05fee5f3e..808f5a26d 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -50,6 +50,11 @@
         output_buffer.should_not have_tag('li.choice label.label')
       end
       
+      it 'should not add the required attribute to each input' do
+        output_buffer.should_not have_tag('li.choice input[@required]')
+      end
+      
+      
       it 'should contain a label for the radio input with a nested input and label text' do
         ::Author.all.each do |author|
           output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
@@ -63,12 +68,6 @@
         end
       end
       
-      it "should add the required attribute to the input's html options" do
-        ::Author.all.each do |post|
-          output_buffer.should have_tag("form li fieldset ol li.author_#{post.id} input[@required]")
-        end
-      end
-
       it "should have a radio input" do
         ::Author.all.each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#post_author_id_#{author.id}")

From 2223df84aebae0ef822891322cfe2070abbe80c2 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 20 Jul 2011 17:30:30 +1000
Subject: [PATCH 876/992] Added a configuration 'perform_browser_validations'
 to opt out of HTML5 browser validations.

* Set to 'true' by default
* When set to false, a 'novalidate' attribute is added to the `<form>` tag
* Can be overridden on a form-by-form basis with :html => { :novalidate => true }

Related to #626
---
 lib/formtastic/form_builder.rb         |  1 +
 lib/formtastic/helpers/form_helper.rb  |  1 +
 lib/generators/templates/formtastic.rb |  5 ++++
 spec/helpers/form_helper_spec.rb       | 32 ++++++++++++++++++++++++++
 4 files changed, 39 insertions(+)

diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 54b395011..1dedd9b57 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -29,6 +29,7 @@ def self.configure(name, value = nil)
     configure :default_error_list_class, 'errors'
     configure :default_hint_class, 'inline-hints'
     configure :use_required_attribute, true
+    configure :perform_browser_validations, true
 
     attr_reader :template
 
diff --git a/lib/formtastic/helpers/form_helper.rb b/lib/formtastic/helpers/form_helper.rb
index ddb0c9237..59f3f5a6c 100644
--- a/lib/formtastic/helpers/form_helper.rb
+++ b/lib/formtastic/helpers/form_helper.rb
@@ -143,6 +143,7 @@ def semantic_form_for(record_or_name_or_array, *args, &proc)
         options = args.extract_options!
         options[:builder] ||= @@builder
         options[:html] ||= {}
+        options[:html][:novalidate] = builder.perform_browser_validations unless options[:html].key?(:novalidate)
         @@builder.custom_namespace = options[:namespace].to_s
 
         singularizer = defined?(ActiveModel::Naming.singular) ? ActiveModel::Naming.method(:singular) : ActionController::RecordIdentifier.method(:singular_class_name)
diff --git a/lib/generators/templates/formtastic.rb b/lib/generators/templates/formtastic.rb
index c41f96639..646a8172c 100644
--- a/lib/generators/templates/formtastic.rb
+++ b/lib/generators/templates/formtastic.rb
@@ -75,3 +75,8 @@
 # You can opt out of Formtastic's use of the HTML5 `required` attribute on `<input>`, `<select>` 
 # and `<textarea>` tags by setting this to false (defaults to true).
 # Formtastic::FormBuilder.use_required_attribute = false
+
+# You can opt out of new HTML5 browser validations (for things like email and url inputs) by setting
+# this to false. Doing so will add a `novalidate` attribute to the `<form>` tag.
+# See http://diveintohtml5.org/forms.html#validation for more info.
+# Formtastic::FormBuilder.perform_browser_validations = true
diff --git a/spec/helpers/form_helper_spec.rb b/spec/helpers/form_helper_spec.rb
index f0a69530d..c5f9e0893 100644
--- a/spec/helpers/form_helper_spec.rb
+++ b/spec/helpers/form_helper_spec.rb
@@ -23,6 +23,38 @@
       end)
       output_buffer.should have_tag("form.formtastic")
     end
+    
+    it 'adds a "novalidate" attribute to the generated form when configured to do so' do
+      with_config :perform_browser_validations, true do
+        concat(semantic_form_for(@new_post, :url => '/hello') do |builder|
+        end)
+        output_buffer.should have_tag("form[@novalidate]")
+      end
+    end
+    
+    it 'omits a "novalidate" attribute to the generated form when configured to do so' do
+      with_config :perform_browser_validations, false do
+        concat(semantic_form_for(@new_post, :url => '/hello') do |builder|
+        end)
+        output_buffer.should_not have_tag("form[@novalidate]")
+      end
+    end
+
+    it 'allows form HTML to override "novalidate" attribute when configure to not show' do
+      with_config :perform_browser_validations, false do
+        concat(semantic_form_for(@new_post, :url => '/hello', :html => { :novalidate => true }) do |builder|
+        end)
+        output_buffer.should have_tag("form[@novalidate]")
+      end
+    end
+
+    it 'allows form HTML to override "novalidate" attribute when configure to show' do
+      with_config :perform_browser_validations, true do
+        concat(semantic_form_for(@new_post, :url => '/hello', :html => { :novalidate => false }) do |builder|
+        end)
+        output_buffer.should_not have_tag("form[@novalidate]")
+      end
+    end
 
     it 'adds a class of "xyz" to the generated form' do
       Formtastic::Helpers::FormHelper.default_form_class = 'xyz'

From c8509d98b3d45379b5709fa6a680780bb239a178 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 22 Jul 2011 08:01:14 +1000
Subject: [PATCH 877/992] Revert "Merge pull request #619 from
 pfeiffer/checkboxes"

This reverts commit 235b89ff145d4b9d15f572f5c5284eca95e99f3e, reversing
changes made to 2223df84aebae0ef822891322cfe2070abbe80c2.

Changes have been retained in the GH-630 branch until we have it passing.
---
 spec/inputs/check_boxes_input_spec.rb | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index fcb2b6b4f..0e0668ae2 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -356,23 +356,6 @@
       end
     end
   end
-  
-  describe 'when :collection is provided' do
-    before do
-      @output_buffer = ''
-      mock_everything
-      @fred.stub(:genres) { ['ficton', 'biography'] }
-      
-      concat(semantic_form_for(@fred) do |builder|
-        concat(builder.input(:genres, :as => :check_boxes, :collection => [['Fiction', 'fiction'], ['Non-fiction', 'non_fiction'], ['Biography', 'biography']]))
-      end)
-    end
-    
-    it 'should check the correct checkboxes' do
-      output_buffer.should have_tag("form li fieldset ol li label input[@value='fiction'][@checked='checked']")
-      output_buffer.should have_tag("form li fieldset ol li label input[@value='biography'][@checked='checked']")
-    end
-  end
 
   describe "when namespace is provided" do
 

From 3fc21909ffca9098d87863145da7bde7e30527ce Mon Sep 17 00:00:00 2001
From: beawesomeinstead <graf.otodrakula@gmail.com>
Date: Fri, 22 Jul 2011 13:49:11 +0300
Subject: [PATCH 878/992] Add a basic .travis.yml file

---
 .travis.yml | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..26a540315
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,9 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - jruby
+  - ree
+  - rbx-2.0
+notifications:
+  recipients:
+    - graf.otodrakula@gmail.com

From 1326648f059592107e49269425c13df96063abe3 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 22 Jul 2011 07:58:32 +1000
Subject: [PATCH 879/992] clarify that spec a little bit more

---
 spec/inputs/check_boxes_input_spec.rb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 0e0668ae2..dc42438ba 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -356,6 +356,23 @@
       end
     end
   end
+  
+  describe 'when :collection is provided as an array of arrays' do
+    before do
+      @output_buffer = ''
+      mock_everything
+      @fred.stub(:genres) { ['ficton', 'biography'] }
+      
+      concat(semantic_form_for(@fred) do |builder|
+        concat(builder.input(:genres, :as => :check_boxes, :collection => [['Fiction', 'fiction'], ['Non-fiction', 'non_fiction'], ['Biography', 'biography']]))
+      end)
+    end
+    
+    it 'should check the correct checkboxes' do
+      output_buffer.should have_tag("form li fieldset ol li label input[@value='fiction'][@checked='checked']")
+      output_buffer.should have_tag("form li fieldset ol li label input[@value='biography'][@checked='checked']")
+    end
+  end
 
   describe "when namespace is provided" do
 

From a0d60926488ffcbdc4ecc0c0ccc6e9394cbfd2ee Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 25 Jul 2011 07:31:19 +1000
Subject: [PATCH 880/992] Rspec => RSpec in spec_helper

---
 spec/spec_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9a5af26aa..01d4fd6b6 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -404,7 +404,7 @@ def with_config(config_method_name, value, &block)
 ::ActiveSupport::Deprecation.silenced = false
 
 
-Rspec.configure do |config|
+RSpec.configure do |config|
   config.before(:all) do
     DeferredGarbageCollection.start
   end

From d2c4ff73d9079f07f53efd193316d283bc332b7d Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 26 Jul 2011 20:50:42 +1000
Subject: [PATCH 881/992] Collections of strings in CheckBoxesInput should now
 be checked if they match the model.

A String responds to methods such as :first and :last, so instead of applying send_or_call to the String ("hello".last => "o"), simply return the String itself.

Fixes #630, Ref #619
---
 lib/formtastic/inputs/base/collections.rb  | 7 +++++++
 lib/formtastic/inputs/check_boxes_input.rb | 2 +-
 spec/inputs/check_boxes_input_spec.rb      | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic/inputs/base/collections.rb b/lib/formtastic/inputs/base/collections.rb
index b2a94035b..1e370c00b 100644
--- a/lib/formtastic/inputs/base/collections.rb
+++ b/lib/formtastic/inputs/base/collections.rb
@@ -87,6 +87,13 @@ def send_or_call(duck, object)
             object.send(duck)
           end
         end
+        
+        # Avoids an issue where `send_or_call` can be a String and duck can be something simple like
+        # `:first`, which obviously String responds to.
+        def send_or_call_or_object(duck, object)
+          return object if object.is_a?(String) # TODO what about other classes etc?
+          send_or_call(duck, object)
+        end
       
       end
     end
diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index c3b319c2e..aaab1c943 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -154,7 +154,7 @@ def disabled?(value)
       def selected_values
         if object.respond_to?(method)
           selected_items = [object.send(method)].compact.flatten
-          [*selected_items.map { |o| send_or_call(value_method, o) }].compact
+          [*selected_items.map { |o| send_or_call_or_object(value_method, o) }].compact
         else
           []
         end
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index dc42438ba..3989fedb1 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -361,7 +361,7 @@
     before do
       @output_buffer = ''
       mock_everything
-      @fred.stub(:genres) { ['ficton', 'biography'] }
+      @fred.stub(:genres) { ['fiction', 'biography'] }
       
       concat(semantic_form_for(@fred) do |builder|
         concat(builder.input(:genres, :as => :check_boxes, :collection => [['Fiction', 'fiction'], ['Non-fiction', 'non_fiction'], ['Biography', 'biography']]))

From 589ab47b13641feb7d520f9c82bf3b82ae96b707 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 27 Jul 2011 07:09:19 +1000
Subject: [PATCH 882/992] Remove the email addresses from .travis.yml The
 defaults offered by the service are fine. Ref #631

---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 26a540315..6450ec275 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,3 @@ rvm:
   - jruby
   - ree
   - rbx-2.0
-notifications:
-  recipients:
-    - graf.otodrakula@gmail.com

From 0baec947a4e61ac603874d5b632fba024b82dcfb Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 27 Jul 2011 07:24:07 +1000
Subject: [PATCH 883/992] check ENV['DEFER_GC'] isn't 'false' before doing the
 the DeferredGarbageCollection trickery in spec_helper.rb -- I suspect it's
 causing Travis CI to fail.

---
 spec/spec_helper.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 01d4fd6b6..7d3d543be 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -403,12 +403,11 @@ def with_config(config_method_name, value, &block)
 
 ::ActiveSupport::Deprecation.silenced = false
 
-
 RSpec.configure do |config|
   config.before(:all) do
-    DeferredGarbageCollection.start
+    DeferredGarbageCollection.start unless ENV["DEFER_GC"] == "false"
   end
   config.after(:all) do
-    DeferredGarbageCollection.reconsider
+    DeferredGarbageCollection.reconsider unless ENV["DEFER_GC"] == "false"
   end
 end
\ No newline at end of file

From ac48a50fca63fae178bf36e0925d0a0de8f448fe Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 27 Jul 2011 07:25:48 +1000
Subject: [PATCH 884/992] set DEFER_GC=false env for Travis CI

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 6450ec275..d4d8e32be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,3 +4,5 @@ rvm:
   - jruby
   - ree
   - rbx-2.0
+env:
+  - DEFER_GC=false
\ No newline at end of file

From 9b340bc9c606477cb8cced5940d2f704fa313154 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 27 Jul 2011 08:38:50 +1000
Subject: [PATCH 885/992] remove all the rubies from .travis.yml -- let's try
 to get one working first eh?

---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d4d8e32be..53b22ff0b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,4 @@
 rvm:
   - 1.8.7
-  - 1.9.2
-  - jruby
-  - ree
-  - rbx-2.0
 env:
   - DEFER_GC=false
\ No newline at end of file

From 27ee0bc88155928319ab3f178dde44ca8a9a52b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petteri=20R=C3=A4ty?= <petsku@petteriraty.eu>
Date: Wed, 27 Jul 2011 22:19:01 +0300
Subject: [PATCH 886/992] Fix example code for FileInput

Closes GH-635
---
 lib/formtastic/inputs/file_input.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/formtastic/inputs/file_input.rb b/lib/formtastic/inputs/file_input.rb
index f298fed02..31ec5b201 100644
--- a/lib/formtastic/inputs/file_input.rb
+++ b/lib/formtastic/inputs/file_input.rb
@@ -13,7 +13,7 @@ module Inputs
     #
     #   <%= semantic_form_for(@user, :html => { :multipart => true }) do |f| %>
     #     <%= f.inputs do %>
-    #       <%= f.input :email_address, :as => :email %>
+    #       <%= f.input :avatar, :as => :file %>
     #     <% end %>
     #   <% end %>
     #
@@ -21,8 +21,8 @@ module Inputs
     #     <fieldset>
     #       <ol>
     #         <li class="email">
-    #           <label for="user_email_address">Email address</label>
-    #           <input type="email" id="user_email_address" name="user[email_address]">
+    #           <label for="user_avatar">Avatar</label>
+    #           <input type="file" id="user_avatar" name="user[avatar]">
     #         </li>
     #       </ol>
     #     </fieldset>
@@ -39,4 +39,4 @@ def to_html
       end
     end
   end
-end
\ No newline at end of file
+end

From 88a3114ed1fe185be6804ccc7b71046b3f36cf7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petteri=20R=C3=A4ty?= <petsku@petteriraty.eu>
Date: Wed, 27 Jul 2011 23:01:13 +0300
Subject: [PATCH 887/992] Fix input type detection for CarrierWave

See the added comment for why it needs to come first.
---
 lib/formtastic/helpers/input_helper.rb | 16 +++++++++-------
 spec/helpers/input_helper_spec.rb      |  1 -
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/formtastic/helpers/input_helper.rb b/lib/formtastic/helpers/input_helper.rb
index 2d03309d7..8ba18f80e 100644
--- a/lib/formtastic/helpers/input_helper.rb
+++ b/lib/formtastic/helpers/input_helper.rb
@@ -267,6 +267,9 @@ def input(method, options = {})
       
       protected
       
+      # First try if we can detect special things like :file. With CarrierWave the method does have
+      # an underlying column so we don't want :string to get selected.
+      #
       # 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 :number), or do
@@ -275,6 +278,12 @@ def input(method, options = {})
       # 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 @object
+          return :select  if reflection_for(method)
+
+          return :file    if is_file?(method, options)
+        end
+
         if column = column_for(method)
           # Special cases where the column type doesn't map to an input method.
           case column.type
@@ -300,12 +309,6 @@ def default_input_type(method, options = {}) #:nodoc:
           # 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 reflection_for(method)
-
-            return :file    if is_file?(method, options)
-          end
-
           return :select    if options.key?(:collection)
           return :password  if method.to_s =~ /password/
           return :string
@@ -363,4 +366,3 @@ def standard_input_class_name(as)
     end
   end
 end
-      
\ No newline at end of file
diff --git a/spec/helpers/input_helper_spec.rb b/spec/helpers/input_helper_spec.rb
index 2cb8ee277..4b3469263 100644
--- a/spec/helpers/input_helper_spec.rb
+++ b/spec/helpers/input_helper_spec.rb
@@ -412,7 +412,6 @@ def length_should_be_required(options)
         describe 'defaulting to file column' do
           Formtastic::FormBuilder.file_methods.each do |method|
             it "should default to :file for attributes that respond to ##{method}" do
-              @new_post.stub!(:column_for_attribute).and_return(nil)
               column = mock('column')
   
               Formtastic::FormBuilder.file_methods.each do |test|

From 7d1b0281f4afd870db94807d8e8d95a03f6ae659 Mon Sep 17 00:00:00 2001
From: Nathan S <nathan@inspire9.com>
Date: Sun, 31 Jul 2011 17:34:46 +1000
Subject: [PATCH 888/992] make blank label for timish fragment html safe

---
 lib/formtastic/inputs/base/timeish.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/base/timeish.rb b/lib/formtastic/inputs/base/timeish.rb
index 48df7717e..26eed7547 100644
--- a/lib/formtastic/inputs/base/timeish.rb
+++ b/lib/formtastic/inputs/base/timeish.rb
@@ -196,7 +196,7 @@ def fragments_label
               :class => "label"
             )
           else
-            ""
+            "".html_safe
           end
         end
         

From 0acfe94bca6eb82e53e53907253f0630cffab8fc Mon Sep 17 00:00:00 2001
From: Nathan S <nathan@inspire9.com>
Date: Mon, 1 Aug 2011 01:18:38 +1000
Subject: [PATCH 889/992] spec for timeish fragment label

---
 spec/inputs/label_spec.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/spec/inputs/label_spec.rb b/spec/inputs/label_spec.rb
index 714ea08d8..a3a051424 100644
--- a/spec/inputs/label_spec.rb
+++ b/spec/inputs/label_spec.rb
@@ -73,6 +73,14 @@
       output_buffer.should_not have_tag('label')
       output_buffer.should_not include("&gt;")
     end
+    
+    it 'should return nil if label is false for timeish fragments' do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.input(:title, :as => :time, :label => false)
+      end)
+      output_buffer.should_not have_tag('li.time > label')
+      output_buffer.should_not include("&gt;")
+    end
 
     it 'should html escape the label string by default' do
       concat(semantic_form_for(@new_post) do |builder|

From f445f4f58910e92fbeac165a173fc87c0430a046 Mon Sep 17 00:00:00 2001
From: nashby <younash@gmail.com>
Date: Sun, 31 Jul 2011 19:45:36 +0300
Subject: [PATCH 890/992] fix issue #603

---
 lib/formtastic/inputs/base/validations.rb |  13 +-
 spec/helpers/input_helper_spec.rb         | 199 ++++++++++++++--------
 2 files changed, 138 insertions(+), 74 deletions(-)

diff --git a/lib/formtastic/inputs/base/validations.rb b/lib/formtastic/inputs/base/validations.rb
index 023a09ee7..ddc3abeb6 100644
--- a/lib/formtastic/inputs/base/validations.rb
+++ b/lib/formtastic/inputs/base/validations.rb
@@ -69,12 +69,12 @@ def validation_min
           if validation
             # We can't determine an appropriate value for :greater_than with a float/decimal column
             raise IndeterminableMinimumAttributeError if validation.options[:greater_than] && column? && [:float, :decimal].include?(column.type)
- 
+
             if validation.options[:greater_than_or_equal_to]
               return (validation.options[:greater_than_or_equal_to].call(object)) if validation.options[:greater_than_or_equal_to].kind_of?(Proc)
               return (validation.options[:greater_than_or_equal_to])
             end
-            
+
             if validation.options[:greater_than]
               return (validation.options[:greater_than].call(object) + 1) if validation.options[:greater_than].kind_of?(Proc)
               return (validation.options[:greater_than] + 1)
@@ -90,12 +90,12 @@ def validation_max
           if validation
             # We can't determine an appropriate value for :greater_than with a float/decimal column
             raise IndeterminableMaximumAttributeError if validation.options[:less_than] && column? && [:float, :decimal].include?(column.type)
-                 
+
             if validation.options[:less_than_or_equal_to]
               return (validation.options[:less_than_or_equal_to].call(object)) if validation.options[:less_than_or_equal_to].kind_of?(Proc)
               return (validation.options[:less_than_or_equal_to])
             end
-            
+
             if validation.options[:less_than]
               return ((validation.options[:less_than].call(object)) - 1) if validation.options[:less_than].kind_of?(Proc)
               return (validation.options[:less_than] - 1)
@@ -135,6 +135,9 @@ def required?
           return false if not_required_through_negated_validation?
           if validations?
             validations.select { |validator|
+              if validator.options.key?(:on)
+                return false if (validator.options[:on] != :save) && ((object.new_record? && validator.options[:on] != :create) || (!object.new_record? && validator.options[:on] != :update))
+              end
               case validator.kind
               when :presence
                 true
@@ -152,7 +155,7 @@ def required?
             return responds_to_global_required? && !!builder.all_fields_required_by_default
           end
         end
-        
+
         def required_attribute?
           required? && builder.use_required_attribute
         end
diff --git a/spec/helpers/input_helper_spec.rb b/spec/helpers/input_helper_spec.rb
index 4b3469263..a4150d527 100644
--- a/spec/helpers/input_helper_spec.rb
+++ b/spec/helpers/input_helper_spec.rb
@@ -8,18 +8,18 @@
   before do
     @output_buffer = ''
     mock_everything
-    
+
     @errors = mock('errors')
     @errors.stub!(:[]).and_return([])
     @new_post.stub!(:errors).and_return(@errors)
   end
-  
+
   after do
     ::I18n.backend.reload!
   end
-  
+
   describe 'arguments and options' do
-  
+
     it 'should require the first argument (the method on form\'s object)' do
       lambda {
         concat(semantic_form_for(@new_post) do |builder|
@@ -31,7 +31,7 @@
     describe ':required option' do
 
       describe 'when true' do
-        
+
         it 'should set a "required" class' do
           with_config :required_string, " required yo!" do
             concat(semantic_form_for(@new_post) do |builder|
@@ -114,21 +114,21 @@
           before do
             @new_post.stub!(:class).and_return(::PostModel)
           end
-        
+
           after do
             @new_post.stub!(:class).and_return(::Post)
           end
           describe 'and validates_presence_of was called for the method' do
             it 'should be required' do
-        
+
               @new_post.class.should_receive(:validators_on).with(:title).any_number_of_times.and_return([
                 active_model_presence_validator([:title])
               ])
-        
+
               @new_post.class.should_receive(:validators_on).with(:body).any_number_of_times.and_return([
                 active_model_presence_validator([:body], {:if => true})
               ])
-        
+
               concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title))
                 concat(builder.input(:body))
@@ -136,48 +136,109 @@
               output_buffer.should have_tag('form li.required')
               output_buffer.should_not have_tag('form li.optional')
             end
-        
+
+            it 'should be required when there is :on => :create option on create' do
+              with_config :required_string, " required yo!" do
+                @new_post.class.should_receive(:validators_on).with(:title).any_number_of_times.and_return([
+                  active_model_presence_validator([:title], {:on => :create})
+                ])
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:title))
+                end)
+                output_buffer.should have_tag('form li.required')
+                output_buffer.should_not have_tag('form li.optional')
+              end
+            end
+
+            it 'should be required when there is :on => :save option on create' do
+              with_config :required_string, " required yo!" do
+                @new_post.class.should_receive(:validators_on).with(:title).any_number_of_times.and_return([
+                  active_model_presence_validator([:title], {:on => :save})
+                ])
+                concat(semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:title))
+                end)
+                output_buffer.should have_tag('form li.required')
+                output_buffer.should_not have_tag('form li.optional')
+              end
+            end
+
+            it 'should be required when there is :on => :save option on update' do
+              with_config :required_string, " required yo!" do
+                @fred.class.should_receive(:validators_on).with(:login).any_number_of_times.and_return([
+                  active_model_presence_validator([:login], {:on => :save})
+                ])
+                concat(semantic_form_for(@fred) do |builder|
+                  concat(builder.input(:login))
+                end)
+                output_buffer.should have_tag('form li.required')
+                output_buffer.should_not have_tag('form li.optional')
+              end
+            end
+
+            it 'should not be required when there is :on => :create option on update' do
+              @fred.class.should_receive(:validators_on).with(:login).any_number_of_times.and_return([
+                active_model_presence_validator([:login], {:on => :create})
+              ])
+              concat(semantic_form_for(@fred) do |builder|
+                concat(builder.input(:login))
+              end)
+              output_buffer.should_not have_tag('form li.required')
+              output_buffer.should have_tag('form li.optional')
+            end
+
+            it 'should not be required when there is :on => :update option on create' do
+              @new_post.class.should_receive(:validators_on).with(:title).any_number_of_times.and_return([
+                active_model_presence_validator([:title], {:on => :update})
+              ])
+              concat(semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:title))
+              end)
+              output_buffer.should_not have_tag('form li.required')
+              output_buffer.should have_tag('form li.optional')
+            end
+
             it 'should be not be required if the optional :if condition is not satisifed' do
               presence_should_be_required(:required => false, :tag => :body, :options => { :if => false })
             end
-        
+
             it 'should not be required if the optional :if proc evaluates to false' do
               presence_should_be_required(:required => false, :tag => :body, :options => { :if => proc { |record| false } })
             end
-        
+
             it 'should be required if the optional :if proc evaluates to true' do
               presence_should_be_required(:required => true, :tag => :body, :options => { :if => proc { |record| true } })
             end
-        
+
             it 'should not be required if the optional :unless proc evaluates to true' do
               presence_should_be_required(:required => false, :tag => :body, :options => { :unless => proc { |record| true } })
             end
-        
+
             it 'should be required if the optional :unless proc evaluates to false' do
               presence_should_be_required(:required => true, :tag => :body, :options => { :unless => proc { |record| false } })
             end
-        
+
             it 'should be required if the optional :if with a method string evaluates to true' do
               @new_post.should_receive(:required_condition).and_return(true)
               presence_should_be_required(:required => true, :tag => :body, :options => { :if => :required_condition })
             end
-        
+
             it 'should be required if the optional :if with a method string evaluates to false' do
               @new_post.should_receive(:required_condition).and_return(false)
               presence_should_be_required(:required => false, :tag => :body, :options => { :if => :required_condition })
             end
-        
+
             it 'should be required if the optional :unless with a method string evaluates to false' do
                @new_post.should_receive(:required_condition).and_return(false)
               presence_should_be_required(:required => true, :tag => :body, :options => { :unless => :required_condition })
             end
-        
+
              it 'should not be required if the optional :unless with a method string evaluates to true' do
                @new_post.should_receive(:required_condition).and_return(true)
                presence_should_be_required(:required => false, :tag => :body, :options => { :unless => :required_condition })
              end
           end
-        
+
           describe 'and validates_inclusion_of was called for the method' do
             it 'should be required' do
               @new_post.class.should_receive(:validators_on).with(:published).any_number_of_times.and_return([
@@ -185,7 +246,7 @@
               ])
               should_be_required(:tag => :published, :required => true)
             end
-            
+
             it 'should not be required if allow_blank is true' do
               @new_post.class.should_receive(:validators_on).with(:published).any_number_of_times.and_return([
                 active_model_inclusion_validator([:published], {:in => [false, true], :allow_blank => true})
@@ -237,7 +298,7 @@ def should_be_required(options)
             concat(semantic_form_for(@new_post) do |builder|
               concat(builder.input(options[:tag]))
             end)
-        
+
             if options[:required]
               output_buffer.should_not have_tag('form li.optional')
               output_buffer.should have_tag('form li.required')
@@ -256,13 +317,13 @@ def length_should_be_required(options)
             add_length_validator(options)
             should_be_required(options)
           end
-          
+
           # TODO JF reversed this during refactor, need to make sure
           describe 'and there are no requirement validations on the method' do
             before do
               @new_post.class.should_receive(:validators_on).with(:title).and_return([])
             end
-        
+
             it 'should not be required' do
               concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title))
@@ -271,9 +332,9 @@ def length_should_be_required(options)
               output_buffer.should have_tag('form li.optional')
             end
           end
-        
+
         end
-        
+
         describe 'and an object without :validators_on' do
 
             it 'should use the default value' do
@@ -338,98 +399,98 @@ def length_should_be_required(options)
           @new_post.stub!(:column_for_attribute).with(:aws_instance_id).and_return(mock('column', :type => :integer))
           default_input_type(:integer, :aws_instance_id).should == :number
         end
-        
+
         it 'should default to :select for associations' do
           @new_post.class.stub!(:reflect_on_association).with(:user_id).and_return(mock('ActiveRecord::Reflection::AssociationReflection'))
           @new_post.class.stub!(:reflect_on_association).with(:section_id).and_return(mock('ActiveRecord::Reflection::AssociationReflection'))
           default_input_type(:integer, :user_id).should == :select
           default_input_type(:integer, :section_id).should == :select
         end
-  
+
         it 'should default to :password for :string column types with "password" in the method name' do
           default_input_type(:string, :password).should == :password
           default_input_type(:string, :hashed_password).should == :password
           default_input_type(:string, :password_hash).should == :password
         end
-  
+
         it 'should default to :text for :text column types' do
           default_input_type(:text).should == :text
         end
-  
+
         it 'should default to :date for :date column types' do
           default_input_type(:date).should == :date
         end
-  
+
         it 'should default to :datetime for :datetime and :timestamp column types' do
           default_input_type(:datetime).should == :datetime
           default_input_type(:timestamp).should == :datetime
         end
-  
+
         it 'should default to :time for :time column types' do
           default_input_type(:time).should == :time
         end
-  
+
         it 'should default to :boolean for :boolean column types' do
           default_input_type(:boolean).should == :boolean
         end
-  
+
         it 'should default to :string for :string column types' do
           default_input_type(:string).should == :string
         end
-  
+
         it 'should default to :number for :integer, :float and :decimal column types' do
           default_input_type(:integer).should == :number
           default_input_type(:float).should == :number
           default_input_type(:decimal).should == :number
         end
-  
+
         it 'should default to :country for :string columns named country' do
           default_input_type(:string, :country).should == :country
         end
-  
+
         it 'should default to :email for :string columns matching email' do
           default_input_type(:string, :email).should == :email
           default_input_type(:string, :customer_email).should == :email
           default_input_type(:string, :email_work).should == :email
         end
-  
+
         it 'should default to :url for :string columns named url or website' do
           default_input_type(:string, :url).should == :url
           default_input_type(:string, :website).should == :url
           default_input_type(:string, :my_url).should == :url
           default_input_type(:string, :hurl).should_not == :url
         end
-  
+
         it 'should default to :phone for :string columns named phone or fax' do
           default_input_type(:string, :phone).should == :phone
           default_input_type(:string, :fax).should == :phone
         end
-  
+
         it 'should default to :search for :string columns named search' do
           default_input_type(:string, :search).should == :search
         end
-  
+
         describe 'defaulting to file column' do
           Formtastic::FormBuilder.file_methods.each do |method|
             it "should default to :file for attributes that respond to ##{method}" do
               column = mock('column')
-  
+
               Formtastic::FormBuilder.file_methods.each do |test|
                 ### TODO: Check if this is ok
                 column.stub!(method).with(test).and_return(method == test)
               end
-  
+
               @new_post.should_receive(method).and_return(column)
-  
+
               semantic_form_for(@new_post) do |builder|
                 builder.send(:default_input_type, method).should == :file
               end
             end
           end
-  
+
         end
       end
-  
+
       it 'should call the corresponding input class with .to_html' do
         [:select, :time_zone, :radio, :date, :datetime, :time, :boolean, :check_boxes, :hidden, :string, :password, :number, :text, :file].each do |input_style|
           @new_post.stub!(:generic_column_name)
@@ -438,7 +499,7 @@ def length_should_be_required(options)
             input_instance = mock('Input instance')
             input_class = "#{input_style.to_s}_input".classify
             input_constant = "Formtastic::Inputs::#{input_class}".constantize
-            
+
             input_constant.should_receive(:new).and_return(input_instance)
             input_instance.should_receive(:to_html).and_return("some HTML")
 
@@ -771,10 +832,10 @@ def length_should_be_required(options)
     end
 
     describe ':collection option' do
-      
+
       it "should be required on polymorphic associations" do
         @new_post.stub!(:commentable)
-        @new_post.class.stub!(:reflections).and_return({ 
+        @new_post.class.stub!(:reflections).and_return({
           :commentable => mock('macro_reflection', :options => { :polymorphic => true }, :macro => :belongs_to)
         })
         @new_post.stub!(:column_for_attribute).with(:commentable).and_return(
@@ -783,37 +844,37 @@ def length_should_be_required(options)
         @new_post.class.stub!(:reflect_on_association).with(:commentable).and_return(
           mock('reflection', :macro => :belongs_to, :options => { :polymorphic => true })
         )
-        expect { 
+        expect {
           concat(semantic_form_for(@new_post) do |builder|
-            concat(builder.inputs do 
+            concat(builder.inputs do
               concat(builder.input :commentable)
             end)
           end)
         }.to raise_error(Formtastic::PolymorphicInputWithoutCollectionError)
       end
-      
+
     end
 
   end
-  
+
   describe 'options re-use' do
-    
+
     it 'should retain :as option when re-using the same options hash' do
       my_options = { :as => :string }
       output = ''
-      
+
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(:title, my_options))
         concat(builder.input(:publish_at, my_options))
       end)
       output_buffer.should have_tag 'li.string', :count => 2
     end
-    
-    
+
+
   end
-  
+
   describe 'instantiating an input class' do
-    
+
     context 'when a class does not exist' do
       it "should raise an error" do
         lambda {
@@ -823,9 +884,9 @@ def length_should_be_required(options)
         }.should raise_error(Formtastic::UnknownInputError)
       end
     end
-    
+
     context 'when a customized top-level class does not exist' do
-      
+
       it 'should instantiate the Formtastic input' do
         input = mock('input', :to_html => 'some HTML')
         Formtastic::Inputs::StringInput.should_receive(:new).and_return(input)
@@ -833,26 +894,26 @@ def length_should_be_required(options)
           builder.input(:title, :as => :string)
         end)
       end
-      
+
     end
-    
+
     describe 'when a top-level input class exists' do
       it "should instantiate the top-level input instead of the Formtastic one" do
         class ::StringInput < Formtastic::Inputs::StringInput
         end
-        
+
         input = mock('input', :to_html => 'some HTML')
         Formtastic::Inputs::StringInput.should_not_receive(:new).and_return(input)
         ::StringInput.should_receive(:new).and_return(input)
-        
+
         concat(semantic_form_for(@new_post) do |builder|
           builder.input(:title, :as => :string)
         end)
       end
     end
-    
+
     describe 'when instantiated multiple times with the same input type' do
-      
+
       it "should be cached (not calling the internal methods)" do
         # TODO this is really tied to the underlying implementation
         concat(semantic_form_for(@new_post) do |builder|
@@ -861,10 +922,10 @@ class ::StringInput < Formtastic::Inputs::StringInput
           builder.input(:title, :as => :string)
         end)
       end
-      
+
     end
-    
+
   end
-  
+
 end
 

From 20b6eadb1414c4d4f09de4cb7ebe6bf224abf66e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 2 Aug 2011 08:44:44 +1000
Subject: [PATCH 891/992] remove validation_reflection plugin from docs... not
 neccessariy and doesn't work woth Rails 3

---
 README.textile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.textile b/README.textile
index 104be08c8..5eaf0ed5c 100644
--- a/README.textile
+++ b/README.textile
@@ -586,7 +586,6 @@ h2. Dependencies
 
 There are none, but...
 
-* if you have the "ValidationReflection":http://github.com/redinger/validation_reflection plugin is installed, you won't have to specify the @:required@ option (it checks the validations on the model instead).
 * if you want to use the @:country@ input, you'll need to install the "country-select plugin":https://github.com/chrislerum/country_select (or any other country_select plugin with the same API).
 * "rspec":http://github.com/dchelimsky/rspec/, "rspec_hpricot_matchers":http://rubyforge.org/projects/rspec-hpricot/ and "rcov":http://github.com/relevance/rcov gems (plus any of their own dependencies) are required for the test suite.
 

From 2bcedcf3c4a3232ac73d6995aa7bd3406abb1805 Mon Sep 17 00:00:00 2001
From: "Juan M. Cuello" <juanmacuello@gmail.com>
Date: Fri, 5 Aug 2011 10:07:00 -0300
Subject: [PATCH 892/992] Change the way 'perform_browser_validations' option
 is used.

'novalidate' attribute should be added when this option is set to 'false'
instead of 'true'.

Related to #626.
---
 lib/formtastic/helpers/form_helper.rb | 2 +-
 spec/helpers/form_helper_spec.rb      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic/helpers/form_helper.rb b/lib/formtastic/helpers/form_helper.rb
index 59f3f5a6c..cf0fa94d7 100644
--- a/lib/formtastic/helpers/form_helper.rb
+++ b/lib/formtastic/helpers/form_helper.rb
@@ -143,7 +143,7 @@ def semantic_form_for(record_or_name_or_array, *args, &proc)
         options = args.extract_options!
         options[:builder] ||= @@builder
         options[:html] ||= {}
-        options[:html][:novalidate] = builder.perform_browser_validations unless options[:html].key?(:novalidate)
+        options[:html][:novalidate] = !builder.perform_browser_validations unless options[:html].key?(:novalidate)
         @@builder.custom_namespace = options[:namespace].to_s
 
         singularizer = defined?(ActiveModel::Naming.singular) ? ActiveModel::Naming.method(:singular) : ActionController::RecordIdentifier.method(:singular_class_name)
diff --git a/spec/helpers/form_helper_spec.rb b/spec/helpers/form_helper_spec.rb
index c5f9e0893..5c9b3e0f8 100644
--- a/spec/helpers/form_helper_spec.rb
+++ b/spec/helpers/form_helper_spec.rb
@@ -28,7 +28,7 @@
       with_config :perform_browser_validations, true do
         concat(semantic_form_for(@new_post, :url => '/hello') do |builder|
         end)
-        output_buffer.should have_tag("form[@novalidate]")
+        output_buffer.should_not have_tag("form[@novalidate]")
       end
     end
     
@@ -36,7 +36,7 @@
       with_config :perform_browser_validations, false do
         concat(semantic_form_for(@new_post, :url => '/hello') do |builder|
         end)
-        output_buffer.should_not have_tag("form[@novalidate]")
+        output_buffer.should have_tag("form[@novalidate]")
       end
     end
 

From 8cf977fb02f3c0251fa00d4a7ab484725be571ab Mon Sep 17 00:00:00 2001
From: "Juan M. Cuello" <juanmacuello@gmail.com>
Date: Tue, 9 Aug 2011 19:48:17 -0300
Subject: [PATCH 893/992] Default step attribute to 'any' in number_input.

---
 lib/formtastic/inputs/number_input.rb | 2 +-
 spec/inputs/number_input_spec.rb      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic/inputs/number_input.rb b/lib/formtastic/inputs/number_input.rb
index b382a3156..d43bde337 100644
--- a/lib/formtastic/inputs/number_input.rb
+++ b/lib/formtastic/inputs/number_input.rb
@@ -96,7 +96,7 @@ def step_option
         return options[:step] if options.key?(:step)
         return validation_step if validation_step
         return 1 if validation_integer_only?
-        1
+        "any"
       end
       
       def min_option
diff --git a/spec/inputs/number_input_spec.rb b/spec/inputs/number_input_spec.rb
index e9c8f6e75..3f59a6545 100644
--- a/spec/inputs/number_input_spec.rb
+++ b/spec/inputs/number_input_spec.rb
@@ -756,11 +756,11 @@
       ])
     end
     
-    it "should default step to 1" do
+    it "should default step to 'any'" do
       concat(semantic_form_for(@new_post) do |builder|
         builder.input(:title, :as => :number)
       end)
-      output_buffer.should have_tag('input[@step="1"]')
+      output_buffer.should have_tag('input[@step="any"]')
     end
     
     it "should let input_html set :step" do

From f1d0ab3772eb7dbf0fb1c23ffe10ee3220f2e345 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 15 Aug 2011 08:30:08 +1000
Subject: [PATCH 894/992] Fixed false fragment labels on date/time inputs
 producing unsafe HTML.

Also beefed up related coverage and uncommented a valid spec.

fixes #647
---
 lib/formtastic/inputs/base/timeish.rb |  2 +-
 spec/inputs/date_input_spec.rb        | 20 +++++++++++++
 spec/inputs/datetime_input_spec.rb    | 41 ++++++++++++++++++++-------
 spec/inputs/time_input_spec.rb        | 20 +++++++++++++
 4 files changed, 71 insertions(+), 12 deletions(-)

diff --git a/lib/formtastic/inputs/base/timeish.rb b/lib/formtastic/inputs/base/timeish.rb
index 26eed7547..5f3929b83 100644
--- a/lib/formtastic/inputs/base/timeish.rb
+++ b/lib/formtastic/inputs/base/timeish.rb
@@ -147,7 +147,7 @@ def fragment_name(fragment)
         
         def fragment_label_html(fragment)
           text = fragment_label(fragment)
-          text.blank? ? "" : template.content_tag(:label, text, :for => fragment_id(fragment))
+          text.blank? ? "".html_safe : template.content_tag(:label, text, :for => fragment_id(fragment))
         end
         
         def value
diff --git a/spec/inputs/date_input_spec.rb b/spec/inputs/date_input_spec.rb
index ca46d5718..e0ddbd624 100644
--- a/spec/inputs/date_input_spec.rb
+++ b/spec/inputs/date_input_spec.rb
@@ -95,6 +95,26 @@
           output_buffer.should have_tag('form li.date fieldset ol li label', /#{f}/i) unless field == f
         end
       end
+      
+      it "should not display the label for the #{field} field when :labels[:#{field}] is false" do
+        output_buffer.replace ''
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:created_at, :as => :date, :labels => { field => false }))
+        end)
+        output_buffer.should have_tag('form li.date fieldset ol li label', :count => fields.length-1)
+        fields.each do |f|
+          output_buffer.should have_tag('form li.date fieldset ol li label', /#{f}/i) unless field == f
+        end
+      end
+      
+      it "should not render unsafe HTML when :labels[:#{field}] is false" do 
+        output_buffer.replace ''
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:created_at, :as => :time, :include_seconds => true, :labels => { field => false }))
+        end)
+        output_buffer.should_not include("&gt;")
+      end
+      
     end
   end
   
diff --git a/spec/inputs/datetime_input_spec.rb b/spec/inputs/datetime_input_spec.rb
index 88ab02262..2321c58e1 100644
--- a/spec/inputs/datetime_input_spec.rb
+++ b/spec/inputs/datetime_input_spec.rb
@@ -89,17 +89,36 @@
           output_buffer.should have_tag('form li.datetime fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
         end
       end
-  
-      #it "should not display the label for the #{field} field when :labels[:#{field}] is blank" do
-      #  output_buffer.replace ''
-      #  concat(semantic_form_for(@new_post) do |builder|
-      #    concat(builder.input(:created_at, :as => :datetime, :labels => { field => "" }))
-      #  end)
-      #  output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => fields.length-1)
-      #  fields.each do |f|
-      #    output_buffer.should have_tag('form li.datetime fieldset ol li label', /#{f}/i) unless field == f
-      #  end
-      #end
+      
+      it "should not display the label for the #{field} field when :labels[:#{field}] is blank" do
+        output_buffer.replace ''
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:created_at, :as => :datetime, :labels => { field => "" }))
+        end)
+        output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => fields.length-1)
+        fields.each do |f|
+          output_buffer.should have_tag('form li.datetime fieldset ol li label', /#{f}/i) unless field == f
+        end
+      end
+      
+      it "should not display the label for the #{field} field when :labels[:#{field}] is false" do
+        output_buffer.replace ''
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:created_at, :as => :datetime, :labels => { field => false }))
+        end)
+        output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => fields.length-1)
+        fields.each do |f|
+          output_buffer.should have_tag('form li.datetime fieldset ol li label', /#{f}/i) unless field == f
+        end
+      end
+      
+      it "should not render unsafe HTML when :labels[:#{field}] is false" do 
+        output_buffer.replace ''
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:created_at, :as => :time, :include_seconds => true, :labels => { field => false }))
+        end)
+        output_buffer.should_not include("&gt;")
+      end
     end
   end
   
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index 166e06652..8577cdce3 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -126,6 +126,26 @@
           output_buffer.should have_tag('form li.time fieldset ol li label', /#{f}/i) unless field == f
         end
       end
+      
+      it "should not render the label when :labels[:#{field}] is false" do 
+        output_buffer.replace ''
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:created_at, :as => :time, :include_seconds => true, :labels => { field => false }))
+        end)
+        output_buffer.should have_tag('form li.time fieldset ol li label', :count => fields.length-1)
+        fields.each do |f|
+          output_buffer.should have_tag('form li.time fieldset ol li label', /#{f}/i) unless field == f
+        end
+      end
+      
+      it "should not render unsafe HTML when :labels[:#{field}] is false" do 
+        output_buffer.replace ''
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:created_at, :as => :time, :include_seconds => true, :labels => { field => false }))
+        end)
+        output_buffer.should_not include("&gt;")
+      end
+      
     end
   end
 

From 2bb0234d44eb9c5bd7f9f198ace11df94723ae5e Mon Sep 17 00:00:00 2001
From: Josh Kalderimis <josh.kalderimis@gmail.com>
Date: Sun, 14 Aug 2011 22:58:11 +0000
Subject: [PATCH 895/992] Now that formtastic is green, why not add some more
 rubies! :)

---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 53b22ff0b..0a82ebd60 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,10 @@
 rvm:
   - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ree
+  - rbx
+  - rbx-2.0
+  - jruby
 env:
   - DEFER_GC=false
\ No newline at end of file

From 8b8e86c07788c3657ccb5906722bfff930e08c18 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 16 Aug 2011 09:06:32 +1000
Subject: [PATCH 896/992] fix epic failing tests under Rails 3.1.0.rc5 due to
 our fake URL helpers in spec_helper.rb needing to now accept arguments,
 thanks to twalpole, fixes #654

---
 spec/spec_helper.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 7d3d543be..5b6e0113d 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -162,15 +162,15 @@ def mock_everything
 
     # Resource-oriented styles like form_for(@post) will expect a path method for the object,
     # so we're defining some here.
-    def post_models_path; "/postmodels/1"; end
+    def post_models_path(*args); "/postmodels/1"; end
 
-    def post_path(o); "/posts/1"; end
-    def posts_path; "/posts"; end
-    def new_post_path; "/posts/new"; end
+    def post_path(*args); "/posts/1"; end
+    def posts_path(*args); "/posts"; end
+    def new_post_path(*args); "/posts/new"; end
 
-    def author_path(o); "/authors/1"; end
-    def authors_path; "/authors"; end
-    def new_author_path; "/authors/new"; end
+    def author_path(*args); "/authors/1"; end
+    def authors_path(*args); "/authors"; end
+    def new_author_path(*args); "/authors/new"; end
     
     @fred = ::Author.new
     @fred.stub!(:class).and_return(::Author)

From f761fcb8857b0f67f73a4bdf4c53cdda48e2fe87 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 16 Aug 2011 10:03:35 +1000
Subject: [PATCH 897/992] remove failing rubies from travil.yml -- you can have
 them back when you make them pass on your local machines (1.9.x is just a
 coverage issue)

---
 .travis.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0a82ebd60..4673a42d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,5 @@
 rvm:
   - 1.8.7
-  - 1.9.2
-  - 1.9.3
   - ree
-  - rbx
-  - rbx-2.0
-  - jruby
 env:
   - DEFER_GC=false
\ No newline at end of file

From b66cb77137585c462149536534a27488b15909f9 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 16 Aug 2011 11:27:41 +1000
Subject: [PATCH 898/992] Remove coverage requirement for 1.9.2 & 1.9.3, add
 back to Travis.

RCov support for 1.9.x is "not accurate", so there's no point right now.
---
 .travis.yml | 2 ++
 Rakefile    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4673a42d0..45d2e28bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 rvm:
   - 1.8.7
   - ree
+  - 1.9.2
+  - 1.9.3
 env:
   - DEFER_GC=false
\ No newline at end of file
diff --git a/Rakefile b/Rakefile
index 81bc17b16..b24c07899 100644
--- a/Rakefile
+++ b/Rakefile
@@ -44,7 +44,7 @@ end
 
 RCov::VerifyTask.new(:verify_coverage) do |t|
   t.require_exact_threshold = false
-  t.threshold = 95
+  t.threshold = (RUBY_VERSION == "1.8.7" ? 95 : 0)
 end
 
 desc "Run all examples and verify coverage"

From b043bd63ad91657be7dd02a79cdf86e854b8a946 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 16 Aug 2011 18:18:38 +1000
Subject: [PATCH 899/992] Fixed #634, where TimeInput was not rendering hidden
 y/m/d inputs by default.

---
 lib/formtastic/inputs/base/timeish.rb |  5 ++++
 lib/formtastic/inputs/time_input.rb   | 28 +++++++++++++++++---
 spec/inputs/time_input_spec.rb        | 38 ++++++++++++++++++++++-----
 3 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/lib/formtastic/inputs/base/timeish.rb b/lib/formtastic/inputs/base/timeish.rb
index 5f3929b83..75051b9b3 100644
--- a/lib/formtastic/inputs/base/timeish.rb
+++ b/lib/formtastic/inputs/base/timeish.rb
@@ -90,6 +90,7 @@ module Timeish
         def to_html
           input_wrapping do
             fragments_wrapping do
+              hidden_fragments <<
               fragments_label <<
               template.content_tag(:ol,
                 fragments.map do |fragment|
@@ -206,6 +207,10 @@ def fragments_inner_wrapping(&block)
           )
         end
         
+        def hidden_fragments
+          "".html_safe
+        end
+        
       end
     end
   end
diff --git a/lib/formtastic/inputs/time_input.rb b/lib/formtastic/inputs/time_input.rb
index 8716f356d..c07f7fc3c 100644
--- a/lib/formtastic/inputs/time_input.rb
+++ b/lib/formtastic/inputs/time_input.rb
@@ -1,16 +1,38 @@
 module Formtastic
   module Inputs
     # Outputs a series of select boxes for the fragments that make up a time (hour, minute, second).
+    # Unless `:ignore_date` is true, it will render hidden inputs for the year, month and day as 
+    # well, defaulting to `Time.current` if the form object doesn't have a value, much like Rails' 
+    # own `time_select`.
     #
     # @see Formtastic::Inputs::Timeish Timeish module for documetation of date, time and datetime input options.
     class TimeInput 
       include Base
       include Base::Timeish
       
-      # we don't want year / month / day fragments in a time select
-      def date_fragments
-        []
+      # we don't want year / month / day fragments if :ignore_date => true
+      def fragments
+        time_fragments
       end
+      
+      def value_or_default_value
+        value ? value : Time.current
+      end
+      
+      def fragment_value(fragment)
+        value_or_default_value.send(fragment)
+      end
+      
+      def hidden_fragments
+        if !options[:ignore_date]
+          date_fragments.map do |fragment|
+            template.hidden_field_tag("#{object_name}[#{fragment_name(fragment)}]", fragment_value(fragment), :id => fragment_id(fragment), :disabled => input_html_options[:disabled] )
+          end.join.html_safe
+        else
+          super
+        end
+      end
+      
     end
   end
 end
\ No newline at end of file
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index 8577cdce3..57647055c 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -16,22 +16,46 @@
       output_buffer.replace ''
     end
 
-    describe "with :ignore_date" do
+    describe "with :ignore_date => true" do
       before do
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:publish_at, :as => :time, :ignore_date => true))
         end)
       end
 
-      it 'should not have an input for day, month and year' do
-        output_buffer.should_not have_tag('#post_publish_at_1i')
-        output_buffer.should_not have_tag('#post_publish_at_2i')
-        output_buffer.should_not have_tag('#post_publish_at_3i')
+      it 'should not have hidden inputs for day, month and year' do
+        output_buffer.should_not have_tag('input#post_publish_at_1i')
+        output_buffer.should_not have_tag('input#post_publish_at_2i')
+        output_buffer.should_not have_tag('input#post_publish_at_3i')
       end
 
       it 'should have an input for hour and minute' do
-        output_buffer.should have_tag('#post_publish_at_4i')
-        output_buffer.should have_tag('#post_publish_at_5i')
+        output_buffer.should have_tag('select#post_publish_at_4i')
+        output_buffer.should have_tag('select#post_publish_at_5i')
+      end
+
+    end
+    
+    describe "with :ignore_date => false" do
+      before do
+        @new_post.stub(:publish_at).and_return(Time.parse('2010-11-07'))
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:publish_at, :as => :time, :ignore_date => false))
+        end)
+      end
+
+      it 'should have a hidden input for day, month and year' do
+        output_buffer.should have_tag('input#post_publish_at_1i')
+        output_buffer.should have_tag('input#post_publish_at_2i')
+        output_buffer.should have_tag('input#post_publish_at_3i')
+        output_buffer.should have_tag('input#post_publish_at_1i[@value="2010"]')
+        output_buffer.should have_tag('input#post_publish_at_2i[@value="11"]')
+        output_buffer.should have_tag('input#post_publish_at_3i[@value="7"]')
+      end
+
+      it 'should have an select for hour and minute' do
+        output_buffer.should have_tag('select#post_publish_at_4i')
+        output_buffer.should have_tag('select#post_publish_at_5i')
       end
 
     end

From e93fce28b3491f7ba35e4de2ecea64340eb46804 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 17 Aug 2011 07:39:12 +1000
Subject: [PATCH 900/992] CHANGELOG catch-up for 2.0.0.rc4

---
 CHANGELOG | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 5f763aeae..38a28e34c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,25 @@
+2.0.0.rc4
+
+* Fixed that TimeInput was not rendering hidden y/m/d inputs by default.
+* Fixed test suite under Rails 3.1.0.rc5
+* Fixed false and blank fragment labels on date/time inputs producing unsafe HTML.
+* Fixed that inputs were 'required' withput considering `:on => :create` validations
+* Fixed that collections of strings in CheckBoxesInput were ot being correctly checked be checked if they match the model
+* Fixed that the required attribute was added to the choices in a :radio or :check_boxes input, instead of just the parent input wrapper
+* Fixed semantic_fields_for when used with a hash-like model
+* Fixed that models without defined validations (even if validators_on exists) should not be considered required
+* Fixed min/max attributes when the validation uses a Proc
+* Fixed that inputs should not be considered required if :allow_blank => true is set on validates_inclusion_of
+* Fixed that inputs should not be considered required if if either :allow_blank => true, :minimum is > 0, or :within's least value is > 0 is set on validates_length_of 
+* Fixed a typo in the config template
+* Fixed semantic_fields_for to work with Rails 3 *and* 3.1's method sigs (I hope), many thanks to the simple_form guys for figuring this out
+* Changed HTML5 `step` attribute to default to "any" instead of "1"
+* Added CarrierWave support for to file input detection
+* Added a configuration 'perform_browser_validations' to opt out of HTML5 browser validations.
+* Added more support for mongo documents, including MongoMapper-specific reflection capability
+* Added IE specific stylesheets & moved those styles out of main stylesheet, include them yourself if needed
+* Added a new configuration to opt out of HTML5 required attribute
+
 2.0.0.rc3
 
 * Fixed that .label class was incorrectly applied to <label> tags inside a .choice on radio and checkbox inputs (#599)

From 9efaea6ea73d3acbbb18593a8179db12d2ab7d38 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 17 Aug 2011 07:39:49 +1000
Subject: [PATCH 901/992] version bump to 2.0.0.rc4

---
 lib/formtastic/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/version.rb b/lib/formtastic/version.rb
index f578b82bf..4fce413e6 100644
--- a/lib/formtastic/version.rb
+++ b/lib/formtastic/version.rb
@@ -1,3 +1,3 @@
 module Formtastic
-  VERSION = "2.0.0.rc3"
+  VERSION = "2.0.0.rc4"
 end

From cd707e66c019c693b90f364f49bfb7f784d325cf Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 17 Aug 2011 07:41:38 +1000
Subject: [PATCH 902/992] delete the post_install_message from gemspec, they're
 not visible with bundler

---
 formtastic.gemspec | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index e82d1fcec..af693a873 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -17,21 +17,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.post_install_message = %q{
-  ========================================================================
-  Thanks for installing Formtastic!
-  ------------------------------------------------------------------------
-  You can now (optionally) run the generator to copy a config initializer 
-  (and some stylesheets, in Rails 3.0.x) into your application:
-    rails generate formtastic:install
-
-  Find out more and get involved:
-    http://github.com/justinfrench/formtastic
-    http://rdoc.info/github/justinfrench/formtastic/master/frames
-    http://groups.google.com.au/group/formtastic
-    http://twitter.com/formtastic
-  ========================================================================
-  }
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = ["README.textile"]
 

From ed60316868aa01f502ca33fed5e17b2b53a0fe73 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 17 Aug 2011 07:42:20 +1000
Subject: [PATCH 903/992] update release instructions, no longer need to edit
 date

---
 RELEASE_PROCESS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/RELEASE_PROCESS b/RELEASE_PROCESS
index 19f8db09f..416b9afd0 100644
--- a/RELEASE_PROCESS
+++ b/RELEASE_PROCESS
@@ -1,5 +1,4 @@
 # edit version.rb
-# edit gemspec release date
 git ci formtastic.gemspec -m "new gemspec" # commit changes
 git tag X.X.X                              # tag the new version in the code base too
 gem build formtastic.gemspec               # build the gem

From fdd2300e03579e94bd6b78b4c13b9d0d4ce6a7bd Mon Sep 17 00:00:00 2001
From: Corin Langosch <info@corinlangosch.com>
Date: Fri, 19 Aug 2011 06:28:58 +0300
Subject: [PATCH 904/992] fixed #657

---
 lib/formtastic/helpers/form_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/helpers/form_helper.rb b/lib/formtastic/helpers/form_helper.rb
index cf0fa94d7..a8d68f65c 100644
--- a/lib/formtastic/helpers/form_helper.rb
+++ b/lib/formtastic/helpers/form_helper.rb
@@ -143,7 +143,7 @@ def semantic_form_for(record_or_name_or_array, *args, &proc)
         options = args.extract_options!
         options[:builder] ||= @@builder
         options[:html] ||= {}
-        options[:html][:novalidate] = !builder.perform_browser_validations unless options[:html].key?(:novalidate)
+        options[:html][:novalidate] = !@@builder.perform_browser_validations unless options[:html].key?(:novalidate)
         @@builder.custom_namespace = options[:namespace].to_s
 
         singularizer = defined?(ActiveModel::Naming.singular) ? ActiveModel::Naming.method(:singular) : ActionController::RecordIdentifier.method(:singular_class_name)

From c64f967b6a2759b6177fb9b17047b36a67b403c4 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Fri, 19 Aug 2011 09:32:40 -0300
Subject: [PATCH 905/992] Spec for issue #657 to avoid regression

---
 spec/builder/custom_builder_spec.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/spec/builder/custom_builder_spec.rb b/spec/builder/custom_builder_spec.rb
index 28b98233e..f6527f923 100644
--- a/spec/builder/custom_builder_spec.rb
+++ b/spec/builder/custom_builder_spec.rb
@@ -70,6 +70,13 @@ def to_html
         end
       end
 
+      # See: https://github.com/justinfrench/formtastic/issues/657
+      it "should not conflict with navigasmic" do
+        stub!(:builder).and_return('navigasmic')
+
+        lambda { semantic_form_for(@new_post) }.should_not raise_error(NoMethodError)
+      end
+
     end
 
     describe "fields_for" do

From 7d3bb2f0f8495c9c53dc5d8940ff215c6374df2d Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 23 Aug 2011 14:23:28 +1000
Subject: [PATCH 906/992] Changed HTML5 configuration defaults from true to
 false fixes #662 (for a better out-of-the-box experience and upgrade path)

---
 CHANGELOG                              |  4 ++++
 lib/formtastic/form_builder.rb         |  4 ++--
 lib/generators/templates/formtastic.rb |  6 +++---
 spec/inputs/boolean_input_spec.rb      | 24 +++++++++++++++---------
 spec/inputs/country_input_spec.rb      |  6 +++---
 spec/inputs/date_input_spec.rb         | 10 ++++++----
 spec/inputs/datetime_input_spec.rb     | 10 ++++++----
 spec/inputs/email_input_spec.rb        | 10 ++++++----
 spec/inputs/file_input_spec.rb         | 10 ++++++----
 spec/inputs/number_input_spec.rb       | 10 ++++++----
 spec/inputs/password_input_spec.rb     | 10 ++++++----
 spec/inputs/phone_input_spec.rb        | 10 ++++++----
 spec/inputs/search_input_spec.rb       | 10 ++++++----
 spec/inputs/select_input_spec.rb       | 10 ++++++----
 spec/inputs/text_input_spec.rb         | 10 ++++++----
 spec/inputs/time_input_spec.rb         | 10 ++++++----
 spec/inputs/time_zone_input_spec.rb    | 10 ++++++----
 spec/inputs/url_input_spec.rb          | 10 ++++++----
 18 files changed, 105 insertions(+), 69 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 38a28e34c..cf8f41daa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+2.0.0.rc5
+
+* Changed perform_browser_validations and use_required_attribute configuration defaults from true to false for a better out-of-the-box experience and upgrade path
+
 2.0.0.rc4
 
 * Fixed that TimeInput was not rendering hidden y/m/d inputs by default.
diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index 1dedd9b57..f6269acb8 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -28,8 +28,8 @@ def self.configure(name, value = nil)
     configure :default_inline_error_class, 'inline-errors'
     configure :default_error_list_class, 'errors'
     configure :default_hint_class, 'inline-hints'
-    configure :use_required_attribute, true
-    configure :perform_browser_validations, true
+    configure :use_required_attribute, false
+    configure :perform_browser_validations, false
 
     attr_reader :template
 
diff --git a/lib/generators/templates/formtastic.rb b/lib/generators/templates/formtastic.rb
index 646a8172c..f94d016af 100644
--- a/lib/generators/templates/formtastic.rb
+++ b/lib/generators/templates/formtastic.rb
@@ -72,11 +72,11 @@
 # specifying that class here.  Defaults to Formtastic::FormBuilder.
 # Formtastic::Helpers::FormHelper.builder = MyCustomBuilder
 
-# You can opt out of Formtastic's use of the HTML5 `required` attribute on `<input>`, `<select>` 
+# You can opt-in to Formtastic's use of the HTML5 `required` attribute on `<input>`, `<select>` 
 # and `<textarea>` tags by setting this to false (defaults to true).
-# Formtastic::FormBuilder.use_required_attribute = false
+# Formtastic::FormBuilder.use_required_attribute = true
 
-# You can opt out of new HTML5 browser validations (for things like email and url inputs) by setting
+# You can opt-in to new HTML5 browser validations (for things like email and url inputs) by setting
 # this to false. Doing so will add a `novalidate` attribute to the `<form>` tag.
 # See http://diveintohtml5.org/forms.html#validation for more info.
 # Formtastic::FormBuilder.perform_browser_validations = true
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index 3ca2c2e81..340fef1c9 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -150,19 +150,25 @@
   end
 
   context "when required" do
+    
     it "should add the required attribute to the input's html options" do
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:title, :as => :boolean, :required => true))
-      end)
-      output_buffer.should have_tag("input[@required]")
+      with_config :use_required_attribute, true do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:title, :as => :boolean, :required => true))
+        end)
+        output_buffer.should have_tag("input[@required]")
+      end
     end
-
+      
     it "should not add the required attribute to the boolean fields input's html options" do
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:title, :as => :boolean))
-      end)
-      output_buffer.should_not have_tag("input[@required]")
+      with_config :use_required_attribute, true do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:title, :as => :boolean))
+        end)
+        output_buffer.should_not have_tag("input[@required]")
+      end
     end
+    
   end
 
   describe "when namespace is provided" do
diff --git a/spec/inputs/country_input_spec.rb b/spec/inputs/country_input_spec.rb
index 2416fc9f4..b6bcd098a 100644
--- a/spec/inputs/country_input_spec.rb
+++ b/spec/inputs/country_input_spec.rb
@@ -56,7 +56,7 @@
       priority_countries = ["Foo", "Bah"]
       semantic_form_for(@new_post) do |builder|
         builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
-        builder.should_receive(:country_select).with(:country, priority_countries, {}, {:id => "post_country", :required => true, :autofocus => false}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        builder.should_receive(:country_select).with(:country, priority_countries, {}, {:id => "post_country", :required => false, :autofocus => false}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
 
         concat(builder.input(:country, :as => :country, :priority_countries => priority_countries))
       end
@@ -69,7 +69,7 @@
 
       semantic_form_for(@new_post) do |builder|
         builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
-        builder.should_receive(:country_select).with(:country, priority_countries, {}, {:id => "post_country", :required => true, :autofocus => false}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        builder.should_receive(:country_select).with(:country, priority_countries, {}, {:id => "post_country", :required => false, :autofocus => false}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
 
         concat(builder.input(:country, :as => :country))
       end
@@ -85,7 +85,7 @@
 
       concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
-        builder.should_receive(:country_select).with(:country, [], {}, {:id => "context2_post_country", :required => true, :autofocus => false}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        builder.should_receive(:country_select).with(:country, [], {}, {:id => "context2_post_country", :required => false, :autofocus => false}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         concat(builder.input(:country, :priority_countries => []))
       end)
     end
diff --git a/spec/inputs/date_input_spec.rb b/spec/inputs/date_input_spec.rb
index e0ddbd624..a06380814 100644
--- a/spec/inputs/date_input_spec.rb
+++ b/spec/inputs/date_input_spec.rb
@@ -120,10 +120,12 @@
   
   describe "when required" do
     it "should add the required attribute to the input's html options" do
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:title, :as => :date, :required => true))
-      end)
-      output_buffer.should have_tag("select[@required]", :count => 3)
+      with_config :use_required_attribute, true do 
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:title, :as => :date, :required => true))
+        end)
+        output_buffer.should have_tag("select[@required]", :count => 3)
+      end
     end
   end
   
diff --git a/spec/inputs/datetime_input_spec.rb b/spec/inputs/datetime_input_spec.rb
index 2321c58e1..8481daa82 100644
--- a/spec/inputs/datetime_input_spec.rb
+++ b/spec/inputs/datetime_input_spec.rb
@@ -124,10 +124,12 @@
   
   describe "when required" do
     it "should add the required attribute to the input's html options" do
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:title, :as => :datetime, :required => true))
-      end)
-      output_buffer.should have_tag("select[@required]", :count => 5)
+      with_config :use_required_attribute, true do 
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:title, :as => :datetime, :required => true))
+        end)
+        output_buffer.should have_tag("select[@required]", :count => 5)
+      end
     end
   end
   
diff --git a/spec/inputs/email_input_spec.rb b/spec/inputs/email_input_spec.rb
index b4066c6d8..a682104dc 100644
--- a/spec/inputs/email_input_spec.rb
+++ b/spec/inputs/email_input_spec.rb
@@ -44,10 +44,12 @@
   
   describe "when required" do
     it "should add the required attribute to the input's html options" do
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:title, :as => :email, :required => true))
-      end)
-      output_buffer.should have_tag("input[@required]")
+      with_config :use_required_attribute, true do 
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:title, :as => :email, :required => true))
+        end)
+        output_buffer.should have_tag("input[@required]")
+      end
     end
   end
   
diff --git a/spec/inputs/file_input_spec.rb b/spec/inputs/file_input_spec.rb
index 6360e7a0e..19d68e2d5 100644
--- a/spec/inputs/file_input_spec.rb
+++ b/spec/inputs/file_input_spec.rb
@@ -48,10 +48,12 @@
   
   context "when required" do
     it "should add the required attribute to the input's html options" do
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:title, :as => :file, :required => true))
-      end)
-      output_buffer.should have_tag("input[@required]")
+      with_config :use_required_attribute, true do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:title, :as => :file, :required => true))
+        end)
+        output_buffer.should have_tag("input[@required]")
+      end
     end
   end
   
diff --git a/spec/inputs/number_input_spec.rb b/spec/inputs/number_input_spec.rb
index 3f59a6545..903ec4274 100644
--- a/spec/inputs/number_input_spec.rb
+++ b/spec/inputs/number_input_spec.rb
@@ -68,10 +68,12 @@
   
   describe "when required" do
     it "should add the required attribute to the input's html options" do
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:title, :as => :number, :required => true))
-      end)
-      output_buffer.should have_tag("input[@required]")
+      with_config :use_required_attribute, true do 
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:title, :as => :number, :required => true))
+        end)
+        output_buffer.should have_tag("input[@required]")
+      end
     end
   end
   
diff --git a/spec/inputs/password_input_spec.rb b/spec/inputs/password_input_spec.rb
index 81f2a4e44..9e60e0ff7 100644
--- a/spec/inputs/password_input_spec.rb
+++ b/spec/inputs/password_input_spec.rb
@@ -59,10 +59,12 @@
   
   describe "when required" do
     it "should add the required attribute to the input's html options" do
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:title, :as => :password, :required => true))
-      end)
-      output_buffer.should have_tag("input[@required]")
+      with_config :use_required_attribute, true do 
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:title, :as => :password, :required => true))
+        end)
+        output_buffer.should have_tag("input[@required]")
+      end
     end
   end
   
diff --git a/spec/inputs/phone_input_spec.rb b/spec/inputs/phone_input_spec.rb
index d70e87d68..c4729e239 100644
--- a/spec/inputs/phone_input_spec.rb
+++ b/spec/inputs/phone_input_spec.rb
@@ -44,10 +44,12 @@
   
   describe "when required" do
     it "should add the required attribute to the input's html options" do
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:title, :as => :phone, :required => true))
-      end)
-      output_buffer.should have_tag("input[@required]")
+      with_config :use_required_attribute, true do 
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:title, :as => :phone, :required => true))
+        end)
+        output_buffer.should have_tag("input[@required]")
+      end
     end
   end
   
diff --git a/spec/inputs/search_input_spec.rb b/spec/inputs/search_input_spec.rb
index 0c4387f33..50e9bafc4 100644
--- a/spec/inputs/search_input_spec.rb
+++ b/spec/inputs/search_input_spec.rb
@@ -44,10 +44,12 @@
   
   describe "when required" do
     it "should add the required attribute to the input's html options" do
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:title, :as => :search, :required => true))
-      end)
-      output_buffer.should have_tag("input[@required]")
+      with_config :use_required_attribute, true do 
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:title, :as => :search, :required => true))
+        end)
+        output_buffer.should have_tag("input[@required]")
+      end
     end
   end
   
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index c5457775d..0f0ac0cdf 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -535,10 +535,12 @@
 
   context "when required" do
     it "should add the required attribute to the select's html options" do
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:author, :as => :select, :required => true))
-      end)
-      output_buffer.should have_tag("select[@required]")
+      with_config :use_required_attribute, true do 
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:author, :as => :select, :required => true))
+        end)
+        output_buffer.should have_tag("select[@required]")
+      end
     end
   end
 
diff --git a/spec/inputs/text_input_spec.rb b/spec/inputs/text_input_spec.rb
index 13122708c..a3da09235 100644
--- a/spec/inputs/text_input_spec.rb
+++ b/spec/inputs/text_input_spec.rb
@@ -83,10 +83,12 @@
   
   context "when required" do
     it "should add the required attribute to the input's html options" do
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:title, :as => :text, :required => true))
-      end)
-      output_buffer.should have_tag("textarea[@required]")
+      with_config :use_required_attribute, true do 
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:title, :as => :text, :required => true))
+        end)
+        output_buffer.should have_tag("textarea[@required]")
+      end
     end
   end
 
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index 57647055c..b8353e63c 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -189,10 +189,12 @@
   
   describe "when required" do
     it "should add the required attribute to the input's html options" do
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:title, :as => :time, :required => true))
-      end)
-      output_buffer.should have_tag("select[@required]", :count => 2)
+      with_config :use_required_attribute, true do 
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:title, :as => :time, :required => true))
+        end)
+        output_buffer.should have_tag("select[@required]", :count => 2)
+      end
     end
   end
   
diff --git a/spec/inputs/time_zone_input_spec.rb b/spec/inputs/time_zone_input_spec.rb
index 4e75e64f9..57bf9b8ce 100644
--- a/spec/inputs/time_zone_input_spec.rb
+++ b/spec/inputs/time_zone_input_spec.rb
@@ -77,10 +77,12 @@
   
   context "when required" do
     it "should add the required attribute to the input's html options" do
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:title, :as => :time_zone, :required => true))
-      end)
-      output_buffer.should have_tag("select[@required]")
+      with_config :use_required_attribute, true do 
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:title, :as => :time_zone, :required => true))
+        end)
+        output_buffer.should have_tag("select[@required]")
+      end
     end
   end
   
diff --git a/spec/inputs/url_input_spec.rb b/spec/inputs/url_input_spec.rb
index 04a4402ca..ef7f7f087 100644
--- a/spec/inputs/url_input_spec.rb
+++ b/spec/inputs/url_input_spec.rb
@@ -44,10 +44,12 @@
   
   describe "when required" do
     it "should add the required attribute to the input's html options" do
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:title, :as => :url, :required => true))
-      end)
-      output_buffer.should have_tag("input[@required]")
+      with_config :use_required_attribute, true do 
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:title, :as => :url, :required => true))
+        end)
+        output_buffer.should have_tag("input[@required]")
+      end
     end
   end
   

From 65a1916b212f677a9b659136b8c263c1c3e3bde8 Mon Sep 17 00:00:00 2001
From: Timothy Klim <klimtimothy@gmail.com>
Date: Tue, 30 Aug 2011 11:03:47 +0400
Subject: [PATCH 907/992] ISSUE 660 fix

---
 lib/formtastic/helpers/form_helper.rb      |  4 +-
 lib/formtastic/helpers/input_helper.rb     | 30 ++++++------
 lib/formtastic/inputs/base/choices.rb      | 16 +++---
 lib/formtastic/inputs/check_boxes_input.rb | 57 ++++++++++++----------
 4 files changed, 57 insertions(+), 50 deletions(-)

diff --git a/lib/formtastic/helpers/form_helper.rb b/lib/formtastic/helpers/form_helper.rb
index a8d68f65c..3d15390cf 100644
--- a/lib/formtastic/helpers/form_helper.rb
+++ b/lib/formtastic/helpers/form_helper.rb
@@ -175,7 +175,7 @@ def semantic_fields_for(record_name, record_object = nil, options = {}, &block)
           self.fields_for(record_name, record_object, options, &block)
         end
       end
-      
+
       protected
 
       # Override the default ActiveRecordHelper behaviour of wrapping the input.
@@ -197,4 +197,4 @@ def with_custom_field_error_proc(&block)
 
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/formtastic/helpers/input_helper.rb b/lib/formtastic/helpers/input_helper.rb
index 8ba18f80e..d56477f0a 100644
--- a/lib/formtastic/helpers/input_helper.rb
+++ b/lib/formtastic/helpers/input_helper.rb
@@ -1,12 +1,13 @@
+# -*- coding: utf-8 -*-
 module Formtastic
   module Helpers
-    
-    # {#input} is used to render all content (labels, form widgets, error messages, hints, etc) for 
-    # a single form input (or field), usually representing a single method or attribute on the 
+
+    # {#input} is used to render all content (labels, form widgets, error messages, hints, etc) for
+    # a single form input (or field), usually representing a single method or attribute on the
     # form's object or model.
     #
-    # The content is wrapped in an `<li>` tag, so it's usually called inside an {Formtastic::Helpers::InputsHelper#inputs inputs} block 
-    # (which renders an `<ol>` inside a `<fieldset>`), which should be inside a {Formtastic::Helpers::FormHelper#semantic_form_for `semantic_form_for`} 
+    # The content is wrapped in an `<li>` tag, so it's usually called inside an {Formtastic::Helpers::InputsHelper#inputs inputs} block
+    # (which renders an `<ol>` inside a `<fieldset>`), which should be inside a {Formtastic::Helpers::FormHelper#semantic_form_for `semantic_form_for`}
     # block:
     #
     #     <%= semantic_form_for @post do |f| %>
@@ -37,7 +38,7 @@ module Helpers
     module InputHelper
       include Formtastic::Helpers::Reflection
       include Formtastic::Helpers::FileColumnDetection
-      
+
       # Returns a chunk of HTML markup for a given `method` on the form object, wrapped in
       # an `<li>` wrapper tag with appropriate `class` and `id` attribute hooks for CSS and JS.
       # In many cases, the contents of the wrapper will be as simple as a `<label>` and an `<input>`:
@@ -105,9 +106,9 @@ module InputHelper
       # * `:time`         (see {Inputs::TimeInput})
       # * `:url`          (see {Inputs::UrlInput})
       #
-      # Calling `:as => :string` (for example) will call `#to_html` on a new instance of 
+      # Calling `:as => :string` (for example) will call `#to_html` on a new instance of
       # `Formtastic::Inputs::StringInput`. Before this, Formtastic will try to instantiate a top-level
-      # namespace StringInput, meaning you can subclass and modify `Formtastic::Inputs::StringInput` 
+      # namespace StringInput, meaning you can subclass and modify `Formtastic::Inputs::StringInput`
       # in `app/inputs/`. This also means you can create your own new input types in `app/inputs/`.
       #
       # @todo document the "guessing" of input style
@@ -233,7 +234,7 @@ module InputHelper
       # @example Modifying an input to suit your needs in `app/inputs`:
       #   class StringInput < Formtastic::Inputs::StringInput
       #     def to_html
-      #       puts "this is my custom version of StringInput"      
+      #       puts "this is my custom version of StringInput"
       #       super
       #     end
       #   end
@@ -260,13 +261,14 @@ module InputHelper
       def input(method, options = {})
         options = options.dup # Allow options to be shared without being tainted by Formtastic
         options[:as] ||= default_input_type(method, options)
-      
+
         klass = input_class(options[:as])
+
         klass.new(self, template, @object, @object_name, method, options).to_html
       end
-      
+
       protected
-      
+
       # First try if we can detect special things like :file. With CarrierWave the method does have
       # an underlying column so we don't want :string to get selected.
       #
@@ -314,7 +316,7 @@ def default_input_type(method, options = {}) #:nodoc:
           return :string
         end
       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)
@@ -352,7 +354,7 @@ def input_class(as)
           end
         end
       end
-      
+
       # :as => :string # => StringInput
       def custom_input_class_name(as)
         "#{as.to_s.camelize}Input"
diff --git a/lib/formtastic/inputs/base/choices.rb b/lib/formtastic/inputs/base/choices.rb
index 6f85f63ef..908ac7636 100644
--- a/lib/formtastic/inputs/base/choices.rb
+++ b/lib/formtastic/inputs/base/choices.rb
@@ -2,9 +2,9 @@ module Formtastic
   module Inputs
     module Base
       module Choices
-        
+
         def choices_wrapping(&block)
-          template.content_tag(:fieldset, 
+          template.content_tag(:fieldset,
             template.capture(&block),
             choices_wrapping_html_options
           )
@@ -15,7 +15,7 @@ def choices_wrapping_html_options
         end
 
         def choices_group_wrapping(&block)
-          template.content_tag(:ol, 
+          template.content_tag(:ol,
             template.capture(&block),
             choices_group_wrapping_html_options
           )
@@ -26,7 +26,7 @@ def choices_group_wrapping_html_options
         end
 
         def choice_wrapping(html_options, &block)
-          template.content_tag(:li, 
+          template.content_tag(:li,
             template.capture(&block),
             html_options
           )
@@ -35,11 +35,11 @@ def choice_wrapping(html_options, &block)
         def choice_wrapping_html_options(choice)
           classes = ['choice']
           classes << "#{sanitized_method_name.singularize}_#{choice_html_safe_value(choice)}" if value_as_class?
-          
+
           { :class => classes.join(" ") }
         end
 
-        def choice_html(choice)        
+        def choice_html(choice)
           raise "choice_html() needs to be implemented when including Formtastic::Inputs::Base::Choices"
         end
 
@@ -75,7 +75,7 @@ def choice_input_dom_id(choice)
             choice_html_safe_value(choice)
           ].compact.reject { |i| i.blank? }.join("_")
         end
-        
+
         def value_as_class?
           options[:value_as_class]
         end
@@ -90,7 +90,7 @@ def legend_html
             "".html_safe
           end
         end
-        
+
         # Override to remove the for attribute since this isn't associated with any element, as it's
         # nested inside the legend.
         def label_html_options
diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index aaab1c943..ec4b986b9 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -81,14 +81,14 @@ class CheckBoxesInput
       include Base
       include Base::Collections
       include Base::Choices
-      
+
       def to_html
         input_wrapping do
           choices_wrapping do
             legend_html <<
             hidden_field_for_all <<
             choices_group_wrapping do
-              collection.map { |choice| 
+              collection.map { |choice|
                 choice_wrapping(choice_wrapping_html_options(choice)) do
                   choice_html(choice)
                 end
@@ -97,17 +97,17 @@ def to_html
           end
         end
       end
-      
-      def choice_html(choice)        
+
+      def choice_html(choice)
         template.content_tag(:label,
-          hidden_fields? ? 
-            check_box_with_hidden_input(choice) : 
+          hidden_fields? ?
+            check_box_with_hidden_input(choice) :
             check_box_without_hidden_input(choice) <<
           choice_label(choice),
           label_html_options.merge(:for => choice_input_dom_id(choice), :class => nil)
         )
       end
-      
+
       def hidden_field_for_all
         if hidden_fields?
           ""
@@ -118,62 +118,67 @@ def hidden_field_for_all
           template.hidden_field_tag(input_name, '', options)
         end
       end
-      
+
       def hidden_fields?
         options[:hidden_fields]
       end
-      
+
       def check_box_with_hidden_input(choice)
         value = choice_value(choice)
         builder.check_box(
-          association_primary_key || method, 
-          input_html_options.merge(:id => choice_input_dom_id(choice), :name => input_name, :disabled => disabled?(value), :required => false), 
-          value, 
+          association_primary_key || method,
+          input_html_options.merge(:id => choice_input_dom_id(choice), :name => input_name, :disabled => disabled?(value), :required => false),
+          value,
           unchecked_value
         )
       end
-      
+
       def check_box_without_hidden_input(choice)
         value = choice_value(choice)
         template.check_box_tag(
-          input_name, 
-          value, 
-          checked?(value), 
+          input_name,
+          value,
+          checked?(value),
           input_html_options.merge(:id => choice_input_dom_id(choice), :disabled => disabled?(value), :required => false)
-        ) 
+        )
       end
-      
+
       def checked?(value)
         selected_values.include?(value)
       end
-      
+
       def disabled?(value)
         disabled_values.include?(value)
       end
-      
+
       def selected_values
         if object.respond_to?(method)
-          selected_items = [object.send(method)].compact.flatten
+          if options[:collection].nil?
+            selected_items = [object.send(method)].compact.flatten
+          else
+            selected_items = options[:collection].to_a # for error readability
+          end
+
           [*selected_items.map { |o| send_or_call_or_object(value_method, o) }].compact
         else
           []
         end
       end
-      
+
       def disabled_values
         vals = options[:disabled] || []
         vals = [vals] unless vals.is_a?(Array)
         vals
       end
-      
+
       def unchecked_value
         options[:unchecked_value] || ''
       end
-      
+
       def input_name
         "#{object_name}[#{association_primary_key || method}][]"
       end
-      
+
     end
   end
-end
\ No newline at end of file
+end

From 4b3fb38c40b89096cb385e6302ca38522252eb44 Mon Sep 17 00:00:00 2001
From: Timothy Klim <klimtimothy@gmail.com>
Date: Tue, 30 Aug 2011 14:35:24 +0400
Subject: [PATCH 908/992] dirty but it's works for me

---
 lib/formtastic/inputs/check_boxes_input.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index ec4b986b9..4c664fcda 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -153,10 +153,12 @@ def disabled?(value)
 
       def selected_values
         if object.respond_to?(method)
-          if options[:collection].nil?
-            selected_items = [object.send(method)].compact.flatten
+          if options[:collection].is_a?(Array) and
+              options[:collection].flatten.all? {|i| i.is_a?(String) or i.is_a?(Integer)}
+
+            selected_items = options[:collection]
           else
-            selected_items = options[:collection].to_a # for error readability
+            selected_items = [object.send(method)].compact.flatten
           end
 
           [*selected_items.map { |o| send_or_call_or_object(value_method, o) }].compact

From 4d61e335c8ea90ceda3a200a672946457a332ec5 Mon Sep 17 00:00:00 2001
From: Timothy Klim <klimtimothy@gmail.com>
Date: Wed, 31 Aug 2011 13:55:34 +0400
Subject: [PATCH 909/992] added specs

---
 spec/inputs/check_boxes_input_spec.rb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 3989fedb1..af1195793 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -393,5 +393,24 @@
     it_should_have_input_wrapper_with_id("context2_author_posts_input")
   end
 
+  describe "when collection is an array" do
+    before do
+      @output_buffer = ''
+      @_collection = [["First", 1], ["Second", 2]]
+      mock_everything
+
+      concat(semantic_form_for(@fred) do |builder|
+        concat(builder.input(:posts, :as => :check_boxes, :collection => @_collection))
+      end)
+    end
+
+    it "should use array items for labels and values" do
+      @_collection.each do |post|
+        output_buffer.should have_tag('form li fieldset ol li label', /#{post.first}/)
+        output_buffer.should have_tag("form li fieldset ol li label[@for='author_post_ids_#{post.last}']")
+      end
+    end
+  end
+  
 end
 

From 14efd86e5a2949405d792f1062a965f597cb61db Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 1 Sep 2011 23:35:38 +1000
Subject: [PATCH 910/992] CHANGELOG

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index cf8f41daa..744fba858 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 2.0.0.rc5
 
 * Changed perform_browser_validations and use_required_attribute configuration defaults from true to false for a better out-of-the-box experience and upgrade path
+* Fixed that the `novalidate` attribute was being applied to the `<form>` tag when it shouldn't have been (and vice-versa)
+* Fixed `undefined method `last' for #<Classname>` with a `:collection` containing an array of arrays
 
 2.0.0.rc4
 

From 9a7fa559eedc1f9c5ff4527dc5b7fa95e6115597 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 1 Sep 2011 23:36:46 +1000
Subject: [PATCH 911/992] version bump 2.0.0.rc5

---
 lib/formtastic/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/version.rb b/lib/formtastic/version.rb
index 4fce413e6..da5da8c07 100644
--- a/lib/formtastic/version.rb
+++ b/lib/formtastic/version.rb
@@ -1,3 +1,3 @@
 module Formtastic
-  VERSION = "2.0.0.rc4"
+  VERSION = "2.0.0.rc5"
 end

From d9ec403d0faf12d521006bf00f8ea9d459c183c7 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 1 Sep 2011 23:39:23 +1000
Subject: [PATCH 912/992] tweak release process

---
 RELEASE_PROCESS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE_PROCESS b/RELEASE_PROCESS
index 416b9afd0..59bc314d9 100644
--- a/RELEASE_PROCESS
+++ b/RELEASE_PROCESS
@@ -1,5 +1,5 @@
 # edit version.rb
-git ci formtastic.gemspec -m "new gemspec" # commit changes
+git ci -am "version bump"                  # commit changes
 git tag X.X.X                              # tag the new version in the code base too
 gem build formtastic.gemspec               # build the gem
 gem push formtastic-X.X.X.gem              # publish the gem

From 22a9af1c2959ade9dcb48d20bebc69303d1d7e77 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 2 Sep 2011 00:06:47 +1000
Subject: [PATCH 913/992] prep README for 2.0

---
 README.textile | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/README.textile b/README.textile
index 5eaf0ed5c..85cd52c9d 100644
--- a/README.textile
+++ b/README.textile
@@ -7,9 +7,8 @@ Formtastic is a Rails FormBuilder DSL (with some other goodies) to make it far e
 
 h2. Compatibility
 
-* Formtastic 1.x is compatible with both Rails 2 and 3, and is being maintained for bug fixes in the the "1.2-stable branch":https://github.com/justinfrench/formtastic/tree/1.2-stable.
-* Formtastic 2.0 will be Rails 3.x compatible only
-* If you're bundling Formtastic from edge/master, get ready for a bumpy ride. Try the "1.2-stable branch":https://github.com/justinfrench/formtastic/tree/1.2-stable.
+* Formtastic 2.0 is Rails 3.x compatible only
+* Formtastic 1.x is compatible with both Rails 2 and 3, and is being maintained for bug fixes in the the "1.2-stable branch":https://github.com/justinfrench/formtastic/tree/1.2-stable. View the README in that branch for installation instructions, etc.
 * Formtastic, much like Rails, is very ActiveRecord-centric. Many are successfully using other ActiveModel-like ORMs and objects (DataMapper, MongoMapper, Mongoid, Authlogic, Devise...) but we're not guaranteeing full compatibility at this stage. Patches are welcome!
  
 
@@ -94,16 +93,10 @@ h2. Installation
 Simply add Formtastic to your Gemfile and bundle it up:
 
 <pre>
-  gem 'formtastic', '~> 1.2.3'
+  gem 'formtastic'
 </pre>
 
-If you want to try out our work towards Formtastic 2.0 (Rails 3.x only):
-
-<pre>
-  gem 'formtastic', '2.0.0.rc1'
-</pre>
-
-Run the installation generator to copy a stylesheet (Rails 3.0.x only) and a configuration initializer into your application:
+Run the installation generator:
 
 <pre>
   $ rails generate formtastic:install 
@@ -419,8 +412,6 @@ Formtastic supports localized *labels*, *hints*, *legends*, *actions* using the
         dummie: "Launch!"
 </pre>
 
-*Note:* We are using English here still, but you get the point.
-
 *3. ...and now you'll get:*
 
 <pre>
@@ -531,11 +522,6 @@ You can show errors on base (by default) and any other attribute just passing it
 </pre>
 
 
-h2. Configuration
-
-Run @rails generate formtastic:install@ to copy a commented out config file into @config/initializers/formtastic.rb@. You can "view the configuration file on GitHub":http://github.com/justinfrench/formtastic/blob/master/lib/generators/templates/formtastic.rb
-
-
 h2. Modified & Custom Inputs
 
 If you want to change the behaviour of an input, you can subclass it in your app. For example, to tweak @StringInput@, create a new file @app/inputs/string_input.rb@:
@@ -572,12 +558,12 @@ To create your own new types of inputs from scratch:
   end
 </pre>
 
-It was previously advised to subclass Formtastic::FormBuilder to add your own inputs. This is no longer advised, and may not work as expected.
+It was previously recommended in Formtastic 1.x to subclass Formtastic::FormBuilder to add your own inputs. This is no longer recommended in Formtastic 2, and will not work as expected.
 
 
 h2. Security
 
-By default formtastic escapes html entities in both labels and hints unless a string is marked as html_safe. If you are using an older rails version which doesn't know html_safe, or you want to globally turn this feature off, you can set the following in your initializer:
+By default Formtastic escapes html entities in both labels and hints unless a string is marked as html_safe. If you are using an older rails version which doesn't know html_safe, or you want to globally turn this feature off, you can set the following in your initializer:
 
 Formtastic::FormBuilder.escape_html_entities_in_hints_and_labels = false
 

From 70986a207f29d15183bc1ed17648058be02930d9 Mon Sep 17 00:00:00 2001
From: eugen neagoe <eneagoe@gmail.com>
Date: Thu, 1 Sep 2011 18:47:55 +0300
Subject: [PATCH 914/992] collection_from_association now works with Proc
 conditions for the associations

---
 lib/formtastic/inputs/base/collections.rb | 45 +++++++++++------------
 spec/inputs/select_input_spec.rb          | 11 +++---
 spec/spec_helper.rb                       | 41 +++++++++++----------
 3 files changed, 49 insertions(+), 48 deletions(-)

diff --git a/lib/formtastic/inputs/base/collections.rb b/lib/formtastic/inputs/base/collections.rb
index 1e370c00b..83bcc2679 100644
--- a/lib/formtastic/inputs/base/collections.rb
+++ b/lib/formtastic/inputs/base/collections.rb
@@ -2,18 +2,18 @@ module Formtastic
   module Inputs
     module Base
       module Collections
-        
+
         def label_method
           label_and_value_method(raw_collection).first
         end
-      
+
         def value_method
           label_and_value_method(raw_collection).last
         end
-      
+
         def label_and_value_method(_collection, grouped=false)
           sample = _collection.first || _collection.last
-      
+
           case sample
           when Array
             label, value = :first, :last
@@ -22,36 +22,36 @@ def label_and_value_method(_collection, grouped=false)
           when String, NilClass
             label, value = :to_s, :to_s
           end
-      
+
           # Order of preference: user supplied method, class defaults, auto-detect
           label = (grouped ? options[:grouped_label_method] : options[:member_label]) || label || builder.collection_label_methods.find { |m| sample.respond_to?(m) }
           value = (grouped ? options[:grouped_value_method] : options[:member_value]) || value || builder.collection_value_methods.find { |m| sample.respond_to?(m) }
-      
+
           [label, value]
         end
-            
+
         def raw_collection
           @raw_collection ||= (collection_from_options || collection_from_association || collection_for_boolean)
         end
-      
+
         def collection
           # Return if we have a plain string
           return raw_collection if raw_collection.instance_of?(String) || raw_collection.instance_of?(ActiveSupport::SafeBuffer)
-        
+
           # Return if we have an Array of strings, fixnums or arrays
           return raw_collection if (raw_collection.instance_of?(Array) || raw_collection.instance_of?(Range)) &&
                                [Array, Fixnum, String, Symbol].include?(raw_collection.first.class) &&
                                !(options.include?(:member_label) || options.include?(:member_value))
-                       
+
           raw_collection.map { |o| [send_or_call(label_method, o), send_or_call(value_method, o)] }
         end
-      
+
         def collection_from_options
           items = options[:collection]
           items = items.to_a if items.is_a?(Hash)
           items
         end
-      
+
         def collection_from_association
           if reflection
             raise PolymorphicInputWithoutCollectionError.new("A collection must be supplied for #{method} input. Collections cannot be guessed for polymorphic associations.") if reflection.options && reflection.options[:polymorphic] == true
@@ -59,27 +59,26 @@ def collection_from_association
             find_options_from_options = options[:find_options] || {}
             conditions_from_options = find_options_from_options[:conditions] || {}
             conditions_from_reflection = reflection.options && reflection.options[:conditions] || {}
-            
+            conditions_from_reflection = conditions_from_reflection.call if conditions_from_reflection.is_a?(Proc)
+
             if conditions_from_options.any?
-              reflection.klass.where(
-                conditions_from_reflection.merge(conditions_from_options)
-              )
+              reflection.klass.scoped(:conditions => conditions_from_reflection).where(conditions_from_options)
             else
               find_options_from_options.merge!(:include => group_by) if self.respond_to?(:group_by) && group_by
-              reflection.klass.where(conditions_from_reflection.merge(find_options_from_options))
+              reflection.klass.scoped(:conditions => conditions_from_reflection).where(find_options_from_options)
             end
           end
         end
-        
+
         def collection_for_boolean
           true_text = options[:true] || Formtastic::I18n.t(:yes)
           false_text = options[:false] || Formtastic::I18n.t(:no)
-        
+
           # TODO options[:value_as_class] = true unless options.key?(:value_as_class)
-      
+
           [ [true_text, true], [false_text, false] ]
         end
-      
+
         def send_or_call(duck, object)
           if duck.respond_to?(:call)
             duck.call(object)
@@ -87,14 +86,14 @@ def send_or_call(duck, object)
             object.send(duck)
           end
         end
-        
+
         # Avoids an issue where `send_or_call` can be a String and duck can be something simple like
         # `:first`, which obviously String responds to.
         def send_or_call_or_object(duck, object)
           return object if object.is_a?(String) # TODO what about other classes etc?
           send_or_call(duck, object)
         end
-      
+
       end
     end
   end
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 0f0ac0cdf..3ac2947d6 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -208,7 +208,7 @@
     end
 
     it "should call author.find with association conditions" do
-      ::Author.should_receive(:where).with(:active => true)
+      ::Author.should_receive(:scoped).with(:conditions => {:active => true})
 
       semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select))
@@ -216,7 +216,8 @@
     end
 
     it "should call author.find with association conditions and find_options conditions" do
-      ::Author.should_receive(:where).with({:active => true, :publisher => true})
+      ::Author.should_receive(:scoped).with(:conditions => {:active => true})
+      ::Author.should_receive(:where).with({:publisher => true})
 
       semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author, :as => :select, :find_options => {:conditions => {:publisher => true}}))
@@ -316,11 +317,11 @@
     it 'should have a multi-select select' do
       output_buffer.should have_tag('form li select[@multiple="multiple"]')
     end
-    
+
     it 'should append [] to the name attribute for multiple select' do
       output_buffer.should have_tag('form li select[@multiple="multiple"][@name="author[post_ids][]"]')
     end
-    
+
     it 'should have a select option for each Post' do
       output_buffer.should have_tag('form li select option', :count => ::Post.all.size)
       ::Post.all.each do |post|
@@ -535,7 +536,7 @@
 
   context "when required" do
     it "should add the required attribute to the select's html options" do
-      with_config :use_required_attribute, true do 
+      with_config :use_required_attribute, true do
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:author, :as => :select, :required => true))
         end)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 5b6e0113d..2ef7a3447 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -67,7 +67,7 @@ def active_model_length_validator(attributes, options = {})
   def active_model_inclusion_validator(attributes, options = {})
     active_model_validator(:inclusion, attributes, options)
   end
-  
+
   def active_model_numericality_validator(attributes, options = {})
     active_model_validator(:numericality, attributes, options)
   end
@@ -93,7 +93,7 @@ def id
     def persisted?
     end
   end
-  
+
   module ::Namespaced
     class Post
       extend ActiveModel::Naming if defined?(ActiveModel::Naming)
@@ -106,18 +106,18 @@ def persisted?
       end
     end
   end
-  
+
   class ::Author
     extend ActiveModel::Naming if defined?(ActiveModel::Naming)
     include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
 
     def to_label
     end
-    
+
     def persisted?
     end
   end
-  
+
   class ::HashBackedAuthor < Hash
     extend ActiveModel::Naming if defined?(ActiveModel::Naming)
     include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
@@ -126,34 +126,34 @@ def name
       'hash backed author'
     end
   end
-  
+
   class ::Continent
     extend ActiveModel::Naming if defined?(ActiveModel::Naming)
     include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
   end
-  
+
   class ::PostModel
     extend ActiveModel::Naming if defined?(ActiveModel::Naming)
     include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
   end
-  
+
   def _routes
     url_helpers = mock('url_helpers')
     url_helpers.stub!(:hash_for_posts_path).and_return({})
     url_helpers.stub!(:hash_for_post_path).and_return({})
     url_helpers.stub!(:hash_for_post_models_path).and_return({})
     url_helpers.stub!(:hash_for_authors_path).and_return({})
-    
-    mock('_routes', 
+
+    mock('_routes',
       :url_helpers => url_helpers,
       :url_for => "/mock/path"
     )
   end
-    
+
   def controller
     mock('controller', :controller_path= => '', :params => {})
   end
-  
+
   def default_url_options
     {}
   end
@@ -171,7 +171,7 @@ def new_post_path(*args); "/posts/new"; end
     def author_path(*args); "/authors/1"; end
     def authors_path(*args); "/authors"; end
     def new_author_path(*args); "/authors/new"; end
-    
+
     @fred = ::Author.new
     @fred.stub!(:class).and_return(::Author)
     @fred.stub!(:to_label).and_return('Fred Smith')
@@ -212,6 +212,7 @@ def new_author_path(*args); "/authors/new"; end
     @james.stub!(:name).and_return('James')
 
 
+    ::Author.stub!(:scoped).and_return(::Author)
     ::Author.stub!(:find).and_return([@fred, @bob])
     ::Author.stub!(:all).and_return([@fred, @bob])
     ::Author.stub!(:where).and_return([@fred, @bob])
@@ -223,7 +224,7 @@ def new_author_path(*args); "/authors/new"; end
     ::Author.stub!(:persisted?).and_return(nil)
 
     @hash_backed_author = HashBackedAuthor.new
-    
+
     # Sometimes we need a mock @post object and some Authors for belongs_to
     @new_post = mock('post')
     @new_post.stub!(:class).and_return(::Post)
@@ -240,7 +241,7 @@ def new_author_path(*args); "/authors/new"; end
     @new_post.stub!(:to_key).and_return(nil)
     @new_post.stub!(:to_model).and_return(@new_post)
     @new_post.stub!(:persisted?).and_return(nil)
-    
+
     @freds_post = mock('post')
     @freds_post.stub!(:to_ary)
     @freds_post.stub!(:class).and_return(::Post)
@@ -258,6 +259,7 @@ def new_author_path(*args); "/authors/new"; end
     @fred.stub!(:posts).and_return([@freds_post])
     @fred.stub!(:post_ids).and_return([@freds_post.id])
 
+    ::Post.stub!(:scoped).and_return(::Post)
     ::Post.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     ::Post.stub!(:human_name).and_return('Post')
     ::Post.stub!(:reflect_on_all_validations).and_return([])
@@ -291,7 +293,6 @@ def new_author_path(*args); "/authors/new"; end
     ::Post.stub!(:persisted?).and_return(nil)
     ::Post.stub!(:to_ary)
 
-
     ::MongoPost.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     ::MongoPost.stub!(:human_name).and_return('MongoPost')
     ::MongoPost.stub!(:associations).and_return do |column_name|
@@ -306,14 +307,14 @@ def new_author_path(*args); "/authors/new"; end
     ::MongoPost.stub!(:to_key).and_return(nil)
     ::MongoPost.stub!(:persisted?).and_return(nil)
     ::MongoPost.stub!(:to_ary)
-    ::MongoPost.stub!(:model_name).and_return( mock(:model_name_mock, :singular => "post", :plural => "posts", :param_key => "post", :route_key => "posts") ) 
+    ::MongoPost.stub!(:model_name).and_return( mock(:model_name_mock, :singular => "post", :plural => "posts", :param_key => "post", :route_key => "posts") )
 
     @new_mm_post = mock('mm_post')
     @new_mm_post.stub!(:class).and_return(::MongoPost)
     @new_mm_post.stub!(:id).and_return(nil)
     @new_mm_post.stub!(:new_record?).and_return(true)
     @new_mm_post.stub!(:errors).and_return(mock('errors', :[] => nil))
-    @new_mm_post.stub!(:title).and_return("Hello World")    
+    @new_mm_post.stub!(:title).and_return("Hello World")
     @new_mm_post.stub!(:sub_posts).and_return([]) #TODO should be a mock with methods for adding sub posts
     @new_mm_post.stub!(:to_key).and_return(nil)
     @new_mm_post.stub!(:to_model).and_return(@new_mm_post)
@@ -384,11 +385,11 @@ def self.included(base)
       def protect_against_forgery?
         false
       end
-      
+
       def _helpers
         FakeHelpersModule
       end
-      
+
     end
   end
 

From 60f85a390c735b57956fbe52a5882e3a4f2e2dcb Mon Sep 17 00:00:00 2001
From: Matt Vague <mattvague@gmail.com>
Date: Thu, 1 Sep 2011 09:57:08 -0700
Subject: [PATCH 915/992] Closes #667 Made it easier to override commit button
 wrapper class by splitting the classes into a different method, added missing
 wrapper class to spec

---
 lib/formtastic/helpers/buttons_helper.rb  | 7 +++++--
 spec/helpers/commit_button_helper_spec.rb | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic/helpers/buttons_helper.rb b/lib/formtastic/helpers/buttons_helper.rb
index a10255348..ff23e1212 100644
--- a/lib/formtastic/helpers/buttons_helper.rb
+++ b/lib/formtastic/helpers/buttons_helper.rb
@@ -264,14 +264,17 @@ def commit_button(*args)
         button_html = options.delete(:button_html) || {}
         button_html.merge!(:class => [button_html[:class], key].compact.join(' '))
 
-        wrapper_html_class = ['commit', 'button'] # TODO: Add class reflecting on form action.
         wrapper_html = options.delete(:wrapper_html) || {}
-        wrapper_html[:class] = (wrapper_html_class << wrapper_html[:class]).flatten.compact.join(' ')
+        wrapper_html[:class] = (commit_button_wrapper_html_class << wrapper_html[:class]).flatten.compact.join(' ')
 
         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, Formtastic::Util.html_safe(submit(text, button_html)), wrapper_html)
       end
+      
+      def commit_button_wrapper_html_class
+        ['commit', 'button'] # TODO: Add class reflecting on form action.
+      end
     end
   end
 end
\ No newline at end of file
diff --git a/spec/helpers/commit_button_helper_spec.rb b/spec/helpers/commit_button_helper_spec.rb
index 717dc8c13..a8d9d2ba9 100644
--- a/spec/helpers/commit_button_helper_spec.rb
+++ b/spec/helpers/commit_button_helper_spec.rb
@@ -461,7 +461,7 @@ def self.human_name
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.commit_button('text'))
         end)
-        output_buffer.should have_tag("form li.commit")
+        output_buffer.should have_tag("form li.commit.button")
       end
     end
 

From f48af207c744e5710e53e7a5e503b48c7660fd25 Mon Sep 17 00:00:00 2001
From: Matt Vague <mattvague@gmail.com>
Date: Thu, 1 Sep 2011 09:59:05 -0700
Subject: [PATCH 916/992] Refactored commit_button method. Split it into a
 couple of different methods to make it easier to read and make it more
 customizable

---
 lib/formtastic/helpers/buttons_helper.rb | 49 ++++++++++++++++--------
 1 file changed, 33 insertions(+), 16 deletions(-)

diff --git a/lib/formtastic/helpers/buttons_helper.rb b/lib/formtastic/helpers/buttons_helper.rb
index ff23e1212..f61bf55f0 100644
--- a/lib/formtastic/helpers/buttons_helper.rb
+++ b/lib/formtastic/helpers/buttons_helper.rb
@@ -238,9 +238,23 @@ def commit_button(*args)
         options = args.extract_options!
         text = options.delete(:label) || args.shift
 
-        if @object && (@object.respond_to?(:persisted?) || @object.respond_to?(:new_record?))
-          key = @object.persisted? ? :update : :create
+        text = (localized_string(commit_button_i18n_key, text, :action, :model => commit_button_object_name) ||
+                Formtastic::I18n.t(commit_button_i18n_key, :model => commit_button_object_name)) unless text.is_a?(::String)
+
+        button_html = options.delete(:button_html) || {}
+        button_html.merge!(:class => [button_html[:class], commit_button_i18n_key].compact.join(' '))
+
+        wrapper_html = options.delete(:wrapper_html) || {}
+        wrapper_html[:class] = (commit_button_wrapper_html_class << wrapper_html[:class]).flatten.compact.join(' ')
+
+        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, Formtastic::Util.html_safe(submit(text, button_html)), wrapper_html)
+      end
 
+      def commit_button_object_name
+        if new_or_persisted_object?
           # Deal with some complications with ActiveRecord::Base.human_name and two name models (eg UserPost)
           # ActiveRecord::Base.human_name falls back to ActiveRecord::Base.name.humanize ("Userpost")
           # if there's no i18n, which is pretty crappy.  In this circumstance we want to detect this
@@ -254,27 +268,30 @@ def commit_button(*args)
             object_name = (object_human_name == crappy_human_name) ? decent_human_name : object_human_name
           end
         else
-          key = :submit
           object_name = @object_name.to_s.send(label_str_method)
         end
-
-        text = (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) || {}
-        button_html.merge!(:class => [button_html[:class], key].compact.join(' '))
-
-        wrapper_html = options.delete(:wrapper_html) || {}
-        wrapper_html[:class] = (commit_button_wrapper_html_class << wrapper_html[:class]).flatten.compact.join(' ')
-
-        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, Formtastic::Util.html_safe(submit(text, button_html)), wrapper_html)
+        
+        object_name
       end
       
+      def commit_button_i18n_key
+        if new_or_persisted_object?
+          key = @object.persisted? ? :update : :create
+        else
+          key = :submit
+        end
+
+        key
+      end
+
       def commit_button_wrapper_html_class
         ['commit', 'button'] # TODO: Add class reflecting on form action.
       end
+      
+      def new_or_persisted_object?
+        @object && (@object.respond_to?(:persisted?) || @object.respond_to?(:new_record?))
+      end
+      
     end
   end
 end
\ No newline at end of file

From d0b0b93203b81e8ff18d116643ee8a94b6661cdd Mon Sep 17 00:00:00 2001
From: "Lars O. Overskeid" <ovelar@gmail.com>
Date: Thu, 1 Sep 2011 22:03:07 +0200
Subject: [PATCH 917/992] Added form template for Slim engine

---
 lib/generators/templates/_form.html.slim | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 lib/generators/templates/_form.html.slim

diff --git a/lib/generators/templates/_form.html.slim b/lib/generators/templates/_form.html.slim
new file mode 100644
index 000000000..5afb5a099
--- /dev/null
+++ b/lib/generators/templates/_form.html.slim
@@ -0,0 +1,8 @@
+= semantic_form_for @<%= singular_name %> do |f|
+  = f.inputs do
+  <% attributes.each do |attribute| -%>
+    = f.input :<%= attribute.name %>
+  <% end -%>
+
+  = f.buttons do
+    = f.commit_button

From bd218eded417ef14d23464c4355d48e9911eee23 Mon Sep 17 00:00:00 2001
From: Christoph Thiel <ct@kki.org>
Date: Mon, 5 Sep 2011 10:50:41 +0200
Subject: [PATCH 918/992] Closes #674 don't check all check_boxes if Array is
 passed to :collection

---
 lib/formtastic/inputs/check_boxes_input.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index 4c664fcda..5b61bbc94 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -153,14 +153,10 @@ def disabled?(value)
 
       def selected_values
         if object.respond_to?(method)
-          if options[:collection].is_a?(Array) and
+          selected_items = [object.send(method)].compact.flatten
+        elsif options[:collection].is_a?(Array) and
               options[:collection].flatten.all? {|i| i.is_a?(String) or i.is_a?(Integer)}
-
             selected_items = options[:collection]
-          else
-            selected_items = [object.send(method)].compact.flatten
-          end
-
           [*selected_items.map { |o| send_or_call_or_object(value_method, o) }].compact
         else
           []

From 61113d670c720bd11bf558c91ecc503d2a4ccaa5 Mon Sep 17 00:00:00 2001
From: Christoph Thiel <ct@kki.org>
Date: Mon, 5 Sep 2011 13:44:21 +0200
Subject: [PATCH 919/992] Revert "Closes #674 don't check all check_boxes if
 Array is passed to :collection"

This reverts commit bd218eded417ef14d23464c4355d48e9911eee23.
---
 lib/formtastic/inputs/check_boxes_input.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index 5b61bbc94..4c664fcda 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -153,10 +153,14 @@ def disabled?(value)
 
       def selected_values
         if object.respond_to?(method)
-          selected_items = [object.send(method)].compact.flatten
-        elsif options[:collection].is_a?(Array) and
+          if options[:collection].is_a?(Array) and
               options[:collection].flatten.all? {|i| i.is_a?(String) or i.is_a?(Integer)}
+
             selected_items = options[:collection]
+          else
+            selected_items = [object.send(method)].compact.flatten
+          end
+
           [*selected_items.map { |o| send_or_call_or_object(value_method, o) }].compact
         else
           []

From 292a0c2e8439fba27b77184b002de15ce2e4d8a9 Mon Sep 17 00:00:00 2001
From: Christoph Thiel <ct@kki.org>
Date: Mon, 5 Sep 2011 13:45:35 +0200
Subject: [PATCH 920/992] add failing spec for issue #674

---
 spec/inputs/check_boxes_input_spec.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index af1195793..5f423780a 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -410,6 +410,10 @@
         output_buffer.should have_tag("form li fieldset ol li label[@for='author_post_ids_#{post.last}']")
       end
     end
+
+    it "should not check any items" do
+      output_buffer.should have_tag('form li input[@checked]', :count => 0)
+    end    
   end
   
 end

From 7691f5b5bb2b72a43655fbab569c971249bd5004 Mon Sep 17 00:00:00 2001
From: Christoph Thiel <ct@kki.org>
Date: Mon, 5 Sep 2011 13:51:01 +0200
Subject: [PATCH 921/992] Closes #674 don't check all check_boxes if Array is
 passed to :collection

---
 lib/formtastic/inputs/base/collections.rb  | 2 +-
 lib/formtastic/inputs/check_boxes_input.rb | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/lib/formtastic/inputs/base/collections.rb b/lib/formtastic/inputs/base/collections.rb
index 83bcc2679..7317324c7 100644
--- a/lib/formtastic/inputs/base/collections.rb
+++ b/lib/formtastic/inputs/base/collections.rb
@@ -82,7 +82,7 @@ def collection_for_boolean
         def send_or_call(duck, object)
           if duck.respond_to?(:call)
             duck.call(object)
-          else
+          elsif object.respond_to? duck.to_sym
             object.send(duck)
           end
         end
diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index 4c664fcda..8393d7150 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -153,13 +153,7 @@ def disabled?(value)
 
       def selected_values
         if object.respond_to?(method)
-          if options[:collection].is_a?(Array) and
-              options[:collection].flatten.all? {|i| i.is_a?(String) or i.is_a?(Integer)}
-
-            selected_items = options[:collection]
-          else
-            selected_items = [object.send(method)].compact.flatten
-          end
+          selected_items = [object.send(method)].compact.flatten
 
           [*selected_items.map { |o| send_or_call_or_object(value_method, o) }].compact
         else

From 13ed3f7f4d4768b8e893c42717d297d3cc1f03e8 Mon Sep 17 00:00:00 2001
From: Taavo Smith <taavo@mac.com>
Date: Sun, 11 Sep 2011 19:32:46 -0400
Subject: [PATCH 922/992] add failing spec for 677 select generates incorrect
 name when passed nil (only fails prior to 3.0.10)

---
 spec/inputs/select_input_spec.rb | 10 ++++++++++
 spec/support/custom_macros.rb    |  6 ++++++
 2 files changed, 16 insertions(+)

diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 3ac2947d6..2b466eaff 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -75,6 +75,16 @@
         end
       end
     end
+    
+    describe 'using a nil name' do
+      before do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:title, :as => :select, :collection => [], :input_html => {:name => nil}))
+        end)
+      end
+
+      it_should_have_select_with_name("post[title]")
+    end
   end
 
   describe 'for boolean columns' do
diff --git a/spec/support/custom_macros.rb b/spec/support/custom_macros.rb
index 5aef0a979..341ab028e 100644
--- a/spec/support/custom_macros.rb
+++ b/spec/support/custom_macros.rb
@@ -86,6 +86,12 @@ def it_should_have_input_with_name(name)
       end
     end
 
+    def it_should_have_select_with_name(name)
+      it "should have an input named #{name}" do
+        output_buffer.should have_tag("form li select[@name=\"#{name}\"]")
+      end
+    end
+
     def it_should_have_textarea_with_name(name)
       it "should have an input named #{name}" do
         output_buffer.should have_tag("form li textarea[@name=\"#{name}\"]")

From 86cb1ed1ec943efd4651650d24aa2b85860db8cf Mon Sep 17 00:00:00 2001
From: Matt Wilson <mhw@hypomodern.com>
Date: Mon, 12 Sep 2011 11:35:04 -0400
Subject: [PATCH 923/992] MongoMapper does not use `associations(method)`.
 `.associations` is an accessor.

---
 lib/formtastic/helpers/reflection.rb | 2 +-
 spec/spec_helper.rb                  | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/lib/formtastic/helpers/reflection.rb b/lib/formtastic/helpers/reflection.rb
index 0532a72e3..4d797c5af 100644
--- a/lib/formtastic/helpers/reflection.rb
+++ b/lib/formtastic/helpers/reflection.rb
@@ -8,7 +8,7 @@ def reflection_for(method) #:nodoc:
         if @object.class.respond_to?(:reflect_on_association)
           @object.class.reflect_on_association(method) 
         elsif @object.class.respond_to?(:associations) # MongoMapper uses the 'associations(method)' instead
-          @object.class.associations(method) 
+          @object.class.associations[method]
         end
       end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 2ef7a3447..35d47159c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -295,12 +295,6 @@ def new_author_path(*args); "/authors/new"; end
 
     ::MongoPost.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     ::MongoPost.stub!(:human_name).and_return('MongoPost')
-    ::MongoPost.stub!(:associations).and_return do |column_name|
-      case column_name
-      when :sub_posts
-        mock('reflection', :options => {:polymorphic => true}, :klass => ::MongoPost, :macro => :has_many)
-      end
-    end
     ::MongoPost.stub!(:find).and_return([@freds_post])
     ::MongoPost.stub!(:all).and_return([@freds_post])
     ::MongoPost.stub!(:where).and_return([@freds_post])

From 6034e771d8677493cb8edaabd45f7a9d7d073f8f Mon Sep 17 00:00:00 2001
From: Matt Wilson <mhw@hypomodern.com>
Date: Mon, 12 Sep 2011 11:57:20 -0400
Subject: [PATCH 924/992] this should fix the remaining problems.

---
 lib/formtastic/helpers/inputs_helper.rb | 2 +-
 spec/spec_helper.rb                     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index c45a28dc6..34327b022 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -321,7 +321,7 @@ def fieldset_contents_from_column_list(columns)
                 raise PolymorphicInputWithoutCollectionError.new("Please provide a collection for :#{method} input (you'll need to use block form syntax). Inputs for polymorphic associations can only be used when an explicit :collection is provided.")
               end
             elsif @object.class.respond_to?(:associations)
-              if (@object.class.associations(method.to_sym) && @object.class.associations(method.to_sym).options[:polymorphic] == true)
+              if (@object.class.associations[method.to_sym] && @object.class.associations[method.to_sym].options[:polymorphic] == true)
                 raise PolymorphicInputWithoutCollectionError.new("Please provide a collection for :#{method} input (you'll need to use block form syntax). Inputs for polymorphic associations can only be used when an explicit :collection is provided.")
               end            
             end            
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 35d47159c..208740784 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -295,6 +295,10 @@ def new_author_path(*args); "/authors/new"; end
 
     ::MongoPost.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     ::MongoPost.stub!(:human_name).and_return('MongoPost')
+    ::MongoPost.stub!(:associations).and_return({
+      :sub_posts => mock('reflection', :options => {:polymorphic => true}, :klass => ::MongoPost, :macro => :has_many),
+      :options => []
+    })
     ::MongoPost.stub!(:find).and_return([@freds_post])
     ::MongoPost.stub!(:all).and_return([@freds_post])
     ::MongoPost.stub!(:where).and_return([@freds_post])

From 8da6eaec3a9886d29a25e9050206c8c2f213ef90 Mon Sep 17 00:00:00 2001
From: Crystalin <alan.sapede@gmail.com>
Date: Fri, 16 Sep 2011 11:02:11 +0200
Subject: [PATCH 925/992] fix nested object i18n scopes order add failing spec
 for issue #613

---
 lib/formtastic/i18n.rb |  5 +++--
 spec/i18n_spec.rb      | 11 +++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic/i18n.rb b/lib/formtastic/i18n.rb
index cc3691a5c..b16ab4382 100644
--- a/lib/formtastic/i18n.rb
+++ b/lib/formtastic/i18n.rb
@@ -8,10 +8,11 @@ module I18n
     DEFAULT_VALUES = YAML.load_file(File.expand_path("../../locale/en.yml", __FILE__))["en"]["formtastic"].freeze
     SCOPES = [
         '%{model}.%{nested_model}.%{action}.%{attribute}',
-        '%{model}.%{action}.%{attribute}',
         '%{model}.%{nested_model}.%{attribute}',
-        '%{model}.%{attribute}',
+        '%{nested_model}.%{action}.%{attribute}',
         '%{nested_model}.%{attribute}',
+        '%{model}.%{action}.%{attribute}',
+        '%{model}.%{attribute}',
         '%{attribute}'
       ]
 
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index a1b9056bd..46777d2f2 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -160,6 +160,17 @@
         output_buffer.should have_tag("form label", /Hello author name!/)
       end
     end
+
+    it 'should be able to translate nested objects with nested object translations' do
+      with_config :i18n_lookups_by_default, true do
+        concat(semantic_form_for(@new_post) do |builder|
+          builder.semantic_fields_for(:project) do |f|
+            concat(f.input(:title))
+          end
+        end)
+        output_buffer.should have_tag("form label", /Hello project!/)
+      end
+    end
     
     it 'should be able to translate nested forms with top level translations' do
       with_config :i18n_lookups_by_default, true do

From be5fdeb97cadac9c6b034ffe5cd6c903e0ceb578 Mon Sep 17 00:00:00 2001
From: Chad Ostrowski <chad.ostrowski@gmail.com>
Date: Tue, 20 Sep 2011 16:30:45 -0300
Subject: [PATCH 926/992] very minor grammar fix

---
 README.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.textile b/README.textile
index 85cd52c9d..48bdc9836 100644
--- a/README.textile
+++ b/README.textile
@@ -80,7 +80,7 @@ h2. Opinions
 * it should be easier to do things the right way than the wrong way.
 * sometimes _more mark-up_ is better.
 * elements and attribute hooks are _gold_ for stylesheet authors.
-* make the common things we do easy, yet still ensure uncommon things are still possible.
+* make the common things we do easy, yet ensure uncommon things are still possible.
 
 
 h2. Documentation

From bdbe30ba6dbf15409b06200a5db35d7ceca51d94 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 23 Sep 2011 21:58:31 +1000
Subject: [PATCH 927/992] a few README clean-ups for 2.0

---
 README.textile | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/README.textile b/README.textile
index 48bdc9836..4c3a3cede 100644
--- a/README.textile
+++ b/README.textile
@@ -50,7 +50,7 @@ One day, I finally had enough, so I opened up my text editor, and wrote a DSL fo
 I also wrote the accompanying HTML output I expected, favoring something very similar to the fieldsets, lists and other semantic elements Aaron Gustafson presented in "Learning to Love Forms":http://www.slideshare.net/AaronGustafson/learning-to-love-forms-web-directions-south-07, hacking together enough Ruby to prove it could be done.
 
 
-h2. It's better than _SomeOtherFormBuilder_ because...
+h2. It's awesome because...
 
 * it can handle @belongs_to@ associations (like Post belongs_to :author), rendering a select or set of radio inputs with choices from the parent model.
 * it can handle @has_many@ and @has_and_belongs_to_many@ associations (like: Post has_many :tags), rendering a multi-select with choices from the child models.
@@ -65,16 +65,6 @@ h2. It's better than _SomeOtherFormBuilder_ because...
 * it has growing HTML5 support (new inputs like email/phone/search, new attributes like required/min/max/step/placeholder)
 
 
-h2. Why?
-
-* web apps = lots of forms.
-* forms are so friggin' boring to code.
-* semantically rich & accessible forms really are possible.
-* the "V" is way behind the "M" and "C" in Rails' MVC – it's the ugly sibling.
-* best practices and common patterns have to start somewhere.
-* i need a challenge.
-
-
 h2. Opinions
 
 * it should be easier to do things the right way than the wrong way.
@@ -158,9 +148,9 @@ This renders a set of inputs (one for _most_ columns in the database table, and
   <% end %>
 </pre>
 
-This is a great way to get something up fast, but like scaffolding, it's not recommended for production.
+This is a great way to get something up fast, but like scaffolding, it's *not recommended for production*. Don't be so lazy!
 
-You probably want to specify the order of the fields, skip some of the fields or even add in fields that Formtastic couldn't detect, you can pass in a list of field names to @inputs@ and list of button names to @buttons@:
+To specify the order of the fields, skip some of the fields or even add in fields that Formtastic couldn't infer. You can pass in a list of field names to @inputs@ and list of button names to @buttons@:
 
 <pre>
   <%= semantic_form_for @user do |form| %>
@@ -169,7 +159,7 @@ You probably want to specify the order of the fields, skip some of the fields or
   <% end %>
 </pre>
 
-You probably want control over the input type Formtastic uses for each field, you can expand the @inputs@ and @buttons@ blocks. This specifies the @:section@ input should be a set of radio buttons (rather than the default select box), and that the @:created_at@ field should be a string (rather than the default datetime selects):
+You probably want control over the input type Formtastic uses for each field. You can expand the @inputs@ and @buttons@ to block helper format and use the @:as@ option to specify an exact input type:
 
 <pre>
   <%= semantic_form_for @post do |form| %>

From b669fd2af0ce6f66790ac7267ba34e1945785f80 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Fri, 23 Sep 2011 22:00:27 +1000
Subject: [PATCH 928/992] version bump

---
 lib/formtastic/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/version.rb b/lib/formtastic/version.rb
index da5da8c07..34df6ee9c 100644
--- a/lib/formtastic/version.rb
+++ b/lib/formtastic/version.rb
@@ -1,3 +1,3 @@
 module Formtastic
-  VERSION = "2.0.0.rc5"
+  VERSION = "2.0.0"
 end

From dc7b668bbeb26a643c9e5b3fda3c0c2cfd144bb2 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 24 Sep 2011 10:24:05 +1000
Subject: [PATCH 929/992] 2.0.0 Changelog

---
 CHANGELOG | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 744fba858..150831e19 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+2.0.0
+
+* Fixed that all check boxes were incorrectly checked if an Array was passed in to :collection 
+* Improved README 
+* Added form generator template for Slim template engine
+* Added support for Proc conditions in collection_from_association
+* Refactored commit button. Split it into a couple of different methods to make it easier to override.
+
 2.0.0.rc5
 
 * Changed perform_browser_validations and use_required_attribute configuration defaults from true to false for a better out-of-the-box experience and upgrade path

From 9bd7764a0bc5ba123b888f8745d1d93c25afe398 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 24 Sep 2011 10:24:05 +1000
Subject: [PATCH 930/992] 2.0.0 Changelog

---
 CHANGELOG | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 744fba858..150831e19 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+2.0.0
+
+* Fixed that all check boxes were incorrectly checked if an Array was passed in to :collection 
+* Improved README 
+* Added form generator template for Slim template engine
+* Added support for Proc conditions in collection_from_association
+* Refactored commit button. Split it into a couple of different methods to make it easier to override.
+
 2.0.0.rc5
 
 * Changed perform_browser_validations and use_required_attribute configuration defaults from true to false for a better out-of-the-box experience and upgrade path

From 5e3fc7f26e921383400af30a16085808e5a191d5 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 24 Sep 2011 10:28:48 +1000
Subject: [PATCH 931/992] more changelog'n

---
 CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 150831e19..107dce253 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+HEAD
+
+* Fixed that MongoMapper does not use `associations(method)`. `.associations` is an accessor.
+
 2.0.0
 
 * Fixed that all check boxes were incorrectly checked if an Array was passed in to :collection 

From a6a469206a69e226acc4e6d58e0364f27970fc4f Mon Sep 17 00:00:00 2001
From: Alexander Semyonov <al@semyonov.us>
Date: Sat, 24 Sep 2011 05:40:47 +0400
Subject: [PATCH 932/992] Depend on Railties instead of Rails

Fix automatic dependency on ActiveRecord whether application uses it or another ORM/ODM.
---
 formtastic.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index af693a873..298f829e0 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.rubygems_version = %q{1.3.6}
 
-  s.add_dependency(%q<rails>, ["~> 3.0"])
+  s.add_dependency(%q<railties>, ["~> 3.0"])
 
   s.add_development_dependency(%q<rspec-rails>, ["~> 2.5"])
   s.add_development_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])

From 9352a130310d47a3e3041adbb0b2946e62e2457e Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 24 Sep 2011 20:22:25 +1000
Subject: [PATCH 933/992] fixed #690 :input_html => { :multiple => true} had no
 affect

---
 lib/formtastic/inputs/select_input.rb |  2 +-
 spec/inputs/select_input_spec.rb      | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index 21bcb243b..d46788c1b 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -194,7 +194,7 @@ def multiple_by_association?
       end
       
       def multiple_by_options?
-        options[:multiple]
+        options[:input_html] && options[:input_html][:multiple]
       end
       
       def multiple?
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 3ac2947d6..8ab34b9f2 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -461,6 +461,16 @@
     it 'should still generate a valid name attribute' do
       output_buffer.should have_tag("form li select[@name='project[author_name]']")
     end
+    
+    describe 'and :multiple is set to true' do
+      it "should make the select a multi-select" do
+        concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          concat(builder.input(:author_name, :as => :select, :input_html => {:multiple => true} ))
+        end)
+        output_buffer.should have_tag("form li select[@multiple]")
+      end
+    end
+    
   end
 
   describe 'when a grouped collection collection is given' do

From c7ac09759fa7dc73658db26adae25e5c56518eaa Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sat, 24 Sep 2011 20:22:25 +1000
Subject: [PATCH 934/992] fixed #690 :input_html => { :multiple => true} had no
 affect

---
 lib/formtastic/inputs/select_input.rb |  2 +-
 spec/inputs/select_input_spec.rb      | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index 21bcb243b..d46788c1b 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -194,7 +194,7 @@ def multiple_by_association?
       end
       
       def multiple_by_options?
-        options[:multiple]
+        options[:input_html] && options[:input_html][:multiple]
       end
       
       def multiple?
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 3ac2947d6..8ab34b9f2 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -461,6 +461,16 @@
     it 'should still generate a valid name attribute' do
       output_buffer.should have_tag("form li select[@name='project[author_name]']")
     end
+    
+    describe 'and :multiple is set to true' do
+      it "should make the select a multi-select" do
+        concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          concat(builder.input(:author_name, :as => :select, :input_html => {:multiple => true} ))
+        end)
+        output_buffer.should have_tag("form li select[@multiple]")
+      end
+    end
+    
   end
 
   describe 'when a grouped collection collection is given' do

From cb409db89edb8bf906912bcece542d6635ecb77a Mon Sep 17 00:00:00 2001
From: Alexander Semyonov <al@semyonov.us>
Date: Sun, 25 Sep 2011 00:45:48 +0400
Subject: [PATCH 935/992] Depend in runtime only on ActionPack

---
 formtastic.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 298f829e0..08c2b7aab 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.rubygems_version = %q{1.3.6}
 
-  s.add_dependency(%q<railties>, ["~> 3.0"])
+  s.add_dependency(%q<actionpack>, ["~> 3.0"])
 
   s.add_development_dependency(%q<rspec-rails>, ["~> 2.5"])
   s.add_development_dependency(%q<rspec_tag_matchers>, [">= 1.0.0"])

From 17d4c774d9e492674d22b7ecd72d17e9266fdd38 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 25 Sep 2011 15:55:13 +1000
Subject: [PATCH 936/992] restore support for :multiple option, didn't have to
 change specs, which is a concern, ref #690

---
 lib/formtastic/inputs/select_input.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index d46788c1b..4028ebd96 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -194,7 +194,7 @@ def multiple_by_association?
       end
       
       def multiple_by_options?
-        options[:input_html] && options[:input_html][:multiple]
+        options[:multiple] || (options[:input_html] && options[:input_html][:multiple])
       end
       
       def multiple?

From f100dc0eb1a241603eef2449775e5f8930ff247d Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Sun, 25 Sep 2011 15:55:13 +1000
Subject: [PATCH 937/992] restore support for :multiple option, didn't have to
 change specs, which is a concern, ref #690

---
 lib/formtastic/inputs/select_input.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index d46788c1b..4028ebd96 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -194,7 +194,7 @@ def multiple_by_association?
       end
       
       def multiple_by_options?
-        options[:input_html] && options[:input_html][:multiple]
+        options[:multiple] || (options[:input_html] && options[:input_html][:multiple])
       end
       
       def multiple?

From 8b72c05ac7cea20cc878e6546997a869840df475 Mon Sep 17 00:00:00 2001
From: Michael Koper <michaelkoper@gmail.com>
Date: Sun, 25 Sep 2011 20:01:53 +0200
Subject: [PATCH 938/992] Fixed placeholder tests for all input types (not just
 string). Added placeholders for textareas.

---
 lib/formtastic/inputs/text_input.rb |  7 ++++++-
 spec/inputs/placeholder_spec.rb     | 23 +++++++++++++----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/lib/formtastic/inputs/text_input.rb b/lib/formtastic/inputs/text_input.rb
index c626c43c4..e81db24d7 100644
--- a/lib/formtastic/inputs/text_input.rb
+++ b/lib/formtastic/inputs/text_input.rb
@@ -31,7 +31,8 @@ class TextInput
       def input_html_options
         { 
           :cols => builder.default_text_area_width,
-          :rows => builder.default_text_area_height
+          :rows => builder.default_text_area_height,
+          :placeholder => placeholder_text
         }.merge(super)
       end
       
@@ -41,6 +42,10 @@ def to_html
           builder.text_area(method, input_html_options)
         end
       end
+      
+      def placeholder_text
+        localized_string(method, options[:placeholder], :placeholder)
+      end
     
     end
   end
diff --git a/spec/inputs/placeholder_spec.rb b/spec/inputs/placeholder_spec.rb
index cc2b5a3a6..783003c3d 100644
--- a/spec/inputs/placeholder_spec.rb
+++ b/spec/inputs/placeholder_spec.rb
@@ -16,18 +16,21 @@
   
   describe "placeholder text" do
     
-    [:email, :number, :password, :phone, :search, :string, :url].each do |type|
+    [:email, :number, :password, :phone, :search, :string, :url, :text].each do |type|
       
       describe "for #{type} inputs" do
-    
+        before do
+          @text_or_textarea = type == :text ? 'textarea' : 'input'
+        end
+        
         describe "when found in i18n" do
           it "should have a placeholder containing i18n text" do
             with_config :i18n_lookups_by_default, true do
               ::I18n.backend.store_translations :en, :formtastic => { :placeholders => { :title => 'War and Peace' }}
               concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:title))
+                concat(builder.input(:title, :as => type))
               end)
-              output_buffer.should have_tag('input[@placeholder="War and Peace"]')
+              output_buffer.should have_tag(@text_or_textarea+'[placeholder="War and Peace"]')
             end
           end
         end
@@ -35,9 +38,9 @@
         describe "when not found in i18n" do
           it "should not have placeholder" do
             concat(semantic_form_for(@new_post) do |builder|
-              concat(builder.input(:title))
+              concat(builder.input(:title, :as => type))
             end)
-            output_buffer.should_not have_tag('input[@placeholder]')
+            output_buffer.should_not have_tag(@text_or_textarea+'[placeholder]')
           end
         end
         
@@ -46,9 +49,9 @@
             with_config :i18n_lookups_by_default, true do
               ::I18n.backend.store_translations :en, :formtastic => { :placeholders => { :title => 'War and Peace' }}
               concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:title, :input_html => { :placeholder => "Foo" }))
+                concat(builder.input(:title, :as => type, :input_html => { :placeholder => "Foo" }))
               end)
-              output_buffer.should have_tag('input[@placeholder="Foo"]')
+              output_buffer.should have_tag(@text_or_textarea+'[placeholder="Foo"]')
             end
           end
         end
@@ -56,9 +59,9 @@
         describe "when found in :input_html" do
           it "should use the :input_html placeholder" do
             concat(semantic_form_for(@new_post) do |builder|
-              concat(builder.input(:title, :input_html => { :placeholder => "Untitled" }))
+              concat(builder.input(:title, :as => type, :input_html => { :placeholder => "Untitled" }))
             end)
-            output_buffer.should have_tag('input[@placeholder="Untitled"]')
+            output_buffer.should have_tag(@text_or_textarea+'[placeholder="Untitled"]')
           end
         end
         

From a829895650df78b29db6073a0453a4fd776f87b3 Mon Sep 17 00:00:00 2001
From: Michael Koper <michaelkoper@gmail.com>
Date: Sun, 25 Sep 2011 21:34:20 +0200
Subject: [PATCH 939/992] deleted before block in splaceholder spec.

---
 spec/inputs/placeholder_spec.rb | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/spec/inputs/placeholder_spec.rb b/spec/inputs/placeholder_spec.rb
index 783003c3d..0f28d9ace 100644
--- a/spec/inputs/placeholder_spec.rb
+++ b/spec/inputs/placeholder_spec.rb
@@ -19,9 +19,6 @@
     [:email, :number, :password, :phone, :search, :string, :url, :text].each do |type|
       
       describe "for #{type} inputs" do
-        before do
-          @text_or_textarea = type == :text ? 'textarea' : 'input'
-        end
         
         describe "when found in i18n" do
           it "should have a placeholder containing i18n text" do
@@ -30,7 +27,7 @@
               concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :as => type))
               end)
-              output_buffer.should have_tag(@text_or_textarea+'[placeholder="War and Peace"]')
+              output_buffer.should have_tag((type == :text ? 'textarea' : 'input') + '[@placeholder="War and Peace"]')
             end
           end
         end
@@ -40,7 +37,7 @@
             concat(semantic_form_for(@new_post) do |builder|
               concat(builder.input(:title, :as => type))
             end)
-            output_buffer.should_not have_tag(@text_or_textarea+'[placeholder]')
+            output_buffer.should_not have_tag((type == :text ? 'textarea' : 'input') + '[@placeholder]')
           end
         end
         
@@ -51,7 +48,7 @@
               concat(semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :as => type, :input_html => { :placeholder => "Foo" }))
               end)
-              output_buffer.should have_tag(@text_or_textarea+'[placeholder="Foo"]')
+              output_buffer.should have_tag((type == :text ? 'textarea' : 'input') + '[@placeholder="Foo"]')
             end
           end
         end
@@ -61,7 +58,7 @@
             concat(semantic_form_for(@new_post) do |builder|
               concat(builder.input(:title, :as => type, :input_html => { :placeholder => "Untitled" }))
             end)
-            output_buffer.should have_tag(@text_or_textarea+'[placeholder="Untitled"]')
+            output_buffer.should have_tag((type == :text ? 'textarea' : 'input') + '[@placeholder="Untitled"]')
           end
         end
         

From 71222a043ed4c123d0e545a81c8eb8ef0581b923 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sun, 25 Sep 2011 16:45:14 -0300
Subject: [PATCH 940/992] Remove active resource require because we are not
 using it

---
 spec/support/test_environment.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/support/test_environment.rb b/spec/support/test_environment.rb
index b90868345..3a7191008 100644
--- a/spec/support/test_environment.rb
+++ b/spec/support/test_environment.rb
@@ -9,7 +9,6 @@
 end
 
 require "action_controller/railtie"
-require "active_resource/railtie"
 require 'active_model'
 
 # Create a simple rails application for use in testing the viewhelper

From 152f04e967cd0bbb3dfce4f8c094cb43482c9e82 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sun, 25 Sep 2011 16:45:42 -0300
Subject: [PATCH 941/992] Use `require 'bundler/setup'` instead of calling
 Bundler.setup manually

---
 spec/spec_helper.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 208740784..c39e3392b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,8 +1,6 @@
 # encoding: utf-8
 require 'rubygems'
-require 'bundler'
-Bundler.setup
-
+require 'bundler/setup'
 require 'active_support'
 require 'action_pack'
 require 'action_view'
@@ -409,4 +407,4 @@ def with_config(config_method_name, value, &block)
   config.after(:all) do
     DeferredGarbageCollection.reconsider unless ENV["DEFER_GC"] == "false"
   end
-end
\ No newline at end of file
+end

From 0c119b4edce66bf7074b725f7e9994f6f20b0ec8 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sun, 25 Sep 2011 16:49:14 -0300
Subject: [PATCH 942/992] Add tzinfo as development dependency

I guess this dependency is defined on wrong place on rails
---
 formtastic.gemspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/formtastic.gemspec b/formtastic.gemspec
index 08c2b7aab..92cdf1c3e 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -32,4 +32,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<yard>, ["~> 0.6"])
   s.add_development_dependency(%q<rcov>, ["~> 0.9.9"])
   s.add_development_dependency(%q<colored>)
+  s.add_development_dependency(%q<tzinfo>)
 end

From 9c489dbcbe9a4ebbc0ec5d7ab5ee1ad675a53a64 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sun, 25 Sep 2011 17:11:03 -0300
Subject: [PATCH 943/992] Do not need to require active_record in this spec

---
 spec/inputs/range_input_spec.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/inputs/range_input_spec.rb b/spec/inputs/range_input_spec.rb
index a2e546a16..7b9c3b694 100644
--- a/spec/inputs/range_input_spec.rb
+++ b/spec/inputs/range_input_spec.rb
@@ -1,6 +1,5 @@
 # encoding: utf-8
 require 'spec_helper'
-require 'active_record'
 
 describe 'range input' do
 

From 7e1490a68b764a95070c7579c48d1eb46b5a9b16 Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Sun, 25 Sep 2011 17:12:00 -0300
Subject: [PATCH 944/992] Do not verify coverage by default

Seems like rcov needs active record but do not declare it as dependency
on gem spec.

I will check this later.
---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index b24c07899..1d65223c9 100644
--- a/Rakefile
+++ b/Rakefile
@@ -9,7 +9,7 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 desc 'Default: run unit specs.'
-task :default => :spec_and_verify_coverage
+task :default => :spec
 
 desc 'Generate documentation for the formtastic plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|

From 4f6e4b948bf05ed25ca56bdeeeda254c51471d61 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 26 Sep 2011 14:27:21 +1000
Subject: [PATCH 945/992] spec to expose that :multiple => true doesn't work
 when there's no association ref #690

---
 spec/inputs/select_input_spec.rb | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 8ab34b9f2..c09bc2775 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -452,17 +452,15 @@
   end
 
   describe 'when no association exists' do
-    before(:each) do
+
+    it 'should still generate a valid name attribute' do
       concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:author_name, :as => :select, :collection => ::Author.all))
       end)
-    end
-
-    it 'should still generate a valid name attribute' do
       output_buffer.should have_tag("form li select[@name='project[author_name]']")
     end
     
-    describe 'and :multiple is set to true' do
+    describe 'and :multiple is set to true through :input_html' do
       it "should make the select a multi-select" do
         concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:author_name, :as => :select, :input_html => {:multiple => true} ))
@@ -471,6 +469,15 @@
       end
     end
     
+    describe 'and :multiple is set to true' do
+      it "should make the select a multi-select" do
+        concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          concat(builder.input(:author_name, :as => :select, :multiple => true, :collection => ["Fred", "Bob"]))
+        end)
+        output_buffer.should have_tag("form li select[@multiple]")
+      end
+    end
+    
   end
 
   describe 'when a grouped collection collection is given' do

From 6625a52c198e8e84ff8ce377fb5df830dd8d3490 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 26 Sep 2011 14:29:23 +1000
Subject: [PATCH 946/992] fixes #690 and failing test in 4f6e4b9

---
 lib/formtastic/inputs/select_input.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index 4028ebd96..ed66adc75 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -184,7 +184,7 @@ def input_html_options
       
       def extra_input_html_options
         {
-          :multiple => multiple_by_association?,
+          :multiple => multiple?,
           :name => "#{object_name}[#{association_primary_key}]#{'[]' if multiple?}"
         }
       end

From 64d55a84f58f3f10d719c1ce22491f50524d3981 Mon Sep 17 00:00:00 2001
From: Nathan Long <nathan.long@tma1.com>
Date: Mon, 26 Sep 2011 10:20:30 -0400
Subject: [PATCH 947/992] Improve grammar, capitalization, formatting

---
 README.textile | 53 +++++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/README.textile b/README.textile
index 4c3a3cede..74d81119a 100644
--- a/README.textile
+++ b/README.textile
@@ -52,25 +52,25 @@ I also wrote the accompanying HTML output I expected, favoring something very si
 
 h2. It's awesome because...
 
-* it can handle @belongs_to@ associations (like Post belongs_to :author), rendering a select or set of radio inputs with choices from the parent model.
-* it can handle @has_many@ and @has_and_belongs_to_many@ associations (like: Post has_many :tags), rendering a multi-select with choices from the child models.
-* it's Rails 3 compatible (including nested forms).
-* it has internationalization (I18n)!
-* it's _really_ quick to get started with a basic form in place (4 lines), then go back to add in more detail if you need it.
-* there's heaps of elements, id and class attributes for you to hook in your CSS and JS.
-* it handles real world stuff like inline hints, inline error messages & help text.
-* it doesn't hijack or change any of the standard Rails form inputs, so you can still use them as expected (even mix and match).
-* it's got absolutely awesome spec coverage.
-* there's a bunch of people using and working on it (it's not just one developer building half a solution).
-* it has growing HTML5 support (new inputs like email/phone/search, new attributes like required/min/max/step/placeholder)
+* It can handle @belongs_to@ associations (like Post belongs_to :author), rendering a select or set of radio inputs with choices from the parent model.
+* It can handle @has_many@ and @has_and_belongs_to_many@ associations (like: Post has_many :tags), rendering a multi-select with choices from the child models.
+* It's Rails 3 compatible (including nested forms).
+* It has internationalization (I18n)!
+* It's _really_ quick to get started with a basic form in place (4 lines), then go back to add in more detail if you need it.
+* There's heaps of elements, id and class attributes for you to hook in your CSS and JS.
+* It handles real world stuff like inline hints, inline error messages & help text.
+* It doesn't hijack or change any of the standard Rails form inputs, so you can still use them as expected (even mix and match).
+* It's got absolutely awesome spec coverage.
+* There's a bunch of people using and working on it (it's not just one developer building half a solution).
+* It has growing HTML5 support (new inputs like email/phone/search, new attributes like required/min/max/step/placeholder)
 
 
 h2. Opinions
 
-* it should be easier to do things the right way than the wrong way.
-* sometimes _more mark-up_ is better.
-* elements and attribute hooks are _gold_ for stylesheet authors.
-* make the common things we do easy, yet ensure uncommon things are still possible.
+* It should be easier to do things the right way than the wrong way.
+* Sometimes _more mark-up_ is better.
+* Elements and attribute hooks are _gold_ for stylesheet authors.
+* Make the common things we do easy, yet ensure uncommon things are still possible.
 
 
 h2. Documentation
@@ -225,7 +225,7 @@ Or the Formtastic way with the @:for@ option:
   <% end %>
 </pre>
 
-When working in has many association, you can even supply @"%i"@ in your fieldset name that it will be properly interpolated with the child index. For example:
+When working in has many association, you can even supply @"%i"@ in your fieldset name; they will be properly interpolated with the child index. For example:
 
 <pre>
   <%= semantic_form_for @post do |form| %>
@@ -235,8 +235,7 @@ When working in has many association, you can even supply @"%i"@ in your fieldse
   <% end %>
 </pre>
 
-If you have more than one form on the same page, it may lead to HTML invalidation because of the way HTML element id attributes are assigned. You can provide
-a namespace for your form to ensure uniqueness of id attributes on form elements. The namespace attribute will be prefixed with underscore on the generate html id. For example:
+If you have more than one form on the same page, it may lead to HTML invalidation because of the way HTML element id attributes are assigned. You can provide a namespace for your form to ensure uniqueness of id attributes on form elements. The namespace attribute will be prefixed with underscore on the generate HTML id. For example:
 
 <pre>
   <%= semantic_form_for(@post, :namespace => 'cat_form') do |form| %>
@@ -247,7 +246,7 @@ a namespace for your form to ensure uniqueness of id attributes on form elements
   <% end %>
 </pre>
 
-Customize HTML attributes for any input using the @:input_html@ option. Typically this is used to disable the input, change the size of a text field, change the rows in a textarea, or even to add a special class to an input to attach special behavior like "autogrow":http://plugins.jquery.com/project/autogrow textareas:
+Customize HTML attributes for any input using the @:input_html@ option. Typically this is used to disable the input, change the size of a text field, change the rows in a textarea, or even to add a special class to an input to attach special behavior like "autogrow":http://plugins.jquery.com/project/autogrowtextarea textareas:
 
 <pre>
   <%= semantic_form_for @post do |form| %>
@@ -269,7 +268,7 @@ The same can be done for buttons with the @:button_html@ option:
   <% end %>
 </pre>
 
-Customize the HTML attributes for the @<li>@ wrapper around every input with the @:wrapper_html@ option hash. There's one special key in the hash (@:class@), which will actually _append_ your string of classes to the existing classes provided by Formtastic (like @"required string error"@).
+Customize the HTML attributes for the @<li>@ wrapper around every input with the @:wrapper_html@ option hash. There's one special key in the hash: (@:class@), which will actually _append_ your string of classes to the existing classes provided by Formtastic (like @"required string error"@).
 
 <pre>
   <%= semantic_form_for @post do |form| %>
@@ -280,7 +279,7 @@ Customize the HTML attributes for the @<li>@ wrapper around every input with the
   <% end %>
 </pre>
 
-Customize the default class used for hints on each attribute or globally in the @config/formtastic.rb@ file. Similarly you can customize the error classes on an attribute level or globally.
+Customize the default class used for hints on each attribute or globally in the @config/formtastic.rb@ file. Similarly, you can customize the error classes on an attribute level or globally.
 
 <pre>
   <%= semantic_form_for @post do |form| %>
@@ -349,7 +348,7 @@ h2. Internationalization (I18n)
 
 h3. Basic Localization
 
-Formtastic got some neat I18n-features. ActiveRecord object names and attributes are, by default, taken from calling @@object.human_name@ and @@object.human_attribute_name(attr)@ respectively. There are a few words specific to Formtastic that can be translated. See @lib/locale/en.yml@ for more information.
+Formtastic has some neat I18n-features. ActiveRecord object names and attributes are, by default, taken from calling @@object.human_name@ and @@object.human_attribute_name(attr)@ respectively. There are a few words specific to Formtastic that can be translated. See @lib/locale/en.yml@ for more information.
 
 Basic localization (labels only, with ActiveRecord):
 
@@ -388,7 +387,7 @@ Formtastic supports localized *labels*, *hints*, *legends*, *actions* using the
             title: "Edit title"
       hints:
         post:
-          title: "Choose a good title for you post."
+          title: "Choose a good title for your post."
           body: "Write something inspiring here."
       placeholders:
         post:
@@ -407,7 +406,7 @@ Formtastic supports localized *labels*, *hints*, *legends*, *actions* using the
 <pre>
   <%= semantic_form_for Post.new do |form| %>
     <%= form.inputs do %>
-      <%= form.input :title %>      # => :label => "Choose a title...", :hint => "Choose a good title for you post."
+      <%= form.input :title %>      # => :label => "Choose a title...", :hint => "Choose a good title for your post."
       <%= form.input :body %>       # => :label => "Write something...", :hint => "Write something inspiring here."
       <%= form.input :section %>    # => :label => I18n.t('activerecord.attributes.user.section')  or 'Section'
     <% end %>
@@ -468,7 +467,7 @@ If I18n-lookups is disabled, i.e.:
 
 *6. Advanced I18n lookups*
 
-For more flexible forms; Formtastic find translations using a bottom-up approach taking the following variables in account:
+For more flexible forms; Formtastic finds translations using a bottom-up approach taking the following variables in account:
 
 * @MODEL@, e.g. "post"
 * @ACTION@, e.g. "edit"
@@ -553,7 +552,7 @@ It was previously recommended in Formtastic 1.x to subclass Formtastic::FormBuil
 
 h2. Security
 
-By default Formtastic escapes html entities in both labels and hints unless a string is marked as html_safe. If you are using an older rails version which doesn't know html_safe, or you want to globally turn this feature off, you can set the following in your initializer:
+By default, Formtastic escapes HTML entities in both labels and hints unless a string is marked as html_safe. If you are using an older rails version which doesn't know html_safe, or you want to globally turn this feature off, you can set the following in your initializer:
 
 Formtastic::FormBuilder.escape_html_entities_in_hints_and_labels = false
 
@@ -562,7 +561,7 @@ h2. Dependencies
 
 There are none, but...
 
-* if you want to use the @:country@ input, you'll need to install the "country-select plugin":https://github.com/chrislerum/country_select (or any other country_select plugin with the same API).
+* If you want to use the @:country@ input, you'll need to install the "country-select plugin":https://github.com/chrislerum/country_select (or any other country_select plugin with the same API).
 * "rspec":http://github.com/dchelimsky/rspec/, "rspec_hpricot_matchers":http://rubyforge.org/projects/rspec-hpricot/ and "rcov":http://github.com/relevance/rcov gems (plus any of their own dependencies) are required for the test suite.
 
 

From eb9e523bc405e22fc726876a504a9574bd3b3a89 Mon Sep 17 00:00:00 2001
From: Nathan Long <nathan.long@tma1.com>
Date: Tue, 27 Sep 2011 17:02:23 -0400
Subject: [PATCH 948/992] Better documentation for custom inputs

---
 README.textile | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/README.textile b/README.textile
index 74d81119a..108f75cde 100644
--- a/README.textile
+++ b/README.textile
@@ -434,7 +434,7 @@ _Note: Slightly different because Formtastic can't guess how you group fields in
 <pre>
   <%= semantic_form_for @post do |form| %>
     <%= form.inputs do %>
-      <%= form.input :title %>      # => :label => "Choose a title...", :hint => "Choose a good title for you post."
+      <%= form.input :title %>      # => :label => "Choose a title...", :hint => "Choose a good title for your post."
       <%= form.input :body, :hint => false %>                 # => :label => "Write something..."
       <%= form.input :section, :label => 'Some section' %>    # => :label => 'Some section'
     <% end %>
@@ -513,7 +513,17 @@ You can show errors on base (by default) and any other attribute just passing it
 
 h2. Modified & Custom Inputs
 
-If you want to change the behaviour of an input, you can subclass it in your app. For example, to tweak @StringInput@, create a new file @app/inputs/string_input.rb@:
+You can modify existing inputs, subclass them, or create your own from scratch. Here's the basic process:
+
+* Create a file in @app/inputs@ with a filename ending in @_input.rb@. For example, @app/inputs/hat_size_input.rb@. Formtastic will automatically look in @app/inputs@ and find the file.
+* In that file, declare a classname ending in @Input@. For example, @class HatSizeInput@. It must have a @to_html@ method for rendering.
+* To use that input, leave off the word "input" in your @as@ statement. For example, @f.input(:size, :as => :hat_size)@
+
+Specific examples follow.
+
+h3. Changing Existing Input Behavior
+
+To modify the behavior of @StringInput@, subclass it in a new file, @app/inputs/string_input.rb@:
 
 <pre>
   class StringInput < Formtastic::Inputs::StringInput
@@ -524,10 +534,13 @@ If you want to change the behaviour of an input, you can subclass it in your app
   end
 </pre>
 
-To create your own new types of inputs based on existing inputs, the process is similar:
+You can use your modified version with @:as => :string@.
+
+h3. Creating New Inputs Based on Existing Ones
+
+To create your own new types of inputs based on existing inputs, the process is similar. For example, to create @FlexibleTextInput@ based on @StringInput@, put the following in @app/inputs/flexible_text_input.rb@:
 
 <pre>
-  # f.input(:body, :as => :flexible_text)
   class FlexibleTextInput < Formtastic::Inputs::StringInput
     def input_html_options
       super.merge(:class => "flexible-text-area")
@@ -535,10 +548,13 @@ To create your own new types of inputs based on existing inputs, the process is
   end
 </pre>
 
-To create your own new types of inputs from scratch:
+You can use your new input with @:as => :flexible_text@.
+
+h3. Creating New Inputs From Scratch
+
+To create a custom @DatePickerInput@ from scratch, put the following in @app/inputs/date_picker_input.rb@:
 
 <pre>
-  # f.input(:created_at, :as => :date_picker)
   class DatePickerInput
     include Formtastic::Inputs::Base
     def to_html
@@ -547,6 +563,10 @@ To create your own new types of inputs from scratch:
   end
 </pre>
 
+You can use your new input with @:as => :date_picker@.
+
+h3. Don't subclass Formtastic::FormBuilder anymore
+
 It was previously recommended in Formtastic 1.x to subclass Formtastic::FormBuilder to add your own inputs. This is no longer recommended in Formtastic 2, and will not work as expected.
 
 

From 600e013ad2fee3eeb35286b356e86d27ea55bc5f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 28 Sep 2011 07:19:14 +1000
Subject: [PATCH 949/992] always use inputs() block in README examples, less
 chance of WTF moments

---
 README.textile | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/README.textile b/README.textile
index 108f75cde..8e35980c5 100644
--- a/README.textile
+++ b/README.textile
@@ -239,9 +239,11 @@ If you have more than one form on the same page, it may lead to HTML invalidatio
 
 <pre>
   <%= semantic_form_for(@post, :namespace => 'cat_form') do |form| %>
-    <%= form.input :title %>        # id="cat_form_post_title"
-    <%= form.input :body %>         # id="cat_form_post_body"
-    <%= form.input :created_at %>   # id="cat_form_post_created_at"
+    <%= f.inputs do %>
+      <%= form.input :title %>        # id="cat_form_post_title"
+      <%= form.input :body %>         # id="cat_form_post_body"
+      <%= form.input :created_at %>   # id="cat_form_post_created_at"
+    <% end %>
     <%= form.buttons %>
   <% end %>
 </pre>
@@ -250,9 +252,11 @@ Customize HTML attributes for any input using the @:input_html@ option. Typicall
 
 <pre>
   <%= semantic_form_for @post do |form| %>
-    <%= form.input :title,      :input_html => {  :cols => 10 } %>
-    <%= form.input :body,       :input_html => { :class => 'autogrow', :rows => 10, :cols => 20, :maxlength => 10  } %>
-    <%= form.input :created_at, :input_html => { :disabled => true } %>
+    <%= f.inputs do %>
+      <%= form.input :title,      :input_html => {  :cols => 10 } %>
+      <%= form.input :body,       :input_html => { :class => 'autogrow', :rows => 10, :cols => 20, :maxlength => 10  } %>
+      <%= form.input :created_at, :input_html => { :disabled => true } %>
+    <% end %>
     <%= form.buttons %>
   <% end %>
 </pre>
@@ -272,9 +276,11 @@ Customize the HTML attributes for the @<li>@ wrapper around every input with the
 
 <pre>
   <%= semantic_form_for @post do |form| %>
-    <%= form.input :title, :wrapper_html => { :class => "important" } %>
-    <%= form.input :body %>
-    <%= form.input :description, :wrapper_html => { :style => "display:none;" } %>
+    <%= f.inputs do %>
+      <%= form.input :title, :wrapper_html => { :class => "important" } %>
+      <%= form.input :body %>
+      <%= form.input :description, :wrapper_html => { :style => "display:none;" } %>
+    <% end %>
     ...
   <% end %>
 </pre>
@@ -283,7 +289,9 @@ Customize the default class used for hints on each attribute or globally in the
 
 <pre>
   <%= semantic_form_for @post do |form| %>
-    <%= form.input :title, :hint_class => 'custom-html-class', :error_class => 'custom-error-class' %>
+    <%= f.inputs do %>
+      <%= form.input :title, :hint_class => 'custom-html-class', :error_class => 'custom-error-class' %>
+    <% end %>
   <% end %>
 </pre>
 
@@ -354,9 +362,11 @@ Basic localization (labels only, with ActiveRecord):
 
 <pre>
   <%= semantic_form_for @post do |form| %>
-    <%= form.input :title %>        # => :label => I18n.t('activerecord.attributes.user.title')    or 'Title'
-    <%= form.input :body %>         # => :label => I18n.t('activerecord.attributes.user.body')     or 'Body'
-    <%= form.input :section %>      # => :label => I18n.t('activerecord.attributes.user.section')  or 'Section'
+    <%= f.inputs do %>
+      <%= form.input :title %>        # => :label => I18n.t('activerecord.attributes.user.title')    or 'Title'
+      <%= form.input :body %>         # => :label => I18n.t('activerecord.attributes.user.body')     or 'Body'
+      <%= form.input :section %>      # => :label => I18n.t('activerecord.attributes.user.section')  or 'Section'
+    <% end %>
   <% end %>
 </pre>
 

From 913215efd1ef9e2088c66b99c8aa1bbfa1f1f33f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 28 Sep 2011 09:11:36 +1000
Subject: [PATCH 950/992] use |f| consistently in README for form builder
 variable name

---
 README.textile | 210 ++++++++++++++++++++++++-------------------------
 1 file changed, 105 insertions(+), 105 deletions(-)

diff --git a/README.textile b/README.textile
index 8e35980c5..6e162fe16 100644
--- a/README.textile
+++ b/README.textile
@@ -17,31 +17,31 @@ h2. The Story
 One day, I finally had enough, so I opened up my text editor, and wrote a DSL for how I'd like to author forms:
 
 <pre>
-  <%= semantic_form_for @article do |form| %>
-
-    <%= form.inputs :name => "Basic" do %>
-      <%= form.input :title %>
-      <%= form.input :body %>
-      <%= form.input :section %>
-      <%= form.input :publication_state, :as => :radio %>
-      <%= form.input :category %>
-      <%= form.input :allow_comments, :label => "Allow commenting on this article" %>
+  <%= semantic_form_for @article do |f| %>
+
+    <%= f.inputs :name => "Basic" do %>
+      <%= f.input :title %>
+      <%= f.input :body %>
+      <%= f.input :section %>
+      <%= f.input :publication_state, :as => :radio %>
+      <%= f.input :category %>
+      <%= f.input :allow_comments, :label => "Allow commenting on this article" %>
     <% end %>
 
-    <%= form.inputs :name => "Advanced" do %>
-      <%= form.input :keywords, :required => false, :hint => "Example: ruby, rails, forms" %>
-      <%= form.input :extract, :required => false %>
-      <%= form.input :description, :required => false %>
-      <%= form.input :url_title, :required => false %>
+    <%= f.inputs :name => "Advanced" do %>
+      <%= f.input :keywords, :required => false, :hint => "Example: ruby, rails, forms" %>
+      <%= f.input :extract, :required => false %>
+      <%= f.input :description, :required => false %>
+      <%= f.input :url_title, :required => false %>
     <% end %>
 
-    <%= form.inputs :name => "Author", :for => :author do |author_form| %>
+    <%= f.inputs :name => "Author", :for => :author do |author_form| %>
       <%= author_form.input :first_name %>
       <%= author_form.input :last_name %>
     <% end %>
 
-    <%= form.buttons do %>
-      <%= form.commit_button %>
+    <%= f.buttons do %>
+      <%= f.commit_button %>
     <% end %>
 
   <% end %>
@@ -142,9 +142,9 @@ Forms are really boring to code... you want to get onto the good stuff as fast a
 This renders a set of inputs (one for _most_ columns in the database table, and one for each ActiveRecord @belongs_to@-association), followed by a submit button:
 
 <pre>
-  <%= semantic_form_for @user do |form| %>
-    <%= form.inputs %>
-    <%= form.buttons %>
+  <%= semantic_form_for @user do |f| %>
+    <%= f.inputs %>
+    <%= f.buttons %>
   <% end %>
 </pre>
 
@@ -153,25 +153,25 @@ This is a great way to get something up fast, but like scaffolding, it's *not re
 To specify the order of the fields, skip some of the fields or even add in fields that Formtastic couldn't infer. You can pass in a list of field names to @inputs@ and list of button names to @buttons@:
 
 <pre>
-  <%= semantic_form_for @user do |form| %>
-    <%= form.inputs :title, :body, :section, :categories, :created_at %>
-    <%= form.buttons :commit %>
+  <%= semantic_form_for @user do |f| %>
+    <%= f.inputs :title, :body, :section, :categories, :created_at %>
+    <%= f.buttons :commit %>
   <% end %>
 </pre>
 
 You probably want control over the input type Formtastic uses for each field. You can expand the @inputs@ and @buttons@ to block helper format and use the @:as@ option to specify an exact input type:
 
 <pre>
-  <%= semantic_form_for @post do |form| %>
-    <%= form.inputs do %>
-      <%= form.input :title %>
-      <%= form.input :body %>
-      <%= form.input :section, :as => :radio %>
-      <%= form.input :categories %>
-      <%= form.input :created_at, :as => :string %>
+  <%= semantic_form_for @post do |f| %>
+    <%= f.inputs do %>
+      <%= f.input :title %>
+      <%= f.input :body %>
+      <%= f.input :section, :as => :radio %>
+      <%= f.input :categories %>
+      <%= f.input :created_at, :as => :string %>
     <% end %>
-    <%= form.buttons do %>
-      <%= form.commit_button %>
+    <%= f.buttons do %>
+      <%= f.commit_button %>
     <% end %>
   <% end %>
 </pre>
@@ -179,20 +179,20 @@ You probably want control over the input type Formtastic uses for each field. Yo
 If you want to customize the label text, or render some hint text below the field, specify which fields are required/optional, or break the form into two fieldsets, the DSL is pretty comprehensive:
 
 <pre>
-  <%= semantic_form_for @post do |form| %>
-    <%= form.inputs "Basic", :id => "basic" do %>
-      <%= form.input :title %>
-      <%= form.input :body %>
+  <%= semantic_form_for @post do |f| %>
+    <%= f.inputs "Basic", :id => "basic" do %>
+      <%= f.input :title %>
+      <%= f.input :body %>
     <% end %>
-    <%= form.inputs :name => "Advanced Options", :id => "advanced" do %>
-      <%= form.input :slug, :label => "URL Title", :hint => "Created automatically if left blank", :required => false %>
-      <%= form.input :section, :as => :radio %>
-      <%= form.input :user, :label => "Author", :member_label => :full_name %>
-      <%= form.input :categories, :required => false %>
-      <%= form.input :created_at, :as => :string, :label => "Publication Date", :required => false %>
+    <%= f.inputs :name => "Advanced Options", :id => "advanced" do %>
+      <%= f.input :slug, :label => "URL Title", :hint => "Created automatically if left blank", :required => false %>
+      <%= f.input :section, :as => :radio %>
+      <%= f.input :user, :label => "Author", :member_label => :full_name %>
+      <%= f.input :categories, :required => false %>
+      <%= f.input :created_at, :as => :string, :label => "Publication Date", :required => false %>
     <% end %>
-    <%= form.buttons do %>
-      <%= form.commit_button %>
+    <%= f.buttons do %>
+      <%= f.commit_button %>
     <% end %>
   <% end %>
 </pre>
@@ -200,74 +200,74 @@ If you want to customize the label text, or render some hint text below the fiel
 You can create forms for nested resources:
 
 <pre>
-	<%= semantic_form_for [@author, @post] do |form| %>
+	<%= semantic_form_for [@author, @post] do |f| %>
 </pre>
 
 Nested forms are also supported (don't forget your models need to be setup correctly with @accepts_nested_attributes_for@). You can do it in the Rails way:
 
 <pre>
-  <%= semantic_form_for @post do |form| %>
-    <%= form.inputs :title, :body, :created_at %>
-    <%= form.semantic_fields_for :author do |author| %>
+  <%= semantic_form_for @post do |f| %>
+    <%= f.inputs :title, :body, :created_at %>
+    <%= f.semantic_fields_for :author do |author| %>
       <%= author.inputs :first_name, :last_name, :name => "Author" %>
     <% end %>
-    <%= form.buttons %>
+    <%= f.buttons %>
   <% end %>
 </pre>
 
 Or the Formtastic way with the @:for@ option:
 
 <pre>
-  <%= semantic_form_for @post do |form| %>
-    <%= form.inputs :title, :body, :created_at %>
-    <%= form.inputs :first_name, :last_name, :for => :author, :name => "Author" %>
-    <%= form.buttons %>
+  <%= semantic_form_for @post do |f| %>
+    <%= f.inputs :title, :body, :created_at %>
+    <%= f.inputs :first_name, :last_name, :for => :author, :name => "Author" %>
+    <%= f.buttons %>
   <% end %>
 </pre>
 
 When working in has many association, you can even supply @"%i"@ in your fieldset name; they will be properly interpolated with the child index. For example:
 
 <pre>
-  <%= semantic_form_for @post do |form| %>
-    <%= form.inputs %>
-    <%= form.inputs :name => 'Category #%i', :for => :categories %>
-    <%= form.buttons %>
+  <%= semantic_form_for @post do |f| %>
+    <%= f.inputs %>
+    <%= f.inputs :name => 'Category #%i', :for => :categories %>
+    <%= f.buttons %>
   <% end %>
 </pre>
 
 If you have more than one form on the same page, it may lead to HTML invalidation because of the way HTML element id attributes are assigned. You can provide a namespace for your form to ensure uniqueness of id attributes on form elements. The namespace attribute will be prefixed with underscore on the generate HTML id. For example:
 
 <pre>
-  <%= semantic_form_for(@post, :namespace => 'cat_form') do |form| %>
+  <%= semantic_form_for(@post, :namespace => 'cat_form') do |f| %>
     <%= f.inputs do %>
-      <%= form.input :title %>        # id="cat_form_post_title"
-      <%= form.input :body %>         # id="cat_form_post_body"
-      <%= form.input :created_at %>   # id="cat_form_post_created_at"
+      <%= f.input :title %>        # id="cat_form_post_title"
+      <%= f.input :body %>         # id="cat_form_post_body"
+      <%= f.input :created_at %>   # id="cat_form_post_created_at"
     <% end %>
-    <%= form.buttons %>
+    <%= f.buttons %>
   <% end %>
 </pre>
 
 Customize HTML attributes for any input using the @:input_html@ option. Typically this is used to disable the input, change the size of a text field, change the rows in a textarea, or even to add a special class to an input to attach special behavior like "autogrow":http://plugins.jquery.com/project/autogrowtextarea textareas:
 
 <pre>
-  <%= semantic_form_for @post do |form| %>
+  <%= semantic_form_for @post do |f| %>
     <%= f.inputs do %>
-      <%= form.input :title,      :input_html => {  :cols => 10 } %>
-      <%= form.input :body,       :input_html => { :class => 'autogrow', :rows => 10, :cols => 20, :maxlength => 10  } %>
-      <%= form.input :created_at, :input_html => { :disabled => true } %>
+      <%= f.input :title,      :input_html => {  :cols => 10 } %>
+      <%= f.input :body,       :input_html => { :class => 'autogrow', :rows => 10, :cols => 20, :maxlength => 10  } %>
+      <%= f.input :created_at, :input_html => { :disabled => true } %>
     <% end %>
-    <%= form.buttons %>
+    <%= f.buttons %>
   <% end %>
 </pre>
 
 The same can be done for buttons with the @:button_html@ option:
 
 <pre>
-  <%= semantic_form_for @post do |form| %>
+  <%= semantic_form_for @post do |f| %>
     ...
-    <%= form.buttons do %>
-      <%= form.commit_button :button_html => { :class => "primary", :disable_with => 'Wait...' } %>
+    <%= f.buttons do %>
+      <%= f.commit_button :button_html => { :class => "primary", :disable_with => 'Wait...' } %>
     <% end %>
   <% end %>
 </pre>
@@ -275,11 +275,11 @@ The same can be done for buttons with the @:button_html@ option:
 Customize the HTML attributes for the @<li>@ wrapper around every input with the @:wrapper_html@ option hash. There's one special key in the hash: (@:class@), which will actually _append_ your string of classes to the existing classes provided by Formtastic (like @"required string error"@).
 
 <pre>
-  <%= semantic_form_for @post do |form| %>
+  <%= semantic_form_for @post do |f| %>
     <%= f.inputs do %>
-      <%= form.input :title, :wrapper_html => { :class => "important" } %>
-      <%= form.input :body %>
-      <%= form.input :description, :wrapper_html => { :style => "display:none;" } %>
+      <%= f.input :title, :wrapper_html => { :class => "important" } %>
+      <%= f.input :body %>
+      <%= f.input :description, :wrapper_html => { :style => "display:none;" } %>
     <% end %>
     ...
   <% end %>
@@ -288,9 +288,9 @@ Customize the HTML attributes for the @<li>@ wrapper around every input with the
 Customize the default class used for hints on each attribute or globally in the @config/formtastic.rb@ file. Similarly, you can customize the error classes on an attribute level or globally.
 
 <pre>
-  <%= semantic_form_for @post do |form| %>
+  <%= semantic_form_for @post do |f| %>
     <%= f.inputs do %>
-      <%= form.input :title, :hint_class => 'custom-html-class', :error_class => 'custom-error-class' %>
+      <%= f.input :title, :hint_class => 'custom-html-class', :error_class => 'custom-error-class' %>
     <% end %>
   <% end %>
 </pre>
@@ -361,11 +361,11 @@ Formtastic has some neat I18n-features. ActiveRecord object names and attributes
 Basic localization (labels only, with ActiveRecord):
 
 <pre>
-  <%= semantic_form_for @post do |form| %>
+  <%= semantic_form_for @post do |f| %>
     <%= f.inputs do %>
-      <%= form.input :title %>        # => :label => I18n.t('activerecord.attributes.user.title')    or 'Title'
-      <%= form.input :body %>         # => :label => I18n.t('activerecord.attributes.user.body')     or 'Body'
-      <%= form.input :section %>      # => :label => I18n.t('activerecord.attributes.user.section')  or 'Section'
+      <%= f.input :title %>        # => :label => I18n.t('activerecord.attributes.user.title')    or 'Title'
+      <%= f.input :body %>         # => :label => I18n.t('activerecord.attributes.user.body')     or 'Body'
+      <%= f.input :section %>      # => :label => I18n.t('activerecord.attributes.user.section')  or 'Section'
     <% end %>
   <% end %>
 </pre>
@@ -414,14 +414,14 @@ Formtastic supports localized *labels*, *hints*, *legends*, *actions* using the
 *3. ...and now you'll get:*
 
 <pre>
-  <%= semantic_form_for Post.new do |form| %>
-    <%= form.inputs do %>
-      <%= form.input :title %>      # => :label => "Choose a title...", :hint => "Choose a good title for your post."
-      <%= form.input :body %>       # => :label => "Write something...", :hint => "Write something inspiring here."
-      <%= form.input :section %>    # => :label => I18n.t('activerecord.attributes.user.section')  or 'Section'
+  <%= semantic_form_for Post.new do |f| %>
+    <%= f.inputs do %>
+      <%= f.input :title %>      # => :label => "Choose a title...", :hint => "Choose a good title for your post."
+      <%= f.input :body %>       # => :label => "Write something...", :hint => "Write something inspiring here."
+      <%= f.input :section %>    # => :label => I18n.t('activerecord.attributes.user.section')  or 'Section'
     <% end %>
-    <%= form.buttons do %>
-      <%= form.commit_button %>     # => "Create my %{model}"
+    <%= f.buttons do %>
+      <%= f.commit_button %>     # => "Create my %{model}"
     <% end %>
   <% end %>
 </pre>
@@ -431,8 +431,8 @@ Formtastic supports localized *labels*, *hints*, *legends*, *actions* using the
 _Note: Slightly different because Formtastic can't guess how you group fields in a form. Legend text can be set with first (as in the sample below) specified value, or :name/:title options - depending on what flavor is preferred._
 
 <pre>
-  <%= semantic_form_for @post do |form| %>
-    <%= form.inputs :post_details do %>   # => :title => "Post details"
+  <%= semantic_form_for @post do |f| %>
+    <%= f.inputs :post_details do %>   # => :title => "Post details"
       # ...
     <% end %>
     # ...
@@ -442,14 +442,14 @@ _Note: Slightly different because Formtastic can't guess how you group fields in
 *5. Override I18n settings:*
 
 <pre>
-  <%= semantic_form_for @post do |form| %>
-    <%= form.inputs do %>
-      <%= form.input :title %>      # => :label => "Choose a title...", :hint => "Choose a good title for your post."
-      <%= form.input :body, :hint => false %>                 # => :label => "Write something..."
-      <%= form.input :section, :label => 'Some section' %>    # => :label => 'Some section'
+  <%= semantic_form_for @post do |f| %>
+    <%= f.inputs do %>
+      <%= f.input :title %>      # => :label => "Choose a title...", :hint => "Choose a good title for your post."
+      <%= f.input :body, :hint => false %>                 # => :label => "Write something..."
+      <%= f.input :section, :label => 'Some section' %>    # => :label => 'Some section'
     <% end %>
-    <%= form.buttons do %>
-      <%= form.commit_button :dummie %>     # => "Launch!"
+    <%= f.buttons do %>
+      <%= f.commit_button :dummie %>     # => "Launch!"
     <% end %>
   <% end %>
 </pre>
@@ -463,14 +463,14 @@ If I18n-lookups is disabled, i.e.:
 ...then you can enable I18n within the forms instead:
 
 <pre>
-  <%= semantic_form_for @post do |form| %>
-    <%= form.inputs do %>
-      <%= form.input :title, :label => true %>      # => :label => "Choose a title..."
-      <%= form.input :body, :label => true %>       # => :label => "Write something..."
-      <%= form.input :section, :label => true %>    # => :label => I18n.t('activerecord.attributes.user.section')  or 'Section'
+  <%= semantic_form_for @post do |f| %>
+    <%= f.inputs do %>
+      <%= f.input :title, :label => true %>      # => :label => "Choose a title..."
+      <%= f.input :body, :label => true %>       # => :label => "Write something..."
+      <%= f.input :section, :label => true %>    # => :label => I18n.t('activerecord.attributes.user.section')  or 'Section'
     <% end %>
-    <%= form.buttons do %>
-      <%= form.commit_button true %>                # => "Update %{model}" (if we are in edit that is...)
+    <%= f.buttons do %>
+      <%= f.commit_button true %>                # => "Update %{model}" (if we are in edit that is...)
     <% end %>
   <% end %>
 </pre>
@@ -515,8 +515,8 @@ h2. Semantic errors
 You can show errors on base (by default) and any other attribute just passing it name to semantic_errors method:
 
 <pre>
-  <%= semantic_form_for @post do |form| %>
-    <%= form.semantic_errors :state %>
+  <%= semantic_form_for @post do |f| %>
+    <%= f.semantic_errors :state %>
   <% end %>
 </pre>
 

From d35bc74841cc494acf3416777bef92cbb6482f2d Mon Sep 17 00:00:00 2001
From: Nathan Long <nathan.long@tma1.com>
Date: Thu, 29 Sep 2011 16:43:58 -0400
Subject: [PATCH 951/992] Extract method field_set_legend.

Extracted from field_set_and_list_wrapping.
This lets us override how the legend is constructed
without affecting the rest of the fieldset. Also
makes field_set_and_list_wrapping a little more concise.
---
 lib/formtastic/helpers/fieldset_wrapper.rb | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/formtastic/helpers/fieldset_wrapper.rb b/lib/formtastic/helpers/fieldset_wrapper.rb
index 1d5cf35b1..4d75b405f 100644
--- a/lib/formtastic/helpers/fieldset_wrapper.rb
+++ b/lib/formtastic/helpers/fieldset_wrapper.rb
@@ -25,10 +25,6 @@ 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[:name] || '').to_s
-        legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
-        legend  = template.content_tag(:legend, template.content_tag(:span, Formtastic::Util.html_safe(legend))) unless legend.blank?
-
         if block_given?
           contents = if template.respond_to?(:is_haml?) && template.is_haml?
             template.capture_haml(&block)
@@ -39,6 +35,8 @@ def field_set_and_list_wrapping(*args, &block) #:nodoc:
 
         # Ruby 1.9: String#to_s behavior changed, need to make an explicit join.
         contents = contents.join if contents.respond_to?(:join)
+
+        legend = field_set_legend(html_options)
         fieldset = template.content_tag(:fieldset,
           Formtastic::Util.html_safe(legend) << template.content_tag(:ol, Formtastic::Util.html_safe(contents)),
           html_options.except(:builder, :parent, :name)
@@ -47,6 +45,12 @@ def field_set_and_list_wrapping(*args, &block) #:nodoc:
         fieldset
       end
 
+      def field_set_legend(html_options)
+        legend  = (html_options[:name] || '').to_s
+        legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
+        legend  = template.content_tag(:legend, template.content_tag(:span, Formtastic::Util.html_safe(legend))) unless legend.blank?
+      end
+
       # Gets the nested_child_index value from the parent builder. It returns a hash with each
       # association that the parent builds.
       def parent_child_index(parent) #:nodoc:
@@ -72,4 +76,4 @@ def parent_child_index(parent) #:nodoc:
 
     end
   end
-end
\ No newline at end of file
+end

From 392cdfacc40b0caa2d44b5afc4aaa120445c5517 Mon Sep 17 00:00:00 2001
From: Alex Rothenberg <alex@alexrothenberg.com>
Date: Fri, 30 Sep 2011 15:24:53 -0400
Subject: [PATCH 952/992] added generator specs using ammeter gem

---
 .gitignore                                    |  3 +-
 formtastic.gemspec                            |  1 +
 .../install/install_generator_spec.rb         | 47 +++++++++++++++++++
 spec/spec_helper.rb                           |  2 +
 4 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 spec/generators/formtastic/install/install_generator_spec.rb

diff --git a/.gitignore b/.gitignore
index 8fddd2b96..27b0fe945 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@ log/*
 .bundle
 Gemfile.lock
 .yardoc
-doc/
\ No newline at end of file
+doc/
+tmp
\ No newline at end of file
diff --git a/formtastic.gemspec b/formtastic.gemspec
index 92cdf1c3e..107e85edd 100644
--- a/formtastic.gemspec
+++ b/formtastic.gemspec
@@ -33,4 +33,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<rcov>, ["~> 0.9.9"])
   s.add_development_dependency(%q<colored>)
   s.add_development_dependency(%q<tzinfo>)
+  s.add_development_dependency(%q<ammeter>, ["~> 0.1.2"])
 end
diff --git a/spec/generators/formtastic/install/install_generator_spec.rb b/spec/generators/formtastic/install/install_generator_spec.rb
new file mode 100644
index 000000000..8e4db7048
--- /dev/null
+++ b/spec/generators/formtastic/install/install_generator_spec.rb
@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+# Generators are not automatically loaded by Rails
+require 'generators/formtastic/install/install_generator'
+
+describe Formtastic::InstallGenerator do
+  # Tell the generator where to put its output (what it thinks of as Rails.root)
+  destination File.expand_path("../../../../../tmp", __FILE__)
+
+  before { prepare_destination }
+
+  describe 'no arguments' do
+    before { run_generator  }
+
+    describe 'config/initializers/formtastic.rb' do
+      subject { file('config/initializers/formtastic.rb') }
+      it { should exist }
+      it { should contain "# Please note: If you're subclassing Formtastic::FormBuilder" }
+    end
+
+    describe 'lib/templates/erb/scaffold/_form.html.erb' do
+      subject { file('lib/templates/erb/scaffold/_form.html.erb') }
+      it { should exist }
+      it { should contain "<%%= semantic_form_for @<%= singular_name %> do |f| %>" }
+    end
+  end
+
+  describe 'haml' do
+    before { run_generator %w(--template-engine haml) }
+
+    describe 'lib/templates/erb/scaffold/_form.html.haml' do
+      subject { file('lib/templates/haml/scaffold/_form.html.haml') }
+      it { should exist }
+      it { should contain "= semantic_form_for @<%= singular_name %> do |f|" }
+    end
+  end
+
+  describe 'slim' do
+    before { run_generator %w(--template-engine slim) }
+
+    describe 'lib/templates/erb/scaffold/_form.html.slim' do
+      subject { file('lib/templates/slim/scaffold/_form.html.slim') }
+      it { should exist }
+      it { should contain "= semantic_form_for @<%= singular_name %> do |f|" }
+    end
+  end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c39e3392b..3e5b9c971 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -10,6 +10,8 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic/util'))
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic'))
 
+require 'ammeter/init'
+
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories in alphabetic order.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each {|f| require f}

From 224e2835072139ee984a10ba4d0fc679b46086b1 Mon Sep 17 00:00:00 2001
From: Thomas Walpole <twalpole@gmail.com>
Date: Sat, 1 Oct 2011 15:23:06 -0700
Subject: [PATCH 953/992] Fix issue with the extraction of field_set_legend

---
 lib/formtastic/helpers/fieldset_wrapper.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/formtastic/helpers/fieldset_wrapper.rb b/lib/formtastic/helpers/fieldset_wrapper.rb
index 4d75b405f..359ecf6c1 100644
--- a/lib/formtastic/helpers/fieldset_wrapper.rb
+++ b/lib/formtastic/helpers/fieldset_wrapper.rb
@@ -49,6 +49,7 @@ def field_set_legend(html_options)
         legend  = (html_options[:name] || '').to_s
         legend %= parent_child_index(html_options[:parent]) if html_options[:parent]
         legend  = template.content_tag(:legend, template.content_tag(:span, Formtastic::Util.html_safe(legend))) unless legend.blank?
+        legend
       end
 
       # Gets the nested_child_index value from the parent builder. It returns a hash with each

From 0b23716e3b80316da09c08fb74dff78fc81afa9f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 26 Sep 2011 14:27:21 +1000
Subject: [PATCH 954/992] spec to expose that :multiple => true doesn't work
 when there's no association ref #690

---
 spec/inputs/select_input_spec.rb | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 8ab34b9f2..c09bc2775 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -452,17 +452,15 @@
   end
 
   describe 'when no association exists' do
-    before(:each) do
+
+    it 'should still generate a valid name attribute' do
       concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:author_name, :as => :select, :collection => ::Author.all))
       end)
-    end
-
-    it 'should still generate a valid name attribute' do
       output_buffer.should have_tag("form li select[@name='project[author_name]']")
     end
     
-    describe 'and :multiple is set to true' do
+    describe 'and :multiple is set to true through :input_html' do
       it "should make the select a multi-select" do
         concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:author_name, :as => :select, :input_html => {:multiple => true} ))
@@ -471,6 +469,15 @@
       end
     end
     
+    describe 'and :multiple is set to true' do
+      it "should make the select a multi-select" do
+        concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          concat(builder.input(:author_name, :as => :select, :multiple => true, :collection => ["Fred", "Bob"]))
+        end)
+        output_buffer.should have_tag("form li select[@multiple]")
+      end
+    end
+    
   end
 
   describe 'when a grouped collection collection is given' do

From f90da6f5878886046f54007b1120de3329d7ff15 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 26 Sep 2011 14:29:23 +1000
Subject: [PATCH 955/992] fixes #690 and failing test in 4f6e4b9

---
 lib/formtastic/inputs/select_input.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index 4028ebd96..ed66adc75 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -184,7 +184,7 @@ def input_html_options
       
       def extra_input_html_options
         {
-          :multiple => multiple_by_association?,
+          :multiple => multiple?,
           :name => "#{object_name}[#{association_primary_key}]#{'[]' if multiple?}"
         }
       end

From 0f0878c7abf3f048d750686f92f2816b1f2b9612 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 3 Oct 2011 08:40:57 +1100
Subject: [PATCH 956/992] CHANGELOG

---
 CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 150831e19..59e5c226e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+2.0.1
+
+* fixed that `:multiple => true` wasn't working when no association present
+
 2.0.0
 
 * Fixed that all check boxes were incorrectly checked if an Array was passed in to :collection 

From 75f4233543f6c48718b4304435837eddf4247409 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Mon, 3 Oct 2011 08:41:20 +1100
Subject: [PATCH 957/992] verion bump 2.0.1

---
 lib/formtastic/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/formtastic/version.rb b/lib/formtastic/version.rb
index 34df6ee9c..eb0db2122 100644
--- a/lib/formtastic/version.rb
+++ b/lib/formtastic/version.rb
@@ -1,3 +1,3 @@
 module Formtastic
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

From 5cec1a653a6956c939e13c4f0dc8b791454d1be6 Mon Sep 17 00:00:00 2001
From: Dimitrij Denissenko <dimitrij.denissenko@blacksquaremedia.com>
Date: Wed, 5 Oct 2011 08:16:32 +0100
Subject: [PATCH 958/992] Fixed prompts on select inputs

---
 lib/formtastic/inputs/select_input.rb | 17 +++++++++--------
 spec/inputs/select_input_spec.rb      |  3 ++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index ed66adc75..078a54cc6 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -162,20 +162,21 @@ def grouped_select_html
           input_html_options
         )
       end
-      
+            
       def include_blank?
-        return options[:prompt] if options.key?(:prompt)
-        return options[:include_blank] if options.key?(:include_blank)
-        return true if (single? && builder.include_blank_for_select_by_default)
-        false
-      end
+        options[:include_blank] == true || (single? && builder.include_blank_for_select_by_default)
+      end      
+
+      def prompt?
+        !!options[:prompt]
+      end      
 
       def label_html_options
         super.merge(:for => input_html_options[:id])
       end
       
       def input_options
-        super.merge({:include_blank => include_blank?, :prompt => nil})
+        super.merge :include_blank => include_blank? && !prompt?
       end
       
       def input_html_options
@@ -207,4 +208,4 @@ def single?
 
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 343457a25..8608f7b4b 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -432,7 +432,8 @@
       output_buffer.should have_tag("form li select option[@value='']", /choose author/, :count => 1)
     end
 
-    it 'should not have a blank select option' do
+    it 'should not have a second blank select option' do
+      output_buffer.should have_tag("form li select option[@value='']", :count => 1)
       output_buffer.should_not have_tag("form li select option[@value='']", "")
     end
   end

From b51411c20999a51c2de8d39fe34a1319c44b06cf Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Wed, 5 Oct 2011 23:26:55 -0300
Subject: [PATCH 959/992] Revert "Fixed prompts on select inputs"

This reverts commit 5cec1a653a6956c939e13c4f0dc8b791454d1be6.
---
 lib/formtastic/inputs/select_input.rb | 17 ++++++++---------
 spec/inputs/select_input_spec.rb      |  3 +--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index 078a54cc6..ed66adc75 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -162,21 +162,20 @@ def grouped_select_html
           input_html_options
         )
       end
-            
+      
       def include_blank?
-        options[:include_blank] == true || (single? && builder.include_blank_for_select_by_default)
-      end      
-
-      def prompt?
-        !!options[:prompt]
-      end      
+        return options[:prompt] if options.key?(:prompt)
+        return options[:include_blank] if options.key?(:include_blank)
+        return true if (single? && builder.include_blank_for_select_by_default)
+        false
+      end
 
       def label_html_options
         super.merge(:for => input_html_options[:id])
       end
       
       def input_options
-        super.merge :include_blank => include_blank? && !prompt?
+        super.merge({:include_blank => include_blank?, :prompt => nil})
       end
       
       def input_html_options
@@ -208,4 +207,4 @@ def single?
 
     end
   end
-end
+end
\ No newline at end of file
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 8608f7b4b..343457a25 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -432,8 +432,7 @@
       output_buffer.should have_tag("form li select option[@value='']", /choose author/, :count => 1)
     end
 
-    it 'should not have a second blank select option' do
-      output_buffer.should have_tag("form li select option[@value='']", :count => 1)
+    it 'should not have a blank select option' do
       output_buffer.should_not have_tag("form li select option[@value='']", "")
     end
   end

From 45014a8c4c7f0cf91c241ebd82ce48db9abd7020 Mon Sep 17 00:00:00 2001
From: Dimitrij Denissenko <dimitrij.denissenko@blacksquaremedia.com>
Date: Thu, 6 Oct 2011 12:20:50 +0100
Subject: [PATCH 960/992] Improved :prompt patch for select inputs

---
 lib/formtastic/inputs/select_input.rb | 43 ++++++++++++++-------------
 spec/inputs/select_input_spec.rb      | 12 ++++----
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index ed66adc75..b8da74be1 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -138,69 +138,70 @@ class SelectInput
       include Base
       include Base::Collections
       include Base::GroupedCollections
-      
+
       def to_html
         input_wrapping do
           label_html <<
           (options[:group_by] ? grouped_select_html : select_html)
         end
       end
-      
+
       def select_html
         builder.select(input_name, collection, input_options, input_html_options)
       end
-      
+
       def grouped_select_html
         builder.grouped_collection_select(
-          input_name, 
+          input_name,
           grouped_collection,
-          group_association, 
+          group_association,
           group_label_method,
-          value_method, 
+          value_method,
           label_method,
-          input_options, 
+          input_options,
           input_html_options
         )
       end
-      
+
       def include_blank?
-        return options[:prompt] if options.key?(:prompt)
-        return options[:include_blank] if options.key?(:include_blank)
-        return true if (single? && builder.include_blank_for_select_by_default)
-        false
+        options.key?(:include_blank) ? !!options[:include_blank] : (single? && builder.include_blank_for_select_by_default)
+      end
+
+      def prompt?
+        !!options[:prompt]
       end
 
       def label_html_options
         super.merge(:for => input_html_options[:id])
       end
-      
+
       def input_options
-        super.merge({:include_blank => include_blank?, :prompt => nil})
+        super.merge :include_blank => include_blank? && !prompt?
       end
-      
+
       def input_html_options
         extra_input_html_options.merge(super)
       end
-      
+
       def extra_input_html_options
         {
           :multiple => multiple?,
           :name => "#{object_name}[#{association_primary_key}]#{'[]' if multiple?}"
         }
       end
-      
+
       def multiple_by_association?
         reflection && [ :has_many, :has_and_belongs_to_many ].include?(reflection.macro)
       end
-      
+
       def multiple_by_options?
         options[:multiple] || (options[:input_html] && options[:input_html][:multiple])
       end
-      
+
       def multiple?
-        multiple_by_options? || multiple_by_association? 
+        multiple_by_options? || multiple_by_association?
       end
-      
+
       def single?
         !multiple?
       end
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 343457a25..543699e50 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -75,7 +75,7 @@
         end
       end
     end
-    
+
     describe 'using a nil name' do
       before do
         concat(semantic_form_for(@new_post) do |builder|
@@ -432,8 +432,8 @@
       output_buffer.should have_tag("form li select option[@value='']", /choose author/, :count => 1)
     end
 
-    it 'should not have a blank select option' do
-      output_buffer.should_not have_tag("form li select option[@value='']", "")
+    it 'should not have a second blank select option' do
+      output_buffer.should have_tag("form li select option[@value='']", :count => 1)
     end
   end
 
@@ -469,7 +469,7 @@
       end)
       output_buffer.should have_tag("form li select[@name='project[author_name]']")
     end
-    
+
     describe 'and :multiple is set to true through :input_html' do
       it "should make the select a multi-select" do
         concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
@@ -478,7 +478,7 @@
         output_buffer.should have_tag("form li select[@multiple]")
       end
     end
-    
+
     describe 'and :multiple is set to true' do
       it "should make the select a multi-select" do
         concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
@@ -487,7 +487,7 @@
         output_buffer.should have_tag("form li select[@multiple]")
       end
     end
-    
+
   end
 
   describe 'when a grouped collection collection is given' do

From 0514d73e22a893d9e2f9b21a38f98f6e9e12962f Mon Sep 17 00:00:00 2001
From: Nathan Long <nathan.long@tma1.com>
Date: Tue, 11 Oct 2011 17:03:50 -0400
Subject: [PATCH 961/992] Ability to customize localization

- `localized_string` uses a configurable class
to perform lookups
- FormBuilder.i18n_localizer is Formtastic::Localizer
by default; this maintains backwards compatability
- Updated documentation and generator accordingly
---
 README.textile                         |   7 ++
 lib/formtastic.rb                      |   1 +
 lib/formtastic/form_builder.rb         |   1 +
 lib/formtastic/localized_string.rb     | 100 ++---------------------
 lib/formtastic/localizer.rb            | 107 +++++++++++++++++++++++++
 lib/generators/templates/formtastic.rb |   6 ++
 6 files changed, 128 insertions(+), 94 deletions(-)
 create mode 100644 lib/formtastic/localizer.rb

diff --git a/README.textile b/README.textile
index 6e162fe16..0208299eb 100644
--- a/README.textile
+++ b/README.textile
@@ -509,6 +509,13 @@ For more flexible forms; Formtastic finds translations using a bottom-up approac
 
 Values for @labels@/@hints@/@actions@ are can take values: @String@ (explicit value), @Symbol@ (i18n-lookup-key relative to the current "type", e.g. actions:), @true@ (force I18n lookup), @false@ (force no I18n lookup). Titles (legends) can only take: @String@ and @Symbol@ - true/false have no meaning.
 
+h3. Customized Localization
+
+If you want to customize your localization even further, create your own localizer class with a @localize@ method (see @Formtastic::Localizer@ for an example), and in @config/initializers/formtastic.rb@, add a line like this:
+
+<pre>
+    configure :i18n_localizer, MyApp::MyLocalizerClass
+</pre>
 
 h2. Semantic errors
 
diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index e5dfc596e..69b42fc46 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -12,6 +12,7 @@ module Formtastic
   autoload :I18n
   autoload :Inputs
   autoload :LocalizedString
+  autoload :Localizer
   autoload :Util
   
   # @private
diff --git a/lib/formtastic/form_builder.rb b/lib/formtastic/form_builder.rb
index f6269acb8..58fad6b7e 100644
--- a/lib/formtastic/form_builder.rb
+++ b/lib/formtastic/form_builder.rb
@@ -23,6 +23,7 @@ def self.configure(name, value = nil)
     configure :file_metadata_suffixes, ['content_type', 'file_name', 'file_size']
     configure :priority_countries, ["Australia", "Canada", "United Kingdom", "United States"]
     configure :i18n_lookups_by_default, true
+    configure :i18n_localizer, Formtastic::Localizer
     configure :escape_html_entities_in_hints_and_labels, true
     configure :default_commit_button_accesskey
     configure :default_inline_error_class, 'inline-errors'
diff --git a/lib/formtastic/localized_string.rb b/lib/formtastic/localized_string.rb
index 9b89910f2..d7c64e8fb 100644
--- a/lib/formtastic/localized_string.rb
+++ b/lib/formtastic/localized_string.rb
@@ -1,105 +1,17 @@
 module Formtastic
-  # @private
   module LocalizedString
 
-    protected
-
-    # 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::FormBuilder.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)
-        escape_html_entities(value)
-      else
-        use_i18n = value.nil? ? i18n_lookups_by_default : (value != false)
-
-        if use_i18n
-          model_name, nested_model_name  = normalize_model_name(self.model_name.underscore)
-
-          action_name = template.params[:action].to_s rescue ''
-          attribute_name = key.to_s
-
-          defaults = Formtastic::I18n::SCOPES.reject do |i18n_scope|
-            nested_model_name.nil? && i18n_scope.match(/nested_model/)
-          end.collect do |i18n_scope|
-            i18n_path = i18n_scope.dup
-            i18n_path.gsub!('%{action}', action_name)
-            i18n_path.gsub!('%{model}', model_name)
-            i18n_path.gsub!('%{nested_model}', nested_model_name) unless nested_model_name.nil?
-            i18n_path.gsub!('%{attribute}', attribute_name)
-            i18n_path.gsub!('..', '.')
-            i18n_path.to_sym
-          end
-          defaults << ''
-
-          defaults.uniq!
-
-          default_key = defaults.shift
-          i18n_value = Formtastic::I18n.t(default_key,
-            options.merge(:default => defaults, :scope => type.to_s.pluralize.to_sym))
-          i18n_value = i18n_value.is_a?(::String) ? i18n_value : nil
-          if i18n_value.blank? && type == :label
-            # This is effectively what Rails label helper does for i18n lookup
-            options[:scope] = [:helpers, type]
-            options[:default] = defaults
-            i18n_value = ::I18n.t(default_key, options)
-          end
-          (i18n_value.is_a?(::String) && i18n_value.present?) ? escape_html_entities(i18n_value) : nil
-        end
-      end
-    end
-
     def model_name
       @object.present? ? @object.class.name : @object_name.to_s.classify
     end
 
-    def normalize_model_name(name)
-      if !name =~ /\[/ && self.respond_to?(:builder) && builder.respond_to?(:parent_builder) && builder.parent_builder.object_name
-        # Rails 3.1 nested builder case
-        [builder.parent_builder.object_name.to_s, name]
-      elsif name =~ /(.+)\[(.+)\]/
-        # Rails 3 (and 3.1?) nested builder case with :post rather than @post
-        [$1, $2]
-      elsif self.respond_to?(:builder) && builder.respond_to?(:options) && builder.options.key?(:parent_builder)
-        # Rails 3.0 nested builder work-around case, where :parent_builder is provided by f.semantic_form_for
-        [builder.options[:parent_builder].object_name.to_s, name]
-      else
-        # Non-nested case
-        [name]
-      end
-    end
-
-    def escape_html_entities(string) #:nodoc:
-      if (respond_to?(:builder) && builder.escape_html_entities_in_hints_and_labels) ||
-         (self.respond_to?(:escape_html_entities_in_hints_and_labels) && escape_html_entities_in_hints_and_labels)
-        string = template.escape_once(string) unless string.respond_to?(:html_safe?) && string.html_safe? == true # Acceppt html_safe flag as indicator to skip escaping
-      end
-      string
-    end
+    protected
 
-    def i18n_lookups_by_default
-      respond_to?(:builder) ? builder.i18n_lookups_by_default : i18n_lookups_by_default
+    def localized_string(key, value, type, options = {}) #:nodoc:
+      current_builder = respond_to?(:builder) ? builder : self
+      localizer = Formtastic::FormBuilder.i18n_localizer.new(current_builder)
+      localizer.localize(key, value, type, options)
     end
 
   end
-end
\ No newline at end of file
+end
diff --git a/lib/formtastic/localizer.rb b/lib/formtastic/localizer.rb
new file mode 100644
index 000000000..fa4cb34c4
--- /dev/null
+++ b/lib/formtastic/localizer.rb
@@ -0,0 +1,107 @@
+module Formtastic
+  class Localizer
+
+    attr_accessor :builder
+
+    def initialize(current_builder)
+      self.builder = current_builder 
+    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::FormBuilder.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 localize(key, value, type, options = {}) #:nodoc:
+      key = value if value.is_a?(::Symbol)
+
+      if value.is_a?(::String)
+        escape_html_entities(value)
+      else
+        use_i18n = value.nil? ? i18n_lookups_by_default : (value != false)
+
+        if use_i18n
+          model_name, nested_model_name  = normalize_model_name(builder.model_name.underscore)
+
+          action_name = builder.template.params[:action].to_s rescue ''
+          attribute_name = key.to_s
+
+
+          defaults = Formtastic::I18n::SCOPES.reject do |i18n_scope|
+            nested_model_name.nil? && i18n_scope.match(/nested_model/)
+          end.collect do |i18n_scope|
+            i18n_path = i18n_scope.dup
+            i18n_path.gsub!('%{action}', action_name)
+            i18n_path.gsub!('%{model}', model_name)
+            i18n_path.gsub!('%{nested_model}', nested_model_name) unless nested_model_name.nil?
+            i18n_path.gsub!('%{attribute}', attribute_name)
+            i18n_path.gsub!('..', '.')
+            i18n_path.to_sym
+          end
+          defaults << ''
+
+          defaults.uniq!
+
+          default_key = defaults.shift
+          i18n_value = Formtastic::I18n.t(default_key,
+            options.merge(:default => defaults, :scope => type.to_s.pluralize.to_sym))
+          i18n_value = i18n_value.is_a?(::String) ? i18n_value : nil
+          if i18n_value.blank? && type == :label
+            # This is effectively what Rails label helper does for i18n lookup
+            options[:scope] = [:helpers, type]
+            options[:default] = defaults
+            i18n_value = ::I18n.t(default_key, options)
+          end
+          (i18n_value.is_a?(::String) && i18n_value.present?) ? escape_html_entities(i18n_value) : nil
+        end
+      end
+    end
+
+    protected
+
+    def normalize_model_name(name)
+      if !name =~ /\[/ && builder.respond_to?(:parent_builder) && builder.parent_builder.object_name
+        # Rails 3.1 nested builder case
+        [builder.parent_builder.object_name.to_s, name]
+      elsif name =~ /(.+)\[(.+)\]/
+        # Rails 3 (and 3.1?) nested builder case with :post rather than @post
+        [$1, $2]
+      elsif builder.respond_to?(:options) && builder.options.key?(:parent_builder)
+        # Rails 3.0 nested builder work-around case, where :parent_builder is provided by f.semantic_form_for
+        [builder.options[:parent_builder].object_name.to_s, name]
+      else
+        # Non-nested case
+        [name]
+      end
+    end
+
+    def escape_html_entities(string) #:nodoc:
+      if (builder.escape_html_entities_in_hints_and_labels) ||
+         (self.respond_to?(:escape_html_entities_in_hints_and_labels) && escape_html_entities_in_hints_and_labels)
+        string = builder.template.escape_once(string) unless string.respond_to?(:html_safe?) && string.html_safe? == true # Accept html_safe flag as indicator to skip escaping
+      end
+      string
+    end
+
+    def i18n_lookups_by_default
+      builder.i18n_lookups_by_default
+    end
+
+  end
+end
diff --git a/lib/generators/templates/formtastic.rb b/lib/generators/templates/formtastic.rb
index f94d016af..1ff950245 100644
--- a/lib/generators/templates/formtastic.rb
+++ b/lib/generators/templates/formtastic.rb
@@ -68,6 +68,12 @@
 # i.e. :label => true, or :hint => true (or opposite depending on initialized value)
 # Formtastic::FormBuilder.i18n_lookups_by_default = false
 
+# Specifies the class to use for localization lookups. You can create your own
+# class and use it instead. It must have a `localize` method - see
+# `Formtastic::Localizer` for details. (You may want to inherit from that
+# class to call `super`.)
+# Formtastic::FormBuilder.i18n_localizer = Formtastic::Localizer
+
 # You can add custom inputs or override parts of Formtastic by subclassing Formtastic::FormBuilder and
 # specifying that class here.  Defaults to Formtastic::FormBuilder.
 # Formtastic::Helpers::FormHelper.builder = MyCustomBuilder

From c5468442336017dba1ffc46fbde4609c0b5702c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Corcuera?= <jzcorcuera@gmail.com>
Date: Mon, 17 Oct 2011 22:45:16 -0500
Subject: [PATCH 962/992] FormGenerator is Back! It is based on the old
 FormGenerator and keeps the same configuration options.

---
 .../formtastic/form/form_generator.rb         | 105 ++++++++++++++++
 .../formtastic/form/form_generator_spec.rb    | 118 ++++++++++++++++++
 2 files changed, 223 insertions(+)
 create mode 100644 lib/generators/formtastic/form/form_generator.rb
 create mode 100644 spec/generators/formtastic/form/form_generator_spec.rb

diff --git a/lib/generators/formtastic/form/form_generator.rb b/lib/generators/formtastic/form/form_generator.rb
new file mode 100644
index 000000000..5c36b8ec3
--- /dev/null
+++ b/lib/generators/formtastic/form/form_generator.rb
@@ -0,0 +1,105 @@
+# encoding: utf-8
+module Formtastic
+  # Generates a Formtastic form partial based on an existing model. It will not overwrite existing
+  # files without confirmation.
+  #
+  # @example
+  #   $ rails generate formtastic:form Post
+  # @example Copy the partial code to the pasteboard rather than generating a partial
+  #   $ rails generate formtastic:form Post --copy
+  # @example Return HAML output instead of default template engine
+  #   $ rails generate formtastic:form Post --haml
+  # @example Generate a form for specific model attributes
+  #   $ rails generate formtastic:form Post title:string body:text
+  # @example Generate a form for a specific controller
+  #   $ rails generate formtastic:form Post --controller admin/posts
+  class FormGenerator < Rails::Generators::NamedBase
+    desc "Generates a Formtastic form partial based on an existing model."
+
+    argument :name, :type => :string, :required => true, :banner => 'MODEL_NAME'
+    argument :attributes, :type => :array, :default => [], :banner => 'attribute attribute'
+
+    source_root File.expand_path('../../../templates', __FILE__)
+
+    class_option :template_engine
+
+    class_option :copy, :type => :boolean, :default => false, :group => :formtastic,
+    :desc => 'Copy the generated code the clipboard instead of generating a partial file."'
+
+    class_option :controller, :type => :string, :default => false, :group => :formtastic,
+    :desc => 'Generate for custom controller/view path - in case model and controller namespace is different, i.e. "admin/posts"'
+
+    def create_or_show
+      @attributes = reflected_attributes if @attributes.empty?
+
+      engine = options[:template_engine]
+
+      if options[:copy]
+        template = File.read("#{self.class.source_root}/_form.html.#{engine}")
+        erb = ERB.new(template, nil, '-')
+        generated_code = erb.result(binding).strip rescue nil
+        puts "The following code has been copied to the clipboard, just paste it in your views:" if save_to_clipboard(generated_code)
+        puts generated_code || "Error: Nothing generated. Does the model exist?"
+      else
+        empty_directory "app/views/#{controller_path}"
+        template "_form.html.#{engine}", "app/views/#{controller_path}/_form.html.#{engine}"
+      end
+    end
+
+    protected
+
+    def controller_path
+      @controller_path ||= if options[:controller]
+        options[:controller].underscore
+      else
+        name.underscore.pluralize
+      end
+    end
+
+    def reflected_attributes
+      columns = content_columns
+      columns += association_columns
+    end
+
+    def model
+      @model ||= name.camelize.constantize
+    end
+
+    # Collects content columns (non-relation columns) for the current class.
+    # Skips Active Record Timestamps.
+    def content_columns
+      model.content_columns.select do |column|
+        !Formtastic::Helpers::InputsHelper::SKIPPED_COLUMNS.include? column.name.to_sym
+      end
+    end
+
+    # Collects association columns (relation columns) for the current class. Skips polymorphic
+    # associations because we can't guess which class to use for an automatically generated input.
+    def association_columns
+      model.reflect_on_all_associations(:belongs_to).select do |association_reflection|
+        association_reflection.options[:polymorphic] != true
+      end
+    end
+
+    def save_to_clipboard(data)
+      return unless data
+
+      begin
+        case RUBY_PLATFORM
+        when /win32/
+          require 'win32/clipboard'
+          ::Win32::Clipboard.data = data
+        when /darwin/ # mac
+          `echo "#{data}" | pbcopy`
+        else # linux/unix
+          `echo "#{data}" | xsel --clipboard` || `echo "#{data}" | xclip`
+        end
+      rescue LoadError
+          false
+      else
+          true
+      end
+    end
+
+  end
+end
\ No newline at end of file
diff --git a/spec/generators/formtastic/form/form_generator_spec.rb b/spec/generators/formtastic/form/form_generator_spec.rb
new file mode 100644
index 000000000..7fcffd5be
--- /dev/null
+++ b/spec/generators/formtastic/form/form_generator_spec.rb
@@ -0,0 +1,118 @@
+require 'spec_helper'
+
+# Generators are not automatically loaded by Rails
+require 'generators/formtastic/form/form_generator'
+
+describe Formtastic::FormGenerator do
+
+  include FormtasticSpecHelper
+
+  # Tell the generator where to put its output (what it thinks of as Rails.root)
+  destination File.expand_path("../../../../../tmp", __FILE__)
+
+  before do
+    @output_buffer = ''
+    prepare_destination
+    mock_everything
+    ::Post.stub!(:reflect_on_all_associations).with(:belongs_to).and_return([
+      mock('reflection', :name => :author, :options => {}, :klass => ::Author, :macro => :belongs_to),
+      mock('reflection', :name => :reviewer, :options => {:class_name => 'Author'}, :klass => ::Author, :macro => :belongs_to),
+      mock('reflection', :name => :main_post, :options => {}, :klass => ::Post, :macro => :belongs_to),
+      mock('reflection', :name => :attachment, :options => {:polymorphic => true}, :macro => :belongs_to),
+    ])
+  end
+
+  describe 'without model' do
+    it 'should raise Thor::RequiredArgumentMissingError' do
+      lambda { run_generator }.should raise_error(Thor::RequiredArgumentMissingError)
+    end
+  end
+
+  describe 'with existing model' do
+    it 'should not raise an exception' do
+      lambda { run_generator %w(Post) }.should_not raise_error(Thor::RequiredArgumentMissingError)
+    end
+  end
+
+  describe 'with attributes' do
+    before { run_generator %w(Post title:string author:references) }
+
+    describe 'render only the specified attributes' do
+      subject { file('app/views/posts/_form.html.erb') }
+      it { should exist }
+      it { should contain "<%= f.input :title %>" }
+      it { should contain "<%= f.input :author %>" }
+      it { should_not contain "<%= f.input :main_post %>" }
+    end
+  end
+
+  describe 'without attributes' do
+    before { run_generator %w(Post) }
+
+    subject { file('app/views/posts/_form.html.erb') }
+
+    describe 'content_columns' do
+      it { should contain "<%= f.input :title %>" }
+      it { should contain "<%= f.input :body %>" }
+      it { should_not contain "<%= f.input :created_at %>" }
+      it { should_not contain "<%= f.input :updated_at %>" }
+    end
+
+    describe 'reflection_on_association' do
+      it { should contain "<%= f.input :author %>" }
+      it { should contain "<%= f.input :reviewer %>" }
+      it { should contain "<%= f.input :main_post %>" }
+      it { should_not contain "<%= f.input :attachment %>" }
+    end
+  end
+
+  describe 'with template engine option' do
+    describe 'erb' do
+      before { run_generator %w(Post --template-engine erb) }
+
+      describe 'app/views/posts/_form.html.erb' do
+        subject { file('app/views/posts/_form.html.erb') }
+        it { should exist }
+        it { should contain "<%= semantic_form_for @post do |f| %>" }
+      end
+    end
+
+    describe 'haml' do
+      before { run_generator %w(Post --template-engine haml) }
+
+      describe 'app/views/posts/_form.html.haml' do
+        subject { file('app/views/posts/_form.html.haml') }
+        it { should exist }
+        it { should contain "= semantic_form_for @post do |f|" }
+      end
+    end
+
+    describe 'slim' do
+      before { run_generator %w(Post --template-engine slim) }
+
+      describe 'app/views/posts/_form.html.slim' do
+        subject { file('app/views/posts/_form.html.slim') }
+        it { should exist }
+        it { should contain "= semantic_form_for @post do |f|" }
+      end
+    end
+  end
+
+  describe 'with copy option' do
+    before { run_generator %w(Post --copy) }
+
+    describe 'app/views/posts/_form.html.erb' do
+      subject { file('app/views/posts/_form.html.erb') }
+      it { should_not exist }
+    end
+  end
+
+  describe 'with controller option' do
+    before { run_generator %w(Post --controller admin/posts) }
+
+    describe 'app/views/admin/posts/_form.html.erb' do
+      subject { file('app/views/admin/posts/_form.html.erb') }
+      it { should exist }
+    end
+  end
+end

From 1fbdf8f68823805c70c421bb55e0d039bdeb9c15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Corcuera?= <jzcorcuera@gmail.com>
Date: Mon, 17 Oct 2011 23:48:36 -0500
Subject: [PATCH 963/992] Fix generator templates: To generate the correct
 indentation for Haml and Slim form partials.

---
 lib/generators/templates/_form.html.haml | 4 ++--
 lib/generators/templates/_form.html.slim | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/generators/templates/_form.html.haml b/lib/generators/templates/_form.html.haml
index 5afb5a099..8baf13c70 100644
--- a/lib/generators/templates/_form.html.haml
+++ b/lib/generators/templates/_form.html.haml
@@ -1,8 +1,8 @@
 = semantic_form_for @<%= singular_name %> do |f|
   = f.inputs do
-  <% attributes.each do |attribute| -%>
+  <%- attributes.each do |attribute| -%>
     = f.input :<%= attribute.name %>
-  <% end -%>
+  <%- end -%>
 
   = f.buttons do
     = f.commit_button
diff --git a/lib/generators/templates/_form.html.slim b/lib/generators/templates/_form.html.slim
index 5afb5a099..8baf13c70 100644
--- a/lib/generators/templates/_form.html.slim
+++ b/lib/generators/templates/_form.html.slim
@@ -1,8 +1,8 @@
 = semantic_form_for @<%= singular_name %> do |f|
   = f.inputs do
-  <% attributes.each do |attribute| -%>
+  <%- attributes.each do |attribute| -%>
     = f.input :<%= attribute.name %>
-  <% end -%>
+  <%- end -%>
 
   = f.buttons do
     = f.commit_button

From e7d3e0f72d775cdaeaf048a1374f6430db4bc93e Mon Sep 17 00:00:00 2001
From: Joel Nimety <jnimety@continuity.net>
Date: Thu, 20 Oct 2011 14:43:05 -0400
Subject: [PATCH 964/992] memoize the selected values array

Signed-off-by: Joel Nimety <jnimety@continuity.net>
---
 lib/formtastic/inputs/check_boxes_input.rb | 2 +-
 spec/inputs/check_boxes_input_spec.rb      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index 8393d7150..18cd29810 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -152,7 +152,7 @@ def disabled?(value)
       end
 
       def selected_values
-        if object.respond_to?(method)
+        @selected_values_cache ||= if object.respond_to?(method)
           selected_items = [object.send(method)].compact.flatten
 
           [*selected_items.map { |o| send_or_call_or_object(value_method, o) }].compact
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 5f423780a..559ae4fbe 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -348,7 +348,7 @@
         item.should_not_receive(:id)
         item.stub!(:custom_value).and_return('custom_value')
         item.should_receive(:custom_value).exactly(3).times
-        @new_post.author.should_receive(:custom_value).exactly(3).times
+        @new_post.author.should_receive(:custom_value).exactly(1).times
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:author, :as => :check_boxes, :member_value => :custom_value, :collection => [item, item, item]))
         end)

From dbc7452d62425d471310f3781b992e772484e24d Mon Sep 17 00:00:00 2001
From: Joel Nimety <jnimety@continuity.net>
Date: Thu, 20 Oct 2011 16:54:00 -0400
Subject: [PATCH 965/992] better code organization, thanks sobrinho

Signed-off-by: Joel Nimety <jnimety@continuity.net>
---
 lib/formtastic/inputs/check_boxes_input.rb | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index 18cd29810..7e28c9baa 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -152,13 +152,7 @@ def disabled?(value)
       end
 
       def selected_values
-        @selected_values_cache ||= if object.respond_to?(method)
-          selected_items = [object.send(method)].compact.flatten
-
-          [*selected_items.map { |o| send_or_call_or_object(value_method, o) }].compact
-        else
-          []
-        end
+        @selected_values ||= make_selected_values
       end
 
       def disabled_values
@@ -175,6 +169,17 @@ def input_name
         "#{object_name}[#{association_primary_key || method}][]"
       end
 
+      protected
+
+      def make_selected_values
+        if object.respond_to?(method)
+          selected_items = [object.send(method)].compact.flatten
+
+          [*selected_items.map { |o| send_or_call_or_object(value_method, o) }].compact
+        else
+          []
+        end
+      end
     end
   end
 end

From 4c5bf686b7fc5bbbc2e03c61cace101e713a51e0 Mon Sep 17 00:00:00 2001
From: Andrew Haines <andrew@haines.org.nz>
Date: Mon, 24 Oct 2011 11:42:32 +0100
Subject: [PATCH 966/992] Fixed invalid html output for nested inputs with
 multiple siblings

---
 lib/formtastic/helpers/inputs_helper.rb |  2 +-
 spec/helpers/inputs_helper_spec.rb      | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/helpers/inputs_helper.rb b/lib/formtastic/helpers/inputs_helper.rb
index 34327b022..17ba7ca7a 100644
--- a/lib/formtastic/helpers/inputs_helper.rb
+++ b/lib/formtastic/helpers/inputs_helper.rb
@@ -300,7 +300,7 @@ def inputs(*args, &block)
         end
         
         out = template.content_tag(:li, out, :class => "input") if wrap_it
-        @already_in_an_inputs_block = false
+        @already_in_an_inputs_block = wrap_it
         out
       end
 
diff --git a/spec/helpers/inputs_helper_spec.rb b/spec/helpers/inputs_helper_spec.rb
index f445ec967..0a1bb1e84 100644
--- a/spec/helpers/inputs_helper_spec.rb
+++ b/spec/helpers/inputs_helper_spec.rb
@@ -556,6 +556,20 @@
         output_buffer.should have_tag('form > fieldset.inputs > ol > li > fieldset.inputs > ol > li > fieldset.inputs > ol')
       end
     end
+
+    context "when several are nested" do
+      it "should wrap each of the nested inputs in an li block to maintain HTML validity" do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.inputs do
+            concat(builder.inputs do
+            end)
+            concat(builder.inputs do
+            end)
+          end)
+        end)
+        output_buffer.should have_tag('form > fieldset.inputs > ol > li > fieldset.inputs > ol', count: 2)
+      end
+    end
     
   end
 

From ca5ffdf070a548c833411a55e0929a8934655e56 Mon Sep 17 00:00:00 2001
From: Andrew Haines <andrew@haines.org.nz>
Date: Mon, 24 Oct 2011 13:04:29 +0100
Subject: [PATCH 967/992] 1.8 hash syntax

---
 spec/helpers/inputs_helper_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/helpers/inputs_helper_spec.rb b/spec/helpers/inputs_helper_spec.rb
index 0a1bb1e84..aea0ec15f 100644
--- a/spec/helpers/inputs_helper_spec.rb
+++ b/spec/helpers/inputs_helper_spec.rb
@@ -567,7 +567,7 @@
             end)
           end)
         end)
-        output_buffer.should have_tag('form > fieldset.inputs > ol > li > fieldset.inputs > ol', count: 2)
+        output_buffer.should have_tag('form > fieldset.inputs > ol > li > fieldset.inputs > ol', :count => 2)
       end
     end
     

From 2d99ed278ac3d2885bda89cf9509af58739b2629 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 25 Oct 2011 07:43:59 +1100
Subject: [PATCH 968/992] thin out README documentation from pull #716

---
 README.textile | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/README.textile b/README.textile
index 0208299eb..6e162fe16 100644
--- a/README.textile
+++ b/README.textile
@@ -509,13 +509,6 @@ For more flexible forms; Formtastic finds translations using a bottom-up approac
 
 Values for @labels@/@hints@/@actions@ are can take values: @String@ (explicit value), @Symbol@ (i18n-lookup-key relative to the current "type", e.g. actions:), @true@ (force I18n lookup), @false@ (force no I18n lookup). Titles (legends) can only take: @String@ and @Symbol@ - true/false have no meaning.
 
-h3. Customized Localization
-
-If you want to customize your localization even further, create your own localizer class with a @localize@ method (see @Formtastic::Localizer@ for an example), and in @config/initializers/formtastic.rb@, add a line like this:
-
-<pre>
-    configure :i18n_localizer, MyApp::MyLocalizerClass
-</pre>
 
 h2. Semantic errors
 

From b42542c136f37e3accd69110c23dc710a16e7930 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 25 Oct 2011 07:44:55 +1100
Subject: [PATCH 969/992] tweak localizer documentation and shift up to class
 level for Yard (ref pull #716)

---
 lib/formtastic/localizer.rb | 45 ++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/lib/formtastic/localizer.rb b/lib/formtastic/localizer.rb
index fa4cb34c4..b5c39a33c 100644
--- a/lib/formtastic/localizer.rb
+++ b/lib/formtastic/localizer.rb
@@ -1,4 +1,28 @@
 module Formtastic
+  # Implementation for looking up localized values within Formtastic using I18n, if no 
+  # explicit value (like the `:label` option) is set and I18n-lookups are enabled in the
+  # configuration.
+  #
+  # You can subclass this to implement your own Localizer, and configure Formtastic to use this
+  # localizer with:
+  #
+  #   Formtastic::FormBuilder.i18n_localizer
+  #
+  # Enabled/disable i18n lookups completely with:
+  #
+  #   Formtastic::FormBuilder.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'
   class Localizer
 
     attr_accessor :builder
@@ -7,27 +31,6 @@ def initialize(current_builder)
       self.builder = current_builder 
     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::FormBuilder.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 localize(key, value, type, options = {}) #:nodoc:
       key = value if value.is_a?(::Symbol)
 

From 373fbd4764e3488607c8dcdc5805f983e35d7254 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Tue, 25 Oct 2011 07:45:33 +1100
Subject: [PATCH 970/992] thin out config template documentation for localizer
 from pull #716

---
 lib/generators/templates/formtastic.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/generators/templates/formtastic.rb b/lib/generators/templates/formtastic.rb
index 1ff950245..ce3f0378c 100644
--- a/lib/generators/templates/formtastic.rb
+++ b/lib/generators/templates/formtastic.rb
@@ -69,10 +69,8 @@
 # Formtastic::FormBuilder.i18n_lookups_by_default = false
 
 # Specifies the class to use for localization lookups. You can create your own
-# class and use it instead. It must have a `localize` method - see
-# `Formtastic::Localizer` for details. (You may want to inherit from that
-# class to call `super`.)
-# Formtastic::FormBuilder.i18n_localizer = Formtastic::Localizer
+# class and use it instead by subclassing Formtastic::Localizer (which is the default).
+# Formtastic::FormBuilder.i18n_localizer = MyOwnLocalizer
 
 # You can add custom inputs or override parts of Formtastic by subclassing Formtastic::FormBuilder and
 # specifying that class here.  Defaults to Formtastic::FormBuilder.

From 186d548990afc296c3012c15cfe9ce09ec7dc7a8 Mon Sep 17 00:00:00 2001
From: Tom Miller <tom.miller@luckie.com>
Date: Mon, 24 Oct 2011 17:13:04 -0500
Subject: [PATCH 971/992] Update commit_button documentation

---
 lib/formtastic/helpers/buttons_helper.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/formtastic/helpers/buttons_helper.rb b/lib/formtastic/helpers/buttons_helper.rb
index f61bf55f0..89d017bc1 100644
--- a/lib/formtastic/helpers/buttons_helper.rb
+++ b/lib/formtastic/helpers/buttons_helper.rb
@@ -22,7 +22,7 @@ module Helpers
     #       ...
     #       <fieldset class="buttons">
     #         <ol>
-    #           <li class="commit">
+    #           <li class="commit button">
     #             <input type="submit" name="commit" value="Create Post" class="create">
     #           </li>
     #         </ol>
@@ -76,9 +76,9 @@ module ButtonsHelper
       #
       #     # Output:
       #     <form ...>
-      #       <fieldset class="inputs">
+      #       <fieldset class="buttons">
       #         <ol>
-      #           <li class="commit">
+      #           <li class="commit button">
       #             <input type="submit" ...>
       #           </li>
       #         </ol>
@@ -203,7 +203,11 @@ def buttons(*args, &block)
       #   <form ...>
       #     ...
       #     <fieldset class="buttons">
-      #       <input name="commit" type="submit" value="Create Post" class="create">
+      #       <ol>
+      #         <li class="commit button">
+      #           <input name="commit" type="submit" value="Create Post" class="create">
+      #         </li>
+      #       </ol>
       #     </fieldset>
       #   </form>
       #

From 56c8dd1aeccad6b97b328d977b911924d5da5297 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 26 Oct 2011 07:13:40 +1100
Subject: [PATCH 972/992] remove deprecated SemanticFormBuilder

---
 lib/formtastic.rb                       |  1 -
 lib/formtastic/semantic_form_builder.rb | 11 -----------
 2 files changed, 12 deletions(-)
 delete mode 100644 lib/formtastic/semantic_form_builder.rb

diff --git a/lib/formtastic.rb b/lib/formtastic.rb
index 69b42fc46..b116dcb96 100644
--- a/lib/formtastic.rb
+++ b/lib/formtastic.rb
@@ -6,7 +6,6 @@ module Formtastic
   extend ActiveSupport::Autoload
 
   autoload :FormBuilder
-  autoload :SemanticFormBuilder
   autoload :Helpers
   autoload :HtmlAttributes
   autoload :I18n
diff --git a/lib/formtastic/semantic_form_builder.rb b/lib/formtastic/semantic_form_builder.rb
deleted file mode 100644
index f91e5b27d..000000000
--- a/lib/formtastic/semantic_form_builder.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Formtastic
-  # Quick hack/shim so that any code expecting the old SemanticFormBuilder class still works.
-  # TODO remove from 2.0 with a helpful upgrade path/warning.
-  # @private
-  class SemanticFormBuilder < Formtastic::FormBuilder
-    def initialize(*args)
-      ActiveSupport::Deprecation.warn('Formtastic::SemanticFormBuilder has been deprecated in favor of Formtastic::FormBuilder.', caller)
-      super
-    end
-  end
-end
\ No newline at end of file

From 749d7de1b83435178daea2f1151bd534569d03dd Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 26 Oct 2011 07:15:26 +1100
Subject: [PATCH 973/992] remove deprecated SemanticFormHelper

---
 lib/formtastic/helpers.rb                      |  1 -
 lib/formtastic/helpers/semantic_form_helper.rb | 11 -----------
 2 files changed, 12 deletions(-)
 delete mode 100644 lib/formtastic/helpers/semantic_form_helper.rb

diff --git a/lib/formtastic/helpers.rb b/lib/formtastic/helpers.rb
index e790f266e..71eca2b1a 100644
--- a/lib/formtastic/helpers.rb
+++ b/lib/formtastic/helpers.rb
@@ -9,7 +9,6 @@ module Helpers
     autoload :InputHelper, 'formtastic/helpers/input_helper'
     autoload :InputsHelper, 'formtastic/helpers/inputs_helper'
     autoload :LabelHelper, 'formtastic/helpers/label_helper'
-    autoload :SemanticFormHelper, 'formtastic/helpers/semantic_form_helper'
     autoload :Reflection, 'formtastic/helpers/reflection'
   end
 end
diff --git a/lib/formtastic/helpers/semantic_form_helper.rb b/lib/formtastic/helpers/semantic_form_helper.rb
deleted file mode 100644
index a0fb71984..000000000
--- a/lib/formtastic/helpers/semantic_form_helper.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Formtastic
-  # Quick hack/shim for anything expecting the old SemanticFormHelper module.
-  # TODO remove from 2.0 with a helpful upgrade path/warning.
-  # @private
-  module SemanticFormHelper
-    include Formtastic::Helpers::FormHelper
-    @@builder = Formtastic::Helpers::FormHelper.builder
-    @@default_form_class = Formtastic::Helpers::FormHelper.default_form_class
-    mattr_accessor :builder, :default_form_class
-  end
-end
\ No newline at end of file

From 72a8c88b739c3e89577158a30dec6f844133f4f2 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 26 Oct 2011 07:17:27 +1100
Subject: [PATCH 974/992] remove deprecated inline_errors_for and related
 methods

---
 lib/formtastic/helpers/errors_helper.rb |  54 -------
 spec/builder/errors_spec.rb             | 203 ------------------------
 2 files changed, 257 deletions(-)
 delete mode 100644 spec/builder/errors_spec.rb

diff --git a/lib/formtastic/helpers/errors_helper.rb b/lib/formtastic/helpers/errors_helper.rb
index 31729656b..c08f06012 100644
--- a/lib/formtastic/helpers/errors_helper.rb
+++ b/lib/formtastic/helpers/errors_helper.rb
@@ -56,62 +56,8 @@ def semantic_errors(*args)
         end
       end
       
-      # Generates error messages for the given method, used for displaying errors right near the
-      # field for data entry. Uses the `:inline_errors` config to determin the right presentation,
-      # which may be an ordered list, a paragraph sentence containing all errors, or a paragraph
-      # containing just the first error. If configred to `:none`, no error is shown.
-      #
-      # See the `:inline_errors` config documentation for more details.
-      #
-      # This method is mostly used internally, but can be used in your forms when creating your own
-      # custom inputs, so it's been made public and aliased to `errors_on`.
-      #
-      # @example
-      #   <%= semantic_form_for @post do |f| %>
-      #     <li class='my-custom-text-input'>
-      #       <%= f.label(:body) %>
-      #       <%= f.text_field(:body) %>
-      #       <%= f.errors_on(:body) %>
-      #     </li>
-      #   <% end %>
-      #
-      # @deprecated See the README for the currently supported approach to custom inputs.
-      def inline_errors_for(method, options = {})
-        ActiveSupport::Deprecation.warn('inline_errors_for and errors_on are deprecated and will be removed on or after version 2.1', caller)
-        if render_inline_errors?
-          errors = error_keys(method, options).map{|x| @object.errors[x] }.flatten.compact.uniq
-          send(:"error_#{inline_errors}", [*errors], options) if errors.any?
-        else
-          nil
-        end
-      end
-      alias :errors_on :inline_errors_for
-      
-
       protected
       
-      # @deprecated This should be removed with inline_errors_for in 2.1
-      def error_sentence(errors, options = {})
-        error_class = options[:error_class] || default_inline_error_class
-        template.content_tag(:p, Formtastic::Util.html_safe(errors.to_sentence.untaint), :class => error_class)
-      end
-      
-      # @deprecated This should be removed with inline_errors_for in 2.1
-      def error_list(errors, options = {})
-        error_class = options[:error_class] || default_error_list_class
-        list_elements = []
-        errors.each do |error|
-          list_elements <<  template.content_tag(:li, Formtastic::Util.html_safe(error.untaint))
-        end
-        template.content_tag(:ul, Formtastic::Util.html_safe(list_elements.join("\n")), :class => error_class)
-      end
-      
-      # @deprecated This should be removed with inline_errors_for in 2.1
-      def error_first(errors, options = {})
-        error_class = options[:error_class] || default_inline_error_class
-        template.content_tag(:p, Formtastic::Util.html_safe(errors.first.untaint), :class => error_class)
-      end
-
       def error_keys(method, options)
         @methods_for_error ||= {}
         @methods_for_error[method] ||= begin
diff --git a/spec/builder/errors_spec.rb b/spec/builder/errors_spec.rb
deleted file mode 100644
index 300492f53..000000000
--- a/spec/builder/errors_spec.rb
+++ /dev/null
@@ -1,203 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-
-describe 'Formtastic::FormBuilder#errors_on' do
-
-  include FormtasticSpecHelper
-
-  before do
-    @output_buffer = ''
-    mock_everything
-    @title_errors = ['must not be blank', 'must be longer than 10 characters', 'must be awesome']
-    @errors = mock('errors')
-    @new_post.stub!(:errors).and_return(@errors)
-  end
-
-  describe 'when there are errors' do
-    before do
-      @errors.stub!(:[]).with(:title).and_return(@title_errors)
-    end
-
-    after do
-      Formtastic::FormBuilder.default_inline_error_class = 'inline-errors'
-      Formtastic::FormBuilder.default_error_list_class = 'errors'
-    end
-
-    it 'should render a paragraph with the errors joined into a sentence when inline_errors config is :sentence' do
-      Formtastic::FormBuilder.inline_errors = :sentence
-      concat(semantic_form_for(@new_post) do |builder|
-        builder.input :title
-      end)
-      output_buffer.should have_tag('p.inline-errors', @title_errors.to_sentence)
-    end
-
-    it 'should render a paragraph with a overridden default class' do
-      Formtastic::FormBuilder.inline_errors = :sentence
-      Formtastic::FormBuilder.default_inline_error_class = 'better-errors'
-      concat(semantic_form_for(@new_post) do |builder|
-        builder.input(:title)
-      end)
-      output_buffer.should have_tag('p.better-errors', @title_errors.to_sentence)
-    end
-
-    it 'should render a paragraph with the errors joined into a sentence when inline_errors config is :sentence with a customized error class' do
-      Formtastic::FormBuilder.inline_errors = :sentence
-      concat(semantic_form_for(@new_post) do |builder|
-        builder.input(:title, :error_class => 'better-errors')
-      end)
-      output_buffer.should have_tag('p.better-errors', @title_errors.to_sentence)
-    end
-
-    it 'should render an unordered list with the class errors when inline_errors config is :list' do
-      Formtastic::FormBuilder.inline_errors = :list
-      concat(semantic_form_for(@new_post) do |builder|
-        builder.input(:title)
-      end)
-      output_buffer.should have_tag('ul.errors')
-      @title_errors.each do |error|
-        output_buffer.should have_tag('ul.errors li', error)
-      end
-    end
-
-    it 'should render an unordered list with the class overridden default class' do
-      Formtastic::FormBuilder.inline_errors = :list
-      Formtastic::FormBuilder.default_error_list_class = "better-errors"
-      concat(semantic_form_for(@new_post) do |builder|
-        builder.input :title
-      end)
-      output_buffer.should have_tag('ul.better-errors')
-      @title_errors.each do |error|
-        output_buffer.should have_tag('ul.better-errors li', error)
-      end
-    end
-
-    it 'should render an unordered list with the class errors when inline_errors config is :list with a customized error class' do
-      Formtastic::FormBuilder.inline_errors = :list
-      concat(semantic_form_for(@new_post) do |builder|
-        builder.input :title, :error_class => "better-errors"
-      end)
-      output_buffer.should have_tag('ul.better-errors')
-      @title_errors.each do |error|
-        output_buffer.should have_tag('ul.better-errors li', error)
-      end
-    end
-
-    it 'should render a paragraph with the first error when inline_errors config is :first' do
-      Formtastic::FormBuilder.inline_errors = :first
-      concat(semantic_form_for(@new_post) do |builder|
-        builder.input :title
-      end)
-      output_buffer.should have_tag('p.inline-errors', @title_errors.first)
-      
-    end
-
-    it 'should render a paragraph with the first error when inline_errors config is :first with a customized error class' do
-      Formtastic::FormBuilder.inline_errors = :first
-      concat(semantic_form_for(@new_post) do |builder|
-        builder.input :title, :error_class => "better-errors"
-      end)
-      output_buffer.should have_tag('p.better-errors', @title_errors.first)
-    end
-
-    it 'should return nil when inline_errors config is :none' do
-      Formtastic::FormBuilder.inline_errors = :none
-      concat(semantic_form_for(@new_post) do |builder|
-        builder.input :title
-      end)
-      output_buffer.should_not have_tag('p.inine-errors')
-      output_buffer.should_not have_tag('ul.errors')
-    end
-    
-    it 'should allow calling deprecated errors_on and inline_errors_for helpers' do
-      Formtastic::FormBuilder.inline_errors = :sentence
-      with_deprecation_silenced do
-        concat(semantic_form_for(@new_post) do |builder|
-          builder.errors_on :title
-          builder.inline_errors_for :title
-        end)
-      end
-    end
-
-  end
-
-  describe 'when there are no errors (nil)' do
-    before do
-      @errors.stub!(:[]).with(:title).and_return(nil)
-    end
-
-    it 'should return nil when inline_errors config is :sentence, :list or :none' do
-      with_deprecation_silenced do
-        [:sentence, :list, :none].each do |config|
-          with_config :inline_errors, config do
-            semantic_form_for(@new_post) do |builder|
-              builder.errors_on(:title).should be_nil
-            end
-          end
-        end
-      end
-    end
-  end
-
-  describe 'when there are no errors (empty array)' do
-    before do
-      @errors.stub!(:[]).with(:title).and_return([])
-    end
-
-    it 'should return nil when inline_errors config is :sentence, :list or :none' do
-      with_deprecation_silenced do
-        [:sentence, :list, :none].each do |config|
-          Formtastic::FormBuilder.inline_errors = config
-          semantic_form_for(@new_post) do |builder|
-            builder.errors_on(:title).should be_nil
-          end
-        end
-      end
-    end
-  end
-
-  describe 'when file type columns have errors' do
-    it "should list errors added on metadata fields" do
-      @errors.stub!(:[]).with(:document_file_name).and_return(['must be provided'])
-      @errors.stub!(:[]).with(:document_file_size).and_return(['must be less than 4mb'])
-      @errors.stub!(:[]).with(:document_content_type).and_return(['must be an image'])
-      @errors.stub!(:[]).with(:document).and_return(nil)
-
-      with_config :inline_errors, :sentence do
-        concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:document))
-        end)
-      end 
-      output_buffer.should have_tag("li.error")
-      output_buffer.should have_tag('p.inline-errors', (['must be an image','must be provided', 'must be less than 4mb']).to_sentence)
-    end
-  end
-
-  describe 'when there are errors on the association and column' do
-
-    it "should list all unique errors" do
-      ::Post.stub!(:reflections).and_return({:author => mock('reflection', :options => {}, :macro => :belongs_to)})
-
-      @errors.stub!(:[]).with(:author).and_return(['must not be blank'])
-      @errors.stub!(:[]).with(:author_id).and_return(['is already taken', 'must not be blank']) # note the duplicate of association
-
-      with_config :inline_errors, :list do
-        concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:author))
-        end)
-      end
-      output_buffer.should have_tag("ul.errors li", /must not be blank/, :count => 1)
-      output_buffer.should have_tag("ul.errors li", /is already taken/, :count => 1)
-    end
-
-  end
-
-  describe "when there are errors on a has_many association" do
-    it "should include the association ids error messages" do
-      semantic_form_for(@new_post) do |builder|
-        builder.send(:error_keys, :sub_posts, {}).should include(:sub_post_ids)
-      end
-    end
-  end
-
-end
-

From 8228f1f052d5ca51ce45b2baca48be3a585f0715 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 26 Oct 2011 07:21:01 +1100
Subject: [PATCH 975/992] remove deprecated :as => :numeric (use number
 instead)

---
 lib/formtastic/inputs/numeric_input.rb | 21 -------------
 spec/inputs/numeric_input_spec.rb      | 41 --------------------------
 2 files changed, 62 deletions(-)
 delete mode 100644 lib/formtastic/inputs/numeric_input.rb
 delete mode 100644 spec/inputs/numeric_input_spec.rb

diff --git a/lib/formtastic/inputs/numeric_input.rb b/lib/formtastic/inputs/numeric_input.rb
deleted file mode 100644
index 3febe633c..000000000
--- a/lib/formtastic/inputs/numeric_input.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module Formtastic
-  module Inputs
-    # Alias for NumberInput for backwards compatibility with 1.x.
-    # 
-    # @example:
-    #   f.input :age, :as => :numeric
-    #
-    # @deprecated Use :as => :number instead
-    #
-    # @todo Remove on or after 2.1
-    class NumericInput < NumberInput
-      
-      def initialize(builder, template, object, object_name, method, options)
-        ActiveSupport::Deprecation.warn(':as => :numeric has been deprecated in favor of :as => :number and will be removed on or after version 2.1', caller)
-        super
-      end
-      
-    end
-  end
-end
-
diff --git a/spec/inputs/numeric_input_spec.rb b/spec/inputs/numeric_input_spec.rb
deleted file mode 100644
index c6e9f1b95..000000000
--- a/spec/inputs/numeric_input_spec.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-
-describe 'numeric input' do
-
-  include FormtasticSpecHelper
-
-  before do
-    @output_buffer = ''
-    mock_everything
-  end
-
-  it "should call NumberInput.new" do
-    input = mock('input', :to_html => "HTML codez")
-    ::Formtastic::Inputs::NumericInput.should_receive(:new).and_return(input)
-    concat(semantic_form_for(@new_post) do |builder|
-      concat(builder.input(:title, :as => :numeric))
-    end)
-  end
-  
-  it "should have an li.numeric" do
-    with_deprecation_silenced do
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:title, :as => :numeric))
-      end)
-    end
-    output_buffer.should have_tag('li.numeric')
-    output_buffer.should have_tag('li.input')
-  end
-  
-  it "should warn that :numeric is deprecated in favor of :number" do
-    ::ActiveSupport::Deprecation.should_receive(:warn)
-    with_deprecation_silenced do
-      concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.input(:title, :as => :numeric))
-      end)
-    end
-  end
-
-end
-

From b926118bd648bdc832fbf434d73cb72148e6f110 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 26 Oct 2011 07:48:32 +1100
Subject: [PATCH 976/992] Removed deprecated :label_method, :value_method &
 :group_label_method options.

---
 lib/formtastic/helpers/input_helper.rb |  11 +-
 lib/formtastic/inputs/base.rb          |  12 ++-
 lib/formtastic/inputs/base/options.rb  |   2 +-
 spec/support/custom_macros.rb          | 134 -------------------------
 4 files changed, 11 insertions(+), 148 deletions(-)

diff --git a/lib/formtastic/helpers/input_helper.rb b/lib/formtastic/helpers/input_helper.rb
index d56477f0a..eacd382b5 100644
--- a/lib/formtastic/helpers/input_helper.rb
+++ b/lib/formtastic/helpers/input_helper.rb
@@ -140,15 +140,9 @@ module InputHelper
       # @option options :member_label [Symbol, Proc, Method]
       #   Override the method called on each object in the `:collection` for use as the `<label>` content (`:check_boxes` & `:radio` inputs) or `<option>` content (`:select` inputs)
       #
-      # @option options :label_method [Symbol, Proc, Method]
-      #   Deprecated, renamed to :member_label
-      #
       # @option options :member_value [Symbol, Proc, Method]
       #   Override the method called on each object in the `:collection` for use as the `value` attribute in the `<input>` (`:check_boxes` & `:radio` inputs) or `<option>` (`:select` inputs)
       #
-      # @option options :value_method [Symbol, Proc, Method]
-      #   Deprecated, renamed to :member_value
-      #
       # @option options :hint_class [String]
       #   Override the `class` attribute applied to the `<p>` tag used when a `:hint` is rendered for an input
       #
@@ -164,9 +158,6 @@ module InputHelper
       # @option options :find_options [Symbol]
       #   TODO will probably be deprecated
       #
-      # @option options :group_label_method [Symbol]
-      #   Deprecated, use `:group_label`
-      #
       # @option options :group_label [Symbol]
       #   TODO will probably be deprecated
       #
@@ -177,7 +168,7 @@ module InputHelper
       #   Specify the text in the first ('blank') `:select` input `<option>` to prompt a user to make a selection (implicitly sets `:include_blank` to `true`)
       #
       # @todo Can we kill `:hint_class` & `:error_class`? What's the use case for input-by-input? Shift to config or burn!
-      # @todo Can we kill `:group_by` & `:group_label`/`:group_label_method`? Should be done with :collection => grouped_options_for_select(...)
+      # @todo Can we kill `:group_by` & `:group_label`? Should be done with :collection => grouped_options_for_select(...)
       # @todo Can we kill `:find_options`? Should be done with MyModel.some_scope.where(...).order(...).whatever_scope
       # @todo Can we kill `:label`, `:hint` & `:prompt`? All strings could be shifted to i18n!
       #
diff --git a/lib/formtastic/inputs/base.rb b/lib/formtastic/inputs/base.rb
index b848aac23..71fd1dd85 100644
--- a/lib/formtastic/inputs/base.rb
+++ b/lib/formtastic/inputs/base.rb
@@ -12,11 +12,12 @@ def initialize(builder, template, object, object_name, method, options)
         @method = method
         @options = options.dup
         
-        warn_and_correct_option!(:label_method, :member_label)
-        warn_and_correct_option!(:value_method, :member_value)
-        warn_and_correct_option!(:group_label_method, :group_label)
+        removed_option!(:label_method)
+        removed_option!(:value_method)
+        removed_option!(:group_label_method)
       end
       
+      # Usefull for deprecating options.
       def warn_and_correct_option!(old_option_name, new_option_name)
         if options.key?(old_option_name)
           ::ActiveSupport::Deprecation.warn("The :#{old_option_name} option is deprecated in favour of :#{new_option_name} and will be removed from Formtastic after 2.0")
@@ -24,6 +25,11 @@ def warn_and_correct_option!(old_option_name, new_option_name)
         end
       end
       
+      # Usefull for raising an error on previously supported option.
+      def removed_option!(old_option_name)
+        raise ArgumentError, ":#{old_option_name} is no longer available" if options.key?(old_option_name)
+      end
+      
       extend ActiveSupport::Autoload
       
       autoload :Associations
diff --git a/lib/formtastic/inputs/base/options.rb b/lib/formtastic/inputs/base/options.rb
index d242d3c8a..ff1bcf0ad 100644
--- a/lib/formtastic/inputs/base/options.rb
+++ b/lib/formtastic/inputs/base/options.rb
@@ -8,7 +8,7 @@ def input_options
         end
         
         def formtastic_options
-          [:priority_countries, :priority_zones, :value_method, :label_method, :member_label, :member_value, :collection, :required, :label, :as, :hint, :input_html, :label_html, :value_as_class, :find_options, :class]
+          [:priority_countries, :priority_zones, :member_label, :member_value, :collection, :required, :label, :as, :hint, :input_html, :label_html, :value_as_class, :find_options, :class]
         end
       
       end
diff --git a/spec/support/custom_macros.rb b/spec/support/custom_macros.rb
index 341ab028e..137b720a9 100644
--- a/spec/support/custom_macros.rb
+++ b/spec/support/custom_macros.rb
@@ -521,140 +521,6 @@ def reverse_login(a)
           end
         end
 
-        describe 'when the deprecated :label_method option is provided' do
-          
-          describe 'as a symbol' do
-            before do
-              with_deprecation_silenced do
-                concat(semantic_form_for(@new_post) do |builder|
-                  concat(builder.input(:author, :as => as, :label_method => :login))
-                end)
-              end
-            end
-
-            it 'should have options with text content from the specified method' do
-              ::Author.all.each do |author|
-                output_buffer.should have_tag("form li.#{as}", /#{author.login}/)
-              end
-            end
-          end
-
-          describe 'as a proc' do
-            
-            before do
-              with_deprecation_silenced do
-                concat(semantic_form_for(@new_post) do |builder|
-                  concat(builder.input(:author, :as => as, :label_method => Proc.new {|a| a.login.reverse }))
-                end)
-              end
-            end
-
-            it 'should have options with the proc applied to each' do
-              ::Author.all.each do |author|
-                output_buffer.should have_tag("form li.#{as}", /#{author.login.reverse}/)
-              end
-            end
-          end
-
-          describe 'as a method object' do
-            before do
-              def reverse_login(a)
-                a.login.reverse
-              end
-              with_deprecation_silenced do 
-                concat(semantic_form_for(@new_post) do |builder|
-                  concat(builder.input(:author, :as => as, :label_method => method(:reverse_login)))
-                end)
-              end
-            end
-
-            it 'should have options with the proc applied to each' do
-              ::Author.all.each do |author|
-                output_buffer.should have_tag("form li.#{as}", /#{author.login.reverse}/)
-              end
-            end
-          end
-        end
-
-        describe 'when the deprecated :label_method option is not provided' do
-          Formtastic::FormBuilder.collection_label_methods.each do |label_method|
-
-            describe "when the collection objects respond to #{label_method}" do
-              before do
-                @fred.stub!(:respond_to?).and_return { |m| m.to_s == label_method || m.to_s == 'id' }
-                ::Author.all.each { |a| a.stub!(label_method).and_return('The Label Text') }
-
-                with_deprecation_silenced do 
-                  concat(semantic_form_for(@new_post) do |builder|
-                    concat(builder.input(:author, :as => as))
-                  end)
-                end
-              end
-
-              it "should render the options with #{label_method} as the label" do
-                ::Author.all.each do |author|
-                  output_buffer.should have_tag("form li.#{as}", /The Label Text/)
-                end
-              end
-            end
-
-          end
-        end
-
-        describe 'when the deprecated :value_method option is provided' do
-
-          describe 'as a symbol' do
-            before do
-              with_deprecation_silenced do 
-                concat(semantic_form_for(@new_post) do |builder|
-                  concat(builder.input(:author, :as => as, :value_method => :login))
-                end)
-              end
-            end
-
-            it 'should have options with values from specified method' do
-              ::Author.all.each do |author|
-                output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login}']")
-              end
-            end
-          end
-
-          describe 'as a proc' do
-            before do
-              with_deprecation_silenced do 
-                concat(semantic_form_for(@new_post) do |builder|
-                  concat(builder.input(:author, :as => as, :value_method => Proc.new {|a| a.login.reverse }))
-                end)
-              end
-            end
-
-            it 'should have options with the proc applied to each value' do
-              ::Author.all.each do |author|
-                output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login.reverse}']")
-              end
-            end
-          end
-
-          describe 'as a method object' do
-            before do
-              def reverse_login(a)
-                a.login.reverse
-              end
-              with_deprecation_silenced do 
-                concat(semantic_form_for(@new_post) do |builder|
-                  concat(builder.input(:author, :as => as, :value_method => method(:reverse_login)))
-                end)
-              end
-            end
-
-            it 'should have options with the proc applied to each value' do
-              ::Author.all.each do |author|
-                output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login.reverse}']")
-              end
-            end
-          end
-        end
-
       end
     end
 

From ba46d2a7ff40b426d2d5965ab5ae47125158ca52 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 26 Oct 2011 17:59:32 +1100
Subject: [PATCH 977/992] whitespace

---
 spec/inputs/boolean_input_spec.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index 340fef1c9..43ebe8bdb 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -21,8 +21,6 @@
 
   it 'should generate a label containing the input' do
     output_buffer.should_not have_tag('label.label')
-    
-    
     output_buffer.should have_tag('form li label', :count => 1)
     output_buffer.should have_tag('form li label[@for="post_allow_comments"]')
     output_buffer.should have_tag('form li label', /Allow comments/)

From e05bbb6c7f6a303cdc3fb673b5ead5f3273b83b4 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Wed, 26 Oct 2011 18:18:51 +1100
Subject: [PATCH 978/992] fix boolean input to respect :index from fields_for
 in input[name] attribute, ref #711

---
 lib/formtastic/inputs/boolean_input.rb | 10 ++++++++-
 spec/inputs/boolean_input_spec.rb      | 31 ++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/boolean_input.rb b/lib/formtastic/inputs/boolean_input.rb
index 980f9db8d..9d8233fef 100644
--- a/lib/formtastic/inputs/boolean_input.rb
+++ b/lib/formtastic/inputs/boolean_input.rb
@@ -84,7 +84,15 @@ def responds_to_global_required?
       end
 
       def input_html_options
-        {:name => "#{object_name}[#{method}]"}.merge(super)
+        {:name => input_html_options_name}.merge(super)
+      end
+      
+      def input_html_options_name
+        if builder.options.key?(:index)
+          "#{object_name}[#{builder.options[:index]}][#{method}]"
+        else
+          "#{object_name}[#{method}]"
+        end
       end
 
       def checked?
diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index 43ebe8bdb..a343b4bcb 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -184,5 +184,36 @@
     it_should_have_an_inline_label_for("context2_post_allow_comments")
 
   end
+  
+  describe "when index is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for :author, :index => 3 do |author|
+          concat(author.input(:name, :as => :boolean))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#post_author_attributes_3_name_input")
+    end
+    
+    it 'should index the id of the input tag' do
+      output_buffer.should have_tag("input#post_author_attributes_3_name")
+    end
+    
+    it 'should index the name of the hidden input' do
+      output_buffer.should have_tag("input[@type='hidden'][@name='post[author_attributes][3][name]']")
+    end
+
+    it 'should index the name of the checkbox input' do
+      output_buffer.should have_tag("input[@type='checkbox'][@name='post[author_attributes][3][name]']")
+    end
+    
+  end
 
 end

From 1d63ebe9d0b41469c63f2a42bc9cf58fc9018f44 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 27 Oct 2011 07:25:17 +1100
Subject: [PATCH 979/992] fix select input to respect :index from fields_for in
 select[name] attribute, ref #711

---
 lib/formtastic/inputs/select_input.rb | 14 +++++++++++++-
 spec/inputs/select_input_spec.rb      | 27 +++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index b8da74be1..f8f9fe5a3 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -186,9 +186,21 @@ def input_html_options
       def extra_input_html_options
         {
           :multiple => multiple?,
-          :name => "#{object_name}[#{association_primary_key}]#{'[]' if multiple?}"
+          :name => multiple? ? input_html_options_name_multiple : input_html_options_name
         }
       end
+      
+      def input_html_options_name
+        if builder.options.key?(:index)
+          "#{object_name}[#{builder.options[:index]}][#{association_primary_key}]"
+        else
+          "#{object_name}[#{association_primary_key}]"
+        end
+      end
+
+      def input_html_options_name_multiple
+        input_html_options_name + "[]"
+      end
 
       def multiple_by_association?
         reflection && [ :has_many, :has_and_belongs_to_many ].include?(reflection.macro)
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index 543699e50..e91b4e088 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -560,6 +560,33 @@
     it_should_have_select_with_id("context2_post_author_ids")
     it_should_have_label_for("context2_post_author_ids")
   end
+  
+  describe "when index is provided" do
+  
+    before do
+      @output_buffer = ''
+      mock_everything
+  
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for :author, :index => 3 do |author|
+          concat(author.input(:name, :as => :select))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#post_author_attributes_3_name_input")
+    end
+    
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("select#post_author_attributes_3_name")
+    end
+    
+    it 'should index the name of the select' do
+      output_buffer.should have_tag("select[@name='post[author_attributes][3][name]']")
+    end
+    
+  end
 
   context "when required" do
     it "should add the required attribute to the select's html options" do

From 56bf9174aca04ac87057821d71883ec985ac5468 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 27 Oct 2011 07:41:23 +1100
Subject: [PATCH 980/992] fix checkboxes input to respect :index from
 fields_for in input[name] and [id] attributes, ref #711

---
 lib/formtastic/inputs/base/choices.rb      |  1 +
 lib/formtastic/inputs/check_boxes_input.rb |  6 ++++-
 spec/inputs/check_boxes_input_spec.rb      | 28 ++++++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/base/choices.rb b/lib/formtastic/inputs/base/choices.rb
index 908ac7636..8845c9ff4 100644
--- a/lib/formtastic/inputs/base/choices.rb
+++ b/lib/formtastic/inputs/base/choices.rb
@@ -71,6 +71,7 @@ def choice_input_dom_id(choice)
           [
             builder.custom_namespace,
             sanitized_object_name,
+            builder.options[:index],
             association_primary_key || method,
             choice_html_safe_value(choice)
           ].compact.reject { |i| i.blank? }.join("_")
diff --git a/lib/formtastic/inputs/check_boxes_input.rb b/lib/formtastic/inputs/check_boxes_input.rb
index 7e28c9baa..1d005d41d 100644
--- a/lib/formtastic/inputs/check_boxes_input.rb
+++ b/lib/formtastic/inputs/check_boxes_input.rb
@@ -166,7 +166,11 @@ def unchecked_value
       end
 
       def input_name
-        "#{object_name}[#{association_primary_key || method}][]"
+        if builder.options.key?(:index)
+          "#{object_name}[#{builder.options[:index]}][#{association_primary_key || method}][]"
+        else
+          "#{object_name}[#{association_primary_key || method}][]"
+        end
       end
 
       protected
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 559ae4fbe..86aed8146 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -392,6 +392,34 @@
     it_should_have_input_with_id('context2_author_post_ids_19')
     it_should_have_input_wrapper_with_id("context2_author_posts_input")
   end
+  
+  describe "when index is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      concat(semantic_form_for(@fred) do |builder|
+        concat(builder.fields_for @fred.posts.first, :index => 3 do |author|
+          concat(author.input(:authors, :as => :check_boxes))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#author_post_3_authors_input")
+    end
+    
+    it 'should index the id of the input tag' do
+      output_buffer.should have_tag("input#author_post_3_author_ids_42")
+    end
+
+    it 'should index the name of the checkbox input' do
+      output_buffer.should have_tag("input[@type='checkbox'][@name='author[post][3][author_ids][]']")
+    end
+    
+  end
+  
 
   describe "when collection is an array" do
     before do

From ec288280c370d8c9f2bcbb30f000a54941e4a7ef Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 27 Oct 2011 08:58:16 +1100
Subject: [PATCH 981/992] fix date, datetime and time inputs to respect :index
 from fields_for, ref #711

---
 lib/formtastic/inputs/base/timeish.rb | 10 +++++++-
 lib/formtastic/inputs/time_input.rb   | 10 +++++++-
 spec/inputs/date_input_spec.rb        | 32 ++++++++++++++++++++++++
 spec/inputs/datetime_input_spec.rb    | 36 +++++++++++++++++++++++++++
 spec/inputs/time_input_spec.rb        | 35 ++++++++++++++++++++++++++
 5 files changed, 121 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic/inputs/base/timeish.rb b/lib/formtastic/inputs/base/timeish.rb
index 75051b9b3..064806075 100644
--- a/lib/formtastic/inputs/base/timeish.rb
+++ b/lib/formtastic/inputs/base/timeish.rb
@@ -156,10 +156,18 @@ def value
         end
         
         def fragment_input_html(fragment)
-          opts = input_options.merge(:prefix => object_name, :field_name => fragment_name(fragment), :default => value, :include_blank => include_blank?)
+          opts = input_options.merge(:prefix => fragment_prefix, :field_name => fragment_name(fragment), :default => value, :include_blank => include_blank?)
           template.send(:"select_#{fragment}", value, opts, input_html_options.merge(:id => fragment_id(fragment)))
         end
         
+        def fragment_prefix
+          if builder.options.key?(:index)
+            object_name + "[#{builder.options[:index]}]"
+          else
+            object_name
+          end
+        end
+        
         # TODO extract to BlankOptions or similar -- Select uses similar code
         def include_blank?
           options.key?(:include_blank) ? options[:include_blank] : builder.include_blank_for_select_by_default
diff --git a/lib/formtastic/inputs/time_input.rb b/lib/formtastic/inputs/time_input.rb
index c07f7fc3c..65e6165f9 100644
--- a/lib/formtastic/inputs/time_input.rb
+++ b/lib/formtastic/inputs/time_input.rb
@@ -26,13 +26,21 @@ def fragment_value(fragment)
       def hidden_fragments
         if !options[:ignore_date]
           date_fragments.map do |fragment|
-            template.hidden_field_tag("#{object_name}[#{fragment_name(fragment)}]", fragment_value(fragment), :id => fragment_id(fragment), :disabled => input_html_options[:disabled] )
+            template.hidden_field_tag(hidden_field_name(fragment), fragment_value(fragment), :id => fragment_id(fragment), :disabled => input_html_options[:disabled] )
           end.join.html_safe
         else
           super
         end
       end
       
+      def hidden_field_name(fragment)
+        if builder.options.key?(:index)
+          "#{object_name}[#{builder.options[:index]}][#{fragment_name(fragment)}]"
+        else
+          "#{object_name}[#{fragment_name(fragment)}]"
+        end
+      end
+      
     end
   end
 end
\ No newline at end of file
diff --git a/spec/inputs/date_input_spec.rb b/spec/inputs/date_input_spec.rb
index a06380814..1b42c1cf6 100644
--- a/spec/inputs/date_input_spec.rb
+++ b/spec/inputs/date_input_spec.rb
@@ -70,6 +70,38 @@
     it_should_have_select_with_id("context2_post_publish_at_3i")
 
   end
+  
+  describe "when index is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for :author, :index => 3 do |author|
+          concat(author.input(:created_at, :as => :date))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#post_author_attributes_3_created_at_input")
+    end
+    
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("select#post_author_attributes_3_created_at_1i")
+      output_buffer.should have_tag("select#post_author_attributes_3_created_at_2i")
+      output_buffer.should have_tag("select#post_author_attributes_3_created_at_3i")
+    end
+    
+    it 'should index the name of the select tag' do
+      output_buffer.should have_tag("select[@name='post[author_attributes][3][created_at(1i)]']")
+      output_buffer.should have_tag("select[@name='post[author_attributes][3][created_at(2i)]']")
+      output_buffer.should have_tag("select[@name='post[author_attributes][3][created_at(3i)]']")
+    end
+    
+  end
+  
 
   describe ':labels option' do
     fields = [:year, :month, :day]
diff --git a/spec/inputs/datetime_input_spec.rb b/spec/inputs/datetime_input_spec.rb
index 8481daa82..ab39e0d50 100644
--- a/spec/inputs/datetime_input_spec.rb
+++ b/spec/inputs/datetime_input_spec.rb
@@ -76,6 +76,42 @@
   
   end
   
+  describe "when index is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for :author, :index => 3 do |author|
+          concat(author.input(:created_at, :as => :datetime))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#post_author_attributes_3_created_at_input")
+    end
+    
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("select#post_author_attributes_3_created_at_1i")
+      output_buffer.should have_tag("select#post_author_attributes_3_created_at_2i")
+      output_buffer.should have_tag("select#post_author_attributes_3_created_at_3i")
+      output_buffer.should have_tag("select#post_author_attributes_3_created_at_4i")
+      output_buffer.should have_tag("select#post_author_attributes_3_created_at_5i")
+    end
+    
+    it 'should index the name of the select tag' do
+      output_buffer.should have_tag("select[@name='post[author_attributes][3][created_at(1i)]']")
+      output_buffer.should have_tag("select[@name='post[author_attributes][3][created_at(2i)]']")
+      output_buffer.should have_tag("select[@name='post[author_attributes][3][created_at(3i)]']")
+      output_buffer.should have_tag("select[@name='post[author_attributes][3][created_at(4i)]']")
+      output_buffer.should have_tag("select[@name='post[author_attributes][3][created_at(5i)]']")
+    end
+    
+  end
+  
+  
   describe ':labels option' do
     fields = [:year, :month, :day, :hour, :minute]
     fields.each do |field|
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index b8353e63c..70c41a4f5 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -198,4 +198,39 @@
     end
   end
   
+  describe "when index is provided" do
+
+    before do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for :author, :index => 3 do |author|
+          concat(author.input(:created_at, :as => :time))
+        end)
+      end)
+    end
+
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#post_author_attributes_3_created_at_input")
+    end
+
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("input#post_author_attributes_3_created_at_1i")
+      output_buffer.should have_tag("input#post_author_attributes_3_created_at_2i")
+      output_buffer.should have_tag("input#post_author_attributes_3_created_at_3i")
+      output_buffer.should have_tag("select#post_author_attributes_3_created_at_4i")
+      output_buffer.should have_tag("select#post_author_attributes_3_created_at_5i")
+    end
+
+    it 'should index the name of the select tag' do
+      output_buffer.should have_tag("input[@name='post[author_attributes][3][created_at(1i)]']")
+      output_buffer.should have_tag("input[@name='post[author_attributes][3][created_at(2i)]']")
+      output_buffer.should have_tag("input[@name='post[author_attributes][3][created_at(3i)]']")
+      output_buffer.should have_tag("select[@name='post[author_attributes][3][created_at(4i)]']")
+      output_buffer.should have_tag("select[@name='post[author_attributes][3][created_at(5i)]']")
+    end
+
+  end
+  
 end
+
+
+

From 253dc6d559b610f04fab1bc43209d6caa0603d30 Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 27 Oct 2011 17:43:25 +1100
Subject: [PATCH 982/992] coverage to assert that fields for with :index works
 on various inputs, ref #711

---
 spec/inputs/date_input_spec.rb      |  1 -
 spec/inputs/email_input_spec.rb     | 28 ++++++++++++++++++++++++++++
 spec/inputs/file_input_spec.rb      | 28 ++++++++++++++++++++++++++++
 spec/inputs/hidden_input_spec.rb    | 28 ++++++++++++++++++++++++++++
 spec/inputs/number_input_spec.rb    | 28 ++++++++++++++++++++++++++++
 spec/inputs/password_input_spec.rb  | 28 ++++++++++++++++++++++++++++
 spec/inputs/phone_input_spec.rb     | 28 ++++++++++++++++++++++++++++
 spec/inputs/radio_input_spec.rb     | 29 +++++++++++++++++++++++++++++
 spec/inputs/range_input_spec.rb     | 28 ++++++++++++++++++++++++++++
 spec/inputs/search_input_spec.rb    | 27 +++++++++++++++++++++++++++
 spec/inputs/string_input_spec.rb    | 28 ++++++++++++++++++++++++++++
 spec/inputs/text_input_spec.rb      | 27 +++++++++++++++++++++++++++
 spec/inputs/time_zone_input_spec.rb | 28 ++++++++++++++++++++++++++++
 spec/inputs/url_input_spec.rb       | 28 ++++++++++++++++++++++++++++
 14 files changed, 363 insertions(+), 1 deletion(-)

diff --git a/spec/inputs/date_input_spec.rb b/spec/inputs/date_input_spec.rb
index 1b42c1cf6..19f4218ab 100644
--- a/spec/inputs/date_input_spec.rb
+++ b/spec/inputs/date_input_spec.rb
@@ -101,7 +101,6 @@
     end
     
   end
-  
 
   describe ':labels option' do
     fields = [:year, :month, :day]
diff --git a/spec/inputs/email_input_spec.rb b/spec/inputs/email_input_spec.rb
index a682104dc..e5a2bc098 100644
--- a/spec/inputs/email_input_spec.rb
+++ b/spec/inputs/email_input_spec.rb
@@ -42,6 +42,34 @@
 
   end
   
+  describe "when index is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for :author, :index => 3 do |author|
+          concat(author.input(:name, :as => :email))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#post_author_attributes_3_name_input")
+    end
+    
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("input#post_author_attributes_3_name")
+    end
+    
+    it 'should index the name of the select tag' do
+      output_buffer.should have_tag("input[@name='post[author_attributes][3][name]']")
+    end
+    
+  end
+  
+  
   describe "when required" do
     it "should add the required attribute to the input's html options" do
       with_config :use_required_attribute, true do 
diff --git a/spec/inputs/file_input_spec.rb b/spec/inputs/file_input_spec.rb
index 19d68e2d5..6dfc003a9 100644
--- a/spec/inputs/file_input_spec.rb
+++ b/spec/inputs/file_input_spec.rb
@@ -46,6 +46,34 @@
 
   end
   
+  describe "when index is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for :author, :index => 3 do |author|
+          concat(author.input(:name, :as => :file))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#post_author_attributes_3_name_input")
+    end
+    
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("input#post_author_attributes_3_name")
+    end
+    
+    it 'should index the name of the select tag' do
+      output_buffer.should have_tag("input[@name='post[author_attributes][3][name]']")
+    end
+    
+  end
+  
+  
   context "when required" do
     it "should add the required attribute to the input's html options" do
       with_config :use_required_attribute, true do
diff --git a/spec/inputs/hidden_input_spec.rb b/spec/inputs/hidden_input_spec.rb
index 2fee3503b..0ffc7c1cb 100644
--- a/spec/inputs/hidden_input_spec.rb
+++ b/spec/inputs/hidden_input_spec.rb
@@ -98,6 +98,34 @@
 
   end
   
+  describe "when index is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for :author, :index => 3 do |author|
+          concat(author.input(:name, :as => :hidden))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#post_author_attributes_3_name_input")
+    end
+    
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("input#post_author_attributes_3_name")
+    end
+    
+    it 'should index the name of the select tag' do
+      output_buffer.should have_tag("input[@name='post[author_attributes][3][name]']")
+    end
+    
+  end
+  
+  
   context "when required" do
     it "should not add the required attribute to the input's html options" do
       concat(semantic_form_for(@new_post) do |builder|
diff --git a/spec/inputs/number_input_spec.rb b/spec/inputs/number_input_spec.rb
index 903ec4274..b8d5ab9d1 100644
--- a/spec/inputs/number_input_spec.rb
+++ b/spec/inputs/number_input_spec.rb
@@ -66,6 +66,34 @@
     it_should_have_label_and_input_with_id("context2_post_title")
   end
   
+  describe "when index is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for :author, :index => 3 do |author|
+          concat(author.input(:name, :as => :number))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#post_author_attributes_3_name_input")
+    end
+    
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("input#post_author_attributes_3_name")
+    end
+    
+    it 'should index the name of the select tag' do
+      output_buffer.should have_tag("input[@name='post[author_attributes][3][name]']")
+    end
+    
+  end
+  
+  
   describe "when required" do
     it "should add the required attribute to the input's html options" do
       with_config :use_required_attribute, true do 
diff --git a/spec/inputs/password_input_spec.rb b/spec/inputs/password_input_spec.rb
index 9e60e0ff7..f21c8ac3d 100644
--- a/spec/inputs/password_input_spec.rb
+++ b/spec/inputs/password_input_spec.rb
@@ -57,6 +57,34 @@
 
   end
   
+  describe "when index is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for :author, :index => 3 do |author|
+          concat(author.input(:name, :as => :password))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#post_author_attributes_3_name_input")
+    end
+    
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("input#post_author_attributes_3_name")
+    end
+    
+    it 'should index the name of the select tag' do
+      output_buffer.should have_tag("input[@name='post[author_attributes][3][name]']")
+    end
+    
+  end
+  
+  
   describe "when required" do
     it "should add the required attribute to the input's html options" do
       with_config :use_required_attribute, true do 
diff --git a/spec/inputs/phone_input_spec.rb b/spec/inputs/phone_input_spec.rb
index c4729e239..8c4d21cc0 100644
--- a/spec/inputs/phone_input_spec.rb
+++ b/spec/inputs/phone_input_spec.rb
@@ -42,6 +42,34 @@
 
   end
   
+  describe "when index is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for :author, :index => 3 do |author|
+          concat(author.input(:name, :as => :phone))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#post_author_attributes_3_name_input")
+    end
+    
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("input#post_author_attributes_3_name")
+    end
+    
+    it 'should index the name of the select tag' do
+      output_buffer.should have_tag("input[@name='post[author_attributes][3][name]']")
+    end
+    
+  end
+  
+  
   describe "when required" do
     it "should add the required attribute to the input's html options" do
       with_config :use_required_attribute, true do 
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index 808f5a26d..c69c31dcc 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -233,5 +233,34 @@
     end
     it_should_have_input_wrapper_with_id("custom_prefix_post_authors_input")
   end
+  
+  describe "when index is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for :author, :index => 3 do |author|
+          concat(author.input(:name, :as => :radio))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#post_author_attributes_3_name_input")
+    end
+    
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("input#post_author_attributes_3_name_true")
+      output_buffer.should have_tag("input#post_author_attributes_3_name_false")
+    end
+    
+    it 'should index the name of the select tag' do
+      output_buffer.should have_tag("input[@name='post[author_attributes][3][name]']")
+    end
+    
+  end
+  
 
 end
diff --git a/spec/inputs/range_input_spec.rb b/spec/inputs/range_input_spec.rb
index 7b9c3b694..5a484f126 100644
--- a/spec/inputs/range_input_spec.rb
+++ b/spec/inputs/range_input_spec.rb
@@ -41,6 +41,34 @@
     it_should_have_label_and_input_with_id("context2_author_age")
 
   end
+  
+  describe "when index is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for :author, :index => 3 do |author|
+          concat(author.input(:name, :as => :range))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#post_author_attributes_3_name_input")
+    end
+    
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("input#post_author_attributes_3_name")
+    end
+    
+    it 'should index the name of the select tag' do
+      output_buffer.should have_tag("input[@name='post[author_attributes][3][name]']")
+    end
+    
+  end
+  
 
   describe "when validations require a minimum value (:greater_than)" do
     before do
diff --git a/spec/inputs/search_input_spec.rb b/spec/inputs/search_input_spec.rb
index 50e9bafc4..8db394b42 100644
--- a/spec/inputs/search_input_spec.rb
+++ b/spec/inputs/search_input_spec.rb
@@ -42,6 +42,33 @@
 
   end
   
+  describe "when index is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for :author, :index => 3 do |author|
+          concat(author.input(:name, :as => :search))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#post_author_attributes_3_name_input")
+    end
+    
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("input#post_author_attributes_3_name")
+    end
+    
+    it 'should index the name of the select tag' do
+      output_buffer.should have_tag("input[@name='post[author_attributes][3][name]']")
+    end
+    
+  end
+  
   describe "when required" do
     it "should add the required attribute to the input's html options" do
       with_config :use_required_attribute, true do 
diff --git a/spec/inputs/string_input_spec.rb b/spec/inputs/string_input_spec.rb
index 5507fff12..c9ea0a645 100644
--- a/spec/inputs/string_input_spec.rb
+++ b/spec/inputs/string_input_spec.rb
@@ -124,6 +124,34 @@ def should_have_maxlength(maxlength, options)
   
   end
   
+  describe "when index is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for :author, :index => 3 do |author|
+          concat(author.input(:name, :as => :string))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#post_author_attributes_3_name_input")
+    end
+    
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("input#post_author_attributes_3_name")
+    end
+    
+    it 'should index the name of the select tag' do
+      output_buffer.should have_tag("input[@name='post[author_attributes][3][name]']")
+    end
+    
+  end
+  
+  
   describe "when no object is provided" do
     before do
       concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
diff --git a/spec/inputs/text_input_spec.rb b/spec/inputs/text_input_spec.rb
index a3da09235..2e369560d 100644
--- a/spec/inputs/text_input_spec.rb
+++ b/spec/inputs/text_input_spec.rb
@@ -81,6 +81,33 @@
 
   end
   
+  describe "when index is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for :author, :index => 3 do |author|
+          concat(author.input(:name, :as => :text))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#post_author_attributes_3_name_input")
+    end
+    
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("textarea#post_author_attributes_3_name")
+    end
+    
+    it 'should index the name of the select tag' do
+      output_buffer.should have_tag("textarea[@name='post[author_attributes][3][name]']")
+    end
+    
+  end
+  
   context "when required" do
     it "should add the required attribute to the input's html options" do
       with_config :use_required_attribute, true do 
diff --git a/spec/inputs/time_zone_input_spec.rb b/spec/inputs/time_zone_input_spec.rb
index 57bf9b8ce..c644757e9 100644
--- a/spec/inputs/time_zone_input_spec.rb
+++ b/spec/inputs/time_zone_input_spec.rb
@@ -54,6 +54,34 @@
     it_should_have_label_for("context2_post_time_zone")
 
   end
+  
+  describe "when index is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for :author, :index => 3 do |author|
+          concat(author.input(:name, :as => :time_zone))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#post_author_attributes_3_name_input")
+    end
+    
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("select#post_author_attributes_3_name")
+    end
+    
+    it 'should index the name of the select tag' do
+      output_buffer.should have_tag("select[@name='post[author_attributes][3][name]']")
+    end
+    
+  end
+  
 
   describe 'when no object is given' do
     before(:each) do
diff --git a/spec/inputs/url_input_spec.rb b/spec/inputs/url_input_spec.rb
index ef7f7f087..82cceb8f0 100644
--- a/spec/inputs/url_input_spec.rb
+++ b/spec/inputs/url_input_spec.rb
@@ -42,6 +42,34 @@
 
   end
   
+  describe "when index is provided" do
+
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for :author, :index => 3 do |author|
+          concat(author.input(:name, :as => :url))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#post_author_attributes_3_name_input")
+    end
+    
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("input#post_author_attributes_3_name")
+    end
+    
+    it 'should index the name of the select tag' do
+      output_buffer.should have_tag("input[@name='post[author_attributes][3][name]']")
+    end
+    
+  end
+  
+  
   describe "when required" do
     it "should add the required attribute to the input's html options" do
       with_config :use_required_attribute, true do 

From 0566774dba3419edcea97a54f022d8e62f65e351 Mon Sep 17 00:00:00 2001
From: Joe Slag <joe@slagwerks.com>
Date: Thu, 27 Oct 2011 11:34:38 -0500
Subject: [PATCH 983/992] address syntax errors with 1.9.2-p290

The syntax introduced in 253dc6d559b610f04fab1bc43209d6caa0603d30, eg.

  concat(builder.fields_for :author, :index => 3 do |author|

was producing these errors:

  syntax error, unexpected keyword_do_block, expecting ')' (SyntaxError)
---
 spec/inputs/boolean_input_spec.rb     | 2 +-
 spec/inputs/check_boxes_input_spec.rb | 2 +-
 spec/inputs/date_input_spec.rb        | 2 +-
 spec/inputs/datetime_input_spec.rb    | 2 +-
 spec/inputs/email_input_spec.rb       | 2 +-
 spec/inputs/file_input_spec.rb        | 2 +-
 spec/inputs/hidden_input_spec.rb      | 2 +-
 spec/inputs/number_input_spec.rb      | 2 +-
 spec/inputs/password_input_spec.rb    | 2 +-
 spec/inputs/phone_input_spec.rb       | 2 +-
 spec/inputs/radio_input_spec.rb       | 2 +-
 spec/inputs/range_input_spec.rb       | 2 +-
 spec/inputs/search_input_spec.rb      | 2 +-
 spec/inputs/select_input_spec.rb      | 2 +-
 spec/inputs/string_input_spec.rb      | 2 +-
 spec/inputs/text_input_spec.rb        | 2 +-
 spec/inputs/time_input_spec.rb        | 2 +-
 spec/inputs/time_zone_input_spec.rb   | 2 +-
 spec/inputs/url_input_spec.rb         | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/spec/inputs/boolean_input_spec.rb b/spec/inputs/boolean_input_spec.rb
index a343b4bcb..c0e62bb8d 100644
--- a/spec/inputs/boolean_input_spec.rb
+++ b/spec/inputs/boolean_input_spec.rb
@@ -192,7 +192,7 @@
       mock_everything
 
       concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.fields_for :author, :index => 3 do |author|
+        concat(builder.fields_for(:author, :index => 3) do |author|
           concat(author.input(:name, :as => :boolean))
         end)
       end)
diff --git a/spec/inputs/check_boxes_input_spec.rb b/spec/inputs/check_boxes_input_spec.rb
index 86aed8146..04530268f 100644
--- a/spec/inputs/check_boxes_input_spec.rb
+++ b/spec/inputs/check_boxes_input_spec.rb
@@ -400,7 +400,7 @@
       mock_everything
 
       concat(semantic_form_for(@fred) do |builder|
-        concat(builder.fields_for @fred.posts.first, :index => 3 do |author|
+        concat(builder.fields_for(@fred.posts.first, :index => 3) do |author|
           concat(author.input(:authors, :as => :check_boxes))
         end)
       end)
diff --git a/spec/inputs/date_input_spec.rb b/spec/inputs/date_input_spec.rb
index 19f4218ab..a7323a3ce 100644
--- a/spec/inputs/date_input_spec.rb
+++ b/spec/inputs/date_input_spec.rb
@@ -78,7 +78,7 @@
       mock_everything
 
       concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.fields_for :author, :index => 3 do |author|
+        concat(builder.fields_for(:author, :index => 3) do |author|
           concat(author.input(:created_at, :as => :date))
         end)
       end)
diff --git a/spec/inputs/datetime_input_spec.rb b/spec/inputs/datetime_input_spec.rb
index ab39e0d50..105525257 100644
--- a/spec/inputs/datetime_input_spec.rb
+++ b/spec/inputs/datetime_input_spec.rb
@@ -83,7 +83,7 @@
       mock_everything
 
       concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.fields_for :author, :index => 3 do |author|
+        concat(builder.fields_for(:author, :index => 3) do |author|
           concat(author.input(:created_at, :as => :datetime))
         end)
       end)
diff --git a/spec/inputs/email_input_spec.rb b/spec/inputs/email_input_spec.rb
index e5a2bc098..03f1eb3ed 100644
--- a/spec/inputs/email_input_spec.rb
+++ b/spec/inputs/email_input_spec.rb
@@ -49,7 +49,7 @@
       mock_everything
 
       concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.fields_for :author, :index => 3 do |author|
+        concat(builder.fields_for(:author, :index => 3) do |author|
           concat(author.input(:name, :as => :email))
         end)
       end)
diff --git a/spec/inputs/file_input_spec.rb b/spec/inputs/file_input_spec.rb
index 6dfc003a9..2eb2db67a 100644
--- a/spec/inputs/file_input_spec.rb
+++ b/spec/inputs/file_input_spec.rb
@@ -53,7 +53,7 @@
       mock_everything
 
       concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.fields_for :author, :index => 3 do |author|
+        concat(builder.fields_for(:author, :index => 3) do |author|
           concat(author.input(:name, :as => :file))
         end)
       end)
diff --git a/spec/inputs/hidden_input_spec.rb b/spec/inputs/hidden_input_spec.rb
index 0ffc7c1cb..24d796cc4 100644
--- a/spec/inputs/hidden_input_spec.rb
+++ b/spec/inputs/hidden_input_spec.rb
@@ -105,7 +105,7 @@
       mock_everything
 
       concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.fields_for :author, :index => 3 do |author|
+        concat(builder.fields_for(:author, :index => 3) do |author|
           concat(author.input(:name, :as => :hidden))
         end)
       end)
diff --git a/spec/inputs/number_input_spec.rb b/spec/inputs/number_input_spec.rb
index b8d5ab9d1..6332d030d 100644
--- a/spec/inputs/number_input_spec.rb
+++ b/spec/inputs/number_input_spec.rb
@@ -73,7 +73,7 @@
       mock_everything
 
       concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.fields_for :author, :index => 3 do |author|
+        concat(builder.fields_for(:author, :index => 3) do |author|
           concat(author.input(:name, :as => :number))
         end)
       end)
diff --git a/spec/inputs/password_input_spec.rb b/spec/inputs/password_input_spec.rb
index f21c8ac3d..1c82a6b69 100644
--- a/spec/inputs/password_input_spec.rb
+++ b/spec/inputs/password_input_spec.rb
@@ -64,7 +64,7 @@
       mock_everything
 
       concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.fields_for :author, :index => 3 do |author|
+        concat(builder.fields_for(:author, :index => 3) do |author|
           concat(author.input(:name, :as => :password))
         end)
       end)
diff --git a/spec/inputs/phone_input_spec.rb b/spec/inputs/phone_input_spec.rb
index 8c4d21cc0..450f86f10 100644
--- a/spec/inputs/phone_input_spec.rb
+++ b/spec/inputs/phone_input_spec.rb
@@ -49,7 +49,7 @@
       mock_everything
 
       concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.fields_for :author, :index => 3 do |author|
+        concat(builder.fields_for(:author, :index => 3) do |author|
           concat(author.input(:name, :as => :phone))
         end)
       end)
diff --git a/spec/inputs/radio_input_spec.rb b/spec/inputs/radio_input_spec.rb
index c69c31dcc..c479ac6f6 100644
--- a/spec/inputs/radio_input_spec.rb
+++ b/spec/inputs/radio_input_spec.rb
@@ -241,7 +241,7 @@
       mock_everything
 
       concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.fields_for :author, :index => 3 do |author|
+        concat(builder.fields_for(:author, :index => 3) do |author|
           concat(author.input(:name, :as => :radio))
         end)
       end)
diff --git a/spec/inputs/range_input_spec.rb b/spec/inputs/range_input_spec.rb
index 5a484f126..35b1d4b52 100644
--- a/spec/inputs/range_input_spec.rb
+++ b/spec/inputs/range_input_spec.rb
@@ -49,7 +49,7 @@
       mock_everything
 
       concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.fields_for :author, :index => 3 do |author|
+        concat(builder.fields_for(:author, :index => 3) do |author|
           concat(author.input(:name, :as => :range))
         end)
       end)
diff --git a/spec/inputs/search_input_spec.rb b/spec/inputs/search_input_spec.rb
index 8db394b42..eeb86596c 100644
--- a/spec/inputs/search_input_spec.rb
+++ b/spec/inputs/search_input_spec.rb
@@ -49,7 +49,7 @@
       mock_everything
 
       concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.fields_for :author, :index => 3 do |author|
+        concat(builder.fields_for(:author, :index => 3) do |author|
           concat(author.input(:name, :as => :search))
         end)
       end)
diff --git a/spec/inputs/select_input_spec.rb b/spec/inputs/select_input_spec.rb
index e91b4e088..a68d87286 100644
--- a/spec/inputs/select_input_spec.rb
+++ b/spec/inputs/select_input_spec.rb
@@ -568,7 +568,7 @@
       mock_everything
   
       concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.fields_for :author, :index => 3 do |author|
+        concat(builder.fields_for(:author, :index => 3) do |author|
           concat(author.input(:name, :as => :select))
         end)
       end)
diff --git a/spec/inputs/string_input_spec.rb b/spec/inputs/string_input_spec.rb
index c9ea0a645..633188c61 100644
--- a/spec/inputs/string_input_spec.rb
+++ b/spec/inputs/string_input_spec.rb
@@ -131,7 +131,7 @@ def should_have_maxlength(maxlength, options)
       mock_everything
 
       concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.fields_for :author, :index => 3 do |author|
+        concat(builder.fields_for(:author, :index => 3) do |author|
           concat(author.input(:name, :as => :string))
         end)
       end)
diff --git a/spec/inputs/text_input_spec.rb b/spec/inputs/text_input_spec.rb
index 2e369560d..b15823099 100644
--- a/spec/inputs/text_input_spec.rb
+++ b/spec/inputs/text_input_spec.rb
@@ -88,7 +88,7 @@
       mock_everything
 
       concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.fields_for :author, :index => 3 do |author|
+        concat(builder.fields_for(:author, :index => 3) do |author|
           concat(author.input(:name, :as => :text))
         end)
       end)
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index 70c41a4f5..752c13b16 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -202,7 +202,7 @@
 
     before do
       concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.fields_for :author, :index => 3 do |author|
+        concat(builder.fields_for(:author, :index => 3) do |author|
           concat(author.input(:created_at, :as => :time))
         end)
       end)
diff --git a/spec/inputs/time_zone_input_spec.rb b/spec/inputs/time_zone_input_spec.rb
index c644757e9..1b93c49ca 100644
--- a/spec/inputs/time_zone_input_spec.rb
+++ b/spec/inputs/time_zone_input_spec.rb
@@ -62,7 +62,7 @@
       mock_everything
 
       concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.fields_for :author, :index => 3 do |author|
+        concat(builder.fields_for(:author, :index => 3) do |author|
           concat(author.input(:name, :as => :time_zone))
         end)
       end)
diff --git a/spec/inputs/url_input_spec.rb b/spec/inputs/url_input_spec.rb
index 82cceb8f0..bc4931217 100644
--- a/spec/inputs/url_input_spec.rb
+++ b/spec/inputs/url_input_spec.rb
@@ -49,7 +49,7 @@
       mock_everything
 
       concat(semantic_form_for(@new_post) do |builder|
-        concat(builder.fields_for :author, :index => 3 do |author|
+        concat(builder.fields_for(:author, :index => 3) do |author|
           concat(author.input(:name, :as => :url))
         end)
       end)

From 617ef956b68b8c3292c44a5782c2365e3513a207 Mon Sep 17 00:00:00 2001
From: Joe Slag <joe@slagwerks.com>
Date: Thu, 27 Oct 2011 13:57:49 -0500
Subject: [PATCH 984/992] Support empty Time inputs

Before this change, it wasn't possible to create an input of type 'time'
that didn't default to the current date. This made it impossible to
differentiate between a form submission wherein the user hadn't picked a
date, and one in which they'd picked midnight UTC.
---
 lib/formtastic/inputs/time_input.rb |  8 ++------
 spec/inputs/time_input_spec.rb      | 27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/lib/formtastic/inputs/time_input.rb b/lib/formtastic/inputs/time_input.rb
index 65e6165f9..ddf595f49 100644
--- a/lib/formtastic/inputs/time_input.rb
+++ b/lib/formtastic/inputs/time_input.rb
@@ -15,12 +15,8 @@ def fragments
         time_fragments
       end
       
-      def value_or_default_value
-        value ? value : Time.current
-      end
-      
       def fragment_value(fragment)
-        value_or_default_value.send(fragment)
+        value ? value.send(fragment) : ""
       end
       
       def hidden_fragments
@@ -43,4 +39,4 @@ def hidden_field_name(fragment)
       
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/inputs/time_input_spec.rb b/spec/inputs/time_input_spec.rb
index 752c13b16..c82a7c3cb 100644
--- a/spec/inputs/time_input_spec.rb
+++ b/spec/inputs/time_input_spec.rb
@@ -60,6 +60,33 @@
 
     end
 
+    describe "with :ignore_date => false and no initial Time" do
+      before do
+        @new_post.stub(:publish_at)
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:publish_at, :as => :time, :ignore_date => false))
+        end)
+      end
+
+      it 'should have a hidden input for day, month and year' do
+        output_buffer.should have_tag('input#post_publish_at_1i')
+        output_buffer.should have_tag('input#post_publish_at_2i')
+        output_buffer.should have_tag('input#post_publish_at_3i')
+      end
+
+      it 'should not have values in hidden inputs for day, month and year' do
+        output_buffer.should have_tag('input#post_publish_at_1i[@value=""]')
+        output_buffer.should have_tag('input#post_publish_at_2i[@value=""]')
+        output_buffer.should have_tag('input#post_publish_at_3i[@value=""]')
+      end
+
+      it 'should have an select for hour and minute' do
+        output_buffer.should have_tag('select#post_publish_at_4i')
+        output_buffer.should have_tag('select#post_publish_at_5i')
+      end
+
+    end
+
     describe "without seconds" do
       before do
         concat(semantic_form_for(@new_post) do |builder|

From 9ead0e99406b8faf3a7624fadd803e1997f7a337 Mon Sep 17 00:00:00 2001
From: Joel Nimety <jnimety@continuity.net>
Date: Wed, 2 Nov 2011 16:52:27 -0400
Subject: [PATCH 985/992] calculate length of integer columns as bytes

Signed-off-by: Joel Nimety <jnimety@continuity.net>
---
 lib/formtastic/inputs/base/validations.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/formtastic/inputs/base/validations.rb b/lib/formtastic/inputs/base/validations.rb
index ddc3abeb6..014be7de7 100644
--- a/lib/formtastic/inputs/base/validations.rb
+++ b/lib/formtastic/inputs/base/validations.rb
@@ -183,7 +183,14 @@ def autofocus?
         end
 
         def column_limit
-          column.limit if column? && column.respond_to?(:limit)
+          if column? && column.respond_to?(:limit)
+            case column.type
+            when :integer
+              (2 ** (column.limit * 8)).to_s.length + 1
+            else
+              column.limit
+            end
+          end
         end
 
         def limit

From 1bc9fabe3daac87dad16d277eeb4fbbc003fc76f Mon Sep 17 00:00:00 2001
From: Justin French <justin@indent.com.au>
Date: Thu, 3 Nov 2011 20:22:34 +1100
Subject: [PATCH 986/992] passing spec related to #714

---
 spec/builder/semantic_fields_for_spec.rb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/spec/builder/semantic_fields_for_spec.rb b/spec/builder/semantic_fields_for_spec.rb
index d78d657f0..3bae0489a 100644
--- a/spec/builder/semantic_fields_for_spec.rb
+++ b/spec/builder/semantic_fields_for_spec.rb
@@ -98,6 +98,20 @@
       end)
       output_buffer.should have_tag('form fieldset.inputs #context2_post_author_1_login_input')
     end
+    
+    it 'should render errors on the nested inputs' do
+      @errors = mock('errors')
+      @errors.stub!(:[]).with(:login).and_return(['oh noes'])
+      @bob.stub!(:errors).and_return(@errors)
+      
+      concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
+        concat(builder.semantic_fields_for(@bob) do |nested_builder|
+          concat(nested_builder.inputs(:login))
+        end)
+      end)
+      output_buffer.should =~ /oh noes/
+    end
+    
   end
   
   context "when I rendered my own hidden id input" do 

From 4df91fc12f1b4799eb5f7c64f6afd7e56c723ef9 Mon Sep 17 00:00:00 2001
From: Kacper Bielecki <kazjote@gmail.com>
Date: Mon, 7 Nov 2011 12:37:39 +0100
Subject: [PATCH 987/992] Documentation update: :include_blank option should be
 passed outside of :input_html option in order to take effect while using
 f.input :as => :select.

---
 lib/formtastic/inputs/select_input.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic/inputs/select_input.rb b/lib/formtastic/inputs/select_input.rb
index f8f9fe5a3..41c81e997 100644
--- a/lib/formtastic/inputs/select_input.rb
+++ b/lib/formtastic/inputs/select_input.rb
@@ -122,8 +122,8 @@ module Inputs
     #   <%= f.input :authors, :as => :select, :wrapper_html => { :class => "special" } %>
     #
     # @example Exclude or include the blank option at the top of the select, or change the prompt
-    #   <%= f.input :author, :as => :select, :input_html => { :include_blank => false } %>
-    #   <%= f.input :author, :as => :select, :input_html => { :include_blank => true } %>
+    #   <%= f.input :author, :as => :select, :include_blank => false %>
+    #   <%= f.input :author, :as => :select, :include_blank => true %>
     #   <%= f.input :author, :as => :select, :input_html => { :prompt => "Please select an Author..." } %>
     #
     # @example Group options an `<optgroup>` with the `:group_by` and `:group_label` options (`belongs_to` associations only)

From 7804a9fe14dd7cfe52418fe6b255a6529097c98e Mon Sep 17 00:00:00 2001
From: Bradley Priest <bradleypriest@gmail.com>
Date: Tue, 8 Nov 2011 21:43:47 +1300
Subject: [PATCH 988/992] Fixed up the documentation for text_input

---
 lib/formtastic/inputs/text_input.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic/inputs/text_input.rb b/lib/formtastic/inputs/text_input.rb
index e81db24d7..11491694d 100644
--- a/lib/formtastic/inputs/text_input.rb
+++ b/lib/formtastic/inputs/text_input.rb
@@ -9,16 +9,16 @@ module Inputs
     #
     #   <%= semantic_form_for(@user) do |f| %>
     #     <%= f.inputs do %>
-    #       <%= f.input :first_name, :as => :string %>
+    #       <%= f.input :first_name, :as => :text %>
     #     <% end %>
     #   <% end %>
     #
     #   <form...>
     #     <fieldset>
     #       <ol>
-    #         <li class="string">
+    #         <li class="text">
     #           <label for="user_first_name">First name</label>
-    #           <input type="text" id="user_first_name" name="user[first_name]">
+    #           <textarea cols="30" id="user_first_name" name="user[first_name]" rows="20"></textarea>
     #         </li>
     #       </ol>
     #     </fieldset>

From 9632dbedb25d6470b8b1aba61469770e4d461715 Mon Sep 17 00:00:00 2001
From: Matt Burke <spraints@gmail.com>
Date: Wed, 9 Nov 2011 12:08:39 -0500
Subject: [PATCH 989/992] Demonstrate a problem when using with_options.

A failing test.
---
 spec/inputs/with_options_spec.rb | 43 ++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 spec/inputs/with_options_spec.rb

diff --git a/spec/inputs/with_options_spec.rb b/spec/inputs/with_options_spec.rb
new file mode 100644
index 000000000..0a34dd837
--- /dev/null
+++ b/spec/inputs/with_options_spec.rb
@@ -0,0 +1,43 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe 'string input' do
+
+  include FormtasticSpecHelper
+
+  before do
+    @output_buffer = ''
+    mock_everything
+  end
+
+  describe "with_options and :wrapper_html" do
+    before do
+      concat(semantic_form_for(@new_post) do |builder|
+        builder.with_options :wrapper_html => { :class => ['extra'] } do |opt_builder|
+          concat(opt_builder.input(:title, :as => :string))
+          concat(opt_builder.input(:author, :as => :radio))
+        end
+      end)
+    end
+
+    it "should have extra class on title" do
+      output_buffer.should have_tag("form li#post_title_input.extra")
+    end
+    it "should have title as string" do
+      output_buffer.should have_tag("form li#post_title_input.string")
+    end
+    it "should not have title as radio" do
+      output_buffer.should_not have_tag("form li#post_title_input.radio")
+    end
+
+    it "should have extra class on author" do
+      output_buffer.should have_tag("form li#post_author_input.extra")
+    end
+    it "should not have author as string" do
+      output_buffer.should_not have_tag("form li#post_author_input.string")
+    end
+    it "should have author as radio" do
+      output_buffer.should have_tag("form li#post_author_input.radio")
+    end
+  end
+end

From f34c6c4ff5b4551aaa7eb61a62ad14e2b288a7eb Mon Sep 17 00:00:00 2001
From: Matt Burke <spraints@gmail.com>
Date: Wed, 9 Nov 2011 12:13:17 -0500
Subject: [PATCH 990/992] Clone wrapper_html options before modifying it.

A passing test.
---
 lib/formtastic/inputs/base/wrapping.rb | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/formtastic/inputs/base/wrapping.rb b/lib/formtastic/inputs/base/wrapping.rb
index fcfff13db..be897162e 100644
--- a/lib/formtastic/inputs/base/wrapping.rb
+++ b/lib/formtastic/inputs/base/wrapping.rb
@@ -14,9 +14,16 @@ def input_wrapping(&block)
         end
         
         def wrapper_html_options
-          opts = options[:wrapper_html] || {}
-          opts[:class] ||= []
-          opts[:class] = [opts[:class].to_s] unless opts[:class].is_a?(Array)
+          opts = (options[:wrapper_html] || {}).dup
+          opts[:class] =
+            case opts[:class]
+            when Array
+              opts[:class].dup
+            when nil
+              []
+            else
+              [opts[:class].to_s]
+            end
           opts[:class] << as
           opts[:class] << "input"
           opts[:class] << "error" if errors?

From a09a6db9b3f1fab5185a4a0ee8c67ebafdb00b9b Mon Sep 17 00:00:00 2001
From: Russell Garner <rgarner@zephyros-systems.co.uk>
Date: Fri, 11 Nov 2011 12:32:16 +0000
Subject: [PATCH 991/992] Fix for #740 - Mongoid belongs_to select raises
 NoMethodError and always returns empty results

---
 lib/formtastic/inputs/base/collections.rb | 13 +++++++++----
 spec/spec_helper.rb                       | 16 +++++++++++++++-
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/lib/formtastic/inputs/base/collections.rb b/lib/formtastic/inputs/base/collections.rb
index 7317324c7..884127521 100644
--- a/lib/formtastic/inputs/base/collections.rb
+++ b/lib/formtastic/inputs/base/collections.rb
@@ -54,18 +54,23 @@ def collection_from_options
 
         def collection_from_association
           if reflection
-            raise PolymorphicInputWithoutCollectionError.new("A collection must be supplied for #{method} input. Collections cannot be guessed for polymorphic associations.") if reflection.options && reflection.options[:polymorphic] == true
+            if reflection.respond_to?(:options)
+              raise PolymorphicInputWithoutCollectionError.new(
+                        "A collection must be supplied for #{method} input. Collections cannot be guessed for polymorphic associations."
+                    ) if reflection.options[:polymorphic] == true
+            end
 
             find_options_from_options = options[:find_options] || {}
             conditions_from_options = find_options_from_options[:conditions] || {}
-            conditions_from_reflection = reflection.options && reflection.options[:conditions] || {}
+            conditions_from_reflection = (reflection.respond_to?(:options) && reflection.options[:conditions]) || {}
             conditions_from_reflection = conditions_from_reflection.call if conditions_from_reflection.is_a?(Proc)
 
+            scope_conditions = conditions_from_reflection.empty? ? nil : {:conditions => conditions_from_reflection}
             if conditions_from_options.any?
-              reflection.klass.scoped(:conditions => conditions_from_reflection).where(conditions_from_options)
+              reflection.klass.scoped(scope_conditions).where(conditions_from_options)
             else
               find_options_from_options.merge!(:include => group_by) if self.respond_to?(:group_by) && group_by
-              reflection.klass.scoped(:conditions => conditions_from_reflection).where(find_options_from_options)
+              reflection.klass.scoped(scope_conditions).where(find_options_from_options)
             end
           end
         end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3e5b9c971..c2625f759 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -137,6 +137,18 @@ class ::PostModel
     include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
   end
 
+  ##
+  # We can't mock :respond_to?, so we need a concrete class override
+  class ::MongoidReflectionMock < RSpec::Mocks::Mock
+    def initialize(name=nil, stubs_and_options={})
+      super name, stubs_and_options
+    end
+
+    def respond_to?(sym)
+      sym == :options ? false : super
+    end
+  end
+
   def _routes
     url_helpers = mock('url_helpers')
     url_helpers.stub!(:hash_for_posts_path).and_return({})
@@ -282,7 +294,9 @@ def new_author_path(*args); "/authors/new"; end
       when :main_post
         mock('reflection', :options => {}, :klass => ::Post, :macro => :belongs_to)
       when :mongoid_reviewer
-        mock('reflection', :options => nil, :klass => ::Author, :macro => :referenced_in, :foreign_key => "reviewer_id") # custom id
+        ::MongoidReflectionMock.new('reflection',
+             :options => Proc.new { raise NoMethodError, "Mongoid has no reflection.options" },
+             :klass => ::Author, :macro => :referenced_in, :foreign_key => "reviewer_id") # custom id
       end
     end
     ::Post.stub!(:find).and_return([@freds_post])

From 82b1ecc72264fbbb917811ddaa92bf40cb8a78bf Mon Sep 17 00:00:00 2001
From: Kristian Mandrup <kristian@unity3d.com>
Date: Tue, 22 Nov 2011 13:52:49 +0100
Subject: [PATCH 992/992] trying to handle composite primary keys in reflection

---
 lib/formtastic/helpers/reflection.rb | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/lib/formtastic/helpers/reflection.rb b/lib/formtastic/helpers/reflection.rb
index 4d797c5af..6de26a579 100644
--- a/lib/formtastic/helpers/reflection.rb
+++ b/lib/formtastic/helpers/reflection.rb
@@ -19,19 +19,32 @@ def association_macro_for_method(method) #:nodoc:
 
       def association_primary_key_for_method(method) #:nodoc:
         reflection = reflection_for(method)
+        
         if reflection
           case association_macro_for_method(method)
           when :has_and_belongs_to_many, :has_many, :references_and_referenced_in_many, :references_many
             :"#{method.to_s.singularize}_ids"
           else
-            return reflection.foreign_key.to_sym if reflection.respond_to?(:foreign_key)
-            return reflection.options[:foreign_key].to_sym unless reflection.options[:foreign_key].blank?
+            # handle case where foreign key is a composite (Array) fx using 'composite_primary_keys' gem
+            foreign_key = foreign_key_for reflection
+            return method.to_sym if !foreign_key || foreign_key.kind_of?(Array)
+
+            return foreign_key.to_sym unless foreign_key.blank? || foreign_key.kind_of?(Array)
             :"#{method}_id"
           end
         else
           method.to_sym
         end
       end
+      
+      protected
+      
+      def foreign_key_for reflection
+        return nil if !reflection
+        return reflection.foreign_key if reflection.respond_to?(:foreign_key)
+        return reflection.options[:foreign_key] if reflection.respond_to?(:options)
+        nil
+      end
     end
   end
 end
\ No newline at end of file