mailgunner 2.6.0 → 3.2.1

data/lib/mailgunner/client/domains.rb

@@ -2,15 +2,15 @@
 
 module Mailgunner
   class Client
-    def get_domains(params = {})
-      get('/v3/domains', params)
+    def get_domains(params = PARAMS)
+      get('/v3/domains', query: params)
     end
 
     def get_domain(name)
       get("/v3/domains/#{escape name}")
     end
 
-    def add_domain(attributes = {})
+    def add_domain(attributes = ATTRIBUTES)
       post('/v3/domains', attributes)
     end
 
@@ -18,6 +18,10 @@ module Mailgunner
       delete("/v3/domains/#{escape name}")
     end
 
+    def verify_domain(name)
+      put("/v3/domains/#{escape name}/verify")
+    end
+
     def get_credentials
       get("/v3/domains/#{escape @domain}/credentials")
     end
@@ -41,5 +45,33 @@ module Mailgunner
     def update_connection_settings(attributes)
       put("/v3/domains/#{escape @domain}/connection", attributes)
     end
+
+    def get_tracking_settings
+      get("/v3/domains/#{escape @domain}/tracking")
+    end
+
+    def update_open_tracking_settings(params = PARAMS)
+      put("/v3/domains/#{escape @domain}/tracking/open", params)
+    end
+
+    def update_click_tracking_settings(params = PARAMS)
+      put("/v3/domains/#{escape @domain}/tracking/click", params)
+    end
+
+    def update_unsubscribe_tracking_settings(params = PARAMS)
+      put("/v3/domains/#{escape @domain}/tracking/unsubscribe", params)
+    end
+
+    def update_dkim_authority(params = PARAMS)
+      put("/v3/domains/#{escape @domain}/dkim_authority", params)
+    end
+
+    def update_dkim_selector(params = PARAMS)
+      put("/v3/domains/#{escape @domain}/dkim_selector", params)
+    end
+
+    def update_web_prefix(params = PARAMS)
+      put("/v3/domains/#{escape @domain}/web_prefix", params)
+    end
   end
 end

data/lib/mailgunner/client/email_validation.rb

@@ -3,11 +3,23 @@
 module Mailgunner
   class Client
     def validate_address(value)
-      get('/v3/address/validate', address: value)
+      get('/v4/address/validate', query: {address: value})
     end
 
-    def parse_addresses(values)
-      get('/v3/address/parse', addresses: Array(values).join(','))
+    def get_bulk_validations
+      get('/v4/address/validate/bulk')
+    end
+
+    def create_bulk_validation(list_id)
+      post("/v4/address/validate/bulk/#{escape list_id}")
+    end
+
+    def get_bulk_validation(list_id)
+      get("/v4/address/validate/bulk/#{escape list_id}")
+    end
+
+    def cancel_bulk_validation(list_id)
+      delete("/v4/address/validate/bulk/#{escape list_id}")
     end
   end
 end

data/lib/mailgunner/client/events.rb

@@ -2,8 +2,8 @@
 
 module Mailgunner
   class Client
-    def get_events(params = {})
-      get("/v3/#{escape @domain}/events", params)
+    def get_events(params = PARAMS)
+      get("/v3/#{escape @domain}/events", query: params)
     end
   end
 end

data/lib/mailgunner/client/ips.rb

@@ -2,8 +2,8 @@
 
 module Mailgunner
   class Client
-    def get_all_ips(params = {})
-      get('/v3/ips', params)
+    def get_all_ips(params = PARAMS)
+      get('/v3/ips', query: params)
     end
 
     def get_ip(address)

data/lib/mailgunner/client/mailing_lists.rb

@@ -2,19 +2,19 @@
 
 module Mailgunner
   class Client
-    def get_lists(params = {})
-      get('/v3/lists', params)
+    def get_lists(params = PARAMS)
+      get('/v3/lists/pages', query: params)
     end
 
     def get_list(address)
       get("/v3/lists/#{escape address}")
     end
 
-    def add_list(attributes = {})
+    def add_list(attributes = ATTRIBUTES)
       post('/v3/lists', attributes)
     end
 
-    def update_list(address, attributes = {})
+    def update_list(address, attributes = ATTRIBUTES)
       put("/v3/lists/#{escape address}", attributes)
     end
 
@@ -22,8 +22,8 @@ module Mailgunner
       delete("/v3/lists/#{escape address}")
     end
 
-    def get_list_members(list_address, params = {})
-      get("/v3/lists/#{escape list_address}/members", params)
+    def get_list_members(list_address, params = PARAMS)
+      get("/v3/lists/#{escape list_address}/members/pages", query: params)
     end
 
     def get_list_member(list_address, member_address)

data/lib/mailgunner/client/messages.rb

@@ -7,10 +7,10 @@ module Mailgunner
     end
 
     def get_mime_message(key)
-      get("/v3/domains/#{escape @domain}/messages/#{escape key}", {}, {'Accept' => 'message/rfc2822'})
+      get("/v3/domains/#{escape @domain}/messages/#{escape key}", headers: {'Accept' => 'message/rfc2822'})
     end
 
-    def send_message(attributes = {})
+    def send_message(attributes = ATTRIBUTES)
       post("/v3/#{escape @domain}/messages", attributes)
     end
 

data/lib/mailgunner/client/routes.rb

@@ -2,19 +2,19 @@
 
 module Mailgunner
   class Client
-    def get_routes(params = {})
-      get('/v3/routes', params)
+    def get_routes(params = PARAMS)
+      get('/v3/routes', query: params)
     end
 
     def get_route(id)
       get("/v3/routes/#{escape id}")
     end
 
-    def add_route(attributes = {})
+    def add_route(attributes = ATTRIBUTES)
       post('/v3/routes', attributes)
     end
 
-    def update_route(id, attributes = {})
+    def update_route(id, attributes = ATTRIBUTES)
       put("/v3/routes/#{escape id}", attributes)
     end
 

data/lib/mailgunner/client/stats.rb

@@ -2,14 +2,8 @@
 
 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)
+    def get_total_stats(params = PARAMS)
+      get("/v3/#{escape @domain}/stats/total", query: params)
     end
   end
 end

data/lib/mailgunner/client/suppressions.rb

@@ -2,15 +2,15 @@
 
 module Mailgunner
   class Client
-    def get_bounces(params = {})
-      get("/v3/#{escape @domain}/bounces", params)
+    def get_bounces(params = PARAMS)
+      get("/v3/#{escape @domain}/bounces", query: params)
     end
 
     def get_bounce(address)
       get("/v3/#{escape @domain}/bounces/#{escape address}")
     end
 
-    def add_bounce(attributes = {})
+    def add_bounce(attributes = ATTRIBUTES)
       post("/v3/#{escape @domain}/bounces", attributes)
     end
 
@@ -22,8 +22,8 @@ module Mailgunner
       delete("/v3/#{escape @domain}/bounces")
     end
 
-    def get_unsubscribes(params = {})
-      get("/v3/#{escape @domain}/unsubscribes", params)
+    def get_unsubscribes(params = PARAMS)
+      get("/v3/#{escape @domain}/unsubscribes", query: params)
     end
 
     def get_unsubscribe(address)
@@ -34,24 +34,40 @@ module Mailgunner
       delete("/v3/#{escape @domain}/unsubscribes/#{escape address_or_id}")
     end
 
-    def add_unsubscribe(attributes = {})
+    def add_unsubscribe(attributes = ATTRIBUTES)
       post("/v3/#{escape @domain}/unsubscribes", attributes)
     end
 
-    def get_complaints(params = {})
-      get("/v3/#{escape @domain}/complaints", params)
+    def get_complaints(params = PARAMS)
+      get("/v3/#{escape @domain}/complaints", query: params)
     end
 
     def get_complaint(address)
       get("/v3/#{escape @domain}/complaints/#{escape address}")
     end
 
-    def add_complaint(attributes = {})
+    def add_complaint(attributes = ATTRIBUTES)
       post("/v3/#{escape @domain}/complaints", attributes)
     end
 
     def delete_complaint(address)
       delete("/v3/#{escape @domain}/complaints/#{escape address}")
     end
+
+    def get_whitelists(params = PARAMS)
+      get("/v3/#{escape @domain}/whitelists", query: params)
+    end
+
+    def get_whitelist(address_or_domain)
+      get("/v3/#{escape @domain}/whitelists/#{escape address_or_domain}")
+    end
+
+    def add_whitelist(attributes = ATTRIBUTES)
+      post("/v3/#{escape @domain}/whitelists", attributes)
+    end
+
+    def delete_whitelist(address_or_domain)
+      delete("/v3/#{escape @domain}/whitelists/#{escape address_or_domain}")
+    end
   end
 end

data/lib/mailgunner/client/tags.rb

@@ -2,8 +2,8 @@
 
 module Mailgunner
   class Client
-    def get_tags(params = {})
-      get("/v3/#{escape @domain}/tags", params)
+    def get_tags(params = PARAMS)
+      get("/v3/#{escape @domain}/tags", query: params)
     end
 
     def get_tag(id)
@@ -15,7 +15,7 @@ module Mailgunner
     end
 
     def get_tag_stats(id, params)
-      get("/v3/#{escape @domain}/tags/#{escape id}/stats", params)
+      get("/v3/#{escape @domain}/tags/#{escape id}/stats", query: params)
     end
 
     def delete_tag(id)

data/lib/mailgunner/client/webhooks.rb

@@ -10,11 +10,11 @@ module Mailgunner
       get("/v3/domains/#{escape @domain}/webhooks/#{escape id}")
     end
 
-    def add_webhook(attributes = {})
+    def add_webhook(attributes = ATTRIBUTES)
       post("/v3/domains/#{escape @domain}/webhooks", attributes)
     end
 
-    def update_webhook(id, attributes = {})
+    def update_webhook(id, attributes = ATTRIBUTES)
       put("/v3/domains/#{escape @domain}/webhooks/#{escape id}", attributes)
     end
 

data/lib/mailgunner/config.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Mailgunner
+  class Config
+    def domain
+      @domain ||= default_domain
+    end
+
+    attr_writer :domain
+
+    def api_key
+      @api_key ||= ENV.fetch('MAILGUN_API_KEY')
+    end
+
+    attr_writer :api_key
+
+    def api_host
+      @api_host ||= 'api.mailgun.net'
+    end
+
+    attr_writer :api_host
+
+    def user_agent
+      @user_agent ||= "Ruby/#{RUBY_VERSION} Mailgunner/#{VERSION}"
+    end
+
+    attr_writer :user_agent
+
+    module NoDomainProvided
+      def self.to_s
+        raise Error, 'No domain provided'
+      end
+    end
+
+    private_constant :NoDomainProvided
+
+    private
+
+    def default_domain
+      return NoDomainProvided unless ENV.key?('MAILGUN_SMTP_LOGIN')
+
+      ENV['MAILGUN_SMTP_LOGIN'].to_s.split('@').last
+    end
+  end
+end

data/lib/mailgunner/delivery_method.rb

@@ -1,17 +1,19 @@
 require 'mail/check_delivery_params'
 
 module Mailgunner
+  # @private
   class DeliveryMethod
     attr_accessor :settings
 
     def initialize(values)
-      @client = Client.new(values)
+      self.settings = values
     end
 
     def deliver!(mail)
       check(mail)
 
-      @client.send_mime(mail)
+      client = Client.new(**settings)
+      client.send_mime(mail)
     end
 
     private

data/lib/mailgunner/errors.rb

@@ -1,15 +1,33 @@
+# frozen_string_literal: true
+
 module Mailgunner
-  class Error < StandardError; end
+  class Error < StandardError
+    # @private
+    def self.parse(response)
+      exception_class = case response
+        when Net::HTTPUnauthorized
+          AuthenticationError
+        when Net::HTTPClientError
+          ClientError
+        when Net::HTTPServerError
+          ServerError
+        else
+          Error
+        end
+
+      message = if response['Content-Type']&.start_with?('application/json')
+        JSON.parse(response.body)['message']
+      end
+
+      message ||= "HTTP #{response.code} response from Mailgun API"
+
+      exception_class.new(message)
+    end
+  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/params.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+require 'cgi'
+
+module Mailgunner
+  module Params
+    def self.encode(params)
+      params.flat_map { |k, vs| Array(vs).map { |v| "#{escape(k)}=#{escape(v)}" } }.join('&')
+    end
+
+    def self.escape(component)
+      CGI.escape(component.to_s)
+    end
+  end
+
+  private_constant :Params
+end

data/lib/mailgunner/railtie.rb

@@ -1,4 +1,5 @@
 module Mailgunner
+  # @private
   class Railtie < Rails::Railtie
     config.before_initialize do
       require 'mailgunner/delivery_method'