Merge pull request #3 from dkainama/feature/pass-context-to-mixins

Feature: pass context to mixins on BaseEmailMessage

Author: pszpetkowski

templated_mail/mail.py

@@ -1,13 +1,12 @@
-from copy import deepcopy
-
 from django.conf import settings
 from django.contrib.sites.shortcuts import get_current_site
 from django.core import mail
 from django.template.context import make_context
 from django.template.loader import get_template
+from django.views.generic.base import ContextMixin
 
 
-class BaseEmailMessage(mail.EmailMultiAlternatives):
+class BaseEmailMessage(mail.EmailMultiAlternatives, ContextMixin):
     _node_map = {
         'subject': 'subject',
         'text_body': 'body',
@@ -26,8 +25,9 @@ def __init__(self, request=None, context=None, template_name=None,
         if template_name is not None:
             self.template_name = template_name
 
-    def get_context_data(self):
-        context = deepcopy(self.context)
+    def get_context_data(self, **kwargs):
+        ctx = super(BaseEmailMessage, self).get_context_data(**kwargs)
+        context = dict(ctx, **self.context)
         if self.request:
             site = get_current_site(self.request)
             domain = context.get('domain') or (

tests/helpers.py

@@ -0,0 +1,13 @@
+from django.views.generic.base import ContextMixin
+from templated_mail.mail import BaseEmailMessage
+
+
+class MockMailContext(ContextMixin):
+    def get_context_data(self, **kwargs):
+        context = super(MockMailContext, self).get_context_data(**kwargs)
+        context['thing'] = 42
+        return context
+
+
+class MockMail(BaseEmailMessage, MockMailContext):
+    pass

tests/test_mail.py

@@ -9,6 +9,8 @@
 from django.test import RequestFactory, TestCase
 from templated_mail.mail import BaseEmailMessage
 
+from .helpers import MockMail
+
 
 class TestBaseEmailMessage(TestCase):
     def setUp(self):
@@ -203,3 +205,13 @@ def test_mail_from_email_is_sent_with_valid_from_email(self):
         self.assertEqual(mail.outbox[0].body, 'Foobar email content')
         self.assertEqual(mail.outbox[0].alternatives, [])
         self.assertEqual(mail.outbox[0].content_subtype, 'plain')
+
+    def test_extending_mail_with_context_mixin(self):
+        email_message = MockMail(
+            template_name='text_mail.html', context={'foo': 'bar'}
+        )
+
+        context = email_message.get_context_data()
+
+        self.assertEquals(context['foo'], 'bar')
+        self.assertEquals(context['thing'], 42)