sendgrid-ruby 1.1.6 → 6.0.4

data/spec/sendgrid/helpers/stats/email_stats_spec.rb

@@ -0,0 +1,112 @@
+require 'spec_helper'
+
+describe SendGrid::EmailStats do
+  let(:sg_client) { SendGrid::API.new(api_key: 'abcd').client }
+  let(:stats) { SendGrid::EmailStats.new(sendgrid_client: sg_client) }
+  let(:sg_response) { double('SendGrid::Response') }
+
+  let(:sample_response) do
+    [{
+      "date" => "2017-10-01",
+      "stats" => [
+        {"metrics" =>
+          {
+            "blocks" => 101,
+            "bounce_drops" => 102,
+            "bounces" => 103,
+            "clicks" => 104,
+            "deferred" => 105,
+            "delivered" => 106,
+            "invalid_emails" => 107,
+            "opens" => 108,
+            "processed" => 109,
+            "requests" => 110,
+            "spam_report_drops" => 111,
+            "spam_reports" => 112,
+            "unique_clicks" => 113,
+            "unique_opens" => 114,
+            "unsubscribe_drops" => 115,
+            "unsubscribes" => 116
+          }
+        }
+      ]
+    }]
+  end
+
+  let(:error_response) do
+    {
+      "errors" => [
+        {
+          "message" => "end_date should be a YYYY-MM-DD formatted date"
+        }
+      ]
+    }
+  end
+
+  describe '.new' do
+    it 'initializes with SendGrid::Client' do
+      expect(stats).to be_a SendGrid::EmailStats
+    end
+  end
+
+  describe 'successful response' do
+    before do
+      allow_any_instance_of(SendGrid::Response).to receive(:body) { sample_response.to_json }
+    end
+
+    describe '#by_day' do
+      it 'fetches data aggregated by day' do
+        day_stats = stats.by_day('2017-10-01', '2017-10-02')
+        day_metrics = day_stats.metrics.first
+
+        expect(day_metrics).to be_a SendGrid::Metrics
+        expect(day_metrics.date.to_s).to eq('2017-10-01')
+        expect(day_metrics.requests).to eq(110)
+        expect(day_metrics.clicks).to eq(104)
+        expect(day_metrics.bounces).to eq(103)
+        expect(day_metrics.opens).to eq(108)
+      end
+    end
+
+    describe '#by_week' do
+      it 'fetches data aggregated by week' do
+        day_stats = stats.by_week('2017-10-01', '2017-10-12')
+        day_metrics = day_stats.metrics.first
+
+        expect(day_metrics).to be_a SendGrid::Metrics
+        expect(day_metrics.date.to_s).to eq('2017-10-01')
+        expect(day_metrics.requests).to eq(110)
+        expect(day_metrics.clicks).to eq(104)
+        expect(day_metrics.bounces).to eq(103)
+        expect(day_metrics.opens).to eq(108)
+      end
+    end
+
+    describe '#by_month' do
+      it 'fetches data aggregated by month' do
+        day_stats = stats.by_month('2017-10-01', '2017-11-01')
+        day_metrics = day_stats.metrics.first
+
+        expect(day_metrics).to be_a SendGrid::Metrics
+        expect(day_metrics.date.to_s).to eq('2017-10-01')
+        expect(day_metrics.requests).to eq(110)
+        expect(day_metrics.clicks).to eq(104)
+        expect(day_metrics.bounces).to eq(103)
+        expect(day_metrics.opens).to eq(108)
+      end
+    end
+  end
+
+  describe 'error response' do
+    before do
+      allow_any_instance_of(SendGrid::Response).to receive(:body) { error_response.to_json }
+    end
+
+    it 'fetches data aggregated by month' do
+      day_stats = stats.by_month('2017-10-01', '2017-10-02')
+
+      expect(day_stats.errors).to include('end_date should be a YYYY-MM-DD formatted date')
+      expect(day_stats.error?).to be_truthy
+    end
+  end
+end

