sendgrid-ruby 6.3.8 → 6.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 231e75f3472085398e06a26224f22343ef40adc73f9f122dbfd821673f4c0dac
-  data.tar.gz: 57528772f441e47a8daa7b0f334302ed4f7f65576c6e4de35a4eec6530786a4c
+  metadata.gz: c1a6640bcc2d82d5d20822a16795d3d2bff5ca408a7d65be07d0af036052c4fc
+  data.tar.gz: 53a40b16fd0fed9228586419bd7d24bb60511836f7480bec2ff6656333596197
 SHA512:
-  metadata.gz: 6260ae36de0b84530c0b981d4c741e9329ecbdbfe488507a9e8c20d9a5ed1096a1b1f2b364d8b2be0280b0c7cbcdd8b531897d5306744dc60b9a39b505b5c713
-  data.tar.gz: 1844bf3d5888b0dd6239cd9c426ac749bfdc8b9736459ba45caced4d79f77a69a8ab756e1bb7191cc9b1cd96849bf4ce53d5d8ac31a1d890d757497f1ace7b2b
+  metadata.gz: b9136bda6b410d9d82c0884621ac4e632e76edbdfa2152fbefa92a13cdde81333d1b48657cd2711e92adfea7e66f2948bbbb099ccde2c6ea0c6b562ce15005bf
+  data.tar.gz: a7c0135e5bfa4fa3186d1c5742f1aae7d909c34d986c7fe4d4baa3d4994a07e837f7d871d368361a91578bab4ce6aab07f14366281904195d756535a47b81236

data/.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,10 @@
+contact_links:
+  - name: Twilio SendGrid Support
+    url: https://support.sendgrid.com
+    about: Get Support
+  - name: Stack Overflow
+    url: https://stackoverflow.com/questions/tagged/sendgrid-ruby+or+sendgrid+ruby
+    about: Ask questions on Stack Overflow
+  - name: Documentation
+    url: https://sendgrid.com/docs/for-developers/
+    about: View Reference Documentation

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/.travis.yml

@@ -1,25 +1,26 @@
 language: ruby
 env:
-  - version=ruby:2.7
-  - version=ruby:2.6
-  - version=ruby:2.5
-  - version=ruby:2.4
-  - version=jruby:9.2
-
+- version=ruby:3.0
+- version=ruby:2.7
+- version=ruby:2.6
+- version=ruby:2.5
+- version=ruby:2.4
+- version=jruby:9.2
 gemfile:
-  - gemfiles/Sinatra_1.gemfile
-  - gemfiles/Sinatra_2.gemfile
-
-script: make test-docker
-
+- gemfiles/Sinatra_1.gemfile
+- gemfiles/Sinatra_2.gemfile
+script:
+- if [[ "$TRAVIS_BRANCH" == "main"  ||  "$TRAVIS_BRANCH" == "travis" ]] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
+  echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin;
+  fi
+- make test-docker
 deploy:
   provider: rubygems
-  api_key: $RUBYGEMS_API_KEY
+  api_key: "$RUBYGEMS_API_KEY"
   gem: sendgrid-ruby
   on:
     tags: true
     condition: $version = ruby:2.4 && $BUNDLE_GEMFILE = *"gemfiles/Sinatra_1.gemfile"
-
 notifications:
   slack:
     if: branch = main
@@ -27,4 +28,4 @@ notifications:
     on_success: never
     on_failure: change
     rooms:
-      - secure: QwoVrGveeA1bo/26fO2A+OQHmUX69NLaC214qd18C1Z8ztYMHkd05/9+k9HFb+PSdPkGLSeYOPWAKJUqJWB7HfGINNGpRGIPFcmfB7vhvvLFnhud/SAdQPRZ+SCeZPdpZcjpVRLYENKv259ucGPBCPFXh1HfJF92R0IrKeW5CII=
+      secure: oSeohwM+ernyiRYSRLpNlICk0wgj0lku3y5LuouJLRHs45tCAzLZLbgxsor18wCSJkmhfn2vg4Rn969VnskFuj70OhJSLBKL4UXBnR1Ji0ClpfJlGojcbY/5Z8N/eGDrvf5ofA0Jc+L/ut+oSCMXnstEGbx4wBpPTajHuRtvb34=

data/CHANGELOG.md

@@ -1,6 +1,31 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+[2021-09-08] Version 6.5.1
+--------------------------
+**Library - Chore**
+- [PR #470](https://github.com/sendgrid/sendgrid-ruby/pull/470): add support for ruby 3.0. Thanks to [@shwetha-manvinkurke](https://github.com/shwetha-manvinkurke)!
+
+
+[2021-08-11] Version 6.5.0
+--------------------------
+**Library - Feature**
+- [PR #466](https://github.com/sendgrid/sendgrid-ruby/pull/466): Add From address to personalization. Thanks to [@grin](https://github.com/grin)!
+
+
+[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**

data/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/README.md

@@ -2,7 +2,6 @@
 
 [![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)
 [![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)

data/examples/helpers/mail/example.rb

@@ -18,6 +18,7 @@ def hello_world
   puts response.headers
 end
 
+# rubocop:disable Metrics/AbcSize
 def kitchen_sink
   mail = SendGrid::Mail.new
   mail.from = Email.new(email: 'test@example.com')
@@ -29,6 +30,9 @@ def kitchen_sink
   personalization.add_cc(Email.new(email: 'test4@example.com', name: 'Example User'))
   personalization.add_bcc(Email.new(email: 'test5@example.com', name: 'Example User'))
   personalization.add_bcc(Email.new(email: 'test6@example.com', name: 'Example User'))
+  # Note, the domain of the from email property specified in any personalization must
+  # match the domain of the from email property specified at root level
+  personalization.from = Email.new(email: 'alias@example.com', name: "My alias")
   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'))
@@ -124,6 +128,7 @@ def kitchen_sink
   puts response.body
   puts response.headers
 end
+# rubocop:enable Metrics/AbcSize
 
 def dynamic_template_data_hello_world
   mail = Mail.new

data/lib/sendgrid/base_interface.rb

@@ -4,7 +4,7 @@ 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
@@ -14,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'
@@ -31,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/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/personalization.rb

@@ -5,10 +5,11 @@ module SendGrid
     attr_reader :tos, :ccs, :bccs, :headers, :substitutions, :custom_args,
                 :dynamic_template_data
 
-    attr_accessor :send_at, :subject
+    attr_accessor :send_at, :subject, :from
 
     def initialize
       @tos = []
+      @from = nil
       @ccs = []
       @bccs = []
       @subject = nil
@@ -59,6 +60,7 @@ module SendGrid
     def to_json(*)
       {
         'to' => tos,
+        'from' => from,
         'cc' => ccs,
         'bcc' => bccs,
         'subject' => subject,
@@ -76,7 +78,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/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.8'.freeze
+  VERSION = '6.5.1'.freeze
 end

data/spec/sendgrid/helpers/settings/mail_settings_dto_spec.rb

@@ -19,14 +19,14 @@ describe SendGrid::MailSettingsDto do
   describe '.fetch' do
     it 'calls get on sendgrid_client' do
       args = { sendgrid_client: sendgrid_client, name: setting_name, query_params: {} }
-      expect(mail_settings.fetch(args)).to be_a SendGrid::Response
+      expect(mail_settings.fetch(**args)).to be_a SendGrid::Response
     end
   end
 
   describe '.update' do
     it 'calls patch on sendgrid_client' do
       args = { sendgrid_client: sendgrid_client, name: setting_name, request_body: setting_params }
-      expect(mail_settings.update(args)).to be_a SendGrid::Response
+      expect(mail_settings.update(**args)).to be_a SendGrid::Response
     end
   end
 end

data/spec/sendgrid/helpers/settings/partner_settings_dto_spec.rb

@@ -11,14 +11,14 @@ describe SendGrid::PartnerSettingsDto do
   describe '.fetch' do
     it 'calls get on sendgrid_client' do
       args = { sendgrid_client: sendgrid_client, name: setting_name, query_params: {} }
-      expect(partner_settings.fetch(args)).to be_a SendGrid::Response
+      expect(partner_settings.fetch(**args)).to be_a SendGrid::Response
     end
   end
 
   describe '.update' do
     it 'calls patch on sendgrid_client' do
       args = { sendgrid_client: sendgrid_client, name: setting_name, request_body: setting_params }
-      expect(partner_settings.update(args)).to be_a SendGrid::Response
+      expect(partner_settings.update(**args)).to be_a SendGrid::Response
     end
   end
 end

data/spec/sendgrid/helpers/settings/tracking_settings_dto_spec.rb

@@ -14,14 +14,14 @@ describe SendGrid::TrackingSettingsDto do
   describe '.fetch' do
     it 'calls get on sendgrid_client' do
       args = { sendgrid_client: sendgrid_client, name: setting_name, query_params: {} }
-      expect(tracking_settings.fetch(args)).to be_a SendGrid::Response
+      expect(tracking_settings.fetch(**args)).to be_a SendGrid::Response
     end
   end
 
   describe '.update' do
     it 'calls patch on sendgrid_client' do
       args = { sendgrid_client: sendgrid_client, name: setting_name, request_body: setting_params }
-      expect(tracking_settings.update(args)).to be_a SendGrid::Response
+      expect(tracking_settings.update(**args)).to be_a SendGrid::Response
     end
   end
 end

data/spec/sendgrid/helpers/settings/user_settings_dto_spec.rb

@@ -11,14 +11,14 @@ describe SendGrid::UserSettingsDto do
   describe '.fetch' do
     it 'calls get on sendgrid_client' do
       args = { sendgrid_client: sendgrid_client, name: setting_name, query_params: {} }
-      expect(user_settings.fetch(args)).to be_a SendGrid::Response
+      expect(user_settings.fetch(**args)).to be_a SendGrid::Response
     end
   end
 
   describe '.update' do
     it 'calls patch on sendgrid_client' do
       args = { sendgrid_client: sendgrid_client, name: setting_name, request_body: setting_params }
-      expect(user_settings.update(args)).to be_a SendGrid::Response
+      expect(user_settings.update(**args)).to be_a SendGrid::Response
     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/test_sendgrid-ruby.rb

@@ -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.8', SendGrid::VERSION)
+    assert_equal('6.5.1', 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}')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid-ruby
 version: !ruby/object:Gem::Version
-  version: 6.3.8
+  version: 6.5.1
 platform: ruby
 authors:
 - Elmer Thomas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-16 00:00:00.000000000 Z
+date: 2021-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_http_client
@@ -167,6 +167,7 @@ extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
 - ".env_sample"
+- ".github/ISSUE_TEMPLATE/config.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"