mandrill-api-delivery-method 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74bcaf23acc15165880998993807a3ae1449f4d1
-  data.tar.gz: bbfda73af6eb4833c7e1bb5bb28cfcf3c3cdd007
+  metadata.gz: 8f93e5e4c86d1ed00d16544b53705dda7fa680cf
+  data.tar.gz: 89220324f4a8d2f62f55f986fa80cb33efaeb08d
 SHA512:
-  metadata.gz: 43eafd4e1927df227ff5c21cc7ba31f54bbfbad37bc16eb38bd630fb99f09fa9eec7b6d786b299e692d6221c9753123988c552742cabf9b5a56ab94bc592a43a
-  data.tar.gz: c04472a0d50a1eb5548f9f1f42e3dd9c2597856497decb69761954bc837d159e2430ee8309e6d0773e0307272f44b56211dae6c83c26af1246acae412b0f513d
+  metadata.gz: 0cd22a5c97918674d9975379af91d518dc29bcb74f1b1526a00cfd060f9781627e1219d9b2c921b5e43922ed689c023739edcd3bb4720f3e59eea73ecc7aa8d4
+  data.tar.gz: 046bad63e0ee100f5f2de538fb168c0d75e31942abd73b927ea358a68d7812fbc205c94a8a127cc25878f721bd2f749dbb0026b6b5d1567aa28e43f155516d7c

data/lib/mandrill_api_delivery_method/delivery_method.rb

@@ -4,6 +4,11 @@ module MandrillAPIDeliveryMethod
   class DeliveryMethod
     class InvalidOption < StandardError; end
   
+    @@deliveries = []
+    class << self
+      attr_accessor :deliveries
+    end
+  
     attr_accessor :settings
   
     def initialize(options = {})
@@ -15,13 +20,20 @@ module MandrillAPIDeliveryMethod
       begin
         mandrill = Mandrill::API.new self.settings[:api_key]
         
-        message = {
-          subject: mail.subject,
-          from_email: mail.from.first,
-          to: [{
-            email: mail.to.first
-          }]
-        }
+        message = mail.mandrill_options || {}
+        
+        unless message.has_key? :subject
+          message[:subject] = mail.subject
+        end
+        unless message.has_key? :from_email
+          message[:from_email] = mail.from.first
+        end
+        unless message.has_key? :to
+          message[:to] = []
+          mail.to.each do |email_address|
+            message[:to] << {email: email_address}
+          end
+        end
         
         if not mail.text_part.nil?
           message[:text] = mail.text_part.body.to_s
@@ -35,6 +47,10 @@ module MandrillAPIDeliveryMethod
         send_at = mail.deliver_at.nil? ? Time.now.utc.to_s : mail.deliver_at.uts.to_s
       
         result = mandrill.messages.send message, async, nil, send_at
+        
+        if self.settings[:test]
+          self.class.deliveries << result
+        end
       rescue Mandrill::Error => e
         puts "Error delivering mail to Mandrill API: #{e.class} - #{e.message}"
         raise

data/spec/mandrill_api_delivery_method/delivery_method_spec.rb

@@ -3,16 +3,22 @@ require "spec_helper"
 describe MandrillAPIDeliveryMethod::DeliveryMethod do
   before do
     Mail.defaults do
-      delivery_method MandrillAPIDeliveryMethod::DeliveryMethod, api_key: ENV["MANDRILL_API_KEY"]
+      delivery_method MandrillAPIDeliveryMethod::DeliveryMethod, api_key: ENV["MANDRILL_API_KEY"], test: true
     end
   end
   
+  let(:deliveries) { MandrillAPIDeliveryMethod::DeliveryMethod.deliveries }
+  before(:each) do
+    # Clear deliveries
+    MandrillAPIDeliveryMethod::DeliveryMethod.deliveries = []
+  end
+  
   it 'raises an exception if no api key specified' do
     expect { MandrillAPIDeliveryMethod::DeliveryMethod.new }.to raise_exception(MandrillAPIDeliveryMethod::DeliveryMethod::InvalidOption)
     expect { MandrillAPIDeliveryMethod::DeliveryMethod.new(api_key: "123") }.to_not raise_exception
   end
   
-  context 'mail message extension' do
+  describe 'mail message extension' do
     it 'has deliver_at' do
       m = Mail::Message.new
       date = Time.now
@@ -28,17 +34,62 @@ describe MandrillAPIDeliveryMethod::DeliveryMethod do
     end
   end
   
-  context 'delivery' do
-    it 'should succeed' do
-      Mail.deliver do
-        from     'Foo <foo@example.com>'
-        sender   'Baz <baz@example.com>'
-        reply_to 'No Reply <no-reply@example.com>'
-        to       'Bar <bar@example.com>'
-        cc       'Qux <qux@example.com>'
-        bcc      'Qux <qux@example.com>'
-        subject  'Hello'
-        body     'World! http://example.com'
+  describe 'delivery' do
+    context 'plain' do
+      before(:each) do
+        Mail.deliver do
+          from     'Foo <foo@example.com>'
+          sender   'Baz <baz@example.com>'
+          reply_to 'No Reply <no-reply@example.com>'
+          to       'Bar <bar@example.com>'
+          cc       'Qux <qux@example.com>'
+          bcc      'Qux <qux@example.com>'
+          subject  'Hello'
+          body     'World! http://example.com'
+        end
+      end
+      
+      it 'should succeed' do
+        expect(deliveries.length).to eq 1
+      end
+    end
+    
+    context 'html' do
+      before(:each) do
+        Mail.deliver do
+          from     'Foo <foo@example.com>'
+          to       'Bar <bar@example.com>'
+          subject  'Hello'
+          text_part do
+            body 'World! http://example.com'
+          end
+          html_part do
+            content_type 'text/html; charset=UTF-8'
+            body '<h1>World! http://example.com</h1>'
+          end
+        end
+      end
+      
+      it 'should succeed' do
+        expect(deliveries.length).to eq 1
+      end
+    end
+    
+    context 'attachments' do
+      before(:each) do
+        Mail.deliver do
+          from     'Foo <foo@example.com>'
+          to       'Bar <bar@example.com>'
+          subject  'Hello'
+          text_part do
+            body 'World! http://example.com'
+          end
+          attachments[File.basename(__FILE__)] = File.read(__FILE__)
+        end
+      end
+      
+      it 'should succeed' do
+        expect(deliveries.length).to eq 1
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mandrill-api-delivery-method
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Pieter Jongsma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-14 00:00:00.000000000 Z
+date: 2015-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec