Refactor value sanitization logic

* Extract value sanitization from default name and id method and new
  collection helpers;
* No need to sanitize value in default name and id always;
* Improve value_before_type_cast to avoid concating the same method name
  string twice.

[Carlos Antonio da Silva + Rafael Mendonça França]

2 files changed, 16 insertions, 8 deletions

diff --git a/actionpack/lib/action_view/helpers/tags/base.rb b/actionpack/lib/action_view/helpers/tags/base.rb
index ec8e3caf3a..e22612ccd0 100644
--- a/actionpack/lib/action_view/helpers/tags/base.rb
+++ b/actionpack/lib/action_view/helpers/tags/base.rb
@@ -32,9 +32,11 @@ module ActionView
 
         def value_before_type_cast(object)
           unless object.nil?
-            object.respond_to?(@method_name + "_before_type_cast") ?
-            object.send(@method_name + "_before_type_cast") :
-            object.send(@method_name)
+            method_before_type_cast = @method_name + "_before_type_cast"
+
+            object.respond_to?(method_before_type_cast) ?
+              object.send(method_before_type_cast) :
+              object.send(@method_name)
           end
         end
 
@@ -59,13 +61,15 @@ module ActionView
         end
 
         def add_default_name_and_id_for_value(tag_value, options)
-          unless tag_value.nil?
-            pretty_tag_value = tag_value.to_s.gsub(/\s/, "_").gsub(/[^-\w]/, "").downcase
-            specified_id = options["id"]
+          if tag_value.nil?
             add_default_name_and_id(options)
-            options["id"] += "_#{pretty_tag_value}" if specified_id.blank? && options["id"].present?
           else
+            specified_id = options["id"]
             add_default_name_and_id(options)
+
+            if specified_id.blank? && options["id"].present?
+              options["id"] += "_#{sanitized_value(tag_value)}"
+            end
           end
         end
 
@@ -112,6 +116,10 @@ module ActionView
           @sanitized_method_name ||= @method_name.sub(/\?$/,"")
         end
 
+        def sanitized_value(value)
+          value.to_s.gsub(/\s/, "_").gsub(/[^-\w]/, "").downcase
+        end
+
         def select_content_tag(option_tags, options, html_options)
           html_options = html_options.stringify_keys
           add_default_name_and_id(html_options)
diff --git a/actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb b/actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb
index cd02408833..201eff048c 100644
--- a/actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb
+++ b/actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb
@@ -45,7 +45,7 @@ module ActionView
         end
 
         def sanitize_attribute_name(value) #:nodoc:
-          "#{sanitized_method_name}_#{value.to_s.gsub(/\s/, "_").gsub(/[^-\w]/, "").downcase}"
+          "#{sanitized_method_name}_#{sanitized_value(value)}"
         end
 
         def render_collection #:nodoc: