sendgrid-actionmailer 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74b9a08b495843840fdc6823142f28de25914d7b
-  data.tar.gz: 6e5fbd4cb655775fe3a67757479dafb41d32b55a
+  metadata.gz: 44c5c216019a73007baba29b9b5450462bbb2c1e
+  data.tar.gz: 829fd2abebfe9a8df103d08eca23deb8134497e3
 SHA512:
-  metadata.gz: 3ae8a64dc6b4f7e77eb5ab7226c2ba8b43e1ee5296f6b26817632b080efc238ba14ce41e9360768b54444cca4c41df047cf17d5823b5be9b1cbb474b9ab0afb9
-  data.tar.gz: d336ebf3f2d0659abfc158bdd585641db23c74271af318afc14f76b5c75009a11e8f358aa78d9a66b12c964e33d7d0d9578731cc10b7f57d624d94a7c707d892
+  metadata.gz: 57619a1532efc305dd82c2d13eab842f5c290703893c98398f03a0f1b69f564e01408869f55ba7c77087d0786265cd11db6f471eea26cc76cc7227c0d89c7f50
+  data.tar.gz: 27f6f546ddecd1e3f8f2538047f72435a8d6931b867361bccf3bb3ed4c201a22cb1a2f570b29c7723bfd016038938920ffa0d3d29c72d831668c8940eea877ce

data/gemfiles/mail_2.5.gemfile.lock

@@ -1,33 +1,32 @@
 PATH
   remote: ../
   specs:
-    sendgrid-actionmailer (0.0.5)
+    sendgrid-actionmailer (0.1.1)
       mail (~> 2.5)
-      sendgrid-ruby (~> 0.0)
+      sendgrid-ruby (< 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.4.0)
     appraisal (2.1.0)
       bundler
       rake
       thor (>= 0.14.0)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
-    domain_name (0.5.20160310)
-      unf (>= 0.0.5, < 1.0.0)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    hashdiff (0.3.0)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    netrc (0.11.0)
+    mimemagic (0.3.1)
+    multipart-post (2.0.0)
     polyglot (0.3.5)
     rake (11.1.2)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
     rspec (3.2.0)
       rspec-core (~> 3.2.0)
       rspec-expectations (~> 3.2.0)
@@ -41,17 +40,20 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-support (3.2.2)
-    sendgrid-ruby (0.0.3)
-      rest-client
-      smtpapi
+    safe_yaml (1.0.4)
+    sendgrid-ruby (1.1.6)
+      faraday (~> 0.9)
+      mimemagic
+      smtpapi (~> 0.1)
     smtpapi (0.1.0)
     thor (0.19.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.2)
+    webmock (1.24.6)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
 
 PLATFORMS
   ruby
@@ -63,6 +65,7 @@ DEPENDENCIES
   rake
   rspec (~> 3.2.0)
   sendgrid-actionmailer!
+  webmock (~> 1.24.6)
 
 BUNDLED WITH
    1.11.2

data/gemfiles/mail_2.6.gemfile.lock

@@ -1,31 +1,30 @@
 PATH
   remote: ../
   specs:
-    sendgrid-actionmailer (0.0.5)
+    sendgrid-actionmailer (0.1.1)
       mail (~> 2.5)
-      sendgrid-ruby (~> 0.0)
+      sendgrid-ruby (< 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.4.0)
     appraisal (2.1.0)
       bundler
       rake
       thor (>= 0.14.0)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
-    domain_name (0.5.20160310)
-      unf (>= 0.0.5, < 1.0.0)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    hashdiff (0.3.0)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
     mime-types (2.99.1)
-    netrc (0.11.0)
+    mimemagic (0.3.1)
+    multipart-post (2.0.0)
     rake (11.1.2)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
     rspec (3.2.0)
       rspec-core (~> 3.2.0)
       rspec-expectations (~> 3.2.0)
@@ -39,14 +38,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-support (3.2.2)
-    sendgrid-ruby (0.0.3)
-      rest-client
-      smtpapi
+    safe_yaml (1.0.4)
+    sendgrid-ruby (1.1.6)
+      faraday (~> 0.9)
+      mimemagic
+      smtpapi (~> 0.1)
     smtpapi (0.1.0)
     thor (0.19.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.2)
+    webmock (1.24.6)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
 
 PLATFORMS
   ruby
@@ -58,6 +60,7 @@ DEPENDENCIES
   rake
   rspec (~> 3.2.0)
   sendgrid-actionmailer!
+  webmock (~> 1.24.6)
 
 BUNDLED WITH
    1.11.2

data/lib/sendgrid_actionmailer/version.rb

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

data/lib/sendgrid_actionmailer.rb

@@ -17,6 +17,7 @@ module SendGridActionMailer
     end
 
     def deliver!(mail)
+      attachment_tempfiles = []
       from = mail[:from].addrs.first
 
       email = SendGrid::Mail.new do |m|
@@ -87,20 +88,26 @@ module SendGridActionMailer
 
         # This needs to be done better
         mail.attachments.each do |a|
-          begin
-            t = Tempfile.new("sendgrid-actionmailer")
-            t.binmode
-            t.write(a.read)
-            t.flush
-            email.add_attachment(t, a.filename)
-          ensure
-            t.close
-            t.unlink
-          end
+          # 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
         end
       end
 
       client.send(email)
+    ensure
+      # Close and delete the attachment tempfiles after the e-mail has been
+      # sent.
+      attachment_tempfiles.each do |file|
+        file.close
+        file.unlink
+      end
     end
   end
 end

data/sendgrid-actionmailer.gemspec

@@ -6,8 +6,8 @@ require 'sendgrid_actionmailer/version'
 Gem::Specification.new do |spec|
   spec.name          = 'sendgrid-actionmailer'
   spec.version       = SendGridActionMailer::VERSION
-  spec.authors       = ['Eddie Zaneski']
-  spec.email         = ['community@sendgrid.com']
+  spec.authors       = ['Eddie Zaneski', 'Kristján Pétursson', 'Nick Muerdter']
+  spec.email         = ['eddiezane@gmail.com', 'kristjan@gmail.com', 'stuff@nickm.org']
   spec.summary       = %q{SendGrid support for ActionMailer.}
   spec.description   = %q{Use ActionMailer with SendGrid's Web API.}
   spec.homepage      = 'https://github.com/eddiezane/sendgrid-actionmailer'
@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~>3.2.0'
   spec.add_development_dependency 'appraisal', '~> 2.1.0'
+  spec.add_development_dependency 'webmock', '~> 1.24.6'
 end

data/spec/lib/sendgrid_actionmailer_spec.rb

@@ -1,4 +1,5 @@
 require 'mail'
+require 'webmock/rspec'
 
 module SendGridActionMailer
   describe DeliveryMethod do
@@ -6,11 +7,12 @@ module SendGridActionMailer
       DeliveryMethod.new(api_user: 'user', api_key: 'key')
     end
 
-    class TestClient
+    class TestClient < SendGrid::Client
       attr_reader :sent_mail
 
       def send(mail)
         @sent_mail = mail
+        super(mail)
       end
     end
 
@@ -34,7 +36,11 @@ module SendGridActionMailer
         )
       end
 
-      before { allow(SendGrid::Client).to receive(:new).and_return(client) }
+      before do
+        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)
+      end
 
       it 'sets to' do
         mailer.deliver!(mail)
@@ -156,6 +162,7 @@ module SendGridActionMailer
           mailer.deliver!(mail)
           attachment = client.sent_mail.attachments.first
           expect(attachment[:name]).to eq('specs.rb')
+          expect(attachment[:file].content_type.to_s).to eq('application/x-ruby')
         end
       end
 

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid-actionmailer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Eddie Zaneski
+- Kristján Pétursson
+- Nick Muerdter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-23 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -94,9 +96,25 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.24.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.24.6
 description: Use ActionMailer with SendGrid's Web API.
 email:
-- community@sendgrid.com
+- eddiezane@gmail.com
+- kristjan@gmail.com
+- stuff@nickm.org
 executables: []
 extensions: []
 extra_rdoc_files: []