aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/railtie.rb
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2010-08-06 16:34:48 +0200
committerPiotr Sarnacki <drogus@gmail.com>2010-09-03 22:59:12 +0200
commite5af8b7d85abb94f21f4e873c1c267e27be2aad8 (patch)
tree65e5f8ce3a82dcc6811fc51ad3a052d599ad500c /actionpack/lib/action_controller/railtie.rb
parent8fb9df535e9fcf4c117ffd3254027e0fe2425cb7 (diff)
downloadrails-e5af8b7d85abb94f21f4e873c1c267e27be2aad8.tar.gz
rails-e5af8b7d85abb94f21f4e873c1c267e27be2aad8.tar.bz2
rails-e5af8b7d85abb94f21f4e873c1c267e27be2aad8.zip
Moved ActionMailer and ActionController railties options to inherited hook
This change is needed, because we must take namespace into account and if controller's/mailer's class is namespaced, engine's paths should be set instead of application's ones. The nice side effect of this is removing unneeded logic in ActionController::Base.inherited - now the helpers_path should be set correctly even for engine's controllers, so helper(:all) will always include correct helpers.
Diffstat (limited to 'actionpack/lib/action_controller/railtie.rb')
-rw-r--r--actionpack/lib/action_controller/railtie.rb14
1 files changed, 3 insertions, 11 deletions
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index 4b5a897b90..2271a51e4e 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -5,6 +5,7 @@ require "action_view/railtie"
require "active_support/deprecation/proxy_wrappers"
require "active_support/deprecation"
require "abstract_controller/railties/routes_helpers"
+require "action_controller/railties/paths"
module ActionController
class Railtie < Rails::Railtie
@@ -41,19 +42,10 @@ module ActionController
end
initializer "action_controller.set_configs" do |app|
- paths = app.config.paths
- options = app.config.action_controller
-
- options.assets_dir ||= paths.public.to_a.first
- options.javascripts_dir ||= paths.public.javascripts.to_a.first
- options.stylesheets_dir ||= paths.public.stylesheets.to_a.first
- options.page_cache_directory ||= paths.public.to_a.first
- options.helpers_path ||= paths.app.helpers.to_a
-
ActiveSupport.on_load(:action_controller) do
- extend ::AbstractController::Railties::RoutesHelpers.with(app.routes)
include app.routes.mounted_helpers(:app)
- options.each { |k,v| send("#{k}=", v) }
+ extend ::AbstractController::Railties::RoutesHelpers.with(app.routes)
+ extend ::ActionController::Railties::Paths.with(app)
end
end