sendgrid-ruby 4.3.3 → 5.0.0

data/lib/sendgrid/helpers/mail/mail_settings.rb

@@ -0,0 +1,63 @@
+require 'json'
+
+module SendGrid
+  class MailSettings
+    def initialize
+      @bcc = nil
+      @bypass_list_management = nil
+      @footer = nil
+      @sandbox_mode = nil
+      @spam_check = nil
+    end
+
+    def sandbox_mode=(sandbox_mode)
+      @sandbox_mode = sandbox_mode
+    end
+
+    def sandbox_mode
+      @sandbox_mode.nil? ? nil : @sandbox_mode.to_json
+    end
+
+    def bypass_list_management=(bypass_list_management)
+      @bypass_list_management = bypass_list_management
+    end
+
+    def bypass_list_management
+      @bypass_list_management.nil? ? nil : @bypass_list_management.to_json
+    end
+
+    def footer=(footer)
+      @footer = footer
+    end
+
+    def footer
+      @footer.nil? ? nil : @footer.to_json
+    end
+
+    def bcc=(bcc)
+      @bcc = bcc
+    end
+
+    def bcc
+      @bcc.nil? ? nil : @bcc.to_json
+    end
+
+    def spam_check=(spam_check)
+      @spam_check = spam_check
+    end
+
+    def spam_check
+      @spam_check.nil? ? nil : @spam_check.to_json
+    end
+
+    def to_json(*)
+      {
+        'bcc' => self.bcc,
+        'bypass_list_management' => self.bypass_list_management,
+        'footer' => self.footer,
+        'sandbox_mode' => self.sandbox_mode,
+        'spam_check' => self.spam_check
+      }.delete_if { |_, value| value.to_s.strip == '' }
+    end
+  end
+end

data/lib/sendgrid/helpers/mail/open_tracking.rb

@@ -0,0 +1,33 @@
+require 'json'
+
+module SendGrid
+  class OpenTracking
+    def initialize(enable: nil, substitution_tag: nil)
+      @enable = enable
+      @substitution_tag = substitution_tag
+    end
+
+    def enable=(enable)
+      @enable = enable
+    end
+
+    def enable
+      @enable
+    end
+
+    def substitution_tag=(substitution_tag)
+      @substitution_tag = substitution_tag
+    end
+
+    def substitution_tag
+      @substitution_tag
+    end
+
+    def to_json(*)
+      {
+        'enable' => self.enable,
+        'substitution_tag' => self.substitution_tag
+      }.delete_if { |_, value| value.to_s.strip == '' }
+    end
+  end
+end

data/lib/sendgrid/helpers/mail/personalization.rb

@@ -0,0 +1,75 @@
+require 'json'
+
+module SendGrid
+  class Personalization
+
+    attr_reader :tos, :ccs, :bccs, :headers, :substitutions, :custom_args
+
+    def initialize
+      @tos = []
+      @ccs = []
+      @bccs = []
+      @subject = nil
+      @headers = {}
+      @substitutions = {}
+      @custom_args = {}
+      @send_at = nil
+    end
+
+    def add_to(to)
+      @tos << to.to_json
+    end
+
+    def add_cc(cc)
+      @ccs << cc.to_json
+    end
+
+    def add_bcc(bcc)
+      @bccs << bcc.to_json
+    end
+
+    def subject=(subject)
+      @subject = subject
+    end
+
+    def subject
+      @subject
+    end
+
+    def add_header(header)
+      header = header.to_json
+      @headers = @headers.merge(header['header'])
+    end
+
+    def add_substitution(substitution)
+      substitution = substitution.to_json
+      @substitutions = @substitutions.merge(substitution['substitution'])
+    end
+
+    def add_custom_arg(custom_arg)
+      custom_arg = custom_arg.to_json
+      @custom_args = @custom_args.merge(custom_arg['custom_arg'])
+    end
+
+    def send_at=(send_at)
+      @send_at = send_at
+    end
+
+    def send_at
+      @send_at
+    end
+
+    def to_json(*)
+      {
+        'to' => self.tos,
+        'cc' => self.ccs,
+        'bcc' => self.bccs,
+        'subject' => self.subject,
+        'headers' => self.headers,
+        'substitutions' => self.substitutions,
+        'custom_args' => self.custom_args,
+        'send_at' => self.send_at
+      }.delete_if { |_, value| value.to_s.strip == '' || value == [] || value == {}}
+    end
+  end
+end

data/lib/sendgrid/helpers/mail/section.rb

@@ -0,0 +1,24 @@
+require 'json'
+
+module SendGrid
+  class Section
+    def initialize(key: nil, value: nil)
+      @section = {}
+      (key.nil? || value.nil?) ? @section = nil : @section[key] = value
+    end
+
+    def section=(section)
+      @section = section
+    end
+
+    def section
+      @section
+    end
+
+    def to_json(*)
+      {
+        'section' => self.section
+      }.delete_if { |_, value| value.to_s.strip == '' }
+    end
+  end
+end

data/lib/sendgrid/helpers/mail/spam_check.rb

@@ -0,0 +1,43 @@
+require 'json'
+
+module SendGrid
+  class SpamCheck
+    def initialize(enable: nil, threshold: nil, post_to_url: nil)
+      @enable = enable
+      @threshold = threshold
+      @post_to_url = post_to_url
+    end
+
+    def enable=(enable)
+      @enable = enable
+    end
+
+    def enable
+      @enable
+    end
+
+    def threshold=(threshold)
+      @threshold = threshold
+    end
+
+    def threshold
+      @threshold
+    end
+
+    def post_to_url=(post_to_url)
+      @post_to_url = post_to_url
+    end
+
+    def post_to_url
+      @post_to_url
+    end
+
+    def to_json(*)
+      {
+        'enable' => self.enable,
+        'threshold' => self.threshold,
+        'post_to_url' => self.post_to_url
+      }.delete_if { |_, value| value.to_s.strip == '' }
+    end
+  end
+end

data/lib/sendgrid/helpers/mail/subscription_tracking.rb

@@ -0,0 +1,53 @@
+require 'json'
+
+module SendGrid
+  class SubscriptionTracking
+    def initialize(enable: nil, text: nil, html: nil, substitution_tag: nil)
+      @enable = enable
+      @text = text
+      @html = html
+      @substitution_tag = substitution_tag
+    end
+
+    def enable=(enable)
+      @enable = enable
+    end
+
+    def enable
+      @enable
+    end
+
+    def text=(text)
+      @text = text
+    end
+
+    def text
+      @text
+    end
+
+    def html=(html)
+      @html = html
+    end
+
+    def html
+      @html
+    end
+
+    def substitution_tag=(substitution_tag)
+      @substitution_tag = substitution_tag
+    end
+
+    def substitution_tag
+      @substitution_tag
+    end
+
+    def to_json(*)
+      {
+        'enable' => self.enable,
+        'text' => self.text,
+        'html' => self.html,
+        'substitution_tag' => self.substitution_tag
+      }.delete_if { |_, value| value.to_s.strip == '' }
+    end
+  end
+end

data/lib/sendgrid/helpers/mail/substitution.rb

@@ -0,0 +1,24 @@
+require 'json'
+
+module SendGrid
+  class Substitution
+    def initialize(key: nil, value: nil)
+      @substitution = {}
+      (key.nil? || value.nil?) ? @substitution = nil : @substitution[key] = value
+    end
+
+    def substitution=(substitution)
+      @substitution = substitution
+    end
+
+    def substitution
+      @substitution
+    end
+
+    def to_json(*)
+      {
+        'substitution' => self.substitution
+      }.delete_if { |_, value| value.to_s.strip == '' }
+    end
+  end
+end

