kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Enable ActionDispatch::Http::Headers to support fetch

Browse source
This commit is contained in:
Mark Turner 2012-05-02 11:14:40 -07:00
parent 6a4541d63e
commit 61ba0fe82c
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
actionpack/lib/action_dispatch/http/headers.rb
View file

@ -14,17 +14,18 @@ module ActionDispatch
end end
def [](header_name) def [](header_name)
if include?(header_name) super env_name(header_name)
super
else
super(env_name(header_name))
end end
def fetch(header_name, default=nil, &block)
super env_name(header_name), default, &block
end end
private private
# Converts a HTTP header name to an environment variable name. # Converts a HTTP header name to an environment variable name if it is
# not contained within the headers hash.
def env_name(header_name) def env_name(header_name)
@@env_cache[header_name] include?(header_name) ? header_name : @@env_cache[header_name]
end end
end end
end end

5
actionpack/test/dispatch/header_test.rb
View file

@ -13,4 +13,9 @@ class HeaderTest < ActiveSupport::TestCase
assert_equal "text/plain", @headers["CONTENT_TYPE"] assert_equal "text/plain", @headers["CONTENT_TYPE"]
assert_equal "text/plain", @headers["HTTP_CONTENT_TYPE"] assert_equal "text/plain", @headers["HTTP_CONTENT_TYPE"]
end end
test "fetch" do
assert_equal "text/plain", @headers.fetch("content-type", nil)
assert_equal "not found", @headers.fetch('not-found', 'not found')
end
end end