actionpack 1.13.6 → 2.0.0

data/lib/action_view/helpers/debug_helper.rb

@@ -1,10 +1,14 @@
 module ActionView
   module Helpers
-    # Provides a set of methods for making it easier to locate problems.
+    # Provides a set of methods for making it easier to debug Rails objects.
     module DebugHelper
-      # Returns a <pre>-tag set with the +object+ dumped by YAML. Very readable way to inspect an object.
+      # Returns a <pre>-tag that has +object+ dumped by YAML. This creates a very
+      # readable way to inspect an object.
+      #
+      # ==== Example
       #  my_hash = {'first' => 1, 'second' => 'two', 'third' => [1,2,3]}
       #  debug(my_hash)
+      #
       #  => <pre class='debug_dump'>--- 
       #  first: 1
       #  second: two

data/lib/action_view/helpers/form_helper.rb

@@ -1,72 +1,67 @@
 require 'cgi'
-require File.dirname(__FILE__) + '/date_helper'
-require File.dirname(__FILE__) + '/tag_helper'
+require 'action_view/helpers/date_helper'
+require 'action_view/helpers/tag_helper'
 
 module ActionView
   module Helpers
-    # Provides a set of methods for working with forms and especially forms related to objects assigned to the template.
-    # The following is an example of a complete form for a person object that works for both creates and updates built
-    # with all the form helpers. The <tt>@person</tt> object was assigned by an action on the controller:
-    #   <form action="save_person" method="post">
-    #     Name:
-    #     <%= text_field "person", "name", "size" => 20 %>
+    # Form helpers are designed to make working with models much easier compared to using just standard HTML
+    # elements by providing a set of methods for creating forms based on your models. This helper generates the HTML
+    # for forms, providing a method for each sort of input (e.g., text, password, select, and so on). When the form
+    # is submitted (i.e., when the user hits the submit button or <tt>form.submit</tt> is called via JavaScript), the form inputs will be bundled into the <tt>params</tt> object and passed back to the controller.
     #
-    #     Password:
-    #     <%= password_field "person", "password", "maxsize" => 20 %>
+    # There are two types of form helpers: those that specifically work with model attributes and those that don't.
+    # This helper deals with those that work with model attributes; to see an example of form helpers that don't work
+    # with model attributes, check the ActionView::Helpers::FormTagHelper documentation.
     #
-    #     Single?:
-    #     <%= check_box "person", "single" %>
+    # The core method of this helper, form_for, gives you the ability to create a form for a model instance;
+    # for example, let's say that you have a model <tt>Person</tt> and want to create a new instance of it:
     #
-    #     Description:
-    #     <%= text_area "person", "description", "cols" => 20 %>
+    #     # Note: a @person variable will have been created in the controller.
+    #     # For example: @person = Person.new
+    #     <% form_for :person, @person, :url => { :action => "create" } do |f| %>
+    #       <%= f.text_field :first_name %>
+    #       <%= f.text_field :last_name %>
+    #       <%= submit_tag 'Create' %>
+    #     <% end %>
     #
-    #     <input type="submit" value="Save">
-    #   </form>
+    # The HTML generated for this would be:
     #
-    # ...is compiled to:
+    #     <form action="/persons/create" method="post">
+    #       <input id="person_first_name" name="person[first_name]" size="30" type="text" />
+    #       <input id="person_last_name" name="person[last_name]" size="30" type="text" />
+    #       <input name="commit" type="submit" value="Create" />
+    #     </form>
     #
-    #   <form action="save_person" method="post">
-    #     Name:
-    #     <input type="text" id="person_name" name="person[name]"
-    #       size="20" value="<%= @person.name %>" />
+    # The <tt>params</tt> object created when this form is submitted would look like:
     #
-    #     Password:
-    #     <input type="password" id="person_password" name="person[password]"
-    #       size="20" maxsize="20" value="<%= @person.password %>" />
+    #     {"action"=>"create", "controller"=>"persons", "person"=>{"first_name"=>"William", "last_name"=>"Smith"}}
     #
-    #     Single?:
-    #     <input type="checkbox" id="person_single" name="person[single]" value="1" />
+    # The params hash has a nested <tt>person</tt> value, which can therefore be accessed with <tt>params[:person]</tt> in the controller.
+    # If were editing/updating an instance (e.g., <tt>Person.find(1)</tt> rather than <tt>Person.new</tt> in the controller), the objects
+    # attribute values are filled into the form (e.g., the <tt>person_first_name</tt> field would have that person's first name in it).
     #
