mandriller 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deeff3c683de00284210e838175705e8210c6ee9
-  data.tar.gz: 0d5dfe187b2e7864956c99a636fb0495a40f1641
+  metadata.gz: 093de29e2d651df7f6be9028c871b61513873846
+  data.tar.gz: 403e070eb96ef9a9c5c61f2cad53a876c0501404
 SHA512:
-  metadata.gz: 6bdebe419703c4ce2dc76eb6f07f25fbcbf3bf59737cb2dde06fb3250a0fc2e27ba0345f0dfdcf0347926bca8aa6a8dd5fab41efde1e5f0c5d63251636604fe0
-  data.tar.gz: 5bb259f4191a5bf8056caba2cffb8df245b5ec0a2b41adefc61b04aa4109e205336bf2dc57eecdbd218ef55a4b8bc0c04a39475f631c3811063c68e7e0036902
+  metadata.gz: 182e5ecb6542bdac2c9927fa86b4207db5f133de4e9a94868aa20d45e25a06ff69cd911068c01a1221ba41a3fa6818dd70f2c1a953a5c971e0e20921de44b656
+  data.tar.gz: 8c2b8a75209ff80a6baafa606a1ac500dceb83803eedd756b3690602a879aefb63729253484e45be18e22e98b8be5215ca818eb7c8605b7f6d6717ee53da2467

data/.travis.yml

@@ -11,7 +11,7 @@ env:
   - ACTION_MAILER_VERSION=3.2.0
   - ACTION_MAILER_VERSION=4.0.0
   - ACTION_MAILER_VERSION=4.1.0
-  - ACTION_MAILER_VERSION=4.2.0.rc1
+  - ACTION_MAILER_VERSION=4.2.0
 
 script: "bundle exec rake spec"
 

data/README.md

@@ -93,7 +93,7 @@ Automatically generate an HTML version of the email from the plain-text content.
 
 Use an HTML template stored in your Mandrill account
 
-- `set_auto_html 'template_name'` or `set_auto_html 'template_name', 'block_name'`: 
+- `set_template 'template_name'` or `set_template 'template_name', 'block_name'`: 
 
 `template_name`
 
@@ -194,7 +194,7 @@ Specify a [dedicated IP pool](http://help.mandrill.com/entries/24182062-Can-I-ch
 
 - `set_ip_pool 'dedicated_ip_pool'`
 
-### set_retun_path_domain
+### set_return_path_domain
 
 Specify a [custom domain](http://help.mandrill.com/entries/25241243-Can-I-customize-the-Return-Path-bounce-address-used-for-my-emails-) to use for the message's return-path
 

data/lib/mandriller/base.rb

@@ -6,8 +6,8 @@ class Mandriller::Base < ActionMailer::Base
   include Mandriller::SettingsMethods
 
   BOOLEAN_SETTINGS = {
-    autotext:                  'X-MC-Autotext',
-    autohtml:                  'X-MC-AutoHtml',
+    auto_text:                 'X-MC-Autotext',
+    auto_html:                 'X-MC-AutoHtml',
     url_strip_qs:              'X-MC-URLStripQS',
     preserve_recipients:       'X-MC-PreserveRecipients',
     inline_css:                'X-MC-InlineCSS',

data/lib/mandriller/version.rb

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

data/spec/mandriller/base_spec.rb

@@ -20,8 +20,8 @@ describe Mandriller::Base do
   subject { klass.foo }
 
   BOOLEAN_SETTINGS = {
-    autotext:                  'X-MC-Autotext',
-    autohtml:                  'X-MC-AutoHtml',
+    auto_text:                 'X-MC-Autotext',
+    auto_html:                 'X-MC-AutoHtml',
     url_strip_qs:              'X-MC-URLStripQS',
     preserve_recipients:       'X-MC-PreserveRecipients',
     inline_css:                'X-MC-InlineCSS',

data/spec/support/action_mailer.rb

@@ -1,7 +1,8 @@
+deliver_method = ActionMailer.respond_to?(:version) && ActionMailer.version.to_s.to_f >= 4.2 ? :deliver_now! : :deliver!
 shared_examples "with header" do |header, value|
   it "sets header #{header}" do
     expect {
-      subject.deliver!
+      subject.__send__(deliver_method)
     }.to change { ActionMailer::Base.deliveries.count }.by(1)
     m = ActionMailer::Base.deliveries.last
     expect(m.header.to_s).to match(/(\r\n)?#{header}: #{value}(\r\n)?/)
@@ -10,7 +11,7 @@ end
 shared_examples "without header" do |header|
   it "does not set header #{header}" do
     expect {
-      subject.deliver!
+      subject.__send__(deliver_method)
     }.to change { ActionMailer::Base.deliveries.count }.by(1)
     m = ActionMailer::Base.deliveries.last
     expect(m.header.to_s).not_to match(/(\r\n)?#{header}: [^\r]*(\r\n)?/)
@@ -20,7 +21,7 @@ shared_examples "raise an exception" do |exception|
   it "raises #{exception}" do
     expect {
       expect {
-        subject.deliver!
+        subject.__send__(deliver_method)
       }.to raise_error(exception)
     }.to change { ActionMailer::Base.deliveries.count }.by(0)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mandriller
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Daisuke Taniwaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Mandrill SMTP API integration for ActionMailer