Changeset 8166

Timestamp:

11/18/07 22:01:33 (1 year ago)

Author:

david

Message:

Fixed that partial rendering should look at the type of the first render to determine its own type if no other clues are available (like when using text.plain.erb as the extension in AM) (closes #10130) [java] Fixed that partials would be broken when using text.plain.erb as the extension #10130 [java]

Files:

• trunk/actionmailer/CHANGELOG (modified) (1 diff)
• trunk/actionmailer/test/mail_render_test.rb (modified) (2 diffs)
• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_view/base.rb (modified) (3 diffs)

trunk/actionmailer/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fixed that partials would be broken when using text.plain.erb as the extension #10130 [java]
-
-* Update README to use new smtp settings configuration API. Closes #10060 [psq]

trunk/actionmailer/test/mail_render_test.rb

@@ -19 +19 @@
-    recipients recipient
-    subject    "rendering rxml template"
+    from       "tester@example.com"
+  end
+  
+  def included_subtemplate(recipient)
+    recipients recipient
+    subject    "Including another template in the one being rendered"
-    from       "tester@example.com"
-  end
@@ -71 +77 @@
-    assert_equal "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<test/>", mail.body.strip
-  end
+  
+  def test_included_subtemplate
+    mail = RenderMailer.deliver_included_subtemplate(@recipient)
+    assert_equal "Hey Ho, let's go!", mail.body.strip
+  end
-end
-

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fixed that partial rendering should look at the type of the first render to determine its own type if no other clues are available (like when using text.plain.erb as the extension in AM) #10130 [java]
-
-* Fixed that has_many :through associations should render as collections too #9051 [mathie/danger]

trunk/actionpack/lib/action_view/base.rb

@@ -288 +288 @@
-          end
-          template_file_name = full_template_path(template_path, template_extension)
-\w
+.
-        end
-      else
@@ -491 +491 @@
-      # Determines the template's file extension, such as rhtml, rxml, or rjs.
-      def find_template_extension_for(template_path)
-
+
+
+
-      end
-
@@ -512 +514 @@
-        nil
-      end
+      
+      # Determine the template extension from the <tt>@first_render</tt> filename
+      def find_template_extension_from_first_render
+        extension = @first_render.to_s.sub /^\w+\.?/, ''
+        extension.blank? ? nil : extension
+      end
-
-      # This method reads a template file.