-    #     Description:
-    #     <textarea cols="20" rows="40" id="person_description" name="person[description]">
-    #       <%= @person.description %>
-    #     </textarea>
-    #
-    #     <input type="submit" value="Save">
-    #   </form>
-    #
-    # If the object name contains square brackets the id for the object will be inserted. Example:
+    # If the object name contains square brackets the id for the object will be inserted. For example:
     #
     #   <%= text_field "person[]", "name" %> 
-    # 
-    # ...becomes:
+    #
+    # ...will generate the following ERb.
     #
     #   <input type="text" id="person_<%= @person.id %>_name" name="person[<%= @person.id %>][name]" value="<%= @person.name %>" />
     #
     # If the helper is being used to generate a repetitive sequence of similar form elements, for example in a partial
-    # used by render_collection_of_partials, the "index" option may come in handy. Example:
+    # used by <tt>render_collection_of_partials</tt>, the <tt>index</tt> option may come in handy. Example:
     #
     #   <%= text_field "person", "name", "index" => 1 %>
     #
-    # becomes
+    # ...becomes...
     #
     #   <input type="text" id="person_1_name" name="person[1][name]" value="<%= @person.name %>" />
     #
-    # There's also methods for helping to build form tags in link:classes/ActionView/Helpers/FormOptionsHelper.html,
+    # There are also methods for helping to build form tags in link:classes/ActionView/Helpers/FormOptionsHelper.html,
     # link:classes/ActionView/Helpers/DateHelper.html, and link:classes/ActionView/Helpers/ActiveRecordHelper.html
     module FormHelper
-      # Creates a form and a scope around a specific model object, which is then used as a base for questioning about
-      # values for the fields. Examples:
+      # Creates a form and a scope around a specific model object that is used as a base for questioning about
+      # values for the fields.
       #
       #   <% form_for :person, @person, :url => { :action => "update" } do |f| %>
       #     First name: <%= f.text_field :first_name %>
@@ -75,18 +70,18 @@ module ActionView
       #     Admin?    : <%= f.check_box :admin %>
       #   <% end %>
       #
-      # Worth noting is that the form_for tag is called in a ERb evaluation block, not a ERb output block. So that's <tt><% %></tt>, 
-      # not <tt><%= %></tt>. Also worth noting is that the form_for yields a form_builder object, in this example as f, which emulates
+      # Worth noting is that the form_for tag is called in a ERb evaluation block, not an ERb output block. So that's <tt><% %></tt>,
+      # not <tt><%= %></tt>. Also worth noting is that form_for yields a <tt>form_builder</tt> object, in this example as <tt>f</tt>, which emulates
       # the API for the stand-alone FormHelper methods, but without the object name. So instead of <tt>text_field :person, :name</tt>,
-      # you get away with <tt>f.text_field :name</tt>. 
+      # you get away with <tt>f.text_field :name</tt>.
       #
-      # That in itself is a modest increase in comfort. The big news is that form_for allows us to more easily escape the instance
-      # variable convention, so while the stand-alone approach would require <tt>text_field :person, :name, :object => person</tt> 
+      # Even further, the form_for method allows you to more easily escape the instance variable convention. So while the stand-alone
+      # approach would require <tt>text_field :person, :name, :object => person</tt>
       # to work with local variables instead of instance ones, the form_for calls remain the same. You simply declare once with 
       # <tt>:person, person</tt> and all subsequent field calls save <tt>:person</tt> and <tt>:object => person</tt>.
       #
       # Also note that form_for doesn't create an exclusive scope. It's still possible to use both the stand-alone FormHelper methods
-      # and methods from FormTagHelper. Example:
+      # and methods from FormTagHelper. For example:
       #
       #   <% form_for :person, @person, :url => { :action => "update" } do |f| %>
       #     First name: <%= f.text_field :first_name %>
@@ -95,84 +90,260 @@ module ActionView
       #     Admin?    : <%= check_box_tag "person[admin]", @person.company.admin? %>
       #   <% end %>
       #
