formtastic 2.1.1 → 2.2.0.rc

data/spec/inputs/{time_input_spec.rb → time_select_input_spec.rb}

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'time input' do
+describe 'time select input' do
 
   include FormtasticSpecHelper
 
@@ -19,7 +19,7 @@ describe 'time input' 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))
+          concat(builder.input(:publish_at, :as => :time_select, :ignore_date => true))
         end)
       end
 
@@ -40,7 +40,7 @@ describe 'time input' 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))
+          concat(builder.input(:publish_at, :as => :time_select, :ignore_date => false))
         end)
       end
 
@@ -59,7 +59,7 @@ describe 'time input' do
       end
 
       it 'should associate the legend label with the hour select' do
-        output_buffer.should have_tag('form li.time fieldset legend.label label[@for="post_publish_at_4i"]')
+        output_buffer.should have_tag('form li.time_select fieldset legend.label label[@for="post_publish_at_4i"]')
       end
 
     end
@@ -68,7 +68,7 @@ describe 'time input' 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))
+          concat(builder.input(:publish_at, :as => :time_select, :ignore_date => false))
         end)
       end
 
@@ -94,58 +94,58 @@ describe 'time input' do
     describe "without seconds" do
       before do
         concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:publish_at, :as => :time))
+          concat(builder.input(:publish_at, :as => :time_select))
         end)
       end
 
-      it_should_have_input_wrapper_with_class("time")
+      it_should_have_input_wrapper_with_class("time_select")
       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_apply_error_logic_for_input_type(:time_select)
 
       it 'should have a legend and label with the label text inside the fieldset' do
-        output_buffer.should have_tag('form li.time fieldset legend.label label', /Publish at/)
+        output_buffer.should have_tag('form li.time_select 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.time fieldset legend.label label[@for="post_publish_at_4i"]')
+        output_buffer.should have_tag('form li.time_select fieldset legend.label label[@for="post_publish_at_4i"]')
       end
 
       it 'should have an ordered list of two items inside the fieldset' do
-        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)
+        output_buffer.should have_tag('form li.time_select fieldset ol.fragments-group')
+        output_buffer.should have_tag('form li.time_select fieldset ol li.fragment', :count => 2)
       end
 
       it 'should have five labels for hour and minute' do
-        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)
+        output_buffer.should have_tag('form li.time_select fieldset ol li label', :count => 2)
+        output_buffer.should have_tag('form li.time_select fieldset ol li label', /hour/i)
+        output_buffer.should have_tag('form li.time_select fieldset ol li label', /minute/i)
       end
 
       it 'should have two selects for hour and minute' do
-        output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
+        output_buffer.should have_tag('form li.time_select fieldset ol li', :count => 2)
       end
     end
 
     describe "with seconds" do
       before do
         concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:publish_at, :as => :time, :include_seconds => true))
+          concat(builder.input(:publish_at, :as => :time_select, :include_seconds => true))
         end)
       end
 
       it 'should have five labels for hour and minute' do
-        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)
-        output_buffer.should have_tag('form li.time fieldset ol li label', /second/i)
+        output_buffer.should have_tag('form li.time_select fieldset ol li label', :count => 3)
+        output_buffer.should have_tag('form li.time_select fieldset ol li label', /hour/i)
+        output_buffer.should have_tag('form li.time_select fieldset ol li label', /minute/i)
+        output_buffer.should have_tag('form li.time_select fieldset ol li label', /second/i)
       end
 
       it 'should have three selects for hour, minute and seconds' do
-        output_buffer.should have_tag('form li.time fieldset ol li', :count => 3)
+        output_buffer.should have_tag('form li.time_select fieldset ol li', :count => 3)
       end
 
       it 'should generate a sanitized label and matching ids for attribute' do
@@ -163,40 +163,40 @@ describe 'time input' do
       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 => :time, :include_seconds => true, :labels => { field => "another #{field} label" }))
+          concat(builder.input(:created_at, :as => :time_select, :include_seconds => true, :labels => { field => "another #{field} label" }))
         end)
-        output_buffer.should have_tag('form li.time fieldset ol li label', :count => fields.length)
+        output_buffer.should have_tag('form li.time_select 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)
+          output_buffer.should have_tag('form li.time_select 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 => :time, :include_seconds => true, :labels => { field => "" }))
+          concat(builder.input(:created_at, :as => :time_select, :include_seconds => true, :labels => { field => "" }))
         end)
-        output_buffer.should have_tag('form li.time fieldset ol li label', :count => fields.length-1)
+        output_buffer.should have_tag('form li.time_select 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
+          output_buffer.should have_tag('form li.time_select 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 }))
+          concat(builder.input(:created_at, :as => :time_select, :include_seconds => true, :labels => { field => false }))
         end)
-        output_buffer.should have_tag('form li.time fieldset ol li label', :count => fields.length-1)
+        output_buffer.should have_tag('form li.time_select 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
+          output_buffer.should have_tag('form li.time_select 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 }))
+          concat(builder.input(:created_at, :as => :time_select, :include_seconds => true, :labels => { field => false }))
         end)
         output_buffer.should_not include(">")
       end
@@ -207,7 +207,7 @@ describe 'time input' do
   describe ':namespace option' do
     before do
       concat(semantic_form_for(@new_post, :namespace => 'form2') do |builder|
-        concat(builder.input(:publish_at, :as => :time))
+        concat(builder.input(:publish_at, :as => :time_select))
       end)
     end
 
@@ -222,7 +222,7 @@ describe 'time input' 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 => :time, :required => true))
+          concat(builder.input(:title, :as => :time_select, :required => true))
         end)
         output_buffer.should have_tag("select[@required]", :count => 2)
       end
@@ -234,7 +234,7 @@ describe 'time input' 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))
+          concat(author.input(:created_at, :as => :time_select))
         end)
       end)
     end

data/spec/spec_helper.rb

@@ -413,7 +413,31 @@ module FormtasticSpecHelper
     yield
     Formtastic::FormBuilder.send(:"#{config_method_name}=", old_value)
   end
-
+  
+  class ToSMatcher
+    def initialize(str)
+      @str=str.to_s
+    end
+    
+    def matches?(value)
+      value.to_s==@str
+    end
+    
+    def failure_message_for_should
+      "Expected argument that converted to #{@str}"
+    end
+  end
+  
+  def errors_matcher(method)
+    # In edge rails (Rails 4) tags store method_name as a string and index the errors object using a string
+    # therefore allow stubs to match on either string or symbol.  The errors object calls to_sym on all index 
+    # accesses so @object.errors[:abc] is equivalent to @object.errors["abc"]
+    if Rails::VERSION::MAJOR == 4
+      ToSMatcher.new(method)
+    else
+      method
+    end
+  end
 end
 
 ::ActiveSupport::Deprecation.silenced = false

data/spec/support/custom_macros.rb

@@ -177,9 +177,9 @@ module CustomMacros
         before do
           @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)
+          @errors.stub!(:[]).with(errors_matcher(:title)).and_return(@title_errors)
           Formtastic::FormBuilder.file_metadata_suffixes.each do |suffix|
-            @errors.stub!(:[]).with("title_#{suffix}".to_sym).and_return(nil)
+            @errors.stub!(:[]).with(errors_matcher("title_#{suffix}".to_sym)).and_return(nil)
           end
           @new_post.stub!(:errors).and_return(@errors)
         end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: formtastic
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: 
+  hash: -1676882131
+  prerelease: 6
   segments: 
   - 2
-  - 1
-  - 1
-  version: 2.1.1
+  - 2
+  - 0
+  - rc
+  version: 2.2.0.rc
 platform: ruby
 authors: 
 - Justin French
@@ -15,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-03 00:00:00 +11:00
-default_executable: 
+date: 2012-03-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: actionpack
@@ -24,7 +24,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -226,6 +226,7 @@ files:
 - gemfiles/rails-3.0.gemfile
 - gemfiles/rails-3.1.gemfile
 - gemfiles/rails-3.2.gemfile
+- gemfiles/rails-4.gemfile
 - lib/formtastic.rb
 - lib/formtastic/actions.rb
 - lib/formtastic/actions/base.rb
@@ -238,7 +239,6 @@ files:
 - lib/formtastic/helpers.rb
 - lib/formtastic/helpers/action_helper.rb
 - lib/formtastic/helpers/actions_helper.rb
-- lib/formtastic/helpers/buttons_helper.rb
 - lib/formtastic/helpers/errors_helper.rb
 - lib/formtastic/helpers/fieldset_wrapper.rb
 - lib/formtastic/helpers/file_column_detection.rb
@@ -254,6 +254,7 @@ files:
 - lib/formtastic/inputs/base/choices.rb
 - lib/formtastic/inputs/base/collections.rb
 - lib/formtastic/inputs/base/database.rb
+- lib/formtastic/inputs/base/datetime_pickerish.rb
 - lib/formtastic/inputs/base/errors.rb
 - lib/formtastic/inputs/base/fileish.rb
 - lib/formtastic/inputs/base/grouped_collections.rb
@@ -272,7 +273,11 @@ files:
 - lib/formtastic/inputs/check_boxes_input.rb
 - lib/formtastic/inputs/country_input.rb
 - lib/formtastic/inputs/date_input.rb
+- lib/formtastic/inputs/date_picker_input.rb
+- lib/formtastic/inputs/date_select_input.rb
 - lib/formtastic/inputs/datetime_input.rb
+- lib/formtastic/inputs/datetime_picker_input.rb
+- lib/formtastic/inputs/datetime_select_input.rb
 - lib/formtastic/inputs/email_input.rb
 - lib/formtastic/inputs/file_input.rb
 - lib/formtastic/inputs/hidden_input.rb
@@ -286,6 +291,8 @@ files:
 - lib/formtastic/inputs/string_input.rb
 - lib/formtastic/inputs/text_input.rb
 - lib/formtastic/inputs/time_input.rb
+- lib/formtastic/inputs/time_picker_input.rb
+- lib/formtastic/inputs/time_select_input.rb
 - lib/formtastic/inputs/time_zone_input.rb
 - lib/formtastic/inputs/url_input.rb
 - lib/formtastic/localized_string.rb
@@ -314,8 +321,6 @@ files:
 - spec/generators/formtastic/install/install_generator_spec.rb
 - spec/helpers/action_helper_spec.rb
 - spec/helpers/actions_helper_spec.rb
-- spec/helpers/buttons_helper_spec.rb
-- spec/helpers/commit_button_helper_spec.rb
 - spec/helpers/form_helper_spec.rb
 - spec/helpers/input_helper_spec.rb
 - spec/helpers/inputs_helper_spec.rb
@@ -326,8 +331,11 @@ files:
 - spec/inputs/check_boxes_input_spec.rb
 - spec/inputs/country_input_spec.rb
 - spec/inputs/custom_input_spec.rb
-- spec/inputs/date_input_spec.rb
-- spec/inputs/datetime_input_spec.rb
+- spec/inputs/date_picker_input_spec.rb
+- spec/inputs/date_select_input_spec.rb
+- spec/inputs/datetime_picker_input_spec.rb
+- spec/inputs/datetime_select_input_spec.rb
+- spec/inputs/deprecated_time_date_datetime_inputs_spec.rb
 - spec/inputs/email_input_spec.rb
 - spec/inputs/file_input_spec.rb
 - spec/inputs/hidden_input_spec.rb
@@ -343,7 +351,8 @@ files:
 - 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_picker_input_spec.rb
+- spec/inputs/time_select_input_spec.rb
 - spec/inputs/time_zone_input_spec.rb
 - spec/inputs/url_input_spec.rb
 - spec/inputs/with_options_spec.rb
@@ -354,7 +363,6 @@ files:
 - spec/support/deferred_garbage_collection.rb
 - spec/support/deprecation.rb
 - spec/support/test_environment.rb
-has_rdoc: true
 homepage: http://github.com/justinfrench/formtastic
 licenses: []
 
@@ -384,7 +392,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
 summary: A Rails form builder plugin/gem with semantically rich and accessible markup
@@ -400,8 +408,6 @@ test_files:
 - spec/generators/formtastic/install/install_generator_spec.rb
 - spec/helpers/action_helper_spec.rb
 - spec/helpers/actions_helper_spec.rb
-- spec/helpers/buttons_helper_spec.rb
-- spec/helpers/commit_button_helper_spec.rb
 - spec/helpers/form_helper_spec.rb
 - spec/helpers/input_helper_spec.rb
 - spec/helpers/inputs_helper_spec.rb
@@ -412,8 +418,11 @@ test_files:
 - spec/inputs/check_boxes_input_spec.rb
 - spec/inputs/country_input_spec.rb
 - spec/inputs/custom_input_spec.rb
-- spec/inputs/date_input_spec.rb
-- spec/inputs/datetime_input_spec.rb
+- spec/inputs/date_picker_input_spec.rb
+- spec/inputs/date_select_input_spec.rb
+- spec/inputs/datetime_picker_input_spec.rb
+- spec/inputs/datetime_select_input_spec.rb
+- spec/inputs/deprecated_time_date_datetime_inputs_spec.rb
 - spec/inputs/email_input_spec.rb
 - spec/inputs/file_input_spec.rb
 - spec/inputs/hidden_input_spec.rb
@@ -429,7 +438,8 @@ test_files:
 - 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_picker_input_spec.rb
+- spec/inputs/time_select_input_spec.rb
 - spec/inputs/time_zone_input_spec.rb
 - spec/inputs/url_input_spec.rb
 - spec/inputs/with_options_spec.rb
@@ -440,3 +450,4 @@ test_files:
 - spec/support/deferred_garbage_collection.rb
 - spec/support/deprecation.rb
 - spec/support/test_environment.rb
+has_rdoc: 

data/lib/formtastic/helpers/buttons_helper.rb

@@ -1,310 +0,0 @@
-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 button">
-    #             <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.
-    #
-    # @deprecated ButtonsHelper will be removed after 2.1
-    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:
-      #
-      #     # 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="buttons">
-      #         <ol>
-      #           <li class="commit button">
-      #             <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').
-      #
-      # 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.
-      #
-      # @example Quickly add button(s) to the form, accepting all default values, options and behaviors
-      #     <% semantic_form_for @post do |f| %>
-      #       ...
-      #       <%= f.buttons %>
-      #     <% end %>
-      #
-      # @example Specify which named buttons you want, accepting all default values, options and behaviors
-      #     <% semantic_form_for @post do |f| %>
-      #       ...
-      #       <%= 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", :button_html => { :class => "pretty" :disable_with => "Wait..." }, :wrapper_html => { ... }
-      #       <% end %>
-      #     <% end %>
-      #
-      # @example Make your own custom buttons, links or actions with standard Rails helpers or HTML
-      #     <% semantic_form_for @post do |f| %>
-      #       ...
-      #       <%= 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 %>
-      #
-      # @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
-      # @deprecated f.buttons is deprecated in favor of f.actions and will be removed after 2.1
-      def buttons(*args, &block)
-        ::ActiveSupport::Deprecation.warn("f.buttons is deprecated in favour of f.actions and will be removed from Formtastic after 2.1. Please see ActionsHelper and InputAction or ButtonAction for more information")
-        
-        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. 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`
-      # argument or through i18n.
-      #
-      # 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
-      #   # form
-      #   <%= semantic_form_for @post do |f| %>
-      #     ...
-      #     <%= f.buttons do %>
-      #       <%= f.commit_button %>
-      #     <% end %>
-      #   <% end %>
-      #
-      #   # output
-      #   <form ...>
-      #     ...
-      #     <fieldset class="buttons">
-      #       <ol>
-      #         <li class="commit button">
-      #           <input name="commit" type="submit" value="Create Post" class="create">
-      #         </li>
-      #       </ol>
-      #     </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', :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 :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
-      #
-      # @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]
-      #   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`
-      # @deprecated f.commit_button is deprecated in favor of f.actions and will be removed after 2.1
-      def commit_button(*args)
-        ::ActiveSupport::Deprecation.warn("f.commit_button is deprecated in favour of f.action(:submit) and will be removed from Formtastic after 2.1. Please see ActionsHelper and InputAction or ButtonAction for more information")
-        
-        options = args.extract_options!
-        text = options.delete(:label) || args.shift
-
-        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[:id] ||= "#{@object_name}_submit"
-        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
-          # 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
-          object_name = @object_name.to_s.send(label_str_method)
-        end
-
-        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