Permalink
Browse files

Merge pull request #1924 from cesario/1922-get-back-and-deprecate-env…

…-default

Put back Rails.application#env_default and deprecate it [Closes #1922]
  • Loading branch information...
2 parents c3732bf + ea649de commit 871d7fad03b2c74edc8b853b9c350aa9f9d24a3d @josevalim josevalim committed Jul 11, 2011
Showing with 18 additions and 0 deletions.
  1. +9 −0 railties/lib/rails/application.rb
  2. +9 −0 railties/test/application/configuration_test.rb
View
9 railties/lib/rails/application.rb
@@ -106,6 +106,15 @@ def load_console(app=self)
self
end
+ # Rails.application.env_config stores some of the Rails initial environment parameters.
+ # Currently stores:
+ #
+ # * action_dispatch.parameter_filter" => config.filter_parameters,
+ # * action_dispatch.secret_token" => config.secret_token,
+ # * action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions
+ #
+ # These parameters will be used by middlewares and engines to configure themselves.
+ #
def env_config
@env_config ||= super.merge({
"action_dispatch.parameter_filter" => config.filter_parameters,
View
9 railties/test/application/configuration_test.rb
@@ -516,5 +516,14 @@ def index
get "/", { :format => :xml }, "HTTP_ACCEPT" => "application/xml"
assert_equal 'XML', last_response.body
end
+
+ test "Rails.application#env_config exists and include some existing parameters" do
+ make_basic_app
+
+ assert_respond_to app, :env_config
+ assert_equal app.env_config['action_dispatch.parameter_filter'], app.config.filter_parameters
+ assert_equal app.env_config['action_dispatch.secret_token'], app.config.secret_token
+ assert_equal app.env_config['action_dispatch.show_exceptions'], app.config.action_dispatch.show_exceptions
+ end
end
end

0 comments on commit 871d7fa

Please sign in to comment.