postmark 1.10.0 → 1.11.0

data/lib/postmark/mail_message_converter.rb

@@ -31,7 +31,7 @@ module Postmark
         'Headers' => @message.export_headers,
         'Tag' => @message.tag.to_s,
         'TrackOpens' => (cast_to_bool(@message.track_opens) unless @message.track_opens.empty?),
-        'TrackLinks' => (@message.track_links unless @message.track_links.empty?)
+        'TrackLinks' => (::Postmark::Inflector.to_postmark(@message.track_links) unless @message.track_links.empty?)
       }
     end
 

data/lib/postmark/version.rb

@@ -1,3 +1,3 @@
 module Postmark
-  VERSION = '1.10.0'
+  VERSION = '1.11.0'
 end

data/spec/integration/account_api_client_spec.rb

@@ -33,7 +33,7 @@ describe 'Account API client usage' do
 
 
     # spf
-    expect(subject.verified_sender_spf?(new_sender[:id])).to be_true
+    expect(subject.verified_sender_spf?(new_sender[:id])).to be true
 
     # resend
     expect { subject.resend_sender_confirmation(new_sender[:id]) }.not_to raise_error
@@ -74,7 +74,7 @@ describe 'Account API client usage' do
     expect(updated_domain[:id]).to eq(new_domain[:id])
 
     # spf
-    expect(subject.verified_domain_spf?(new_domain[:id])).to be_false
+    expect(subject.verified_domain_spf?(new_domain[:id])).to be true
 
     # dkim
     expect { subject.rotate_domain_dkim(new_domain[:id]) }.

data/spec/integration/api_client_messages_spec.rb

@@ -91,14 +91,14 @@ describe "Sending Mail::Messages with Postmark::ApiClient" do
       api_client.deliver_messages(valid_messages)
 
       expect(valid_messages.all? { |m| m.message_id =~ postmark_message_id_format }).
-          to be_true
+          to be true
     end
 
     it 'updates delivered messages with related Postmark responses' do
       api_client.deliver_messages(valid_messages)
 
       expect(valid_messages.all? { |m| m.postmark_response["To"] == m.to[0] }).
-          to be_true
+          to be true
     end
 
     it 'returns as many responses as many messages were sent' do
@@ -114,7 +114,7 @@ describe "Sending Mail::Messages with Postmark::ApiClient" do
         api_client.deliver_messages(valid_messages)
 
         expect(valid_messages.all? { |m| m.postmark_response["To"] == m.to[0] }).
-            to be_true
+            to be true
       end
 
       it 'returns as many responses as many messages were sent' do

data/spec/spec_helper.rb

@@ -10,8 +10,9 @@ require 'json'
 require 'fakeweb'
 require 'fakeweb_matcher'
 require 'rspec'
-require 'rspec/autorun'
+require 'rspec/its'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'support', 'shared_examples.rb')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'support', 'custom_matchers.rb')
 require File.join(File.expand_path(File.dirname(__FILE__)), 'support', 'helpers.rb')
 
 if ENV['JSONGEM']
@@ -23,6 +24,8 @@ end
 RSpec.configure do |config|
   include Postmark::RSpecHelpers
 
+  config.expect_with(:rspec) { |c| c.syntax = [:should, :expect] }
+
 	config.filter_run_excluding :skip_for_platform => lambda { |platform|
     RUBY_PLATFORM.to_s =~ /^#{platform.to_s}/
   }

data/spec/support/custom_matchers.rb

@@ -0,0 +1,30 @@
+RSpec::Matchers.define :a_postmark_json do |string|
+  def postmark_key?(key)
+    key == ::Postmark::Inflector.to_postmark(key)
+  end
+
+  def postmark_object?(obj)
+    case obj
+    when Hash
+      return false unless obj.keys.all? { |k| postmark_key?(k) }
+      return false unless obj.values.all? { |v| postmark_object?(v) }
+    when Array
+      return false unless obj.all? { |v| postmark_object?(v) }
+    end
+
+    true
+  end
+
+  def postmark_json?(str)
+    return false unless str.is_a?(String)
+
+    json = Postmark::Json.decode(str)
+    postmark_object?(json)
+  rescue
+    false
+  end
+
+  match do |actual|
+    postmark_json?(actual)
+  end
+end

