Changeset 8212

Timestamp:

11/26/07 03:36:28 (1 year ago)

Author:

rick

Message:

Update ActionMailer so it treats ActionView the same way that ActionController does. Closes #10244 [rick]

Files:

• trunk/actionmailer/CHANGELOG (modified) (1 diff)
• trunk/actionmailer/lib/action_mailer/base.rb (modified) (4 diffs)
• trunk/actionmailer/test/fixtures/test_mailer/_subtemplate.text.plain.erb (moved) (moved from trunk/actionmailer/test/fixtures/test_mailer/subtemplate.text.plain.erb)
• trunk/actionmailer/test/fixtures/test_mailer/included_subtemplate.text.plain.erb (modified) (1 diff)
• trunk/actionmailer/test/mail_render_test.rb (modified) (2 diffs)

trunk/actionmailer/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Update ActionMailer so it treats ActionView the same way that ActionController does.  Closes #10244 [rick]
+
+  * Pass the template_root as an array as ActionView's view_path
+  * Request templates with the "#{mailer_name}/#{action}" as opposed to just "#{action}"
-
-* Fixed that partials would be broken when using text.plain.erb as the extension #10130 [java]

trunk/actionmailer/lib/action_mailer/base.rb

@@ -299 +299 @@
-    adv_attr_accessor :implicit_parts_order
-    
-    # Override the mailer name, which defaults to an inflected version of the
-    # mailer's class name. If you want to use a template in a non-standard
-    # location, you can use this to specify that location.
-    adv_attr_accessor :mailer_name
-    
-    # Defaults to "1.0", but may be explicitly given if needed.
-    adv_attr_accessor :mime_version
@@ -323 +318 @@
-    adv_attr_accessor :template
-
+    # Override the mailer name, which defaults to an inflected version of the
+    # mailer's class name. If you want to use a template in a non-standard
+    # location, you can use this to specify that location.
+    def mailer_name(value = nil)
+      if value
+        self.mailer_name = value
+      else
+        self.class.mailer_name
+      end
+    end
+    
+    def mailer_name=(value)
+      self.class.mailer_name = value
+    end
+
-    # The mail object instance referenced by this mailer.
-    attr_reader :mail
-
-    class << self
+      attr_writer :mailer_name
+
+      def mailer_name
+        @mailer_name ||= name.underscore
+      end
+
+      # for ActionView compatibility
+      alias_method :controller_name, :mailer_name
+      alias_method :controller_path, :mailer_name
+
-      def method_missing(method_symbol, *parameters)#:nodoc:
-        case method_symbol.id2name
@@ -477 +497 @@
-      def render(opts)
-        body = opts.delete(:body)
+        if opts[:file] && opts[:file] !~ /\//
+          opts[:file] = "#{mailer_name}/#{opts[:file]}"
+        end
-        initialize_template_class(body).render(opts)
-      end
@@ -485 +508 @@
-
-      def initialize_template_class(assigns)
-template_path
+[template_root]
-      end
-

trunk/actionmailer/test/fixtures/test_mailer/included_subtemplate.text.plain.erb

@@ -1 @@
-
+:partial => 

trunk/actionmailer/test/mail_render_test.rb

@@ -26 +26 @@
-    subject    "Including another template in the one being rendered"
-    from       "tester@example.com"
+  end
+  
+  def included_old_subtemplate(recipient)
+    recipients recipient
+    subject    "Including another template in the one being rendered"
+    from       "tester@example.com"
+    body       render(:inline => "Hello, <%= render \"subtemplate\" %>", :body => { :world => "Earth" })
-  end
-
@@ -82 +89 @@
-    assert_equal "Hey Ho, let's go!", mail.body.strip
-  end
+  
+  def test_deprecated_old_subtemplate
+    assert_raises ActionView::ActionViewError do
+      RenderMailer.deliver_included_old_subtemplate(@recipient)
+    end
+  end
-end
-