-      # Note: This also works for the methods in FormOptionHelper and DateHelper that are designed to work with an object as base.
-      # Like collection_select and datetime_select.
+      # Note: This also works for the methods in FormOptionHelper and DateHelper that are designed to work with an object as base,
+      # like FormOptionHelper#collection_select and DateHelper#datetime_select.
+      #
+      # HTML attributes for the form tag can be given as :html => {...}. For example:
       #
-      # Html attributes for the form tag can be given as :html => {...}. Example:
-      #     
       #   <% form_for :person, @person, :html => {:id => 'person_form'} do |f| %>
       #     ...
       #   <% end %>
       #
+      # The above form will then have the <tt>id</tt> attribute with the value </tt>person_form</tt>, which you can then
+      # style with CSS or manipulate with JavaScript.
+      #
+      # === Relying on record identification
+      #
+      # In addition to manually configuring the form_for call, you can also rely on record identification, which will use
+      # the conventions and named routes of that approach. Examples:
+      #
+      #   <% form_for(@post) do |f| %>
+      #     ...
+      #   <% end %>
+      #
+      # This will expand to be the same as:
+      #
+      #   <% form_for :post, @post, :url => post_path(@post), :html => { :method => :put, :class => "edit_post", :id => "edit_post_45" } do |f| %>
+      #     ...
+      #   <% end %>
+      #
+      # And for new records:
+      #
+      #   <% form_for(Post.new) do |f| %>
+      #     ...
+      #   <% end %>
+      #
+      # This will expand to be the same as:
+      #
+      #   <% form_for :post, @post, :url => posts_path, :html => { :class => "new_post", :id => "new_post" } do |f| %>
+      #     ...
+      #   <% end %>
+      #
+      # You can also overwrite the individual conventions, like this:
+      #
+      #   <% form_for(@post, :url => super_post_path(@post)) do |f| %>
+      #     ...
+      #   <% end %>
+      #
+      # And for namespaced routes, like admin_post_url: 
+      #
+      #   <% form_for([:admin, @post]) do |f| %>
+      #    ...
+      #   <% end %>
+      #
+      # === Customized form builders
+      #
       # You can also build forms using a customized FormBuilder class. Subclass FormBuilder and override or define some more helpers,
-      # then use your custom builder like so:
-      #   
+      # then use your custom builder. For example, let's say you made a helper to automatically add labels to form inputs.
+      #
       #   <% form_for :person, @person, :url => { :action => "update" }, :builder => LabellingFormBuilder do |f| %>
       #     <%= f.text_field :first_name %>
       #     <%= f.text_field :last_name %>
       #     <%= text_area :person, :biography %>
       #     <%= check_box_tag "person[admin]", @person.company.admin? %>
       #   <% end %>
-      # 
-      # In many cases you will want to wrap the above in another helper, such as:
+      #
+      # In many cases you will want to wrap the above in another helper, so you could do something like the following:
       #
       #   def labelled_form_for(name, object, options, &proc)
       #     form_for(name, object, options.merge(:builder => LabellingFormBuiler), &proc)
       #   end
       #
-      def form_for(object_name, *args, &proc)
+      # If you don't need to attach a form to a model instance, then check out FormTagHelper#form_tag.
+      def form_for(record_or_name_or_array, *args, &proc)
         raise ArgumentError, "Missing block" unless block_given?
-        options = args.last.is_a?(Hash) ? args.pop : {}
+
+        options = args.extract_options!
+
+        case record_or_name_or_array
+        when String, Symbol
+          object_name = record_or_name_or_array
+        when Array
+          object = record_or_name_or_array.last
+          object_name = ActionController::RecordIdentifier.singular_class_name(object)
+          apply_form_for_options!(record_or_name_or_array, options)
+          args.unshift object
+        else
+          object = record_or_name_or_array
+          object_name = ActionController::RecordIdentifier.singular_class_name(object)
+          apply_form_for_options!([object], options)
+          args.unshift object
+        end
+
         concat(form_tag(options.delete(:url) || {}, options.delete(:html) || {}), proc.binding)
         fields_for(object_name, *(args << options), &proc)
         concat('</form>', proc.binding)
       end
 
+      def apply_form_for_options!(object_or_array, options) #:nodoc:
+        object = object_or_array.is_a?(Array) ? object_or_array.last : object_or_array
+
+        html_options =
+          if object.respond_to?(:new_record?) && object.new_record?
+            { :class  => dom_class(object, :new),  :id => dom_id(object), :method => :post }
+          else
+            { :class  => dom_class(object, :edit), :id => dom_id(object, :edit), :method => :put }
+          end
+
+        options[:html] ||= {}
+        options[:html].reverse_merge!(html_options)
+        options[:url] ||= polymorphic_path(object_or_array)
+      end
+
       # Creates a scope around a specific model object like form_for, but doesn't create the form tags themselves. This makes
-      # fields_for suitable for specifying additional model objects in the same form. Example:
+      # fields_for suitable for specifying additional model objects in the same form:
       #
-      #   <% form_for :person, @person, :url => { :action => "update" } do |person_form| %>
+      # ==== Examples
+      #   <% form_for @person, :url => { :action => "update" } do |person_form| %>
       #     First name: <%= person_form.text_field :first_name %>
       #     Last name : <%= person_form.text_field :last_name %>
-      #     
-      #     <% fields_for :permission, @person.permission do |permission_fields| %>
+      #
+      #     <% fields_for @person.permission do |permission_fields| %>
       #       Admin?  : <%= permission_fields.check_box :admin %>
       #     <% end %>
       #   <% end %>
       #
-      # Note: This also works for the methods in FormOptionHelper and DateHelper that are designed to work with an object as base.
-      # Like collection_select and datetime_select.
-      def fields_for(object_name, *args, &block)
+      # ...or if you have an object that needs to be represented as a different parameter, like a Client that acts as a Person:
+      #
+      #   <% fields_for :person, @client do |permission_fields| %>
+      #     Admin?: <%= permission_fields.check_box :admin %>
+      #   <% end %>
+      #
+      # ...or if you don't have an object, just a name of the parameter
+      #
+      #   <% fields_for :person do |permission_fields| %>
+      #     Admin?: <%= permission_fields.check_box :admin %>
+      #   <% end %>
+      #
+      # Note: This also works for the methods in FormOptionHelper and DateHelper that are designed to work with an object as base,
+      # like FormOptionHelper#collection_select and DateHelper#datetime_select.
+      def fields_for(record_or_name_or_array, *args, &block)
         raise ArgumentError, "Missing block" unless block_given?
-        options = args.last.is_a?(Hash) ? args.pop : {}
-        object  = args.first
+        options = args.extract_options!
+
+        case record_or_name_or_array
+        when String, Symbol
+          object_name = record_or_name_or_array
+          object = args.first
+        when Array
+          object = record_or_name_or_array.last
+          object_name = ActionController::RecordIdentifier.singular_class_name(object)
+          apply_form_for_options!(record_or_name_or_array, options)
+        else
+          object = record_or_name_or_array
+          object_name = ActionController::RecordIdentifier.singular_class_name(object)
+        end
 
         builder = options[:builder] || ActionView::Base.default_form_builder
         yield builder.new(object_name, object, self, options, block)
       end
 
+      # Returns a label tag tailored for labelling an input field for a specified attribute (identified by +method+) on an object
+      # assigned to the template (identified by +object+). The text of label will default to the attribute name unless you specify
+      # it explicitly. Additional options on the label tag can be passed as a hash with +options+. These options will be tagged
+      # onto the HTML as an HTML element attribute as in the example shown.
+      #
+      # ==== Examples
+      #   label(:post, :title)
+      #   #=> <label for="post_title">Title</label>
+      #
+      #   label(:post, :title, "A short title")
+      #   #=> <label for="post_title">A short title</label>
+      #
+      #   label(:post, :title, "A short title", :class => "title_label")
+      #   #=> <label for="post_title" class="title_label">A short title</label>
+      #
+      def label(object_name, method, text = nil, options = {})
+        InstanceTag.new(object_name, method, self, nil, options.delete(:object)).to_label_tag(text, options)
+      end
+
       # Returns an input tag of the "text" type tailored for accessing a specified attribute (identified by +method+) on an object
       # assigned to the template (identified by +object+). Additional options on the input tag can be passed as a
