mailgunner 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d953d49216e0419f517316128a12974aefc63ce7
-  data.tar.gz: 23857d5d6ddf925bb6d07a5f20c5069afe80d0e2
+SHA256:
+  metadata.gz: ffd33ded9bd33ca044bbe54fc8d89a876bb9949fb91c98ef0f677cc0ca82f4f5
+  data.tar.gz: 7d4ba505f5b1de914fc360b23f64d14497e40e6ca01ecb4e8421560c0404e36d
 SHA512:
-  metadata.gz: 2b4c452b40c78d8d569efdc93ce24d0980616546e69fedde804721331ff47d536f93ceba3341c6f0ff7854a4a7957979e21121ba766980f29d01a876f2a0a5d5
-  data.tar.gz: 6e531aa0c226284e539f5e5b9128e30ef9c3fcd21da511dbacc95ec2c8c8b6ebe0ec41ef2d60469a2510a5b10355a3a91b17ce3c73a1842d10a79acb1fd441ae
+  metadata.gz: bfea517bd1e392add5a730c417a8aa479279503a574b9855e22a37a8bf1da56c8d972900173fbecb1cc39b73cf0c5eb6772a44b3681c3f2566c5ce9ff2aa4559
+  data.tar.gz: 739a82133f746ad9117dbd6655dec76324de3b1cf3394c2c35672a44306e9cab643e7b29174f7cd2823a477d82e174cbb68a40cf21c54f4dd007dc0c528c1ac0

data/README.md

@@ -1,9 +1,9 @@
 # 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)
