1 files changed, 28 insertions, 9 deletions
diff --git a/actionview/lib/action_view/helpers/tags/base.rb b/actionview/lib/action_view/helpers/tags/base.rb
index e3e3c8b109..74d6324771 100644
--- a/actionview/lib/action_view/helpers/tags/base.rb
+++ b/actionview/lib/action_view/helpers/tags/base.rb
@@ -11,8 +11,10 @@ module ActionView
           @object_name, @method_name = object_name.to_s.dup, method_name.to_s.dup
           @template_object = template_object
 
-          @object_name.sub!(/\[\]$/,"") || @object_name.sub!(/\[\]\]$/,"]")
+          @object_name.sub!(/\[\]$/, "") || @object_name.sub!(/\[\]\]$/, "]")
           @object = retrieve_object(options.delete(:object))
+          @skip_default_ids = options.delete(:skip_default_ids)
+          @allow_method_names_outside_object = options.delete(:allow_method_names_outside_object)
           @options = options
           @auto_index = Regexp.last_match ? retrieve_autoindex(Regexp.last_match.pre_match) : nil
         end
@@ -25,7 +27,11 @@ module ActionView
         private
 
           def value(object)
-            object.public_send @method_name if object
+            if @allow_method_names_outside_object
+              object.public_send @method_name if object && object.respond_to?(@method_name)
+            else
+              object.public_send @method_name if object
+            end
           end
 
           def value_before_type_cast(object)
@@ -81,15 +87,21 @@ module ActionView
           def add_default_name_and_id(options)
             index = name_and_id_index(options)
             options["name"] = options.fetch("name") { tag_name(options["multiple"], index) }
-            options["id"] = options.fetch("id") { tag_id(index) }
-            if namespace = options.delete("namespace")
-              options["id"] = options["id"] ? "#{namespace}_#{options['id']}" : namespace
+
+            unless skip_default_ids?
+              options["id"] = options.fetch("id") { tag_id(index) }
+              if namespace = options.delete("namespace")
+                options["id"] = options["id"] ? "#{namespace}_#{options['id']}" : namespace
+              end
             end
           end
 
           def tag_name(multiple = false, index = nil)
             # a little duplication to construct less strings
-            if index
+            case
+            when @object_name.empty?
+              "#{sanitized_method_name}#{"[]" if multiple}"
+            when index
               "#{@object_name}[#{index}][#{sanitized_method_name}]#{"[]" if multiple}"
             else
               "#{@object_name}[#{sanitized_method_name}]#{"[]" if multiple}"
@@ -98,7 +110,10 @@ module ActionView
 
           def tag_id(index = nil)
             # a little duplication to construct less strings
-            if index
+            case
+            when @object_name.empty?
+              sanitized_method_name.dup
+            when index
               "#{sanitized_object_name}_#{index}_#{sanitized_method_name}"
             else
               "#{sanitized_object_name}_#{sanitized_method_name}"
@@ -110,7 +125,7 @@ module ActionView
           end
 
           def sanitized_method_name
-            @sanitized_method_name ||= @method_name.sub(/\?$/,"")
+            @sanitized_method_name ||= @method_name.sub(/\?$/, "")
           end
 
           def sanitized_value(value)
@@ -152,7 +167,11 @@ module ActionView
           end
 
           def name_and_id_index(options)
-            options.key?("index") ?  options.delete("index") || "" : @auto_index
+            options.key?("index") ? options.delete("index") || "" : @auto_index
+          end
+
+          def skip_default_ids?
+            @skip_default_ids
           end
       end
     end