From ae7ada1fde1648a5c81b9e6adf74d515e0bbe0a5 Mon Sep 17 00:00:00 2001 From: Carl Lerche Date: Thu, 31 Dec 2009 13:11:54 -0800 Subject: Some railties cleanup: * Rename /rails.rb -> /railtie.rb * Rails::Plugin -> Rails::Railtie * Rails::Plugin::Vendored -> Rails::Plugin --- actionmailer/lib/action_mailer/rails.rb | 25 ------------------------- actionmailer/lib/action_mailer/railtie.rb | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 actionmailer/lib/action_mailer/rails.rb create mode 100644 actionmailer/lib/action_mailer/railtie.rb (limited to 'actionmailer') diff --git a/actionmailer/lib/action_mailer/rails.rb b/actionmailer/lib/action_mailer/rails.rb deleted file mode 100644 index 5389f243e5..0000000000 --- a/actionmailer/lib/action_mailer/rails.rb +++ /dev/null @@ -1,25 +0,0 @@ -require "action_mailer" -require "rails" - -module ActionMailer - class Plugin < Rails::Plugin - plugin_name :action_mailer - - initializer "action_mailer.set_configs" do |app| - app.config.action_mailer.each do |k,v| - ActionMailer::Base.send "#{k}=", v - end - end - - # TODO: ActionController::Base.logger should delegate to its own config.logger - initializer "action_mailer.logger" do - ActionMailer::Base.logger ||= Rails.logger - end - - initializer "action_mailer.view_paths" do |app| - # TODO: this should be combined with the logic for default config.action_mailer.view_paths - view_path = ActionView::PathSet.type_cast(app.config.view_path, app.config.cache_classes) - ActionMailer::Base.template_root = view_path if ActionMailer::Base.view_paths.blank? - end - end -end \ No newline at end of file diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb new file mode 100644 index 0000000000..5410c7d75f --- /dev/null +++ b/actionmailer/lib/action_mailer/railtie.rb @@ -0,0 +1,25 @@ +require "action_mailer" +require "rails" + +module ActionMailer + class Railtie < Rails::Railtie + plugin_name :action_mailer + + initializer "action_mailer.set_configs" do |app| + app.config.action_mailer.each do |k,v| + ActionMailer::Base.send "#{k}=", v + end + end + + # TODO: ActionController::Base.logger should delegate to its own config.logger + initializer "action_mailer.logger" do + ActionMailer::Base.logger ||= Rails.logger + end + + initializer "action_mailer.view_paths" do |app| + # TODO: this should be combined with the logic for default config.action_mailer.view_paths + view_path = ActionView::PathSet.type_cast(app.config.view_path, app.config.cache_classes) + ActionMailer::Base.template_root = view_path if ActionMailer::Base.view_paths.blank? + end + end +end \ No newline at end of file -- cgit v1.2.3