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

Merge pull request #6122 from amerine/add_fetch_to_actiondispatch_http_headers

Enable ActionDispatch::Http::Headers to support fetch
This commit is contained in:
Aaron Patterson 2012-05-02 12:12:46 -07:00
commit 2914b92048
2 changed files with 13 additions and 7 deletions

View file

@ -14,17 +14,18 @@ module ActionDispatch
end
def [](header_name)
if include?(header_name)
super
else
super(env_name(header_name))
end
super env_name(header_name)
end
def fetch(header_name, default=nil, &block)
super env_name(header_name), default, &block
end
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)
@@env_cache[header_name]
include?(header_name) ? header_name : @@env_cache[header_name]
end
end
end

View file

@ -13,4 +13,9 @@ class HeaderTest < ActiveSupport::TestCase
assert_equal "text/plain", @headers["CONTENT_TYPE"]
assert_equal "text/plain", @headers["HTTP_CONTENT_TYPE"]
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