data/spec/unit/postmark/account_api_client_spec.rb

@@ -77,7 +77,7 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned list of senders' do
         allow(subject.http_client).to receive(:get).and_return(response)
         keys = subject.get_senders.map { |s| s.keys }.flatten
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
 
       it 'accepts offset and count options' do
@@ -132,7 +132,7 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned response' do
         allow(subject.http_client).to receive(:get).and_return(response)
         keys = subject.get_sender(42).keys
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
     end
 
@@ -168,7 +168,7 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned response' do
         allow(subject.http_client).to receive(:post).and_return(response)
         keys = subject.create_sender(:foo => 'bar').keys
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
     end
 
@@ -205,7 +205,7 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned response' do
         allow(subject.http_client).to receive(:put).and_return(response)
         keys = subject.update_sender(42, :foo => 'bar').keys
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
 
     end
@@ -233,7 +233,7 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned response' do
         allow(subject.http_client).to receive(:post).and_return(response)
         keys = subject.resend_sender_confirmation(42).keys
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
 
     end
@@ -255,12 +255,12 @@ describe Postmark::AccountApiClient do
 
       it 'returns false when SPFVerified field of the response is false' do
         allow(subject.http_client).to receive(:post).and_return(false_response)
-        expect(subject.verified_sender_spf?(42)).to be_false
+        expect(subject.verified_sender_spf?(42)).to be false
       end
 
       it 'returns true when SPFVerified field of the response is true' do
         allow(subject.http_client).to receive(:post).and_return(response)
-        expect(subject.verified_sender_spf?(42)).to be_true
+        expect(subject.verified_sender_spf?(42)).to be true
       end
 
     end
@@ -292,7 +292,7 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned response' do
         allow(subject.http_client).to receive(:post).and_return(response)
         keys = subject.request_new_sender_dkim(42).keys
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
 
     end
@@ -319,7 +319,7 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned response' do
         allow(subject.http_client).to receive(:delete).and_return(response)
         keys = subject.delete_sender(42).keys
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
 
     end
@@ -366,7 +366,7 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned list of domains' do
         allow(subject.http_client).to receive(:get).and_return(response)
         keys = subject.get_domains.map { |s| s.keys }.flatten
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
 
       it 'accepts offset and count options' do
@@ -408,7 +408,7 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned response' do
         allow(subject.http_client).to receive(:get).and_return(response)
         keys = subject.get_domain(42).keys
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
     end
 
@@ -436,7 +436,7 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned response' do
         allow(subject.http_client).to receive(:post).and_return(response)
         keys = subject.create_domain(:foo => 'bar').keys
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
     end
 
@@ -465,7 +465,7 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned response' do
         allow(subject.http_client).to receive(:put).and_return(response)
         keys = subject.update_domain(42, :foo => 'bar').keys
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
 
     end
@@ -483,12 +483,12 @@ describe Postmark::AccountApiClient do
 
       it 'returns false when SPFVerified field of the response is false' do
         allow(subject.http_client).to receive(:post).and_return(false_response)
-        expect(subject.verified_domain_spf?(42)).to be_false
+        expect(subject.verified_domain_spf?(42)).to be false
       end
 
       it 'returns true when SPFVerified field of the response is true' do
         allow(subject.http_client).to receive(:post).and_return(response)
-        expect(subject.verified_domain_spf?(42)).to be_true
+        expect(subject.verified_domain_spf?(42)).to be true
       end
 
     end
@@ -511,7 +511,7 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned response' do
         allow(subject.http_client).to receive(:post).and_return(response)
         keys = subject.rotate_domain_dkim(42).keys
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
 
     end
@@ -534,7 +534,7 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned response' do
         allow(subject.http_client).to receive(:delete).and_return(response)
         keys = subject.delete_sender(42).keys
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
 
     end
@@ -590,7 +590,7 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned list of servers' do
         allow(subject.http_client).to receive(:get).and_return(response)
         keys = subject.get_servers.map { |s| s.keys }.flatten
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
 
       it 'accepts offset and count options' do
@@ -631,7 +631,7 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned response' do
         allow(subject.http_client).to receive(:get).and_return(response)
         keys = subject.get_server(42).keys
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
 
     end
@@ -678,7 +678,7 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned response' do
         allow(subject.http_client).to receive(:post).and_return(response)
         keys = subject.create_server(:foo => 'bar').keys
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
 
     end
@@ -720,7 +720,7 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned response' do
         allow(subject.http_client).to receive(:put).and_return(response)
         keys = subject.update_server(42, :foo => 'bar').keys
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
 
     end
@@ -743,7 +743,7 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned response' do
         allow(subject.http_client).to receive(:delete).and_return(response)
         keys = subject.delete_server(42).keys
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
 
     end

data/spec/unit/postmark/api_client_spec.rb

@@ -38,7 +38,7 @@ describe Postmark::ApiClient do
     its(:max_retries) { should eq max_retries }
 
     it 'passes other options to HttpClient instance' do
-      Postmark::HttpClient.should_receive(:new).with(api_token, :foo => :bar)
+      allow(Postmark::HttpClient).to receive(:new).with(api_token, :foo => :bar)
       subject.should be
     end
 
@@ -67,20 +67,18 @@ describe Postmark::ApiClient do
     let(:response) { {"MessageID" => 42} }
 
     it 'converts message hash to Postmark format and posts it to /email' do
-      http_client.should_receive(:post).with('email', email_json) { response }
+      allow(http_client).to receive(:post).with('email', email_json) { response }
       subject.deliver(message_hash)
     end
 
     it 'retries 3 times' do
-      2.times do
-        http_client.should_receive(:post).and_raise(Postmark::InternalServerError)
-      end
-      http_client.should_receive(:post) { response }
+      expect(http_client).to receive(:post).twice.and_raise(Postmark::InternalServerError)
+      expect(http_client).to receive(:post) { response }
       expect { subject.deliver(message_hash) }.not_to raise_error
     end
 
     it 'converts response to ruby format' do
-      http_client.should_receive(:post).with('email', email_json) { response }
+      expect(http_client).to receive(:post).with('email', email_json) { response }
       r = subject.deliver(message_hash)
       r.should have_key(:message_id)
     end
@@ -94,12 +92,12 @@ describe Postmark::ApiClient do
     let(:response) { [{'ErrorCode' => 0}, {'ErrorCode' => 0}, {'ErrorCode' => 0}] }
 
     it 'turns array of messages into a JSON document and posts it to /email/batch' do
-      http_client.should_receive(:post).with('email/batch', emails_json) { response }
+      expect(http_client).to receive(:post).with('email/batch', emails_json) { response }
       subject.deliver_in_batches([message_hash, message_hash, message_hash])
     end
 
     it 'converts response to ruby format' do
-      http_client.should_receive(:post).with('email/batch', emails_json) { response }
+      expect(http_client).to receive(:post).with('email/batch', emails_json) { response }
       response = subject.deliver_in_batches([message_hash, message_hash, message_hash])
       response.first.should have_key(:error_code)
     end
@@ -111,26 +109,26 @@ describe Postmark::ApiClient do
     let(:http_client) { subject.http_client }
 
     it 'turns message into a JSON document and posts it to /email' do
-      http_client.should_receive(:post).with('email', email_json)
+      expect(http_client).to receive(:post).with('email', email_json)
       subject.deliver_message(message)
     end
 
     it "retries 3 times" do
       2.times do
