sendgrid-ruby 5.3.0 → 6.0.0

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.0'
 end

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

data/test/sendgrid/permissions/test_scopes.rb

@@ -0,0 +1,38 @@
+require_relative '../../../lib/sendgrid/helpers/permissions/scope'
+require 'minitest/autorun'
+
+class TestCategory < Minitest::Test
+
+  include SendGrid
+
+  # usecases
+  # 1. test admin scopes
+  # 2. test read only scopes
+  # 3. test read only and full access scopes for a method by hardcoding
+  # 4. test read only and full access scopes by loading scopes.yaml
+
+  def setup
+    @scopes_from_yaml = YAML.load_file(File.dirname(__FILE__) + '/../../../lib/sendgrid/helpers/permissions/scopes.yml').freeze
+  end
+
+  def test_admin_scopes
+    assert_equal Scope.admin_permissions, @scopes_from_yaml.values.map(&:values).flatten
+  end
+
+  def test_read_only_scopes
+    assert_equal Scope.read_only_permissions, @scopes_from_yaml.map { |_, v| v[:read] }.flatten
+  end
+
+  def test_read_only_and_full_access_for_mail_hardcoded
+    assert_equal Scope.mail_read_only_permissions, ["mail.batch.read"]
+    assert_equal Scope.mail_full_access_permissions, ["mail.send", "mail.batch.create", "mail.batch.delete", "mail.batch.read", "mail.batch.update"]
+  end
+
+  def test_read_only_and_full_access_from_file
+    @scopes_from_yaml.each_key do |endpoint|
+      assert_equal Scope.send("#{endpoint}_read_only_permissions"), @scopes_from_yaml[endpoint][:read]
+      assert_equal Scope.send("#{endpoint}_full_access_permissions"), @scopes_from_yaml[endpoint].values.flatten
+    end
+  end
+
+end

data/test/sendgrid/test_sendgrid-ruby.rb

@@ -41,7 +41,8 @@ class TestAPI < MiniTest::Test
                 "X-Test": "test"
             }
         ')
-        sg = SendGrid::API.new(api_key: "SENDGRID_API_KEY", host: "https://api.test.com", request_headers: headers, version: "v3")
+        subuser = 'test_user'
+        sg = SendGrid::API.new(api_key: "SENDGRID_API_KEY", host: "https://api.test.com", request_headers: headers, version: "v3", impersonate_subuser: subuser)
 
         assert_equal("https://api.test.com", sg.host)
         user_agent       = "sendgrid/#{SendGrid::VERSION};ruby"
@@ -50,15 +51,22 @@ class TestAPI < MiniTest::Test
                     "Authorization": "Bearer SENDGRID_API_KEY",
                     "Accept": "application/json",
                     "X-Test": "test",
-                    "User-agent": "' + user_agent + '"
+                    "User-agent": "' + user_agent + '",
+                    "On-Behalf-Of": "' + subuser + '"
                 }
             ')
         assert_equal(test_headers, sg.request_headers)
         assert_equal("v3", sg.version)
-        assert_equal("5.3.0", SendGrid::VERSION)
+        assert_equal(subuser, sg.impersonate_subuser)
+        assert_equal("6.0.0", SendGrid::VERSION)
         assert_instance_of(SendGrid::Client, sg.client)
     end
 
+    def test_init_when_impersonate_subuser_is_not_given
+        sg = SendGrid::API.new(api_key: "SENDGRID_API_KEY", host: "https://api.test.com", version: "v3")
+        refute_includes(sg.request_headers, 'On-Behalf-Of')
+    end
+
     def test_access_settings_activity_get
         params = JSON.parse('{"limit": 1}')
         headers = JSON.parse('{"X-Mock": 200}')
@@ -1176,8 +1184,8 @@ class TestAPI < MiniTest::Test
     },
     "footer": {
       "enable": true,
-      "html": "<p>Thanks</br>The SendGrid Team</p>",
-      "text": "Thanks,/n The SendGrid Team"
+      "html": "<p>Thanks</br>The Twilio SendGrid Team</p>",
+      "text": "Thanks,/n The Twilio SendGrid Team"
     },
     "sandbox_mode": {
       "enable": false
@@ -1883,7 +1891,7 @@ class TestAPI < MiniTest::Test
         email = "test_url_param"
         headers = JSON.parse('{"X-Mock": 204}')
 
-        response = @sg.client.suppression.spam_report._(email).delete(request_headers: headers)
+        response = @sg.client.suppression.spam_reports._(email).delete(request_headers: headers)
 
         self.assert_equal('204', response.status_code)
     end
@@ -2678,7 +2686,7 @@ class TestAPI < MiniTest::Test
     end
 
     def test_docker_exists
-      assert(File.file?('./Dockerfile') || File.file?('./docker/Dockerfile'))
+      assert(File.file?('./Docker') || File.file?('./docker/Dockerfile'))
     end
 
     # def test_docker_compose_exists

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid-ruby
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Elmer Thomas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2019-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_http_client
@@ -36,7 +36,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -130,7 +130,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.9'
-description: Official SendGrid Gem to Interact with SendGrids API in native Ruby
+description: Official Twilio SendGrid Gem to Interact with Twilio SendGrids API in
+  native Ruby
 email: dx@sendgrid.com
 executables: []
 extensions: []
@@ -150,6 +151,7 @@ files:
 - README.md
 - Rakefile
 - TROUBLESHOOTING.md
+- UPGRADE.md
 - USAGE.md
 - USE_CASES.md
 - config.ru
@@ -175,6 +177,7 @@ files:
 - examples/mailsettings/mailsettings.rb
 - examples/partnersettings/partnersettings.rb
 - examples/scopes/scopes.rb
+- examples/senderauthentication/senderauthentication.rb
 - examples/senders/senders.rb
 - examples/stats/stats.rb
 - examples/subusers/subusers.rb
@@ -182,7 +185,6 @@ files:
 - examples/templates/templates.rb
 - examples/trackingsettings/trackingsettings.rb
 - examples/user/user.rb
-- examples/whitelabel/whitelabel.rb
 - gemfiles/Sinatra_1.gemfile
 - gemfiles/Sinatra_2.gemfile
 - lib/sendgrid-ruby.rb
@@ -195,6 +197,7 @@ files:
 - lib/sendgrid/helpers/inbound/sample_data/raw_data.txt
 - lib/sendgrid/helpers/inbound/sample_data/raw_data_with_attachments.txt
 - lib/sendgrid/helpers/inbound/send.rb
+- lib/sendgrid/helpers/ip_management/ip_management.rb
 - lib/sendgrid/helpers/mail/README.md
 - lib/sendgrid/helpers/mail/asm.rb
 - lib/sendgrid/helpers/mail/attachment.rb
@@ -217,6 +220,8 @@ files:
 - lib/sendgrid/helpers/mail/subscription_tracking.rb
 - lib/sendgrid/helpers/mail/substitution.rb
 - lib/sendgrid/helpers/mail/tracking_settings.rb
+- lib/sendgrid/helpers/permissions/scope.rb
+- lib/sendgrid/helpers/permissions/scopes.yml
 - lib/sendgrid/helpers/settings/README.md
 - lib/sendgrid/helpers/settings/mail_settings_dto.rb
 - lib/sendgrid/helpers/settings/partner_settings_dto.rb
@@ -229,6 +234,7 @@ files:
 - lib/sendgrid/version.rb
 - mail_helper_v3.md
 - sendgrid-ruby.gemspec
+- spec/sendgrid/helpers/ip_management/ip_management_spec.rb
 - spec/sendgrid/helpers/settings/mail_settings_dto_spec.rb
 - spec/sendgrid/helpers/settings/partner_settings_dto_spec.rb
 - spec/sendgrid/helpers/settings/settings_spec.rb
@@ -239,10 +245,12 @@ files:
 - spec/sendgrid/helpers/stats/stats_response_spec.rb
 - spec/spec_helper.rb
 - test/prism.sh
+- test/sendgrid/helpers/mail/test_attachment.rb
 - test/sendgrid/helpers/mail/test_category.rb
 - test/sendgrid/helpers/mail/test_email.rb
 - test/sendgrid/helpers/mail/test_mail.rb
 - test/sendgrid/helpers/mail/test_personalizations.rb
+- test/sendgrid/permissions/test_scopes.rb
 - test/sendgrid/test_sendgrid-ruby.rb
 homepage: http://github.com/sendgrid/sendgrid-ruby
 licenses:
@@ -267,8 +275,9 @@ rubyforge_project:
 rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
-summary: Official SendGrid Gem
+summary: Official Twilio SendGrid Gem
 test_files:
+- spec/sendgrid/helpers/ip_management/ip_management_spec.rb
 - spec/sendgrid/helpers/settings/mail_settings_dto_spec.rb
 - spec/sendgrid/helpers/settings/partner_settings_dto_spec.rb
 - spec/sendgrid/helpers/settings/settings_spec.rb
@@ -279,8 +288,10 @@ test_files:
 - spec/sendgrid/helpers/stats/stats_response_spec.rb
 - spec/spec_helper.rb
 - test/prism.sh
+- test/sendgrid/helpers/mail/test_attachment.rb
 - test/sendgrid/helpers/mail/test_category.rb
 - test/sendgrid/helpers/mail/test_email.rb
 - test/sendgrid/helpers/mail/test_mail.rb
 - test/sendgrid/helpers/mail/test_personalizations.rb
+- test/sendgrid/permissions/test_scopes.rb
 - test/sendgrid/test_sendgrid-ruby.rb