sendgrid-actionmailer 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20a38e557a4c77001c637d5d94407d99113b9661
-  data.tar.gz: 2dc48c9d94c830a664cb0105e8ad8d068eca449a
+  metadata.gz: 92aceed9d68cf14a3c461fef95478935b2d6abad
+  data.tar.gz: cda4360a31bddc4dbc8dd02b1ad6bf96519b1f84
 SHA512:
-  metadata.gz: 059add8c5b4fe2d4232ec038c2686b79ec93c8dbeed984bd806b3f61d71e3afeb961ea05181f603b7105ba50eb34709ddb108c3cfc5997d5b66a66d5083c499a
-  data.tar.gz: c60cf2c4baeeb7468c03cdd6631eeb5b7516a287c88750a2ad7afcc882ae6c81ec59f0c501a811bff046d07c7e7f5b5ca915db223c2431ea9fe992eb06e3b3ae
+  metadata.gz: 7687cc4ede183737d615e2892844f1ac538e8b629f74952fd584761a81207c32fdcc44cd031898bc00996edc8a2eb13dbe5c01cbaf4bf951c2f31532d99c553e
+  data.tar.gz: e63c5d2236e329ab7b7898875c0d87fa2ffa34565e9b0ddbd58aa70753be615a4ea22a428b20f4e879e9b97cb0ac50209f3b5dfff80a825863a51c084fc1fdfc

data/.travis.yml

@@ -11,3 +11,4 @@ before_install:
 gemfile:
   - gemfiles/mail_2.5.gemfile
   - gemfiles/mail_2.6.gemfile
+  - gemfiles/mail_2.7.gemfile

data/README.md

@@ -24,6 +24,20 @@ Normal ActionMailer usage will now transparently be sent using SendGrid's Web AP
 
 ```mail(to: 'example@email.com', subject: 'email subject', body: 'email body')```
 
+### 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:
+
+
+```ruby
+mail(to: 'example@email.com',
+     subject: 'email subject',
+     body: 'email body',
+     delivery_method_options: {
+       api_key: 'SENDGRID_API_KEY'
+     })
+```
+
 ## SendGrid Mail Extensions
 
 The Mail functionality is extended to include additional attributes provided by the Sendgrid API.

data/gemfiles/mail_2.7.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mail", "2.7.0"
+
+gemspec :path => "../"

data/lib/sendgrid_actionmailer.rb

@@ -10,10 +10,10 @@ module SendGridActionMailer
     include SendGrid
 
     DEFAULTS = {
-      raise_delivery_errors: false,
-    }
+      raise_delivery_errors: false
+    }.freeze
 
-    attr_accessor :settings
+    attr_accessor :settings, :api_key
 
     def initialize(**params)
       self.settings = DEFAULTS.merge(params)
@@ -28,6 +28,7 @@ module SendGridActionMailer
         m.add_personalization(to_personalizations(mail))
       end
 
+      add_api_key(sendgrid_mail, mail)
       add_content(sendgrid_mail, mail)
       add_send_options(sendgrid_mail, mail)
       add_mail_settings(sendgrid_mail, mail)
@@ -41,7 +42,7 @@ module SendGridActionMailer
     private
 
     def client
-      @client ||= SendGrid::API.new(api_key: settings.fetch(:api_key)).client
+      @client = SendGrid::API.new(api_key: api_key).client
     end
 
     # type should be either :plain or :html
@@ -105,6 +106,13 @@ module SendGridActionMailer
       content_disp.disposition_type
     end
 
+    def add_api_key(sendgrid_mail, mail)
+      self.api_key = settings.fetch(:api_key)
+      if mail['delivery-method-options'] && mail['delivery-method-options'].value.include?('api_key')
+        self.api_key = JSON.parse(mail['delivery-method-options'].value.gsub('=>', ':'))['api_key']
+      end
+    end
+
     def add_content(sendgrid_mail, mail)
       case mail.mime_type
       when 'text/plain'

data/lib/sendgrid_actionmailer/version.rb

@@ -1,3 +1,3 @@
 module SendGridActionMailer
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.0.1'.freeze
 end

data/sendgrid-actionmailer.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'mail', '~> 2.5'
-  spec.add_dependency 'sendgrid-ruby', '~> 5.0'
+  spec.add_dependency 'sendgrid-ruby', '~> 5.2'
 
   spec.add_development_dependency 'appraisal', '~> 2.1.0'
   spec.add_development_dependency 'bundler', '~> 1.6'

data/spec/lib/sendgrid_actionmailer_spec.rb

@@ -59,6 +59,8 @@ module SendGridActionMailer
 
     describe '#deliver!' do
       let(:client) { TestClient.new }
+      let(:client_parent) { double(client: client) }
+
       let(:mail) do
         Mail.new(
           to:      'test@sendgrid.com',
@@ -71,6 +73,37 @@ module SendGridActionMailer
         stub_request(:any, 'https://api.sendgrid.com/api/mail.send.json')
           .to_return(body: {message: 'success'}.to_json, status: 200, headers: {'X-TEST' => 'yes'})
         allow(SendGrid::Client).to receive(:new).and_return(client)
+        allow(SendGrid::API).to receive(:new).and_return(client_parent)
+      end
+
+      context 'with dynamic api_key' do
+        let(:default) do
+          Mail.new(
+            to:      'test@sendgrid.com',
+            from:    'taco@cat.limo',
+            subject: 'Hello, world!'
+          )
+        end
+
+        let(:mail) do
+          Mail.new(
+            to:      'test@sendgrid.com',
+            from:    'taco@cat.limo',
+            subject: 'Hello, world!',
+            delivery_method_options: {
+              api_key: 'test_key'
+            }
+          )
+        end
+
+        it 'sets dynamic api_key, but should revert to default settings api_key' do
+          expect(SendGrid::API).to receive(:new).with(api_key: 'key')
+          mailer.deliver!(default)
+          expect(SendGrid::API).to receive(:new).with(api_key: 'test_key')
+          mailer.deliver!(mail)
+          expect(SendGrid::API).to receive(:new).with(api_key: 'key')
+          mailer.deliver!(default)
+        end
       end
 
       it 'sets to' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid-actionmailer
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Eddie Zaneski
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2018-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +130,7 @@ files:
 - Rakefile
 - gemfiles/mail_2.5.gemfile
 - gemfiles/mail_2.6.gemfile
+- gemfiles/mail_2.7.gemfile
 - lib/sendgrid-actionmailer.rb
 - lib/sendgrid_actionmailer.rb
 - lib/sendgrid_actionmailer/railtie.rb