From 1cafbfafe42a0dca2c215337a3c0c6c939b0fcf0 Mon Sep 17 00:00:00 2001
From: Joseph Ware <joseph@promoboxx.com>
Date: Tue, 14 Nov 2023 18:59:46 -0500
Subject: [PATCH 01/30] Initial commit

---
 .circleci/config.yml | 65 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 .circleci/config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..5593fae
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,65 @@
+version: 2
+jobs:
+  build:
+    parallelism: 1
+    docker:
+      - image: circleci/ruby:2.3
+    working_directory: ~/pbxx
+    steps:
+      - checkout
+
+      - restore_cache:
+          keys:
+            - ruby-cache-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile" }}-{{ checksum "sendgrid_toolkit.gemspec" }}
+            - ruby-cache-{{ arch }}-{{ .Branch }}
+            - ruby-cache
+
+      - run:
+          name: Download cc-test-reporter
+          command: |
+            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+            chmod +x ./cc-test-reporter
+
+      - run:
+          name: Update RubyGems
+          command: sudo gem update --system 3.3.25
+
+      - run:
+          name: Install bundler
+          command: gem install bundler
+
+      - run:
+          name: Configure bundler
+          command: bundle config set --local path 'vendor/bundle'
+
+      - run:
+          name: Bundle Install
+          command: bundle check || bundle install --jobs=4 --retry=3
+
+      - save_cache:
+          key: ruby-cache-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile" }}-{{ checksum "sendgrid_toolkit.gemspec" }}
+          paths:
+            - vendor/bundle
+
+      - run:
+          name: Run tests
+          command: |
+            ./cc-test-reporter before-build
+            bundle exec rspec --profile 10 \
+                              --format RspecJunitFormatter \
+                              --out test_results/rspec.xml \
+                              --format progress
+            ./cc-test-reporter after-build -t simplecov --exit-code $?
+
+      - store_test_results:
+          path: test_results
+
+      - run:
+          name: Upload to Gemfury
+          context: gem
+          command: |
+            if [ "${CIRCLE_BRANCH}" == "master" ]; then
+              gem build sendgrid_toolkit.gemspec
+              curl -F package=@sendgrid_toolkit-1.4.0.gem q
+            fi
+

From 1a5baab1c8dc946d76004cb821a59d1758467f77 Mon Sep 17 00:00:00 2001
From: Joseph Ware <joseph@promoboxx.com>
Date: Tue, 14 Nov 2023 20:39:26 -0500
Subject: [PATCH 02/30] gemfile

---
 Gemfile.lock | 91 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 50 insertions(+), 41 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2873b4a..38b15f9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,59 +1,65 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.5)
-    builder (3.2.2)
-    coderay (1.1.0)
+    addressable (2.4.0)
+    builder (3.2.4)
+    coderay (1.1.3)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.1.3)
     fakeweb (1.3.0)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    git (1.2.6)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
-      oauth2
-    hashie (2.0.5)
-    highline (1.6.20)
-    httparty (0.12.0)
-      json (~> 1.8)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.11.0)
+      rchardet (~> 1.8)
+    github_api (0.16.0)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
+    hashie (5.0.0)
+    highline (2.1.0)
+    httparty (0.21.0)
+      mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    httpauth (0.2.0)
-    jeweler (1.8.8)
+    jeweler (2.3.9)
       builder
-      bundler (~> 1.0)
+      bundler
       git (>= 1.2.5)
-      github_api (= 0.10.1)
+      github_api (~> 0.16.0)
       highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
+      nokogiri (>= 1.5.10)
+      psych
       rake
       rdoc
-    json (1.8.1)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
+      semver2
+    jwt (2.3.0)
     method_source (0.8.2)
-    multi_json (1.8.2)
-    multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    mime-types (2.99.3)
+    mini_mime (1.1.2)
+    mini_portile2 (2.4.0)
+    multi_json (1.15.0)
+    multi_xml (0.6.0)
+    multipart-post (2.3.0)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    oauth2 (1.4.8)
+      faraday (>= 0.8, < 3.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    pry (0.10.3)
+      rack (>= 1.2, < 3)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.5.2)
-    rake (10.1.0)
-    rdoc (4.0.1)
-      json (~> 1.4)
+    psych (3.1.0)
+    rack (2.2.8)
+    rake (13.1.0)
+    rchardet (1.8.0)
+    rdoc (6.2.0)
     rspec (2.7.0)
       rspec-core (~> 2.7.0)
       rspec-expectations (~> 2.7.0)
@@ -62,10 +68,13 @@ GEM
     rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.7.0)
+    semver2 (3.4.2)
     slop (3.6.0)
+    thread_safe (0.3.6)
 
 PLATFORMS
   ruby
+  x86_64-linux
 
 DEPENDENCIES
   fakeweb (~> 1.3.0)
@@ -75,4 +84,4 @@ DEPENDENCIES
   rspec (~> 2.7.0)
 
 BUNDLED WITH
-   1.11.2
+   2.3.27
\ No newline at end of file

From 7f297b02b0c43cd477bee4a1791bead93ac974d3 Mon Sep 17 00:00:00 2001
From: Joseph Ware <joseph@promoboxx.com>
Date: Tue, 14 Nov 2023 21:00:26 -0500
Subject: [PATCH 03/30] formater

---
 .circleci/config.yml | 3 ++-
 Gemfile              | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5593fae..1471a72 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -45,7 +45,8 @@ jobs:
           name: Run tests
           command: |
             ./cc-test-reporter before-build
-            bundle exec rspec --profile 10 \
+            bundle exec rspec spec
+                              --profile 10 \
                               --format RspecJunitFormatter \
                               --out test_results/rspec.xml \
                               --format progress
diff --git a/Gemfile b/Gemfile
index fea4cf8..f5dbd29 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,4 +7,9 @@ group :development do
   gem "jeweler"
   gem "rspec", "~> 2.7.0"
   gem 'pry', '~> 0.10.3'
+  gem 'rspec_junit_formatter'
 end
+
+group :test do
+  gem 'rspec_junit_formatter'
+end
\ No newline at end of file

From 7415a5dd6d64a13d04a342bd880b2849d4bb81be Mon Sep 17 00:00:00 2001
From: Sean Slattery <30410349+sean-m-slattery@users.noreply.github.com>
Date: Wed, 24 Jan 2024 10:02:08 -0800
Subject: [PATCH 04/30] try this out

---
 lib/sendgrid_toolkit/common.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/sendgrid_toolkit/common.rb b/lib/sendgrid_toolkit/common.rb
index 275f45f..adb0918 100644
--- a/lib/sendgrid_toolkit/common.rb
+++ b/lib/sendgrid_toolkit/common.rb
@@ -15,7 +15,7 @@ def retrieve_with_timestamps(options = {})
           parse_message_time message
         end
       else
-        parse_message_time response
+        parse_message_time response.parsed_response
       end
       response
     end

From f41df47a5eecc9233780b7dd299436a41bd2ba72 Mon Sep 17 00:00:00 2001
From: Sean Slattery <30410349+sean-m-slattery@users.noreply.github.com>
Date: Wed, 24 Jan 2024 10:27:57 -0800
Subject: [PATCH 05/30] should fix some of the tests

---
 lib/sendgrid_toolkit/common.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/sendgrid_toolkit/common.rb b/lib/sendgrid_toolkit/common.rb
index adb0918..f845b9d 100644
--- a/lib/sendgrid_toolkit/common.rb
+++ b/lib/sendgrid_toolkit/common.rb
@@ -10,12 +10,12 @@ def retrieve(options = {})
     def retrieve_with_timestamps(options = {})
       options.merge! :date => 1
       response = retrieve options
-      if response.is_a? Array
+      if response.respond_to?(:each)
         response.each do |message|
           parse_message_time message
         end
       else
-        parse_message_time response.parsed_response
+        parse_message_time response
       end
       response
     end

From ffde4b3d28a500c43fba7cbd9a754b1d6130ce93 Mon Sep 17 00:00:00 2001
From: Sean Slattery <30410349+sean-m-slattery@users.noreply.github.com>
Date: Wed, 24 Jan 2024 11:42:43 -0800
Subject: [PATCH 06/30] more test fixes

---
 lib/sendgrid_toolkit/abstract_sendgrid_client.rb                | 2 +-
 lib/sendgrid_toolkit/v3/abstract_sendgrid_client.rb             | 2 +-
 .../newsletter/newsletter_sendgrid_client_spec.rb               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/sendgrid_toolkit/abstract_sendgrid_client.rb b/lib/sendgrid_toolkit/abstract_sendgrid_client.rb
index 49a2d16..5aee161 100644
--- a/lib/sendgrid_toolkit/abstract_sendgrid_client.rb
+++ b/lib/sendgrid_toolkit/abstract_sendgrid_client.rb
@@ -39,7 +39,7 @@ def compose_base_path(module_name, action_name)
 
     private
     def has_error?(response)
-      response.kind_of?(Hash) && response.has_key?('error')
+      response != nil && response.respond_to?(:key?) && response.key?('error')
     end
   end
 end
diff --git a/lib/sendgrid_toolkit/v3/abstract_sendgrid_client.rb b/lib/sendgrid_toolkit/v3/abstract_sendgrid_client.rb
index b8f6ba5..668d3c5 100644
--- a/lib/sendgrid_toolkit/v3/abstract_sendgrid_client.rb
+++ b/lib/sendgrid_toolkit/v3/abstract_sendgrid_client.rb
@@ -54,7 +54,7 @@ def credentials
       end
 
       def error?(response)
-        response.is_a?(Hash) && response.key?('error')
+        response != nil && response.respond_to?(:key?) && response.key?('error')
       end
     end
   end
diff --git a/spec/lib/sendgrid_toolkit/newsletter/newsletter_sendgrid_client_spec.rb b/spec/lib/sendgrid_toolkit/newsletter/newsletter_sendgrid_client_spec.rb
index 9f8c901..5b4ca8d 100644
--- a/spec/lib/sendgrid_toolkit/newsletter/newsletter_sendgrid_client_spec.rb
+++ b/spec/lib/sendgrid_toolkit/newsletter/newsletter_sendgrid_client_spec.rb
@@ -19,7 +19,7 @@
 
       sendgrid_client = SendgridToolkit::NewsletterSendgridClient.new("fakeuser", "fakepass")
 
-      sendgrid_client.send(:api_post, "lists", "add", opts).should eql({ 'message' => 'success' })
+      sendgrid_client.send(:api_post, "lists", "add", opts).parsed_response.should eql({ 'message' => 'success' })
     end
   end
 end

