From d3d487479a6d4a5ba6977fb0075e7937eb19718a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Wed, 27 Jan 2010 17:46:55 +0100 Subject: Add config.to_prepare back and add tests for it. Signed-off-by: Carl Lerche --- railties/lib/rails/application/finisher.rb | 8 +++++++- railties/lib/rails/configuration.rb | 8 ++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'railties/lib/rails') diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb index c0b16a0090..b722679ec2 100644 --- a/railties/lib/rails/application/finisher.rb +++ b/railties/lib/rails/application/finisher.rb @@ -15,6 +15,12 @@ module Rails end end + initializer :add_to_prepare_blocks do + config.to_prepare_blocks.each do |block| + ActionDispatch::Callbacks.to_prepare(&block) + end + end + initializer :add_builtin_route do |app| if Rails.env.development? app.routes_reloader.paths << File.join(RAILTIES_PATH, 'builtin', 'routes.rb') @@ -25,7 +31,7 @@ module Rails app end - # Fires the user-supplied after_initialize block (config#after_initialize) + # Fires the user-supplied after_initialize block (config.after_initialize) initializer :after_initialize do config.after_initialize_blocks.each do |block| block.call(self) diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb index 6d5fa87439..a95075562f 100644 --- a/railties/lib/rails/configuration.rb +++ b/railties/lib/rails/configuration.rb @@ -52,6 +52,14 @@ module Rails after_initialize_blocks << blk if blk end + def to_prepare_blocks + @@to_prepare_blocks ||= [] + end + + def to_prepare(&blk) + to_prepare_blocks << blk if blk + end + def respond_to?(name) super || name.to_s =~ config_key_regexp end -- cgit v1.2.3