@@ -694,11 +694,12 @@ module Sinatra end end - # Look up a media type by file extension in Rack's mime registry. - def mime_type(type) + # Lookup or register a mime type in Rack's mime registry. + def mime_type(type, value=nil) return type if type.nil? || type.to_s.include?('/') type = ".#{type}" unless type.to_s[0] == ?. - Rack::Mime.mime_type(type, nil) + return Rack::Mime.mime_type(type, nil) unless value + Rack::Mime::MIME_TYPES[type] = value end # Define a before filter. Filters are run before all requests lib/sinatra/base.rb @@ -223,6 +223,19 @@ class HelpersTest < Test::Unit::TestCase end end + test 'Base.mime_type registers mime type' do + mock_app { + mime_type :foo, 'application/foo' + + get '/' do + "foo is #{mime_type(:foo)}" + end + } + + get '/' + assert_equal 'foo is application/foo', body + end + describe 'content_type' do it 'sets the Content-Type header' do mock_app { test/helpers_test.rb 080adc2f7a58cc575d0cdca6ba9438b274b23144 Simon Rozet simon@rozet.name http://github.com/sr/sinatra/commit/fd129ed5a0b11420cdea33293afd04fa8508c78b fd129ed5a0b11420cdea33293afd04fa8508c78b 2009-10-17T16:51:48-07:00 2009-10-04T07:41:03-07:00 Allow to register a mime type with mime_type c3ea87dc1740c4ebc6c30e61191fea95bc445d77 Simon Rozet simon@rozet.name