-      # hash with +options+.
+      # hash with +options+. These options will be tagged onto the HTML as an HTML element attribute as in the example
+      # shown.
+      #
+      # ==== Examples
+      #   text_field(:post, :title, :size => 20)
+      #   # => <input type="text" id="post_title" name="post[title]" size="20" value="#{@post.title}" />
+      #
+      #   text_field(:post, :title, :class => "create_input")
+      #   # => <input type="text" id="post_title" name="post[title]" value="#{@post.title}" class="create_input" />
+      #
+      #   text_field(:session, :user, :onchange => "if $('session[user]').value == 'admin' { alert('Your login can not be admin!'); }")
+      #   # => <input type="text" id="session_user" name="session[user]" value="#{@session.user}" onchange = "if $('session[user]').value == 'admin' { alert('Your login can not be admin!'); }"/>
+      #
+      #   text_field(:snippet, :code, :size => 20, :class => 'code_input')
+      #   # => <input type="text" id="snippet_code" name="snippet[code]" size="20" value="#{@snippet.code}" class="code_input" />
       #
-      # Examples (call, result):
-      #   text_field("post", "title", "size" => 20)
-      #     <input type="text" id="post_title" name="post[title]" size="20" value="#{@post.title}" />
       def text_field(object_name, method, options = {})
         InstanceTag.new(object_name, method, self, nil, options.delete(:object)).to_input_field_tag("text", options)
       end
 
-      # Works just like text_field, but returns an input tag of the "password" type instead.
+      # Returns an input tag of the "password" type tailored for accessing a specified attribute (identified by +method+) on an object
+      # assigned to the template (identified by +object+). Additional options on the input tag can be passed as a
+      # hash with +options+. These options will be tagged onto the HTML as an HTML element attribute as in the example
+      # shown.
+      #
+      # ==== Examples
+      #   password_field(:login, :pass, :size => 20)
+      #   # => <input type="text" id="login_pass" name="login[pass]" size="20" value="#{@login.pass}" />
+      #
+      #   password_field(:account, :secret, :class => "form_input")
+      #   # => <input type="text" id="account_secret" name="account[secret]" value="#{@account.secret}" class="form_input" />
+      #
+      #   password_field(:user, :password, :onchange => "if $('user[password]').length > 30 { alert('Your password needs to be shorter!'); }")
+      #   # => <input type="text" id="user_password" name="user[password]" value="#{@user.password}" onchange = "if $('user[password]').length > 30 { alert('Your password needs to be shorter!'); }"/>
+      #
+      #   password_field(:account, :pin, :size => 20, :class => 'form_input')
+      #   # => <input type="text" id="account_pin" name="account[pin]" size="20" value="#{@account.pin}" class="form_input" />
+      #
       def password_field(object_name, method, options = {})
         InstanceTag.new(object_name, method, self, nil, options.delete(:object)).to_input_field_tag("password", options)
       end
 
-      # Works just like text_field, but returns an input tag of the "hidden" type instead.
+      # Returns a hidden input tag tailored for accessing a specified attribute (identified by +method+) on an object
+      # assigned to the template (identified by +object+). Additional options on the input tag can be passed as a
+      # hash with +options+. These options will be tagged onto the HTML as an HTML element attribute as in the example
+      # shown.
+      #
+      # ==== Examples 
+      #   hidden_field(:signup, :pass_confirm)
+      #   # => <input type="hidden" id="signup_pass_confirm" name="signup[pass_confirm]" value="#{@signup.pass_confirm}" />
+      #
+      #   hidden_field(:post, :tag_list)
+      #   # => <input type="hidden" id="post_tag_list" name="post[tag_list]" value="#{@post.tag_list}" />
+      #
+      #   hidden_field(:user, :token)
+      #   # => <input type="hidden" id="user_token" name="user[token]" value="#{@user.token}" />
       def hidden_field(object_name, method, options = {})
         InstanceTag.new(object_name, method, self, nil, options.delete(:object)).to_input_field_tag("hidden", options)
       end
 
-      # Works just like text_field, but returns an input tag of the "file" type instead, which won't have a default value.
+      # Returns an file upload input tag tailored for accessing a specified attribute (identified by +method+) on an object
+      # assigned to the template (identified by +object+). Additional options on the input tag can be passed as a
+      # hash with +options+. These options will be tagged onto the HTML as an HTML element attribute as in the example
+      # shown.
+      #
+      # ==== Examples
+      #   file_field(:user, :avatar)
+      #   # => <input type="file" id="user_avatar" name="user[avatar]" />
+      #
+      #   file_field(:post, :attached, :accept => 'text/html')
+      #   # => <input type="file" id="post_attached" name="post[attached]" />
+      #
+      #   file_field(:attachment, :file, :class => 'file_input')
+      #   # => <input type="file" id="attachment_file" name="attachment[file]" class="file_input" />
+      #
       def file_field(object_name, method, options = {})
         InstanceTag.new(object_name, method, self, nil, options.delete(:object)).to_input_field_tag("file", options)
       end
@@ -181,11 +352,26 @@ module ActionView
       # on an object assigned to the template (identified by +object+). Additional options on the input tag can be passed as a
       # hash with +options+.
       #
-      # Example (call, result):
-      #   text_area("post", "body", "cols" => 20, "rows" => 40)
-      #     <textarea cols="20" rows="40" id="post_body" name="post[body]">
-      #       #{@post.body}
-      #     </textarea>
+      # ==== Examples
+      #   text_area(:post, :body, :cols => 20, :rows => 40)
+      #   # => <textarea cols="20" rows="40" id="post_body" name="post[body]">
+      #   #      #{@post.body}
+      #   #    </textarea>
+      #
+      #   text_area(:comment, :text, :size => "20x30")
+      #   # => <textarea cols="20" rows="30" id="comment_text" name="comment[text]">
+      #   #      #{@comment.text}
+      #   #    </textarea>
+      #
+      #   text_area(:application, :notes, :cols => 40, :rows => 15, :class => 'app_input')
+      #   # => <textarea cols="40" rows="15" id="application_notes" name="application[notes]" class="app_input">
+      #   #      #{@application.notes}
+      #   #    </textarea>
+      #
+      #   text_area(:entry, :body, :size => "20x20", :disabled => 'disabled')
+      #   # => <textarea cols="20" rows="20" id="entry_body" name="entry[body]" disabled="disabled">
+      #   #      #{@entry.body}
+      #   #    </textarea>
       def text_area(object_name, method, options = {})
         InstanceTag.new(object_name, method, self, nil, options.delete(:object)).to_text_area_tag(options)
       end
@@ -194,18 +380,24 @@ module ActionView
       # assigned to the template (identified by +object+). It's intended that +method+ returns an integer and if that
       # integer is above zero, then the checkbox is checked. Additional options on the input tag can be passed as a
       # hash with +options+. The +checked_value+ defaults to 1 while the default +unchecked_value+
-      # is set to 0 which is convenient for boolean values. Usually unchecked checkboxes don't post anything.
-      # We work around this problem by adding a hidden value with the same name as the checkbox.
+      # is set to 0 which is convenient for boolean values. Since HTTP standards say that unchecked checkboxes don't post anything,
+      # we add a hidden value with the same name as the checkbox as a work around.
       #
-      # Example (call, result). Imagine that @post.validated? returns 1:
+      # ==== Examples 
+      #   # Let's say that @post.validated? is 1:
       #   check_box("post", "validated")
-      #     <input type="checkbox" id="post_validate" name="post[validated]" value="1" checked="checked" />
-      #     <input name="post[validated]" type="hidden" value="0" />
+      #   # => <input type="checkbox" id="post_validate" name="post[validated]" value="1" checked="checked" />
+      #   #    <input name="post[validated]" type="hidden" value="0" />
       #
-      # Example (call, result). Imagine that @puppy.gooddog returns no:
+      #   # Let's say that @puppy.gooddog is "no":
       #   check_box("puppy", "gooddog", {}, "yes", "no")
-      #     <input type="checkbox" id="puppy_gooddog" name="puppy[gooddog]" value="yes" />
-      #     <input name="puppy[gooddog]" type="hidden" value="no" />
+      #   # => <input type="checkbox" id="puppy_gooddog" name="puppy[gooddog]" value="yes" />
+      #   #    <input name="puppy[gooddog]" type="hidden" value="no" />
+      #
+      #   check_box("eula", "accepted", {}, "yes", "no", :class => 'eula_check')
+      #   # => <input type="checkbox" id="eula_accepted" name="eula[accepted]" value="no" />
+      #   #    <input name="eula[accepted]" type="hidden" value="no" />
+      #
       def check_box(object_name, method, options = {}, checked_value = "1", unchecked_value = "0")
         InstanceTag.new(object_name, method, self, nil, options.delete(:object)).to_check_box_tag(options, checked_value, unchecked_value)
       end
