0
@@ -1,6 +1,7 @@
0
 require 'cgi'
0
 require 'action_view/helpers/date_helper'
0
 require 'action_view/helpers/tag_helper'
0
+require 'action_view/helpers/form_tag_helper'
0
 
0
 module ActionView
0
   module Helpers
0
@@ -51,7 +52,7 @@ module ActionView
0
     #
0
     # If the object name contains square brackets the id for the object will be inserted. For example:
0
     #
0
-    #   <%= text_field "person[]", "name" %> 
0
+    #   <%= text_field "person[]", "name" %>
0
     #
0
     # ...will generate the following ERb.
0
     #
0
@@ -91,7 +92,7 @@ module ActionView
0
       #
0
       # Even further, the form_for method allows you to more easily escape the instance variable convention. So while the stand-alone
0
       # approach would require <tt>text_field :person, :name, :object => person</tt>
0
-      # to work with local variables instead of instance ones, the form_for calls remain the same. You simply declare once with 
0
+      # to work with local variables instead of instance ones, the form_for calls remain the same. You simply declare once with
0
       # <tt>:person, person</tt> and all subsequent field calls save <tt>:person</tt> and <tt>:object => person</tt>.
0
       #
0
       # Also note that form_for doesn't create an exclusive scope. It's still possible to use both the stand-alone FormHelper methods
0
@@ -149,7 +150,7 @@ module ActionView
0
       #     ...
0
       #   <% end %>
0
       #
0
-      # And for namespaced routes, like admin_post_url: 
0
+      # And for namespaced routes, like admin_post_url:
0
       #
0
       #   <% form_for([:admin, @post]) do |f| %>
0
       #    ...
0
@@ -337,7 +338,7 @@ module ActionView
0
       # hash with +options+. These options will be tagged onto the HTML as an HTML element attribute as in the example
0
       # shown.
0
       #
0
-      # ==== Examples 
0
+      # ==== Examples
0
       #   hidden_field(:signup, :pass_confirm)
0
       #   # => <input type="hidden" id="signup_pass_confirm" name="signup[pass_confirm]" value="#{@signup.pass_confirm}" />
0
       #
0
@@ -404,7 +405,7 @@ module ActionView
0
       # is set to 0 which is convenient for boolean values. Since HTTP standards say that unchecked checkboxes don't post anything,
0
       # we add a hidden value with the same name as the checkbox as a work around.
0
       #
0
-      # ==== Examples 
0
+      # ==== Examples
0
       #   # Let's say that @post.validated? is 1:
0
       #   check_box("post", "validated")
0
       #   # => <input type="checkbox" id="post_validated" name="post[validated]" value="1" />
0
@@ -445,7 +446,7 @@ module ActionView
0
     end
0
 
0
     class InstanceTag #:nodoc:
0
-      include Helpers::TagHelper
0
+      include Helpers::TagHelper, Helpers::FormTagHelper
0
 
0
       attr_reader :method_name, :object_name
0
 
0
@@ -467,11 +468,12 @@ module ActionView
0
       end
0
 
0
       def to_label_tag(text = nil, options = {})
0
+        options = options.stringify_keys
0
         name_and_id = options.dup
0
         add_default_name_and_id(name_and_id)
0
-        options["for"] = name_and_id["id"]
0
+        options["for"] ||= name_and_id["id"]
0
         content = (text.blank? ? nil : text.to_s) || method_name.humanize
0
-        content_tag("label", content, options)
0
+        label_tag(name_and_id["id"], content, options)
0
       end
0
 
0
       def to_input_field_tag(field_type, options = {})

0
@@ -6,11 +6,11 @@ silence_warnings do
0
     alias_method :title_before_type_cast, :title unless respond_to?(:title_before_type_cast)
0
     alias_method :body_before_type_cast, :body unless respond_to?(:body_before_type_cast)
0
     alias_method :author_name_before_type_cast, :author_name unless respond_to?(:author_name_before_type_cast)
0
-    
0
+
0
     def new_record=(boolean)
0
       @new_record = boolean
0
     end
0
-    
0
+
0
     def new_record?
0
       @new_record
0
     end
0
@@ -36,13 +36,13 @@ class FormHelperTest < ActionView::TestCase
0
   def setup
0
     @post = Post.new
0
     @comment = Comment.new
0
-    def @post.errors() 
0
-      Class.new{ 
0
-        def on(field); "can't be empty" if field == "author_name"; end 
0
-        def empty?() false end 
0
+    def @post.errors()
0
+      Class.new{
0
+        def on(field); "can't be empty" if field == "author_name"; end
0
+        def empty?() false end
0
         def count() 1 end
0
-        def full_messages() [ "Author name can't be empty" ] end  
0
-      }.new 
0
+        def full_messages() [ "Author name can't be empty" ] end
0
+      }.new
0
     end
0
     def @post.id; 123; end
0
     def @post.id_before_type_cast; 123; end
0
@@ -72,11 +72,19 @@ class FormHelperTest < ActionView::TestCase
0
       label("post", "title", nil, :class => 'title_label')
0
     )
0
   end
0
-  
0
+
0
   def test_label_with_symbols
0
     assert_dom_equal('<label for="post_title">Title</label>', label(:post, :title))
0
   end
0
 
0
+  def test_label_with_for_attribute_as_symbol
0
+    assert_dom_equal('<label for="my_for">Title</label>', label(:post, :title, nil, :for => "my_for"))
0
+  end
0
+
0
+  def test_label_with_for_attribute_as_string
0
+    assert_dom_equal('<label for="my_for">Title</label>', label(:post, :title, nil, "for" => "my_for"))
0
+  end
0
+
0
   def test_text_field
