Ticket #7139: patch-for-7139.diff

actionpack/test/template/form_helper_test.rb

@@ -76 +76 @@
-    assert_equal expected, text_field(object_name, "title")
-    assert_equal object_name, "post[]"
-  end
+  
+  def test_label_for_without_value
+    expected = '<label for="post_title">Post Title</label>'
+    assert_equal expected, label_for("post", "title")
+    assert_equal expected, label_for(:post, :title)
+    
+    expected = '<label for="post_author_name">Post Author name</label>'
+    assert_equal expected, label_for(:post, :author_name)
+  end
+  
+  def test_label_for
+    expected = '<label for="post_title">Funky Title</label>'
+    assert_equal expected, label_for("post", "title", "Funky Title")
+    assert_equal expected, label_for(:post, :title, "Funky Title")
+  end
+  
+  def test_label_for_with_params
+    expected = '<label class="blues" for="post_title" id="funky">Funky Title</label>'
+    assert_equal expected, label_for("post", "title", "Funky Title", 
+                                     :id => "funky", :class => "blues")
+  end
+  
+  def test_label_for_doesnt_change_param_values
+    object_name = 'post[]'
+    expected = '<label for="post_123_title">Post Title</label>'
+    assert_equal expected, label_for(object_name, "title")
+    assert_equal object_name, "post[]"
+  end
-
-  def test_check_box
-    assert_dom_equal(

actionpack/lib/action_view/helpers/form_helper.rb

@@ -151 +151 @@
-        yield builder.new(object_name, object, self, options, block)
-      end
-
+      # Returns a label tag tailored for labeling a form field for a 
+      # specified attribute (identified by +method+) on an object
+      # assigned to the template (identified by +object+). Additional 
+      # options on the label tag can be passed as a
+      # hash with +options+.
+      #
+      # Examples (call, result):
+      #   label_for("post", "title")
+      #     <label for="post_title">Post Title</label>
+      #     
+      #   label_for("post", "title", "Funky Title")
+      #     <label for="post_title">Funky Title</label>
+      #
+      #   label_for("post", "title", "Funky Title", :id => "funky")
+      #     <label for="post_title" id="funky">Funky Title</label>
+      def label_for(object_name, method, value = nil, options = {})
+        InstanceTag.new(object_name, method, self, nil, options.delete(:object)).to_label_tag(value, 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+.
@@ -280 +299 @@
-        tag("input", options)
-      end
-
+      def to_label_tag(value = nil, options = {})
+        options = options.stringify_keys
+        value ||= "#{sanitized_object_name.capitalize} #{@method_name.gsub("_", " ").capitalize}"
+        add_default_for(options)
+        content_tag_without_error_wrapping("label", value, options)
+      end
+
-      def to_text_area_tag(options = {})
-        options = DEFAULT_TEXT_AREA_OPTIONS.merge(options.stringify_keys)
-        add_default_name_and_id(options)
@@ -391 +417 @@
-            options["id"]   ||= tag_id
-          end
-        end
+        
+        def add_default_for(options)
+          if options.has_key?("index")
+            options["for"]   ||= tag_id_with_index(options["index"])
+            options.delete("index")
+          elsif defined?(@auto_index)
+            options["for"]   ||= tag_id_with_index(@auto_index)
+          else
+            options["for"]   ||= tag_id
+          end
+        end
-
-        def tag_name
-          "#{@object_name}[#{@method_name}]"