github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

move the setting up of the mime collector into the collector on init

Browse Source 
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
This commit is contained in:
Josh Kalderimis
2010-11-26 00:21:51 +01:00
committed by Santiago Pastorino
parent 438c0188f8
commit a98d9d65ae
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
actionpack/lib/action_controller/metal/mime_responds.rb
View File

@@ -258,9 +258,8 @@ module ActionController #:nodoc:
# nil if :not_acceptable was sent to the client.
#
def retrieve_response_from_mimes(mimes=nil, &block)
collector = Collector.new { default_render }
mimes ||= collect_mimes_from_class_level
mimes.each { |mime| collector.send(mime) }
collector = Collector.new(mimes) { default_render }
block.call(collector) if block_given?
if format = request.negotiate_mime(collector.order)
@@ -277,8 +276,9 @@ module ActionController #:nodoc:
include AbstractController::Collector
attr_accessor :order
def initialize(&block)
def initialize(mimes, &block)
@order, @responses, @default_response = [], {}, block
mimes.each { |mime| self.send(mime) }
end
def any(*args, &block)