RubyGems - formtastic - Versions diffs - 0.9.7 → 0.9.8 - Mend

formtastic 0.9.7 → 0.9.8

Files changed (27) hide show

data/README.textile +69 -12
data/Rakefile +1 -1
data/generators/form/templates/view__form.html.erb +2 -2
data/generators/form/templates/view__form.html.haml +2 -2
data/generators/formtastic/templates/formtastic.css +58 -50
data/generators/formtastic/templates/formtastic.rb +3 -0
data/generators/formtastic/templates/formtastic_changes.css +5 -1
data/lib/formtastic.rb +108 -37
data/lib/formtastic/layout_helper.rb +10 -0
data/rails/init.rb +2 -0
data/spec/commit_button_spec.rb +26 -4
data/spec/custom_macros.rb +0 -101
data/spec/form_helper_spec.rb +6 -0
data/spec/input_spec.rb +34 -0
data/spec/inputs/boolean_input_spec.rb +9 -5
data/spec/inputs/check_boxes_input_spec.rb +33 -10
data/spec/inputs/date_input_spec.rb +137 -25
data/spec/inputs/datetime_input_spec.rb +177 -54
data/spec/inputs/hidden_input_spec.rb +9 -0
data/spec/inputs/radio_input_spec.rb +15 -9
data/spec/inputs/select_input_spec.rb +113 -83
data/spec/inputs/time_input_spec.rb +151 -25
data/spec/inputs/time_zone_input_spec.rb +4 -2
data/spec/layout_helper_spec.rb +29 -0
data/spec/semantic_errors_spec.rb +98 -0
data/spec/spec_helper.rb +26 -18
metadata +50 -22

data/README.textile CHANGED Viewed

@@ -91,20 +91,28 @@ Then install the Formtastic gem:
   sudo gem install formtastic
 </pre>
+And add it to your environment.rb configuration as a gem dependency:
+<pre>
+  config.gem 'formtastic'
+</pre>
 Optionally, run @./script/generate formtastic@ to copy the following files into your app:
 * @config/initializers/formtastic.rb@ - a commented out Formtastic config initializer
 * @public/stylesheets/formtastic.css@
 * @public/stylesheets/formtastic_changes.css@
-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:
+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:
 <pre>
-  <%= stylesheet_link_tag "formtastic" %>
-  <%= stylesheet_link_tag "formtastic_changes" %>
+  <head>
+    ...
+    <%= formtastic_stylesheet_link_tag %>
+    ...
+  </head>
 </pre>
 h2. Usage
 Forms are really boring to code... you want to get onto the good stuff as fast as possible.
@@ -165,7 +173,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. You can do it in the Rails way:
+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:
 <pre>
   <% semantic_form_for @post do |form| %>
@@ -231,6 +239,23 @@ Customize the HTML attributes for the @<li>@ wrapper around every input with the
   <% 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>
+  f.input :authors, :as => :check_boxes, :collection => User.find(:all, :order => "last_name ASC")
+  f.input :authors, :as => :check_boxes, :collection => current_user.company.users.active
+  f.input :authors, :as => :check_boxes, :collection => [@justin, @kate]
+  f.input :authors, :as => :check_boxes, :collection => ["Justin", "Kate", "Amelia", "Gus", "Meg"]
+  f.input :author,  :as => :select,      :collection => Author.find(:all)
+  f.input :author,  :as => :select,      :collection => { @justin.name => @justin.id, @kate.name => @kate.id }
+  f.input :author,  :as => :select,      :collection => ["Justin", "Kate", "Amelia", "Gus", "Meg"]
+  f.input :author,  :as => :radio,       :collection => User.find(:all)
+  f.input :author,  :as => :radio,       :collection => [@justin, @kate]
+  f.input :author,  :as => :radio,       :collection => { @justin.name => @justin.id, @kate.name => @kate.id }
+  f.input :author,  :as => :radio,       :collection => ["Justin", "Kate", "Amelia", "Gus", "Meg"]
+  f.input :admin,   :as => :radio,       :collection => ["Yes!", "No"]
+</pre>
 h2. The Available Inputs
@@ -252,7 +277,19 @@ The Formtastic input types:
 * @:country@ - a select menu of country names. Default for column types: :string with name @"country"@ - requires a *country_select* plugin to be installed.
 * @:hidden@ - a hidden field. Creates a hidden field (added for compatibility).
-The documentation is pretty good for each of these (what it does, what the output is, what the options are, etc.) so go check it out.
+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.
+h2. Delegation for label lookups
+Formtastic decides which label to use in the following order:
+<pre>
+  1. :label             # :label => "Choose Title"
+  2. Formtastic i18n    # if either :label => true || i18n_lookups_by_default = true (see Internationalization)
+  3. Activerecord i18n  # if localization file found for the given attribute
+  4. label_str_method   # if nothing provided this defaults to :humanize but can be set to a custom method
+</pre>
 h2. Internationalization (I18n)
