multi_mail 0.1.3 → 0.1.4

data/spec/mandrill/receiver_spec.rb

@@ -62,8 +62,8 @@ describe MultiMail::Receiver::Mandrill do
         message.subject.should == 'Test'
 
         # Body
-        message.multipart?.should            == true
-        message.parts.size.should            == 4
+        message.multipart?.should == true
+        message.parts.size.should == 4
         message.parts[0].content_type.should == 'text/plain'
         message.parts[1].content_type.should == 'text/html; charset=UTF-8'
         # @note Mandrill adds a newline at the end of each part.
@@ -77,12 +77,12 @@ describe MultiMail::Receiver::Mandrill do
         attachment1.read.should == "Nam accumsan euismod eros et rhoncus.\n\n"
 
         # Extra Mandrill parameters
-        message['ts'].value.should == '1369860716'
-        message['email'].value.should == 'foo+bar@govkit.org'
-        message['dkim-signed'].value.should == 'false'
-        message['dkim-valid'].value.should == 'false'
-        message['spam_report-score'].value.should == '-0.7'
-        message['spf-result'].value.should == 'pass'
+        message.ts.should == 1369860716
+        message.email.should == 'foo+bar@govkit.org'
+        message.dkim_signed.should == false
+        message.dkim_valid.should == false
+        message.spam_report_score.should == -0.7
+        message.spf_result.should == 'pass'
       end
 
       it 'should return multiple messages if there are multiple events' do

data/spec/mandrill/sender_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe MultiMail::Sender::Mandrill do 
+describe MultiMail::Sender::Mandrill do
   let :message do
     Mail.new do
       from    'foo@example.com'
@@ -34,6 +34,13 @@ describe MultiMail::Sender::Mandrill do
       }.to raise_error(MultiMail::InvalidAPIKey, 'Invalid API key')
     end
 
+    it 'should raise an error if :template_name is invalid' do
+      expect{
+        message.delivery_method MultiMail::Sender::Mandrill, :api_key => ENV['MANDRILL_API_KEY'], :template_name => 'nonexistent'
+        message.deliver
+      }.to raise_error(MultiMail::InvalidTemplate, 'No such template "nonexistent"')
+    end
+
     it 'should transform send_at to a string if it is not a string' do
       sender = MultiMail::Sender::Mandrill.new(:api_user => '', :api_key => '', 'send_at' => Time.at(981203696))
       sender.send_at.should == '2001-02-03 12:34:56'
@@ -51,20 +58,26 @@ describe MultiMail::Sender::Mandrill do
       sender.async.should   == false
       sender.ip_pool.should == nil
       sender.send_at.should == nil
+      sender.template_name.should == nil
+      sender.template_content.should == nil
     end
 
     it 'should assign custom settings' do
       sender = MultiMail::Sender::Mandrill.new({
         :api_key => 'xxx',
-        :async   => true,
+        :async => true,
         :ip_pool => 'Main Pool',
         :send_at => 'example send_at',
+        :template_name => 'foo',
+        :template_content => [{'name' => 'bar', 'content' => 'baz'}],
       })
 
       sender.api_key.should == 'xxx'
       sender.async.should   == true
       sender.ip_pool.should == 'Main Pool'
       sender.send_at.should == 'example send_at'
+      sender.template_name.should == 'foo'
+      sender.template_content.should == [{'name' => 'bar', 'content' => 'baz'}]
     end
   end
 
@@ -119,27 +132,50 @@ describe MultiMail::Sender::Mandrill do
   end
 
   describe '#deliver!' do
-    before :all do
-      Mail.defaults do
-        delivery_method MultiMail::Sender::Mandrill, :api_key => ENV['MANDRILL_API_KEY'], :return_response => true
+    context 'when :template_name is set' do
+      before do
+        Mail.defaults do
+          delivery_method MultiMail::Sender::Mandrill, :api_key => ENV['MANDRILL_API_KEY'], :return_response => true, :template_name => 'default'
+        end
       end
-    end
 
-    it 'should send a message' do
-      results = message.deliver!
-      results.size.should == 1
+      it 'should send a mandrill template' do
+        results = message.deliver!
+        results.size.should == 1
 
-      result = results.first
-      result.size.should == 4
+        result = results.first
+        result.size.should == 4
 
-      result['reject_reason'].should == nil
-      result['status'].should == 'sent'
-      result['email'].should == 'bit-bucket@test.smtp.org'
-      result['_id'].should match(/\A[0-9a-f]{32}\z/)
+        result['reject_reason'].should == nil
+        result['status'].should == 'sent'
+        result['email'].should == 'bit-bucket@test.smtp.org'
+        result['_id'].should match(/\A[0-9a-f]{32}\z/)
+      end
     end
 
-    it 'should not send an empty message' do
-      empty_message.deliver!.should == [] # response not saved
+    context 'when :template_name is not set' do
+      before do
+        Mail.defaults do
+          delivery_method MultiMail::Sender::Mandrill, :api_key => ENV['MANDRILL_API_KEY'], :return_response => true
+        end
+      end
+
+      it 'should send a message' do
+        results = message.deliver!
+        results.size.should == 1
+
+        result = results.first
+        result.size.should == 4
+
+        result['reject_reason'].should == nil
+        result['status'].should == 'sent'
+        result['email'].should == 'bit-bucket@test.smtp.org'
+        result['_id'].should match(/\A[0-9a-f]{32}\z/)
+      end
+
+      it 'should not send an empty message' do
+        empty_message.deliver!.should == [] # response not saved
+      end
     end
   end
 end

data/spec/postmark/receiver_spec.rb

@@ -23,8 +23,8 @@ describe MultiMail::Receiver::Postmark do
       message.subject.should == 'Test'
 
       # Body
-      message.multipart?.should            == true
-      message.parts.size.should            == 4
+      message.multipart?.should == true
+      message.parts.size.should == 4
       message.parts[0].content_type.should == 'text/plain'
       message.parts[1].content_type.should == 'text/html; charset=UTF-8'
       message.parts[0].body.decoded.should == "bold text\n\n\n\nsome more bold text\n\n\n\nsome italic text\n\n> multiline\n> quoted\n> text\n\n\n--\nSignature block"
@@ -38,9 +38,9 @@ describe MultiMail::Receiver::Postmark do
       attachment1.read.should == "Nam accumsan euismod eros et rhoncus.\n"
 
       # Extra Postmark parameters
-      message['MailboxHash'].value.should == 'bar'
-      message['MessageID'].value.should == 'e27500eb-142e-4ca0-8529-e32ffd9931d6'
-      message['Tag'].should be_nil
+      message.mailboxhash.should == 'bar'
+      message.messageid.should == 'e27500eb-142e-4ca0-8529-e32ffd9931d6'
+      message.tag.should be_nil
     end
   end
 

data/spec/postmark/sender_spec.rb

@@ -69,6 +69,54 @@ describe MultiMail::Sender::Postmark do
     end
   end
 
+  describe '#parameters' do
+    it 'should allow true, false and nil values' do
+      [true, false, nil].each do |value|
+        sender = MultiMail::Sender::Postmark.new({
+          :api_key => 'xxx',
+          :track => {
+            :opens => value,
+          }
+        })
+
+        sender.parameters.should == {:TrackOpens => value}
+      end
+    end
+
+    it 'should transform "yes" values' do
+      sender = MultiMail::Sender::Postmark.new({
+        :api_key => 'xxx',
+        :track => {
+          :opens => 'yes',
+        }
+      })
+
+      sender.parameters.should == {:TrackOpens => true}
+    end
+
+    it 'should transform "no" values' do
+      sender = MultiMail::Sender::Postmark.new({
+        :api_key => 'xxx',
+        :track => {
+          :opens => 'no',
+        }
+      })
+
+      sender.parameters.should == {:TrackOpens => false}
+    end
+
+    it 'should ignore "htmlonly" values' do
+      sender = MultiMail::Sender::Postmark.new({
+        :api_key => 'xxx',
+        :track => {
+          :opens => 'htmlonly',
+        }
+      })
+
+      sender.parameters.should == {}
+    end
+  end
+
   describe '#deliver' do
     before :all do
       Mail.defaults do

data/spec/sendgrid/receiver_spec.rb

@@ -24,7 +24,7 @@ describe MultiMail::Receiver::SendGrid do
       message.subject.should == 'Test'
 
       # Body
-      message.multipart?.should            == true
+      message.multipart?.should == true
       # @note SendGrid adds additional HTML parts as attachments, which is
       # sensible, but it does not match the behavior of other email APIs.
       message.parts.size.should            == 6
@@ -47,10 +47,10 @@ describe MultiMail::Receiver::SendGrid do
       attachment1.read.should == "Nam accumsan euismod eros et rhoncus.\n"
 
       # Extra SendGrid parameters
-      message['dkim'].value.should == 'none'
-      message['SPF'].value.should == 'pass'
-      message['spam_report'].value.should == "Spam detection software, running on the system \"mx3.sendgrid.net\", has\r\nidentified this incoming email as possible spam.  The original message\r\nhas been attached to this so you can view it (if it isn't spam) or label\r\nsimilar future email.  If you have any questions, see\r\nthe administrator of that system for details.\r\n\r\nContent preview:  bold text some more bold text some italic text [...] \r\n\r\nContent analysis details:   (-2.6 points, 5.0 required)\r\n\r\n pts rule name              description\r\n---- ---------------------- --------------------------------------------------\r\n-0.7 RCVD_IN_DNSWL_LOW      RBL: Sender listed at http://www.dnswl.org/, low\r\n                            trust\r\n                            [209.85.223.172 listed in list.dnswl.org]\r\n-1.9 BAYES_00               BODY: Bayes spam probability is 0 to 1%\r\n                            [score: 0.0000]\r\n 0.0 HTML_MESSAGE           BODY: HTML included in message\r\n\r\n"
-      message['spam_score'].value.should == '-2.599'
+      message.dkim.should == 'none'
+      message.spf.should == 'pass'
+      message.spam_report.should == "Spam detection software, running on the system \"mx3.sendgrid.net\", has\r\nidentified this incoming email as possible spam.  The original message\r\nhas been attached to this so you can view it (if it isn't spam) or label\r\nsimilar future email.  If you have any questions, see\r\nthe administrator of that system for details.\r\n\r\nContent preview:  bold text some more bold text some italic text [...] \r\n\r\nContent analysis details:   (-2.6 points, 5.0 required)\r\n\r\n pts rule name              description\r\n---- ---------------------- --------------------------------------------------\r\n-0.7 RCVD_IN_DNSWL_LOW      RBL: Sender listed at http://www.dnswl.org/, low\r\n                            trust\r\n                            [209.85.223.172 listed in list.dnswl.org]\r\n-1.9 BAYES_00               BODY: Bayes spam probability is 0 to 1%\r\n                            [score: 0.0000]\r\n 0.0 HTML_MESSAGE           BODY: HTML included in message\r\n\r\n"
+      message.spam_score.should == '-2.599'
     end
 
     # No postbin is capable of handling mixed encodings, and most fail to even

data/spec/sendgrid/sender_spec.rb

@@ -56,7 +56,7 @@ describe MultiMail::Sender::SendGrid do
 
     it 'should raise an error if :api_key is missing' do
       expect{
-        message.delivery_method MultiMail::Sender::SendGrid, :api_user => 'xxx'
+        message.delivery_method MultiMail::Sender::SendGrid, :api_user => 'non-existent'
       }.to raise_error(ArgumentError, "Missing required arguments: api_key")
     end
 
@@ -68,13 +68,13 @@ describe MultiMail::Sender::SendGrid do
 
     it 'should raise an error if :api_key is nil' do
       expect{
-        message.delivery_method MultiMail::Sender::SendGrid, :api_user => 'xxx', :api_key => nil
+        message.delivery_method MultiMail::Sender::SendGrid, :api_user => 'non-existent', :api_key => nil
       }.to raise_error(ArgumentError, "Missing required arguments: api_key")
     end
 
     it 'should raise an error if :api_user is invalid' do
       expect{
-        message.delivery_method MultiMail::Sender::SendGrid, :api_user => 'xxx', :api_key => ENV['SENDGRID_API_KEY']
+        message.delivery_method MultiMail::Sender::SendGrid, :api_user => 'non-existent', :api_key => ENV['SENDGRID_API_KEY']
         message.deliver
       }.to raise_error(MultiMail::InvalidAPIKey, 'Bad username / password')
     end

data/spec/simple/receiver_spec.rb

@@ -38,7 +38,7 @@ describe MultiMail::Receiver::Simple do
       message.subject.should == 'Test'
 
       # Body
-      message.multipart?.should            == true
+      message.multipart?.should == true
       message.parts.size.should            == 2
       message.parts[0].content_type.should == 'text/plain; charset=us-ascii'
       message.parts[0].body.should         == "bold text\n\n\n> multiline\n> quoted\n> text\n\n--\nSignature block"

data/spec/spec_helper.rb

@@ -1,7 +1,11 @@
 require 'rubygems'
 
+require 'simplecov'
 require 'coveralls'
-Coveralls.wear!
+SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+SimpleCov.start do
+  add_filter 'spec'
+end
 
 require 'digest/sha1'
 require 'net/http'
@@ -9,20 +13,8 @@ require 'yaml'
 
 require 'rspec'
 require 'rack'
-require 'vcr'
 require File.dirname(__FILE__) + '/../lib/multi_mail'
 
-if RUBY_VERSION >= '1.9'
-  VCR.configure do |c|
-    c.cassette_library_dir = 'spec/cassettes'
-    c.hook_into :faraday
-
-    c.around_http_request do |request| # Ruby 1.9+
-      VCR.use_cassette(Digest::SHA1.hexdigest(request.uri + request.body + request.headers.to_s), &request)
-    end
-  end
-end
-
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
 Dir[File.expand_path("../support/**/*.rb", __FILE__)].each {|f| require f}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_mail
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
-- Open North
+- James McKinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-12 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.3
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.3
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.7
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.10'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: mandrill-api
   requirement: !ruby/object:Gem::Requirement
@@ -156,47 +128,33 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.7
-- !ruby/object:Gem::Dependency
-  name: sendgrid_webapi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
 description: 
-email:
-- info@opennorth.ca
+email: 
 executables:
 - multi_mail_post
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - ".yardopts"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- USAGE
 - bin/multi_mail_post
 - lib/mail_ext/message.rb
 - lib/multi_mail.rb
+- lib/multi_mail/cloudmailin/message.rb
 - lib/multi_mail/cloudmailin/receiver.rb
 - lib/multi_mail/mailgun/message.rb
 - lib/multi_mail/mailgun/receiver.rb
@@ -273,7 +231,7 @@ files:
 - spec/service_spec.rb
 - spec/simple/receiver_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/opennorth/multi_mail
+homepage: https://github.com/jpmckinney/multi_mail
 licenses:
 - MIT
 metadata: {}
@@ -293,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Easily switch between email APIs
@@ -352,3 +310,4 @@ test_files:
 - spec/service_spec.rb
 - spec/simple/receiver_spec.rb
 - spec/spec_helper.rb
+has_rdoc: