From eb9ecd217777c2ba0e40f724ffb5212ed550e03a Mon Sep 17 00:00:00 2001
From: Steve St. Martin <kuprishuz@gmail.com>
Date: Fri, 7 Aug 2009 21:42:50 -0400
Subject: [PATCH] radio_button_tag should use sanitize_to_id for consistency

---
 .../lib/action_view/helpers/form_tag_helper.rb     |    4 +---
 actionpack/test/template/form_tag_helper_test.rb   |   10 ++++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index c217191..2d36cbc 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -312,9 +312,7 @@ module ActionView
       #   radio_button_tag 'color', "green", true, :class => "color_input"
       #   # => <input checked="checked" class="color_input" id="color_green" name="color" type="radio" value="green" />
       def radio_button_tag(name, value, checked = false, options = {})
-        pretty_tag_value = value.to_s.gsub(/\s/, "_").gsub(/(?!-)\W/, "").downcase
-        pretty_name = name.to_s.gsub(/\[/, "_").gsub(/\]/, "")
-        html_options = { "type" => "radio", "name" => name, "id" => "#{pretty_name}_#{pretty_tag_value}", "value" => value }.update(options.stringify_keys)
+        html_options = { "type" => "radio", "name" => name, "id" => sanitize_to_id("#{name}_#{value}"), "value" => value }.update(options.stringify_keys)
         html_options["checked"] = "checked" if checked
         tag :input, html_options
       end
diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb
index 09a0c64..4b6d158 100644
--- a/actionpack/test/template/form_tag_helper_test.rb
+++ b/actionpack/test/template/form_tag_helper_test.rb
@@ -112,6 +112,16 @@ class FormTagHelperTest < ActionView::TestCase
     assert_dom_equal expected, actual
   end
 
+  def test_radio_button_id_should_match_label_for
+    name = "webserver"
+    value = "Apache 2.2"
+
+    radio_id = Regexp.new("id=['|\"](.*?)['|\"]").match(radio_button_tag(name, value))[1]
+    label_for = Regexp.new("for=['|\"](.*?)['|\"]").match(label_tag("#{name}_#{value}", value))[1]
+
+    assert_equal radio_id, label_for, "radio id attribute should match label for attribute"
+  end
+  
   def test_select_tag
     actual = select_tag "people", "<option>david</option>"
     expected = %(<select id="people" name="people"><option>david</option></select>)
-- 
1.6.4