@@ -406,6 +443,17 @@ For more flexible forms; Formtastic find translations using a bottom-up approach
 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.
+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 %>
+  <% end %>
+</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).
@@ -428,10 +476,10 @@ $ ./script/generate form Post
 #  GENERATED FORMTASTIC CODE
 # ---------------------------------------------------------
-<% form.inputs do %>
-  <%= form.input :title, :label => 'Title' %>
-  <%= form.input :body, :label => 'Body' %>
-  <%= form.input :published, :label => 'Published' %>
+<% f.inputs do %>
+  <%= f.input :title, :label => 'Title' %>
+  <%= f.input :body, :label => 'Body' %>
+  <%= f.input :published, :label => 'Published' %>
 <% end %>
 # ---------------------------------------------------------
@@ -497,9 +545,18 @@ Well...there's a TextMate-bundle in town, dedicated to make usage of Formtastic
 "Formtastic.tmbundle":http://github.com/grimen/formtastic_tmbundle
-h2. Contributors
+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 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.
+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 30 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.
 @git shortlog -n -s --no-merges@

data/Rakefile CHANGED Viewed

@@ -27,7 +27,7 @@ begin
   a config initializer into your application:
     ./script/generate formtastic
-  To generate some semantic form markup for your exisiting models, just run:
+  To generate some semantic form markup for your existing models, just run:
     ./script/generate form MODEL_NAME
   Find out more and get involved:

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

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

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

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

data/generators/formtastic/templates/formtastic.css CHANGED Viewed

@@ -19,7 +19,13 @@ 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; }
+form.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; }
 /* FIELDSETS & LISTS
@@ -39,100 +45,102 @@ html[xmlns] form.formtastic fieldset { display: block; }
 /* INPUT LIs
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset ol li { margin-bottom:1.5em; }
+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 { }
+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;}
+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; }
+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 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 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%; }
+form.formtastic fieldset > ol > li.string input { max-width:74%; }
+form.formtastic fieldset > ol > li.password input { max-width: 13em; }
+form.formtastic fieldset > ol > li.numeric input { max-width:74%; }
 /* TEXTAREA OVERRIDES
 --------------------------------------------------------------------------------------------------*/
-form.formtastic fieldset ol li.text textarea { width:74%; }
+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 { display:none; }
+form.formtastic fieldset ol li.hidden,
+html[xmlns] 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 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; }
+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; }
+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,
+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;  }

data/generators/formtastic/templates/formtastic.rb CHANGED Viewed

@@ -1,6 +1,9 @@
 # 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

data/generators/formtastic/templates/formtastic_changes.css CHANGED Viewed

@@ -5,6 +5,10 @@ This will allow you to update formtastic.css with new releases without clobberin
 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; }
+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;}
 --------------------------------------------------------------------------------------------------*/

data/lib/formtastic.rb CHANGED Viewed

@@ -6,6 +6,7 @@ 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 { %{<abbr title="#{::Formtastic::I18n.t(:required)}">*</abbr>} }
@@ -14,12 +15,12 @@ module Formtastic #:nodoc:
     @@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 ]
+    @@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, :all_fields_required_by_default, :include_blank_for_select_by_default,
+    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
@@ -75,6 +76,13 @@ module Formtastic #:nodoc:
     #   <% 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)
@@ -91,7 +99,7 @@ module Formtastic #:nodoc:
       end
       input_parts = @@inline_order.dup
-      input_parts.delete(:errors) if options[:as] == :hidden
+      input_parts = input_parts - [:errors, :hints] if options[:as] == :hidden
       list_item_content = input_parts.map do |type|
         send(:"inline_#{type}_for", method, options)
@@ -310,9 +318,17 @@ module Formtastic #:nodoc:
       options = args.extract_options!
       text = options.delete(:label) || args.shift
-      if @object
+      if @object && @object.respond_to?(:new_record?)
         key = @object.new_record? ? :create : :update
-        object_name = @object.class.human_name
+        # 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")
+        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
       else
         key = :submit
         object_name = @object_name.to_s.send(@@label_str_method)
@@ -414,6 +430,32 @@ module Formtastic #:nodoc:
     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.on_base
+      full_errors.flatten!
+      full_errors.compact!
+      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
+      end
+    end
     protected
       def render_inline_errors?
@@ -523,7 +565,7 @@ module Formtastic #: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].include?(type)
+        html_options = default_string_options(method, type).merge(html_options) if [:numeric, :string, :password, :text].include?(type)
         self.label(method, options_for_label(options)) <<
         self.send(form_helper_method, method, html_options)
@@ -825,13 +867,15 @@ module Formtastic #:nodoc:
           template.content_tag(:li, li_content, li_options)
         end
-        field_set_and_list_wrapping_for_method(method, options.merge(:label_for => input_ids.first), list_item_content)
+        field_set_and_list_wrapping_for_method(method, options, list_item_content)
       end
       alias :boolean_radio_input :radio_input
       # Outputs a fieldset with a legend for the method label, and a ordered list (ol) of list
       # items (li), one for each fragment for the date (year, month, day).  Each li contains a label
-      # (eg "Year") and a select box.  See date_or_datetime_input for a more detailed output example.
+      # (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.
       #
       # You can pre-select a specific option value by passing in the :selected option.
       #
@@ -839,9 +883,10 @@ module Formtastic #:nodoc:
       #
       #   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.
-      #
+      # 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))
@@ -849,8 +894,9 @@ module Formtastic #:nodoc:
       # Outputs a fieldset with a legend for the method label, and a ordered list (ol) of list
       # items (li), one for each fragment for the date (year, month, day, hour, min, sec).  Each li
-      # contains a label (eg "Year") and a select box.  See date_or_datetime_input for a more
-      # detailed output example.
+      # 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.
       #
       # You can pre-select a specific option value by passing in the :selected option.
       #
@@ -858,9 +904,11 @@ module Formtastic #:nodoc:
       #
       #   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.
-      #
+      # 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)
@@ -868,7 +916,9 @@ module Formtastic #:nodoc:
       # Outputs a fieldset with a legend for the method label, and a ordered list (ol) of list
       # items (li), one for each fragment for the time (hour, minute, second).  Each li contains a label
-      # (eg "Hour") and a select box.  See date_or_datetime_input for a more detailed output example.
+      # (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.
       #
       # You can pre-select a specific option value by passing in the :selected option.
       #
@@ -876,14 +926,19 @@ module Formtastic #:nodoc:
       #
       #   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.
-      #
+      # 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>
@@ -916,23 +971,32 @@ module Formtastic #:nodoc:
       #
       # This is an absolute abomination, but so is the official Rails select_date().
       #
+      # 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 => {}@
       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]
+        labels   = options.delete(:labels) || {}
         time_inputs = [:hour, :minute]
-        time_inputs << [:second] if options[:include_seconds]
+        time_inputs << :second if options[:include_seconds]
         list_items_capture = ""
         hidden_fields_capture = ""
-        default_time = ::Time.now
+        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
-        # Gets the datetime object. It can be a Fixnum, Date or Time, or nil.
-        datetime = options[:selected] || (@object ? @object.send(method) : default_time) || default_time
         html_options = options.delete(:input_html) || {}
         input_ids    = []
@@ -943,15 +1007,16 @@ module Formtastic #:nodoc:
           if options[:"discard_#{input}"]
             break if time_inputs.include?(input)
-            hidden_value = datetime.respond_to?(input) ? datetime.send(input.to_sym) : datetime
+            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 = ::I18n.t(input.to_s, :default => input.to_s.humanize, :scope => [:datetime, :prompts])
+            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,
-              template.content_tag(:label, item_label_text, :for => input_id) <<
-              template.send(:"select_#{input}", datetime, opts, html_options.merge(:id => input_id))
+            list_items_capture << template.content_tag(:li, [
+                !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("")
             )
           end
         end
@@ -1064,7 +1129,7 @@ module Formtastic #:nodoc:
           template.content_tag(:li, li_content, li_options)
         end
-        field_set_and_list_wrapping_for_method(method, options.merge(:label_for => input_ids.first), list_item_content)
+        field_set_and_list_wrapping_for_method(method, options, list_item_content)
       end
       # Outputs a country select input, wrapping around a regular country_select helper.
@@ -1406,7 +1471,7 @@ module Formtastic #: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
@@ -1432,7 +1497,9 @@ module Formtastic #:nodoc:
       def default_string_options(method, type) #:nodoc:
         column = self.column_for(method)
-        if type == :numeric || column.nil? || column.limit.nil?
+        if type == :text
+          { :cols => @@default_text_field_size, :rows => @@default_text_area_height }
+        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 }
@@ -1479,7 +1546,12 @@ module Formtastic #:nodoc:
       def humanized_attribute_name(method) #:nodoc:
         if @object && @object.class.respond_to?(:human_attribute_name)
-          @object.class.human_attribute_name(method.to_s)
+          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
@@ -1612,18 +1684,18 @@ module Formtastic #:nodoc:
     end
     [:form_for, :fields_for, :remote_form_for].each do |meth|
-      src = <<-END_SRC
+      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] ||= {}
           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 record_or_name_or_array.last.class.to_s.underscore  # [@post, @comment] # => "comment"
-            else record_or_name_or_array.class.to_s.underscore                  # @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"
           end
           options[:html][:class] = class_names.join(" ")
@@ -1632,7 +1704,6 @@ module Formtastic #:nodoc:
           end
         end
       END_SRC
-      module_eval src, __FILE__, __LINE__
     end
     alias :semantic_form_remote_for :semantic_remote_form_for