Permalink
Browse files

Some mime type refactoring. Closes #9957 [Josh Peek]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8001 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
jeremy committed Oct 23, 2007
1 parent 28729a4 commit 562b398fd729b05bfde4da90b91efc24dbbac49d
@@ -251,7 +251,7 @@ def after(controller)
private
def set_content_type!(controller, extension)
- controller.response.content_type = Mime::EXTENSION_LOOKUP[extension].to_s if extension
+ controller.response.content_type = Mime::Type.lookup_by_extension(extension).to_s if extension
end
def path_options_for(controller, options)
@@ -110,14 +110,11 @@ def respond_to(*types, &block)
class Responder #:nodoc:
def initialize(controller)
- @controller = controller
- @request = controller.request
- @response = controller.response
+ @controller = controller
+ @request = controller.request
+ @response = controller.response
- format = @request.parameters[:format]
- @mime_type_priority = format && Mime::EXTENSION_LOOKUP[format] ?
- [ Mime::EXTENSION_LOOKUP[format] ] :
- @request.accepts
+ @mime_type_priority = Array(Mime::Type.lookup_by_extension(@request.parameters[:format]) || @request.accepts)
@order = []
@responses = {}
@@ -128,18 +125,10 @@ def custom(mime_type, &block)
@order << mime_type
- if block_given?
- @responses[mime_type] = Proc.new do
- @response.template.template_format = mime_type.to_sym
- @response.content_type = mime_type.to_s
- block.call
- end
- else
- @responses[mime_type] = Proc.new do
- @response.template.template_format = mime_type.to_sym
- @response.content_type = mime_type.to_s
- @controller.send :render, :action => @controller.action_name
- end
+ @responses[mime_type] = Proc.new do
+ @response.template.template_format = mime_type.to_sym
+ @response.content_type = mime_type.to_s
+ block_given? ? block.call : @controller.send(:render, :action => @controller.action_name)
end
end
@@ -1,7 +1,7 @@
module Mime
SET = []
- EXTENSION_LOOKUP = Hash.new { |h, k| h[k] = Type.new(k) unless k == "" }
- LOOKUP = Hash.new { |h, k| h[k] = Type.new(k) unless k == "" }
+ EXTENSION_LOOKUP = Hash.new { |h, k| h[k] = Type.new(k) unless k.blank? }
+ LOOKUP = Hash.new { |h, k| h[k] = Type.new(k) unless k.blank? }
# Encapsulates the notion of a mime type. Can be used at render time, for example, with:
#

0 comments on commit 562b398

Please sign in to comment.