sendgrid-actionmailer 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 439cfb2a51ff36ec5c65b6848312d86ec545d51f
-  data.tar.gz: da68fced610264b8bb73fef05fa20e419fae45c7
+  metadata.gz: 279c424c1fb91a3d43959b079eb62ff18cc49f4b
+  data.tar.gz: 612acbbe466f59ef1cfe8fb43d3e50b905b480c7
 SHA512:
-  metadata.gz: f26257a6de567602003ea7d15f179a9336ddabdcec1bb7708449c6bba22a8e47c26a5f2ff692d747e02c4af3907c271a9b1da0aa0d56c1e8fef8d52be776bf96
-  data.tar.gz: 38106c76e663f6d43c0e00a18722560f0d1847c17c544fff7b19cdb44d34450d435a0c9b073dd152fb4c3b180e38ba310cdb0ec20b5a30ffa00ee58a7c3f4d32
+  metadata.gz: efa913396a27fca27aaa83f3aa4ee00f9c59a8e5706d881d097e43e7a2d246fb06283f6c58a41ebe468fd997a6b2b7e56fe43b444597c31fe465bfaca2ff007e
+  data.tar.gz: 22c1f0dc2f693e4788cd508ccb2a4a7997e4437423ceea8c6eeaf5372dd2905c52447660dd0590f548f1f17dc2faa07410f3efebe1732af47a587502b88702fc

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.2.1 - 2016-04-26
+
+### Fixed
+
+- Fix handling of multipart/related inline attachments.
+
 ## 0.2.0 - 2016-04-25
 
 ### Added

data/gemfiles/mail_2.5.gemfile.lock

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

data/gemfiles/mail_2.6.gemfile.lock

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

data/lib/sendgrid_actionmailer.rb

@@ -1,7 +1,8 @@
 require 'sendgrid_actionmailer/version'
 require 'sendgrid_actionmailer/railtie' if defined? Rails
 
-require 'tempfile'
+require 'fileutils'
+require 'tmpdir'
 
 require 'sendgrid-ruby'
 
@@ -17,7 +18,7 @@ module SendGridActionMailer
     end
 
     def deliver!(mail)
-      attachment_tempfiles = []
+      attachment_temp_dirs = []
       from = mail[:from].addrs.first
 
       email = SendGrid::Mail.new do |m|
@@ -96,21 +97,30 @@ module SendGridActionMailer
       when 'text/html'
         # HTML
         email.html = mail.body.decoded
-      when 'multipart/alternative', 'multipart/mixed'
+      when 'multipart/alternative', 'multipart/mixed', 'multipart/related'
         email.html = mail.html_part.decoded if mail.html_part
         email.text = mail.text_part.decoded if mail.text_part
 
-        # This needs to be done better
         mail.attachments.each do |a|
-          # Create a tempfile with the same file extension as the real file
-          # for sendgrid-ruby's mime type lookups.
-          t = Tempfile.new(["sendgrid-actionmailer", File.extname(a.filename)])
-          t.binmode
-          t.write(a.read)
-          t.flush
-          t.rewind
-          email.add_attachment(t, a.filename)
-          attachment_tempfiles << t
+          # Write the attachment into a temporary location, since sendgrid-ruby
+          # expects to deal with files.
+          #
+          # We write to a temporary directory (instead of a tempfile) and then
+          # use the original filename inside there, since sendgrid-ruby's
+          # add_content method pulls the filename from the path (so tempfiles
+          # would lead to random filenames).
+          temp_dir = Dir.mktmpdir('sendgrid-actionmailer')
+          attachment_temp_dirs << temp_dir
+          temp_path = File.join(temp_dir, a.filename)
+          File.open(temp_path, 'wb') do |file|
+            file.write(a.read)
+          end
+
+          if(mail.mime_type == 'multipart/related' && a.header[:content_id])
+            email.add_content(temp_path, a.header[:content_id].field.content_id)
+          else
+            email.add_attachment(temp_path, a.filename)
+          end
         end
       end
 
@@ -118,9 +128,8 @@ module SendGridActionMailer
     ensure
       # Close and delete the attachment tempfiles after the e-mail has been
       # sent.
-      attachment_tempfiles.each do |file|
-        file.close
-        file.unlink
+      attachment_temp_dirs.each do |dir|
+        FileUtils.remove_entry_secure(dir)
       end
     end
   end

data/lib/sendgrid_actionmailer/version.rb

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

data/spec/lib/sendgrid_actionmailer_spec.rb

@@ -193,6 +193,43 @@ module SendGridActionMailer
         end
       end
 
+      context 'multipart/related' do
+        before do
+          mail.content_type 'multipart/related'
+          mail.part do |part|
+            part.text_part = Mail::Part.new do
+              content_type 'text/plain'
+              body 'I heard you like pineapple.'
+            end
+            part.html_part = Mail::Part.new do
+              content_type 'text/html'
+              body 'I heard you like <b>pineapple</b>.'
+            end
+          end
+          mail.attachments.inline['specs.rb'] = File.read(__FILE__)
+        end
+
+        it 'sets the text body' do
+          mailer.deliver!(mail)
+          expect(client.sent_mail.text).to eq('I heard you like pineapple.')
+        end
+
+        it 'sets the html body' do
+          mailer.deliver!(mail)
+          expect(client.sent_mail.html)
+            .to eq('I heard you like <b>pineapple</b>.')
+        end
+
+        it 'adds the inline attachment' do
+          expect(mail.attachments.first.read).to eq(File.read(__FILE__))
+          mailer.deliver!(mail)
+          content = client.sent_mail.contents.first
+          expect(content[:name]).to eq('specs.rb')
+          expect(content[:file].content_type.to_s).to eq('application/x-ruby')
+          expect(content[:cid].class).to eq(String)
+        end
+      end
+
       context 'SMTPAPI' do
         context 'it is not JSON' do
           before { mail['X-SMTPAPI'] = '<xml>JSON sucks!</xml>' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid-actionmailer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Eddie Zaneski