From 6fccd7b6293dcae383757379c5c3809c6674084e Mon Sep 17 00:00:00 2001
From: Sammy Larbi <sam@codeodor.com>
Date: Thu, 13 Oct 2016 17:53:41 -0500
Subject: [PATCH] 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.
---
 actionpack/CHANGELOG.md                      | 5 +++++
 actionpack/lib/action_controller/renderer.rb | 4 +++-
 actionpack/test/controller/renderer_test.rb  | 8 ++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index eef3db8f24..c9c347ea26 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,8 @@
+*   Allow keys not found in RACK_KEY_TRANSLATION for setting the environment when rendering
+    arbitrary templates.
+
+    *Sammy Larbi*
+
 *   Remove deprecated support to non-keyword arguments in `ActionDispatch::IntegrationTest#process`,
     `#get`, `#post`, `#patch`, `#put`, `#delete`, and `#head`.
 
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 @@ def normalize_keys(env)
         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
diff --git a/actionpack/test/controller/renderer_test.rb b/actionpack/test/controller/renderer_test.rb
index d6f09f2d90..866600b935 100644
--- a/actionpack/test/controller/renderer_test.rb
+++ b/actionpack/test/controller/renderer_test.rb
@@ -60,6 +60,14 @@ class RendererTest < ActiveSupport::TestCase
     assert_equal "true", content
   end
 
+  test "rendering with custom env using a key that is not in RACK_KEY_TRANSLATION" do
+    value    = "warden is here"
+    renderer = ApplicationController.renderer.new warden: value
+    content  = renderer.render inline: "<%= request.env['warden'] %>"
+
+    assert_equal value, content
+  end
+
   test "rendering with defaults" do
     renderer = ApplicationController.renderer.new https: true
     content = renderer.render inline: "<%= request.ssl? %>"