WIP

thinkingserious · thinkingserious · commit ff555caf7fda · 2018-08-16T09:08:26.000-07:00
diff --git a/sendgrid/helpers/mail/attachment.py b/sendgrid/helpers/mail/attachment.py
@@ -1,14 +1,47 @@
 class Attachment(object):
     """An attachment to be included with an email."""
 
-    def __init__(self):
-        """Create an empty Attachment."""
+    def __init__(self, content=None, type_=None, filename=None, disposition=None, content_id=None):
+        """Create an Attachment
+
+        :param content: The Base64 encoded content of the attachment
+        :type content: string, optional
+        :param filename: The filename of the attachment
+        :type filename: string, optional
+        :param disposition: The content-disposition of the attachment, specifying display style.
+                            Specifies how you would like the attachment to be displayed.
+                            - "inline" results in the attached file being displayed automatically
+                                within the message.
+                            - "attachment" results in the attached file requiring some action to
+                                display (e.g. opening or downloading the file).
+                            If unspecified, "attachment" is used. Must be one of the two choices.
+        :type disposition: string, optional
+        :param content_id: The content id for the attachment.
+                           This is used when the disposition is set to "inline" and the attachment
+                           is an image, allowing the file to be displayed within the email body.
+        :type content_id: string, optional
+        """
         self._content = None
         self._type = None
         self._filename = None
         self._disposition = None
         self._content_id = None
 
+        if content is not None:
+            self.content = content
+        
+        if type_ is not None:
+            self.type = type_
+        
+        if filename is not None:
+            self.filename = filename
+        
+        if disposition is not None:
+            self.disposition = disposition
+        
+        if content_id is not None:
+            self.content_id = content_id
+
     @property
     def content(self):
         """The Base64 encoded content of the attachment.
diff --git a/sendgrid/helpers/mail/bcc_settings.py b/sendgrid/helpers/mail/bcc_settings.py
@@ -13,8 +13,14 @@ def __init__(self, enable=None, email=None):
         :param email: Who should be BCCed.
         :type email: Email, optional
         """
-        self.enable = enable
-        self.email = email
+        self._enable = None
+        self._email = None
+
+        if enable is not None:
+            self.enable = enable
+        
+        if email is not None:
+            self.email = email
 
     @property
     def enable(self):
diff --git a/sendgrid/helpers/mail/bypass_list_management.py b/sendgrid/helpers/mail/bypass_list_management.py
@@ -13,7 +13,10 @@ def __init__(self, enable=None):
         :param enable: Whether emails should bypass list management.
         :type enable: boolean, optional
         """
-        self.enable = enable
+        self._enable = None
+
+        if enable is not None:
+            self.enable = enable
 
     @property
     def enable(self):
diff --git a/sendgrid/helpers/mail/category.py b/sendgrid/helpers/mail/category.py
@@ -7,7 +7,10 @@ def __init__(self, name=None):
         :param name: The name of this category
         :type name: string, optional
         """
-        self.name = name
+        self._name = None
+
+        if name is not None:
+            self.name = name
 
     @property
     def name(self):
diff --git a/sendgrid/helpers/mail/click_tracking.py b/sendgrid/helpers/mail/click_tracking.py
@@ -9,8 +9,14 @@ def __init__(self, enable=None, enable_text=None):
         :param enable_text: If click tracking is on in your email's text/plain.
         :type enable_text: boolean, optional
         """
-        self.enable = enable
-        self.enable_text = enable_text
+        self._enable = None
+        self._enable_text = None
+
+        if enable is not None:
+            self.enable = enable
+        
+        if enable_text is not None:
+            self.enable_text = enable_text
 
     @property
     def enable(self):
diff --git a/sendgrid/helpers/mail/custom_arg.py b/sendgrid/helpers/mail/custom_arg.py
@@ -8,9 +8,21 @@ class CustomArg(object):
     """
 
     def __init__(self, key=None, value=None):
-        """Create a CustomArg with the given key and value."""
-        self.key = key
-        self.value = value
+        """Create a CustomArg with the given key and value.
+            
+            :param key: Key for this CustomArg
+            :type key: string, optional
+            :param value: Value of this CustomArg
+            :type value: string, optional
+        """
+        self._key = None
+        self._value = None
+        
+        if key is not None:
+            self.key = key
+        
+        if value is not None:
+            self.value = value
 
     @property
     def key(self):
diff --git a/sendgrid/helpers/mail/email.py b/sendgrid/helpers/mail/email.py
@@ -17,13 +17,19 @@ def __init__(self, email=None, name=None):
         :param name: Name for this sender or recipient.
         :type name: string
         """
+        self._name = None
+        self._email = None
+
         if email and not name:
             # allows passing emails as "dude Fella <example@example.com>"
             self.parse_email(email)
         else:
             # allows backwards compatibility for Email(email, name)
-            self.email = email
-            self.name = name
+            if email is not None:
+                self.email = email
+
+            if name is not None:
+                self.name = name
 
     @property
     def name(self):
diff --git a/sendgrid/helpers/mail/exceptions.py b/sendgrid/helpers/mail/exceptions.py
@@ -8,15 +8,47 @@ class SendGridException(Exception):
 
 
 class APIKeyIncludedException(SendGridException):
-    """Exception raised for when SendGrid API Key included in message text
-        Attributes:
-            expression -- input expression in which the error occurred
-            message -- explanation of the error
-    """
+    """Exception raised for when SendGrid API Key included in message text"""
 
     def __init__(self, 
                  expression="Email body", 
                  message="SendGrid API Key detected"):
-        self.expression = expression
-        self.message = message
+        """Create an exception for when SendGrid API Key included in message text
+        
+            :param expression: Input expression in which the error occurred
+            :type expression: string
+            :param message: Explanation of the error
+            :type message: string
+        """
+        self._expression = None
+        self._message = None
 
+        if expression is not None:
+            self.expression = expression
+
+        if message is not None:
+            self.message = message
+
+    @property
+    def expression(self):
+        """Input expression in which the error occurred
+
+        :rtype: string
+        """
+        return self._expression
+
+    @expression.setter
+    def expression(self, value):
+        self._expression = value
+
+    @property
+    def message(self):
+        """Explanation of the error
+
+        :rtype: string
+        """
+        return self._message
+
+    @message.setter
+    def message(self, value):
+        self._message = value
diff --git a/sendgrid/helpers/mail/footer_settings.py b/sendgrid/helpers/mail/footer_settings.py
@@ -11,9 +11,18 @@ def __init__(self, enable=None, text=None, html=None):
         :param html: HTML content of this footer
         :type html: string, optional
         """
-        self.enable = enable
-        self.text = text
-        self.html = html
+        self._enable = None
+        self._text = None
+        self._html = None
+
+        if enable is not None:
+            self.enable = enable
+        
+        if text is not None:
+            self.text = text
+        
+        if html is not None:
+            self.html = html
 
     @property
     def enable(self):
diff --git a/sendgrid/helpers/mail/ganalytics.py b/sendgrid/helpers/mail/ganalytics.py
@@ -41,7 +41,7 @@ def __set_field(self, field, value):
         """ Sets a field to the provided value if value is not None
 
         :param field: Name of the field
-        :type field: String
+        :type field: string
         :param value: value to be set, ignored if None
         :type value: Any
         """
diff --git a/sendgrid/helpers/mail/html_content.py b/sendgrid/helpers/mail/html_content.py
@@ -4,15 +4,17 @@
 class HtmlContent(Content):
     """HTML content to be included in your email."""
 
-    def __init__(self, value):
+    def __init__(self, value = None):
         """Create an HtmlContent with the specified MIME type and value.
 
         :param value: The HTML content.
         :type value: string, optional
         """
+        self._value = None
         self._validator = ValidateAPIKey()
-        self.type = "text/html"
-        self.value = value
+
+        if value is not None:
+            self.value = value
 
     @property
     def value(self):
diff --git a/sendgrid/helpers/mail/mail_settings.py b/sendgrid/helpers/mail/mail_settings.py
@@ -1,14 +1,47 @@
 class MailSettings(object):
     """A collection of mail settings that specify how to handle this email."""
 
-    def __init__(self):
-        """Create an empty MailSettings."""
+    def __init__(self,
+                 bcc_settings = None,
+                 bypass_list_management = None,
+                 footer_settings = None,
+                 sandbox_mode = None,
+                 spam_check = None): 
+        """Create a MailSettings object
+
+        :param bcc_settings: The BCC Settings of this MailSettings
+        :type bcc_settings: BCCSettings, optional
+        :param bypass_list_management: Whether this MailSettings bypasses list management
+        :type bypass_list_management: BypassListManagement, optional
+        :param footer_settings: The default footer specified by this MailSettings
+        :type footer_settings: FooterSettings, optional
+        :param sandbox_mode: Whether this MailSettings enables sandbox mode
+        :type sandbox_mode: SandBoxMode, optional
+        :param spam_check: How this MailSettings requests email to be checked for spam
+        :type spam_check: SpamCheck, optional
+        
+        """
         self._bcc_settings = None
         self._bypass_list_management = None
         self._footer_settings = None
         self._sandbox_mode = None
         self._spam_check = None
 
+        if bcc_settings is not None:
+            self.bcc_settings = bcc_settings
+        
+        if bypass_list_management is not None:
+            self.bypass_list_management = bypass_list_management
+
+        if footer_settings is not None:
+            self.footer_settings = footer_settings
+
+        if sandbox_mode is not None:
+            self.sandbox_mode = sandbox_mode
+
+        if spam_check is not None:
+            self.spam_check = spam_check
+
     @property
     def bcc_settings(self):
         """The BCC Settings of this MailSettings.
