Ticket #4627: radio_button_label_option.patch

actionpack/lib/action_view/helpers/form_helper.rb

@@ -214 +214 @@
-      # hash with +options+.
-      # Example (call, result). Imagine that @post.category returns "rails":
-      #   radio_button("post", "category", "rails")
-
+, :label => "Java"
-      #     <input type="radio" id="post_category" name="post[category]" value="rails" checked="checked" />
- /
+>Java</input
-      #
-      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)
@@ -265 +265 @@
-          "#{@object_name}_#{@auto_index}_#{@method_name}_#{pretty_tag_value}" :
-          "#{@object_name}_#{@method_name}_#{pretty_tag_value}"
-        add_default_name_and_id(options)
-
+
+
+
+
+
-      end
-
-      def to_text_area_tag(options = {})

actionpack/lib/action_view/helpers/form_tag_helper.rb

@@ -109 +109 @@
-      end
-
-      # Creates a radio button.
+      #
+      # Options:
+      # * <tt>:label</tt> - A string specifying the content of the tag.
+      #     # Outputs <input id="people" name="people" type="radio" value="david">david</input>
+      #     <%=  radio_button_tag "people", "david", false, "label" => "david" %>
-      def radio_button_tag(name, value, checked = false, options = {})
-        html_options = { "type" => "radio", "name" => name, "id" => name, "value" => value }.update(options.stringify_keys)
-        html_options["checked"] = "checked" if checked
-
+
+
+
+
+
-      end
-
-      # Creates a submit button with the text <tt>value</tt> as the caption. If options contains a pair with the key of "disable_with",

actionpack/test/template/form_helper_test.rb

@@ -121 +121 @@
-   )
-  end
-
+  def test_radio_button_with_label
+    assert_dom_equal('<input id="post_title_goodbye_world" name="post[title]" type="radio" value="Goodbye World">Goodby World</input>',
+      radio_button("post", "title", "Goodbye World", :label => "Goodby World")
+    )
+  end
+
-  def test_text_area
-    assert_dom_equal(
-      '<textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea>',

actionpack/test/template/form_tag_helper_test.rb

@@ -51 +51 @@
-    assert_dom_equal expected, actual
-  end
-
+  def test_radio_button_tag_with_label
+    actual = radio_button_tag "people", "david", false, :label => "david"
+    expected = %(<input id="people" name="people" type="radio" value="david">david</input>)
+    assert_dom_equal expected, actual
+  end
+
-  def test_select_tag
-    actual = select_tag "people", "<option>david</option>"
-    expected = %(<select id="people" name="people"><option>david</option></select>)