data/lib/sendgrid/helpers/mail/tracking_settings.rb

@@ -0,0 +1,53 @@
+require 'json'
+
+module SendGrid
+  class TrackingSettings
+    def initialize
+      @click_tracking = nil
+      @open_tracking = nil
+      @subscription_tracking = nil
+      @ganalytics = nil
+    end
+
+    def click_tracking=(click_tracking)
+      @click_tracking = click_tracking
+    end
+
+    def click_tracking
+      @click_tracking.nil? ? nil : @click_tracking.to_json
+    end
+
+    def open_tracking=(open_tracking)
+      @open_tracking = open_tracking
+    end
+
+    def open_tracking
+      @open_tracking.nil? ? nil : @open_tracking.to_json
+    end
+
+    def subscription_tracking=(subscription_tracking)
+      @subscription_tracking = subscription_tracking
+    end
+
+    def subscription_tracking
+      @subscription_tracking.nil? ? nil : @subscription_tracking.to_json
+    end
+
+    def ganalytics=(ganalytics)
+      @ganalytics = ganalytics
+    end
+
+    def ganalytics
+      @ganalytics.nil? ? nil : @ganalytics.to_json
+    end
+
+    def to_json(*)
+      {
+        'click_tracking' => self.click_tracking,
+        'open_tracking' => self.open_tracking,
+        'subscription_tracking' => self.subscription_tracking,
+        'ganalytics' => self.ganalytics
+      }.delete_if { |_, value| value.to_s.strip == '' }
+    end
+  end
+end

data/lib/sendgrid/version.rb

@@ -1,3 +1,3 @@
 module SendGrid
-  VERSION = '4.3.3'
+  VERSION = '5.0.0'
 end

data/test/sendgrid/helpers/mail/test_category.rb

@@ -0,0 +1,27 @@
+require_relative '../../../../lib/sendgrid/helpers/mail/mail'
+require 'minitest/autorun'
+
+class TestCategory < Minitest::Test
+
+  include SendGrid
+
+  def setup
+    @category = Category.new(name: 'foo')
+  end
+
+  def test_aliases
+    assert_equal @category.method(:name), @category.method(:category)
+  end
+
+  def test_name
+    assert_equal @category.name, 'foo'
+  end
+
+  def test_to_json
+    expected_json = {
+      'category' => 'foo'
+    }
+    assert_equal @category.to_json, expected_json
+  end
+
+end

data/test/sendgrid/helpers/mail/test_mail.rb

@@ -9,88 +9,88 @@ class TestMail < Minitest::Test
   end
 
   def test_hello_world
-    mail = Mail.new()
+    mail = Mail.new
     mail.from = Email.new(email: "test@example.com")
     mail.subject = "Hello World from the SendGrid Ruby Library"
-    personalization = Personalization.new()
-    personalization.to = Email.new(email: "test@example.com")
-    mail.personalizations = personalization
-    mail.contents = Content.new(type: "text/plain", value: "some text here")
-    mail.contents = Content.new(type: "text/html", value: "<html><body>some text here</body></html>")
+    personalization = Personalization.new
+    personalization.add_to(Email.new(email: "test@example.com"))
+    mail.add_personalization(personalization)
+    mail.add_content(Content.new(type: "text/plain", value: "some text here"))
+    mail.add_content(Content.new(type: "text/html", value: "<html><body>some text here</body></html>"))
     assert_equal(mail.to_json, JSON.parse('{"content":[{"type":"text/plain","value":"some text here"},{"type":"text/html","value":"<html><body>some text here</body></html>"}],"from":{"email":"test@example.com"},"personalizations":[{"to":[{"email":"test@example.com"}]}],"subject":"Hello World from the SendGrid Ruby Library"}'))
   end
 
   def test_kitchen_sink
-    mail = Mail.new()
+    mail = Mail.new
     mail.from = Email.new(email: "test@example.com")
     mail.subject = "Hello World from the SendGrid Ruby Library"
-    personalization = Personalization.new()
-    personalization.to = Email.new(email: "test@example.com", name: "Example User")
-    personalization.to = Email.new(email: "test@example.com", name: "Example User")
-    personalization.cc = Email.new(email: "test@example.com", name: "Example User")
-    personalization.cc = Email.new(email: "test@example.com", name: "Example User")
-    personalization.bcc = Email.new(email: "test@example.com", name: "Example User")
-    personalization.bcc = Email.new(email: "test@example.com", name: "Example User")
+    personalization = Personalization.new
+    personalization.add_to(Email.new(email: "test@example.com", name: "Example User"))
+    personalization.add_to(Email.new(email: "test@example.com", name: "Example User"))
+    personalization.add_cc(Email.new(email: "test@example.com", name: "Example User"))
+    personalization.add_cc(Email.new(email: "test@example.com", name: "Example User"))
+    personalization.add_bcc(Email.new(email: "test@example.com", name: "Example User"))
+    personalization.add_bcc(Email.new(email: "test@example.com", name: "Example User"))
     personalization.subject = "Hello World from the Personalized SendGrid Python Library"
-    personalization.headers = Header.new(key: "X-Test", value: "True")
-    personalization.headers = Header.new(key: "X-Mock", value: "False")
-    personalization.substitutions = Substitution.new(key: "%name%", value: "Example User")
-    personalization.substitutions = Substitution.new(key: "%city%", value: "Denver")
-    personalization.custom_args = CustomArg.new(key: "user_id", value: "343")
-    personalization.custom_args = CustomArg.new(key: "type", value: "marketing")
+    personalization.add_header(Header.new(key: "X-Test", value: "True"))
+    personalization.add_header(Header.new(key: "X-Mock", value: "False"))
+    personalization.add_substitution(Substitution.new(key: "%name%", value: "Example User"))
+    personalization.add_substitution(Substitution.new(key: "%city%", value: "Denver"))
+    personalization.add_custom_arg(CustomArg.new(key: "user_id", value: "343"))
+    personalization.add_custom_arg(CustomArg.new(key: "type", value: "marketing"))
     personalization.send_at = 1443636843
-    mail.personalizations = personalization
-
-    personalization2 = Personalization.new()
-    personalization2.to = Email.new(email: "test@example.com", name: "Example User")
-    personalization2.to = Email.new(email: "test@example.com", name: "Example User")
-    personalization2.cc = Email.new(email: "test@example.com", name: "Example User")
-    personalization2.cc = Email.new(email: "test@example.com", name: "Example User")
-    personalization2.bcc = Email.new(email: "test@example.com", name: "Example User")
-    personalization2.bcc = Email.new(email: "test@example.com", name: "Example User")
+    mail.add_personalization(personalization)
+
+    personalization2 = Personalization.new
+    personalization2.add_to(Email.new(email: "test@example.com", name: "Example User"))
+    personalization2.add_to(Email.new(email: "test@example.com", name: "Example User"))
+    personalization2.add_cc(Email.new(email: "test@example.com", name: "Example User"))
+    personalization2.add_cc(Email.new(email: "test@example.com", name: "Example User"))
+    personalization2.add_bcc(Email.new(email: "test@example.com", name: "Example User"))
+    personalization2.add_bcc(Email.new(email: "test@example.com", name: "Example User"))
     personalization2.subject = "Hello World from the Personalized SendGrid Python Library"
-    personalization2.headers = Header.new(key: "X-Test", value: "True")
-    personalization2.headers = Header.new(key: "X-Mock", value: "False")
-    personalization2.substitutions = Substitution.new(key: "%name%", value: "Example User")
-    personalization2.substitutions = Substitution.new(key: "%city%", value: "Denver")
-    personalization2.custom_args = CustomArg.new(key: "user_id", value: "343")
-    personalization2.custom_args = CustomArg.new(key: "type", value: "marketing")
+    personalization2.add_header(Header.new(key: "X-Test", value: "True"))
+    personalization2.add_header(Header.new(key: "X-Mock", value: "False"))
+    personalization2.add_substitution(Substitution.new(key: "%name%", value: "Example User"))
+    personalization2.add_substitution(Substitution.new(key: "%city%", value: "Denver"))
+    personalization2.add_custom_arg(CustomArg.new(key: "user_id", value: "343"))
+    personalization2.add_custom_arg(CustomArg.new(key: "type", value: "marketing"))
     personalization2.send_at = 1443636843
-    mail.personalizations = personalization2
+    mail.add_personalization(personalization2)
 
-    mail.contents = Content.new(type: "text/plain", value: "some text here")
-    mail.contents = Content.new(type: "text/html", value: "<html><body>some text here</body></html>")
+    mail.add_content(Content.new(type: "text/plain", value: "some text here"))
+    mail.add_content(Content.new(type: "text/html", value: "<html><body>some text here</body></html>"))
 
-    attachment = Attachment.new()
+    attachment = Attachment.new
     attachment.content = "TG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2NpbmcgZWxpdC4gQ3JhcyBwdW12"
     attachment.type = "application/pdf"
     attachment.filename = "balance_001.pdf"
     attachment.disposition = "attachment"
     attachment.content_id = "Balance Sheet"
 
-    mail.attachments = attachment
+    mail.add_attachment(attachment)
 
-    attachment2 = Attachment.new()
+    attachment2 = Attachment.new
     attachment2.content = "BwdW"
     attachment2.type = "image/png"
     attachment2.filename = "banner.png"
     attachment2.disposition = "inline"
     attachment2.content_id = "Banner"
-    mail.attachments = attachment2
+    mail.add_attachment(attachment2)
 
     mail.template_id = "13b8f94f-bcae-4ec6-b752-70d6cb59f932"
 
-    mail.sections = Section.new(key: "%section1%", value: "Substitution Text for Section 1")
-    mail.sections = Section.new(key: "%section2%", value: "Substitution Text for Section 2")
+    mail.add_section(Section.new(key: "%section1%", value: "Substitution Text for Section 1"))
+    mail.add_section(Section.new(key: "%section2%", value: "Substitution Text for Section 2"))
 
-    mail.headers = Header.new(key: "X-Test3", value: "test3")
-    mail.headers = Header.new(key: "X-Test4", value: "test4")
+    mail.add_header(Header.new(key: "X-Test3", value: "test3"))
+    mail.add_header(Header.new(key: "X-Test4", value: "test4"))
 
-    mail.categories = Category.new(name: "May")
-    mail.categories = Category.new(name: "2016")
+    mail.add_category(Category.new(name: "May"))
+    mail.add_category(Category.new(name: "2016"))
 
-    mail.custom_args = CustomArg.new(key: "campaign", value: "welcome")
-    mail.custom_args = CustomArg.new(key: "weekday", value: "morning")
+    mail.add_custom_arg(CustomArg.new(key: "campaign", value: "welcome"))
+    mail.add_custom_arg(CustomArg.new(key: "weekday", value: "morning"))
 
     mail.send_at = 1443636842
 
@@ -100,7 +100,7 @@ class TestMail < Minitest::Test
 
     mail.ip_pool_name = "23"
 
-    mail_settings = MailSettings.new()
+    mail_settings = MailSettings.new
     mail_settings.bcc = BccSettings.new(enable: true, email: "test@example.com")
     mail_settings.bypass_list_management = BypassListManagement.new(enable: true)
     mail_settings.footer = Footer.new(enable: true, text: "Footer Text", html: "<html><body>Footer Text</body></html>")
@@ -108,7 +108,7 @@ class TestMail < Minitest::Test
     mail_settings.spam_check = SpamCheck.new(enable: true, threshold: 1, post_to_url: "https://spamcatcher.sendgrid.com")
     mail.mail_settings = mail_settings
 
-    tracking_settings = TrackingSettings.new()
+    tracking_settings = TrackingSettings.new
     tracking_settings.click_tracking = ClickTracking.new(enable: false, enable_text: false)
     tracking_settings.open_tracking = OpenTracking.new(enable: true, substitution_tag: "Optional tag to replace with the open image in the body of the message")
     tracking_settings.subscription_tracking = SubscriptionTracking.new(enable: true, text: "text to insert into the text/plain portion of the message", html: "html to insert into the text/html portion of the message", substitution_tag: "Optional tag to replace with the open image in the body of the message")
@@ -119,4 +119,122 @@ class TestMail < Minitest::Test
 
     assert_equal(mail.to_json, JSON.parse('{"asm":{"group_id":99,"groups_to_display":[4,5,6,7,8]},"attachments":[{"content":"TG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2NpbmcgZWxpdC4gQ3JhcyBwdW12","content_id":"Balance Sheet","disposition":"attachment","filename":"balance_001.pdf","type":"application/pdf"},{"content":"BwdW","content_id":"Banner","disposition":"inline","filename":"banner.png","type":"image/png"}],"batch_id":"sendgrid_batch_id","categories":["May","2016"],"content":[{"type":"text/plain","value":"some text here"},{"type":"text/html","value":"<html><body>some text here</body></html>"}],"custom_args":{"campaign":"welcome","weekday":"morning"},"from":{"email":"test@example.com"},"headers":{"X-Test3":"test3","X-Test4":"test4"},"ip_pool_name":"23","mail_settings":{"bcc":{"email":"test@example.com","enable":true},"bypass_list_management":{"enable":true},"footer":{"enable":true,"html":"<html><body>Footer Text</body></html>","text":"Footer Text"},"sandbox_mode":{"enable":true},"spam_check":{"enable":true,"post_to_url":"https://spamcatcher.sendgrid.com","threshold":1}},"personalizations":[{"bcc":[{"email":"test@example.com","name":"Example User"},{"email":"test@example.com","name":"Example User"}],"cc":[{"email":"test@example.com","name":"Example User"},{"email":"test@example.com","name":"Example User"}],"custom_args":{"type":"marketing","user_id":"343"},"headers":{"X-Mock":"False","X-Test":"True"},"send_at":1443636843,"subject":"Hello World from the Personalized SendGrid Python Library","substitutions":{"%city%":"Denver","%name%":"Example User"},"to":[{"email":"test@example.com","name":"Example User"},{"email":"test@example.com","name":"Example User"}]},{"bcc":[{"email":"test@example.com","name":"Example User"},{"email":"test@example.com","name":"Example User"}],"cc":[{"email":"test@example.com","name":"Example User"},{"email":"test@example.com","name":"Example User"}],"custom_args":{"type":"marketing","user_id":"343"},"headers":{"X-Mock":"False","X-Test":"True"},"send_at":1443636843,"subject":"Hello World from the Personalized SendGrid Python Library","substitutions":{"%city%":"Denver","%name%":"Example User"},"to":[{"email":"test@example.com","name":"Example User"},{"email":"test@example.com","name":"Example User"}]}],"reply_to":{"email":"test@example.com"},"sections":{"%section1%":"Substitution Text for Section 1","%section2%":"Substitution Text for Section 2"},"send_at":1443636842,"subject":"Hello World from the SendGrid Ruby Library","template_id":"13b8f94f-bcae-4ec6-b752-70d6cb59f932","tracking_settings":{"click_tracking":{"enable":false,"enable_text":false},"ganalytics":{"enable":true,"utm_campaign":"some campaign","utm_content":"some content","utm_medium":"some medium","utm_source":"some source","utm_term":"some term"},"open_tracking":{"enable":true,"substitution_tag":"Optional tag to replace with the open image in the body of the message"},"subscription_tracking":{"enable":true,"html":"html to insert into the text/html portion of the message","substitution_tag":"Optional tag to replace with the open image in the body of the message","text":"text to insert into the text/plain portion of the message"}}}'))
   end
+
+  def test_that_personalizations_is_empty_initially
+    mail = Mail.new
+    assert_equal([], mail.personalizations)
+  end
+
+  def test_that_contents_is_empty_initially
+    mail = Mail.new
+    assert_equal([], mail.contents)
+  end
+
+  def test_that_attachments_is_empty_initially
+    mail = Mail.new
+    assert_equal([], mail.attachments)
+  end
+
+  def test_that_categories_is_empty_initially
+    mail = Mail.new
+    assert_equal([], mail.categories)
+  end
+
+  def test_add_personalization
+    mail = Mail.new
+    mail.add_personalization('foo')
+    assert_equal(['foo'.to_json], mail.personalizations)
+  end
+
+  def test_add_content
+    mail = Mail.new
+    mail.add_content('foo')
+    assert_equal(['foo'.to_json], mail.contents)
+  end
+
+  def test_add_section
+    mail = Mail.new
+    mail.add_section(Section.new(key: '%section1%', value: 'Substitution Text for Section 1'))
+    expected_json = {
+        "sections"=>{
+                "%section1%"=>"Substitution Text for Section 1"
+            }
+    }
+    assert_equal mail.to_json, expected_json
+    mail.add_section(Section.new(key: '%section2%', value: 'Substitution Text for Section 2'))
+    expected_json = {
+        "sections"=>{
+                "%section1%"=>"Substitution Text for Section 1",
+                "%section2%"=>"Substitution Text for Section 2"
+            }
+    }
+    assert_equal mail.to_json, expected_json
+  end
+
+  def test_add_header
+    mail = Mail.new
+    mail.add_header(Header.new(key: 'X-Test3', value: 'test3'))
+    expected_json = {
+        "headers"=>{
+                "X-Test3"=>"test3"
+            }
+    }
+    assert_equal mail.to_json, expected_json
+    mail.add_header(Header.new(key: 'X-Test4', value: 'test4'))
+    expected_json = {
+        "headers"=>{
+                "X-Test3"=>"test3",
+                "X-Test4"=>"test4"
+            }
+    }
+    assert_equal mail.to_json, expected_json
+  end
+
+  def test_add_custom_arg
+    mail = Mail.new
+    mail.add_custom_arg(CustomArg.new(key: 'campaign 1', value: 'welcome 1'))
+    expected_json = {
+        "custom_args"=>{
+                "campaign 1"=>"welcome 1"
+            }
+    }
+    assert_equal mail.to_json, expected_json
+    mail.add_custom_arg(CustomArg.new(key: 'campaign 2', value: 'welcome 2'))
+    expected_json = {
+        "custom_args"=>{
+                "campaign 1"=>"welcome 1",
+                "campaign 2"=>"welcome 2"
+            }
+    }
+    assert_equal mail.to_json, expected_json
+  end
+
+  def test_add_attachment
+    mail = Mail.new
+    mail.add_attachment('foo')
+    assert_equal(['foo'.to_json], mail.attachments)
+  end
+
+  def test_add_valid_category
+    mail = Mail.new
+    category = Category.new(name: 'foo')
+    mail.add_category(category)
+    assert_equal(['foo'], mail.categories)
+  end
+
+  def test_add_more_than_1_valid_category
+    mail = Mail.new
+    category_1 = Category.new(name: 'foo')
+    category_2 = Category.new(name: 'bar')
+    mail.add_category(category_1)
+    mail.add_category(category_2)
+    assert_equal(['foo', 'bar'], mail.categories)
+  end
+
+  def test_add_invalid_category
+    mail = Mail.new
+    assert_raises(NoMethodError) do
+      mail.add_category('foo')
+    end
+  end
 end