GitHub Sale: sign up for any paid plan this week and pay nothing until January 1, 2009!  [ hide ]

public
Rubygem
Description: Merb Core: All you need. None you don't.
Homepage: http://www.merbivore.com
Clone URL: git://github.com/wycats/merb-core.git
Additional slight efficiency and readability improvement.
wycats (author)
Sat Jun 21 00:06:30 -0700 2008
commit  20bc8d45a9efeb974cbbdfb119069573637845b5
tree    e04941c2d2c49aeb649bb52a6bdb7485dad6423e
parent  2a9453adc10081789709d743a31b270731af4c20
...
50
51
52
53
54
 
 
55
56
57
...
50
51
52
 
 
53
54
55
56
57
0
@@ -50,8 +50,8 @@ module Merb
0
       ResponderMixin::TYPES.update(key =>
0
         {:accepts => mimes,
0
          :transform_method => transform_method,
0
- # Use symbol to speed compares later
0
- :response_headers => new_response_headers.update(:"Content-Type" => content_type),
0
+ :content_type => content_type,
0
+ :response_headers => new_response_headers,
0
          :response_block => block })
0
 
0
       mimes.each do |mime|
...
365
366
367
368
 
369
370
371
372
373
374
 
375
376
377
378
379
 
 
380
381
382
...
365
366
367
 
368
369
370
 
 
 
 
371
372
373
 
 
 
374
375
376
377
378
0
@@ -365,18 +365,14 @@ module Merb
0
 
0
       mime = Merb.available_mime_types[type]
0
       
0
- headers["Content-Type"] = mime[:response_headers][:"Content-Type"]
0
+ headers["Content-Type"] = mime[:content_type]
0
       
0
       # merge any format specific response headers
0
- mime[:response_headers].each do |key, value|
0
- next if key == :"Content-Type"
0
- headers[key] ||= value
0
- end
0
+ mime[:response_headers].each { |k,v| headers[k] ||= v }
0
       
0
       # if given, use a block to finetune any runtime headers
0
- if mime[:response_block].respond_to?(:call)
0
- mime[:response_block].call(self)
0
- end
0
+ mime[:response_block].call(self) if mime[:response_block]
0
+
0
       @_content_type = type
0
     end
0
     

Comments

    No one has commented yet.