data/spec/sendgrid/helpers/stats/metrics_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe SendGrid::Metrics do
+  let(:params) do
+    {
+      "date" => "2017-10-01",
+      "blocks" => 101,
+      "bounce_drops" => 102,
+      "bounces" => 103,
+      "clicks" => 104,
+      "deferred" => 105,
+      "delivered" => 106,
+      "invalid_emails" => 107,
+      "opens" => 108,
+      "processed" => 109,
+      "requests" => 110,
+      "spam_report_drops" => 111,
+      "spam_reports" => 112,
+      "unique_clicks" => 113,
+      "unique_opens" => 114,
+      "unsubscribe_drops" => 115,
+      "unsubscribes" => 116
+    }
+  end
+
+  subject { described_class.new(params) }
+
+  it 'initializes with metric parameters' do
+    expect(subject).to be_a SendGrid::Metrics
+  end
+
+  it 'returns date as object' do
+    expect(subject.date).to be_a Date
+  end
+
+  %w(
+    blocks bounce_drops bounces clicks deferred delivered invalid_emails
+    opens processed requests spam_report_drops spam_reports unique_clicks
+    unique_opens unsubscribe_drops unsubscribes
+  ).each do |attribute|
+    it "responds to #{attribute}" do
+      expect(subject).to respond_to(attribute.to_sym)
+    end
+  end
+
+end

data/spec/sendgrid/helpers/stats/stats_response_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+
+describe SendGrid::StatsResponse do
+  let(:params) do
+    [{
+      "date" => "2017-10-01",
+      "stats" => [
+        {"metrics" =>
+          {
+            "blocks" => 101,
+            "bounce_drops" => 102,
+            "bounces" => 103,
+            "clicks" => 104,
+            "deferred" => 105,
+            "delivered" => 106,
+            "invalid_emails" => 107,
+            "opens" => 108,
+            "processed" => 109,
+            "requests" => 110,
+            "spam_report_drops" => 111,
+            "spam_reports" => 112,
+            "unique_clicks" => 113,
+            "unique_opens" => 114,
+            "unsubscribe_drops" => 115,
+            "unsubscribes" => 116
+          }
+        }
+      ]
+    }]
+  end
+
+  subject { described_class.new(params) }
+
+  it 'initialized with JSON response body' do
+    expect(subject).to be_a SendGrid::StatsResponse
+  end
+
+  describe '#metrics' do
+    it 'returns an array of metrics' do
+      metric = subject.metrics.first
+
+      expect(subject.metrics).to be_a Array
+      expect(metric.date.to_s).to eq('2017-10-01')
+      expect(metric.requests).to eq(110)
+      expect(metric.clicks).to eq(104)
+      expect(metric.bounces).to eq(103)
+      expect(metric.opens).to eq(108)
+    end
+  end
+
+  context 'errors' do
+    let(:error_params) do
+      {
+        "errors" => [
+          {
+            "message" => "end_date should be a YYYY-MM-DD formatted date"
+          }
+        ]
+      }
+    end
+
+    subject { described_class.new(error_params) }
+
+    describe '#errors' do
+      it 'shows a list of errors' do
+        expect(subject.errors).to include('end_date should be a YYYY-MM-DD formatted date')
+      end
+    end
+
+    describe '#error?' do
+      it 'returns true if there is an error' do
+        expect(subject.error?).to be_truthy
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1 +1,10 @@
-require_relative '../lib/sendgrid-ruby'
+require 'rubygems'
+require 'bundler/setup'
+require 'pry'
+require 'faker'
+
+RSpec.configure do |config|
+  Dir["#{File.dirname(__FILE__)}/../lib/sendgrid-ruby.rb"].sort.each { |ext| require ext }
+
+  config.color = true
+end

data/test/prism.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+install () {
+
+set -eu
+
+UNAME=$(uname)
+ARCH=$(uname -m)
+if [ "$UNAME" != "Linux" ] && [ "$UNAME" != "Darwin" ] && [ "$ARCH" != "x86_64" ] && [ "$ARCH" != "i686" ]; then
+    echo "Sorry, OS/Architecture not supported: ${UNAME}/${ARCH}. Download binary from https://github.com/stoplightio/prism/releases"
+    exit 1
+fi
+
+if [ "$UNAME" = "Darwin" ] ; then
+  OSX_ARCH=$(uname -m)
+  if [ "${OSX_ARCH}" = "x86_64" ] ; then
+    PLATFORM="darwin_amd64"
+  fi
+elif [ "$UNAME" = "Linux" ] ; then
+  LINUX_ARCH=$(uname -m)
+  if [ "${LINUX_ARCH}" = "i686" ] ; then
+    PLATFORM="linux_386"
+  elif [ "${LINUX_ARCH}" = "x86_64" ] ; then
+    PLATFORM="linux_amd64"
+  fi
+fi
+
+#LATEST=$(curl -s https://api.github.com/repos/stoplightio/prism/tags | grep -Eo '"name":.*?[^\\]",'  | head -n 1 | sed 's/[," ]//g' | cut -d ':' -f 2)
+LATEST="v0.2.7"
+URL="https://github.com/stoplightio/prism/releases/download/$LATEST/prism_$PLATFORM"
+DEST=./prism/bin/prism
+
+if [ -z $LATEST ] ; then
+  echo "Error requesting. Download binary from ${URL}"
+  exit 1
+else
+  curl -L $URL -o $DEST
+  chmod +x $DEST
+fi
+}
+
+install

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