-        http_client.should_receive(:post).and_raise(Postmark::InternalServerError)
+        expect(http_client).to receive(:post).and_raise(Postmark::InternalServerError)
       end
-      http_client.should_receive(:post)
+      expect(http_client).to receive(:post)
       expect { subject.deliver_message(message) }.not_to raise_error
     end
 
     it "retries on timeout" do
-      http_client.should_receive(:post).and_raise(Postmark::TimeoutError)
-      http_client.should_receive(:post)
+      expect(http_client).to receive(:post).and_raise(Postmark::TimeoutError)
+      expect(http_client).to receive(:post)
       expect { subject.deliver_message(message) }.not_to raise_error
     end
 
     it "proxies errors" do
-      http_client.stub(:post).and_raise(Postmark::TimeoutError)
+      allow(http_client).to receive(:post).and_raise(Postmark::TimeoutError)
       expect { subject.deliver_message(message) }.to raise_error(Postmark::TimeoutError)
     end
 
@@ -145,21 +143,21 @@ describe Postmark::ApiClient do
     let(:response) { [{}, {}, {}] }
 
     it 'turns array of messages into a JSON document and posts it to /email/batch' do
-      http_client.should_receive(:post).with('email/batch', emails_json) { response }
+      expect(http_client).to receive(:post).with('email/batch', emails_json) { response }
       subject.deliver_messages([message, message, message])
     end
 
     it "should retry 3 times" do
       2.times do
-        http_client.should_receive(:post).and_raise(Postmark::InternalServerError)
+        expect(http_client).to receive(:post).and_raise(Postmark::InternalServerError)
       end
-      http_client.should_receive(:post) { response }
+      expect(http_client).to receive(:post) { response }
       expect { subject.deliver_messages([message, message, message]) }.not_to raise_error
     end
 
     it "should retry on timeout" do
-      http_client.should_receive(:post).and_raise(Postmark::TimeoutError)
-      http_client.should_receive(:post) { response }
+      expect(http_client).to receive(:post).and_raise(Postmark::TimeoutError)
+      expect(http_client).to receive(:post) { response }
       expect { subject.deliver_messages([message, message, message]) }.not_to raise_error
     end
 
@@ -170,7 +168,7 @@ describe Postmark::ApiClient do
     let(:response) { {"Bounces" => [{"Foo" => "Bar"}]} }
 
     it 'requests data at /deliverystats' do
-      http_client.should_receive(:get).with("deliverystats") { response }
+      expect(http_client).to receive(:get).with("deliverystats") { response }
       subject.delivery_stats.should have_key(:bounces)
     end
   end
@@ -224,7 +222,7 @@ describe Postmark::ApiClient do
       let(:response) { {"TotalCount" => 1, "Messages" => [{}]} }
 
       it 'requests data at /messages/outbound' do
-        http_client.should_receive(:get).
+        expect(http_client).to receive(:get).
                     with('messages/outbound', :offset => 50, :count => 50).
                     and_return(response)
         subject.get_messages(:offset => 50, :count => 50)
@@ -236,7 +234,7 @@ describe Postmark::ApiClient do
       let(:response) { {"TotalCount" => 1, "InboundMessages" => [{}]} }
 
       it 'requests data at /messages/inbound' do
-        http_client.should_receive(:get).
+        expect(http_client).to receive(:get).
                     with('messages/inbound', :offset => 50, :count => 50).
                     and_return(response)
         subject.get_messages(:inbound => true, :offset => 50, :count => 50).
@@ -281,7 +279,7 @@ describe Postmark::ApiClient do
     context 'given outbound' do
 
       it 'requests a single message by id at /messages/outbound/:id/details' do
-        http_client.should_receive(:get).
+        expect(http_client).to receive(:get).
                     with("messages/outbound/#{id}/details", {}).
                     and_return(response)
         subject.get_message(id).should have_key(:to)
@@ -292,7 +290,7 @@ describe Postmark::ApiClient do
     context 'given inbound' do
 
       it 'requests a single message by id at /messages/inbound/:id/details' do
-        http_client.should_receive(:get).
+        expect(http_client).to receive(:get).
                     with("messages/inbound/#{id}/details", {}).
                     and_return(response)
         subject.get_message(id, :inbound => true).should have_key(:to)
@@ -309,7 +307,7 @@ describe Postmark::ApiClient do
     context 'given outbound' do
 
       it 'requests a single message by id at /messages/outbound/:id/dump' do
-        http_client.should_receive(:get).
+        expect(http_client).to receive(:get).
                     with("messages/outbound/#{id}/dump", {}).
                     and_return(response)
         subject.dump_message(id).should have_key(:body)
@@ -320,7 +318,7 @@ describe Postmark::ApiClient do
     context 'given inbound' do
 
       it 'requests a single message by id at /messages/inbound/:id/dump' do
-        http_client.should_receive(:get).
+        expect(http_client).to receive(:get).
                     with("messages/inbound/#{id}/dump", {}).
                     and_return(response)
         subject.dump_message(id, :inbound => true).should have_key(:body)
@@ -360,7 +358,7 @@ describe Postmark::ApiClient do
     let(:http_client) { subject.http_client }
 
     it 'requests data at /bounces/tags' do
-      http_client.should_receive(:get).with("bounces/tags")
+      expect(http_client).to receive(:get).with("bounces/tags")
       subject.get_bounced_tags
     end
   end
@@ -370,7 +368,7 @@ describe Postmark::ApiClient do
     let(:id) { 42 }
 
     it 'requests a single bounce by ID at /bounces/:id' do
-      http_client.should_receive(:get).with("bounces/#{id}")
+      expect(http_client).to receive(:get).with("bounces/#{id}")
       subject.get_bounce(id)
     end
   end
@@ -380,7 +378,7 @@ describe Postmark::ApiClient do
     let(:id) { 42 }
 
     it 'requests a specific bounce data at /bounces/:id/dump' do
-      http_client.should_receive(:get).with("bounces/#{id}/dump")
+      expect(http_client).to receive(:get).with("bounces/#{id}/dump")
       subject.dump_bounce(id)
     end
   end
@@ -391,7 +389,7 @@ describe Postmark::ApiClient do
     let(:response) { {"Bounce" => {}} }
 
     it 'activates a specific bounce by sending a PUT request to /bounces/:id/activate' do
-      http_client.should_receive(:put).with("bounces/#{id}/activate") { response }
+      expect(http_client).to receive(:put).with("bounces/#{id}/activate") { response }
       subject.activate_bounce(id)
     end
   end
@@ -411,6 +409,19 @@ describe Postmark::ApiClient do
 
   end
 
+  describe '#clicks' do
+    it 'returns an Enumerator' do
+      expect(subject.clicks).to be_kind_of(Enumerable)
+    end
+
+    it 'performs a GET request to /clicks/tags' do
+      allow(subject.http_client).to receive(:get).
+          with('messages/outbound/clicks', an_instance_of(Hash)).
+          and_return('TotalCount' => 1, 'Clicks' => [{}])
+      expect(subject.clicks.first(5).count).to eq(1)
+    end
+  end
+
   describe '#get_opens' do
     let(:http_client) { subject.http_client }
     let(:options) { {:offset => 5} }
@@ -423,6 +434,18 @@ describe Postmark::ApiClient do
     end
   end
 
+  describe '#get_clicks' do
+    let(:http_client) { subject.http_client }
+    let(:options) { {:offset => 5} }
+    let(:response) { {'Clicks' => [], 'TotalCount' => 0} }
+
+    it 'performs a GET request to /messages/outbound/clicks' do
+      allow(http_client).to receive(:get).with('messages/outbound/clicks', options) { response }
+      expect(subject.get_clicks(options)).to be_an(Array)
+      expect(subject.get_clicks(options).count).to be_zero
+    end
+  end
+
   describe '#get_opens_by_message_id' do
     let(:http_client) { subject.http_client }
     let(:message_id) { 42 }
