aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorSammy Larbi <sam@codeodor.com>2016-10-13 17:53:41 -0500
committerSammy Larbi <sam@codeodor.com>2016-10-15 07:03:33 -0500
commit6fccd7b6293dcae383757379c5c3809c6674084e (patch)
treebd2049dc156244eb1aaa70fffb50ea5ca0ba74f4 /actionpack/lib/action_controller
parente10e3c7da215ef848db7592068993f14aac00fa6 (diff)
downloadrails-6fccd7b6293dcae383757379c5c3809c6674084e.tar.gz
rails-6fccd7b6293dcae383757379c5c3809c6674084e.tar.bz2
rails-6fccd7b6293dcae383757379c5c3809c6674084e.zip
Allow any key in Renderer environment hash
When rendering arbitrary templates, it is helpful to not overwrite `env` keys with nil if they don't match any found in the `RACK_KEY_TRANSLATION` This allows the developer to set the environment to exactly what is needed for rendering.
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/renderer.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/renderer.rb b/actionpack/lib/action_controller/renderer.rb
index 0739f16965..243a54330e 100644
--- a/actionpack/lib/action_controller/renderer.rb
+++ b/actionpack/lib/action_controller/renderer.rb
@@ -102,7 +102,9 @@ module ActionController
method: ->(v) { v.upcase },
}
- def rack_key_for(key); RACK_KEY_TRANSLATION[key]; end
+ def rack_key_for(key)
+ RACK_KEY_TRANSLATION.fetch(key, key.to_s)
+ end
def rack_value_for(key, value)
RACK_VALUE_TRANSLATION.fetch(key, IDENTITY).call value