@@ -95,7 +95,7 @@ module Sinatra class NotFound < RuntimeError; end class ServerError < RuntimeError; end - Result = Struct.new(:block, :params, :status) unless defined?(Result) + Result = Struct.new(:block, :params, :status, :content_type) unless defined?(Result) def options application.options @@ -179,7 +179,8 @@ module Sinatra return unless host === request.host end if accept = options[:accept] - return unless request.accept.include? lookup_mime(accept) + accept = lookup_mime(accept) + return unless request.accept.include? accept end return unless pattern =~ request.path_info.squeeze('/') params.merge!(param_keys.zip($~.captures.map(&:from_param)).to_hash) @@ -188,7 +189,7 @@ module Sinatra params.delete_if { |k, v| k =~ /^_splat_\d+$/ } params["splat"] = splats end - Result.new(block, params, 200) + Result.new(block, params, 200, accept) end end @@ -202,7 +203,7 @@ module Sinatra end def invoke(request) - Result.new(block, {}, 404) + Result.new(block, {}, 404, nil) end end @@ -213,7 +214,7 @@ module Sinatra return unless File.file?( Sinatra.application.options.public + request.path_info.http_unescape ) - Result.new(block, {}, 200) + Result.new(block, {}, 200, nil) end def block @@ -1233,6 +1234,7 @@ module Sinatra result = lookup(request) context = EventContext.new(request, Rack::Response.new, result.params) context.status(result.status) + context.response.headers['Content-Type'] = result.content_type if result.content_type begin returned = run_safely do catch(:halt) do lib/sinatra.rb @@ -224,6 +224,7 @@ context "Events in an app" do get_it '/', :env => { :accept => 'application/xml' } should.be.ok body.should.equal 'application/xml' + headers['Content-Type'].should.equal 'application/xml' get_it '/', :env => { :accept => 'text/html' } should.not.be.ok test/application_test.rb cfcf7863a865337ea29c764db5a192bf46f50e29 Adam Wiggins adam@heroku.com http://github.com/adamwiggins/sinatra/commit/8a99bd7ef181aca2f35a9df6bea18d512ebdfd39 8a99bd7ef181aca2f35a9df6bea18d512ebdfd39 2008-06-09T00:41:45-07:00 2008-06-09T00:41:45-07:00 :accept option sets content-type header 27e3b28dc74c9ccc52a683478c60a23fcaae9594 Adam Wiggins adam@heroku.com