@@ -439,6 +462,22 @@ describe Postmark::ApiClient do
     end
   end
 
+  describe '#get_clicks_by_message_id' do
+    let(:http_client) { subject.http_client }
+    let(:message_id) { 42 }
+    let(:options) { {:offset => 5} }
+    let(:response) { {'Clicks' => [], 'TotalCount' => 0} }
+
+    it 'performs a GET request to /messages/outbound/clicks' do
+      allow(http_client).
+          to receive(:get).with("messages/outbound/clicks/#{message_id}",
+                                options).
+                           and_return(response)
+      expect(subject.get_clicks_by_message_id(message_id, options)).to be_an(Array)
+      expect(subject.get_clicks_by_message_id(message_id, options).count).to be_zero
+    end
+  end
+
   describe '#opens_by_message_id' do
     let(:message_id) { 42 }
 
@@ -454,6 +493,21 @@ describe Postmark::ApiClient do
     end
   end
 
+  describe '#clicks_by_message_id' do
+    let(:message_id) { 42 }
+
+    it 'returns an Enumerator' do
+      expect(subject.clicks_by_message_id(message_id)).to be_kind_of(Enumerable)
+    end
+
+    it 'performs a GET request to /clicks/tags' do
+      allow(subject.http_client).to receive(:get).
+          with("messages/outbound/clicks/#{message_id}", an_instance_of(Hash)).
+          and_return('TotalCount' => 1, 'Clicks' => [{}])
+      expect(subject.clicks_by_message_id(message_id).first(5).count).to eq(1)
+    end
+  end
+
   describe '#create_trigger' do
     let(:http_client) { subject.http_client }
     let(:options) { {:foo => 'bar'} }
@@ -553,7 +607,7 @@ describe Postmark::ApiClient do
                       "SmtpApiActivated" => true} }
 
     it 'requests server info from Postmark and converts it to ruby format' do
-      http_client.should_receive(:get).with('server') { response }
+      expect(http_client).to receive(:get).with('server') { response }
       subject.server_info.should have_key(:inbound_hash)
     end
   end
@@ -567,8 +621,8 @@ describe Postmark::ApiClient do
     let(:update) { {:smtp_api_activated => false} }
 
     it 'updates server info in Postmark and converts it to ruby format' do
-      http_client.should_receive(:put).with('server', anything) { response }
-      subject.update_server_info(update)[:smtp_api_activated].should be_false
+      expect(http_client).to receive(:put).with('server', anything) { response }
+      subject.update_server_info(update)[:smtp_api_activated].should be false
     end
   end
 
@@ -593,7 +647,7 @@ describe Postmark::ApiClient do
     end
 
     it 'gets templates info and converts it to ruby format' do
-      http_client.should_receive(:get).with('templates', :offset => 0, :count => 2).and_return(response)
+      expect(http_client).to receive(:get).with('templates', :offset => 0, :count => 2).and_return(response)
 
       count, templates = subject.get_templates(:count => 2)
 
@@ -631,7 +685,7 @@ describe Postmark::ApiClient do
     end
 
     it 'gets single template and converts it to ruby format' do
-      http_client.should_receive(:get).with('templates/123').and_return(response)
+      expect(http_client).to receive(:get).with('templates/123').and_return(response)
 
       template = subject.get_template('123')
 
@@ -654,7 +708,7 @@ describe Postmark::ApiClient do
     it 'performs a POST request to /templates with the given attributes' do
       expected_json = { 'Name' => 'template name' }.to_json
 
-      http_client.should_receive(:post).with('templates', expected_json).and_return(response)
+      expect(http_client).to receive(:post).with('templates', expected_json).and_return(response)
 
       template = subject.create_template(:name => 'template name')
 
@@ -676,7 +730,7 @@ describe Postmark::ApiClient do
     it 'performs a PUT request to /templates with the given attributes' do
       expected_json = { 'Name' => 'template name' }.to_json
 
-      http_client.should_receive(:put).with('templates/123', expected_json).and_return(response)
+      expect(http_client).to receive(:put).with('templates/123', expected_json).and_return(response)
 
       template = subject.update_template(123, :name => 'template name')
 
@@ -695,7 +749,7 @@ describe Postmark::ApiClient do
     end
 
     it 'performs a DELETE request to /templates/:id' do
-      http_client.should_receive(:delete).with('templates/123').and_return(response)
+      expect(http_client).to receive(:delete).with('templates/123').and_return(response)
 
       resp = subject.delete_template(123)
 
@@ -738,14 +792,14 @@ describe Postmark::ApiClient do
           'Subject' => '{{MyName}}'
         }.to_json
 
-        http_client.should_receive(:post).with('templates/validate', expected_template_json).and_return(response)
+        expect(http_client).to receive(:post).with('templates/validate', expected_template_json).and_return(response)
 
         resp = subject.validate_template(:html_body => '{{MyName}}',
                                          :text_body => '{{MyName}}',
                                          :subject => '{{MyName}}')
 
-        expect(resp[:all_content_is_valid]).to be_true
-        expect(resp[:html_body][:content_is_valid]).to be_true
+        expect(resp[:all_content_is_valid]).to be true
+        expect(resp[:html_body][:content_is_valid]).to be true
         expect(resp[:html_body][:validation_errors]).to be_empty
         expect(resp[:suggested_template_model]['MyName']).to eq('MyName_Value')
       end
@@ -787,15 +841,15 @@ describe Postmark::ApiClient do
           'Subject' => '{{MyName}}'
         }.to_json
 
-        http_client.should_receive(:post).with('templates/validate', expected_template_json).and_return(response)
+        expect(http_client).to receive(:post).with('templates/validate', expected_template_json).and_return(response)
 
         resp = subject.validate_template(:html_body => '{{#each}}',
                                          :text_body => '{{MyName}}',
                                          :subject => '{{MyName}}')
 
-        expect(resp[:all_content_is_valid]).to be_false
-        expect(resp[:text_body][:content_is_valid]).to be_true
-        expect(resp[:html_body][:content_is_valid]).to be_false
+        expect(resp[:all_content_is_valid]).to be false
+        expect(resp[:text_body][:content_is_valid]).to be true
+        expect(resp[:html_body][:content_is_valid]).to be false
         expect(resp[:html_body][:validation_errors].first[:character_position]).to eq(1)
         expect(resp[:html_body][:validation_errors].first[:message]).to eq('The \'each\' block being opened requires a model path to be specified in the form \'{#each <name>}\'.')
       end
@@ -809,25 +863,81 @@ describe Postmark::ApiClient do
     let(:response) { {"MessageID" => 42} }
 
     it 'converts message hash to Postmark format and posts it to /email/withTemplate' do
-      http_client.should_receive(:post).with('email/withTemplate', email_json) { response }
+      expect(http_client).to receive(:post).with('email/withTemplate', email_json) { response }
       subject.deliver_with_template(message_hash)
     end
 
     it 'retries 3 times' do
       2.times do
-        http_client.should_receive(:post).and_raise(Postmark::InternalServerError)
+        expect(http_client).to receive(:post).and_raise(Postmark::InternalServerError, 500)
       end
-      http_client.should_receive(:post) { response }
+      expect(http_client).to receive(:post) { response }
       expect { subject.deliver_with_template(message_hash) }.not_to raise_error
     end
 
     it 'converts response to ruby format' do
-      http_client.should_receive(:post).with('email/withTemplate', email_json) { response }
+      expect(http_client).to receive(:post).with('email/withTemplate', email_json) { response }
       r = subject.deliver_with_template(message_hash)
       r.should have_key(:message_id)
     end
   end
 
+  describe '#deliver_in_batches_with_templates' do
+    let(:max_batch_size) { 50 }
+    let(:factor) { 3.5 }
+    let(:http_client) { subject.http_client }
+    let(:postmark_response) do
+      {
+        'ErrorCode' => 0,
+        'Message' => 'OK',
+        'SubmittedAt' => '2018-03-14T09:56:50.4288265-04:00',
+        'To' => 'recipient@example.org'
+      }
+    end
+
+    let(:message_hashes) do
+      Array.new((factor * max_batch_size).to_i) do
+        {
+          :template_id => 42,
+          :alias => 'alias',
+          :template_model => { :Foo => 'attr_value' },
+          :from => 'sender@example.org',
+          :to => 'recipient@example.org'
+        }
+      end
+    end
+
+    before { subject.max_batch_size = max_batch_size }
+
+    it 'performs a total of (bath_size / max_batch_size) requests' do
+      expect(http_client).
+        to receive(:post).with('email/batchWithTemplates', a_postmark_json).
+        at_most(factor.to_i).times do
+        Array.new(max_batch_size) { postmark_response }
+      end
+
+      expect(http_client).
+        to receive(:post).with('email/batchWithTemplates', a_postmark_json).
+        exactly((factor - factor.to_i).ceil).times do
+        response = Array.new(((factor - factor.to_i) * max_batch_size).to_i) do
+          postmark_response
+        end
+        response
+      end
+
+      response = subject.deliver_in_batches_with_templates(message_hashes)
+      expect(response).to be_an Array
+      expect(response.size).to eq message_hashes.size
+
+      response.each do |message_status|
+        expect(message_status).to have_key(:error_code)
+        expect(message_status).to have_key(:message)
+        expect(message_status).to have_key(:to)
+        expect(message_status).to have_key(:submitted_at)
+      end
+    end
+  end
+
   describe '#get_stats_totals' do
     let(:response) do
       {
@@ -838,7 +948,7 @@ describe Postmark::ApiClient do
     let(:http_client) { subject.http_client }
 
     it 'converts response to ruby format' do
-      http_client.should_receive(:get).with('stats/outbound', { :tag => 'foo' }) { response }
+      expect(http_client).to receive(:get).with('stats/outbound', { :tag => 'foo' }) { response }
       r = subject.get_stats_totals(:tag => 'foo')
       r.should have_key(:sent)
       r.should have_key(:bounce_rate)
@@ -872,7 +982,7 @@ describe Postmark::ApiClient do
     let(:http_client) { subject.http_client }
 
     it 'converts response to ruby format' do
-      http_client.should_receive(:get).with('stats/outbound/sends', { :tag => 'foo' }) { response }
+      expect(http_client).to receive(:get).with('stats/outbound/sends', { :tag => 'foo' }) { response }
       r = subject.get_stats_counts(:sends, :tag => 'foo')
       r.should have_key(:days)
       r.should have_key(:sent)
@@ -884,7 +994,7 @@ describe Postmark::ApiClient do
     end
 
     it 'uses fromdate that is passed in' do
-      http_client.should_receive(:get).with('stats/outbound/sends', { :tag => 'foo', :fromdate => '2015-01-01' }) { response }
+      expect(http_client).to receive(:get).with('stats/outbound/sends', { :tag => 'foo', :fromdate => '2015-01-01' }) { response }
       r = subject.get_stats_counts(:sends, :tag => 'foo', :fromdate => '2015-01-01')
       r.should have_key(:days)
       r.should have_key(:sent)
@@ -896,7 +1006,7 @@ describe Postmark::ApiClient do
     end
 
     it 'uses stats type that is passed in' do
-      http_client.should_receive(:get).with('stats/outbound/opens/readtimes', { :tag => 'foo', :type => :readtimes }) { response }
+      expect(http_client).to receive(:get).with('stats/outbound/opens/readtimes', { :tag => 'foo', :type => :readtimes }) { response }
       r = subject.get_stats_counts(:opens, :type => :readtimes, :tag => 'foo')
       r.should have_key(:days)
       r.should have_key(:sent)