sendgrid-ruby 6.3.5 → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e029e78d950c6d118cf0444a43ea84aaaa93a7524fb35d22e0442e9a575ae18e
-  data.tar.gz: 136c50aab4d0f6561acccad706b2238eee7bc3d76d723055ce43f38fd4ef747a
+  metadata.gz: 8a77256d8db572200bdedd90a2b719d0f36d1a1aecbf17070968b555ed404028
+  data.tar.gz: 10081de69452a519515b2fe5f086460935cac375e1d3ade7528412477aab38a9
 SHA512:
-  metadata.gz: ff63561ef8b7ea73bf7125c3cd62803e0ffe50a73914fbd3736d7d3aed8a98c23f6f8b6a1ab7c07d9eefc5b1fabed78586d8d27bafd548c87d4f79f422eb430f
-  data.tar.gz: 3d7eb06f425f60994db736113f45c9db3406b63f4bc1ff1a6e7eadd6761f8a67ba98eda05cf6830eef40fd9143046219ec3e7fa9d5b58da8bc270eddf0809a68
+  metadata.gz: fa4e2a6a2cd904d43f1c32a57ecbc1ea7db0729fed4cab05303566515975661fd12bb0e1d3f92480b3101276019db4a1858dc060ff35a1055ff587dc5582d071
+  data.tar.gz: 10493d88b4836f3f90a8813dbe3bb6d40e141a3d0f1ed99adc35c34a308c7a149104b7bde9829c8bf5b5b1efb7e855ad1236fc43c5f6c444c656a1e6f740599c

data/.rubocop.yml

@@ -2,3 +2,7 @@ inherit_from: .rubocop_todo.yml
 
 Style/StringLiterals:
   Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'

data/.rubocop_todo.yml

@@ -34,6 +34,8 @@ Metrics/BlockLength:
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
   Max: 2006
+  Exclude:
+    - 'test/sendgrid/test_sendgrid-ruby.rb'
 
 # Offense count: 41
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods.

data/CHANGELOG.md

@@ -1,6 +1,37 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+[2021-02-10] Version 6.4.0
+--------------------------
+**Library - Feature**
+- [PR #455](https://github.com/sendgrid/sendgrid-ruby/pull/455): Add http_options as a param in the SendGrid::API's constructor. Thanks to [@hoangtuanictvn](https://github.com/hoangtuanictvn)!
+
+
+[2021-01-27] Version 6.3.9
+--------------------------
+**Library - Fix**
+- [PR #446](https://github.com/sendgrid/sendgrid-ruby/pull/446): Accurate duplicate checking when adding email to Personalizations. Thanks to [@mito5525](https://github.com/mito5525)!
+- [PR #457](https://github.com/sendgrid/sendgrid-ruby/pull/457): email is required. Thanks to [@luk4s](https://github.com/luk4s)!
+
+
+[2020-12-16] Version 6.3.8
+--------------------------
+**Library - Fix**
+- [PR #448](https://github.com/sendgrid/sendgrid-ruby/pull/448): tests failing on rubocop rule. Thanks to [@thinkingserious](https://github.com/thinkingserious)!
+
+
+[2020-11-05] Version 6.3.7
+--------------------------
+**Library - Chore**
+- [PR #447](https://github.com/sendgrid/sendgrid-ruby/pull/447): fix rubocop styling errors. Thanks to [@eshanholtz](https://github.com/eshanholtz)!
+
+
+[2020-10-14] Version 6.3.6
+--------------------------
+**Library - Fix**
+- [PR #440](https://github.com/sendgrid/sendgrid-ruby/pull/440): reading position of a request body. Thanks to [@snaka](https://github.com/snaka)!
+
+
 [2020-09-28] Version 6.3.5
 --------------------------
 **Library - Fix**

data/FIRST_TIMERS.md

@@ -61,13 +61,13 @@ Before creating a pull request, make sure that you respect the repository's cons
 * [Node.js SDK](https://github.com/sendgrid/sendgrid-nodejs/issues?utf8=%E2%9C%93&q=is%3Aopen+label%3A%22difficulty%3A+easy%22+label%3A%22status%3A+help+wanted%22)
 * [Java SDK](https://github.com/sendgrid/sendgrid-java/issues?utf8=%E2%9C%93&q=is%3Aopen+label%3A%22difficulty%3A+easy%22+label%3A%22status%3A+help+wanted%22)
 * [Go SDK](https://github.com/sendgrid/sendgrid-go/issues?utf8=%E2%9C%93&q=is%3Aopen+label%3A%22difficulty%3A+easy%22+label%3A%22status%3A+help+wanted%22)
-* [Python STMPAPI Client](https://github.com/sendgrid/smtpapi-python/issues?utf8=%E2%9C%93&q=is%3Aopen+label%3A%22difficulty%3A+easy%22+label%3A%22status%3A+help+wanted%22)
-* [PHP STMPAPI Client](https://github.com/sendgrid/smtpapi-php/issues?utf8=%E2%9C%93&q=is%3Aopen+label%3A%22difficulty%3A+easy%22+label%3A%22status%3A+help+wanted%22)
-* [C# STMPAPI Client](https://github.com/sendgrid/smtpapi-csharp/issues?utf8=%E2%9C%93&q=is%3Aopen+label%3A%22difficulty%3A+easy%22+label%3A%22status%3A+help+wanted%22)
-* [Ruby STMPAPI Client](https://github.com/sendgrid/smtpapi-ruby/issues?utf8=%E2%9C%93&q=is%3Aopen+label%3A%22difficulty%3A+easy%22+label%3A%22status%3A+help+wanted%22)
-* [Node.js STMPAPI Client](https://github.com/sendgrid/smtpapi-nodejs/issues?utf8=%E2%9C%93&q=is%3Aopen+label%3A%22difficulty%3A+easy%22+label%3A%22status%3A+help+wanted%22)
-* [Java STMPAPI Client](https://github.com/sendgrid/smtpapi-java/issues?utf8=%E2%9C%93&q=is%3Aopen+label%3A%22difficulty%3A+easy%22+label%3A%22status%3A+help+wanted%22)
-* [Go STMPAPI Client](https://github.com/sendgrid/smtpapi-go/issues?utf8=%E2%9C%93&q=is%3Aopen+label%3A%22difficulty%3A+easy%22+label%3A%22status%3A+help+wanted%22)
+* [Python SMTPAPI Client](https://github.com/sendgrid/smtpapi-python/issues?utf8=%E2%9C%93&q=is%3Aopen+label%3A%22difficulty%3A+easy%22+label%3A%22status%3A+help+wanted%22)
+* [PHP SMTPAPI Client](https://github.com/sendgrid/smtpapi-php/issues?utf8=%E2%9C%93&q=is%3Aopen+label%3A%22difficulty%3A+easy%22+label%3A%22status%3A+help+wanted%22)
+* [C# SMTPAPI Client](https://github.com/sendgrid/smtpapi-csharp/issues?utf8=%E2%9C%93&q=is%3Aopen+label%3A%22difficulty%3A+easy%22+label%3A%22status%3A+help+wanted%22)
+* [Ruby SMTPAPI Client](https://github.com/sendgrid/smtpapi-ruby/issues?utf8=%E2%9C%93&q=is%3Aopen+label%3A%22difficulty%3A+easy%22+label%3A%22status%3A+help+wanted%22)
+* [Node.js SMTPAPI Client](https://github.com/sendgrid/smtpapi-nodejs/issues?utf8=%E2%9C%93&q=is%3Aopen+label%3A%22difficulty%3A+easy%22+label%3A%22status%3A+help+wanted%22)
+* [Java SMTPAPI Client](https://github.com/sendgrid/smtpapi-java/issues?utf8=%E2%9C%93&q=is%3Aopen+label%3A%22difficulty%3A+easy%22+label%3A%22status%3A+help+wanted%22)
+* [Go SMTPAPI Client](https://github.com/sendgrid/smtpapi-go/issues?utf8=%E2%9C%93&q=is%3Aopen+label%3A%22difficulty%3A+easy%22+label%3A%22status%3A+help+wanted%22)
 * [Python HTTP Client](https://github.com/sendgrid/python-http-client/issues?utf8=%E2%9C%93&q=is%3Aopen+label%3A%22difficulty%3A+easy%22+label%3A%22status%3A+help+wanted%22)
 * [PHP HTTP Client](https://github.com/sendgrid/php-http-client/issues?utf8=%E2%9C%93&q=is%3Aopen+label%3A%22difficulty%3A+easy%22+label%3A%22status%3A+help+wanted%22)
 * [C# HTTP Client](https://github.com/sendgrid/csharp-http-client/issues?utf8=%E2%9C%93&q=is%3Aopen+label%3A%22difficulty%3A+easy%22+label%3A%22status%3A+help+wanted%22)

data/{LICENSE.md → LICENSE}

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (C) 2020, Twilio SendGrid, Inc. <help@twilio.com>
+Copyright (C) 2021, Twilio SendGrid, Inc. <help@twilio.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/PULL_REQUEST_TEMPLATE.md

@@ -19,13 +19,13 @@ Closes #2
 A short description of what this PR does.
 
 ### Checklist
-- [ ] I acknowledge that all my contributions will be made under the project's license
+- [x] I acknowledge that all my contributions will be made under the project's license
 - [ ] I have made a material change to the repo (functionality, testing, spelling, grammar)
-- [ ] I have read the [Contribution Guidelines](CONTRIBUTING.md) and my PR follows them
+- [ ] I have read the [Contribution Guidelines](https://github.com/sendgrid/sendgrid-ruby/blob/main/CONTRIBUTING.md) and my PR follows them
 - [ ] I have titled the PR appropriately
 - [ ] I have updated my branch with the main branch
 - [ ] I have added tests that prove my fix is effective or that my feature works
-- [ ] I have added necessary documentation about the functionality in the appropriate .md file
+- [ ] I have added the necessary documentation about the functionality in the appropriate .md file
 - [ ] I have added inline documentation to the code I modified
 
-If you have questions, please file a [support ticket](https://twilio.com/help/contact), or create a GitHub Issue in this repository.
+If you have questions, please file a [support ticket](https://support.sendgrid.com), or create a GitHub Issue in this repository.

data/README.md

@@ -1,9 +1,9 @@
 ![Twilio SendGrid Logo](twilio_sendgrid_logo.png)
 
-[![Travis Badge](https://travis-ci.org/sendgrid/sendgrid-ruby.svg?branch=main)](https://travis-ci.org/sendgrid/sendgrid-ruby)
+[![Travis Badge](https://travis-ci.com/sendgrid/sendgrid-ruby.svg?branch=main)](https://travis-ci.com/sendgrid/sendgrid-ruby)
 [![Gem Version](https://badge.fury.io/rb/sendgrid-ruby.svg)](https://badge.fury.io/rb/sendgrid-ruby)
 [![Email Notifications Badge](https://dx.sendgrid.com/badge/ruby)](https://dx.sendgrid.com/newsletter/ruby)
-[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md)
+[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
 [![Twitter Follow](https://img.shields.io/twitter/follow/sendgrid.svg?style=social&label=Follow)](https://twitter.com/sendgrid)
 [![GitHub contributors](https://img.shields.io/github/contributors/sendgrid/sendgrid-ruby.svg)](https://github.com/sendgrid/sendgrid-ruby/graphs/contributors)
 [![Open Source Helpers](https://www.codetriage.com/sendgrid/sendgrid-ruby/badges/users.svg)](https://www.codetriage.com/sendgrid/sendgrid-ruby)
@@ -220,4 +220,4 @@ If you've instead found a bug in the library or would like new features added, g
 
 <a name="license"></a>
 # License
-[The MIT License (MIT)](LICENSE.md)
+[The MIT License (MIT)](LICENSE)

data/USAGE.md

@@ -3197,7 +3197,7 @@ puts response.status_code
 puts response.body
 puts response.headers
 ```
-## Remove an IP from a domain authenticaiton.
+## Remove an IP from a domain authentication.
 
 **This endpoint allows you to remove a domain's IP address from that domain's authentication.**
 

data/examples/scopes/scopes.rb

@@ -1,4 +1,4 @@
-require_relative '../../lib/sendgrid-ruby.rb'
+require_relative '../../lib/sendgrid-ruby'
 sg = SendGrid::API.new(api_key: ENV['SENDGRID_API_KEY'])
 
 ##################################################

data/lib/rack/sendgrid_webhook_verification.rb

@@ -39,6 +39,8 @@ module Rack
         request.env[SendGrid::EventWebhookHeader::TIMESTAMP]
       )
 
+      request.body.rewind
+
       if verified
         @app.call(env)
       else

data/lib/sendgrid/base_interface.rb

@@ -4,7 +4,8 @@ require_relative 'version'
 # Initialize the HTTP client
 class BaseInterface
   attr_accessor :client
-  attr_reader :request_headers, :host, :version, :impersonate_subuser
+  attr_reader :request_headers, :host, :version, :impersonate_subuser, :http_options
+
   # * *Args* :
   #   - +auth+ -> authorization header value
   #   - +host+ -> the base URL for the API
@@ -13,8 +14,9 @@ class BaseInterface
   #                  currently only "v3" is supported
   #   - +impersonate_subuser+ -> the subuser to impersonate, will be passed
   #                              in the "On-Behalf-Of" header
+  #   - +http_options+ -> http options that you want to be globally applied to each request
   #
-  def initialize(auth:, host:, request_headers: nil, version: nil, impersonate_subuser: nil)
+  def initialize(auth:, host:, request_headers: nil, version: nil, impersonate_subuser: nil, http_options: {})
     @auth = auth
     @host = host
     @version = version || 'v3'
@@ -30,7 +32,9 @@ class BaseInterface
     @request_headers['On-Behalf-Of'] = @impersonate_subuser if @impersonate_subuser
 
     @request_headers = @request_headers.merge(request_headers) if request_headers
+    @http_options = http_options
     @client = SendGrid::Client.new(host: "#{@host}/#{@version}",
-                                   request_headers: @request_headers)
+                                   request_headers: @request_headers,
+                                   http_options: @http_options)
   end
 end

data/lib/sendgrid/helpers/inbound/app.rb

@@ -18,7 +18,7 @@ require 'yaml'
 class Main < Sinatra::Base
   configure :production, :development do
     enable :logging
-    set :config, YAML.load_file(File.dirname(__FILE__) + '/config.yml')
+    set :config, YAML.load_file("#{File.dirname(__FILE__)}/config.yml")
   end
 
   get '/' do

data/lib/sendgrid/helpers/inbound/send.rb

@@ -8,7 +8,7 @@ OPTS = {}.freeze
 opt = OptionParser.new
 opt.on('--host=HOST') { |v| OPTS[:host] = v }
 argv = opt.parse!(ARGV)
-config = YAML.load_file(File.dirname(__FILE__) + '/config.yml')
+config = YAML.load_file("#{File.dirname(__FILE__)}/config.yml")
 host = OPTS[:host] || config['host']
 client = SendGrid::Client.new(host: host)
 File.open(argv[0]) do |file|

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

@@ -4,7 +4,9 @@ module SendGrid
   class Email
     attr_accessor :email, :name
 
-    def initialize(email: nil, name: nil)
+    # @param [String] email required e-mail address
+    # @param [String] name optionally personification
+    def initialize(email:, name: nil)
       if name
         @email = email
         @name = name
@@ -15,6 +17,8 @@ module SendGrid
 
     def split_email(email)
       split = /(?:(?<address>.+)\s)?<?(?<email>.+@[^>]+)>?/.match(email)
+      raise ArgumentError, "email (#{email}) is invalid" unless split
+
       [split[:email], split[:address]]
     end
 

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

@@ -8,7 +8,9 @@ module SendGrid
     attr_reader :personalizations, :contents, :attachments, :categories, :sections, :headers, :custom_args
     attr_writer :from, :asm, :mail_settings, :tracking_settings, :reply_to
 
-    def initialize(from_email = nil, subj = nil, to_email = nil, cont = nil)
+    # We allow for all nil values here to create uninitialized Mail objects
+    # (e.g. <project-root>/use-cases/transactional-templates.md)
+    def initialize(from_email = nil, subj = nil, to_email = nil, cont = nil) # rubocop:disable Metrics/ParameterLists
       @from = nil
       @subject = nil
       @personalizations = []

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

@@ -76,7 +76,7 @@ module SendGrid
       additional_email = addition.email.downcase
 
       [@tos, @ccs, @bccs].flatten.each do |elm|
-        return true if elm&.dig('email') == additional_email
+        return true if elm&.dig('email')&.downcase == additional_email
       end
 
       false

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

@@ -3,6 +3,7 @@ require 'json'
 module SendGrid
   class TrackingSettings
     attr_writer :click_tracking, :open_tracking, :subscription_tracking, :ganalytics
+
     def initialize
       @click_tracking = nil
       @open_tracking = nil

data/lib/sendgrid/helpers/permissions/scope.rb

@@ -3,7 +3,7 @@ require 'yaml'
 
 module SendGrid
   class Scope
-    SCOPES = YAML.load_file(File.dirname(__FILE__) + '/scopes.yml').freeze
+    SCOPES = YAML.load_file("#{File.dirname(__FILE__)}/scopes.yml").freeze
 
     class << self
       def admin_permissions

data/lib/sendgrid/sendgrid.rb

@@ -9,12 +9,13 @@ module SendGrid
     #                  currently only "v3" is supported
     #   - +impersonate_subuser+ -> the subuser to impersonate, will be passed
     #                              in the "On-Behalf-Of" header
+    #   - +http_options+ -> http options that you want to be globally applied to each request
     #
-    def initialize(api_key:, host: nil, request_headers: nil, version: nil, impersonate_subuser: nil)
+    def initialize(api_key:, host: nil, request_headers: nil, version: nil, impersonate_subuser: nil, http_options: {})
       auth = "Bearer #{api_key}"
       host ||= 'https://api.sendgrid.com'
 
-      super(auth: auth, host: host, request_headers: request_headers, version: version, impersonate_subuser: impersonate_subuser)
+      super(auth: auth, host: host, request_headers: request_headers, version: version, impersonate_subuser: impersonate_subuser, http_options: http_options)
     end
   end
 end

data/lib/sendgrid/version.rb

@@ -1,3 +1,3 @@
 module SendGrid
-  VERSION = '6.3.5'.freeze
+  VERSION = '6.4.0'.freeze
 end

data/spec/fixtures/event_webhook.rb

@@ -7,7 +7,7 @@ module Fixtures
     SIGNATURE = 'MEUCIGHQVtGj+Y3LkG9fLcxf3qfI10QysgDWmMOVmxG0u6ZUAiEAyBiXDWzM+uOe5W0JuG+luQAbPIqHh89M15TluLtEZtM='.freeze
     FAILING_SIGNATURE = 'MEUCIQCtIHJeH93Y+qpYeWrySphQgpNGNr/U+UyUlBkU6n7RAwIgJTz2C+8a8xonZGi6BpSzoQsbVRamr2nlxFDWYNH3j/0='.freeze
     TIMESTAMP = '1600112502'.freeze
-    PAYLOAD = [
+    PAYLOAD = "#{[
       {
         email: 'hello@world.com',
         event: 'dropped',
@@ -17,6 +17,6 @@ module Fixtures
         'smtp-id': '<LRzXl_NHStOGhQ4kofSm_A@ismtpd0039p1iad1.sendgrid.net>',
         timestamp: 1_600_112_492
       }
-    ].to_json + "\r\n" # Be sure to include the trailing carriage return and newline!
+    ].to_json}\r\n".freeze # Be sure to include the trailing carriage return and newline!
   end
 end

data/spec/rack/sendgrid_webhook_verification_spec.rb

@@ -112,5 +112,31 @@ unless RUBY_PLATFORM == 'java'
         expect(status).to eq(403)
       end
     end
+
+    describe 'request body which passed to an app' do
+      before do
+        @payload = nil
+        @spy_app = lambda do |env|
+          @payload = Rack::Request.new(env).body
+          [200, { 'Content-Type' => 'text/plain' }, ['Hello']]
+        end
+      end
+
+      let(:middleware) { Rack::SendGridWebhookVerification.new(@spy_app, public_key, %r{/email}) }
+
+      it 'keeps orignal reading position' do
+        options = {
+          :input => Fixtures::EventWebhook::PAYLOAD,
+          'Content-Type' => "application/json"
+        }
+        options[SendGrid::EventWebhookHeader::SIGNATURE] = Fixtures::EventWebhook::SIGNATURE
+        options[SendGrid::EventWebhookHeader::TIMESTAMP] = Fixtures::EventWebhook::TIMESTAMP
+        request = Rack::MockRequest.env_for('/email', options)
+        status, headers, body = middleware.call(request)
+        expect(status).to eq(200)
+        expect(@payload).not_to be_nil
+        expect(@payload.pos).to be_zero
+      end
+    end
   end
 end

data/spec/sendgrid/helpers/eventwebhook/eventwebhook_spec.rb

@@ -78,7 +78,7 @@ describe SendGrid::EventWebhook do
             Fixtures::EventWebhook::SIGNATURE,
             Fixtures::EventWebhook::TIMESTAMP
           )
-        end .to raise_error(SendGrid::EventWebhook::NotSupportedError)
+        end.to raise_error(SendGrid::EventWebhook::NotSupportedError)
       end
     end
   end

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

@@ -29,4 +29,13 @@ class TestEmail < Minitest::Test
     }
     assert_equal @email.to_json, expected_json
   end
+
+  def test_mandatory_email_missing
+    assert_raises(ArgumentError) { Email.new(email: nil) }
+    assert_raises(ArgumentError) { Email.new(email: "") }
+  end
+
+  def test_invalid_email
+    assert_raises(ArgumentError) { Email.new(email: "some-invalid-string") }
+  end
 end

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

@@ -26,6 +26,7 @@ class TestPersonalization < Minitest::Test
   def test_duplicate_add_to
     @personalization = Personalization.new
     @personalization.add_to(Email.new(email: 'test1@example.com', name: 'Example User'))
+    @personalization.add_to(Email.new(email: 'TEST2@EXAMPLE.COM', name: 'Example User 2'))
 
     assert_raises(DuplicatePersonalizationError) do
       @personalization.add_to(Email.new(email: 'test1@example.com', name: 'Duplicate User'))
@@ -34,6 +35,14 @@ class TestPersonalization < Minitest::Test
     assert_raises(DuplicatePersonalizationError) do
       @personalization.add_to(Email.new(email: 'TEST1@EXAMPLE.COM', name: 'Duplicate User'))
     end
+
+    assert_raises(DuplicatePersonalizationError) do
+      @personalization.add_to(Email.new(email: 'test2@example.com', name: 'Duplicate User 2'))
+    end
+
+    assert_raises(DuplicatePersonalizationError) do
+      @personalization.add_to(Email.new(email: 'TEST2@EXAMPLE.COM', name: 'Duplicate User 2'))
+    end
   end
 
   def test_add_cc
@@ -58,6 +67,7 @@ class TestPersonalization < Minitest::Test
   def test_duplicate_add_cc
     @personalization = Personalization.new
     @personalization.add_cc(Email.new(email: 'test1@example.com', name: 'Example User'))
+    @personalization.add_cc(Email.new(email: 'TEST2@EXAMPLE.COM', name: 'Example User 2'))
 
     assert_raises(DuplicatePersonalizationError) do
       @personalization.add_cc(Email.new(email: 'test1@example.com', name: 'Duplicate User'))
@@ -66,6 +76,14 @@ class TestPersonalization < Minitest::Test
     assert_raises(DuplicatePersonalizationError) do
       @personalization.add_cc(Email.new(email: 'TEST1@EXAMPLE.COM', name: 'Duplicate User'))
     end
+
+    assert_raises(DuplicatePersonalizationError) do
+      @personalization.add_cc(Email.new(email: 'test2@example.com', name: 'Duplicate User 2'))
+    end
+
+    assert_raises(DuplicatePersonalizationError) do
+      @personalization.add_cc(Email.new(email: 'TEST2@EXAMPLE.COM', name: 'Duplicate User 2'))
+    end
   end
 
   def test_add_bcc
@@ -90,6 +108,7 @@ class TestPersonalization < Minitest::Test
   def test_duplicate_add_bcc
     @personalization = Personalization.new
     @personalization.add_bcc(Email.new(email: 'test1@example.com', name: 'Example User'))
+    @personalization.add_bcc(Email.new(email: 'TEST2@EXAMPLE.COM', name: 'Example User 2'))
 
     assert_raises(DuplicatePersonalizationError) do
       @personalization.add_bcc(Email.new(email: 'test1@example.com', name: 'Duplicate User'))
@@ -98,6 +117,14 @@ class TestPersonalization < Minitest::Test
     assert_raises(DuplicatePersonalizationError) do
       @personalization.add_bcc(Email.new(email: 'TEST1@EXAMPLE.COM', name: 'Duplicate User'))
     end
+
+    assert_raises(DuplicatePersonalizationError) do
+      @personalization.add_bcc(Email.new(email: 'test2@example.com', name: 'Duplicate User 2'))
+    end
+
+    assert_raises(DuplicatePersonalizationError) do
+      @personalization.add_bcc(Email.new(email: 'TEST2@EXAMPLE.COM', name: 'Duplicate User 2'))
+    end
   end
 
   def test_add_header

data/test/sendgrid/permissions/test_scopes.rb

@@ -11,7 +11,7 @@ class TestCategory < Minitest::Test
   # 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
+    @scopes_from_yaml = YAML.load_file("#{File.dirname(__FILE__)}/../../../lib/sendgrid/helpers/permissions/scopes.yml").freeze
   end
 
   def test_admin_scopes

data/test/sendgrid/test_sendgrid-ruby.rb

@@ -1,6 +1,6 @@
 require 'simplecov'
 SimpleCov.start
-require_relative '../../lib/sendgrid-ruby.rb'
+require_relative '../../lib/sendgrid-ruby'
 require 'ruby_http_client'
 require 'minitest/autorun'
 require 'minitest/unit'
@@ -33,8 +33,9 @@ class TestAPI < MiniTest::Test
     assert_equal(test_headers, sg.request_headers)
     assert_equal('v3', sg.version)
     assert_equal(subuser, sg.impersonate_subuser)
-    assert_equal('6.3.5', SendGrid::VERSION)
+    assert_equal('6.4.0', SendGrid::VERSION)
     assert_instance_of(SendGrid::Client, sg.client)
+    assert_equal({}, sg.http_options)
   end
 
   def test_init_when_impersonate_subuser_is_not_given
@@ -42,6 +43,23 @@ class TestAPI < MiniTest::Test
     refute_includes(sg.request_headers, 'On-Behalf-Of')
   end
 
+  def test_init_when_http_options_is_given
+    params = JSON.parse('{"subuser": "test_string", "ip": "test_string", "limit": 1, "exclude_whitelabels": "true", "offset": 1}')
+    headers = JSON.parse('{"X-Mock": 200}')
+    http_options = {
+      open_timeout: 40,
+      read_timeout: 40
+    }
+
+    sg = SendGrid::API.new(api_key: 'SENDGRID_API_KEY', version: 'v3', http_options: http_options)
+    client = sg.client.ips
+    response = client.get(query_params: params, request_headers: headers)
+
+    assert_equal(40, client.http.open_timeout)
+    assert_equal(40, client.http.read_timeout)
+    assert_equal('200', response.status_code)
+  end
+
   def test_access_settings_activity_get
     params = JSON.parse('{"limit": 1}')
     headers = JSON.parse('{"X-Mock": 200}')
@@ -2653,7 +2671,7 @@ class TestAPI < MiniTest::Test
 
   def test_license_file_year
     # Read the third line from the license file
-    year = IO.readlines('./LICENSE.md')[2].gsub(/[^\d]/, '')
+    year = IO.readlines('./LICENSE')[2].gsub(/[^\d]/, '')
     assert_equal(Time.now.year.to_s, year)
   end
 
@@ -2690,7 +2708,7 @@ class TestAPI < MiniTest::Test
   end
 
   def test_license_exists
-    assert(File.file?('./LICENSE.md'))
+    assert(File.file?('./LICENSE'))
   end
 
   def test_pull_request_template_exists

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid-ruby
 version: !ruby/object:Gem::Version
-  version: 6.3.5
+  version: 6.4.0
 platform: ruby
 authors:
 - Elmer Thomas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2021-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_http_client
@@ -178,7 +178,7 @@ files:
 - FIRST_TIMERS.md
 - Gemfile
 - ISSUE_TEMPLATE.md
-- LICENSE.md
+- LICENSE
 - Makefile
 - PULL_REQUEST_TEMPLATE.md
 - README.md