Take into account parent templates when rendering mail content. Fixes #10

Author: hawi74

templated_mail/mail.py

@@ -3,6 +3,7 @@
 from django.core import mail
 from django.template.context import make_context
 from django.template.loader import get_template
+from django.template.loader_tags import BlockNode, ExtendsNode
 from django.views.generic.base import ContextMixin
 
 
@@ -60,8 +61,9 @@ def render(self):
         context = make_context(self.get_context_data(), request=self.request)
         template = get_template(self.template_name)
         with context.bind_template(template.template):
-            for node in template.template.nodelist:
-                self._process_node(node, context)
+            blocks = self._get_blocks(template.template.nodelist, context)
+            for block_node in blocks.values():
+                self._process_block(block_node, context)
         self._attach_body()
 
     def send(self, to, *args, **kwargs):
@@ -77,10 +79,21 @@ def send(self, to, *args, **kwargs):
 
         super(BaseEmailMessage, self).send(*args, **kwargs)
 
-    def _process_node(self, node, context):
-        attr = self._node_map.get(getattr(node, 'name', ''))
+    def _process_block(self, block_node, context):
+        attr = self._node_map.get(block_node.name)
         if attr is not None:
-            setattr(self, attr, node.render(context).strip())
+            setattr(self, attr, block_node.render(context).strip())
+
+    def _get_blocks(self, nodelist, context):
+        blocks = {}
+        for node in nodelist:
+            if isinstance(node, ExtendsNode):
+                parent = node.get_parent(context)
+                blocks.update(self._get_blocks(parent.nodelist, context))
+        blocks.update({
+            node.name: node for node in nodelist.get_nodes_by_type(BlockNode)
+        })
+        return blocks
 
     def _attach_body(self):
         if self.body and self.html:

tests/templates/extends.html

@@ -0,0 +1,3 @@
+{% extends "text_and_html_mail.html" %}
+
+{% block html_body %}Some extended HTML body{% endblock html_body %}

tests/templates/html_mail.html

@@ -1,3 +1,3 @@
 {% block subject %}HTML mail subject{% endblock %}
 
-{% block html_body %}<p>Foobar email content</p>{% endblock %}
+{% block html_body %}<p>Foobar email content</p>{% endblock %}

tests/templates/nested_extends.html

@@ -0,0 +1,3 @@
+{% extends "extends.html" %}
+
+{% block text_body %}Some extended text body{% endblock text_body %}

tests/test_mail.py

@@ -225,3 +225,19 @@ def test_extending_mail_with_context_mixin(self):
 
         self.assertEquals(context['foo'], 'bar')
         self.assertEquals(context['thing'], 42)
+
+    def test_extending_mail_template(self):
+        email_message = BaseEmailMessage(template_name='extends.html')
+        email_message.render()
+
+        self.assertEquals(email_message.subject, 'Text and HTML mail subject')
+        self.assertEquals(email_message.body, 'Foobar email content')
+        self.assertEquals(email_message.html, 'Some extended HTML body')
+
+    def text_nested_extending_mail_template(self):
+        email_message = BaseEmailMessage(template_name='nested_extends.html')
+        email_message.render()
+
+        self.assertEquals(email_message.subject, 'Text and HTML mail subject')
+        self.assertEquals(email_message.body, 'Some extended text body')
+        self.assertEquals(email_message.html, 'Some extended HTML body')