aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application
diff options
context:
space:
mode:
authorRafael Mendonça França <rafael.franca@plataformatec.com.br>2014-08-18 00:22:34 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-08-19 13:59:22 -0300
commitde4891344ccc074f6d5693f4fac6ad610584e336 (patch)
tree9d62508514bb9909e0766cba3020292c2d27bb17 /railties/lib/rails/application
parent0cb3bdb66e87981c1094edecfce9182ae8aeb240 (diff)
downloadrails-de4891344ccc074f6d5693f4fac6ad610584e336.tar.gz
rails-de4891344ccc074f6d5693f4fac6ad610584e336.tar.bz2
rails-de4891344ccc074f6d5693f4fac6ad610584e336.zip
Improve custom configuration
1. Hashes can be assigned 2. We don't need a special level anymore The method chain only works in the top level. If users need a second level they need to assign a OrderedOptions to the key: config.resque.server = ActiveSupport::OrderedOptions.new config.resque.server.url = "http://localhost" config.resque.server.port = 3000 [Rafael Mendonça França + Carlos Antonio da Silva]
Diffstat (limited to 'railties/lib/rails/application')
-rw-r--r--railties/lib/rails/application/configuration.rb14
1 files changed, 1 insertions, 13 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 782bc4b0f1..5e8f4de847 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -13,7 +13,7 @@ module Rails
:railties_order, :relative_url_root, :secret_key_base, :secret_token,
:serve_static_assets, :ssl_options, :static_cache_control, :session_options,
:time_zone, :reload_classes_only_on_change,
- :beginning_of_week, :filter_redirect, :x
+ :beginning_of_week, :filter_redirect
attr_writer :log_level
attr_reader :encoding
@@ -48,7 +48,6 @@ module Rails
@eager_load = nil
@secret_token = nil
@secret_key_base = nil
- @x = Custom.new
@assets = ActiveSupport::OrderedOptions.new
@assets.enabled = true
@@ -155,17 +154,6 @@ module Rails
def annotations
SourceAnnotationExtractor::Annotation
end
-
- private
- class Custom
- def initialize
- @configurations = Hash.new
- end
-
- def method_missing(method, *args)
- @configurations[method] ||= ActiveSupport::OrderedOptions.new
- end
- end
end
end
end