Merge branch 'master' into nested_has_many_through_2

2 files changed, 13 insertions, 6 deletions

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 6ae3940e6d..0bf60a2c24 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -409,7 +409,7 @@ module ActionMailer #:nodoc:
     protected
 
       def set_payload_for_mail(payload, mail) #:nodoc:
-        payload[:mailer]     = self.name
+        payload[:mailer]     = name
         payload[:message_id] = mail.message_id
         payload[:subject]    = mail.subject
         payload[:to]         = mail.to
@@ -421,11 +421,8 @@ module ActionMailer #:nodoc:
       end
 
       def method_missing(method, *args) #:nodoc:
-        if action_methods.include?(method.to_s)
-          new(method, *args).message
-        else
-          super
-        end
+        return super unless respond_to?(method)
+        new(method, *args).message
       end
     end
 
diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb
index 889ae34407..86136bdafd 100644
--- a/actionmailer/lib/action_mailer/railtie.rb
+++ b/actionmailer/lib/action_mailer/railtie.rb
@@ -18,6 +18,10 @@ module ActionMailer
       options.javascripts_dir ||= paths.public.javascripts.to_a.first
       options.stylesheets_dir ||= paths.public.stylesheets.to_a.first
 
+      # make sure readers methods get compiled
+      options.asset_path           ||= nil
+      options.asset_host           ||= nil
+
       ActiveSupport.on_load(:action_mailer) do
         include AbstractController::UrlFor
         extend ::AbstractController::Railties::RoutesHelpers.with(app.routes)
@@ -25,5 +29,11 @@ module ActionMailer
         options.each { |k,v| send("#{k}=", v) }
       end
     end
+
+    initializer "action_mailer.compile_config_methods" do
+      ActiveSupport.on_load(:action_mailer) do
+        config.compile_methods! if config.respond_to?(:compile_methods!)
+      end
+    end
   end
 end