0
     assert_dom_equal(
0
       '<input id="post_title" name="post[title]" size="30" type="text" value="Hello World" />', text_field("post", "title")
0
@@ -303,7 +311,7 @@ class FormHelperTest < ActionView::TestCase
0
       _erbout.concat f.submit('Create post')
0
     end
0
 
0
-    expected = 
0
+    expected =
0
       "<form action='http://www.example.com' id='create-post' method='post'>" +
0
       "<label for='post_title'>Title</label>" +
0
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
0
@@ -325,7 +333,7 @@ class FormHelperTest < ActionView::TestCase
0
       _erbout.concat f.check_box(:secret)
0
     end
0
 
0
-    expected = 
0
+    expected =
0
       "<form action='http://www.example.com' id='create-post' method='post'>" +
0
       "<div style='margin:0;padding:0'><input name='_method' type='hidden' value='put' /></div>" +
0
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
0
@@ -346,7 +354,7 @@ class FormHelperTest < ActionView::TestCase
0
       _erbout.concat f.check_box(:secret)
0
     end
0
 
0
-    expected = 
0
+    expected =
0
       "<form action='http://www.example.com' id='create-post' method='post'>" +
0
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
0
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
0
@@ -367,7 +375,7 @@ class FormHelperTest < ActionView::TestCase
0
       _erbout.concat f.check_box(:secret)
0
     end
0
 
0
-    expected = 
0
+    expected =
0
       "<form action='http://www.example.com' method='post'>" +
0
       "<label for=\"post_123_title\">Title</label>" +
0
       "<input name='post[123][title]' size='30' type='text' id='post_123_title' value='Hello World' />" +
0
@@ -423,7 +431,7 @@ class FormHelperTest < ActionView::TestCase
0
       _erbout.concat f.check_box(:secret)
0
     end
0
 
0
-    expected = 
0
+    expected =
0
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
0
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
0
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
0
@@ -494,7 +502,7 @@ class FormHelperTest < ActionView::TestCase
0
       _erbout.concat f.check_box(:secret)
0
     end
0
 
0
-    expected = 
0
+    expected =
0
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
0
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
0
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
0
@@ -511,7 +519,7 @@ class FormHelperTest < ActionView::TestCase
0
       _erbout.concat f.check_box(:secret)
0
     end
0
 
0
-    expected = 
0
+    expected =
0
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
0
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
0
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
0
@@ -548,7 +556,7 @@ class FormHelperTest < ActionView::TestCase
0
       end
0
     end
0
 
0
-    expected = 
0
+    expected =
0
       "<form action='http://www.example.com' id='create-post' method='post'>" +
0
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
0
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
0
@@ -571,7 +579,7 @@ class FormHelperTest < ActionView::TestCase
0
       end
0
     end
0
 
0
-    expected = 
0
+    expected =
0
       "<form action='http://www.example.com' id='create-post' method='post'>" +
0
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
0
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
0
@@ -601,7 +609,7 @@ class FormHelperTest < ActionView::TestCase
0
       _erbout.concat f.check_box(:secret)
0
     end
0
 
0
-    expected = 
0
+    expected =
0
       "<form action='http://www.example.com' method='post'>" +
0
       "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>" +
0
       "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea><br/>" +
0
@@ -623,7 +631,7 @@ class FormHelperTest < ActionView::TestCase
0
       _erbout.concat f.check_box(:secret)
0
     end
0
 
0
-    expected = 
0
+    expected =
0
       "<form action='http://www.example.com' method='post'>" +
0
       "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>" +
0
       "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea><br/>" +
0
@@ -637,39 +645,39 @@ class FormHelperTest < ActionView::TestCase
0
   end
0
 
0
   def test_default_form_builder_with_active_record_helpers
0
-     
0
-    _erbout = '' 
0
+
0
+    _erbout = ''
0
     form_for(:post, @post) do |f|
0
        _erbout.concat f.error_message_on('author_name')
0
        _erbout.concat f.error_messages
0
-    end    
0
-    
0
-    expected = %(<form action='http://www.example.com' method='post'>) + 
0
-               %(<div class='formError'>can't be empty</div>) + 
0
+    end
0
+
0
+    expected = %(<form action='http://www.example.com' method='post'>) +
0
+               %(<div class='formError'>can't be empty</div>) +
0
                %(<div class="errorExplanation" id="errorExplanation"><h2>1 error prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>) +
0
                %(</form>)
0
-    
0
+
0
     assert_dom_equal expected, _erbout
0
 
0
   end
0
-  
0
+
0
   def test_default_form_builder_no_instance_variable
0
     post = @post
0
     @post = nil
0
-    
0
-    _erbout = '' 
0
+
0
+    _erbout = ''
0
     form_for(:post, post) do |f|
0
        _erbout.concat f.error_message_on('author_name')
0
        _erbout.concat f.error_messages
0
-    end    
0
-    
0
-    expected = %(<form action='http://www.example.com' method='post'>) + 
0
-               %(<div class='formError'>can't be empty</div>) + 
0
+    end
0
+
0
+    expected = %(<form action='http://www.example.com' method='post'>) +
0
+               %(<div class='formError'>can't be empty</div>) +
0
                %(<div class="errorExplanation" id="errorExplanation"><h2>1 error prohibited this post from being saved</h2><p>There were problems with the following fields:</p><ul><li>Author name can't be empty</li></ul></div>) +
0
                %(</form>)
0
-    
0
+
0
     assert_dom_equal expected, _erbout
0
-    
0
+
0
   end
0
 
0
   # Perhaps this test should be moved to prototype helper tests.
0
@@ -683,7 +691,7 @@ class FormHelperTest < ActionView::TestCase
0
        _erbout.concat f.check_box(:secret)
0
      end
0
 
0
-     expected = 
0
+     expected =
0
        %(<form action="http://www.example.com" onsubmit="new Ajax.Request('http://www.example.com', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;" method="post">) +
0
        "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>" +
0
        "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea><br/>" +
0
@@ -693,31 +701,31 @@ class FormHelperTest < ActionView::TestCase
0
 
0
      assert_dom_equal expected, _erbout
0
   end
0
-   
0
+
0
   def test_fields_for_with_labelled_builder
0
     _erbout = ''
0
-    
0
+
0
     fields_for(:post, @post, :builder => LabelledFormBuilder) do |f|
0
       _erbout.concat f.text_field(:title)
0
       _erbout.concat f.text_area(:body)
0
       _erbout.concat f.check_box(:secret)
0
     end
0
-    
0
-    expected = 
0
+
0
+    expected =
0
       "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>" +
0
       "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea><br/>" +
0
       "<label for='secret'>Secret:</label> <input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
0
       "<input name='post[secret]' type='hidden' value='0' /><br/>"
0
-    
0
+
0
     assert_dom_equal expected, _erbout
0
   end
0
 
0
   def test_form_for_with_html_options_adds_options_to_form_tag
0
     _erbout = ''
0
-    
0
+
0
     form_for(:post, @post, :html => {:id => 'some_form', :class => 'some_class'}) do |f| end
0
     expected = "<form action=\"http://www.example.com\" class=\"some_class\" id=\"some_form\" method=\"post\"></form>"
0
-    
0
+
0
     assert_dom_equal expected, _erbout
0
   end
0
 
0
@@ -793,16 +801,16 @@ class FormHelperTest < ActionView::TestCase
0
     @comment.save
0
     _erbout = ''
0
     form_for([:admin, @post, @comment]) {}
0
-  
0
+
0
     expected = %(<form action="#{admin_comment_path(@post, @comment)}" class="edit_comment" id="edit_comment_1" method="post"><div style="margin:0;padding:0"><input name="_method" type="hidden" value="put" /></div></form>)
0
     assert_dom_equal expected, _erbout
0
   end
0
-  
0
+
0
   def test_form_for_with_new_object_and_namespace_in_list
0
     @post.new_record = false
0
     _erbout = ''
0
     form_for([:admin, @post, @comment]) {}
0
-  
0
+
0
     expected = %(<form action="#{admin_comments_path(@post)}" class="new_comment" id="new_comment" method="post"></form>)
0
     assert_dom_equal expected, _erbout
0
   end
0
@@ -819,10 +827,10 @@ class FormHelperTest < ActionView::TestCase
0
   def test_remote_form_for_with_html_options_adds_options_to_form_tag
0
     self.extend ActionView::Helpers::PrototypeHelper
0
     _erbout = ''
0
-    
0
+
0
     remote_form_for(:post, @post, :html => {:id => 'some_form', :class => 'some_class'}) do |f| end
0
     expected = "<form action=\"http://www.example.com\" class=\"some_class\" id=\"some_form\" method=\"post\" onsubmit=\"new Ajax.Request('http://www.example.com', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;\"></form>"
0
-    
0
+
0
     assert_dom_equal expected, _erbout
0
   end
0
 
0
@@ -837,21 +845,21 @@ class FormHelperTest < ActionView::TestCase
0
       "/posts/#{post.id}/comments/#{comment.id}"
0
     end
0
     alias_method :post_comment_path, :comment_path
0
-    
0
+
0
     def admin_comments_path(post)
0
       "/admin/posts/#{post.id}/comments"
0
     end
0
     alias_method :admin_post_comments_path, :admin_comments_path
0
-    
0
+
0
     def admin_comment_path(post, comment)
0
       "/admin/posts/#{post.id}/comments/#{comment.id}"
0
     end
0
     alias_method :admin_post_comment_path, :admin_comment_path
0
-    
0
+
0
     def posts_path
0
       "/posts"
0
-    end 
0
-    
0
+    end
0
+
0
     def post_path(post)
0
       "/posts/#{post.id}"
0
     end