From ddb01fe9425785275d59451b46869e62f1b5728f Mon Sep 17 00:00:00 2001
From: Sean Slattery <30410349+sean-m-slattery@users.noreply.github.com>
Date: Wed, 24 Jan 2024 11:58:14 -0800
Subject: [PATCH 07/30] fix

---
 .circleci/config.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1471a72..bb9559e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -45,11 +45,10 @@ jobs:
           name: Run tests
           command: |
             ./cc-test-reporter before-build
-            bundle exec rspec spec
-                              --profile 10 \
-                              --format RspecJunitFormatter \
-                              --out test_results/rspec.xml \
-                              --format progress
+            bundle exec rspec spec --profile 10 \
+                                   --format RspecJunitFormatter \
+                                   --out test_results/rspec.xml \
+                                   --format progress
             ./cc-test-reporter after-build -t simplecov --exit-code $?
 
       - store_test_results:

From a2057a718191d5b33441d0ab25f1cd2a92ef657b Mon Sep 17 00:00:00 2001
From: Sean Slattery <30410349+sean-m-slattery@users.noreply.github.com>
Date: Wed, 24 Jan 2024 12:06:47 -0800
Subject: [PATCH 08/30] who knows what will ultimately work here

---
 .circleci/config.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bb9559e..ddbbc86 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -44,12 +44,10 @@ jobs:
       - run:
           name: Run tests
           command: |
-            ./cc-test-reporter before-build
             bundle exec rspec spec --profile 10 \
                                    --format RspecJunitFormatter \
                                    --out test_results/rspec.xml \
                                    --format progress
-            ./cc-test-reporter after-build -t simplecov --exit-code $?
 
       - store_test_results:
           path: test_results

From 3280ebdf4237b2eb0a61b0354af28afae9a18954 Mon Sep 17 00:00:00 2001
From: Sean Slattery <30410349+sean-m-slattery@users.noreply.github.com>
Date: Wed, 24 Jan 2024 12:08:45 -0800
Subject: [PATCH 09/30] just tests stop with all this other stuff

---
 .circleci/config.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ddbbc86..83effd4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -44,10 +44,7 @@ jobs:
       - run:
           name: Run tests
           command: |
-            bundle exec rspec spec --profile 10 \
-                                   --format RspecJunitFormatter \
-                                   --out test_results/rspec.xml \
-                                   --format progress
+            bundle exec rspec spec
 
       - store_test_results:
           path: test_results

From 6222e92ffc584fe02c5e1062fe853f0e37988e04 Mon Sep 17 00:00:00 2001
From: Sean Slattery <30410349+sean-m-slattery@users.noreply.github.com>
Date: Wed, 24 Jan 2024 12:34:41 -0800
Subject: [PATCH 10/30] try to change the package to a promoboxx one so it
 doesn't look like we're trying to override the other sendgrid_toolkit

---
 .circleci/config.yml     | 4 ++--
 Rakefile                 | 5 ++---
 sendgrid_toolkit.gemspec | 9 +++------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1471a72..142134d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -60,7 +60,7 @@ jobs:
           context: gem
           command: |
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
-              gem build sendgrid_toolkit.gemspec
-              curl -F package=@sendgrid_toolkit-1.4.0.gem q
+              gem build promoboxx_sendgrid_toolkit.gemspec
+              curl -F package=@promoboxx_sendgrid_toolkit-1.4.0.gem https://$GEMFURY_PUSH_TOKEN@push.fury.io/promoboxx/
             fi
 
diff --git a/Rakefile b/Rakefile
index bebf02f..4fc6ab4 100644
--- a/Rakefile
+++ b/Rakefile
@@ -13,13 +13,12 @@ require 'jeweler'
 
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "sendgrid_toolkit"
+  gem.name = "promoboxx_sendgrid_toolkit"
   gem.homepage = "http://github.com/freerobby/sendgrid_toolkit"
   gem.license = "MIT"
   gem.summary = "sendgrid_toolkit = Sendgrid + Ruby"
   gem.description = "A Ruby wrapper and utility library for communicating with the Sendgrid API."
-  gem.email = "robby@freerobby.com"
-  gem.authors = ["Robby Grossman"]
+  gem.authors = ["promoboxx people"]
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
diff --git a/sendgrid_toolkit.gemspec b/sendgrid_toolkit.gemspec
index 4f0efdf..a288cf1 100644
--- a/sendgrid_toolkit.gemspec
+++ b/sendgrid_toolkit.gemspec
@@ -5,14 +5,12 @@
 # stub: sendgrid_toolkit 1.4.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "sendgrid_toolkit"
+  s.name = "promoboxx_sendgrid_toolkit"
   s.version = "1.4.0"
-
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Robby Grossman"]
+  s.authors = ["promoboxx people"]
   s.date = "2014-03-04"
   s.description = "A Ruby wrapper and utility library for communicating with the Sendgrid API."
-  s.email = "robby@freerobby.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -43,7 +41,7 @@ Gem::Specification.new do |s|
     'lib/sendgrid_toolkit/v3/groups.rb',
     'lib/sendgrid_toolkit/v3/unsubscribes.rb',
     'lib/sendgrid_toolkit/v3/abstract_sendgrid_client.rb',
-    "sendgrid_toolkit.gemspec",
+    "promoboxx_sendgrid_toolkit.gemspec",
     "spec/helper.rb",
     "spec/lib/sendgrid_toolkit/abstract_sendgrid_client_spec.rb",
     "spec/lib/sendgrid_toolkit/blocks_spec.rb",
@@ -60,7 +58,6 @@ Gem::Specification.new do |s|
     'spec/lib/sendgrid_toolkit/v3/abstract_sendgrid_client_spec.rb',
     'spec/lib/sendgrid_toolkit/v3/unsubscribes_spec.rb'
   ]
-  s.homepage = "http://github.com/freerobby/sendgrid_toolkit"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = "2.1.11"

From 012b5cdd76e6fd44b8370de66a7259837840eff4 Mon Sep 17 00:00:00 2001
From: Sean Slattery <30410349+sean-m-slattery@users.noreply.github.com>
Date: Wed, 24 Jan 2024 12:43:29 -0800
Subject: [PATCH 11/30] no message

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7cbec1c..0462241 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -54,7 +54,7 @@ jobs:
           context: gem
           command: |
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
-              gem build promoboxx_sendgrid_toolkit.gemspec
-              curl -F package=@promoboxx_sendgrid_toolkit-1.4.0.gem https://$GEMFURY_PUSH_TOKEN@push.fury.io/promoboxx/
+              gem build sendgrid_toolkit.gemspec
+              curl -F package=@sendgrid_toolkit-1.4.0.gem https://$GEMFURY_PUSH_TOKEN@push.fury.io/promoboxx/
             fi
 

From babafea9eca40838f91cd83ef2325a377376d4a7 Mon Sep 17 00:00:00 2001
From: Sean Slattery <30410349+sean-m-slattery@users.noreply.github.com>
Date: Wed, 24 Jan 2024 12:52:22 -0800
Subject: [PATCH 12/30] last reversion

---
 Rakefile                 | 2 +-
 sendgrid_toolkit.gemspec | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Rakefile b/Rakefile
index 4fc6ab4..78744d3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -13,7 +13,7 @@ require 'jeweler'
 
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "promoboxx_sendgrid_toolkit"
+  gem.name = "sendgrid_toolkit"
   gem.homepage = "http://github.com/freerobby/sendgrid_toolkit"
   gem.license = "MIT"
   gem.summary = "sendgrid_toolkit = Sendgrid + Ruby"
diff --git a/sendgrid_toolkit.gemspec b/sendgrid_toolkit.gemspec
index a288cf1..f4ebabf 100644
--- a/sendgrid_toolkit.gemspec
+++ b/sendgrid_toolkit.gemspec
@@ -5,7 +5,7 @@
 # stub: sendgrid_toolkit 1.4.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "promoboxx_sendgrid_toolkit"
+  s.name = "sendgrid_toolkit"
   s.version = "1.4.0"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["promoboxx people"]
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
     'lib/sendgrid_toolkit/v3/groups.rb',
     'lib/sendgrid_toolkit/v3/unsubscribes.rb',
     'lib/sendgrid_toolkit/v3/abstract_sendgrid_client.rb',
-    "promoboxx_sendgrid_toolkit.gemspec",
+    "sendgrid_toolkit.gemspec",
     "spec/helper.rb",
     "spec/lib/sendgrid_toolkit/abstract_sendgrid_client_spec.rb",
     "spec/lib/sendgrid_toolkit/blocks_spec.rb",

From bfd2c79674e7dbd2f7343ba1636f03cf17cbc7b7 Mon Sep 17 00:00:00 2001
From: Sean Slattery <30410349+sean-m-slattery@users.noreply.github.com>
Date: Wed, 24 Jan 2024 13:01:39 -0800
Subject: [PATCH 13/30] Upgrade package

---
 .circleci/config.yml     | 2 +-
 sendgrid_toolkit.gemspec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0462241..d9fdd56 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -55,6 +55,6 @@ jobs:
           command: |
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
               gem build sendgrid_toolkit.gemspec
-              curl -F package=@sendgrid_toolkit-1.4.0.gem https://$GEMFURY_PUSH_TOKEN@push.fury.io/promoboxx/
+              curl -F package=@sendgrid_toolkit-1.5.0.gem https://$GEMFURY_PUSH_TOKEN@push.fury.io/promoboxx/
             fi
 
diff --git a/sendgrid_toolkit.gemspec b/sendgrid_toolkit.gemspec
index f4ebabf..f5832e9 100644
--- a/sendgrid_toolkit.gemspec
+++ b/sendgrid_toolkit.gemspec
@@ -6,7 +6,7 @@
 
 Gem::Specification.new do |s|
   s.name = "sendgrid_toolkit"
-  s.version = "1.4.0"
+  s.version = "1.5.0"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["promoboxx people"]
   s.date = "2014-03-04"

From 0cafc6293870965efb423480a32e256ad9969535 Mon Sep 17 00:00:00 2001
From: Sean Slattery <30410349+sean-m-slattery@users.noreply.github.com>
Date: Wed, 24 Jan 2024 13:04:22 -0800
Subject: [PATCH 14/30] bane of my existence

---
 .circleci/config.yml     | 2 +-
 sendgrid_toolkit.gemspec | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d9fdd56..6438e74 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -55,6 +55,6 @@ jobs:
           command: |
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
               gem build sendgrid_toolkit.gemspec
-              curl -F package=@sendgrid_toolkit-1.5.0.gem https://$GEMFURY_PUSH_TOKEN@push.fury.io/promoboxx/
+              curl -F package=@sendgrid_toolkit-1.6.0.gem https://$GEMFURY_PUSH_TOKEN@push.fury.io/promoboxx/
             fi
 
diff --git a/sendgrid_toolkit.gemspec b/sendgrid_toolkit.gemspec
index f5832e9..c37c6e9 100644
--- a/sendgrid_toolkit.gemspec
+++ b/sendgrid_toolkit.gemspec
@@ -6,7 +6,7 @@
 
 Gem::Specification.new do |s|
   s.name = "sendgrid_toolkit"
-  s.version = "1.5.0"
+  s.version = "1.6.0"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["promoboxx people"]
   s.date = "2014-03-04"
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "lib/sendgrid_toolkit/blocks.rb",
     "lib/sendgrid_toolkit/bounces.rb",
     "lib/sendgrid_toolkit/common.rb",
+    "lib/sendgrid_toolkit/http_parser_party.rb",
     "lib/sendgrid_toolkit/invalid_emails.rb",
     "lib/sendgrid_toolkit/mail.rb",
     "lib/sendgrid_toolkit/newsletter/list_emails.rb",

From c59b609cb10638689ddafc4a68760b26884bcf9c Mon Sep 17 00:00:00 2001
From: Sean Slattery <30410349+sean-m-slattery@users.noreply.github.com>
Date: Thu, 25 Jan 2024 09:49:09 -0800
Subject: [PATCH 15/30] merge apikey change, bump package version

---
 .circleci/config.yml                             | 2 +-
 lib/sendgrid_toolkit/abstract_sendgrid_client.rb | 9 +++++++++
 sendgrid_toolkit.gemspec                         | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6438e74..5e9c6ee 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -55,6 +55,6 @@ jobs:
           command: |
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
               gem build sendgrid_toolkit.gemspec
-              curl -F package=@sendgrid_toolkit-1.6.0.gem https://$GEMFURY_PUSH_TOKEN@push.fury.io/promoboxx/
+              curl -F package=@sendgrid_toolkit-1.7.0.gem https://$GEMFURY_PUSH_TOKEN@push.fury.io/promoboxx/
             fi
 
diff --git a/lib/sendgrid_toolkit/abstract_sendgrid_client.rb b/lib/sendgrid_toolkit/abstract_sendgrid_client.rb
index 5aee161..1b4f9b5 100644
--- a/lib/sendgrid_toolkit/abstract_sendgrid_client.rb
+++ b/lib/sendgrid_toolkit/abstract_sendgrid_client.rb
@@ -16,6 +16,15 @@ def api_post(module_name, action_name, opts = {})
       response = HTTParserParty.post("https://#{SendgridToolkit.base_uri}/#{base_path}.json",
                                :body => get_credentials.merge(opts),
                                :format => :json)
+
+      base_path = compose_base_path(module_name, action_name)
+      response = nil
+      if (@api_user == "apikey")
+        response = HTTParty.post("https://#{BASE_URI}/#{base_path}.json?", :body => opts, :format => :json, :headers => { "Authorization" => "Bearer #{@api_key}"})
+      else
+        response = HTTParty.post("https://#{BASE_URI}/#{base_path}.json?", :body => get_credentials.merge(opts), :format => :json)
+      end
+
       if response.code > 401
         raise(SendgridToolkit::SendgridServerError, "The SendGrid server returned an error. #{response.inspect}")
       elsif has_error?(response) and
diff --git a/sendgrid_toolkit.gemspec b/sendgrid_toolkit.gemspec
index c37c6e9..a21ebd7 100644
--- a/sendgrid_toolkit.gemspec
+++ b/sendgrid_toolkit.gemspec
@@ -6,7 +6,7 @@
 
 Gem::Specification.new do |s|
   s.name = "sendgrid_toolkit"
-  s.version = "1.6.0"
+  s.version = "1.7.0"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["promoboxx people"]
   s.date = "2014-03-04"

From 1f2cd235fbf5fa9955ee65b4c6c53a51e32b7402 Mon Sep 17 00:00:00 2001
From: Sean Slattery <30410349+sean-m-slattery@users.noreply.github.com>
Date: Thu, 25 Jan 2024 10:00:36 -0800
Subject: [PATCH 16/30] remove dupe code

---
 lib/sendgrid_toolkit/abstract_sendgrid_client.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/sendgrid_toolkit/abstract_sendgrid_client.rb b/lib/sendgrid_toolkit/abstract_sendgrid_client.rb
index 1b4f9b5..6938fe9 100644
--- a/lib/sendgrid_toolkit/abstract_sendgrid_client.rb
+++ b/lib/sendgrid_toolkit/abstract_sendgrid_client.rb
@@ -12,11 +12,6 @@ def initialize(api_user = nil, api_key = nil)
     protected
 
     def api_post(module_name, action_name, opts = {})
-      base_path = compose_base_path(module_name, action_name)
-      response = HTTParserParty.post("https://#{SendgridToolkit.base_uri}/#{base_path}.json",
-                               :body => get_credentials.merge(opts),
-                               :format => :json)
-
       base_path = compose_base_path(module_name, action_name)
       response = nil
       if (@api_user == "apikey")

From a6d625a36a3d59057fed85aee0fc647afcbcc0e1 Mon Sep 17 00:00:00 2001
From: Sean Slattery <30410349+sean-m-slattery@users.noreply.github.com>
Date: Thu, 25 Jan 2024 10:24:23 -0800
Subject: [PATCH 17/30] needed the parser party

---
 lib/sendgrid_toolkit/abstract_sendgrid_client.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/sendgrid_toolkit/abstract_sendgrid_client.rb b/lib/sendgrid_toolkit/abstract_sendgrid_client.rb
index 6938fe9..54680b9 100644
--- a/lib/sendgrid_toolkit/abstract_sendgrid_client.rb
+++ b/lib/sendgrid_toolkit/abstract_sendgrid_client.rb
@@ -15,9 +15,9 @@ def api_post(module_name, action_name, opts = {})
       base_path = compose_base_path(module_name, action_name)
       response = nil
       if (@api_user == "apikey")
-        response = HTTParty.post("https://#{BASE_URI}/#{base_path}.json?", :body => opts, :format => :json, :headers => { "Authorization" => "Bearer #{@api_key}"})
+        response = HTTParserParty.post("https://#{BASE_URI}/#{base_path}.json?", :body => opts, :format => :json, :headers => { "Authorization" => "Bearer #{@api_key}"})
       else
-        response = HTTParty.post("https://#{BASE_URI}/#{base_path}.json?", :body => get_credentials.merge(opts), :format => :json)
+        response = HTTParserParty.post("https://#{BASE_URI}/#{base_path}.json?", :body => get_credentials.merge(opts), :format => :json)
       end
 
       if response.code > 401

