Bring body(Hash) behavior back.

2 files changed, 31 insertions, 24 deletions

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 5be1beaedb..928fed4777 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -23,8 +23,7 @@ module ActionMailer #:nodoc:
   #      bcc        ["bcc@example.com", "Order Watcher <watcher@example.com>"]
   #      from       "system@example.com"
   #      subject    "New account information"
-  #
-  #      @account = recipient
+  #      body       :account => recipient
   #    end
   #  end
   #
@@ -523,6 +522,20 @@ module ActionMailer #:nodoc:
 
     private
 
+      # Allow you to set assigns for your template:
+      #
+      #   body :greetings => "Hi"
+      #
+      # Will make @greetings available in the template to be rendered.
+      def body(object=nil)
+        super # Run deprecation hooks
+
+        if object.is_a?(Hash)
+          @assigns_set = true
+          object.each { |k, v| instance_variable_set(:"@#{k}", v) }
+        end
+      end
+
       # Set up the default values for the various instance variables of this
       # mailer. Subclasses may override this method to provide different
       # defaults.
diff --git a/actionmailer/lib/action_mailer/deprecated_body.rb b/actionmailer/lib/action_mailer/deprecated_body.rb
index 20b0989a85..5379b33a54 100644
--- a/actionmailer/lib/action_mailer/deprecated_body.rb
+++ b/actionmailer/lib/action_mailer/deprecated_body.rb
@@ -1,15 +1,13 @@
 module ActionMailer
   # TODO Remove this module all together in a next release. Ensure that super
-  # hooks in ActionMailer::Base are removed as well.
+  # hooks and @assigns_set in ActionMailer::Base are removed as well.
   module DeprecatedBody
-    def self.included(base)
-      base.class_eval do
-        # Define the body of the message. This is either a Hash (in which case it
-        # specifies the variables to pass to the template when it is rendered),
-        # or a string, in which case it specifies the actual text of the message.
-        adv_attr_accessor :body
-      end
-    end
+    extend ActionMailer::AdvAttrAccessor
+
+    # Define the body of the message. This is either a Hash (in which case it
+    # specifies the variables to pass to the template when it is rendered),
+    # or a string, in which case it specifies the actual text of the message.
+    adv_attr_accessor :body
 
     def initialize_defaults(method_name)
       @body ||= {}
@@ -18,32 +16,28 @@ module ActionMailer
     def attachment(params, &block)
       if params[:body]
         ActiveSupport::Deprecation.warn('attachment :body => "string" is deprecated. To set the body of an attachment ' <<
-                                        'please use :data instead, like attachment :data => "string".', caller[0,10])
+                                        'please use :data instead, like attachment :data => "string"', caller[0,10])
         params[:data] = params.delete(:body)
       end
     end
 
     def create_parts
-      if String === @body
-        ActiveSupport::Deprecation.warn('body is deprecated. To set the body with a text ' <<
-                                        'call render(:text => "body").', caller[0,10])
+      if String === @body && !defined?(@assigns_set)
+        ActiveSupport::Deprecation.warn('body(String) is deprecated. To set the body with a text ' <<
+                                        'call render(:text => "body")', caller[0,10])
         self.response_body = @body
-      elsif @body.is_a?(Hash) && !@body.empty?
-        ActiveSupport::Deprecation.warn('body is deprecated. To set assigns simply ' << 
-                                        'use instance variables', caller[0,10])
-        @body.each { |k, v| instance_variable_set(:"@#{k}", v) }
+      elsif self.response_body
+        @body = self.response_body
       end
     end
 
     def render(*args)
       options = args.last.is_a?(Hash) ? args.last : {}
       if options[:body]
-        ActiveSupport::Deprecation.warn(':body is deprecated. To set assigns simply ' << 
-                                        'use instance variables', caller[0,1])
+        ActiveSupport::Deprecation.warn(':body in render deprecated. Please call body ' <<
+                                        'with a hash instead', caller[0,1])
 
-        options.delete(:body).each do |k, v|
-          instance_variable_set(:"@#{k}", v)
-        end
+        body options.delete(:body)
       end
 
       super