-
Notifications
You must be signed in to change notification settings - Fork 21.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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.
- Loading branch information
Showing
5 changed files
with
61 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
module ActionMailer | ||
module Railties | ||
module Paths | ||
def self.with(_app) | ||
Module.new do | ||
define_method(:inherited) do |klass| | ||
super(klass) | ||
if namespace = klass.parents.detect {|m| m.respond_to?(:_railtie) } | ||
app = namespace._railtie | ||
else | ||
app = _app | ||
end | ||
|
||
paths = app.config.paths | ||
options = app.config.action_mailer | ||
|
||
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.each { |k,v| klass.send("#{k}=", v) } | ||
end | ||
end | ||
end | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
module ActionController | ||
module Railties | ||
module Paths | ||
def self.with(_app) | ||
Module.new do | ||
define_method(:inherited) do |klass| | ||
super(klass) | ||
if namespace = klass.parents.detect {|m| m.respond_to?(:_railtie) } | ||
app = namespace._railtie | ||
else | ||
app = _app | ||
end | ||
|
||
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 | ||
options.each { |k,v| klass.send("#{k}=", v) } | ||
end | ||
end | ||
end | ||
end | ||
end | ||
end |