From 8c402224dc7644a3feef3bb0c7b2b7dd116dbf9d Mon Sep 17 00:00:00 2001
From: Joseph Ware <joseph@promoboxx.com>
Date: Wed, 5 Mar 2025 10:45:01 -0500
Subject: [PATCH 18/30] DEV-10737 Add V3 bounces method (#2)

---
 .circleci/config.yml                          |  2 +-
 lib/sendgrid_toolkit.rb                       |  1 +
 .../abstract_sendgrid_client.rb               |  6 +--
 .../v3/abstract_sendgrid_client.rb            | 48 +++++++++++++------
 lib/sendgrid_toolkit/v3/bounces.rb            | 12 +++++
 sendgrid_toolkit.gemspec                      |  2 +-
 spec/lib/sendgrid_toolkit/v3/bounces_spec.rb  | 17 +++++++
 7 files changed, 69 insertions(+), 19 deletions(-)
 create mode 100644 lib/sendgrid_toolkit/v3/bounces.rb
 create mode 100644 spec/lib/sendgrid_toolkit/v3/bounces_spec.rb

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5e9c6ee..393158f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -55,6 +55,6 @@ jobs:
           command: |
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
               gem build sendgrid_toolkit.gemspec
-              curl -F package=@sendgrid_toolkit-1.7.0.gem https://$GEMFURY_PUSH_TOKEN@push.fury.io/promoboxx/
+              curl -F package=@sendgrid_toolkit-1.8.0.gem https://$GEMFURY_PUSH_TOKEN@push.fury.io/promoboxx/
             fi
 
diff --git a/lib/sendgrid_toolkit.rb b/lib/sendgrid_toolkit.rb
index 19d19dd..f225bf1 100644
--- a/lib/sendgrid_toolkit.rb
+++ b/lib/sendgrid_toolkit.rb
@@ -13,6 +13,7 @@
 require 'sendgrid_toolkit/mail'
 
 require 'sendgrid_toolkit/v3/abstract_sendgrid_client'
+require 'sendgrid_toolkit/v3/bounces'
 require 'sendgrid_toolkit/v3/groups'
 require 'sendgrid_toolkit/v3/unsubscribes'
 
diff --git a/lib/sendgrid_toolkit/abstract_sendgrid_client.rb b/lib/sendgrid_toolkit/abstract_sendgrid_client.rb
index 54680b9..4657344 100644
--- a/lib/sendgrid_toolkit/abstract_sendgrid_client.rb
+++ b/lib/sendgrid_toolkit/abstract_sendgrid_client.rb
@@ -22,9 +22,9 @@ def api_post(module_name, action_name, opts = {})
 
       if response.code > 401
         raise(SendgridToolkit::SendgridServerError, "The SendGrid server returned an error. #{response.inspect}")
-      elsif has_error?(response) and
-          response['error'].respond_to?(:has_key?) and
-          response['error'].has_key?('code') and
+      elsif has_error?(response) &&
+          response['error'].respond_to?(:has_key?) &&
+          response['error'].has_key?('code') &&
           response['error']['code'].to_i == 401
         raise SendgridToolkit::AuthenticationFailed
       elsif has_error?(response)
diff --git a/lib/sendgrid_toolkit/v3/abstract_sendgrid_client.rb b/lib/sendgrid_toolkit/v3/abstract_sendgrid_client.rb
index 668d3c5..40dcdaf 100644
--- a/lib/sendgrid_toolkit/v3/abstract_sendgrid_client.rb
+++ b/lib/sendgrid_toolkit/v3/abstract_sendgrid_client.rb
@@ -2,7 +2,7 @@ module SendgridToolkit
   module V3
     class AbstractSendgridClient
 
-      BASE_URI = 'https://api.sendgrid.com/v3/asm'
+      BASE_URI = 'https://api.sendgrid.com/v3'
 
       def initialize(api_user = nil, api_key = nil)
         @api_user = api_user || SendgridToolkit.api_user || ENV['SMTP_USERNAME']
@@ -15,22 +15,41 @@ def initialize(api_user = nil, api_key = nil)
       protected
 
       def api_post(action_name, options = {})
-        response = HTTParserParty.post("#{BASE_URI}/#{action_name}",
-                                 body: options.to_json, format: :json,
-                                 headers: { 'Authorization' => "Basic #{credentials}" })
+        if (@api_user == "apikey")
+          response = HTTParserParty.post("#{BASE_URI}/#{action_name}",
+            body: options.to_json, format: :json,
+            headers: { 'Authorization' => "Bearer #{api_key}" })
+        else
+          response = HTTParserParty.post("#{BASE_URI}/#{action_name}",
+            body: options.to_json, format: :json,
+            headers: { 'Authorization' => "Basic #{credentials}" })
+        end
         check_response(response)
       end
 
       def api_get(action_name, options = {})
-        response = HTTParserParty.get("#{BASE_URI}/#{action_name}",
-                                query: options, format: :json, headers: { 'Authorization' => "Basic #{credentials}" })
+        if (@api_user == "apikey")
+          response = HTTParserParty.get("#{BASE_URI}/#{action_name}",
+            query: options, format: :json,
+            headers: { 'Authorization' => "Bearer #{api_key}" })
+        else
+          response = HTTParserParty.get("#{BASE_URI}/#{action_name}",
+            query: options, format: :json,
+            headers: { 'Authorization' => "Basic #{credentials}" })
+        end
         check_response(response)
       end
 
       def api_delete(action_name, options = {})
-        response = HTTParserParty.delete("#{BASE_URI}/#{action_name}",
-                                   body: options, format: :json,
-                                   headers: { 'Authorization' => "Basic #{credentials}" })
+        if (@api_user == "apikey")
+          response = HTTParserParty.delete("#{BASE_URI}/#{action_name}",
+            body: options, format: :json,
+            headers: { 'Authorization' => "Bearer #{api_key}" })
+        else
+          response = HTTParserParty.delete("#{BASE_URI}/#{action_name}",
+            body: options, format: :json,
+            headers: { 'Authorization' => "Basic #{credentials}" })
+        end
         check_response(response)
       end
 
@@ -39,11 +58,12 @@ def api_delete(action_name, options = {})
       def check_response(response)
         if response.code > 401
           fail(SendgridToolkit::SendgridServerError, "The SendGrid server returned an error. #{response.inspect}")
-        elsif error?(response) && response['error'].respond_to?(:has_key?) &&
-              response['error'].key?('code') &&
-              response['error']['code'].to_i == 401
+        elsif has_error?(response) &&
+            response['error'].respond_to?(:has_key?) &&
+            response['error'].has_key?('code') &&
+            response['error']['code'].to_i == 401
           fail SendgridToolkit::AuthenticationFailed
-        elsif error?(response)
+        elsif has_error?(response)
           fail(SendgridToolkit::APIError, response['error'])
         end
         response
@@ -53,7 +73,7 @@ def credentials
         Base64.encode64("#{@api_user}:#{@api_key}")
       end
 
-      def error?(response)
+      def has_error?(response)
         response != nil && response.respond_to?(:key?) && response.key?('error')
       end
     end
diff --git a/lib/sendgrid_toolkit/v3/bounces.rb b/lib/sendgrid_toolkit/v3/bounces.rb
new file mode 100644
index 0000000..3709513
--- /dev/null
+++ b/lib/sendgrid_toolkit/v3/bounces.rb
@@ -0,0 +1,12 @@
+module SendgridToolkit
+  module V3
+    class Bounces < SendgridToolkit::V3::AbstractSendgridClient
+      def get(opts = {})
+        action_name = 'supressions/bounces'
+        response = api_get(action_name, opts)
+        fail(SendgridToolkit::APIError, response['error']) if response.is_a?(Hash) && response.key?('errors')
+        response
+      end
+    end
+  end
+end
diff --git a/sendgrid_toolkit.gemspec b/sendgrid_toolkit.gemspec
index a21ebd7..497c160 100644
--- a/sendgrid_toolkit.gemspec
+++ b/sendgrid_toolkit.gemspec
@@ -6,7 +6,7 @@
 
 Gem::Specification.new do |s|
   s.name = "sendgrid_toolkit"
-  s.version = "1.7.0"
+  s.version = "1.8.0"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["promoboxx people"]
   s.date = "2014-03-04"
diff --git a/spec/lib/sendgrid_toolkit/v3/bounces_spec.rb b/spec/lib/sendgrid_toolkit/v3/bounces_spec.rb
new file mode 100644
index 0000000..50d65d1
--- /dev/null
+++ b/spec/lib/sendgrid_toolkit/v3/bounces_spec.rb
@@ -0,0 +1,17 @@
+require File.expand_path("#{File.dirname(__FILE__)}/../../../helper")
+
+describe SendgridToolkit::V3::Bounces do
+  before do
+    FakeWeb.clean_registry
+    api_name = ENV['TEST_SMTP_USERNAME'] || 'fakeuser'
+    api_key = ENV['TEST_SMTP_PASSWORD'] || 'fakepass'
+    @obj = SendgridToolkit::V3::Bounces.new("fakeuser", "fakepass")
+  end
+
+  describe "#retrieve" do
+    it "returns array of bounced emails" do
+      FakeWeb.register_uri(:get, "https://#{REGEX_ESCAPED_BASE_URI_V3}/suppressions/bounces", query: {})
+      bounces = @obj.get
+    end
+  end
+end

From 6aa2095c0c4202e2606ae901f36726967ab1d322 Mon Sep 17 00:00:00 2001
From: Joseph Ware <joseph@promoboxx.com>
Date: Wed, 5 Mar 2025 12:56:07 -0500
Subject: [PATCH 19/30] DEV-10737 Add bounces.rb to gemspec (#3)

---
 sendgrid_toolkit.gemspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sendgrid_toolkit.gemspec b/sendgrid_toolkit.gemspec
index 497c160..abe82ec 100644
--- a/sendgrid_toolkit.gemspec
+++ b/sendgrid_toolkit.gemspec
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
     "lib/sendgrid_toolkit/spam_reports.rb",
     "lib/sendgrid_toolkit/statistics.rb",
     "lib/sendgrid_toolkit/unsubscribes.rb",
+    'lib/sendgrid_toolkit/v3/bounces.rb',
     'lib/sendgrid_toolkit/v3/groups.rb',
     'lib/sendgrid_toolkit/v3/unsubscribes.rb',
     'lib/sendgrid_toolkit/v3/abstract_sendgrid_client.rb',

From ad9bcdb97ba5fa731a9be1ba281dec505560b795 Mon Sep 17 00:00:00 2001
From: Joseph Ware <joseph@promoboxx.com>
Date: Wed, 5 Mar 2025 13:11:38 -0500
Subject: [PATCH 20/30] DEV-10737 Update version to 1.9.0 (#4)

---
 .circleci/config.yml     | 2 +-
 sendgrid_toolkit.gemspec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 393158f..c820acf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -55,6 +55,6 @@ jobs:
           command: |
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
               gem build sendgrid_toolkit.gemspec
-              curl -F package=@sendgrid_toolkit-1.8.0.gem https://$GEMFURY_PUSH_TOKEN@push.fury.io/promoboxx/
+              curl -F package=@sendgrid_toolkit-1.9.0.gem https://$GEMFURY_PUSH_TOKEN@push.fury.io/promoboxx/
             fi
 
diff --git a/sendgrid_toolkit.gemspec b/sendgrid_toolkit.gemspec
index abe82ec..5732fc2 100644
--- a/sendgrid_toolkit.gemspec
+++ b/sendgrid_toolkit.gemspec
@@ -6,7 +6,7 @@
 
 Gem::Specification.new do |s|
   s.name = "sendgrid_toolkit"
-  s.version = "1.8.0"
+  s.version = "1.9.0"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["promoboxx people"]
   s.date = "2014-03-04"

From 0a6c5ddcd692892e0ef59f1b60042eba5ecfc0ea Mon Sep 17 00:00:00 2001
From: Joseph Ware <joseph@promoboxx.com>
Date: Thu, 6 Mar 2025 15:56:51 -0500
Subject: [PATCH 21/30] DEV-10737 Update version to 1.10.0. Fix resource path
 for suppression/bounces. Fix api_key issue. (#5)

---
 .circleci/config.yml                                | 2 +-
 lib/sendgrid_toolkit/v3/abstract_sendgrid_client.rb | 6 +++---
 lib/sendgrid_toolkit/v3/bounces.rb                  | 2 +-
 sendgrid_toolkit.gemspec                            | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c820acf..c203dcf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -55,6 +55,6 @@ jobs:
           command: |
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
               gem build sendgrid_toolkit.gemspec
-              curl -F package=@sendgrid_toolkit-1.9.0.gem https://$GEMFURY_PUSH_TOKEN@push.fury.io/promoboxx/
+              curl -F package=@sendgrid_toolkit-1.10.0.gem https://$GEMFURY_PUSH_TOKEN@push.fury.io/promoboxx/
             fi
 
diff --git a/lib/sendgrid_toolkit/v3/abstract_sendgrid_client.rb b/lib/sendgrid_toolkit/v3/abstract_sendgrid_client.rb
index 40dcdaf..2bee649 100644
--- a/lib/sendgrid_toolkit/v3/abstract_sendgrid_client.rb
+++ b/lib/sendgrid_toolkit/v3/abstract_sendgrid_client.rb
@@ -18,7 +18,7 @@ def api_post(action_name, options = {})
         if (@api_user == "apikey")
           response = HTTParserParty.post("#{BASE_URI}/#{action_name}",
             body: options.to_json, format: :json,
-            headers: { 'Authorization' => "Bearer #{api_key}" })
+            headers: { 'Authorization' => "Bearer #{@api_key}" })
         else
           response = HTTParserParty.post("#{BASE_URI}/#{action_name}",
             body: options.to_json, format: :json,
@@ -31,7 +31,7 @@ def api_get(action_name, options = {})
         if (@api_user == "apikey")
           response = HTTParserParty.get("#{BASE_URI}/#{action_name}",
             query: options, format: :json,
-            headers: { 'Authorization' => "Bearer #{api_key}" })
+            headers: { 'Authorization' => "Bearer #{@api_key}" })
         else
           response = HTTParserParty.get("#{BASE_URI}/#{action_name}",
             query: options, format: :json,
@@ -44,7 +44,7 @@ def api_delete(action_name, options = {})
         if (@api_user == "apikey")
           response = HTTParserParty.delete("#{BASE_URI}/#{action_name}",
             body: options, format: :json,
-            headers: { 'Authorization' => "Bearer #{api_key}" })
+            headers: { 'Authorization' => "Bearer #{@api_key}" })
         else
           response = HTTParserParty.delete("#{BASE_URI}/#{action_name}",
             body: options, format: :json,
diff --git a/lib/sendgrid_toolkit/v3/bounces.rb b/lib/sendgrid_toolkit/v3/bounces.rb
index 3709513..12b6b70 100644
--- a/lib/sendgrid_toolkit/v3/bounces.rb
+++ b/lib/sendgrid_toolkit/v3/bounces.rb
@@ -2,7 +2,7 @@ module SendgridToolkit
   module V3
     class Bounces < SendgridToolkit::V3::AbstractSendgridClient
       def get(opts = {})
-        action_name = 'supressions/bounces'
+        action_name = 'suppression/bounces'
         response = api_get(action_name, opts)
         fail(SendgridToolkit::APIError, response['error']) if response.is_a?(Hash) && response.key?('errors')
         response
diff --git a/sendgrid_toolkit.gemspec b/sendgrid_toolkit.gemspec
index 5732fc2..52a4d02 100644
--- a/sendgrid_toolkit.gemspec
+++ b/sendgrid_toolkit.gemspec
@@ -6,7 +6,7 @@
 
 Gem::Specification.new do |s|
   s.name = "sendgrid_toolkit"
-  s.version = "1.9.0"
+  s.version = "1.10.0"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["promoboxx people"]
   s.date = "2014-03-04"

From 8cf0d05488a12be410233dcbaa984f561ae5f32c Mon Sep 17 00:00:00 2001
From: Joseph Ware <joseph@promoboxx.com>
Date: Mon, 8 Dec 2025 10:54:04 -0500
Subject: [PATCH 22/30] DEV-11922 Add V3 /mail/send endpoint (#6)

---
 .circleci/config.yml                      |  2 +-
 lib/sendgrid_toolkit.rb                   |  1 +
 lib/sendgrid_toolkit/v3/mail.rb           | 20 +++++++++++++++++
 sendgrid_toolkit.gemspec                  |  3 ++-
 spec/lib/sendgrid_toolkit/mail_spec.rb    |  2 +-
 spec/lib/sendgrid_toolkit/v3/mail_spec.rb | 26 +++++++++++++++++++++++
 6 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 lib/sendgrid_toolkit/v3/mail.rb
 create mode 100644 spec/lib/sendgrid_toolkit/v3/mail_spec.rb

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c203dcf..9daecda 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -55,6 +55,6 @@ jobs:
           command: |
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
               gem build sendgrid_toolkit.gemspec
-              curl -F package=@sendgrid_toolkit-1.10.0.gem https://$GEMFURY_PUSH_TOKEN@push.fury.io/promoboxx/
+              curl -F package=@sendgrid_toolkit-1.11.0.gem https://$GEMFURY_PUSH_TOKEN@push.fury.io/promoboxx/
             fi
 
diff --git a/lib/sendgrid_toolkit.rb b/lib/sendgrid_toolkit.rb
index f225bf1..3abd768 100644
--- a/lib/sendgrid_toolkit.rb
+++ b/lib/sendgrid_toolkit.rb
@@ -15,6 +15,7 @@
 require 'sendgrid_toolkit/v3/abstract_sendgrid_client'
 require 'sendgrid_toolkit/v3/bounces'
 require 'sendgrid_toolkit/v3/groups'
+require 'sendgrid_toolkit/v3/mail'
 require 'sendgrid_toolkit/v3/unsubscribes'
 
 require 'sendgrid_toolkit/newsletter/newsletter_sendgrid_client'
diff --git a/lib/sendgrid_toolkit/v3/mail.rb b/lib/sendgrid_toolkit/v3/mail.rb
new file mode 100644
index 0000000..41a062e
--- /dev/null
+++ b/lib/sendgrid_toolkit/v3/mail.rb
@@ -0,0 +1,20 @@
+require 'json'
+
+module SendgridToolkit
+  module V3
+    class Mail < SendgridToolkit::V3::AbstractSendgridClient
+      def send_mail(options = {})
+        response = api_post('mail/send', convert_params(options))
+        raise(SendEmailError, "SendMail API refused to send email: #{response["errors"].inspect}") if response["message"] == "error"
+        response
+      end
+
+      private
+
+      def convert_params(options)
+        options["x-smtpapi"] = options["x-smtpapi"].to_json if options.has_key?("x-smtpapi")
+        options
+      end
+    end
+  end
+end
diff --git a/sendgrid_toolkit.gemspec b/sendgrid_toolkit.gemspec
index 52a4d02..c61fbd3 100644
--- a/sendgrid_toolkit.gemspec
+++ b/sendgrid_toolkit.gemspec
@@ -6,7 +6,7 @@
 
 Gem::Specification.new do |s|
   s.name = "sendgrid_toolkit"
-  s.version = "1.10.0"
+  s.version = "1.11.0"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["promoboxx people"]
   s.date = "2014-03-04"
@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
     "lib/sendgrid_toolkit/unsubscribes.rb",
     'lib/sendgrid_toolkit/v3/bounces.rb',
     'lib/sendgrid_toolkit/v3/groups.rb',
+    'lib/sendgrid_toolkit/v3/mail.rb',
     'lib/sendgrid_toolkit/v3/unsubscribes.rb',
     'lib/sendgrid_toolkit/v3/abstract_sendgrid_client.rb',
     "sendgrid_toolkit.gemspec",
diff --git a/spec/lib/sendgrid_toolkit/mail_spec.rb b/spec/lib/sendgrid_toolkit/mail_spec.rb
index 969fb10..06fdf68 100644
--- a/spec/lib/sendgrid_toolkit/mail_spec.rb
+++ b/spec/lib/sendgrid_toolkit/mail_spec.rb
@@ -6,7 +6,7 @@
     @obj = SendgridToolkit::Mail.new("fakeuser", "fakepass")
   end
 
-  describe "#send" do
+  describe "#send_mail" do
     it "raises error when sendgrid returns an error" do
       FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/mail\.send\.json|, :body => '{"message": "error", "errors": ["Missing destination email"]}')
       lambda {
diff --git a/spec/lib/sendgrid_toolkit/v3/mail_spec.rb b/spec/lib/sendgrid_toolkit/v3/mail_spec.rb
new file mode 100644
index 0000000..d8146b1
--- /dev/null
+++ b/spec/lib/sendgrid_toolkit/v3/mail_spec.rb
@@ -0,0 +1,26 @@
+require File.expand_path("#{File.dirname(__FILE__)}/../../../helper")
+
+describe SendgridToolkit::V3::Bounces do
+  before do
+    FakeWeb.clean_registry
+    api_name = ENV['TEST_SMTP_USERNAME'] || 'fakeuser'
+    api_key = ENV['TEST_SMTP_PASSWORD'] || 'fakepass'
+    @obj = SendgridToolkit::V3::Bounces.new("fakeuser", "fakepass")
+  end
+
+  describe "#send_mail" do
+    it "raises error when sendgrid returns an error" do
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI_V3}/mail/send|, :body => '{"message": "error", "errors": ["Missing destination email"]}')
+      lambda {
+        response = @obj.send_mail :from => "testing@fiverr.com", :subject => "Subject", :text => "Text", "x-smtpapi" => {:category => "Testing", :to => ["elad@fiverr.com"]}
+      }.should raise_error SendgridToolkit::SendEmailError
+    end
+
+    it "posts x-smtpapi parameters as json" do
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI_V3}/mail/send|, :body => '{"message":"success"}')
+      xsmtpapi = {:category => "Testing", :to => ["scottb@sendgrid.com"]}
+      response = @obj.send_mail :to => "scottb@sendgrid.com", :from => "testing@fiverr.com", :subject => "Subject", :text => "Text", "x-smtpapi" => xsmtpapi
+      response.request.options[:body]["x-smtpapi"].should == xsmtpapi.to_json
+    end
+  end
+end

From 464523b82771d4fa5e0bedb173a83956f0a5ff30 Mon Sep 17 00:00:00 2001
From: Joseph Ware <joseph@promoboxx.com>
Date: Fri, 12 Dec 2025 08:43:09 -0500
Subject: [PATCH 23/30] Setup docker for local development and cleanup files
 (#7)

---
 .rvmrc                     |   3 ---
 .travis.yml                |   6 ------
 Dockerfile                 |  35 +++++++++++++++++++++++++++++++++++
 Gemfile                    |  11 ++++++-----
 Gemfile.lock               |  14 +++++++++++---
 VERSION                    |   2 +-
 docker-compose.yml         |   9 +++++++++
 sendgrid_toolkit-1.4.0.gem | Bin 18944 -> 0 bytes
 sendgrid_toolkit.gemspec   |   6 +++---
 spec/helper.rb             |   1 +
 10 files changed, 66 insertions(+), 21 deletions(-)
 delete mode 100644 .rvmrc
 delete mode 100644 .travis.yml
 create mode 100644 Dockerfile
 create mode 100644 docker-compose.yml
 delete mode 100644 sendgrid_toolkit-1.4.0.gem

diff --git a/.rvmrc b/.rvmrc
deleted file mode 100644
index 25649f7..0000000
--- a/.rvmrc
+++ /dev/null
@@ -1,3 +0,0 @@
-export RUBYOPT="rubygems"
-export RUBYLIB="."
-rvm 1.9.3@sendgrid_toolkit --create
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 28cf207..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.3
-  - jruby-19mode
-  - 2.0.0
-  - 2.1.0
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..9df8708
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,35 @@
+FROM pbxx/docker-passenger-ruby-base:ruby-2.7.6-latest
+
+ARG FOO=bar
+
+USER root
+
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends --fix-missing \
+      wget \
+      nano \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
+
+# Switch to the app user for app installation
+USER app
+
+# Define where our application will live inside the image
+ENV HOMEDIR /home/app/
+WORKDIR $HOMEDIR/sendgrid_toolkit
+
+# Set environment
+ENV RUBYOPT='-W:no-deprecated -W:no-experimental'
+
+COPY --chown=app:app . .
+
+# Install rubygems and bundler
+RUN rm -rf .bundle
+RUN gem update --system 3.4.22
+RUN gem install bundler -v 2.4.22
+
+# Install gems
+ARG CACHEBUST
+RUN bundle install --full-index
+
+USER root
diff --git a/Gemfile b/Gemfile
index f5dbd29..1fbc263 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,13 +3,14 @@ source "http://rubygems.org"
 gem "httparty", ">= 0.7.6"
 
 group :development do
-  gem "fakeweb", "~> 1.3.0"
-  gem "jeweler"
-  gem "rspec", "~> 2.7.0"
-  gem 'pry', '~> 0.10.3'
+  gem 'fakeweb', '~> 1.3.0'
+  gem 'jeweler'
+  gem 'rspec'
+  gem 'pry'
+  gem 'pry-byebug'
   gem 'rspec_junit_formatter'
 end
 
 group :test do
   gem 'rspec_junit_formatter'
-end
\ No newline at end of file
+end
diff --git a/Gemfile.lock b/Gemfile.lock
index 38b15f9..147dafa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,6 +3,7 @@ GEM
   specs:
     addressable (2.4.0)
     builder (3.2.4)
+    byebug (11.1.3)
     coderay (1.1.3)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
@@ -55,6 +56,9 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    pry-byebug (3.8.0)
+      byebug (~> 11.0)
+      pry (~> 0.10)
     psych (3.1.0)
     rack (2.2.8)
     rake (13.1.0)
@@ -68,6 +72,8 @@ GEM
     rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.7.0)
+    rspec_junit_formatter (0.6.0)
+      rspec-core (>= 2, < 4, != 2.12.0)
     semver2 (3.4.2)
     slop (3.6.0)
     thread_safe (0.3.6)
@@ -80,8 +86,10 @@ DEPENDENCIES
   fakeweb (~> 1.3.0)
   httparty (>= 0.7.6)
   jeweler
-  pry (~> 0.10.3)
-  rspec (~> 2.7.0)
+  pry
+  pry-byebug
+  rspec
+  rspec_junit_formatter
 
 BUNDLED WITH
-   2.3.27
\ No newline at end of file
+   2.3.27
diff --git a/VERSION b/VERSION
index e21e727..1cac385 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.4.0
\ No newline at end of file
+1.11.0
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..bb045c7
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,9 @@
+version: '3.4'
+services:
+  sendgrid_toolkit:
+    build:
+      context: .
+    environment:
+      RUBY_OPT: -W:no-deprecated -W:no-experimental
+    volumes:
+      - .:/home/app/sendgrid_toolkit
diff --git a/sendgrid_toolkit-1.4.0.gem b/sendgrid_toolkit-1.4.0.gem
deleted file mode 100644
index 719f452eb55ad16002960a53f0ef1656a3630ae0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18944
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

diff --git a/sendgrid_toolkit.gemspec b/sendgrid_toolkit.gemspec
index c61fbd3..c97c4d4 100644
--- a/sendgrid_toolkit.gemspec
+++ b/sendgrid_toolkit.gemspec
@@ -2,14 +2,14 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: sendgrid_toolkit 1.4.0 ruby lib
+# stub: sendgrid_toolkit 1.11.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "sendgrid_toolkit"
   s.version = "1.11.0"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["promoboxx people"]
-  s.date = "2014-03-04"
+  s.date = Time.now.strftime("%Y-%m-%d")
   s.description = "A Ruby wrapper and utility library for communicating with the Sendgrid API."
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -63,7 +63,7 @@ Gem::Specification.new do |s|
   ]
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.11"
+  s.rubygems_version = "2.3.27"
   s.summary = "sendgrid_toolkit = Sendgrid + Ruby"
 
   if s.respond_to? :specification_version then
diff --git a/spec/helper.rb b/spec/helper.rb
index 4f9070d..b2028f4 100644
--- a/spec/helper.rb
+++ b/spec/helper.rb
@@ -2,6 +2,7 @@
 require 'sendgrid_toolkit'
 require 'rspec'
 require 'json'
+require 'pry'
 
 FakeWeb.allow_net_connect = false
 

From a1b19ac17360a9abf20bfd32893bacec1f6f6257 Mon Sep 17 00:00:00 2001
From: Joseph Ware <joseph@promoboxx.com>
Date: Fri, 12 Dec 2025 10:18:56 -0500
Subject: [PATCH 24/30] Cleanup gemspec file (#11)

---
 sendgrid_toolkit.gemspec | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sendgrid_toolkit.gemspec b/sendgrid_toolkit.gemspec
index c97c4d4..9f7e7aa 100644
--- a/sendgrid_toolkit.gemspec
+++ b/sendgrid_toolkit.gemspec
@@ -16,8 +16,6 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
-    ".rvmrc",
-    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",

From f547e9cff5b635bcfdd6089b75e210255bebb767 Mon Sep 17 00:00:00 2001
From: Joseph Ware <joseph@promoboxx.com>
Date: Fri, 12 Dec 2025 10:49:58 -0500
Subject: [PATCH 25/30] Add workflow with separate test, build, approval and
 upload steps (#10)

---
 .circleci/config.yml | 65 ++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 60 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9daecda..2a2f522 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,6 +1,6 @@
 version: 2
 jobs:
-  build:
+  test:
     parallelism: 1
     docker:
       - image: circleci/ruby:2.3
@@ -49,12 +49,67 @@ jobs:
       - store_test_results:
           path: test_results
 
+  build:
+    parallelism: 1
+    docker:
+      - image: circleci/ruby:2.3
+    working_directory: ~/pbxx
+    steps:
+      - checkout
+      
+      - restore_cache:
+          keys:
+            - ruby-cache-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile" }}-{{ checksum "sendgrid_toolkit.gemspec" }}
+
+      - run:
+          name: Build gem
+          context: gem
+          command: |
+            gem build sendgrid_toolkit.gemspec
+
+      - save_cache:
+          key: ruby-cache-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile" }}-{{ checksum "sendgrid_toolkit.gemspec" }}-build
+          paths:
+            - .
+
+  upload:
+    parallelism: 1
+    docker:
+      - image: circleci/ruby:2.3
+    working_directory: ~/pbxx
+    steps:
+      - checkout
+
+      - restore_cache:
+          keys:
+            - ruby-cache-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile" }}-{{ checksum "sendgrid_toolkit.gemspec" }}-build
+
       - run:
           name: Upload to Gemfury
           context: gem
           command: |
-            if [ "${CIRCLE_BRANCH}" == "master" ]; then
-              gem build sendgrid_toolkit.gemspec
-              curl -F package=@sendgrid_toolkit-1.11.0.gem https://$GEMFURY_PUSH_TOKEN@push.fury.io/promoboxx/
-            fi
+            curl -F package=@sendgrid_toolkit-1.11.0.gem https://$GEMFURY_PUSH_TOKEN@push.fury.io/promoboxx/
+
+workflows:
+  version: 2
+  build_and_upload:
+    jobs:
+      - test
+      - build:
+          requires:
+            - test
+      - ready_to_upload:
+          type: approval
+          requires:
+            - build
+          filters:
+            branches:
+              only: master
+      - upload:
+          requires:
+            - ready_to_upload
+          filters:
+            branches:
+              only: master
+
 

From 33b7dfad8c5346a78ddb538c223c121eac1215ea Mon Sep 17 00:00:00 2001
From: Joseph Ware <joseph@promoboxx.com>
Date: Fri, 12 Dec 2025 11:06:31 -0500
Subject: [PATCH 26/30] DEV-11922 Fix V3 tests (#8)

---
 lib/sendgrid_toolkit/v3/bounces.rb            |  4 +--
 lib/sendgrid_toolkit/v3/unsubscribes.rb       |  6 ++--
 spec/helper.rb                                |  2 +-
 .../v3/abstract_sendgrid_client_spec.rb       | 28 +++++++++----------
 spec/lib/sendgrid_toolkit/v3/bounces_spec.rb  |  6 ++--
 spec/lib/sendgrid_toolkit/v3/groups_spec.rb   |  2 +-
 spec/lib/sendgrid_toolkit/v3/mail_spec.rb     | 12 ++++----
 .../sendgrid_toolkit/v3/unsubscribes_spec.rb  |  6 ++--
 8 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/lib/sendgrid_toolkit/v3/bounces.rb b/lib/sendgrid_toolkit/v3/bounces.rb
index 12b6b70..2d074b8 100644
--- a/lib/sendgrid_toolkit/v3/bounces.rb
+++ b/lib/sendgrid_toolkit/v3/bounces.rb
@@ -1,9 +1,9 @@
 module SendgridToolkit
   module V3
     class Bounces < SendgridToolkit::V3::AbstractSendgridClient
-      def get(opts = {})
+      def get(options = {})
         action_name = 'suppression/bounces'
-        response = api_get(action_name, opts)
+        response = api_get(action_name, options)
         fail(SendgridToolkit::APIError, response['error']) if response.is_a?(Hash) && response.key?('errors')
         response
       end
diff --git a/lib/sendgrid_toolkit/v3/unsubscribes.rb b/lib/sendgrid_toolkit/v3/unsubscribes.rb
index 2931734..afb8bb6 100644
--- a/lib/sendgrid_toolkit/v3/unsubscribes.rb
+++ b/lib/sendgrid_toolkit/v3/unsubscribes.rb
@@ -4,7 +4,7 @@ class Unsubscribes < SendgridToolkit::V3::AbstractSendgridClient
       def add(options = {})
         fail NoGroupIdSpecified unless options[:group_id]
 
-        response = api_post("groups/#{options[:group_id]}/suppressions", options)
+        response = api_post("asm/groups/#{options[:group_id]}/suppressions", options)
         fail APIError if response.is_a?(Hash) && response.key?('errors')
         response
       end
@@ -12,7 +12,7 @@ def add(options = {})
       def delete(options = {})
         fail NoGroupIdSpecified unless options[:group_id]
 
-        response = api_delete("groups/#{options[:group_id]}/suppressions/#{options[:email]}", options)
+        response = api_delete("asm/groups/#{options[:group_id]}/suppressions/#{options[:email]}", options)
         fail APIError if response.is_a?(Hash) && response.key?('errors')
         response
       end
@@ -20,7 +20,7 @@ def delete(options = {})
       def retrieve(options = {})
         fail NoGroupIdSpecified unless options[:group_id]
 
-        response = api_get("groups/#{options[:group_id]}/suppressions", options)
+        response = api_get("asm.groups/#{options[:group_id]}/suppressions", options)
         response
       end
     end
diff --git a/spec/helper.rb b/spec/helper.rb
index b2028f4..67bee3b 100644
--- a/spec/helper.rb
+++ b/spec/helper.rb
@@ -7,7 +7,7 @@
 FakeWeb.allow_net_connect = false
 
 REGEX_ESCAPED_BASE_URI = "api\.sendgrid\.com/api"
-REGEX_ESCAPED_BASE_URI_V3 = 'api.sendgrid.com/v3/asm'
+REGEX_ESCAPED_BASE_URI_V3 = "api.sendgrid.com/v3"
 
 def backup_env
   @env_backup = Hash.new
diff --git a/spec/lib/sendgrid_toolkit/v3/abstract_sendgrid_client_spec.rb b/spec/lib/sendgrid_toolkit/v3/abstract_sendgrid_client_spec.rb
index fd057e3..5718958 100644
--- a/spec/lib/sendgrid_toolkit/v3/abstract_sendgrid_client_spec.rb
+++ b/spec/lib/sendgrid_toolkit/v3/abstract_sendgrid_client_spec.rb
@@ -10,32 +10,32 @@
 
   describe '#api_post' do
     it "throws error when authentication fails" do
-      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI_V3}/profile\.get\.json\?|, :body => '{"error":{"code":401,"message":"Permission denied, wrong credentials"}}')
-      @obj = SendgridToolkit::AbstractSendgridClient.new("fakeuser", "fakepass")
+      FakeWeb.register_uri(:get, "https://#{REGEX_ESCAPED_BASE_URI_V3}/user/profile", :body => '{"error":{"code":401,"message":"Permission denied, wrong credentials"}}')
+      @obj = SendgridToolkit::V3::AbstractSendgridClient.new("apikey", "fakepass")
       lambda {
-        @obj.send(:api_post, "profile", "get", {})
+        @obj.send(:api_get, "user/profile", {})
       }.should raise_error SendgridToolkit::AuthenticationFailed
     end
     it "thows error when sendgrid response is a server error" do
-      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI_V3}/profile\.get\.json\?|, :body => '{}', :status => ['500', 'Internal Server Error'])
-      @obj = SendgridToolkit::AbstractSendgridClient.new("someuser", "somepass")
+      FakeWeb.register_uri(:get, "https://#{REGEX_ESCAPED_BASE_URI_V3}/user/profile", :body => '{}', :status => ['500', 'Internal Server Error'])
+      @obj = SendgridToolkit::V3::AbstractSendgridClient.new("apikey", "fakepass")
       lambda {
-        @obj.send(:api_post, "profile", "get", {})
-      }.should raise_error SendgridToolkit::AuthenticationFailed
+        @obj.send(:api_get, "user/profile", {})
+      }.should raise_error SendgridToolkit::SendgridServerError
     end
     it "handles unexpected error responses gracefully" do
