django-codenerix-email 4.0.26__tar.gz → 4.0.28__tar.gz

{django_codenerix_email-4.0.26 → django_codenerix_email-4.0.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django_codenerix_email
-Version: 4.0.26
+Version: 4.0.28
 Summary: Codenerix Email is a module that enables CODENERIX to set send emails in a general manner.
 Home-page: https://github.com/codenerix/django-codenerix-email
 Author: Juan Miguel Taboada Godoy <juanmi@juanmitaboada.com>, Juan Soler Ruiz <soleronline@gmail.com>

{django_codenerix_email-4.0.26 → django_codenerix_email-4.0.28}/codenerix_email/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "4.0.26"
+__version__ = "4.0.28"
 
 __authors__ = [
     "Juan Miguel Taboada Godoy <juanmi@juanmitaboada.com>",

django_codenerix_email-4.0.28/codenerix_email/management/commands/test_email.py

@@ -0,0 +1,179 @@
+# -*- coding: utf-8 -*-
+#
+# django-codenerix-email
+#
+# Codenerix GNU
+#
+# Project URL : http://www.codenerix.com
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import json
+
+from django.core.management.base import BaseCommand
+from django.conf import settings
+from django.utils import timezone
+
+from codenerix_lib.debugger import Debugger
+from codenerix_email.models import EmailMessage, EmailTemplate  # type: ignore
+from codenerix_email import __version__
+from django.core.management import CommandError
+
+
+class Command(BaseCommand, Debugger):
+
+    # Show this when the user types help
+    help = "Test"
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "--email",
+            type=str,
+            help="Email",
+            default=None,
+        )
+        parser.add_argument(
+            "--template",
+            type=str,
+            help="Template CID",
+            default=None,
+        )
+        parser.add_argument(
+            "--context",
+            type=str,
+            help="Context as JSON",
+            default="{}",
+        )
+        parser.add_argument(
+            "--language",
+            type=str,
+            help="Language",
+            default=None,
+        )
+        parser.add_argument(
+            "--stdout",
+            action="store_true",
+            help="Print to stdout",
+            default=False,
+        )
+
+    def handle(self, *args, **options):
+
+        # Autoconfigure Debugger
+        self.set_name("CODENERIX-EMAIL")
+        self.set_debug()
+
+        # Get arguments
+        email = options["email"]
+        template = options["template"]
+        context_str = options["context"]
+        language = options["language"]
+        stdout = options["stdout"]
+
+        # Read context
+        try:
+            context = json.loads(context_str)
+        except json.JSONDecodeError:
+            raise CommandError(
+                "Context is not a valid JSON string: {}".format(context_str)
+            )
+
+        # If no template is provided, use the default one
+        if template is None:
+
+            # Get the default template
+            message = """Hello,
+
+This email has been sent using Django Codenerix Email.
+
+Best regards, Codenerix Team
+
+--
+Django Codenerix Email v{}
+""".format(
+                __version__
+            )
+
+            def email_message_factory(context, language):
+                email_message = EmailMessage()
+                email_message.subject = "[Codenerix Email] Test"
+                email_message.body = message
+                return email_message
+
+        else:
+            # Get the template
+            try:
+                template = EmailTemplate.objects.get(cid=template)
+            except EmailTemplate.DoesNotExist:
+                raise CommandError(
+                    "Template with CID {} does not exist.".format(template)
+                )
+
+            # Render the template
+            def email_message_factory(context, language):
+                return template.get_email(context, language)
+
+        # If no email is provided, send to all admins
+        if email is None:
+
+            # Send email to all admins
+            for name, email in settings.ADMINS:
+                email_message = email_message_factory(context, language)
+                email_message.efrom = settings.DEFAULT_FROM_EMAIL
+                email_message.eto = email
+
+                # Prepare message ID info
+                ecid = email_message.uuid.hex
+                edomain = settings.EMAIL_FROM.split("@")[-1]
+                ets = int(timezone.now().timestamp())
+                email_message.headers = {
+                    "Message-ID": f"<{ecid}-{ets}@{edomain}>",
+                    "X-Codenerix-Email": "Test",
+                }
+
+                if stdout:
+                    self.debug(
+                        f"Sending email to {name} <{email}> "
+                        f"with subject: {email_message.subject}:\n"
+                        f"{email_message.body}",
+                        color="white",
+                    )
+                else:
+                    email_message.save()
+                    email_message.send(legacy=False, silent=False)
+        else:
+
+            # Send email to the specified address
+            email_message = email_message_factory(context, language)
+            email_message.efrom = settings.DEFAULT_FROM_EMAIL
+            email_message.eto = email
+
+            # Prepare message ID info
+            ecid = email_message.uuid.hex
+            edomain = settings.EMAIL_FROM.split("@")[-1]
+            ets = int(timezone.now().timestamp())
+            email_message.headers = {
+                "Message-ID": f"<{ecid}-{ets}@{edomain}>",
+                "X-Codenerix-Email": "Test",
+            }
+
+            if stdout:
+                self.debug(
+                    f"Sending email to {name} <{email}> "
+                    f"with subject: {email_message.subject}:\n"
+                    f"{email_message.body}",
+                    color="white",
+                )
+            else:
+                email_message.save()
+                email_message.send(legacy=False, silent=False)

{django_codenerix_email-4.0.26 → django_codenerix_email-4.0.28}/codenerix_email/models.py

@@ -49,8 +49,10 @@ CONTENT_SUBTYPES = (
 )
 
 
-def ensure_header(headers, key, value):
-    if key not in headers:
+def ensure_header(headers, key, value, headers_keys=None):
+    if headers_keys is None:
+        headers_keys = [k.lower() for k in headers.keys()]
+    if key.lower() not in headers_keys:
         headers[key] = value
     return headers
 
@@ -186,13 +188,34 @@ class EmailMessage(CodenerixModel, Debugger):
         # Get headers
         headers = self.headers or {}
 
+        # Header keys
+        headers_keys = [k.lower() for k in headers.keys()]
+
         # Ensure unsubscribe headers
         if self.unsubscribe_url:
             ensure_header(
-                headers, "List-Unsubscribe", f"<{self.unsubscribe_url}>"
+                headers,
+                "List-Unsubscribe",
+                f"<{self.unsubscribe_url}>",
+                headers_keys,
             )
             ensure_header(
-                headers, "List-Unsubscribe-Post", "List-Unsubscribe=One-Click"
+                headers,
+                "List-Unsubscribe-Post",
+                "List-Unsubscribe=One-Click",
+                headers_keys,
+            )
+
+        # Prepare message ID info
+        if "Message-ID".lower() not in headers_keys:
+            ecid = self.uuid.hex
+            edomain = settings.EMAIL_FROM.split("@")[-1]
+            ets = int(timezone.now().timestamp())
+            ensure_header(
+                headers,
+                "Message-ID",
+                f"<{ecid}-{ets}@{edomain}>",
+                headers_keys,
             )
 
         # Return headers
@@ -552,6 +575,7 @@ class EmailTemplate(CodenerixModel):
         e.body = Template(getattr(self, lang).body).render(Context(context))
         e.efrom = Template(self.efrom).render(Context(context))
         e.content_subtype = self.content_subtype
+
         return e
 
     def clean(self):

{django_codenerix_email-4.0.26 → django_codenerix_email-4.0.28}/django_codenerix_email.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-codenerix-email
-Version: 4.0.26
+Version: 4.0.28
 Summary: Codenerix Email is a module that enables CODENERIX to set send emails in a general manner.
 Home-page: https://github.com/codenerix/django-codenerix-email
 Author: Juan Miguel Taboada Godoy <juanmi@juanmitaboada.com>, Juan Soler Ruiz <soleronline@gmail.com>

django_codenerix_email-4.0.26/codenerix_email/management/commands/test_email.py

@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# django-codenerix-email
-#
-# Codenerix GNU
-#
-# Project URL : http://www.codenerix.com
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-from django.core.management.base import BaseCommand
-from django.conf import settings
-
-from codenerix_lib.debugger import Debugger
-from codenerix_email.models import EmailMessage
-from codenerix_email import __version__
-
-
-class Command(BaseCommand, Debugger):
-
-    # Show this when the user types help
-    help = "Test"
-
-    def handle(self, *args, **options):
-
-        # Autoconfigure Debugger
-        self.set_name("CODENERIX-EMAIL")
-        self.set_debug()
-
-        message = """Hello,
-
-this email has been sent using Django Codenerix Email.
-
-Best regards, Codenerix Team
-
---
-Django Codenerix Email v{}""".format(
-            __version__
-        )
-
-        for name, email in settings.ADMINS:
-            email_message = EmailMessage()
-            email_message.efrom = settings.DEFAULT_FROM_EMAIL
-            email_message.eto = email
-            email_message.subject = "[Codenerix Email] Test"
-            email_message.body = message
-            email_message.save()
-            email_message.send(legacy=False, silent=False)