1 files changed, 20 insertions, 8 deletions
diff --git a/actionpack/lib/action_view/helpers/tags/base.rb b/actionpack/lib/action_view/helpers/tags/base.rb
index 449f94d347..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
 
@@ -78,7 +82,7 @@ module ActionView
             options["name"] ||= tag_name_with_index(@auto_index)
             options["id"] = options.fetch("id"){ tag_id_with_index(@auto_index) }
           else
-            options["name"] ||= tag_name + (options['multiple'] ? '[]' : '')
+            options["name"] ||= options['multiple'] ? tag_name_multiple : tag_name
             options["id"] = options.fetch("id"){ tag_id }
           end
           options["id"] = [options.delete('namespace'), options["id"]].compact.join("_").presence
@@ -88,6 +92,10 @@ module ActionView
           "#{@object_name}[#{sanitized_method_name}]"
         end
 
+        def tag_name_multiple
+          "#{tag_name}[]"
+        end
+
         def tag_name_with_index(index)
           "#{@object_name}[#{index}][#{sanitized_method_name}]"
         end
@@ -108,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)