-      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/profile\.get\.json|, :body => '<html>Html formatted error</html>', :status => ['500', 'Internal Server Error'])
-      @obj = SendgridToolkit::AbstractSendgridClient.new("someuser", "somepass")
+      FakeWeb.register_uri(:get, "https://#{REGEX_ESCAPED_BASE_URI_V3}/user/profile", :body => '<html>Html formatted error</html>', :status => ['500', 'Internal Server Error'])
+      @obj = SendgridToolkit::V3::AbstractSendgridClient.new("apikey", "fakepass")
       lambda {
-        @obj.send(:api_post, "profile", "get", {})
+        @obj.send(:api_get, "user/profile", {})
       }.should raise_error SendgridToolkit::SendgridServerError, /<html>Html formatted error<\/html> - SendgridToolkit warning/
     end
     it "thows error when sendgrid response is an API error" do
-      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI_V3}/stats\.get\.json\?|, :body => '{"error": "error in end_date: end date is in the future"}', :status => ['400', 'Bad Request'])
-      @obj = SendgridToolkit::AbstractSendgridClient.new("someuser", "somepass")
+      FakeWeb.register_uri(:get, "https://#{REGEX_ESCAPED_BASE_URI_V3}/stats", :body => '{"error": "error in end_date: end date is in the future"}', :status => ['400', 'Bad Request'])
+      @obj = SendgridToolkit::V3::AbstractSendgridClient.new("apikey", "fakepass")
       lambda {
-        @obj.send(:api_post, "stats", "get", {})
-      }.should raise_error SendgridToolkit::SendgridServerError
+        @obj.send(:api_get, "stats", {})
+      }.should raise_error SendgridToolkit::APIError
     end
   end
 
