Send a Single Email to a Single Recipient

thinkingserious · thinkingserious · commit 00260892fc02 · 2018-11-29T14:19:10.000-08:00
diff --git a/TROUBLESHOOTING.md b/TROUBLESHOOTING.md
@@ -105,7 +105,7 @@ When debugging or testing, it may be useful to examine the raw request body to c
 You can do this right before you call `response = sg.client.mail.send.post(request_body=mail.get())` like so:
 
 ```python
-print mail.get()
+ print(json.dumps(message.get(), sort_keys=True, indent=4))
 ```
 
 <a name="error-handling"></a>
diff --git a/live_test.py b/live_test.py
@@ -1,5 +1,6 @@
 # Send a Single Email to a Single Recipient
 import os
+import json
 from sendgrid import SendGridAPIClient
 from sendgrid.helpers.mail import Mail, From, To, Subject, PlainTextContent, HtmlContent, SendGridException
 
@@ -11,6 +12,7 @@
 
 try:
     sendgrid_client = SendGridAPIClient(apikey=os.environ.get('SENDGRID_API_KEY'))
+    print(json.dumps(message.get(), sort_keys=True, indent=4))
     response = sendgrid_client.send(message=message)
     print(response.status_code)
     print(response.body)
@@ -21,4 +23,3 @@
 # ToDo
 
 ## The Mail constructor should also support passing in tuples and strings
-## The send function parameter should be better named, maybe email_message or simply message
diff --git a/sendgrid/helpers/mail/html_content.py b/sendgrid/helpers/mail/html_content.py
@@ -17,6 +17,14 @@ def __init__(self, value = None):
         if value is not None:
             self.value = value
 
+    @property
+    def type(self):
+        """The actual text content.
+
+        :rtype: string
+        """
+        return "text/html"
+
     @property
     def value(self):
         """The actual HTML content.
@@ -38,6 +46,6 @@ def get(self):
         :rtype: dict
         """
         content = {}
-        content["type"] = "text/html"
-        content["value"] = self._value
+        content["type"] = self.type
+        content["value"] = self.value
         return content
diff --git a/sendgrid/helpers/mail/mail.py b/sendgrid/helpers/mail/mail.py
@@ -8,17 +8,25 @@
 class Mail(object):
     """Creates the response body for v3/mail/send"""
     def __init__(
-            self, from_email=None, subject=None, to_email=None, content=None):
+            self,
+            from_email=None,
+            subject=None,
+            to_emails=None,
+            plain_text_content=None,
+            html_content=None
+        ):
         """Create Mail object
         
         :param from_email: The email address of the sender
-        :type from_email: string, optional
+        :type from_email: From, optional
         :param subject: The subject of the email
-        :type subject: string, optional
-        :param to_email: The email address of the recipient
-        :type to_email: string, optional
-        :param content: The body of the email
-        :type content: string, optional
+        :type subject: Subject, optional
+        :param to_emails: The email address of the recipient
+        :type to_emails: string, optional
+        :param plain_text_content: The plain text body of the email
+        :type plain_text_content: string, optional
+        :param html_content: The html body of the email
+        :type html_content: string, optional
         """
         self._attachments = None
         self._categories = None
@@ -43,12 +51,14 @@ def __init__(
             self.from_email = from_email
         if subject is not None:
             self.subject = subject
-        if to_email is not None:
+        if to_emails is not None:
             personalization = Personalization()
-            personalization.add_to(to_email)
+            personalization.add_to(to_emails)
             self.add_personalization(personalization)
-        if content is not None:
-            self.add_content(content)
+        if plain_text_content is not None:
+            self.add_content(plain_text_content)
+        if html_content is not None:
+            self.add_content(html_content)
 
     def __str__(self):
         return str(self.get())
@@ -97,7 +107,7 @@ def contents(self):
 
     def add_content(self, content):
         # Text content should be before HTML content
-        if content._type == "text/plain":
+        if content.type == "text/plain":
             self._contents = self._ensure_insert(content, self._contents)
         else:
             self._contents = self._ensure_append(content, self._contents)
@@ -214,7 +224,7 @@ def get(self):
         """
         mail = {
             'from': self._get_or_none(self.from_email),
-            'subject': self.subject,
+            'subject': self._get_or_none(self.subject),
             'personalizations': [p.get() for p in self.personalizations or []],
             'content': [c.get() for c in self.contents or []],
             'attachments': [a.get() for a in self.attachments or []],
@@ -245,7 +255,7 @@ def from_EmailMessage(cls, message):
         mail = cls(
             from_email=Email(message.get('From')),
             subject=message.get('Subject'),
-            to_email=Email(message.get('To')),
+            to_emails=Email(message.get('To')),
         )
         try:
             body = message.get_content()
diff --git a/sendgrid/helpers/mail/plain_text_content.py b/sendgrid/helpers/mail/plain_text_content.py
@@ -6,20 +6,17 @@ class PlainTextContent(Content):
     """Plain text content to be included in your email.
     """
 
-    def __init__(self, value, validator=None):
+    def __init__(self, value):
         """Create a PlainTextContent with the specified MIME type and value.
 
         :param value: The actual text content.
         """
         self._value = None
-        self._validator = None
+        self._validator = ValidateAPIKey()
 
         if value is not None:
             self.value = value
-        if validator is not None:
-            self.validator = validator
-        else:
-            self.validator = ValidateAPIKey()
+        
 
     @property
     def type(self):
@@ -39,17 +36,9 @@ def value(self):
 
     @value.setter
     def value(self, value):
-        self.validator.validate_message_dict(value)
+        self._validator.validate_message_dict(value)
         self._value = value
 
-    @property
-    def validator(self):
-        return self._validator
-
-    @validator.setter
-    def validator(self, value):
-        self._validator = value
-
     def get(self):
         """
         Get a JSON-ready representation of this PlainTextContent.