@@ -214,12 +406,18 @@ module ActionView
       # assigned to the template (identified by +object+). If the current value of +method+ is +tag_value+ the
       # radio button will be checked. Additional options on the input tag can be passed as a
       # hash with +options+.
-      # Example (call, result). Imagine that @post.category returns "rails":
+      #
+      # ==== Examples
+      #   # Let's say that @post.category returns "rails":
       #   radio_button("post", "category", "rails")
       #   radio_button("post", "category", "java")
-      #     <input type="radio" id="post_category" name="post[category]" value="rails" checked="checked" />
-      #     <input type="radio" id="post_category" name="post[category]" value="java" />
+      #   # => <input type="radio" id="post_category" name="post[category]" value="rails" checked="checked" />
+      #   #    <input type="radio" id="post_category" name="post[category]" value="java" />
       #
+      #   radio_button("user", "receive_newsletter", "yes")
+      #   radio_button("user", "receive_newsletter", "no")
+      #   # => <input type="radio" id="user_receive_newsletter" name="user[receive_newsletter]" value="yes" />
+      #   #    <input type="radio" id="user_receive_newsletter" name="user[receive_newsletter]" value="no" checked="checked" />
       def radio_button(object_name, method, tag_value, options = {})
         InstanceTag.new(object_name, method, self, nil, options.delete(:object)).to_radio_button_tag(tag_value, options)
       end
@@ -240,17 +438,25 @@ module ActionView
         @template_object, @local_binding = template_object, local_binding
         @object = object
         if @object_name.sub!(/\[\]$/,"")
-          if object ||= @template_object.instance_variable_get("@#{Regexp.last_match.pre_match}") and object.respond_to?(:id_before_type_cast)
-            @auto_index = object.id_before_type_cast
+          if object ||= @template_object.instance_variable_get("@#{Regexp.last_match.pre_match}") and object.respond_to?(:to_param)
+            @auto_index = object.to_param
           else
-            raise ArgumentError, "object[] naming but object param and @object var don't exist or don't respond to id_before_type_cast: #{object.inspect}"
+            raise ArgumentError, "object[] naming but object param and @object var don't exist or don't respond to to_param: #{object.inspect}"
           end
         end
       end
 
+      def to_label_tag(text = nil, options = {})
+        name_and_id = options.dup
+        add_default_name_and_id(name_and_id)
+        options["for"] = name_and_id["id"]
+        content = (text.blank? ? nil : text.to_s) || method_name.humanize
+        content_tag("label", content, options)
+      end
+
       def to_input_field_tag(field_type, options = {})
         options = options.stringify_keys
-        options["size"] ||= options["maxlength"] || DEFAULT_FIELD_OPTIONS["size"]
+        options["size"] = options["maxlength"] || DEFAULT_FIELD_OPTIONS["size"] unless options.key?("size")
         options = DEFAULT_FIELD_OPTIONS.merge(options)
         if field_type == "hidden"
           options.delete("size")
@@ -273,7 +479,7 @@ module ActionView
         end
         options["checked"]  = "checked" if checked
         pretty_tag_value    = tag_value.to_s.gsub(/\s/, "_").gsub(/\W/, "").downcase
-        options["id"]     ||= defined?(@auto_index) ?             
+        options["id"]     ||= defined?(@auto_index) ?
           "#{@object_name}_#{@auto_index}_#{@method_name}_#{pretty_tag_value}" :
           "#{@object_name}_#{@method_name}_#{pretty_tag_value}"
         add_default_name_and_id(options)
@@ -285,7 +491,7 @@ module ActionView
         add_default_name_and_id(options)
 
         if size = options.delete("size")
-          options["cols"], options["rows"] = size.split("x")
+          options["cols"], options["rows"] = size.split("x") if size.respond_to?(:split)
         end
 
         content_tag("textarea", html_escape(options.delete('value') || value_before_type_cast(object)), options)
@@ -303,7 +509,7 @@ module ActionView
         end
         options["checked"] = "checked" if checked
         add_default_name_and_id(options)