diff --git a/spec/lib/sendgrid_toolkit/v3/bounces_spec.rb b/spec/lib/sendgrid_toolkit/v3/bounces_spec.rb
index 50d65d1..89ebf60 100644
--- a/spec/lib/sendgrid_toolkit/v3/bounces_spec.rb
+++ b/spec/lib/sendgrid_toolkit/v3/bounces_spec.rb
@@ -3,14 +3,14 @@
 describe SendgridToolkit::V3::Bounces do
   before do
     FakeWeb.clean_registry
-    api_name = ENV['TEST_SMTP_USERNAME'] || 'fakeuser'
+    api_name = ENV['TEST_SMTP_USERNAME'] || 'apikey'
     api_key = ENV['TEST_SMTP_PASSWORD'] || 'fakepass'
-    @obj = SendgridToolkit::V3::Bounces.new("fakeuser", "fakepass")
+    @obj = SendgridToolkit::V3::Bounces.new(api_name, api_key)
   end
 
   describe "#retrieve" do
     it "returns array of bounced emails" do
-      FakeWeb.register_uri(:get, "https://#{REGEX_ESCAPED_BASE_URI_V3}/suppressions/bounces", query: {})
+      FakeWeb.register_uri(:get, "https://#{REGEX_ESCAPED_BASE_URI_V3}/suppression/bounces", query: {})
       bounces = @obj.get
     end
   end
diff --git a/spec/lib/sendgrid_toolkit/v3/groups_spec.rb b/spec/lib/sendgrid_toolkit/v3/groups_spec.rb
index 4010ea5..a6c2055 100644
--- a/spec/lib/sendgrid_toolkit/v3/groups_spec.rb
+++ b/spec/lib/sendgrid_toolkit/v3/groups_spec.rb
@@ -3,7 +3,7 @@
 describe SendgridToolkit::V3::Groups do
   before do
     FakeWeb.clean_registry
-    api_name = ENV['TEST_SMTP_USERNAME'] || 'fakeuser'
+    api_name = ENV['TEST_SMTP_USERNAME'] || 'apikey'
     api_key = ENV['TEST_SMTP_PASSWORD'] || 'fakepass'
     @obj = SendgridToolkit::V3::Groups.new(api_name, api_key)
   end
diff --git a/spec/lib/sendgrid_toolkit/v3/mail_spec.rb b/spec/lib/sendgrid_toolkit/v3/mail_spec.rb
index d8146b1..cb37c0d 100644
--- a/spec/lib/sendgrid_toolkit/v3/mail_spec.rb
+++ b/spec/lib/sendgrid_toolkit/v3/mail_spec.rb
@@ -1,26 +1,26 @@
 require File.expand_path("#{File.dirname(__FILE__)}/../../../helper")
 
-describe SendgridToolkit::V3::Bounces do
+describe SendgridToolkit::V3::Mail do
   before do
     FakeWeb.clean_registry
-    api_name = ENV['TEST_SMTP_USERNAME'] || 'fakeuser'
+    api_name = ENV['TEST_SMTP_USERNAME'] || 'apikey'
     api_key = ENV['TEST_SMTP_PASSWORD'] || 'fakepass'
-    @obj = SendgridToolkit::V3::Bounces.new("fakeuser", "fakepass")
+    @obj = SendgridToolkit::V3::Mail.new(api_name, api_key)
   end
 
   describe "#send_mail" do
     it "raises error when sendgrid returns an error" do
-      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI_V3}/mail/send|, :body => '{"message": "error", "errors": ["Missing destination email"]}')
+      FakeWeb.register_uri(:post, "https://#{REGEX_ESCAPED_BASE_URI_V3}/mail/send", :body => '{"message": "error", "errors": ["Missing destination email"]}')
       lambda {
         response = @obj.send_mail :from => "testing@fiverr.com", :subject => "Subject", :text => "Text", "x-smtpapi" => {:category => "Testing", :to => ["elad@fiverr.com"]}
       }.should raise_error SendgridToolkit::SendEmailError
     end
 
     it "posts x-smtpapi parameters as json" do
-      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI_V3}/mail/send|, :body => '{"message":"success"}')
+      FakeWeb.register_uri(:post, "https://#{REGEX_ESCAPED_BASE_URI_V3}/mail/send", :body => '{"message":"success"}')
       xsmtpapi = {:category => "Testing", :to => ["scottb@sendgrid.com"]}
       response = @obj.send_mail :to => "scottb@sendgrid.com", :from => "testing@fiverr.com", :subject => "Subject", :text => "Text", "x-smtpapi" => xsmtpapi
-      response.request.options[:body]["x-smtpapi"].should == xsmtpapi.to_json
+      JSON.parse(response.request.options[:body])["x-smtpapi"].should == xsmtpapi.to_json
     end
   end
 end
diff --git a/spec/lib/sendgrid_toolkit/v3/unsubscribes_spec.rb b/spec/lib/sendgrid_toolkit/v3/unsubscribes_spec.rb
index be9abc6..42aee2e 100644
--- a/spec/lib/sendgrid_toolkit/v3/unsubscribes_spec.rb
+++ b/spec/lib/sendgrid_toolkit/v3/unsubscribes_spec.rb
@@ -3,7 +3,7 @@
 describe SendgridToolkit::V3::Unsubscribes do
   before do
     FakeWeb.clean_registry
-    api_name = ENV['TEST_SMTP_USERNAME'] || 'fakeuser'
+    api_name = ENV['TEST_SMTP_USERNAME'] || 'apikey'
     api_key = ENV['TEST_SMTP_PASSWORD'] || 'fakepass'
     @obj = SendgridToolkit::V3::Unsubscribes.new(api_name, api_key)
   end
@@ -21,12 +21,12 @@
 
   describe '#add' do
     xit 'raises no errors on success' do
-      FakeWeb.register_uri(:post, "https://#{REGEX_ESCAPED_BASE_URI_V3}/suppressions/global",
+      FakeWeb.register_uri(:post, "https://#{REGEX_ESCAPED_BASE_URI_V3}/asm/suppressions/global",
                            body: '{"recipient_emails":[{"user@domain.com"}]}')
       -> { @obj.add(recipient_emails: ['user@domain.com']) }.should_not raise_error
     end
     xit 'not raises error when email already exists' do
-      FakeWeb.register_uri(:post, "https://#{REGEX_ESCAPED_BASE_URI_V3}/suppressions/global",
+      FakeWeb.register_uri(:post, "https://#{REGEX_ESCAPED_BASE_URI_V3}/asm/suppressions/global",
                            body: '{"recipient_emails":[{"user@domain.com"}]}')
       -> { @obj.add(recipient_emails: ['user@domain.com']) }.should_not raise_error
     end

From 0c328ccac72d2cba3730372e0c1a5a51abb51078 Mon Sep 17 00:00:00 2001
From: Joseph Ware <joseph@promoboxx.com>
Date: Fri, 12 Dec 2025 11:12:40 -0500
Subject: [PATCH 27/30] Test and build against Ruby 2.7.6 (#9)

---
 .circleci/config.yml | 13 +++++++------
 .ruby-version        |  1 +
 Gemfile              |  2 ++
 Gemfile.lock         |  5 ++++-
 4 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 .ruby-version

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2a2f522..5fb152d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,8 @@ jobs:
   test:
     parallelism: 1
     docker:
-      - image: circleci/ruby:2.3
+      - image: ruby:2.7.6
+
     working_directory: ~/pbxx
     steps:
       - checkout
@@ -22,11 +23,11 @@ jobs:
 
       - run:
           name: Update RubyGems
-          command: sudo gem update --system 3.3.25
+          command: gem update --system 3.4.22
 
       - run:
           name: Install bundler
-          command: gem install bundler
+          command: gem install bundler -v 2.4.22
 
       - run:
           name: Configure bundler
@@ -52,11 +53,11 @@ jobs:
   build:
     parallelism: 1
     docker:
-      - image: circleci/ruby:2.3
+      - image: ruby:2.7.6
     working_directory: ~/pbxx
     steps:
       - checkout
-      
+
       - restore_cache:
           keys:
             - ruby-cache-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile" }}-{{ checksum "sendgrid_toolkit.gemspec" }}
@@ -75,7 +76,7 @@ jobs:
   upload:
     parallelism: 1
     docker:
-      - image: circleci/ruby:2.3
+      - image: ruby:2.7.6
     working_directory: ~/pbxx
     steps:
       - checkout
diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 0000000..49cdd66
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+2.7.6
diff --git a/Gemfile b/Gemfile
index 1fbc263..86f8913 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,7 @@
 source "http://rubygems.org"
 
+ruby file: ".ruby-version"
+
 gem "httparty", ">= 0.7.6"
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 147dafa..583a46a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -91,5 +91,8 @@ DEPENDENCIES
   rspec
   rspec_junit_formatter
 
+RUBY VERSION
+   ruby 2.7.6p219
+
 BUNDLED WITH
-   2.3.27
+   2.4.22

From 96ff7981903f9caf5f87fb4cef7732e2dbf8b1e3 Mon Sep 17 00:00:00 2001
From: Joseph Ware <joseph@promoboxx.com>
Date: Mon, 22 Dec 2025 12:27:54 -0500
Subject: [PATCH 28/30] DEV-11922 Set content-type on V3 post calls. Handle
 HTTParty::Response with errors (#12)

---
 lib/sendgrid_toolkit/v3/abstract_sendgrid_client.rb | 4 ++--
 lib/sendgrid_toolkit/v3/bounces.rb                  | 2 +-
 lib/sendgrid_toolkit/v3/groups.rb                   | 6 +++---
 lib/sendgrid_toolkit/v3/mail.rb                     | 2 +-
 lib/sendgrid_toolkit/v3/unsubscribes.rb             | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/sendgrid_toolkit/v3/abstract_sendgrid_client.rb b/lib/sendgrid_toolkit/v3/abstract_sendgrid_client.rb
index 2bee649..78ecaa3 100644
--- a/lib/sendgrid_toolkit/v3/abstract_sendgrid_client.rb
+++ b/lib/sendgrid_toolkit/v3/abstract_sendgrid_client.rb
@@ -18,11 +18,11 @@ def api_post(action_name, options = {})
         if (@api_user == "apikey")
           response = HTTParserParty.post("#{BASE_URI}/#{action_name}",
             body: options.to_json, format: :json,
-            headers: { 'Authorization' => "Bearer #{@api_key}" })
+            headers: { 'Content-Type' => 'application/json', 'Authorization' => "Bearer #{@api_key}" })
         else
           response = HTTParserParty.post("#{BASE_URI}/#{action_name}",
             body: options.to_json, format: :json,
-            headers: { 'Authorization' => "Basic #{credentials}" })
+            headers: { 'Content-Type' => 'application/json', 'Authorization' => "Basic #{credentials}" })
         end
         check_response(response)
       end
diff --git a/lib/sendgrid_toolkit/v3/bounces.rb b/lib/sendgrid_toolkit/v3/bounces.rb
index 2d074b8..842b734 100644
--- a/lib/sendgrid_toolkit/v3/bounces.rb
+++ b/lib/sendgrid_toolkit/v3/bounces.rb
@@ -4,7 +4,7 @@ class Bounces < SendgridToolkit::V3::AbstractSendgridClient
       def get(options = {})
         action_name = 'suppression/bounces'
         response = api_get(action_name, options)
-        fail(SendgridToolkit::APIError, response['error']) if response.is_a?(Hash) && response.key?('errors')
+        fail(SendgridToolkit::APIError, response['error']) if response.key?('errors')
         response
       end
     end
diff --git a/lib/sendgrid_toolkit/v3/groups.rb b/lib/sendgrid_toolkit/v3/groups.rb
index 6420c0b..c77f8db 100644
--- a/lib/sendgrid_toolkit/v3/groups.rb
+++ b/lib/sendgrid_toolkit/v3/groups.rb
@@ -3,14 +3,14 @@ module V3
     class Groups < SendgridToolkit::V3::AbstractSendgridClient
       def add(options = {})
         response = api_post('groups', options)
-        fail GroupsError if response.is_a?(Hash) && response.key?('errors')
+        fail GroupsError if response.key?('errors')
         response
       end
 
       def get(group_id = nil)
         action_name = 'groups' + (group_id ? "/#{group_id}" : '')
         response = api_get(action_name)
-        fail GroupsError if response.is_a?(Hash) && response.key?('errors')
+        fail GroupsError if response.key?('errors')
         response
       end
 
@@ -18,7 +18,7 @@ def delete(options = {})
         fail NoGroupIdSpecified unless options[:group_id]
 
         response = api_delete("groups/#{options[:group_id]}")
-        fail GroupsError if response.is_a?(Hash) && response.key?('errors')
+        fail GroupsError if response.key?('errors')
         response
       end
     end
diff --git a/lib/sendgrid_toolkit/v3/mail.rb b/lib/sendgrid_toolkit/v3/mail.rb
index 41a062e..557ec57 100644
--- a/lib/sendgrid_toolkit/v3/mail.rb
+++ b/lib/sendgrid_toolkit/v3/mail.rb
@@ -5,7 +5,7 @@ module V3
     class Mail < SendgridToolkit::V3::AbstractSendgridClient
       def send_mail(options = {})
         response = api_post('mail/send', convert_params(options))
-        raise(SendEmailError, "SendMail API refused to send email: #{response["errors"].inspect}") if response["message"] == "error"
+        fail(SendgridToolkit::SendEmailError, response['error']) if response.key?('errors')
         response
       end
 
diff --git a/lib/sendgrid_toolkit/v3/unsubscribes.rb b/lib/sendgrid_toolkit/v3/unsubscribes.rb
index afb8bb6..e522245 100644
--- a/lib/sendgrid_toolkit/v3/unsubscribes.rb
+++ b/lib/sendgrid_toolkit/v3/unsubscribes.rb
@@ -5,7 +5,7 @@ def add(options = {})
         fail NoGroupIdSpecified unless options[:group_id]
 
         response = api_post("asm/groups/#{options[:group_id]}/suppressions", options)
-        fail APIError if response.is_a?(Hash) && response.key?('errors')
+        fail APIError if response.key?('errors')
         response
       end
 
@@ -13,7 +13,7 @@ def delete(options = {})
         fail NoGroupIdSpecified unless options[:group_id]
 
         response = api_delete("asm/groups/#{options[:group_id]}/suppressions/#{options[:email]}", options)
-        fail APIError if response.is_a?(Hash) && response.key?('errors')
+        fail APIError if response.key?('errors')
         response
       end
 

From 79ce2c4fb093af1611c9bd78efcfe6fa6f1bb014 Mon Sep 17 00:00:00 2001
From: Joseph Ware <joseph@promoboxx.com>
Date: Mon, 22 Dec 2025 12:45:04 -0500
Subject: [PATCH 29/30] DEV-11922 Updater version to 1.12.0 (#13)

---
 .circleci/config.yml     | 2 +-
 VERSION                  | 2 +-
 sendgrid_toolkit.gemspec | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5fb152d..d632254 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -89,7 +89,7 @@ jobs:
           name: Upload to Gemfury
           context: gem
           command: |
-            curl -F package=@sendgrid_toolkit-1.11.0.gem https://$GEMFURY_PUSH_TOKEN@push.fury.io/promoboxx/
+            curl -F package=@sendgrid_toolkit-1.12.0.gem https://$GEMFURY_PUSH_TOKEN@push.fury.io/promoboxx/
 
 workflows:
   version: 2
diff --git a/VERSION b/VERSION
index 1cac385..0eed1a2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.11.0
+1.12.0
diff --git a/sendgrid_toolkit.gemspec b/sendgrid_toolkit.gemspec
index 9f7e7aa..f187878 100644
--- a/sendgrid_toolkit.gemspec
+++ b/sendgrid_toolkit.gemspec
@@ -6,7 +6,7 @@
 
 Gem::Specification.new do |s|
   s.name = "sendgrid_toolkit"
-  s.version = "1.11.0"
+  s.version = "1.12.0"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["promoboxx people"]
   s.date = Time.now.strftime("%Y-%m-%d")

From 21c9d1a63a030ebc5732b78d4e5a79cd4c065235 Mon Sep 17 00:00:00 2001
From: josephware <joseph@promoboxx.com>
Date: Thu, 21 May 2026 15:08:09 -0400
Subject: [PATCH 30/30] Don't download cc-test-report since no longer using it

---
 .circleci/config.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d632254..c809d5f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,12 +15,6 @@ jobs:
             - ruby-cache-{{ arch }}-{{ .Branch }}
             - ruby-cache
 
-      - run:
-          name: Download cc-test-reporter
-          command: |
-            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-            chmod +x ./cc-test-reporter
-
       - run:
           name: Update RubyGems
           command: gem update --system 3.4.22