@@ -179,7 +179,7 @@ module Sinatra return unless host === request.host end if accept = options[:accept] - return unless request.accept.include? accept + return unless request.accept.include? lookup_mime(accept) end return unless pattern =~ request.path_info.squeeze('/') params.merge!(param_keys.zip($~.captures.map(&:from_param)).to_hash) @@ -449,8 +449,7 @@ module Sinatra # end # def content_type(type, params={}) - type = Rack::File::MIME_TYPES[type.to_s] if type.kind_of?(Symbol) - fail "Invalid or undefined media_type: #{type}" if type.nil? + type = lookup_mime(type) if params.any? params = params.collect { |kv| "%s=%s" % kv }.join(', ') type = [ type, params ].join(";") @@ -1403,6 +1402,12 @@ def mime(ext, type) Rack::File::MIME_TYPES[ext.to_s] = type end +def lookup_mime(type) + type = Rack::File::MIME_TYPES[type.to_s] if type.kind_of?(Symbol) + fail "Invalid or undefined media_type: #{type}" if type.nil? + type +end + ### Misc Core Extensions module Kernel lib/sinatra.rb @@ -217,13 +217,13 @@ context "Events in an app" do specify "filters by accept header" do - get '/', :accept => 'image/jpg' do + get '/', :accept => :xml do request.env['HTTP_ACCEPT'] end - get_it '/', :env => { :accept => 'image/jpg' } + get_it '/', :env => { :accept => 'application/xml' } should.be.ok - body.should.equal 'image/jpg' + body.should.equal 'application/xml' get_it '/', :env => { :accept => 'text/html' } should.not.be.ok test/application_test.rb 33cbfedbcce13c924e2fbb094e20f24929d38f80 Adam Wiggins adam@heroku.com http://github.com/adamwiggins/sinatra/commit/cfcf7863a865337ea29c764db5a192bf46f50e29 cfcf7863a865337ea29c764db5a192bf46f50e29 2008-06-09T00:11:56-07:00 2008-06-09T00:11:56-07:00 lookup_mime, used by content_type and accept 2969a90c1fb9f573f11ef85a504936f85d9250c5 Adam Wiggins adam@heroku.com