sendgrid-actionmailer 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44c5c216019a73007baba29b9b5450462bbb2c1e
-  data.tar.gz: 829fd2abebfe9a8df103d08eca23deb8134497e3
+  metadata.gz: 439cfb2a51ff36ec5c65b6848312d86ec545d51f
+  data.tar.gz: da68fced610264b8bb73fef05fa20e419fae45c7
 SHA512:
-  metadata.gz: 57619a1532efc305dd82c2d13eab842f5c290703893c98398f03a0f1b69f564e01408869f55ba7c77087d0786265cd11db6f471eea26cc76cc7227c0d89c7f50
-  data.tar.gz: 27f6f546ddecd1e3f8f2538047f72435a8d6931b867361bccf3bb3ed4c201a22cb1a2f570b29c7723bfd016038938920ffa0d3d29c72d831668c8940eea877ce
+  metadata.gz: f26257a6de567602003ea7d15f179a9336ddabdcec1bb7708449c6bba22a8e47c26a5f2ff692d747e02c4af3907c271a9b1da0aa0d56c1e8fef8d52be776bf96
+  data.tar.gz: 38106c76e663f6d43c0e00a18722560f0d1847c17c544fff7b19cdb44d34450d435a0c9b073dd152fb4c3b180e38ba310cdb0ec20b5a30ffa00ee58a7c3f4d32

data/CHANGELOG.md

@@ -0,0 +1,33 @@
+# Change Log
+
+## 0.2.0 - 2016-04-25
+
+### Added
+
+- Support for `reply_to` and `date` options.
+
+### Fixed
+
+- Fix sending when multiple `X-SMTPAPI` headers are set.
+
+## 0.1.1 - 2016-04-25
+
+### Fixed
+
+- Fix file attachments.
+
+## 0.1.0 - 2016-04-23
+
+### Added
+
+- Support for `cc` and `bcc` options.
+- Support the `X-SMTPAPI` header.
+
+### Changed
+
+- Compatibility with `sendgrid-ruby` v1.0.
+- Compatibility with `mail` v2.6.
+
+### Fixed
+
+- Fix `From` addresses with display names.

data/gemfiles/mail_2.5.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    sendgrid-actionmailer (0.1.1)
+    sendgrid-actionmailer (0.2.0)
       mail (~> 2.5)
       sendgrid-ruby (< 2.0)
 

data/gemfiles/mail_2.6.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    sendgrid-actionmailer (0.1.1)
+    sendgrid-actionmailer (0.2.0)
       mail (~> 2.5)
       sendgrid-ruby (< 2.0)
 

data/lib/sendgrid_actionmailer.rb

@@ -26,10 +26,24 @@ module SendGridActionMailer
         m.bcc       = mail[:bcc].addresses if mail[:bcc]
         m.from      = from.address
         m.from_name = from.display_name
+        m.reply_to  = mail[:reply_to].addresses.first if mail[:reply_to]
+        m.date      = mail[:date].to_s if mail[:date]
         m.subject   = mail.subject
       end
 
       smtpapi = mail['X-SMTPAPI']
+
+      # If multiple X-SMTPAPI headers are present on the message, then pick the
+      # first one. This may happen when X-SMTPAPI is set with defaults at the
+      # class-level (using defaults()), as well as inside an individual method
+      # (using headers[]=). In this case, we'll defer to the more specific
+      # header set in the individual method, which is the first header
+      # (somewhat counter-intuitively:
+      # https://github.com/rails/rails/issues/15912).
+      if(smtpapi.kind_of?(Array))
+        smtpapi = smtpapi.first
+      end
+
       if smtpapi && smtpapi.value
         begin
           data = JSON.parse(smtpapi.value)

data/lib/sendgrid_actionmailer/version.rb

@@ -1,3 +1,3 @@
 module SendGridActionMailer
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/spec/lib/sendgrid_actionmailer_spec.rb

@@ -65,6 +65,33 @@ module SendGridActionMailer
         end
       end
 
+      context 'there is a reply to' do
+        before { mail.reply_to = 'nachos@cat.limo' }
+
+        it 'sets reply_to' do
+          mailer.deliver!(mail)
+          expect(client.sent_mail.reply_to).to eq('nachos@cat.limo')
+        end
+      end
+
+      context 'there is a reply to with a friendly name' do
+        before { mail.reply_to = 'Taco Cat <nachos@cat.limo>' }
+
+        it 'sets reply_to' do
+          mailer.deliver!(mail)
+          expect(client.sent_mail.reply_to).to eq('nachos@cat.limo')
+        end
+      end
+
+      context 'there is a date' do
+        before { mail.date = Time.utc(2016) }
+
+        it 'sets date' do
+          mailer.deliver!(mail)
+          expect(client.sent_mail.date).to eq("Fri, 01 Jan 2016 00:00:00 +0000")
+        end
+      end
+
       it 'sets from' do
         mailer.deliver!(mail)
         expect(client.sent_mail.from).to eq('taco@cat.limo')
@@ -362,6 +389,18 @@ module SendGridActionMailer
             expect(client.sent_mail.smtpapi.ip_pool).to eq("pool_name")
           end
         end
+
+        context 'multiple X-SMTPAPI headers are present' do
+          before do
+            mail['X-SMTPAPI'] = { category: 'food_canine' }.to_json
+            mail['X-SMTPAPI'] = { category: 'food_feline' }.to_json
+          end
+
+          it 'uses the last header' do
+            mailer.deliver!(mail)
+            expect(client.sent_mail.smtpapi.category).to eq('food_canine')
+          end
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid-actionmailer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Eddie Zaneski
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -123,6 +123,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md