@@ -0,0 +1,35 @@
+# coding: utf-8
+require_relative "../../../../lib/sendgrid/helpers/mail/attachment"
+include SendGrid
+require "json"
+require "minitest/autorun"
+
+class TestAttachment < Minitest::Test
+  SAMPLE_INPUT = """Es blüht so grün wie Blüten blüh'n im Frühling
+Es blüht so grün wie Blüten blüh'n im Frühling
+Es blüht so grün wie Blüten blüh'n im Frühling
+Es blüht so grün wie Blüten blüh'n im Frühling
+Es blüht so grün wie Blüten blüh'n im Frühling
+""".force_encoding('UTF-8').encode
+  
+  def setup
+  end
+
+  def test_io_enocding
+    attachment = Attachment.new
+    attachment.content = StringIO.new(SAMPLE_INPUT)
+
+    expected = {
+      "content" => "RXMgYmzDvGh0IHNvIGdyw7xuIHdpZSBCbMO8dGVuIGJsw7xoJ24gaW0gRnLD\nvGhsaW5nCkVzIGJsw7xodCBzbyBncsO8biB3aWUgQmzDvHRlbiBibMO8aCdu\nIGltIEZyw7xobGluZwpFcyBibMO8aHQgc28gZ3LDvG4gd2llIEJsw7x0ZW4g\nYmzDvGgnbiBpbSBGcsO8aGxpbmcKRXMgYmzDvGh0IHNvIGdyw7xuIHdpZSBC\nbMO8dGVuIGJsw7xoJ24gaW0gRnLDvGhsaW5nCkVzIGJsw7xodCBzbyBncsO8\nbiB3aWUgQmzDvHRlbiBibMO8aCduIGltIEZyw7xobGluZwo=\n"
+    }
+
+    json = attachment.to_json
+
+    # Double check that the decoded json matches original input.
+    decoded = Base64.decode64(json["content"]).force_encoding('UTF-8').encode
+
+    assert_equal(decoded, SAMPLE_INPUT)
+
+    assert_equal(json, expected)
+  end
+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_email.rb

@@ -0,0 +1,34 @@
+require_relative '../../../../lib/sendgrid/helpers/mail/email'
+require 'minitest/autorun'
+
+class TestEmail < Minitest::Test
+
+  include SendGrid
+
+  def test_split_email_full_email
+    @email = Email.new(email: "Example User <test1@example.com>")
+    expected_json = {
+        "email"=>"test1@example.com",
+        "name"=>"Example User"
+    }
+    assert_equal @email.to_json, expected_json
+  end
+
+  def test_split_email_only_email
+    @email = Email.new(email: "test1@example.com")
+    expected_json = {
+        "email"=>"test1@example.com",
+    }
+    assert_equal @email.to_json, expected_json
+  end
+
+  def test_split_email_name_and_email
+    @email = Email.new(name: "Example User", email: "test1@example.com")
+    expected_json = {
+        "email"=>"test1@example.com",
+        "name"=>"Example User"
+    }
+    assert_equal @email.to_json, expected_json
+  end
+
+end

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

@@ -0,0 +1,261 @@
+require_relative "../../../../lib/sendgrid/helpers/mail/mail"
+require_relative "../../../../lib/sendgrid/client"
+include SendGrid
+require "json"
+require 'minitest/autorun'
+
+class TestMail < Minitest::Test
+  def setup
+  end
+
+  def test_hello_world
+    from = Email.new(email: 'test@example.com')
+    to = Email.new(email: 'test@example.com')
+    subject = 'Sending with Twilio SendGrid is Fun'
+    content = Content.new(type: 'text/plain', value: 'and easy to do anywhere, even with Ruby')
+    mail = SendGrid::Mail.new(from, subject, to, content)
+
+    assert_equal(mail.to_json, JSON.parse('{"from":{"email":"test@example.com"}, "subject":"Sending with Twilio SendGrid is Fun", "personalizations":[{"to":[{"email":"test@example.com"}]}], "content":[{"type":"text/plain", "value":"and easy to do anywhere, even with Ruby"}]}'))
+  end
+
+  def test_kitchen_sink
+    mail = SendGrid::Mail.new
+    mail.from = Email.new(email: "test@example.com")
+    mail.subject = "Hello World from the Twilio SendGrid Ruby Library"
+    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 Twilio SendGrid Ruby Library"
+    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.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 Twilio SendGrid Ruby Library"
+    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.add_personalization(personalization2)
+
+    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.content = "TG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2NpbmcgZWxpdC4gQ3JhcyBwdW12"
+    attachment.type = "application/pdf"
+    attachment.filename = "balance_001.pdf"
+    attachment.disposition = "attachment"
+    attachment.content_id = "Balance Sheet"
+
+    mail.add_attachment(attachment)
+
+    attachment2 = Attachment.new
+    attachment2.content = "BwdW"
+    attachment2.type = "image/png"
+    attachment2.filename = "banner.png"
+    attachment2.disposition = "inline"
+    attachment2.content_id = "Banner"
+    mail.add_attachment(attachment2)
+
+    mail.template_id = "13b8f94f-bcae-4ec6-b752-70d6cb59f932"
+
+    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.add_header(Header.new(key: "X-Test3", value: "test3"))
+    mail.add_header(Header.new(key: "X-Test4", value: "test4"))
+
+    mail.add_category(Category.new(name: "May"))
+    mail.add_category(Category.new(name: "2016"))
+
+    mail.add_custom_arg(CustomArg.new(key: "campaign", value: "welcome"))
+    mail.add_custom_arg(CustomArg.new(key: "weekday", value: "morning"))
+
+    mail.send_at = 1443636842
+
+    mail.batch_id = "sendgrid_batch_id"
+
+    mail.asm = ASM.new(group_id: 99, groups_to_display: [4,5,6,7,8])
+
+    mail.ip_pool_name = "23"
+
+    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>")
+    mail_settings.sandbox_mode = SandBoxMode.new(enable: true)
+    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.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")
+    tracking_settings.ganalytics = Ganalytics.new(enable: true, utm_source: "some source", utm_medium: "some medium", utm_term: "some term", utm_content: "some content", utm_campaign: "some campaign")
+    mail.tracking_settings = tracking_settings
+
+    mail.reply_to = Email.new(email: "test@example.com")
+
+    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 Twilio SendGrid Ruby 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 Twilio SendGrid Ruby 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 Twilio 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 = SendGrid::Mail.new
+    assert_equal([], mail.personalizations)
+  end
+
+  def test_that_contents_is_empty_initially
+    mail = SendGrid::Mail.new
+    assert_equal([], mail.contents)
+  end
+
+  def test_that_attachments_is_empty_initially
+    mail = SendGrid::Mail.new
+    assert_equal([], mail.attachments)
+  end
+
+  def test_that_categories_is_empty_initially
+    mail = SendGrid::Mail.new
+    assert_equal([], mail.categories)
+  end
+
+  def test_add_personalization
+    mail = SendGrid::Mail.new
+    mail.add_personalization('foo')
+    assert_equal(['foo'.to_json], mail.personalizations)
+  end
+
+  def test_add_content
+    mail = SendGrid::Mail.new
+    mail.add_content('foo')
+    assert_equal(['foo'.to_json], mail.contents)
+  end
+
+  def test_add_section
+    mail = SendGrid::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 = SendGrid::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 = SendGrid::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_non_string_custom_arg
+    mail = Mail.new
+    mail.add_custom_arg(CustomArg.new(key: "Integer", value: 1))
+    mail.add_custom_arg(CustomArg.new(key: "Array", value: [1, "a", true]))
+    mail.add_custom_arg(CustomArg.new(key: "Hash", value: {"a" => 1, "b" => 2}))
+    expected_json = {
+        "custom_args"=>{
+                "Integer"=>"1",
+                "Array"=>"[1, \"a\", true]",
+                "Hash"=>"{\"a\"=>1, \"b\"=>2}",
+            }
+    }
+    assert_equal mail.to_json, expected_json
+  end
+
+  def test_add_attachment
+    mail = SendGrid::Mail.new
+    mail.add_attachment('foo')
+    assert_equal(['foo'.to_json], mail.attachments)
+  end
+
+  def test_add_valid_category
+    mail = SendGrid::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 = SendGrid::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 = SendGrid::Mail.new
+    assert_raises(NoMethodError) do
+      mail.add_category('foo')
+    end
+  end
+
+  def test_check_for_secrets
+    mail = Mail.new
+    mail.add_content(Content.new(type: 'text/plain', value: 'Sensitive information: SG.a123b456'))
+    assert_raises(SecurityError) do
+      mail.check_for_secrets([/SG.[a-zA-Z0-9_-]*/])
+    end
+  end
+end