Ticket #9915: make_index_consistent_with_radio_buttons_and_labels.diff

actionpack/test/template/form_helper_test.rb

@@ -72 +72 @@
-
-  def test_label
-    assert_dom_equal('<label for="post_title">Title</label>', label("post", "title"))
+    assert_dom_equal('<label for="post_title_value">Title</label>', label("post", "title",nil,"radio_button_value"=>"value"))
+    assert_dom_equal(label("post", "title",nil,:radio_button_value=>"value"), label("post", "title",nil,"radio_button_value"=>"value"))
-    assert_dom_equal('<label for="post_title">The title goes here</label>', label("post", "title", "The title goes here"))
-    assert_dom_equal(
-      '<label class="title_label" for="post_title">Title</label>',
@@ -262 +264 @@
-                 check_box("post", "secret", :id => "i mean it")
-  end
-
+  def test_index
+    pid = @post.id
+    index = "INDEX"
+    assert_dom_equal(
+      "<label for=\"post_#{index}_title\">Title</label>", label("post[]","title", nil, "index" => index)
+    )
+    assert_dom_equal(
+      "<label for=\"post_#{index}_title_goodbye_world\">Title</label>", label("post","title",nil,"index"=>index, "radio_button_value"=>"goodbye_world")
+    )
+    assert_dom_equal(
+      "<input id=\"post_#{index}_title\" name=\"post[#{index}][title]\" size=\"30\" type=\"text\" value=\"Hello World\" />", text_field("post","title", "index"=>index)
+    )
+    assert_dom_equal(
+      "<textarea cols=\"40\" id=\"post_#{index}_body\" name=\"post[#{index}][body]\" rows=\"20\">Back to the hill and over it again!</textarea>",
+      text_area("post", "body", "index"=>index)
+    )
+    assert_dom_equal(
+      "<input checked=\"checked\" id=\"post_#{index}_secret\" name=\"post[#{index}][secret]\" type=\"checkbox\" value=\"1\" /><input name=\"post[#{index}][secret]\" type=\"hidden\" value=\"0\" />",
+      check_box("post", "secret","index"=>index)
+    )
+   assert_dom_equal(
+  "<input checked=\"checked\" id=\"post_#{index}_title_hello_world\" name=\"post[#{index}][title]\" type=\"radio\" value=\"Hello World\" />",
+      radio_button("post", "title", "Hello World","index"=>index)
+    )
+    assert_dom_equal("<input id=\"post_#{index}_title_goodbye_world\" name=\"post[#{index}][title]\" type=\"radio\" value=\"Goodbye World\" />",
+      radio_button("post", "title", "Goodbye World","index"=>index)
+    )
+
+    assert_equal label("post","title",nil,"index"=>"dont guess"),
+                 label("post","title",nil,:index=>"dont guess")
+    assert_equal label("post","title",nil,"index"=>"dont guess","radio_button_value"=>"add"),
+                label("post","title",nil,:index=>"dont guess",:radio_button_value=>"add")
+    assert_dom_equal text_field("post", "title", "index" => "dont guess"),
+                 text_field("post", "title", :index => "dont guess")
+    assert_dom_equal text_area("post", "body", "index" => "really!"),
+                 text_area("post", "body", :index => "really!")
+    assert_dom_equal check_box("post", "secret", "index" => "i mean it"),
+                 check_box("post", "secret", :index => "i mean it")
+
+  end
+
+
-  def test_auto_index
-    pid = @post.id
-    assert_dom_equal(
+      "<label for=\"post_#{pid}_title\">Title</label>", label("post[]","title")
+    )
+    assert_dom_equal(
+      "<label for=\"post_#{pid}_title_goodbye_world\">Title</label>", label("post[]","title",nil,"radio_button_value"=>"goodbye_world")
+    )
+    assert_dom_equal(
-      "<input id=\"post_#{pid}_title\" name=\"post[#{pid}][title]\" size=\"30\" type=\"text\" value=\"Hello World\" />", text_field("post[]","title")
-    )
-    assert_dom_equal(
@@ -353 +403 @@
-    _erbout = ''
-    
-    form_for("post[]", @post) do |f|
+      _erbout.concat f.label(:title)
-      _erbout.concat f.text_field(:title)
-      _erbout.concat f.text_area(:body)
-      _erbout.concat f.check_box(:secret)
@@ -360 +411 @@
-    
-    expected = 
-      "<form action='http://www.example.com' method='post'>" +
+      "<label for='post_123_title'>Title</label>" +
-      "<input name='post[123][title]' size='30' type='text' id='post_123_title' value='Hello World' />" +
-      "<textarea name='post[123][body]' id='post_123_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='post[123][secret]' checked='checked' type='checkbox' id='post_123_secret' value='1' />" +

actionpack/lib/action_view/helpers/form_helper.rb

@@ -230 +230 @@
-      # 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.
-      #
+      # Passing a <tt>:radio_button_value</tt> appends +radio_button_value+ to the end of the "for" attribute so that labels can 
+      # correctly identify radio buttons.
+      #
-      # ==== Examples
-      #   label(:post, :title)
-      #   #=> <label for="post_title">Title</label>
@@ -240 +243 @@
-      #   label(:post, :title, "A short title", :class => "title_label")
-      #   #=> <label for="post_title" class="title_label">A short title</label>
-      #
+      #   label("post[]", :title, "A short title")
+      #   #=> <label for="post_<%= @post.id %>_title">A short title</label>
+      #
+      #   label(:post, :title, "A short title", :index => 1)
+      #   #=> <label for="post_1_title">A short title</label>
+      #
+      #   label("post[]", :title, "A short title", :radio_button_value => "rails")
+      #   #=> <label for="post_<%= @post.id %>_title_rails">A short title</label>
+      #
+      #   label(:post, :title, "A short title", :index => 1, :radio_button_value => "rails")
+      #   #=> <label for="post_1_title_rails">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
@@ -395 +410 @@
-      #   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" />
+      #
+      #   # Let's say that @posts has 2 posts, 1 with the category "rails", the other with the category "java"
+      #   <%- @posts.each do |post| -%>
+      #     <%- @post = post -%>
+      #     <p>
+      #       <%= radio_button("post[]", "category", "rails") %>
+      #       <%= radio_button("post[]", "category", "java") %>
+      #     </p>
+      #   <%- end -%>
+      #   # =>  <p>
+      #   #       <input type="radio" id="post_1_category" name="post[1][category]" value="rails" checked="checked" />
+      #   #       <input type="radio" id="post_1_category" name="post[1][category]" value="java" />
+      #   #     </p>
+      #   #     <p>
+      #   #       <input type="radio" id="post_1_category" name="post[2][category]" value="rails"/>
+      #   #       <input type="radio" id="post_1_category" name="post[2][category]" value="java" checked="checked" />
+      #   #     </p>
+      #   
+      #   <%- @posts.each do |post| -%>
+      #       <%= radio_button("post", "category", "rails", :index=>post.id) %>
+      #       <%= radio_button("post", "category", "java", :index=>post.id) %>
+      #   <%- end -%>
+      #   # =>  <p>
+      #   #       <input type="radio" id="post_1_category" name="post[1][category]" value="rails" checked="checked" />
+      #   #       <input type="radio" id="post_1_category" name="post[1][category]" value="java" />
+      #   #     </p>
+      #   #     <p>
+      #   #       <input type="radio" id="post_1_category" name="post[2][category]" value="rails"/>
+      #   #       <input type="radio" id="post_1_category" name="post[2][category]" value="java" checked="checked" />
+      #   #     </p>
+      #
-      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
@@ -424 +470 @@
-      end
-
-      def to_label_tag(text = nil, options = {})
+        options = options.stringify_keys
-        name_and_id = options.dup
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        content = (text.blank? ? nil : text.to_s) || method_name.humanize
-        content_tag("label", content, options)
-      end
@@ -455 +521 @@
-          checked = self.class.radio_button_checked?(value(object), tag_value)
-        end
-        options["checked"]  = "checked" if checked
-
-
-
-
+
+
+
+
+
+
+
+
-        add_default_name_and_id(options)
-        tag("input", options)
-      end
@@ -594 +664 @@
-        def sanitized_object_name
-          @object_name.gsub(/[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
-        end
+
+        def sanitized_tag_value(tag_value)
+          tag_value.to_s.gsub(/\s/, "_").gsub(/\W/, "").downcase
+        end
-    end
-
-    class FormBuilder #:nodoc: