Changeset 8001
- Timestamp:
- 10/23/07 06:33:28 (1 year ago)
- Files:
-
- trunk/actionpack/lib/action_controller/caching.rb (modified) (1 diff)
- trunk/actionpack/lib/action_controller/mime_responds.rb (modified) (2 diffs)
- trunk/actionpack/lib/action_controller/mime_type.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/actionpack/lib/action_controller/caching.rb
r7949 r8001 252 252 private 253 253 def set_content_type!(controller, extension) 254 controller.response.content_type = Mime:: EXTENSION_LOOKUP[extension].to_s if extension254 controller.response.content_type = Mime::Type.lookup_by_extension(extension).to_s if extension 255 255 end 256 256 trunk/actionpack/lib/action_controller/mime_responds.rb
r7719 r8001 111 111 class Responder #:nodoc: 112 112 def initialize(controller) 113 @controller 114 @request 115 @response 113 @controller = controller 114 @request = controller.request 115 @response = controller.response 116 116 117 format = @request.parameters[:format] 118 @mime_type_priority = format && Mime::EXTENSION_LOOKUP[format] ? 119 [ Mime::EXTENSION_LOOKUP[format] ] : 120 @request.accepts 117 @mime_type_priority = Array(Mime::Type.lookup_by_extension(@request.parameters[:format]) || @request.accepts) 121 118 122 119 @order = [] … … 129 126 @order << mime_type 130 127 131 if block_given? 132 @responses[mime_type] = Proc.new do 133 @response.template.template_format = mime_type.to_sym 134 @response.content_type = mime_type.to_s 135 block.call 136 end 137 else 138 @responses[mime_type] = Proc.new do 139 @response.template.template_format = mime_type.to_sym 140 @response.content_type = mime_type.to_s 141 @controller.send :render, :action => @controller.action_name 142 end 128 @responses[mime_type] = Proc.new do 129 @response.template.template_format = mime_type.to_sym 130 @response.content_type = mime_type.to_s 131 block_given? ? block.call : @controller.send(:render, :action => @controller.action_name) 143 132 end 144 133 end trunk/actionpack/lib/action_controller/mime_type.rb
r7905 r8001 1 1 module Mime 2 2 SET = [] 3 EXTENSION_LOOKUP = Hash.new { |h, k| h[k] = Type.new(k) unless k == ""}4 LOOKUP = Hash.new { |h, k| h[k] = Type.new(k) unless k == ""}3 EXTENSION_LOOKUP = Hash.new { |h, k| h[k] = Type.new(k) unless k.blank? } 4 LOOKUP = Hash.new { |h, k| h[k] = Type.new(k) unless k.blank? } 5 5 6 6 # Encapsulates the notion of a mime type. Can be used at render time, for example, with:
