@@ -55,6 +55,10 @@ module Rack #:nodoc: @env['HTTP_USER_AGENT'] end + def accept + @env['HTTP_ACCEPT'].split(',').map { |a| a.strip } + end + private # Return truthfully if and only if the following conditions are met: 1.) the @@ -174,6 +178,9 @@ module Sinatra if host = options[:host] return unless host === request.host end + if accept = options[: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) splats = params.select { |k, v| k =~ /^_splat_\d+$/ }.sort.map(&:last) lib/sinatra.rb @@ -191,6 +191,21 @@ context "Events in an app" do end + specify "filters by accept header" do + + get '/', :accept => 'image/jpg' do + request.env['HTTP_ACCEPT'] + end + + get_it '/', :env => { :accept => 'image/jpg' } + should.be.ok + body.should.equal 'image/jpg' + + get_it '/', :env => { :accept => 'text/html' } + should.not.be.ok + + end + specify "can use regex to get parts of user-agent" do get '/', :agent => /Windows (NT)/ do test/application_test.rb ea3239c88f8a85f82cc891589bc6ad1c339719e8 Adam Wiggins adam@heroku.com http://github.com/adamwiggins/sinatra/commit/9c413351c79f35a72f93cf74f3f516cab3bda4e5 9c413351c79f35a72f93cf74f3f516cab3bda4e5 2008-06-08T02:17:17-07:00 2008-06-08T02:17:17-07:00 :accept option to filter on HTTP accept header 4814239e11aeea44a02f6d0acb0f028b0c25120c Adam Wiggins adam@heroku.com