sendgrid_actionmailer_adapter 0.2.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ee79cf7cc71fee2d3bd2212d2bfb1221d9629d90
-  data.tar.gz: f35a57e974388b72188ae92d9dd168763a662a6c
+SHA256:
+  metadata.gz: d59836f5bb9a8cc47a2a4c45406d5ceb7c13798677676b5f8d04db5adbba15d3
+  data.tar.gz: 07bf50bf757fafa6d18c8848eac7b40e9789329c4aa0cfd2682726d83ee131bb
 SHA512:
-  metadata.gz: c37de30e3e2b91fb8cac5860bda517d44eea91eb04d60403ed6af2b3652a6fcb3b003aaafb6bf4550287c6bb115d5d8ad2e22b18d83e68f608a32c2706292585
-  data.tar.gz: d82abaf00a36eec76085fe8df9db0311634dd89ec49df7a799be08b55a13bd04bc1018ee6258775b5609854ffeaaab89e6ceb4930134371bfe03ddc180016b20
+  metadata.gz: 38233870aeb4994d09dd2394e15a521f8fd2cc154b06e43de9d2b70b6301bb62bf5c7867d986cfb263a760c9c3cb09f00f273b72716ac8d01c93ec40f9809df2
+  data.tar.gz: 9c581f63f5ccad65c7881034b50b46ac415beff1225c70e5bdf8c2d8f89617195d44e86771d4d082bb674d86d9428999955af70b85e7f43db68fa5f1ab572089

data/lib/sendgrid_actionmailer_adapter/configuration.rb

@@ -7,7 +7,7 @@ module SendGridActionMailerAdapter
 
     class << self
       attr_accessor :api_key, :host, :request_headers, :version, :retry_max_count,
-                    :retry_wait_seconds, :return_response
+                    :retry_wait_seconds, :return_response, :logger
 
       # Set your configuration with block.
       def configure
@@ -30,6 +30,7 @@ module SendGridActionMailerAdapter
             wait_seconds: retry_wait_seconds || DEFAULT_RETRY_WAIT_SECONDS,
           },
           return_response: return_response,
+          logger: logger,
         }.freeze
       end
 
@@ -42,6 +43,7 @@ module SendGridActionMailerAdapter
         self.retry_max_count = nil
         self.retry_wait_seconds = nil
         self.return_response = nil
+        self.logger = nil
         @settings = nil
       end
     end

data/lib/sendgrid_actionmailer_adapter/converters/categories.rb

@@ -11,6 +11,7 @@ module SendGridActionMailerAdapter
       def convert(mail)
         categories_str = mail['categories']&.value
         return if categories_str.nil? || categories_str.empty?
+
         categories_str.split(', ').map { |c| ::SendGrid::Category.new(name: c) }
       end
 

data/lib/sendgrid_actionmailer_adapter/converters/contents.rb

@@ -9,7 +9,8 @@ module SendGridActionMailerAdapter
       end
 
       def convert(mail)
-        ::SendGrid::Content.new(type: mail.mime_type, value: mail.body.to_s)
+        contents = mail.body.multipart? ? mail.body.parts.select(&:text?) : [mail]
+        contents.map { |c| ::SendGrid::Content.new(type: c.mime_type, value: c.body.to_s) }
       end
 
       def assign_attributes(sendgrid_mail, value)

data/lib/sendgrid_actionmailer_adapter/converters/reply_to.rb

@@ -11,6 +11,7 @@ module SendGridActionMailerAdapter
       def convert(mail)
         addr = mail[:reply_to]&.addrs&.first
         return if addr.nil?
+
         ::SendGrid::Email.new(email: addr.address, name: addr.display_name)
       end
 

data/lib/sendgrid_actionmailer_adapter/converters/send_at.rb

@@ -11,6 +11,7 @@ module SendGridActionMailerAdapter
       def convert(mail)
         send_at_str = mail['send_at']&.value
         return if send_at_str.nil? || send_at_str.empty?
+
         send_at_str.to_i
       end
 

data/lib/sendgrid_actionmailer_adapter/delivery_method.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'logger'
 require 'sendgrid/client'
 require_relative 'configuration'
 require_relative 'converter'
@@ -22,6 +23,7 @@ module SendGridActionMailerAdapter
     # @options settings [Integer, Float] :retry_wait_sec Wait seconds for next retry, Default is 1.
     def initialize(settings)
       @settings = ::SendGridActionMailerAdapter::Configuration.settings.merge(settings)
+      @logger = @settings[:logger] || ::Logger.new(nil)
     end
 
     # Deliver a mail via SendGrid Web API.
@@ -33,33 +35,65 @@ module SendGridActionMailerAdapter
     # @raise [SendGridActionMailerAdapter::ApiError] when SendGrid Web API returns error response.
     def deliver!(mail)
       sendgrid_mail = ::SendGridActionMailerAdapter::Converter.to_sendgrid_mail(mail)
-      body = sendgrid_mail.to_json
-      client = ::SendGrid::API.new(@settings[:sendgrid]).client.mail._('send')
 
-      with_retry(@settings[:retry]) do
-        response = client.post(request_body: body)
+      if mail[:remove_from_bounces]
+        remove_to_addrs_from_bounces(sendgrid_mail)
+      end
+
+      with_retry(**@settings[:retry]) do
+        @logger.info("Calling sendMail API, #{extract_log_info(sendgrid_mail)}")
+        response = sendgrid_client.mail._('send').post(request_body: sendgrid_mail.to_json)
+        @logger.info("End calling sendMail API, status_code: #{response.status_code}")
         handle_response!(response)
       end
     end
 
     private
 
+    def sendgrid_client
+      @sendgrid_client ||= ::SendGrid::API.new(**@settings[:sendgrid]).client
+    end
+
+    # @param [::SendGrid::Mail]
+    def remove_to_addrs_from_bounces(sendgrid_mail)
+      sendgrid_mail.personalizations.each do |personalization|
+        personalization['to'].each do |to|
+          @logger.info("Calling deleteBounce API, #{to}")
+          # success => 204, not_found => 404
+          sendgrid_client.suppression.bounces._(to['email']).delete
+          @logger.info('End calling deleteBounce API')
+        end
+      end
+    end
+
     def with_retry(max_count:, wait_seconds:)
       tryable_count = max_count + 1
       begin
         tryable_count -= 1
         yield
-      rescue ::SendGridActionMailerAdapter::ApiClientError => _e
+      rescue ::SendGridActionMailerAdapter::ApiClientError => e
+        @logger.error(e)
         raise
-      rescue => _e
+      rescue StandardError => e
         if tryable_count > 0
+          @logger.warn("Retry mail sending, tryable_count: #{tryable_count}")
+          @logger.warn(e)
           sleep(wait_seconds)
           retry
         end
+        @logger.error('Give up retrying')
+        @logger.error(e)
         raise
       end
     end
 
+    def extract_log_info(sendgrid_mail)
+      {
+        subject: sendgrid_mail.subject,
+        personalizations: sendgrid_mail.personalizations,
+      }
+    end
+
     # @see https://sendgrid.com/docs/API_Reference/Web_API_v3/Mail/errors.html
     def handle_response!(response)
       case response.status_code.to_i

data/lib/sendgrid_actionmailer_adapter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SendGridActionMailerAdapter
-  VERSION = '0.2.0'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid_actionmailer_adapter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.2
 platform: ruby
 authors:
 - ryu39
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-07-16 00:00:00.000000000 Z
+date: 2021-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sendgrid-ruby
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: actionmailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,49 +53,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ryu39cop
+  name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: mail
+  name: ryu39cop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: actionmailer
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -148,7 +148,7 @@ homepage: https://github.com/ryu39/sendgrid_actionmailer_adapter
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -156,16 +156,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A ActionMailer adapter using SendGrid Web API v3
 test_files: []