sendgrid-actionmailer 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65e252ac43443369106264d0b1b33c111184aede536c0b753798e91cd7c55e22
-  data.tar.gz: df787ee4c8c4c40b3a8ceeffb89fae8c162360a84960cb094e04dff096990250
+  metadata.gz: 68926bb0db0f0f622282b8429b3df0f86911ca0d72c0146bcaf181966130e290
+  data.tar.gz: '048ca01e72420c6f88be723ada69126d31c831f300b0aa539f8f7d236e3c500f'
 SHA512:
-  metadata.gz: 74792717f19a0ca85d4c450faf2936e318d0d1885ec922a9522b43ac1a1911aa791f5790d6331a56a0c43d7ec190fc1fdfbfdc0033fc52494755c5ea560b0257
-  data.tar.gz: 45f55ecee835b2f49cff9fc16fc8845dd499ef9195f7e39737da6e83abb61d537b19293172758a7f682b3f4ba9388639d4052da11aff75841a581d52aec9e9b0
+  metadata.gz: 5999a6b88c2eb27869872a42c0f7300198cb9870f20087a9c38c68909b0bdcd6a960d0adc2eb01dfa39c530ff6eabee727e0ad9762b19294d57be8fd26e598f0
+  data.tar.gz: a26c201d0a9466684796371b82d2cb3d2aaad48efd1fc6a5c1ffd22b410bcdb71203379c498c8ae504653d0a2692206003ac3176ecfd32025e555fb38ebc0d2e

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 3.1.1 - 2020-11-06
+- #92 globally configured mail_settings
+- #95 add_mail_settings - support global settings
+
 ## 3.1.0 - 2020-8-03
 
 ### Changes

data/README.md

@@ -24,6 +24,18 @@ Normal ActionMailer usage will now transparently be sent using SendGrid's Web AP
 
 ```mail(to: 'example@email.com', subject: 'email subject', body: 'email body')```
 
+### Mail Settings
+
+Mail settings, such as sandbox_mode, may be applied globally through the sendgrid_actionmailer_settings configuration.
+
+```ruby
+config.action_mailer.delivery_method = :sendgrid_actionmailer
+config.action_mailer.sendgrid_actionmailer_settings = {
+  api_key: ENV['SENDGRID_API_KEY'],
+  mail_settings: { sandbox_mode: { enable: true }}
+}
+```
+
 ### Dynamic API Key
 
 If you need to send mail for a number of Sendgrid accounts, you can set the API key for these as follows:

data/lib/sendgrid_actionmailer.rb

@@ -238,8 +238,10 @@ module SendGridActionMailer
     end
 
     def add_mail_settings(sendgrid_mail, mail)
-      if mail['mail_settings']
-        settings = mail['mail_settings'].unparsed_value || {}
+      local_settings = mail['mail_settings'] && mail['mail_settings'].unparsed_value || {}
+      global_settings = self.settings[:mail_settings] || {}
+      settings = global_settings.merge(local_settings)
+      unless settings.empty?
         sendgrid_mail.mail_settings = MailSettings.new.tap do |m|
           if settings[:bcc]
             m.bcc = BccSettings.new(**settings[:bcc])

data/lib/sendgrid_actionmailer/version.rb

@@ -1,3 +1,3 @@
 module SendGridActionMailer
-  VERSION = '3.1.0'.freeze
+  VERSION = '3.1.1'.freeze
 end

data/spec/lib/sendgrid_actionmailer_spec.rb

@@ -772,6 +772,45 @@ module SendGridActionMailer
             expect(response).to respond_to(:to_json)
           end
         end
+
+        context 'when mail_settings are present' do
+          it 'should apply mail_settings to request body' do
+            m = DeliveryMethod.new(api_key: 'key', return_response: true,  mail_settings: { sandbox_mode: {enable: true }})
+            m.deliver!(mail)
+            expect(client.sent_mail['mail_settings']).to eq("sandbox_mode" => {"enable" => true })
+          end
+
+          context 'when mail has mail_settings set' do
+            before { mail['mail_settings'] = { spam_check: { enable: true } } }
+
+            it 'should combine local mail_settings with global settings' do
+              m = DeliveryMethod.new(api_key: 'key', return_response: true,  mail_settings: { sandbox_mode: {enable: true }})
+              m.deliver!(mail)
+              expect(client.sent_mail['mail_settings']).to eq(
+                "sandbox_mode" => {"enable" => true },
+                "spam_check" => {"enable" => true },
+              )
+            end
+          end
+
+          context 'when mail contains the same setting as global settings' do
+            before do
+              mail['mail_settings'] = {
+                sandbox_mode: { enable: false },
+                spam_check: { enable: true }
+              }
+            end
+
+            it 'should apply local mail_settings on top of global settings' do
+              m = DeliveryMethod.new(api_key: 'key', return_response: true,  mail_settings: { sandbox_mode: {enable: true }})
+              m.deliver!(mail)
+              expect(client.sent_mail['mail_settings']).to eq(
+                "sandbox_mode" => {"enable" => false },
+                "spam_check" => {"enable" => true },
+              )
+            end
+          end
+        end
       end
     end
   end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid-actionmailer
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Eddie Zaneski
 - Kristján Pétursson
 - Nick Muerdter
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-03 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -140,7 +140,7 @@ homepage: https://github.com/eddiezane/sendgrid-actionmailer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: SendGrid support for ActionMailer.
 test_files: