Remove collection_wrapper* and item_wrapper* options

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

2 files changed, 3 insertions, 21 deletions

diff --git a/actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb b/actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
index 1103341888..7c85441c5d 100644
--- a/actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
+++ b/actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
@@ -20,7 +20,7 @@ module ActionView
           # server if all check boxes are unchecked.
           hidden = @template_object.hidden_field_tag(tag_name_multiple, "", :id => nil)
 
-          wrap_rendered_collection(rendered_collection + hidden)
+          rendered_collection + hidden
         end
       end
     end
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 201eff048c..3d04ae3579 100644
--- a/actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb
+++ b/actionpack/lib/action_view/helpers/tags/collection_radio_buttons.rb
@@ -5,7 +5,7 @@ module ActionView
         delegate :radio_button, :label, :to => :@template_object
 
         def render
-          rendered_collection = render_collection do |value, text, default_html_options|
+          render_collection do |value, text, default_html_options|
             if block_given?
               yield sanitize_attribute_name(value), text, value, default_html_options
             else
@@ -13,8 +13,6 @@ module ActionView
                 label(@object_name, sanitize_attribute_name(value), text, :class => "collection_radio_buttons")
             end
           end
-
-          wrap_rendered_collection(rendered_collection)
         end
 
         private
@@ -49,34 +47,18 @@ module ActionView
         end
 
         def render_collection #:nodoc:
-          item_wrapper_tag   = @options.fetch(:item_wrapper_tag, :span)
-          item_wrapper_class = @options[:item_wrapper_class]
-
           @collection.map do |item|
             value = value_for_collection(item, @value_method)
             text  = value_for_collection(item, @text_method)
             default_html_options = default_html_options_for_collection(item, value)
 
-            rendered_item = yield value, text, default_html_options
-
-            item_wrapper_tag ? @template_object.content_tag(item_wrapper_tag, rendered_item, :class => item_wrapper_class) : rendered_item
+            yield value, text, default_html_options
           end.join.html_safe
         end
 
         def value_for_collection(item, value) #:nodoc:
           value.respond_to?(:call) ? value.call(item) : item.send(value)
         end
-
-        def wrap_rendered_collection(collection)
-          wrapper_tag = @options[:collection_wrapper_tag]
-
-          if wrapper_tag
-            wrapper_class = @options[:collection_wrapper_class]
-            @template_object.content_tag(wrapper_tag, collection, :class => wrapper_class)
-          else
-            collection
-          end
-        end
       end
     end
   end