kotovalexarian-likes-github/sinatra
1
0
Fork 0
mirror of https://github.com/sinatra/sinatra synced 2023-03-27 23:18:01 -04:00
Code Releases Activity

small refactor

Browse source
This commit is contained in:
Konstantin Haase 2012-12-10 22:04:43 +01:00
parent bd6e4cc39d
commit 1fb10858b8
2 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
rack-protection/lib/rack/protection/base.rb
View file

@ -10,7 +10,8 @@ module Rack
:reaction => :default_reaction, :logging => true,
:message => 'Forbidden', :encryptor => Digest::SHA1,
:session_key => 'rack.session', :status => 403,
:allow_empty_referrer => true
:allow_empty_referrer => true,
:html_types => %w[text/html application/xhtml]
}
attr_reader :app, :options
@ -98,16 +99,8 @@ module Rack
alias default_reaction deny
def html?(headers)
if type = headers.detect { |k,v| k.downcase == 'content-type' }
case type.last[/^\w+\/\w+/]
when 'text/html', 'application/xhtml'
true
else
false
end
else
false
end
return false unless header = headers.detect { |k,v| k.downcase == 'content-type' }
options[:html_types].include? header.last[/^\w+\/\w+/]
end
end
end

4
rack-protection/spec/protection_spec.rb
View file

@ -20,12 +20,12 @@ describe Rack::Protection do
describe "#html?" do
context "given an appropriate content-type header" do
subject { Rack::Protection::Base.new(nil).html?({'content-type' => "text/html"}) }
subject { Rack::Protection::Base.new(nil).html? 'content-type' => "text/html" }
it { should be_true }
end
context "given an inappropriate content-type header" do
subject { Rack::Protection::Base.new(nil).html?({'content-type' => "image/gif"}) }
subject { Rack::Protection::Base.new(nil).html? 'content-type' => "image/gif" }
it { should be_false }
end