-        tag("input", options) << tag("input", "name" => options["name"], "type" => "hidden", "value" => unchecked_value)
+        tag("input", options) << tag("input", "name" => options["name"], "type" => "hidden", "value" => options['disabled'] && checked ? checked_value : unchecked_value)
       end
 
       def to_date_tag()
@@ -327,13 +533,13 @@ module ActionView
         tag_text << " selected" if value
         tag_text << ">True</option></select>"
       end
-      
+
       def to_content_tag(tag_name, options = {})
         content_tag(tag_name, value(object), options)
       end
-      
+
       def object
-        @object || @template_object.instance_variable_get("@#{@object_name}")
+        @object || (@template_object.instance_variable_get("@#{@object_name}") rescue nil)
       end
 
       def value(object)
@@ -343,12 +549,12 @@ module ActionView
       def value_before_type_cast(object)
         self.class.value_before_type_cast(object, @method_name)
       end
-      
+
       class << self
         def value(object, method_name)
           object.send method_name unless object.nil?
         end
-        
+
         def value_before_type_cast(object, method_name)
           unless object.nil?
             object.respond_to?(method_name + "_before_type_cast") ?
@@ -356,7 +562,7 @@ module ActionView
             object.send(method_name)
           end
         end
-        
+
         def check_box_checked?(value, checked_value)
           case value
           when TrueClass, FalseClass
@@ -371,7 +577,7 @@ module ActionView
             value.to_i != 0
           end
         end
-        
+
         def radio_button_checked?(value, checked_value)
           value.to_s == checked_value.to_s
         end
@@ -401,11 +607,15 @@ module ActionView
         end
 
         def tag_id
-          "#{@object_name}_#{@method_name}"
+          "#{sanitized_object_name}_#{@method_name}"
         end
 
         def tag_id_with_index(index)
-          "#{@object_name}_#{index}_#{@method_name}"
+          "#{sanitized_object_name}_#{index}_#{@method_name}"
+        end
+
+        def sanitized_object_name
+          @object_name.gsub(/[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
         end
     end
 
@@ -417,10 +627,10 @@ module ActionView
       attr_accessor :object_name, :object, :options
 
       def initialize(object_name, object, template, options, proc)
-        @object_name, @object, @template, @options, @proc = object_name, object, template, options, proc        
+        @object_name, @object, @template, @options, @proc = object_name, object, template, options, proc
       end
-      
-      (field_helpers - %w(check_box radio_button)).each do |selector|
+
+      (field_helpers - %w(label check_box radio_button fields_for)).each do |selector|
         src = <<-end_src
           def #{selector}(method, options = {})
             @template.send(#{selector.inspect}, @object_name, method, options.merge(:object => @object))
@@ -428,14 +638,47 @@ module ActionView
         end_src
         class_eval src, __FILE__, __LINE__
       end
-      
+
+      def fields_for(record_or_name_or_array, *args, &block)
+        case record_or_name_or_array
+        when String, Symbol
+          name = "#{object_name}[#{record_or_name_or_array}]"
+        when Array
+          object = record_or_name_or_array.last
+          name = "#{object_name}[#{ActionController::RecordIdentifier.singular_class_name(object)}]"
+          args.unshift(object)
+        else
+          object = record_or_name_or_array
+          name = "#{object_name}[#{ActionController::RecordIdentifier.singular_class_name(object)}]"
+          args.unshift(object)
+        end
+        
+        @template.fields_for(name, *args, &block)
+      end
+
+      def label(method, text = nil, options = {})
+        @template.label(@object_name, method, text, options.merge(:object => @object))
+      end
+
       def check_box(method, options = {}, checked_value = "1", unchecked_value = "0")
         @template.check_box(@object_name, method, options.merge(:object => @object), checked_value, unchecked_value)
       end
-      
+
       def radio_button(method, tag_value, options = {})
         @template.radio_button(@object_name, method, tag_value, options.merge(:object => @object))
       end
+
+      def error_message_on(method, prepend_text = "", append_text = "", css_class = "formError")
+        @template.error_message_on(@object, method, prepend_text, append_text, css_class)
+      end
+
+      def error_messages(options = {})
+        @template.error_messages_for(@object_name, options.merge(:object => @object))
+      end
+
+      def submit(value = "Save changes", options = {})
+        @template.submit_tag(value, options.reverse_merge(:id => "#{object_name}_submit"))
+      end
     end
   end