mailgunner 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e755c6f546bd421940dffab1c41d0b803842b7d4
-  data.tar.gz: ec6bde54051dcdfd4a28dfcc6dfb9ca9b13bd2b0
+  metadata.gz: d953d49216e0419f517316128a12974aefc63ce7
+  data.tar.gz: 23857d5d6ddf925bb6d07a5f20c5069afe80d0e2
 SHA512:
-  metadata.gz: 71f7726130d76a1163d717b5e3437e4a6adecd4fab2a40ceeee62d05bbd7b9c180a930ba95b04744494cfa0288275938d2d8da4619d70d6c38ba719935b32e37
-  data.tar.gz: 3ddcc963e98c68ed4855d0d895c67b5c3511b6a5793c3c0c3f8dda2c2888183a9195615cbc29c677938d59ae9bd7004b91ce7d9b821a2c9138eeda24aca22b17
+  metadata.gz: 2b4c452b40c78d8d569efdc93ce24d0980616546e69fedde804721331ff47d536f93ceba3341c6f0ff7854a4a7957979e21121ba766980f29d01a876f2a0a5d5
+  data.tar.gz: 6e531aa0c226284e539f5e5b9128e30ef9c3fcd21da511dbacc95ec2c8c8b6ebe0ec41ef2d60469a2510a5b10355a3a91b17ce3c73a1842d10a79acb1fd441ae

data/LICENSE.txt

@@ -1,9 +1,4 @@
-Copyright (c) TIMCRAFT <http://timcraft.com>
+Copyright (c) 2012-2018 TIMCRAFT
 
 This is an Open Source project licensed under the terms of the LGPLv3 license.
 Please see <http://www.gnu.org/licenses/lgpl-3.0.html> for license text.
-
-This code is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Lesser General Public License for more details.

data/README.md

@@ -1,18 +1,17 @@
-mailgunner
-==========
+# mailgunner
+
+[![Gem Version](https://badge.fury.io/rb/mailgunner.svg)](https://badge.fury.io/rb/mailgunner) [![Build Status](https://api.travis-ci.org/timcraft/mailgunner.svg?branch=master)](https://travis-ci.org/timcraft/mailgunner)
 
 
 Ruby client for the [Mailgun API](http://documentation.mailgun.net/api_reference.html).
 
 
-Installation
-------------
+## Installation
 
     $ gem install mailgunner
 
 
-Quick start
------------
+## Quick start
 
 ```ruby
 require 'mailgunner'
@@ -26,8 +25,7 @@ response = mailgun.get_stats(limit: 5)
 ```
 
 
-Storing the API key
--------------------
+## Storing the API key
 
 Best practice for storing credentials for external services is to use environment
 variables, as described by [12factor.net/config](http://www.12factor.net/config).
@@ -36,8 +34,7 @@ from the MAILGUN_API_KEY and MAILGUN_SMTP_LOGIN environment variables. These wil
 exist if you are using Mailgun on Heroku, or you can set them manually.
 
 
-ActionMailer integration
-------------------------
+## ActionMailer integration
 
 Mailgunner integrates with [ActionMailer](https://rubygems.org/gems/actionmailer).
 If you are using Rails, you can use Mailgunner to send mail via Mailgun by adding
@@ -47,11 +44,21 @@ the following line to `config/environments/production.rb`:
 config.action_mailer.delivery_method = :mailgun
 ````
 
+If for some reason you can't set the required ENV variables, you can configure Mailgunner
+through ActionMailer settings:
+
+```ruby
+config.action_mailer.mailgun_settings = {
+  domain: 'test.com'
+  api_key: 'your-api-key'
+}
+
+```
+
 Outside of Rails you can set `ActionMailer::Base.delivery_method` directly.
 
 
-Email validation
-----------------
+## Email validation
 
 If you only need to use Mailgun's [email address validation service](http://documentation.mailgun.com/api-email-validation.html),
 you can instead use your Mailgun public key to authenticate like this:

data/lib/mailgunner.rb

@@ -2,18 +2,11 @@ require 'net/http'
 require 'json'
 require 'cgi'
 require 'mailgunner/version'
+require 'mailgunner/errors'
 require 'mailgunner/delivery_method' if defined?(Mail)
 require 'mailgunner/railtie' if defined?(Rails)
 
 module Mailgunner
-  class Error < StandardError; end
-
-  module NoDomainProvided
-    def self.to_s
-      raise Error, 'No domain provided'
-    end
-  end
-
   class Client
     attr_accessor :domain, :api_key, :http
 
@@ -211,6 +204,26 @@ module Mailgunner
       delete("/v3/routes/#{escape id}")
     end
 
+    def get_webhooks
+      get("/v3/domains/#{escape @domain}/webhooks")
+    end
+
+    def get_webhook(id)
+      get("/v3/domains/#{escape @domain}/webhooks/#{escape id}")
+    end
+
+    def add_webhook(attributes = {})
+      post("/v3/domains/#{escape @domain}/webhooks", attributes)
+    end
+
+    def update_webhook(id, attributes = {})
+      put("/v3/domains/#{escape @domain}/webhooks/#{escape id}", attributes)
+    end
+
+    def delete_webhook(id)
+      delete("/v3/domains/#{escape @domain}/webhooks/#{escape id}")
+    end
+
     def get_campaigns(params = {})
       get("/v3/#{escape @domain}/campaigns", params)
     end
@@ -333,31 +346,36 @@ module Mailgunner
     end
 
     def parse(response)
-      if Net::HTTPSuccess === response
-        json?(response) ? JSON.parse(response.body) : response.body
+      case response
+      when Net::HTTPSuccess
+        parse_success(response)
+      when Net::HTTPUnauthorized
+        raise AuthenticationError, "HTTP #{response.code}"
+      when Net::HTTPClientError
+        raise ClientError, "HTTP #{response.code}"
+      when Net::HTTPServerError
+        raise ServerError, "HTTP #{response.code}"
       else
-        if json?(response)
-          raise Error, "HTTP #{response.code}: #{JSON.parse(response.body).fetch('message')}"
-        else
-          raise Error, "HTTP #{response.code}"
-        end
+        raise Error, "HTTP #{response.code}"
       end
     end
 
+    def parse_success(response)
+      return JSON.parse(response.body) if json?(response)
+
+      response.body
+    end
+
     def json?(response)
       content_type = response['Content-Type']
 
       content_type && content_type.split(';').first == 'application/json'
     end
 
-    def request_uri(path, hash)
-      return path if hash.empty?
-
-      query_params = hash.map do |key, values|
-        Array(values).map { |value| "#{escape(key)}=#{escape(value)}" }
-      end
+    def request_uri(path, params)
+      return path if params.empty?
 
-      path + '?' + query_params.flatten.join('&')
+      path + '?' + params.flat_map { |k, vs| Array(vs).map { |v| "#{escape(k)}=#{escape(v)}" } }.join('&')
     end
 
     def escape(component)

data/lib/mailgunner/delivery_method.rb

@@ -2,8 +2,6 @@ require 'mail/check_delivery_params'
 
 module Mailgunner
   class DeliveryMethod
-    include Mail::CheckDeliveryParams
-
     attr_accessor :settings
 
     def initialize(values)
@@ -11,10 +9,24 @@ module Mailgunner
     end
 
     def deliver!(mail)
-      check_delivery_params(mail)
+      check(mail)
 
       @client.send_mime(mail)
     end
+
+    private
+
+    if Mail::CheckDeliveryParams.respond_to?(:check) # mail v2.6.6+
+      def check(mail)
+        Mail::CheckDeliveryParams.check(mail)
+      end
+    else
+      include Mail::CheckDeliveryParams
+
+      def check(mail)
+        check_delivery_params(mail)
+      end
+    end
   end
 
   if defined?(ActionMailer)

data/lib/mailgunner/errors.rb

@@ -0,0 +1,15 @@
+module Mailgunner
+  class Error < StandardError; end
+
+  class ClientError < Error; end
+
+  class AuthenticationError < ClientError; end
+
+  class ServerError < Error; end
+
+  module NoDomainProvided
+    def self.to_s
+      raise Error, 'No domain provided'
+    end
+  end
+end

data/lib/mailgunner/version.rb

@@ -1,3 +1,3 @@
 module Mailgunner
-  VERSION = '2.4.0'
+  VERSION = '2.5.0'
 end

data/mailgunner.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
   s.summary = 'Ruby client for the Mailgun API'
   s.files = Dir.glob('{lib,spec}/**/*') + %w(LICENSE.txt README.md mailgunner.gemspec)
   s.required_ruby_version = '>= 1.9.3'
-  s.add_development_dependency('rake', '~> 10.1')
-  s.add_development_dependency('webmock', '~> 1.18')
-  s.add_development_dependency('mail', '~> 2.5')
-  s.add_development_dependency('actionmailer', '~> 4.0')
-  s.add_development_dependency('mocha', '~> 1.0')
+  s.add_development_dependency('rake', '>= 12')
+  s.add_development_dependency('webmock', '~> 3')
+  s.add_development_dependency('mail', '~> 2')
+  s.add_development_dependency('actionmailer', '~> 5')
+  s.add_development_dependency('mocha', '~> 1')
   s.require_path = 'lib'
 end

data/spec/mailgunner_delivery_method_spec.rb

@@ -18,7 +18,9 @@ describe 'Mailgunner::DeliveryMethod' do
 
     @domain = 'samples.mailgun.org'
 
-    @base_url = "https://api:#@api_key@api.mailgun.net/v3"
+    @base_url = 'https://api.mailgun.net/v3'
+
+    @auth = ['api', @api_key]
 
     @address = 'user@example.com'
 
@@ -28,20 +30,8 @@ describe 'Mailgunner::DeliveryMethod' do
   end
 
   it 'delivers the mail to mailgun in mime format' do
-    stub_request(:post, "#@base_url/#@domain/messages.mime")
+    stub_request(:post, "#@base_url/#@domain/messages.mime").with(basic_auth: @auth)
 
     ExampleMailer.registration_confirmation(email: @address).deliver_now
   end
-
-  it 'raises an exception if the api returns an error' do
-    stub_request(:post, "#@base_url/#@domain/messages.mime").to_return({
-      status: 403,
-      headers: {'Content-Type' => 'application/json'},
-      body: '{"message": "Invalid API key"}'
-    })
-
-    exception = proc { ExampleMailer.registration_confirmation(email: @address).deliver_now }.must_raise(Mailgunner::Error)
-
-    exception.message.must_include('Invalid API key')
-  end
 end

data/spec/mailgunner_spec.rb

@@ -5,17 +5,13 @@ require 'mailgunner'
 require 'json'
 require 'mail'
 
-WebMock::Config.instance.query_values_notation = :flat_array
-
 describe 'Mailgunner::Client' do
   before do
     @domain = 'samples.mailgun.org'
 
     @api_key = 'xxx'
 
-    @base_url = "https://api:#{@api_key}@api.mailgun.net/v3"
-
-    @json_response = {headers: {'Content-Type' => 'application/json;charset=utf-8'}, body: '{"key":"value"}'}
+    @base_url = 'https://@api.mailgun.net/v3'
 
     @json_response_object = {'key' => 'value'}
 
@@ -30,6 +26,20 @@ describe 'Mailgunner::Client' do
     @id = 'idxxx'
   end
 
+  def stub(http_method, url, body: nil, headers: nil)
+    headers ||= {}
+    headers['User-Agent'] = /\ARuby\/\d+\.\d+\.\d+ Mailgunner\/\d+\.\d+\.\d+\z/
+
+    params = {basic_auth: ['api', @api_key]}
+    params[:headers] = headers
+    params[:body] = body if body
+
+    response_headers = {'Content-Type' => 'application/json;charset=utf-8'}
+    response_body = '{"key":"value"}'
+
+    stub_request(http_method, url).with(params).to_return(headers: response_headers, body: response_body)
+  end
+
   describe 'http method' do
     it 'returns a net http object that uses ssl' do
       @client.http.must_be_instance_of(Net::HTTP)
@@ -68,7 +78,7 @@ describe 'Mailgunner::Client' do
 
   describe 'validate_address method' do
     it 'calls the address validate resource with the given email address and returns the response object' do
-      stub_request(:get, "#@base_url/address/validate?address=#@encoded_address").to_return(@json_response)
+      stub(:get, "#@base_url/address/validate?address=#@encoded_address")
 
       @client.validate_address(@address).must_equal(@json_response_object)
     end
@@ -76,7 +86,7 @@ describe 'Mailgunner::Client' do
 
   describe 'parse_addresses method' do
     it 'calls the address parse resource with the given email addresses and returns the response object' do
-      stub_request(:get, "#@base_url/address/parse?addresses=bob%40example.com%2Ceve%40example.com").to_return(@json_response)
+      stub(:get, "#@base_url/address/parse?addresses=bob%40example.com%2Ceve%40example.com")
 
       @client.parse_addresses(['bob@example.com', 'eve@example.com']).must_equal(@json_response_object)
     end
@@ -84,7 +94,7 @@ describe 'Mailgunner::Client' do
 
   describe 'get_message method' do
     it 'fetches the domain message resource with the given id and returns the response object' do
-      stub_request(:get, "#@base_url/domains/#@domain/messages/#@id").to_return(@json_response)
+      stub(:get, "#@base_url/domains/#@domain/messages/#@id")
 
       @client.get_message(@id).must_equal(@json_response_object)
     end
@@ -92,8 +102,7 @@ describe 'Mailgunner::Client' do
 
   describe 'get_mime_message method' do
     it 'fetches the domain message resource with the given key and returns the response object' do
-      stub_request(:get, "#@base_url/domains/#@domain/messages/#@id").
-        with(headers: {'Accept' => 'message/rfc2822'}).to_return(@json_response)
+      stub(:get, "#@base_url/domains/#@domain/messages/#@id", headers: {'Accept' => 'message/rfc2822'})
 
       @client.get_mime_message(@id).must_equal(@json_response_object)
     end
@@ -101,7 +110,7 @@ describe 'Mailgunner::Client' do
 
   describe 'send_message method' do
     it 'posts to the domain messages resource and returns the response object' do
-      stub_request(:post, "#@base_url/#@domain/messages").with(body: "to=#@encoded_address").to_return(@json_response)
+      stub(:post, "#@base_url/#@domain/messages", body: "to=#@encoded_address")
 
       @client.send_message({to: @address}).must_equal(@json_response_object)
     end
@@ -129,7 +138,7 @@ describe 'Mailgunner::Client' do
     end
 
     it 'posts to the domain messages resource and returns the response object' do
-      stub_request(:post, "#@base_url/#@domain/messages.mime").to_return(@json_response)
+      stub(:post, "#@base_url/#@domain/messages.mime")
 
       @client.send_mime(@mail).must_equal(@json_response_object)
     end
@@ -138,7 +147,7 @@ describe 'Mailgunner::Client' do
       @mail.cc = 'carol@example.com'
       @mail.bcc = 'dave@example.com'
 
-      stub_request(:post, "#@base_url/#@domain/messages.mime")
+      stub(:post, "#@base_url/#@domain/messages.mime")
 
       recipients = 'alice@example.com,carol@example.com,dave@example.com'
 
@@ -150,7 +159,7 @@ describe 'Mailgunner::Client' do
 
   describe 'delete_message method' do
     it 'deletes the domain message resource with the given key and returns the response object' do
-      stub_request(:delete, "#@base_url/domains/#@domain/messages/#@id").to_return(@json_response)
+      stub(:delete, "#@base_url/domains/#@domain/messages/#@id")
 
       @client.delete_message(@id).must_equal(@json_response_object)
     end
@@ -158,7 +167,7 @@ describe 'Mailgunner::Client' do
 
   describe 'get_domains method' do
     it 'fetches the domains resource and returns the response object' do
-      stub_request(:get, "#@base_url/domains").to_return(@json_response)
+      stub(:get, "#@base_url/domains")
 
       @client.get_domains.must_equal(@json_response_object)
     end
@@ -166,7 +175,7 @@ describe 'Mailgunner::Client' do
 
   describe 'get_domain method' do
     it 'fetches the domain resource and returns the response object' do
-      stub_request(:get, "#@base_url/domains/#@domain").to_return(@json_response)
+      stub(:get, "#@base_url/domains/#@domain")
 
       @client.get_domain(@domain).must_equal(@json_response_object)
     end
@@ -174,7 +183,7 @@ describe 'Mailgunner::Client' do
 
   describe 'add_domain method' do
     it 'posts to the domains resource and returns the response object' do
-      stub_request(:post, "#@base_url/domains").with(body: "name=#@domain").to_return(@json_response)
+      stub(:post, "#@base_url/domains", body: "name=#@domain")
 
       @client.add_domain({name: @domain}).must_equal(@json_response_object)
     end
@@ -182,7 +191,7 @@ describe 'Mailgunner::Client' do
 
   describe 'delete_domain method' do
     it 'deletes the domain resource with the given name and returns the response object' do
-      stub_request(:delete, "#@base_url/domains/#@domain").to_return(@json_response)
+      stub(:delete, "#@base_url/domains/#@domain")
 
       @client.delete_domain(@domain).must_equal(@json_response_object)
     end
@@ -190,7 +199,7 @@ describe 'Mailgunner::Client' do
 
   describe 'get_credentials method' do
     it 'fetches the domain credentials resource and returns the response object' do
-      stub_request(:get, "#@base_url/domains/#@domain/credentials").to_return(@json_response)
+      stub(:get, "#@base_url/domains/#@domain/credentials")
 
       @client.get_credentials.must_equal(@json_response_object)
     end
@@ -198,7 +207,7 @@ describe 'Mailgunner::Client' do
 
   describe 'add_credentials method' do
     it 'posts to the domain credentials resource and returns the response object' do
-      stub_request(:post, "#@base_url/domains/#@domain/credentials").with(body: "login=#@login").to_return(@json_response)
+      stub(:post, "#@base_url/domains/#@domain/credentials", body: "login=#@login")
 
       @client.add_credentials(login: @login).must_equal(@json_response_object)
     end
@@ -206,7 +215,7 @@ describe 'Mailgunner::Client' do
 
   describe 'update_credentials method' do
     it 'updates the domain credentials resource with the given login and returns the response object' do
-      stub_request(:put, "#@base_url/domains/#@domain/credentials/#@login").with(body: 'password=secret').to_return(@json_response)
+      stub(:put, "#@base_url/domains/#@domain/credentials/#@login", body: 'password=secret')
 
       @client.update_credentials(@login, {password: 'secret'}).must_equal(@json_response_object)
     end
@@ -214,7 +223,7 @@ describe 'Mailgunner::Client' do
 
   describe 'delete_credentials method' do
     it 'deletes the domain credentials resource with the given login and returns the response object' do
-      stub_request(:delete, "#@base_url/domains/#@domain/credentials/#@login").to_return(@json_response)
+      stub(:delete, "#@base_url/domains/#@domain/credentials/#@login")
 
       @client.delete_credentials(@login).must_equal(@json_response_object)
     end
@@ -222,7 +231,7 @@ describe 'Mailgunner::Client' do
 
   describe 'get_connection_settings method' do
     it 'fetches the domain connection settings resource and returns the response object' do
-      stub_request(:get, "#@base_url/domains/#@domain/connection").to_return(@json_response)
+      stub(:get, "#@base_url/domains/#@domain/connection")
 
       @client.get_connection_settings.must_equal(@json_response_object)
     end
@@ -230,7 +239,7 @@ describe 'Mailgunner::Client' do
 
   describe 'update_connection_settings method' do
     it 'updates the domain connection settings resource and returns the response object' do
-      stub_request(:put, "#@base_url/domains/#@domain/connection").with(body: 'require_tls=true').to_return(@json_response)
+      stub(:put, "#@base_url/domains/#@domain/connection", body: 'require_tls=true')
 
       @client.update_connection_settings({require_tls: true}).must_equal(@json_response_object)
     end
@@ -238,13 +247,13 @@ describe 'Mailgunner::Client' do
 
   describe 'get_unsubscribes method' do
     it 'fetches the domain unsubscribes resource and returns the response object' do
-      stub_request(:get, "#@base_url/#@domain/unsubscribes").to_return(@json_response)
+      stub(:get, "#@base_url/#@domain/unsubscribes")
 
       @client.get_unsubscribes.must_equal(@json_response_object)
     end
 
     it 'encodes skip and limit parameters' do
-      stub_request(:get, "#@base_url/#@domain/unsubscribes?skip=1&limit=2")
+      stub(:get, "#@base_url/#@domain/unsubscribes?skip=1&limit=2")
 
       @client.get_unsubscribes(skip: 1, limit: 2)
     end
@@ -252,7 +261,7 @@ describe 'Mailgunner::Client' do
 
   describe 'get_unsubscribe method' do
     it 'fetches the unsubscribe resource with the given address and returns the response object' do
-      stub_request(:get, "#@base_url/#@domain/unsubscribes/#@encoded_address").to_return(@json_response)
+      stub(:get, "#@base_url/#@domain/unsubscribes/#@encoded_address")
 
       @client.get_unsubscribe(@address).must_equal(@json_response_object)
     end
@@ -260,7 +269,7 @@ describe 'Mailgunner::Client' do
 
   describe 'delete_unsubscribe method' do
     it 'deletes the domain unsubscribe resource with the given address and returns the response object' do
-      stub_request(:delete, "#@base_url/#@domain/unsubscribes/#@encoded_address").to_return(@json_response)
+      stub(:delete, "#@base_url/#@domain/unsubscribes/#@encoded_address")
 
       @client.delete_unsubscribe(@address).must_equal(@json_response_object)
     end
@@ -268,7 +277,7 @@ describe 'Mailgunner::Client' do
 
   describe 'add_unsubscribe method' do
     it 'posts to the domain unsubscribes resource and returns the response object' do
-      stub_request(:post, "#@base_url/#@domain/unsubscribes").with(body: "address=#@encoded_address").to_return(@json_response)
+      stub(:post, "#@base_url/#@domain/unsubscribes", body: "address=#@encoded_address")
 
       @client.add_unsubscribe({address: @address}).must_equal(@json_response_object)
     end
@@ -276,13 +285,13 @@ describe 'Mailgunner::Client' do
 
   describe 'get_complaints method' do
     it 'fetches the domain complaints resource and returns the response object' do
-      stub_request(:get, "#@base_url/#@domain/complaints").to_return(@json_response)
+      stub(:get, "#@base_url/#@domain/complaints")
 
       @client.get_complaints.must_equal(@json_response_object)
     end
 
     it 'encodes skip and limit parameters' do
-      stub_request(:get, "#@base_url/#@domain/complaints?skip=1&limit=2")
+      stub(:get, "#@base_url/#@domain/complaints?skip=1&limit=2")
 
       @client.get_complaints(skip: 1, limit: 2)
     end
@@ -290,7 +299,7 @@ describe 'Mailgunner::Client' do
 
   describe 'get_complaint method' do
     it 'fetches the complaint resource with the given address and returns the response object' do
-      stub_request(:get, "#@base_url/#@domain/complaints/#@encoded_address").to_return(@json_response)
+      stub(:get, "#@base_url/#@domain/complaints/#@encoded_address")
 
       @client.get_complaint(@address).must_equal(@json_response_object)
     end
@@ -298,7 +307,7 @@ describe 'Mailgunner::Client' do
 
   describe 'add_complaint method' do
     it 'posts to the domain complaints resource and returns the response object' do
-      stub_request(:post, "#@base_url/#@domain/complaints").with(body: "address=#@encoded_address").to_return(@json_response)
+      stub(:post, "#@base_url/#@domain/complaints", body: "address=#@encoded_address")
 
       @client.add_complaint({address: @address}).must_equal(@json_response_object)
     end
@@ -306,7 +315,7 @@ describe 'Mailgunner::Client' do
 
   describe 'delete_complaint method' do
     it 'deletes the domain complaint resource with the given address and returns the response object' do
-      stub_request(:delete, "#@base_url/#@domain/complaints/#@encoded_address").to_return(@json_response)
+      stub(:delete, "#@base_url/#@domain/complaints/#@encoded_address")
 
       @client.delete_complaint(@address).must_equal(@json_response_object)
     end
@@ -314,13 +323,13 @@ describe 'Mailgunner::Client' do
 
   describe 'get_bounces method' do
     it 'fetches the domain bounces resource and returns the response object' do
-      stub_request(:get, "#@base_url/#@domain/bounces").to_return(@json_response)
+      stub(:get, "#@base_url/#@domain/bounces")
 
       @client.get_bounces.must_equal(@json_response_object)
     end
 
     it 'encodes skip and limit parameters' do
-      stub_request(:get, "#@base_url/#@domain/bounces?skip=1&limit=2")
+      stub(:get, "#@base_url/#@domain/bounces?skip=1&limit=2")
 
       @client.get_bounces(skip: 1, limit: 2)
     end
@@ -328,7 +337,7 @@ describe 'Mailgunner::Client' do
 
   describe 'get_bounce method' do
     it 'fetches the bounce resource with the given address and returns the response object' do
-      stub_request(:get, "#@base_url/#@domain/bounces/#@encoded_address").to_return(@json_response)
+      stub(:get, "#@base_url/#@domain/bounces/#@encoded_address")
 
       @client.get_bounce(@address).must_equal(@json_response_object)
     end
@@ -336,7 +345,7 @@ describe 'Mailgunner::Client' do
 
   describe 'add_bounce method' do
     it 'posts to the domain bounces resource and returns the response object' do
-      stub_request(:post, "#@base_url/#@domain/bounces").with(body: "address=#@encoded_address").to_return(@json_response)
+      stub(:post, "#@base_url/#@domain/bounces", body: "address=#@encoded_address")
 
       @client.add_bounce({address: @address}).must_equal(@json_response_object)
     end
@@ -344,7 +353,7 @@ describe 'Mailgunner::Client' do
 
   describe 'delete_bounce method' do
     it 'deletes the domain bounce resource with the given address and returns the response object' do
-      stub_request(:delete, "#@base_url/#@domain/bounces/#@encoded_address").to_return(@json_response)
+      stub(:delete, "#@base_url/#@domain/bounces/#@encoded_address")
 
       @client.delete_bounce(@address).must_equal(@json_response_object)
     end
@@ -352,7 +361,7 @@ describe 'Mailgunner::Client' do
 
   describe 'delete_bounces method' do
     it 'deletes the domain bounces resource and returns the response object' do
-      stub_request(:delete, "#@base_url/#@domain/bounces").to_return(@json_response)
+      stub(:delete, "#@base_url/#@domain/bounces")
 
       @client.delete_bounces.must_equal(@json_response_object)
     end
@@ -364,25 +373,29 @@ describe 'Mailgunner::Client' do
     end
 
     it 'fetches the domain stats resource and returns the response object' do
-      stub_request(:get, "#@base_url/#@domain/stats").to_return(@json_response)
+      stub(:get, "#@base_url/#@domain/stats")
 
       @client.get_stats.must_equal(@json_response_object)
     end
 
     it 'encodes skip and limit parameters' do
-      stub_request(:get, "#@base_url/#@domain/stats?skip=1&limit=2")
+      stub(:get, "#@base_url/#@domain/stats?skip=1&limit=2")
 
       @client.get_stats(skip: 1, limit: 2)
     end
 
     it 'encodes an event parameter with multiple values' do
-      stub_request(:get, "#@base_url/#@domain/stats?event=opened&event=sent")
+      WebMock::Config.instance.query_values_notation = :flat_array
+
+      stub(:get, "#@base_url/#@domain/stats?event=opened&event=sent")
 
       @client.get_stats(event: %w(sent opened))
+
+      WebMock::Config.instance.query_values_notation = nil
     end
 
     it 'emits a deprecation warning' do
-      stub_request(:get, "#@base_url/#@domain/stats")
+      stub(:get, "#@base_url/#@domain/stats")
 
       Kernel.expects(:warn).with(regexp_matches(/Mailgunner::Client#get_stats is deprecated/))
 
@@ -392,33 +405,37 @@ describe 'Mailgunner::Client' do
 
   describe 'get_total_stats method' do
     it 'fetches the domain total stats resource and returns the response object' do
-      stub_request(:get, "#@base_url/#@domain/stats/total?event=delivered").to_return(@json_response)
+      stub(:get, "#@base_url/#@domain/stats/total?event=delivered")
 
       @client.get_total_stats(event: 'delivered').must_equal(@json_response_object)
     end
 
     it 'encodes optional parameters' do
-      stub_request(:get, "#@base_url/#@domain/stats/total?event=delivered&resolution=hour")
+      stub(:get, "#@base_url/#@domain/stats/total?event=delivered&resolution=hour")
 
       @client.get_total_stats(event: 'delivered', resolution: 'hour')
     end
 
-    it 'encodes multiple event values' do
-      stub_request(:get, "#@base_url/#@domain/stats/total?event=delivered&event=accepted")
+    it 'encodes an event parameter with multiple values' do
+      WebMock::Config.instance.query_values_notation = :flat_array
+
+      stub(:get, "#@base_url/#@domain/stats/total?event=delivered&event=accepted")
 
       @client.get_total_stats(event: %w(accepted delivered))
+
+      WebMock::Config.instance.query_values_notation = nil
     end
   end
 
   describe 'get_events method' do
     it 'fetches the domain events resource and returns the response object' do
-      stub_request(:get, "#@base_url/#@domain/events").to_return(@json_response)
+      stub(:get, "#@base_url/#@domain/events")
 
       @client.get_events.must_equal(@json_response_object)
     end
 
     it 'encodes optional parameters' do
-      stub_request(:get, "#@base_url/#@domain/events?event=accepted&limit=10")
+      stub(:get, "#@base_url/#@domain/events?event=accepted&limit=10")
 
       @client.get_events(event: 'accepted', limit: 10)
     end
@@ -426,13 +443,13 @@ describe 'Mailgunner::Client' do
 
   describe 'get_tags method' do
     it 'fetches the domain tags resource and returns the response object' do
-      stub_request(:get, "#@base_url/#@domain/tags").to_return(@json_response)
+      stub(:get, "#@base_url/#@domain/tags")
 
       @client.get_tags.must_equal(@json_response_object)
     end
 
     it 'encodes optional limit parameter' do
-      stub_request(:get, "#@base_url/#@domain/tags?limit=2")
+      stub(:get, "#@base_url/#@domain/tags?limit=2")
 
       @client.get_tags(limit: 2)
     end
@@ -440,7 +457,7 @@ describe 'Mailgunner::Client' do
 
   describe 'get_tag method' do
     it 'fetches the domain tag resource with the given id and returns the response object' do
-      stub_request(:get, "#@base_url/#@domain/tags/#@id").to_return(@json_response)
+      stub(:get, "#@base_url/#@domain/tags/#@id")
 
       @client.get_tag(@id).must_equal(@json_response_object)
     end
@@ -448,7 +465,7 @@ describe 'Mailgunner::Client' do
 
   describe 'update_tag method' do
     it 'updates the domain tag resource with the given id and returns the response object' do
-      stub_request(:put, "#@base_url/#@domain/tags/#@id").with(body: 'description=Tag+description').to_return(@json_response)
+      stub(:put, "#@base_url/#@domain/tags/#@id", body: 'description=Tag+description')
 
       @client.update_tag(@id, {description: 'Tag description'}).must_equal(@json_response_object)
     end
@@ -456,7 +473,7 @@ describe 'Mailgunner::Client' do
 
   describe 'get_tag_stats method' do
     it 'fetches the domain tag stats resource with the given id and returns the response object' do
-      stub_request(:get, "#@base_url/#@domain/tags/#@id/stats?event=accepted").to_return(@json_response)
+      stub(:get, "#@base_url/#@domain/tags/#@id/stats?event=accepted")
 
       @client.get_tag_stats(@id, event: 'accepted').must_equal(@json_response_object)
     end
@@ -464,7 +481,7 @@ describe 'Mailgunner::Client' do
 
   describe 'delete_tag method' do
     it 'deletes the domain tag resource with the given id and returns the response object' do
-      stub_request(:delete, "#@base_url/#@domain/tags/#@id").to_return(@json_response)
+      stub(:delete, "#@base_url/#@domain/tags/#@id")
 
       @client.delete_tag(@id).must_equal(@json_response_object)
     end
@@ -472,13 +489,13 @@ describe 'Mailgunner::Client' do
 
   describe 'get_routes method' do
     it 'fetches the routes resource and returns the response object' do
-      stub_request(:get, "#@base_url/routes").to_return(@json_response)
+      stub(:get, "#@base_url/routes")
 
       @client.get_routes.must_equal(@json_response_object)
     end
 
     it 'encodes skip and limit parameters' do
-      stub_request(:get, "#@base_url/routes?skip=1&limit=2")
+      stub(:get, "#@base_url/routes?skip=1&limit=2")
 
       @client.get_routes(skip: 1, limit: 2)
     end
@@ -486,7 +503,7 @@ describe 'Mailgunner::Client' do
 
   describe 'get_route method' do
     it 'fetches the route resource with the given id and returns the response object' do
-      stub_request(:get, "#@base_url/routes/#@id").to_return(@json_response)
+      stub(:get, "#@base_url/routes/#@id")
 
       @client.get_route(@id).must_equal(@json_response_object)
     end
@@ -494,7 +511,7 @@ describe 'Mailgunner::Client' do
 
   describe 'add_route method' do
     it 'posts to the routes resource and returns the response object' do
-      stub_request(:post, "#@base_url/routes").with(body: 'description=Example+route&priority=1').to_return(@json_response)
+      stub(:post, "#@base_url/routes", body: 'description=Example+route&priority=1')
 
       @client.add_route({description: 'Example route', priority: 1}).must_equal(@json_response_object)
     end
@@ -502,7 +519,7 @@ describe 'Mailgunner::Client' do
 
   describe 'update_route method' do
     it 'updates the route resource with the given id and returns the response object' do
-      stub_request(:put, "#@base_url/routes/#@id").with(body: 'priority=10').to_return(@json_response)
+      stub(:put, "#@base_url/routes/#@id", body: 'priority=10')
 
       @client.update_route(@id, {priority: 10}).must_equal(@json_response_object)
     end
@@ -510,21 +527,65 @@ describe 'Mailgunner::Client' do
 
   describe 'delete_route method' do
     it 'deletes the route resource with the given id and returns the response object' do
-      stub_request(:delete, "#@base_url/routes/#@id").to_return(@json_response)
+      stub(:delete, "#@base_url/routes/#@id")
 
       @client.delete_route(@id).must_equal(@json_response_object)
     end
   end
 
+  describe 'get_webhooks method' do
+    it 'fetches the domain webhooks resource and returns the response object' do
+      stub(:get, "#@base_url/domains/#@domain/webhooks")
+
+      @client.get_webhooks.must_equal(@json_response_object)
+    end
+  end
+
+  describe 'get_webhook method' do
+    it 'fetches the domain webhook resource with the given id and returns the response object' do
+      stub(:get, "#@base_url/domains/#@domain/webhooks/#@id")
+
+      @client.get_webhook(@id).must_equal(@json_response_object)
+    end
+  end
+
+  describe 'add_webhook method' do
+    it 'posts to the domain webhooks resource and returns the response object' do
+      attributes = {id: @id, url: 'http://example.com/webhook'}
+
+      stub(:post, "#@base_url/domains/#@domain/webhooks", body: attributes)
+
+      @client.add_webhook(attributes).must_equal(@json_response_object)
+    end
+  end
+
+  describe 'update_webhook method' do
+    it 'updates the domain webhook resource with the given id and returns the response object' do
+      attributes = {url: 'http://example.com/webhook'}
+
+      stub(:put, "#@base_url/domains/#@domain/webhooks/#@id", body: attributes)
+
+      @client.update_webhook(@id, attributes).must_equal(@json_response_object)
+    end
+  end
+
+  describe 'delete_webhook method' do
+    it 'deletes the domain webhook resource with the given address and returns the response object' do
+      stub(:delete, "#@base_url/domains/#@domain/webhooks/#@id")
+
+      @client.delete_webhook(@id).must_equal(@json_response_object)
+    end
+  end
+
   describe 'get_campaigns method' do
     it 'fetches the domain campaigns resource and returns the response object' do
-      stub_request(:get, "#@base_url/#@domain/campaigns").to_return(@json_response)
+      stub(:get, "#@base_url/#@domain/campaigns")
 
       @client.get_campaigns.must_equal(@json_response_object)
     end
 
     it 'encodes skip and limit parameters' do
-      stub_request(:get, "#@base_url/#@domain/campaigns?skip=1&limit=2")
+      stub(:get, "#@base_url/#@domain/campaigns?skip=1&limit=2")
 
       @client.get_campaigns(skip: 1, limit: 2)
     end
@@ -532,7 +593,7 @@ describe 'Mailgunner::Client' do
 
   describe 'get_campaign method' do
     it 'fetches the campaign resource with the given id and returns the response object' do
-      stub_request(:get, "#@base_url/#@domain/campaigns/#@id").to_return(@json_response)
+      stub(:get, "#@base_url/#@domain/campaigns/#@id")
 
       @client.get_campaign(@id).must_equal(@json_response_object)
     end
@@ -540,7 +601,7 @@ describe 'Mailgunner::Client' do
 
   describe 'add_campaign method' do
     it 'posts to the domain campaigns resource and returns the response object' do
-      stub_request(:post, "#@base_url/#@domain/campaigns").with(body: "id=#@id").to_return(@json_response)
+      stub(:post, "#@base_url/#@domain/campaigns", body: "id=#@id")
 
       @client.add_campaign({id: @id}).must_equal(@json_response_object)
     end
@@ -548,7 +609,7 @@ describe 'Mailgunner::Client' do
 
   describe 'update_campaign method' do
     it 'updates the campaign resource and returns the response object' do
-      stub_request(:put, "#@base_url/#@domain/campaigns/#@id").with(body: 'name=Example+Campaign').to_return(@json_response)
+      stub(:put, "#@base_url/#@domain/campaigns/#@id", body: 'name=Example+Campaign')
 
       @client.update_campaign(@id, {name: 'Example Campaign'}).must_equal(@json_response_object)
     end
@@ -556,7 +617,7 @@ describe 'Mailgunner::Client' do
 
   describe 'delete_campaign method' do
     it 'deletes the domain campaign resource with the given id and returns the response object' do
-      stub_request(:delete, "#@base_url/#@domain/campaigns/#@id").to_return(@json_response)
+      stub(:delete, "#@base_url/#@domain/campaigns/#@id")
 
       @client.delete_campaign(@id).must_equal(@json_response_object)
     end
@@ -564,13 +625,13 @@ describe 'Mailgunner::Client' do
 
   describe 'get_campaign_events method' do
     it 'fetches the domain campaign events resource and returns the response object' do
-      stub_request(:get, "#@base_url/#@domain/campaigns/#@id/events").to_return(@json_response)
+      stub(:get, "#@base_url/#@domain/campaigns/#@id/events")
 
       @client.get_campaign_events(@id).must_equal(@json_response_object)
     end
 
     it 'encodes the optional parameters' do
-      stub_request(:get, "#@base_url/#@domain/campaigns/#@id/events?country=US&limit=100")
+      stub(:get, "#@base_url/#@domain/campaigns/#@id/events?country=US&limit=100")
 
       @client.get_campaign_events(@id, country: 'US', limit: 100)
     end
@@ -578,13 +639,13 @@ describe 'Mailgunner::Client' do
 
   describe 'get_campaign_stats method' do
     it 'fetches the domain campaign stats resource and returns the response object' do
-      stub_request(:get, "#@base_url/#@domain/campaigns/#@id/stats").to_return(@json_response)
+      stub(:get, "#@base_url/#@domain/campaigns/#@id/stats")
 
       @client.get_campaign_stats(@id).must_equal(@json_response_object)
     end
 
     it 'encodes the optional parameters' do
-      stub_request(:get, "#@base_url/#@domain/campaigns/#@id/stats?groupby=dailyhour")
+      stub(:get, "#@base_url/#@domain/campaigns/#@id/stats?groupby=dailyhour")
 
       @client.get_campaign_stats(@id, groupby: 'dailyhour')
     end
@@ -592,13 +653,13 @@ describe 'Mailgunner::Client' do
 
   describe 'get_campaign_clicks method' do
     it 'fetches the domain campaign clicks resource and returns the response object' do
-      stub_request(:get, "#@base_url/#@domain/campaigns/#@id/clicks").to_return(@json_response)
+      stub(:get, "#@base_url/#@domain/campaigns/#@id/clicks")
 
       @client.get_campaign_clicks(@id).must_equal(@json_response_object)
     end
 
     it 'encodes the optional parameters' do
-      stub_request(:get, "#@base_url/#@domain/campaigns/#@id/clicks?groupby=month&limit=100")
+      stub(:get, "#@base_url/#@domain/campaigns/#@id/clicks?groupby=month&limit=100")
 
       @client.get_campaign_clicks(@id, groupby: 'month', limit: 100)
     end
@@ -606,13 +667,13 @@ describe 'Mailgunner::Client' do
 
   describe 'get_campaign_opens method' do
     it 'fetches the domain campaign opens resource and returns the response object' do
-      stub_request(:get, "#@base_url/#@domain/campaigns/#@id/opens").to_return(@json_response)
+      stub(:get, "#@base_url/#@domain/campaigns/#@id/opens")
 
       @client.get_campaign_opens(@id).must_equal(@json_response_object)
     end
 
     it 'encodes the optional parameters' do
-      stub_request(:get, "#@base_url/#@domain/campaigns/#@id/opens?groupby=month&limit=100")
+      stub(:get, "#@base_url/#@domain/campaigns/#@id/opens?groupby=month&limit=100")
 
       @client.get_campaign_opens(@id, groupby: 'month', limit: 100)
     end
@@ -620,13 +681,13 @@ describe 'Mailgunner::Client' do
 
   describe 'get_campaign_unsubscribes method' do
     it 'fetches the domain campaign unsubscribes resource and returns the response object' do
-      stub_request(:get, "#@base_url/#@domain/campaigns/#@id/unsubscribes").to_return(@json_response)
+      stub(:get, "#@base_url/#@domain/campaigns/#@id/unsubscribes")
 
       @client.get_campaign_unsubscribes(@id).must_equal(@json_response_object)
     end
 
     it 'encodes the optional parameters' do
-      stub_request(:get, "#@base_url/#@domain/campaigns/#@id/unsubscribes?groupby=month&limit=100")
+      stub(:get, "#@base_url/#@domain/campaigns/#@id/unsubscribes?groupby=month&limit=100")
 
       @client.get_campaign_unsubscribes(@id, groupby: 'month', limit: 100)
     end
@@ -634,13 +695,13 @@ describe 'Mailgunner::Client' do
 
   describe 'get_campaign_complaints method' do
     it 'fetches the domain campaign complaints resource and returns the response object' do
-      stub_request(:get, "#@base_url/#@domain/campaigns/#@id/complaints").to_return(@json_response)
+      stub(:get, "#@base_url/#@domain/campaigns/#@id/complaints")
 
       @client.get_campaign_complaints(@id).must_equal(@json_response_object)
     end
 
     it 'encodes the optional parameters' do
-      stub_request(:get, "#@base_url/#@domain/campaigns/#@id/complaints?groupby=month&limit=100")
+      stub(:get, "#@base_url/#@domain/campaigns/#@id/complaints?groupby=month&limit=100")
 
       @client.get_campaign_complaints(@id, groupby: 'month', limit: 100)
     end
@@ -648,13 +709,13 @@ describe 'Mailgunner::Client' do
 
   describe 'get_lists method' do
     it 'fetches the lists resource and returns the response object' do
-      stub_request(:get, "#@base_url/lists").to_return(@json_response)
+      stub(:get, "#@base_url/lists")
 
       @client.get_lists.must_equal(@json_response_object)
     end
 
     it 'encodes skip and limit parameters' do
-      stub_request(:get, "#@base_url/lists?skip=1&limit=2")
+      stub(:get, "#@base_url/lists?skip=1&limit=2")
 
       @client.get_lists(skip: 1, limit: 2)
     end
@@ -662,7 +723,7 @@ describe 'Mailgunner::Client' do
 
   describe 'get_list method' do
     it 'fetches the list resource with the given address and returns the response object' do
-      stub_request(:get, "#@base_url/lists/developers%40mailgun.net").to_return(@json_response)
+      stub(:get, "#@base_url/lists/developers%40mailgun.net")
 
       @client.get_list('developers@mailgun.net').must_equal(@json_response_object)
     end
@@ -670,7 +731,7 @@ describe 'Mailgunner::Client' do
 
   describe 'add_list method' do
     it 'posts to the lists resource and returns the response object' do
-      stub_request(:post, "#@base_url/lists").with(body: 'address=developers%40mailgun.net').to_return(@json_response)
+      stub(:post, "#@base_url/lists", body: 'address=developers%40mailgun.net')
 
       @client.add_list({address: 'developers@mailgun.net'}).must_equal(@json_response_object)
     end
@@ -678,7 +739,7 @@ describe 'Mailgunner::Client' do
 
   describe 'update_list method' do
     it 'updates the list resource and returns the response object' do
-      stub_request(:put, "#@base_url/lists/developers%40mailgun.net").with(body: 'name=Example+list').to_return(@json_response)
+      stub(:put, "#@base_url/lists/developers%40mailgun.net", body: 'name=Example+list')
 
       @client.update_list('developers@mailgun.net', {name: 'Example list'}).must_equal(@json_response_object)
     end
@@ -686,7 +747,7 @@ describe 'Mailgunner::Client' do
 
   describe 'delete_list method' do
     it 'deletes the list resource with the given address and returns the response object' do
-      stub_request(:delete, "#@base_url/lists/developers%40mailgun.net").to_return(@json_response)
+      stub(:delete, "#@base_url/lists/developers%40mailgun.net")
 
       @client.delete_list('developers@mailgun.net').must_equal(@json_response_object)
     end
@@ -694,13 +755,13 @@ describe 'Mailgunner::Client' do
 
   describe 'get_list_members method' do
     it 'fetches the list members resource and returns the response object' do
-      stub_request(:get, "#@base_url/lists/developers%40mailgun.net/members").to_return(@json_response)
+      stub(:get, "#@base_url/lists/developers%40mailgun.net/members")
 
       @client.get_list_members('developers@mailgun.net').must_equal(@json_response_object)
     end
 
     it 'encodes skip and limit parameters' do
-      stub_request(:get, "#@base_url/lists/developers%40mailgun.net/members?skip=1&limit=2")
+      stub(:get, "#@base_url/lists/developers%40mailgun.net/members?skip=1&limit=2")
 
       @client.get_list_members('developers@mailgun.net', skip: 1, limit: 2)
     end
@@ -708,7 +769,7 @@ describe 'Mailgunner::Client' do
 
   describe 'get_list_member method' do
     it 'fetches the list member resource with the given address and returns the response object' do
-      stub_request(:get, "#@base_url/lists/developers%40mailgun.net/members/#@encoded_address").to_return(@json_response)
+      stub(:get, "#@base_url/lists/developers%40mailgun.net/members/#@encoded_address")
 
       @client.get_list_member('developers@mailgun.net', @address).must_equal(@json_response_object)
     end
@@ -716,7 +777,7 @@ describe 'Mailgunner::Client' do
 
   describe 'add_list_member method' do
     it 'posts to the list members resource and returns the response object' do
-      stub_request(:post, "#@base_url/lists/developers%40mailgun.net/members").with(body: "address=#@encoded_address").to_return(@json_response)
+      stub(:post, "#@base_url/lists/developers%40mailgun.net/members", body: "address=#@encoded_address")
 
       @client.add_list_member('developers@mailgun.net', {address: @address}).must_equal(@json_response_object)
     end
@@ -724,7 +785,7 @@ describe 'Mailgunner::Client' do
 
   describe 'update_list_member method' do
     it 'updates the list member resource with the given address and returns the response object' do
-      stub_request(:put, "#@base_url/lists/developers%40mailgun.net/members/#@encoded_address").with(body: 'subscribed=no').to_return(@json_response)
+      stub(:put, "#@base_url/lists/developers%40mailgun.net/members/#@encoded_address", body: 'subscribed=no')
 
       @client.update_list_member('developers@mailgun.net', @address, {subscribed: 'no'}).must_equal(@json_response_object)
     end
@@ -732,17 +793,27 @@ describe 'Mailgunner::Client' do
 
   describe 'delete_list_member method' do
     it 'deletes the list member resource with the given address and returns the response object' do
-      stub_request(:delete, "#@base_url/lists/developers%40mailgun.net/members/#@encoded_address").to_return(@json_response)
+      stub(:delete, "#@base_url/lists/developers%40mailgun.net/members/#@encoded_address")
 
       @client.delete_list_member('developers@mailgun.net', @address).must_equal(@json_response_object)
     end
   end
 
-  it 'sets the user agent header' do
-    headers = {'User-Agent' => /\ARuby\/\d+\.\d+\.\d+ Mailgunner\/\d+\.\d+\.\d+\z/}
+  it 'raises an exception for authentication errors' do
+    stub_request(:any, /api\.mailgun\.net/).to_return(status: 401)
+
+    proc { @client.get_message(@id) }.must_raise(Mailgunner::AuthenticationError)
+  end
+
+  it 'raises an exception for client errors' do
+    stub_request(:any, /api\.mailgun\.net/).to_return(status: 400)
+
+    proc { @client.get_message(@id) }.must_raise(Mailgunner::ClientError)
+  end
 
-    stub_request(:get, "#@base_url/domains/#@domain/messages/#@id").with(headers: headers)
+  it 'raises an exception for server errors' do
+    stub_request(:any, /api\.mailgun\.net/).to_return(status: 500)
 
-    @client.get_message(@id)
+    proc { @client.get_message(@id) }.must_raise(Mailgunner::ServerError)
   end
 end

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: mailgunner
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Tim Craft
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2018-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
 description: Ruby client for the Mailgun API
 email:
 - mail@timcraft.com
@@ -91,6 +91,7 @@ files:
 - README.md
 - lib/mailgunner.rb
 - lib/mailgunner/delivery_method.rb
+- lib/mailgunner/errors.rb
 - lib/mailgunner/railtie.rb
 - lib/mailgunner/version.rb
 - mailgunner.gemspec
@@ -116,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby client for the Mailgun API