sendgrid-ruby 5.3.0 → 6.0.4

data/lib/sendgrid/helpers/permissions/scopes.yml

@@ -0,0 +1,309 @@
+---
+:alerts:
+  :create:
+  - alerts.create
+  :delete:
+  - alerts.delete
+  :read:
+  - alerts.read
+  :update:
+  - alerts.update
+:api_keys:
+  :create:
+  - api_keys.create
+  :delete:
+  - api_keys.delete
+  :read:
+  - api_keys.read
+  :update:
+  - api_keys.update
+:asm_groups:
+  :create:
+  - asm.groups.create
+  :delete:
+  - asm.groups.delete
+  :read:
+  - asm.groups.read
+  :update:
+  - asm.groups.update
+:billing:
+  :create:
+  - billing.create
+  :delete:
+  - billing.delete
+  :read:
+  - billing.read
+  :update:
+  - billing.update
+:categories:
+  :create:
+  - categories.create
+  :delete:
+  - categories.delete
+  :read:
+  - categories.read
+  - categories.stats.read
+  - categories.stats.sums.read
+  :update:
+  - categories.update
+:credentials:
+  :create:
+  - credentials.create
+  :delete:
+  - credentials.delete
+  :read:
+  - credentials.read
+  :update:
+  - credentials.update
+:stats:
+  :create: []
+  :delete: []
+  :read:
+  - email_activity.read
+  - stats.read
+  - stats.global.read
+  - browsers.stats.read
+  - devices.stats.read
+  - geo.stats.read
+  - mailbox_providers.stats.read
+  - clients.desktop.stats.read
+  - clients.phone.stats.read
+  - clients.stats.read
+  - clients.tablet.stats.read
+  - clients.webmail.stats.read
+  :update: []
+:ips:
+  :create:
+  - ips.pools.create
+  - ips.pools.ips.create
+  - ips.warmup.create
+  :delete:
+  - ips.pools.delete
+  - ips.pools.ips.delete
+  - ips.warmup.delete
+  :read:
+  - ips.assigned.read
+  - ips.read
+  - ips.pools.read
+  - ips.pools.ips.read
+  - ips.warmup.read
+  :update:
+  - ips.pools.update
+  - ips.pools.ips.update
+  - ips.warmup.update
+:mail_settings:
+  :create: []
+  :delete: []
+  :read:
+  - mail_settings.address_whitelist.read
+  - mail_settings.bcc.read
+  - mail_settings.bounce_purge.read
+  - mail_settings.footer.read
+  - mail_settings.forward_bounce.read
+  - mail_settings.forward_spam.read
+  - mail_settings.plain_content.read
+  - mail_settings.read
+  - mail_settings.spam_check.read
+  - mail_settings.template.read
+  :update:
+  - mail_settings.address_whitelist.update
+  - mail_settings.bcc.update
+  - mail_settings.bounce_purge.update
+  - mail_settings.footer.update
+  - mail_settings.forward_bounce.update
+  - mail_settings.forward_spam.update
+  - mail_settings.plain_content.update
+  - mail_settings.spam_check.update
+  - mail_settings.template.update
+:mail:
+  :create:
+  - mail.send
+  - mail.batch.create
+  :delete:
+  - mail.batch.delete
+  :read:
+  - mail.batch.read
+  :update:
+  - mail.batch.update
+:marketing_campaigns:
+  :create:
+  - marketing_campaigns.create
+  :delete:
+  - marketing_campaigns.delete
+  :read:
+  - marketing_campaigns.read
+  :update:
+  - marketing_campaigns.update
+:partner_settings:
+  :create: []
+  :delete: []
+  :read:
+  - partner_settings.new_relic.read
+  - partner_settings.read
+  - partner_settings.sendwithus.read
+  :update:
+  - partner_settings.new_relic.update
+  - partner_settings.sendwithus.update
+:scheduled_sends:
+  :create:
+  - user.scheduled_sends.create
+  :delete:
+  - user.scheduled_sends.delete
+  :read:
+  - user.scheduled_sends.read
+  :update:
+  - user.scheduled_sends.update
+:subusers:
+  :create:
+  - subusers.create
+  - subusers.credits.create
+  - subusers.credits.remaining.create
+  - subusers.monitor.create
+  :delete:
+  - subusers.delete
+  - subusers.credits.delete
+  - subusers.credits.remaining.delete
+  - subusers.monitor.delete
+  :read:
+  - subusers.read
+  - subusers.credits.read
+  - subusers.stats.read
+  - subusers.credits.remaining.read
+  - subusers.monitor.read
+  - subusers.reputations.read
+  - subusers.stats.monthly.read
+  - subusers.stats.sums.read
+  - subusers.summary.read
+  :update:
+  - subusers.update
+  - subusers.credits.update
+  - subusers.credits.remaining.update
+  - subusers.monitor.update
+:suppression:
+  :create:
+  - suppression.create
+  - suppression.bounces.create
+  - suppression.blocks.create
+  - suppression.invalid_emails.create
+  - suppression.spam_reports.create
+  - suppression.unsubscribes.create
+  :delete:
+  - suppression.delete
+  - suppression.bounces.delete
+  - suppression.blocks.delete
+  - suppression.invalid_emails.delete
+  - suppression.spam_reports.delete
+  - suppression.unsubscribes.delete
+  :read:
+  - suppression.read
+  - suppression.bounces.read
+  - suppression.blocks.read
+  - suppression.invalid_emails.read
+  - suppression.spam_reports.read
+  - suppression.unsubscribes.read
+  :update:
+  - suppression.update
+  - suppression.bounces.update
+  - suppression.blocks.update
+  - suppression.invalid_emails.update
+  - suppression.spam_reports.update
+  - suppression.unsubscribes.update
+:teammates:
+  :create:
+  - teammates.create
+  :delete:
+  - teammates.delete
+  :read:
+  - teammates.read
+  :update:
+  - teammates.update
+:templates:
+  :create:
+  - templates.create
+  - templates.versions.activate.create
+  - templates.versions.create
+  :delete:
+  - templates.delete
+  - templates.versions.activate.delete
+  - templates.versions.delete
+  :read:
+  - templates.read
+  - templates.versions.activate.read
+  - templates.versions.read
+  :update:
+  - templates.update
+  - templates.versions.activate.update
+  - templates.versions.update
+:tracking_settings:
+  :create: []
+  :delete: []
+  :read:
+  - tracking_settings.click.read
+  - tracking_settings.google_analytics.read
+  - tracking_settings.open.read
+  - tracking_settings.read
+  - tracking_settings.subscription.read
+  :update:
+  - tracking_settings.click.update
+  - tracking_settings.google_analytics.update
+  - tracking_settings.open.update
+  - tracking_settings.subscription.update
+:user_settings:
+  :create:
+  - user.email.create
+  - user.multifactor_authentication.create
+  :delete:
+  - user.email.delete
+  - user.multifactor_authentication.delete
+  :read:
+  - user.account.read
+  - user.credits.read
+  - user.email.read
+  - user.multifactor_authentication.read
+  - user.password.read
+  - user.profile.read
+  - user.timezone.read
+  - user.settings.enforced_tls.read
+  - user.username.read
+  :update:
+  - user.email.update
+  - user.multifactor_authentication.update
+  - user.password.update
+  - user.profile.update
+  - user.settings.enforced_tls.update
+  - user.timezone.update
+  - user.username.update
+:webhooks:
+  :create:
+  - user.webhooks.event.test.create
+  - user.webhooks.parse.settings.create
+  :delete:
+  - user.webhooks.parse.settings.delete
+  :read:
+  - user.webhooks.event.settings.read
+  - user.webhooks.event.test.read
+  - user.webhooks.parse.settings.read
+  - user.webhooks.parse.stats.read
+  :update:
+  - user.webhooks.event.settings.update
+  - user.webhooks.event.test.update
+  - user.webhooks.parse.settings.update
+:whitelabel:
+  :create:
+  - whitelabel.create
+  :delete:
+  - whitelabel.delete
+  :read:
+  - whitelabel.read
+  :update:
+  - whitelabel.update
+:access_settings:
+  :create:
+  - access_settings.whitelist.create
+  :delete:
+  - access_settings.whitelist.delete
+  :read:
+  - access_settings.activity.read
+  - access_settings.whitelist.read
+  :update:
+  - access_settings.whitelist.update

data/lib/sendgrid/helpers/settings/README.md

@@ -1,4 +1,4 @@
-**This module allows you to quickly and easily build a Settings object for retrieving or updating you SendGrid Settings.**
+**This module allows you to quickly and easily build a Settings object for retrieving or updating your Twilio SendGrid Settings.**
 
 # Quick Start
 

data/lib/sendgrid/helpers/stats/stats_response.rb

@@ -22,7 +22,7 @@ module SendGrid
         starting_date = stat['date']
         all_stats_for_date = stat['stats']
 
-        metrics = all_stats_for_date.map do |metric|
+        all_stats_for_date.map do |metric|
           Metrics.new(metric['metrics'].merge('date' => starting_date))
         end
       end

data/lib/sendgrid/version.rb

@@ -1,3 +1,3 @@
 module SendGrid
-  VERSION = '5.3.0'
+  VERSION = '6.0.4'
 end

data/lib/sendgrid-ruby.rb

@@ -1,5 +1,6 @@
 require_relative 'sendgrid/client'
 require_relative 'sendgrid/version'
+require_relative 'sendgrid/helpers/ip_management/ip_management'
 require_relative 'sendgrid/helpers/mail/asm'
 require_relative 'sendgrid/helpers/mail/attachment'
 require_relative 'sendgrid/helpers/mail/bcc_settings'
@@ -25,3 +26,4 @@ require_relative 'sendgrid/helpers/settings/settings'
 require_relative 'sendgrid/helpers/stats/email_stats'
 require_relative 'sendgrid/helpers/stats/stats_response'
 require_relative 'sendgrid/helpers/stats/metrics'
+require_relative 'sendgrid/helpers/permissions/scope'

data/mail_helper_v3.md

@@ -13,7 +13,7 @@ require 'sendgrid-ruby'
 
 from = SendGrid::Email.new('test@example.com', 'Example User')
 to = SendGrid::Email.new('test@example.com', 'Example User')
-subject = 'Sending with SendGrid is Fun'
+subject = 'Sending with Twilio SendGrid is Fun'
 plain_text_content = 'and easy to do anywhere, even with Ruby'
 html_content = '<strong>and easy to do anywhere, even with Ruby</strong>'
 msg = SendGrid::Mail.create(from: from,
@@ -48,7 +48,7 @@ tos = [
     SendGrid::Email.new('test2@example.com', 'Example User2'),
     SendGrid::Email.new('test3@example.com', 'Example User3')
 ];
-subject = 'Sending with SendGrid is Fun'
+subject = 'Sending with Twilio SendGrid is Fun'
 plain_text_content = 'and easy to do anywhere, even with Ruby'
 html_content = '<strong>and easy to do anywhere, even with Ruby</strong>'
 msg = SendGrid::Mail.create(from: from,
@@ -84,9 +84,9 @@ tos = [
     SendGrid::Email.new('test3@example.com', 'Example User3')
 ];
 subjects = [
-    'Sending with SendGrid is Fun',
-    'Sending with SendGrid is Super Fun',
-    'Sending with SendGrid is Super Duper Fun'
+    'Sending with Twilio SendGrid is Fun',
+    'Sending with Twilio SendGrid is Super Fun',
+    'Sending with Twilio SendGrid is Super Duper Fun'
 ];
 plain_text_content = 'and easy to do anywhere, even with Ruby'
 html_content = '<strong>and easy to do anywhere, even with Ruby</strong>'
@@ -126,7 +126,7 @@ client = SendGrid::Client.new(api_key: ENV['SENDGRID_API_KEY'])
 
 from = SendGrid::Email.new('test@example.com', 'Example User')
 to = SendGrid::Email.new('test@example.com', 'Example User')
-subject = 'Sending with SendGrid is Fun'
+subject = 'Sending with Twilio SendGrid is Fun'
 plain_text_content = 'and easy to do anywhere, even with Ruby'
 html_content = '<strong>and easy to do anywhere, even with Ruby</strong>'
 msg = SendGrid::Message.new(from, to, subject, plain_text_content, html_content)
@@ -237,7 +237,7 @@ msg.set_subject('this subject overrides the Global Subject on the second Persona
 
 msg.set_from(SendGrid::Email.new('test0@example.com', 'Example User0'))
 
-msg.set_global_subject('Sending with SendGrid is Fun');
+msg.set_global_subject('Sending with Twilio SendGrid is Fun');
 
 msg.add_content(MimeType::Text, 'and easy to do anywhere, even with Ruby')
 msg.add_content(MimeType::Html, '<strong>and easy to do anywhere, even with Ruby</strong>')
@@ -302,7 +302,7 @@ client = SendGrid::Client.new(api_key: ENV['SENDGRID_API_KEY'])
 
 from = SendGrid::Email.new('test@example.com', 'Example User')
 to = SendGrid::Email.new('test@example.com', 'Example User')
-subject = 'Sending with SendGrid is Fun'
+subject = 'Sending with Twilio SendGrid is Fun'
 plain_text_content = 'and easy to do anywhere, even with Ruby'
 html_content = '<strong>and easy to do anywhere, even with Ruby</strong>'
 msg = SendGrid::Message.new(from, to, subject, plain_text_content, html_content)
@@ -367,7 +367,7 @@ client = SendGrid::Client.new(api_key: ENV['SENDGRID_API_KEY'])
 
 from = SendGrid::Email.new('test@example.com', 'Example User')
 to = SendGrid::Email.new('test@example.com', 'Example User')
-subject = 'Sending with SendGrid is Fun'
+subject = 'Sending with Twilio SendGrid is Fun'
 plain_text_content = 'and easy to do anywhere, even with Ruby'
 html_content = '<strong>and easy to do anywhere, even with Ruby</strong>'
 msg = SendGrid::Message.new(from, to, subject, plain_text_content, html_content)

data/sendgrid-ruby.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version     = SendGrid::VERSION
   spec.authors     = ['Elmer Thomas', 'Robin Johnson', 'Eddie Zaneski']
   spec.email       = 'dx@sendgrid.com'
-  spec.summary     = 'Official SendGrid Gem'
-  spec.description = 'Official SendGrid Gem to Interact with SendGrids API in native Ruby'
+  spec.summary     = 'Official Twilio SendGrid Gem'
+  spec.description = 'Official Twilio SendGrid Gem to Interact with Twilio SendGrids API in native Ruby'
   spec.homepage    = 'http://github.com/sendgrid/sendgrid-ruby'
 
   spec.required_ruby_version = '>= 2.2'
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^(test|spec|features)/)
   spec.require_paths = ['lib']
   spec.add_dependency 'ruby_http_client', '~> 3.3.0'
-  spec.add_dependency 'sinatra', '>= 1.4.7', '< 3'
+  spec.add_development_dependency 'sinatra', '>= 1.4.7', '< 3'
   spec.add_development_dependency 'rake', '~> 0'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'pry'

data/spec/sendgrid/helpers/ip_management/ip_management_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe SendGrid::IpManagement do
+  let(:sendgrid_client) { SendGrid::API.new(api_key: 'fake_key').client }
+  let(:ip_management) { SendGrid::IpManagement.new(sendgrid_client: sendgrid_client) }
+
+  describe '.new' do
+    it 'initializes correctly' do
+      expect(ip_management).to be_a SendGrid::IpManagement
+    end
+  end
+end

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_mail.rb

@@ -11,17 +11,17 @@ class TestMail < Minitest::Test
   def test_hello_world
     from = Email.new(email: 'test@example.com')
     to = Email.new(email: 'test@example.com')
-    subject = 'Sending with SendGrid is Fun'
+    subject = 'Sending with Twilio SendGrid is Fun'
     content = Content.new(type: 'text/plain', value: 'and easy to do anywhere, even with Ruby')
-    mail = Mail.new(from, subject, to, content)
+    mail = SendGrid::Mail.new(from, subject, to, content)
 
-    assert_equal(mail.to_json, JSON.parse('{"from":{"email":"test@example.com"}, "subject":"Sending with SendGrid is Fun", "personalizations":[{"to":[{"email":"test@example.com"}]}], "content":[{"type":"text/plain", "value":"and easy to do anywhere, even with Ruby"}]}'))
+    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 = Mail.new
+    mail = SendGrid::Mail.new
     mail.from = Email.new(email: "test@example.com")
-    mail.subject = "Hello World from the SendGrid Ruby Library"
+    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"))
@@ -29,7 +29,7 @@ class TestMail < Minitest::Test
     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.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"))
@@ -46,7 +46,7 @@ class TestMail < Minitest::Test
     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.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"))
@@ -115,43 +115,43 @@ class TestMail < Minitest::Test
 
     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 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"}}}'))
+    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 = Mail.new
+    mail = SendGrid::Mail.new
     assert_equal([], mail.personalizations)
   end
 
   def test_that_contents_is_empty_initially
-    mail = Mail.new
+    mail = SendGrid::Mail.new
     assert_equal([], mail.contents)
   end
 
   def test_that_attachments_is_empty_initially
-    mail = Mail.new
+    mail = SendGrid::Mail.new
     assert_equal([], mail.attachments)
   end
 
   def test_that_categories_is_empty_initially
-    mail = Mail.new
+    mail = SendGrid::Mail.new
     assert_equal([], mail.categories)
   end
 
   def test_add_personalization
-    mail = Mail.new
+    mail = SendGrid::Mail.new
     mail.add_personalization('foo')
     assert_equal(['foo'.to_json], mail.personalizations)
   end
 
   def test_add_content
-    mail = Mail.new
+    mail = SendGrid::Mail.new
     mail.add_content('foo')
     assert_equal(['foo'.to_json], mail.contents)
   end
 
   def test_add_section
-    mail = Mail.new
+    mail = SendGrid::Mail.new
     mail.add_section(Section.new(key: '%section1%', value: 'Substitution Text for Section 1'))
     expected_json = {
         "sections"=>{
@@ -170,7 +170,7 @@ class TestMail < Minitest::Test
   end
 
   def test_add_header
-    mail = Mail.new
+    mail = SendGrid::Mail.new
     mail.add_header(Header.new(key: 'X-Test3', value: 'test3'))
     expected_json = {
         "headers"=>{
@@ -189,7 +189,7 @@ class TestMail < Minitest::Test
   end
 
   def test_add_custom_arg
-    mail = Mail.new
+    mail = SendGrid::Mail.new
     mail.add_custom_arg(CustomArg.new(key: 'campaign 1', value: 'welcome 1'))
     expected_json = {
         "custom_args"=>{
@@ -223,20 +223,20 @@ class TestMail < Minitest::Test
   end
 
   def test_add_attachment
-    mail = Mail.new
+    mail = SendGrid::Mail.new
     mail.add_attachment('foo')
     assert_equal(['foo'.to_json], mail.attachments)
   end
 
   def test_add_valid_category
-    mail = Mail.new
+    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 = Mail.new
+    mail = SendGrid::Mail.new
     category_1 = Category.new(name: 'foo')
     category_2 = Category.new(name: 'bar')
     mail.add_category(category_1)
@@ -245,9 +245,17 @@ class TestMail < Minitest::Test
   end
 
   def test_add_invalid_category
-    mail = Mail.new
+    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