+[![Gem Version](https://badge.fury.io/rb/mailgunner.svg)](https://badge.fury.io/rb/mailgunner) [![Build Status](https://api.travis-ci.org/readysteady/mailgunner.svg?branch=master)](https://travis-ci.org/readysteady/mailgunner)
 
 
-Ruby client for the [Mailgun API](http://documentation.mailgun.net/api_reference.html).
+Ruby client for the [Mailgun API](https://documentation.mailgun.com/en/latest/api_reference.html).
 
 
 ## Installation
@@ -21,16 +21,19 @@ mailgun = Mailgunner::Client.new({
   api_key: 'key-3ax6xnjp29jd6fds4gc373sgvjxteol0'
 })
 
-response = mailgun.get_stats(limit: 5)
+response = mailgun.get_domains
+
+response['items'].each do |item|
+  p item.values_at('id', 'name')
+end
 ```
 
 
 ## 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).
-Mailgunner::Client defaults to extracting the domain and api_key values it needs
-from the MAILGUN_API_KEY and MAILGUN_SMTP_LOGIN environment variables. These will
+Best practice for credentials is to [store them in the environment](https://www.12factor.net/config#store_config_in_the_environment).
+`Mailgunner::Client` defaults to extracting the domain and api_key values it needs
+from the `MAILGUN_API_KEY` and `MAILGUN_SMTP_LOGIN` environment variables—these will
 exist if you are using Mailgun on Heroku, or you can set them manually.
 
 
@@ -42,22 +45,36 @@ the following line to `config/environments/production.rb`:
 
 ```ruby
 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'
+  domain: 'test.com',
   api_key: 'your-api-key'
 }
-
 ```
 
 Outside of Rails you can set `ActionMailer::Base.delivery_method` directly.
 
 
+## Specifying the region
+
+Mailgun offers both a US and EU region to send your e-mail from. Mailgunner uses
+the US region by default. If you wish to use the EU region set the `api_host`
+config option like so:
+
+```ruby
+mailgun = Mailgunner::Client.new({
+  domain: 'eu.samples.mailgun.org',
+  api_key: 'key-3ax6xnjp29jd6fds4gc373sgvjxteol0',
+  api_host: 'api.eu.mailgun.net'
+})
+```
+
+
 ## Email validation
 
 If you only need to use Mailgun's [email address validation service](http://documentation.mailgun.com/api-email-validation.html),

data/lib/mailgunner.rb

@@ -1,385 +1,16 @@
-require 'net/http'
-require 'json'
-require 'cgi'
 require 'mailgunner/version'
 require 'mailgunner/errors'
+require 'mailgunner/client'
+require 'mailgunner/client/domains'
+require 'mailgunner/client/email_validation'
+require 'mailgunner/client/events'
+require 'mailgunner/client/ips'
+require 'mailgunner/client/mailing_lists'
+require 'mailgunner/client/messages'
+require 'mailgunner/client/routes'
+require 'mailgunner/client/stats'
+require 'mailgunner/client/suppressions'
+require 'mailgunner/client/tags'
+require 'mailgunner/client/webhooks'
 require 'mailgunner/delivery_method' if defined?(Mail)
 require 'mailgunner/railtie' if defined?(Rails)
-
-module Mailgunner
-  class Client
-    attr_accessor :domain, :api_key, :http
-
-    def initialize(options = {})
-      @domain = if options.key?(:domain)
-        options.fetch(:domain)
-      elsif ENV.key?('MAILGUN_SMTP_LOGIN')
-        ENV['MAILGUN_SMTP_LOGIN'].to_s.split('@').last
-      else
-        NoDomainProvided
-      end
-
-      @api_key = options.fetch(:api_key) { ENV.fetch('MAILGUN_API_KEY') }
-
-      @http = Net::HTTP.new('api.mailgun.net', Net::HTTP.https_default_port)
-
-      @http.use_ssl = true
-    end
-
-    def validate_address(value)
-      get('/v3/address/validate', address: value)
-    end
-
-    def parse_addresses(values)
-      get('/v3/address/parse', addresses: Array(values).join(','))
-    end
-
-    def get_message(key)
-      get("/v3/domains/#{escape @domain}/messages/#{escape key}")
-    end
-
-    def get_mime_message(key)
-      get("/v3/domains/#{escape @domain}/messages/#{escape key}", {}, {'Accept' => 'message/rfc2822'})
-    end
-
-    def send_message(attributes = {})
-      post("/v3/#{escape @domain}/messages", attributes)
-    end
-
-    def send_mime(mail)
-      to = ['to', Array(mail.destinations).join(',')]
-
-      message = ['message', mail.encoded, {filename: 'message.mime'}]
-
-      multipart_post("/v3/#{escape @domain}/messages.mime", [to, message])
-    end
-
-    def delete_message(key)
-      delete("/v3/domains/#{escape @domain}/messages/#{escape key}")
-    end
-
-    def get_domains(params = {})
-      get('/v3/domains', params)
-    end
-
-    def get_domain(name)
-      get("/v3/domains/#{escape name}")
-    end
-
-    def add_domain(attributes = {})
-      post('/v3/domains', attributes)
-    end
-
-    def delete_domain(name)
-      delete("/v3/domains/#{escape name}")
-    end
-
-    def get_credentials
-      get("/v3/domains/#{escape @domain}/credentials")
-    end
-
-    def add_credentials(attributes)
-      post("/v3/domains/#{escape @domain}/credentials", attributes)
-    end
-
-    def update_credentials(login, attributes)
-      put("/v3/domains/#{escape @domain}/credentials/#{escape login}", attributes)
-    end
-
-    def delete_credentials(login)
-      delete("/v3/domains/#{escape @domain}/credentials/#{escape login}")
-    end
-
-    def get_connection_settings
-      get("/v3/domains/#{escape @domain}/connection")
-    end
-
-    def update_connection_settings(attributes)
-      put("/v3/domains/#{escape @domain}/connection", attributes)
-    end
-
-    def get_unsubscribes(params = {})
-      get("/v3/#{escape @domain}/unsubscribes", params)
-    end
-
-    def get_unsubscribe(address)
-      get("/v3/#{escape @domain}/unsubscribes/#{escape address}")
-    end
-
-    def delete_unsubscribe(address_or_id)
-      delete("/v3/#{escape @domain}/unsubscribes/#{escape address_or_id}")
-    end
-
-    def add_unsubscribe(attributes = {})
-      post("/v3/#{escape @domain}/unsubscribes", attributes)
-    end
-
-    def get_complaints(params = {})
-      get("/v3/#{escape @domain}/complaints", params)
-    end
-
-    def get_complaint(address)
-      get("/v3/#{escape @domain}/complaints/#{escape address}")
-    end
-
-    def add_complaint(attributes = {})
-      post("/v3/#{escape @domain}/complaints", attributes)
-    end
-
-    def delete_complaint(address)
-      delete("/v3/#{escape @domain}/complaints/#{escape address}")
-    end
-
-    def get_bounces(params = {})
-      get("/v3/#{escape @domain}/bounces", params)
-    end
-
-    def get_bounce(address)
-      get("/v3/#{escape @domain}/bounces/#{escape address}")
-    end
-
-    def add_bounce(attributes = {})
-      post("/v3/#{escape @domain}/bounces", attributes)
-    end
-
-    def delete_bounce(address)
-      delete("/v3/#{escape @domain}/bounces/#{escape address}")
-    end
-
-    def delete_bounces
-      delete("/v3/#{escape @domain}/bounces")
-    end
-
-    def get_stats(params = {})
-      Kernel.warn 'Mailgunner::Client#get_stats is deprecated'
-
-      get("/v3/#{escape @domain}/stats", params)
-    end
-
-    def get_total_stats(params = {})
-      get("/v3/#{escape @domain}/stats/total", params)
-    end
-
-    def get_events(params = {})
-      get("/v3/#{escape @domain}/events", params)
-    end
-
-    def get_tags(params = {})
-      get("/v3/#{escape @domain}/tags", params)
-    end
-
-    def get_tag(id)
-      get("/v3/#{escape @domain}/tags/#{escape id}")
-    end
-
-    def update_tag(id, attributes)
-      put("/v3/#{escape @domain}/tags/#{escape id}", attributes)
-    end
-
-    def get_tag_stats(id, params)
-      get("/v3/#{escape @domain}/tags/#{escape id}/stats", params)
-    end
-
-    def delete_tag(id)
-      delete("/v3/#{escape @domain}/tags/#{escape id}")
-    end
-
-    def get_routes(params = {})
-      get('/v3/routes', params)
-    end
-
-    def get_route(id)
-      get("/v3/routes/#{escape id}")
-    end
-
-    def add_route(attributes = {})
-      post('/v3/routes', attributes)
-    end
-
-    def update_route(id, attributes = {})
-      put("/v3/routes/#{escape id}", attributes)
-    end
-
-    def delete_route(id)
-      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
-
-    def get_campaign(id)
-      get("/v3/#{escape @domain}/campaigns/#{escape id}")
-    end
-
-    def add_campaign(attributes = {})
-      post("/v3/#{escape @domain}/campaigns", attributes)
-    end
-
-    def update_campaign(id, attributes = {})
-      put("/v3/#{escape @domain}/campaigns/#{escape id}", attributes)
-    end
-
-    def delete_campaign(id)
-      delete("/v3/#{escape @domain}/campaigns/#{escape id}")
-    end
-
-    def get_campaign_events(campaign_id, params = {})
-      get("/v3/#{escape @domain}/campaigns/#{escape campaign_id}/events", params)
-    end
-
-    def get_campaign_stats(campaign_id, params = {})
-      get("/v3/#{escape @domain}/campaigns/#{escape campaign_id}/stats", params)
-    end
-
-    def get_campaign_clicks(campaign_id, params = {})
-      get("/v3/#{escape @domain}/campaigns/#{escape campaign_id}/clicks", params)
-    end
-
-    def get_campaign_opens(campaign_id, params = {})
-      get("/v3/#{escape @domain}/campaigns/#{escape campaign_id}/opens", params)
-    end
-
-    def get_campaign_unsubscribes(campaign_id, params = {})
-      get("/v3/#{escape @domain}/campaigns/#{escape campaign_id}/unsubscribes", params)
-    end
-
-    def get_campaign_complaints(campaign_id, params = {})
-      get("/v3/#{escape @domain}/campaigns/#{escape campaign_id}/complaints", params)
-    end
-
-    def get_lists(params = {})
-      get('/v3/lists', params)
-    end
-
-    def get_list(address)
-      get("/v3/lists/#{escape address}")
-    end
-
-    def add_list(attributes = {})
-      post('/v3/lists', attributes)
-    end
-
-    def update_list(address, attributes = {})
-      put("/v3/lists/#{escape address}", attributes)
-    end
-
-    def delete_list(address)
-      delete("/v3/lists/#{escape address}")
-    end
-
-    def get_list_members(list_address, params = {})
-      get("/v3/lists/#{escape list_address}/members", params)
-    end
-
-    def get_list_member(list_address, member_address)
-      get("/v3/lists/#{escape list_address}/members/#{escape member_address}")
-    end
-
-    def add_list_member(list_address, member_attributes)
-      post("/v3/lists/#{escape list_address}/members", member_attributes)
-    end
-
-    def update_list_member(list_address, member_address, member_attributes)
-      put("/v3/lists/#{escape list_address}/members/#{escape member_address}", member_attributes)
-    end
-
-    def delete_list_member(list_address, member_address)
-      delete("/v3/lists/#{escape list_address}/members/#{escape member_address}")
-    end
-
-    private
-
-    def get(path, params = {}, headers = {})
-      request = Net::HTTP::Get.new(request_uri(path, params))
-
-      headers.each { |k, v| request[k] = v }
-
-      transmit(request)
-    end
-
-    def post(path, attributes = {})
-      transmit(Net::HTTP::Post.new(path)) { |message| message.set_form_data(attributes) }
-    end
-
-    def multipart_post(path, data)
-      transmit(Net::HTTP::Post.new(path)) { |message| message.set_form(data, 'multipart/form-data') }
-    end
-
-    def put(path, attributes = {})
-      transmit(Net::HTTP::Put.new(path)) { |message| message.set_form_data(attributes) }
-    end
-
-    def delete(path)
-      transmit(Net::HTTP::Delete.new(path))
-    end
-
-    USER_AGENT = "Ruby/#{RUBY_VERSION} Mailgunner/#{VERSION}"
-
-    def transmit(message)
-      message.basic_auth('api', @api_key)
-      message['User-Agent'] = USER_AGENT
-
-      yield message if block_given?
-
-      parse(@http.request(message))
-    end
-
-    def parse(response)
-      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
-        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, params)
-      return path if params.empty?
-
-      path + '?' + params.flat_map { |k, vs| Array(vs).map { |v| "#{escape(k)}=#{escape(v)}" } }.join('&')
-    end
-
-    def escape(component)
-      CGI.escape(component.to_s)
-    end
-  end
-end

data/lib/mailgunner/client.rb

@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+require 'net/http'
+require 'json'
+require 'cgi'
+
+module Mailgunner
+  class Client
+    attr_accessor :domain, :api_key, :http
+
+    def initialize(options = {})
+      @domain = options.fetch(:domain) { default_domain }
+
+      @api_key = options.fetch(:api_key) { ENV.fetch('MAILGUN_API_KEY') }
+
+      @api_host = options.fetch(:api_host) { 'api.mailgun.net' }
+
+      @http = Net::HTTP.new(@api_host, Net::HTTP.https_default_port)
+
+      @http.use_ssl = true
+    end
+
+    private
+
+    def default_domain
+      return NoDomainProvided unless ENV.key?('MAILGUN_SMTP_LOGIN')
+
+      ENV['MAILGUN_SMTP_LOGIN'].to_s.split('@').last
+    end
+
+    def get(path, params = {}, headers = {})
+      request = Net::HTTP::Get.new(request_uri(path, params))
+
+      headers.each { |k, v| request[k] = v }
+
+      transmit(request)
+    end
+
+    def post(path, attributes = {})
+      transmit(Net::HTTP::Post.new(path)) { |message| message.set_form_data(attributes) }
+    end
+
+    def multipart_post(path, data)
+      transmit(Net::HTTP::Post.new(path)) { |message| message.set_form(data, 'multipart/form-data') }
+    end
+
+    def put(path, attributes = {})
+      transmit(Net::HTTP::Put.new(path)) { |message| message.set_form_data(attributes) }
+    end
+
+    def delete(path)
+      transmit(Net::HTTP::Delete.new(path))
+    end
+
+    USER_AGENT = "Ruby/#{RUBY_VERSION} Mailgunner/#{VERSION}"
+
+    def transmit(message)
+      message.basic_auth('api', @api_key)
+      message['User-Agent'] = USER_AGENT
+
+      yield message if block_given?
+
+      parse(@http.request(message))
+    end
+
+    def parse(response)
+      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
+        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, params)
+      return path if params.empty?
+
+      path + '?' + params.flat_map { |k, vs| Array(vs).map { |v| "#{escape(k)}=#{escape(v)}" } }.join('&')
+    end
+
+    def escape(component)
+      CGI.escape(component.to_s)
+    end
+  end
+end

data/lib/mailgunner/client/domains.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Mailgunner
+  class Client
+    def get_domains(params = {})
+      get('/v3/domains', params)
+    end
+
+    def get_domain(name)
+      get("/v3/domains/#{escape name}")
+    end
+
+    def add_domain(attributes = {})
+      post('/v3/domains', attributes)
+    end
+
+    def delete_domain(name)
+      delete("/v3/domains/#{escape name}")
+    end
+
+    def get_credentials
+      get("/v3/domains/#{escape @domain}/credentials")
+    end
+
+    def add_credentials(attributes)
+      post("/v3/domains/#{escape @domain}/credentials", attributes)
+    end
+
+    def update_credentials(login, attributes)
+      put("/v3/domains/#{escape @domain}/credentials/#{escape login}", attributes)
+    end
+
+    def delete_credentials(login)
+      delete("/v3/domains/#{escape @domain}/credentials/#{escape login}")
+    end
+
+    def get_connection_settings
+      get("/v3/domains/#{escape @domain}/connection")
+    end
+
+    def update_connection_settings(attributes)
+      put("/v3/domains/#{escape @domain}/connection", attributes)
+    end
+  end
+end

data/lib/mailgunner/client/email_validation.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Mailgunner
+  class Client
+    def validate_address(value)
+      get('/v3/address/validate', address: value)
+    end
+
+    def parse_addresses(values)
+      get('/v3/address/parse', addresses: Array(values).join(','))
+    end
+  end
+end

data/lib/mailgunner/client/events.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Mailgunner
+  class Client
+    def get_events(params = {})
+      get("/v3/#{escape @domain}/events", params)
+    end
+  end
+end

data/lib/mailgunner/client/ips.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Mailgunner
+  class Client
+    def get_all_ips(params = {})
+      get('/v3/ips', params)
+    end
+
+    def get_ip(address)
+      get("/v3/ips/#{escape address}")
+    end
+
+    def get_ips
+      get("/v3/domains/#{escape @domain}/ips")
+    end
+
+    def add_ip(address)
+      post("/v3/domains/#{escape @domain}/ips", ip: address)
+    end
+
+    def delete_ip(address)
+      delete("/v3/domains/#{escape @domain}/ips/#{escape address}")
+    end
+  end
+end

data/lib/mailgunner/client/mailing_lists.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Mailgunner
+  class Client
+    def get_lists(params = {})
+      get('/v3/lists', params)
+    end
+
+    def get_list(address)
+      get("/v3/lists/#{escape address}")
+    end
+
+    def add_list(attributes = {})
+      post('/v3/lists', attributes)
+    end
+
+    def update_list(address, attributes = {})
+      put("/v3/lists/#{escape address}", attributes)
+    end
+
+    def delete_list(address)
+      delete("/v3/lists/#{escape address}")
+    end
+
+    def get_list_members(list_address, params = {})
+      get("/v3/lists/#{escape list_address}/members", params)
+    end
+
+    def get_list_member(list_address, member_address)
+      get("/v3/lists/#{escape list_address}/members/#{escape member_address}")
+    end
+
+    def add_list_member(list_address, member_attributes)
+      post("/v3/lists/#{escape list_address}/members", member_attributes)
+    end
+
+    def update_list_member(list_address, member_address, member_attributes)
+      put("/v3/lists/#{escape list_address}/members/#{escape member_address}", member_attributes)
+    end
+
+    def delete_list_member(list_address, member_address)
+      delete("/v3/lists/#{escape list_address}/members/#{escape member_address}")
+    end
+  end
+end

data/lib/mailgunner/client/messages.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Mailgunner
+  class Client
+    def get_message(key)
+      get("/v3/domains/#{escape @domain}/messages/#{escape key}")
+    end
+
+    def get_mime_message(key)
+      get("/v3/domains/#{escape @domain}/messages/#{escape key}", {}, {'Accept' => 'message/rfc2822'})
+    end
+
+    def send_message(attributes = {})
+      post("/v3/#{escape @domain}/messages", attributes)
+    end
+
+    def send_mime(mail)
+      to = ['to', Array(mail.destinations).join(',')]
+
+      message = ['message', mail.encoded, {filename: 'message.mime'}]
+
+      multipart_post("/v3/#{escape @domain}/messages.mime", [to, message])
+    end
+
+    def delete_message(key)
+      delete("/v3/domains/#{escape @domain}/messages/#{escape key}")
+    end
+  end
+end

data/lib/mailgunner/client/routes.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Mailgunner
+  class Client
+    def get_routes(params = {})
+      get('/v3/routes', params)
+    end
+
+    def get_route(id)
+      get("/v3/routes/#{escape id}")
+    end
+
+    def add_route(attributes = {})
+      post('/v3/routes', attributes)
+    end
+
+    def update_route(id, attributes = {})
+      put("/v3/routes/#{escape id}", attributes)
+    end
+
+    def delete_route(id)
+      delete("/v3/routes/#{escape id}")
+    end
+  end
+end

data/lib/mailgunner/client/stats.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Mailgunner
+  class Client
+    def get_stats(params = {})
+      Kernel.warn 'Mailgunner::Client#get_stats is deprecated'
+
+      get("/v3/#{escape @domain}/stats", params)
+    end
+
+    def get_total_stats(params = {})
+      get("/v3/#{escape @domain}/stats/total", params)
+    end
+  end
+end

data/lib/mailgunner/client/suppressions.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Mailgunner
+  class Client
+    def get_bounces(params = {})
+      get("/v3/#{escape @domain}/bounces", params)
+    end
+
+    def get_bounce(address)
+      get("/v3/#{escape @domain}/bounces/#{escape address}")
+    end
+
+    def add_bounce(attributes = {})
+      post("/v3/#{escape @domain}/bounces", attributes)
+    end
+
+    def delete_bounce(address)
+      delete("/v3/#{escape @domain}/bounces/#{escape address}")
+    end
+
+    def delete_bounces
+      delete("/v3/#{escape @domain}/bounces")
+    end
+
+    def get_unsubscribes(params = {})
+      get("/v3/#{escape @domain}/unsubscribes", params)
+    end
+
+    def get_unsubscribe(address)
+      get("/v3/#{escape @domain}/unsubscribes/#{escape address}")
+    end
+
+    def delete_unsubscribe(address_or_id)
+      delete("/v3/#{escape @domain}/unsubscribes/#{escape address_or_id}")
+    end
+
+    def add_unsubscribe(attributes = {})
+      post("/v3/#{escape @domain}/unsubscribes", attributes)
+    end
+
+    def get_complaints(params = {})
+      get("/v3/#{escape @domain}/complaints", params)
+    end
+
+    def get_complaint(address)
+      get("/v3/#{escape @domain}/complaints/#{escape address}")
+    end
+
+    def add_complaint(attributes = {})
+      post("/v3/#{escape @domain}/complaints", attributes)
+    end
+
+    def delete_complaint(address)
+      delete("/v3/#{escape @domain}/complaints/#{escape address}")
+    end
+  end
+end

data/lib/mailgunner/client/tags.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Mailgunner
+  class Client
+    def get_tags(params = {})
+      get("/v3/#{escape @domain}/tags", params)
+    end
+
+    def get_tag(id)
+      get("/v3/#{escape @domain}/tags/#{escape id}")
+    end
+
+    def update_tag(id, attributes)
+      put("/v3/#{escape @domain}/tags/#{escape id}", attributes)
+    end
+
+    def get_tag_stats(id, params)
+      get("/v3/#{escape @domain}/tags/#{escape id}/stats", params)
+    end
+
+    def delete_tag(id)
+      delete("/v3/#{escape @domain}/tags/#{escape id}")
+    end
+  end
+end

data/lib/mailgunner/client/webhooks.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Mailgunner
+  class Client
+    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
+  end
+end

data/lib/mailgunner/version.rb

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

data/mailgunner.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.authors = ['Tim Craft']
   s.email = ['mail@timcraft.com']
-  s.homepage = 'http://github.com/timcraft/mailgunner'
+  s.homepage = 'http://github.com/readysteady/mailgunner'
   s.description = 'Ruby client for the Mailgun API'
   s.summary = 'Ruby client for the Mailgun API'
   s.files = Dir.glob('{lib,spec}/**/*') + %w(LICENSE.txt README.md mailgunner.gemspec)
@@ -18,4 +18,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency('actionmailer', '~> 5')
   s.add_development_dependency('mocha', '~> 1')
   s.require_path = 'lib'
+  s.metadata = {
+    'homepage' => 'https://github.com/readysteady/mailgunner',
+    'source_code_uri' => 'https://github.com/readysteady/mailgunner',
+    'bug_tracker_uri' => 'https://github.com/readysteady/mailgunner/issues',
+    'changelog_uri' => 'https://github.com/readysteady/mailgunner/blob/master/CHANGES.md'
+  }
 end

data/spec/mailgunner_spec.rb

@@ -41,11 +41,23 @@ describe 'Mailgunner::Client' do
   end
 
   describe 'http method' do
-    it 'returns a net http object that uses ssl' do
+    it 'returns a net http object' do
       @client.http.must_be_instance_of(Net::HTTP)
+    end
+  end
 
+  describe 'http object' do
+    it 'uses ssl' do
       @client.http.use_ssl?.must_equal(true)
     end
+
+    it 'uses the address from the api_host option' do
+      api_host = 'api.eu.mailgun.net'
+
+      @client = Mailgunner::Client.new(api_key: @api_key, api_host: api_host)
+
+      @client.http.address.must_equal(api_host)
+    end
   end
 
   describe 'domain method' do
@@ -577,133 +589,49 @@ describe 'Mailgunner::Client' do
     end
   end
 
-  describe 'get_campaigns method' do
-    it 'fetches the domain campaigns resource and returns the response object' do
-      stub(:get, "#@base_url/#@domain/campaigns")
+  describe 'get_all_ips method' do
+    it 'fetches the ips resource and returns the response object' do
+      stub(:get, "#@base_url/ips")
 
-      @client.get_campaigns.must_equal(@json_response_object)
-    end
-
-    it 'encodes skip and limit parameters' do
-      stub(:get, "#@base_url/#@domain/campaigns?skip=1&limit=2")
-
-      @client.get_campaigns(skip: 1, limit: 2)
+      @client.get_all_ips.must_equal(@json_response_object)
     end
   end
 
-  describe 'get_campaign method' do
-    it 'fetches the campaign resource with the given id and returns the response object' do
-      stub(:get, "#@base_url/#@domain/campaigns/#@id")
-
-      @client.get_campaign(@id).must_equal(@json_response_object)
-    end
-  end
+  describe 'get_ip method' do
+    it 'fetches the ip resource with the given address and returns the response object' do
+      address = '127.0.0.1'
 
-  describe 'add_campaign method' do
-    it 'posts to the domain campaigns resource and returns the response object' do
-      stub(:post, "#@base_url/#@domain/campaigns", body: "id=#@id")
+      stub(:get, "#@base_url/ips/#{address}")
 
-      @client.add_campaign({id: @id}).must_equal(@json_response_object)
+      @client.get_ip(address).must_equal(@json_response_object)
     end
   end
 
-  describe 'update_campaign method' do
-    it 'updates the campaign resource and returns the response object' do
-      stub(:put, "#@base_url/#@domain/campaigns/#@id", body: 'name=Example+Campaign')
+  describe 'get_ips method' do
+    it 'fetches the domain ips resource and returns the response object' do
+      stub(:get, "#@base_url/domains/#@domain/ips")
 
-      @client.update_campaign(@id, {name: 'Example Campaign'}).must_equal(@json_response_object)
+      @client.get_ips.must_equal(@json_response_object)
     end
   end
 
-  describe 'delete_campaign method' do
-    it 'deletes the domain campaign resource with the given id and returns the response object' do
-      stub(:delete, "#@base_url/#@domain/campaigns/#@id")
+  describe 'add_ip method' do
+    it 'posts to the domain ips resource and returns the response object' do
+      address = '127.0.0.1'
 
-      @client.delete_campaign(@id).must_equal(@json_response_object)
-    end
-  end
-
-  describe 'get_campaign_events method' do
-    it 'fetches the domain campaign events resource and returns the response object' do
-      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(:get, "#@base_url/#@domain/campaigns/#@id/events?country=US&limit=100")
+      stub(:post, "#@base_url/domains/#@domain/ips", body: {ip: address})
 
-      @client.get_campaign_events(@id, country: 'US', limit: 100)
+      @client.add_ip(address).must_equal(@json_response_object)
     end
   end
 
-  describe 'get_campaign_stats method' do
-    it 'fetches the domain campaign stats resource and returns the response object' do
-      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(:get, "#@base_url/#@domain/campaigns/#@id/stats?groupby=dailyhour")
-
-      @client.get_campaign_stats(@id, groupby: 'dailyhour')
-    end
-  end
-
-  describe 'get_campaign_clicks method' do
-    it 'fetches the domain campaign clicks resource and returns the response object' do
-      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(:get, "#@base_url/#@domain/campaigns/#@id/clicks?groupby=month&limit=100")
-
-      @client.get_campaign_clicks(@id, groupby: 'month', limit: 100)
-    end
-  end
-
-  describe 'get_campaign_opens method' do
-    it 'fetches the domain campaign opens resource and returns the response object' do
-      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(:get, "#@base_url/#@domain/campaigns/#@id/opens?groupby=month&limit=100")
-
-      @client.get_campaign_opens(@id, groupby: 'month', limit: 100)
-    end
-  end
-
-  describe 'get_campaign_unsubscribes method' do
-    it 'fetches the domain campaign unsubscribes resource and returns the response object' do
-      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(:get, "#@base_url/#@domain/campaigns/#@id/unsubscribes?groupby=month&limit=100")
-
-      @client.get_campaign_unsubscribes(@id, groupby: 'month', limit: 100)
-    end
-  end
-
-  describe 'get_campaign_complaints method' do
-    it 'fetches the domain campaign complaints resource and returns the response object' do
-      stub(:get, "#@base_url/#@domain/campaigns/#@id/complaints")
-
-      @client.get_campaign_complaints(@id).must_equal(@json_response_object)
-    end
+  describe 'delete_ip method' do
+    it 'deletes the domain ip resource with the given address and returns the response object' do
+      address = '127.0.0.1'
 
-    it 'encodes the optional parameters' do
-      stub(:get, "#@base_url/#@domain/campaigns/#@id/complaints?groupby=month&limit=100")
+      stub(:delete, "#@base_url/domains/#@domain/ips/#{address}")
 
-      @client.get_campaign_complaints(@id, groupby: 'month', limit: 100)
+      @client.delete_ip(address).must_equal(@json_response_object)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailgunner
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Tim Craft
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-05 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -90,6 +90,18 @@ files:
 - LICENSE.txt
 - README.md
 - lib/mailgunner.rb
+- lib/mailgunner/client.rb
+- lib/mailgunner/client/domains.rb
+- lib/mailgunner/client/email_validation.rb
+- lib/mailgunner/client/events.rb
+- lib/mailgunner/client/ips.rb
+- lib/mailgunner/client/mailing_lists.rb
+- lib/mailgunner/client/messages.rb
+- lib/mailgunner/client/routes.rb
+- lib/mailgunner/client/stats.rb
+- lib/mailgunner/client/suppressions.rb
+- lib/mailgunner/client/tags.rb
+- lib/mailgunner/client/webhooks.rb
 - lib/mailgunner/delivery_method.rb
 - lib/mailgunner/errors.rb
 - lib/mailgunner/railtie.rb
@@ -97,10 +109,14 @@ files:
 - mailgunner.gemspec
 - spec/mailgunner_delivery_method_spec.rb
 - spec/mailgunner_spec.rb
-homepage: http://github.com/timcraft/mailgunner
+homepage: http://github.com/readysteady/mailgunner
 licenses:
 - LGPL-3.0
-metadata: {}
+metadata:
+  homepage: https://github.com/readysteady/mailgunner
+  source_code_uri: https://github.com/readysteady/mailgunner
+  bug_tracker_uri: https://github.com/readysteady/mailgunner/issues
+  changelog_uri: https://github.com/readysteady/mailgunner/blob/master/CHANGES.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -117,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby client for the Mailgun API